Skip to content

Commit 1bdcd10

Browse files
committed
Merge pull request apache#452 from datastax/java913
JAVA-913: Redesign IndexMetadata API.
2 parents 8bd064d + 002869f commit 1bdcd10

11 files changed

Lines changed: 324 additions & 382 deletions

driver-core/src/main/java/com/datastax/driver/core/ColumnMetadata.java

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616
package com.datastax.driver.core;
1717

18-
import java.util.*;
18+
import java.util.Arrays;
19+
import java.util.HashMap;
20+
import java.util.Map;
1921

2022
/**
2123
* Describes a Column.
@@ -42,10 +44,6 @@ public class ColumnMetadata {
4244
private final DataType type;
4345
private final boolean isStatic;
4446

45-
// this is the "reverse" side of the many-to-many relationship
46-
// between columns and indexes, and is updated only after the column is created
47-
final Map<String, IndexMetadata> indexes = new LinkedHashMap<String, IndexMetadata>();
48-
4947
private ColumnMetadata(TableOrView parent, String name, DataType type, boolean isStatic) {
5048
this.parent = parent;
5149
this.name = name;
@@ -98,28 +96,6 @@ public boolean isStatic() {
9896
return isStatic;
9997
}
10098

101-
/**
102-
* Returns metadata on a index on this column.
103-
*
104-
* @param name the name of the index to retrieve ({@code name} will be
105-
* interpreted as a case-insensitive identifier unless enclosed in double-quotes,
106-
* see {@link Metadata#quote}).
107-
* @return the metadata for the {@code name} index if it exists, or
108-
* {@code null} otherwise.
109-
*/
110-
public IndexMetadata getIndex(String name) {
111-
return indexes.get(Metadata.handleId(name));
112-
}
113-
114-
/**
115-
* Returns a list containing all the indexes on this column.
116-
*
117-
* @return a list containing the metadata for the indexes on this column.
118-
*/
119-
public List<IndexMetadata> getIndexes() {
120-
return new ArrayList<IndexMetadata>(indexes.values());
121-
}
122-
12399
@Override
124100
public String toString() {
125101
String str = Metadata.escapeId(name) + ' ' + type;

0 commit comments

Comments
 (0)