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 2014/05/29 00:43:41 UTC
[1/2] git commit: Ninja: add missing string format placeholder
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 7a284ae93 -> 01c5e346f
Ninja: add missing string format placeholder
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/50599d22
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50599d22
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50599d22
Branch: refs/heads/cassandra-2.1
Commit: 50599d225f4767a43a6f06974395148f31fab595
Parents: d31c29c
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed May 28 17:42:22 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed May 28 17:42:22 2014 -0500
----------------------------------------------------------------------
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/50599d22/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 a14782f..8f061d2 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -1574,7 +1574,7 @@ public class SelectStatement implements CQLStatement, MeasurableForPreparedCache
if (restriction == null)
restriction = new MultiColumnRestriction.Slice(onToken);
else if (!restriction.isMultiColumn())
- throw new InvalidRequestException(String.format("Column \"%s\" cannot have both tuple-notation inequalities and single-column inequalities", name, relation));
+ throw new InvalidRequestException(String.format("Column \"%s\" cannot have both tuple-notation inequalities and single-column inequalities: %s", name, relation));
restriction.setBound(relation.operator(), t);
stmt.columnRestrictions[name.position] = restriction;
}
[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by ty...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
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/01c5e346
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01c5e346
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01c5e346
Branch: refs/heads/cassandra-2.1
Commit: 01c5e346fb20814b554ace3ac331138b5780daaf
Parents: 7a284ae 50599d2
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed May 28 17:43:29 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed May 28 17:43:29 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------