Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee0f495f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee0f495f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee0f495f Branch: refs/heads/trunk Commit: ee0f495f52e9a26d0795ff1117a54949496878e1 Parents: 7edd0e0 df06344 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Jun 18 17:59:52 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Jun 18 17:59:52 2013 +0300 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/statements/UpdateStatement.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee0f495f/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java index cff4105,5f37e15..3cb58ea --- a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java @@@ -84,13 -244,12 +84,12 @@@ public class UpdateStatement extends Mo } else { - // compact means we don't have a row marker, so don't accept to set only the PK (Note: we - // could accept it and use an empty value!?) + // compact means we don't have a row marker, so don't accept to set only the PK. See CASSANDRA-5648. - if (processedColumns.isEmpty()) + if (updates.isEmpty()) - throw new InvalidRequestException(String.format("Missing mandatory column %s", cfDef.value)); + throw new InvalidRequestException(String.format("Column %s is mandatory for this COMPACT STORAGE table", cfDef.value)); - for (Operation op : processedColumns) - op.execute(key, cf, builder.copy(), params); + for (Operation update : updates) + update.execute(key, cf, builder.copy(), params); } } else