re-allow indexing empty column values

patch by yukim; reviewed by jbellis for CASSANDRA-4031
apache · Mar 20, 2012 · 050e61a · 050e61a
1 parent c5aa781
commit 050e61a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/java/org/apache/cassandra/cql/UpdateStatement.java b/src/java/org/apache/cassandra/cql/UpdateStatement.java
@@ -36,6 +36,7 @@
 import org.apache.cassandra.thrift.InvalidRequestException;
 
 import static org.apache.cassandra.cql.QueryProcessor.validateColumn;
+import static org.apache.cassandra.cql.QueryProcessor.validateKey;
 
 import static org.apache.cassandra.thrift.ThriftValidation.validateColumnFamily;
 import static org.apache.cassandra.thrift.ThriftValidation.validateCommutativeForWrite;
@@ -185,6 +186,7 @@ public List<IMutation> prepareRowMutations(String keyspace, ClientState clientSt
     private IMutation mutationForKey(String keyspace, ByteBuffer key, CFMetaData metadata, Long timestamp, ClientState clientState, List<ByteBuffer> variables)
     throws InvalidRequestException
     {
+        validateKey(key);
         AbstractType<?> comparator = getComparator(keyspace);
 
         // if true we need to wrap RowMutation into CounterMutation

diff --git a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
@@ -32,6 +32,7 @@
 import org.apache.cassandra.utils.ByteBufferUtil;
 
 import static org.apache.cassandra.cql.QueryProcessor.validateColumnName;
+import static org.apache.cassandra.cql.QueryProcessor.validateKey;
 
 import static org.apache.cassandra.thrift.ThriftValidation.validateColumnFamily;
 import static org.apache.cassandra.thrift.ThriftValidation.validateCommutativeForWrite;
@@ -148,6 +149,7 @@ else if (firstEmpty != null)
     private IMutation mutationForKey(CFDefinition cfDef, ClientState clientState, ByteBuffer key, ColumnNameBuilder builder, List<ByteBuffer> variables)
     throws InvalidRequestException
     {
+        validateKey(key);
         // if true we need to wrap RowMutation into CounterMutation
         boolean hasCounterColumn = false;
         RowMutation rm = new RowMutation(cfDef.cfm.ksName, key);

diff --git a/src/java/org/apache/cassandra/db/DecoratedKey.java b/src/java/org/apache/cassandra/db/DecoratedKey.java
@@ -52,7 +52,7 @@ public int compare(DecoratedKey o1, DecoratedKey o2)
 
     public DecoratedKey(T token, ByteBuffer key)
     {
-        assert token != null && key != null && key.remaining() > 0;
+        assert token != null && key != null;
         this.token = token;
         this.key = key;
     }