Repository: cassandra Updated Branches: refs/heads/trunk 87f197593 -> dc8523819
Rename ColumnDefinition.Kind.CLUSTERING_COLUMN to CLUSTERING patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-6717 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d7c608b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d7c608b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d7c608b Branch: refs/heads/trunk Commit: 8d7c608bac9440911f4803db04f306f0616f2a22 Parents: 87f1975 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Jul 17 23:16:08 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Jul 17 23:17:18 2015 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/CFMetaData.java | 6 +++--- .../org/apache/cassandra/config/ColumnDefinition.java | 13 ++++++------- .../cassandra/cql3/statements/AlterTableStatement.java | 6 +++--- .../cql3/statements/ModificationStatement.java | 6 +++--- .../cassandra/cql3/statements/SelectStatement.java | 2 +- .../cassandra/cql3/statements/UpdateStatement.java | 2 +- src/java/org/apache/cassandra/db/filter/RowFilter.java | 2 +- .../index/AbstractSimplePerColumnSecondaryIndex.java | 2 +- .../cassandra/db/index/composites/CompositesIndex.java | 2 +- .../composites/CompositesIndexOnClusteringKey.java | 2 +- .../apache/cassandra/schema/LegacySchemaMigrator.java | 2 +- .../org/apache/cassandra/schema/SchemaKeyspace.java | 6 +++--- .../cassandra/schema/LegacySchemaMigratorTest.java | 4 ++-- 13 files changed, 27 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d7c608b/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java index ee1ed25..4505c6d 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -310,7 +310,7 @@ public final class CFMetaData case PARTITION_KEY: partitions.add(column); break; - case CLUSTERING_COLUMN: + case CLUSTERING: clusterings.add(column); break; default: @@ -1159,7 +1159,7 @@ public final class CFMetaData List<AbstractType<?>> keyTypes = extractTypes(partitionKeyColumns); keyValidator = keyTypes.size() == 1 ? keyTypes.get(0) : CompositeType.getInstance(keyTypes); break; - case CLUSTERING_COLUMN: + case CLUSTERING: clusteringColumns.set(def.position(), def); comparator = new ClusteringComparator(extractTypes(clusteringColumns)); break; @@ -1482,7 +1482,7 @@ public final class CFMetaData for (int i = 0; i < clusteringColumns.size(); i++) { Pair<ColumnIdentifier, AbstractType> p = clusteringColumns.get(i); - clusterings.add(new ColumnDefinition(keyspace, table, p.left, p.right, i, ColumnDefinition.Kind.CLUSTERING_COLUMN)); + clusterings.add(new ColumnDefinition(keyspace, table, p.left, p.right, i, ColumnDefinition.Kind.CLUSTERING)); } for (int i = 0; i < regularColumns.size(); i++) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d7c608b/src/java/org/apache/cassandra/config/ColumnDefinition.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/ColumnDefinition.java b/src/java/org/apache/cassandra/config/ColumnDefinition.java index 8448ca6..432d5a8 100644 --- a/src/java/org/apache/cassandra/config/ColumnDefinition.java +++ b/src/java/org/apache/cassandra/config/ColumnDefinition.java @@ -30,14 +30,13 @@ import org.apache.cassandra.db.rows.*; import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.exceptions.*; -import org.apache.cassandra.utils.ByteBufferUtil; public class ColumnDefinition extends ColumnSpecification implements Comparable<ColumnDefinition> { /* * The type of CQL3 column this definition represents. * There is 4 main type of CQL3 columns: those parts of the partition key, - * those parts of the clustering key and amongst the others, regular and + * those parts of the clustering columns and amongst the others, regular and * static ones. * * Note that thrift only knows about definitions of type REGULAR (and @@ -46,13 +45,13 @@ public class ColumnDefinition extends ColumnSpecification implements Comparable< public enum Kind { PARTITION_KEY, - CLUSTERING_COLUMN, + CLUSTERING, REGULAR, STATIC; public boolean isPrimaryKeyKind() { - return this == PARTITION_KEY || this == CLUSTERING_COLUMN; + return this == PARTITION_KEY || this == CLUSTERING; } } @@ -96,12 +95,12 @@ public class ColumnDefinition extends ColumnSpecification implements Comparable< public static ColumnDefinition clusteringKeyDef(CFMetaData cfm, ByteBuffer name, AbstractType<?> validator, Integer componentIndex) { - return new ColumnDefinition(cfm, name, validator, componentIndex, Kind.CLUSTERING_COLUMN); + return new ColumnDefinition(cfm, name, validator, componentIndex, Kind.CLUSTERING); } public static ColumnDefinition clusteringKeyDef(String ksName, String cfName, String name, AbstractType<?> validator, Integer componentIndex) { - return new ColumnDefinition(ksName, cfName, ColumnIdentifier.getInterned(name, true), validator, null, null, null, componentIndex, Kind.CLUSTERING_COLUMN); + return new ColumnDefinition(ksName, cfName, ColumnIdentifier.getInterned(name, true), validator, null, null, null, componentIndex, Kind.CLUSTERING); } public static ColumnDefinition regularDef(CFMetaData cfm, ByteBuffer name, AbstractType<?> validator, Integer componentIndex) @@ -228,7 +227,7 @@ public class ColumnDefinition extends ColumnSpecification implements Comparable< public boolean isClusteringColumn() { - return kind == Kind.CLUSTERING_COLUMN; + return kind == Kind.CLUSTERING; } public boolean isStatic() http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d7c608b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java index 2cd3f68..d1888bc 100644 --- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java @@ -108,7 +108,7 @@ public class AlterTableStatement extends SchemaAlteringStatement switch (def.kind) { case PARTITION_KEY: - case CLUSTERING_COLUMN: + case CLUSTERING: throw new InvalidRequestException(String.format("Invalid column name %s because it conflicts with a PRIMARY KEY part", columnName)); default: throw new InvalidRequestException(String.format("Invalid column name %s because it conflicts with an existing column", columnName)); @@ -163,7 +163,7 @@ public class AlterTableStatement extends SchemaAlteringStatement currentType.asCQL3Type(), validator)); break; - case CLUSTERING_COLUMN: + case CLUSTERING: AbstractType<?> oldType = cfm.comparator.subtype(def.position()); // Note that CFMetaData.validateCompatibility already validate the change we're about to do. However, the error message it // sends is a bit cryptic for a CQL3 user, so validating here for a sake of returning a better error message @@ -203,7 +203,7 @@ public class AlterTableStatement extends SchemaAlteringStatement switch (def.kind) { case PARTITION_KEY: - case CLUSTERING_COLUMN: + case CLUSTERING: throw new InvalidRequestException(String.format("Cannot drop PRIMARY KEY part %s", columnName)); case REGULAR: case STATIC: http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d7c608b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java index 698371c..ee493f5 100644 --- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java @@ -329,7 +329,7 @@ public abstract class ModificationStatement implements CQLStatement private void addKeyValues(ColumnDefinition def, Restriction values) throws InvalidRequestException { - if (def.kind == ColumnDefinition.Kind.CLUSTERING_COLUMN) + if (def.kind == ColumnDefinition.Kind.CLUSTERING) hasNoClusteringColumns = false; if (processedKeys.put(def.name, values) != null) throw new InvalidRequestException(String.format("Multiple definitions found for PRIMARY KEY part %s", def.name)); @@ -362,7 +362,7 @@ public abstract class ModificationStatement implements CQLStatement switch (def.kind) { case PARTITION_KEY: - case CLUSTERING_COLUMN: + case CLUSTERING: Restriction restriction; if (rel.isEQ() || (def.isPartitionKey() && rel.isIN())) @@ -899,7 +899,7 @@ public abstract class ModificationStatement implements CQLStatement switch (def.kind) { case PARTITION_KEY: - case CLUSTERING_COLUMN: + case CLUSTERING: throw new InvalidRequestException(String.format("PRIMARY KEY column '%s' cannot have IF conditions", id)); default: stmt.addCondition(condition); http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d7c608b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java index 6a7f429..f584c78 100644 --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@ -633,7 +633,7 @@ public class SelectStatement implements CQLStatement case PARTITION_KEY: result.add(keyComponents[def.position()]); break; - case CLUSTERING_COLUMN: + case CLUSTERING: result.add(row.clustering().get(def.position())); break; case REGULAR: http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d7c608b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java index bbaacc8..6229019 100644 --- a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java @@ -248,7 +248,7 @@ public class UpdateStatement extends ModificationStatement switch (def.kind) { case PARTITION_KEY: - case CLUSTERING_COLUMN: + case CLUSTERING: throw new InvalidRequestException(String.format("PRIMARY KEY part %s found in SET part", entry.left)); default: stmt.addOperation(operation); http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d7c608b/src/java/org/apache/cassandra/db/filter/RowFilter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/RowFilter.java b/src/java/org/apache/cassandra/db/filter/RowFilter.java index d357756..8f34efb 100644 --- a/src/java/org/apache/cassandra/db/filter/RowFilter.java +++ b/src/java/org/apache/cassandra/db/filter/RowFilter.java @@ -338,7 +338,7 @@ public abstract class RowFilter implements Iterable<RowFilter.Expression> return column.isOnAllComponents() ? partitionKey.getKey() : CompositeType.extractComponent(partitionKey.getKey(), column.position()); - case CLUSTERING_COLUMN: + case CLUSTERING: return row.clustering().get(column.position()); default: Cell cell = row.getCell(column); http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d7c608b/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java b/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java index 0b6577e..794744a 100644 --- a/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java +++ b/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java @@ -219,7 +219,7 @@ public abstract class AbstractSimplePerColumnSecondaryIndex extends PerColumnSec public void validate(Clustering clustering) throws InvalidRequestException { - if (columnDef.kind == ColumnDefinition.Kind.CLUSTERING_COLUMN) + if (columnDef.kind == ColumnDefinition.Kind.CLUSTERING) validateIndexedValue(getIndexedValue(null, clustering, null, null)); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d7c608b/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java b/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java index 9333bcf..7a40a90 100644 --- a/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java +++ b/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java @@ -62,7 +62,7 @@ public abstract class CompositesIndex extends AbstractSimplePerColumnSecondaryIn switch (cfDef.kind) { - case CLUSTERING_COLUMN: + case CLUSTERING: return new CompositesIndexOnClusteringKey(); case REGULAR: return new CompositesIndexOnRegular(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d7c608b/src/java/org/apache/cassandra/db/index/composites/CompositesIndexOnClusteringKey.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/index/composites/CompositesIndexOnClusteringKey.java b/src/java/org/apache/cassandra/db/index/composites/CompositesIndexOnClusteringKey.java index add4445..aa58511 100644 --- a/src/java/org/apache/cassandra/db/index/composites/CompositesIndexOnClusteringKey.java +++ b/src/java/org/apache/cassandra/db/index/composites/CompositesIndexOnClusteringKey.java @@ -28,7 +28,7 @@ import org.apache.cassandra.db.index.SecondaryIndex; import org.apache.cassandra.utils.concurrent.OpOrder; /** - * Index on a CLUSTERING_COLUMN column definition. + * Index on a CLUSTERING column definition. * * A cell indexed by this index will have the general form: * ck_0 ... ck_n c_name : v http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d7c608b/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java b/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java index 8e374d6..e8f8222 100644 --- a/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java +++ b/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java @@ -468,7 +468,7 @@ public final class LegacySchemaMigrator private static ColumnDefinition.Kind deserializeKind(String kind) { if ("clustering_key".equalsIgnoreCase(kind)) - return ColumnDefinition.Kind.CLUSTERING_COLUMN; + return ColumnDefinition.Kind.CLUSTERING; if ("compact_value".equalsIgnoreCase(kind)) return ColumnDefinition.Kind.REGULAR; return Enum.valueOf(ColumnDefinition.Kind.class, kind.toUpperCase()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d7c608b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java index d17b794..90755fb 100644 --- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java +++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java @@ -1097,8 +1097,8 @@ public final class SchemaKeyspace private static String serializeKind(ColumnDefinition.Kind kind, boolean isDense) { - // For backward compatibility, we special case CLUSTERING_COLUMN and the case where the table is dense. - if (kind == ColumnDefinition.Kind.CLUSTERING_COLUMN) + // For backward compatibility, we special case CLUSTERING and the case where the table is dense. + if (kind == ColumnDefinition.Kind.CLUSTERING) return "clustering_key"; if (kind == ColumnDefinition.Kind.REGULAR && isDense) @@ -1110,7 +1110,7 @@ public final class SchemaKeyspace public static ColumnDefinition.Kind deserializeKind(String kind) { if ("clustering_key".equalsIgnoreCase(kind)) - return ColumnDefinition.Kind.CLUSTERING_COLUMN; + return ColumnDefinition.Kind.CLUSTERING; if ("compact_value".equalsIgnoreCase(kind)) return ColumnDefinition.Kind.REGULAR; return Enum.valueOf(ColumnDefinition.Kind.class, kind.toUpperCase()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d7c608b/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java b/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java index c94681e..df76eb5 100644 --- a/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java +++ b/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java @@ -442,8 +442,8 @@ public class LegacySchemaMigratorTest private static String serializeKind(ColumnDefinition.Kind kind, boolean isDense) { - // For backward compatibility, we special case CLUSTERING_COLUMN and the case where the table is dense. - if (kind == ColumnDefinition.Kind.CLUSTERING_COLUMN) + // For backward compatibility, we special case CLUSTERING and the case where the table is dense. + if (kind == ColumnDefinition.Kind.CLUSTERING) return "clustering_key"; if (kind == ColumnDefinition.Kind.REGULAR && isDense)
