Updated Branches: refs/heads/trunk 7918718c8 -> 144ee9a21
Fixups for CFDefinition removal refactoring patch by dbrosius; reviewed by slebresne for CASSANDRA-6253 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/144ee9a2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/144ee9a2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/144ee9a2 Branch: refs/heads/trunk Commit: 144ee9a2164c445f3d08d590ab99de5d8b059796 Parents: 7918718 Author: Sylvain Lebresne <[email protected]> Authored: Fri Nov 1 10:51:16 2013 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Nov 1 10:52:27 2013 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/CFMetaData.java | 4 +--- src/java/org/apache/cassandra/cql/AlterTableStatement.java | 6 +++--- src/java/org/apache/cassandra/cql/QueryProcessor.java | 2 +- .../org/apache/cassandra/cql3/statements/SelectStatement.java | 2 +- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 3 ++- src/java/org/apache/cassandra/db/index/SecondaryIndex.java | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/144ee9a2/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 e2bd3eb..567b807 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -1270,7 +1270,7 @@ public final class CFMetaData toCompare = components[def.position()]; } - if (def.name.equals(toCompare)) + if (def.name.bytes.equals(toCompare)) return def; } return null; @@ -1281,8 +1281,6 @@ public final class CFMetaData } } - - public ColumnDefinition getColumnDefinitionForIndex(String indexName) { for (ColumnDefinition def : allColumns()) http://git-wip-us.apache.org/repos/asf/cassandra/blob/144ee9a2/src/java/org/apache/cassandra/cql/AlterTableStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql/AlterTableStatement.java b/src/java/org/apache/cassandra/cql/AlterTableStatement.java index 74c6593..479f830 100644 --- a/src/java/org/apache/cassandra/cql/AlterTableStatement.java +++ b/src/java/org/apache/cassandra/cql/AlterTableStatement.java @@ -80,7 +80,7 @@ public class AlterTableStatement case ALTER: // We only look for the first key alias which is ok for CQL2 ColumnDefinition partionKeyDef = cfm.partitionKeyColumns().get(0); - if (partionKeyDef.name.equals(columnName)) + if (partionKeyDef.name.bytes.equals(columnName)) { cfm.keyValidator(TypeParser.parse(validator)); } @@ -90,7 +90,7 @@ public class AlterTableStatement for (ColumnDefinition columnDef : cfm.regularColumns()) { - if (columnDef.name.equals(columnName)) + if (columnDef.name.bytes.equals(columnName)) { toUpdate = columnDef; break; @@ -111,7 +111,7 @@ public class AlterTableStatement for (ColumnDefinition columnDef : cfm.regularColumns()) { - if (columnDef.name.equals(columnName)) + if (columnDef.name.bytes.equals(columnName)) { toDelete = columnDef; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/144ee9a2/src/java/org/apache/cassandra/cql/QueryProcessor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql/QueryProcessor.java b/src/java/org/apache/cassandra/cql/QueryProcessor.java index b15dc82..87f603e 100644 --- a/src/java/org/apache/cassandra/cql/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql/QueryProcessor.java @@ -678,7 +678,7 @@ public class QueryProcessor CFMetaData cfm = oldCfm.clone(); for (ColumnDefinition cd : cfm.regularColumns()) { - if (cd.name.equals(columnName)) + if (cd.name.bytes.equals(columnName)) { if (cd.getIndexType() != null) throw new InvalidRequestException("Index already exists"); http://git-wip-us.apache.org/repos/asf/cassandra/blob/144ee9a2/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 8cec64e..c88534b 100644 --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@ -1122,7 +1122,7 @@ public class SelectStatement implements CQLStatement throw new InvalidRequestException(String.format("Predicates on the non-primary-key column (%s) of a COMPACT table are not yet supported", def.name)); case REGULAR: // We only all IN on the row key and last clustering key so far, never on non-PK columns, and this even if there's an index - Restriction r = updateRestriction(def, stmt.metadataRestrictions.get(def), rel, names); + Restriction r = updateRestriction(def, stmt.metadataRestrictions.get(def.name), rel, names); if (r.isIN() && !((Restriction.IN)r).canHaveOnlyOneValue()) // Note: for backward compatibility reason, we conside a IN of 1 value the same as a EQ, so we let that slide. throw new InvalidRequestException(String.format("IN predicates on non-primary-key columns (%s) is not yet supported", def.name)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/144ee9a2/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index c8d31d1..73704d4 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -916,7 +916,8 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean // 2. if it has been re-added since then, this particular column was inserted before the last drop private static boolean isDroppedColumn(Column c, CFMetaData meta) { - Long droppedAt = meta.getDroppedColumns().get(((CompositeType) meta.comparator).extractLastComponent(c.name())); + ByteBuffer cql3ColumnName = ((CompositeType) meta.comparator).extractLastComponent(c.name()); + Long droppedAt = meta.getDroppedColumns().get(meta.getColumnDefinition(cql3ColumnName).name); return droppedAt != null && c.timestamp() <= droppedAt; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/144ee9a2/src/java/org/apache/cassandra/db/index/SecondaryIndex.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndex.java b/src/java/org/apache/cassandra/db/index/SecondaryIndex.java index 7a822dc..43ecb61 100644 --- a/src/java/org/apache/cassandra/db/index/SecondaryIndex.java +++ b/src/java/org/apache/cassandra/db/index/SecondaryIndex.java @@ -255,7 +255,7 @@ public abstract class SecondaryIndex Iterator<ColumnDefinition> it = columnDefs.iterator(); while (it.hasNext()) { - if (it.next().name.equals(name)) + if (it.next().name.bytes.equals(name)) it.remove(); } }
