You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/01/08 00:13:12 UTC
[1/2] cassandra git commit: ninja: fix column name in SELECT stmt
error message
Repository: cassandra
Updated Branches:
refs/heads/trunk 2b7522f66 -> 66348bbe5
ninja: fix column name in SELECT stmt error message
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6afab52b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6afab52b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6afab52b
Branch: refs/heads/trunk
Commit: 6afab52b27de4b5d8b377d4fb7d15012bc43527c
Parents: 96365bf
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Jan 7 17:11:01 2015 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Jan 7 17:11:01 2015 -0600
----------------------------------------------------------------------
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/6afab52b/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 4163315..96d91b9 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -1945,7 +1945,7 @@ public class SelectStatement implements CQLStatement
break;
}
throw new InvalidRequestException(String.format(
- "PRIMARY KEY column \"%s\" cannot be restricted (preceding column \"%s\" is either not restricted or by a non-EQ relation)", cdef.name, previous));
+ "PRIMARY KEY column \"%s\" cannot be restricted (preceding column \"%s\" is either not restricted or by a non-EQ relation)", cdef.name, previous.name));
}
}
else if (restriction.isSlice())
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66348bbe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66348bbe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66348bbe
Branch: refs/heads/trunk
Commit: 66348bbe5914581d53e0e76f7c64237d5a625615
Parents: 2b7522f 6afab52
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Jan 7 17:13:03 2015 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Jan 7 17:13:03 2015 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------