You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/06/27 04:54:15 UTC
[1/2] git commit: better exception message for attempt to add value
column to a where clause patch by jbellis reviewed by dbrosius for
cassandra-5700
Updated Branches:
refs/heads/trunk 168482bc1 -> 753dc9927
better exception message for attempt to add value column to a where clause
patch by jbellis reviewed by dbrosius for cassandra-5700
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9668535d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9668535d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9668535d
Branch: refs/heads/trunk
Commit: 9668535debed61e3c13d4b0305e2ac0d3e21c7c6
Parents: e4050e6
Author: Dave Brosius <db...@apache.org>
Authored: Wed Jun 26 22:50:09 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Wed Jun 26 22:50:09 2013 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9668535d/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 03f222b..5db58ad 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -945,7 +945,7 @@ public class SelectStatement implements CQLStatement
stmt.columnRestrictions[name.position] = updateRestriction(name, stmt.columnRestrictions[name.position], rel, names);
break;
case VALUE_ALIAS:
- throw new InvalidRequestException(String.format("Restricting the value of a compact CF (%s) is not supported", name.name));
+ throw new InvalidRequestException(String.format("Predicates on the non-primary-key column (%s) of a COMPACT table are not yet supported", name.name));
case COLUMN_METADATA:
stmt.metadataRestrictions.put(name, updateRestriction(name, stmt.metadataRestrictions.get(name), rel, names));
break;
[2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/753dc992
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/753dc992
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/753dc992
Branch: refs/heads/trunk
Commit: 753dc9927593824eaf5d589656a0b46a5cd54408
Parents: 168482b 9668535
Author: Dave Brosius <db...@apache.org>
Authored: Wed Jun 26 22:53:44 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Wed Jun 26 22:53:44 2013 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/753dc992/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------