cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Date Mon, 15 Jul 2013 22:44:56 GMT
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/e4ebd5ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4ebd5ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4ebd5ff

Branch: refs/heads/trunk
Commit: e4ebd5ff59aa63bcf8ea9e457d8048367d16ea8c
Parents: 3f87907 b2daab7
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Jul 15 17:44:46 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Jul 15 17:44:46 2013 -0500

----------------------------------------------------------------------
 .../hadoop/cql3/CqlPagingRecordReader.java      | 49 +++++++++-----------
 1 file changed, 23 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4ebd5ff/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
index 5b9de9b,a900261..c0a6832
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
@@@ -486,10 -483,10 +483,10 @@@ public class CqlPagingRecordReader exte
              // query token(k) = token(pre_partition_key) and m = pre_cluster_key_m and n
> pre_cluster_key_n
              Pair<Integer, String> clause = whereClause(clusterColumns, 0);
              return Pair.create(clause.left,
-                                " WHERE token(" + partitionKeyString + ") = token(" + partitionKeyMarkers
+ ") " + clause.right);
+                                String.format(" WHERE token(%s) = token(%s) %s", partitionKeyString,
partitionKeyMarkers, clause.right));
          }
  
 -        /** recursively compose the where clause */
 +        /** recursively serialize the where clause */
          private Pair<Integer, String> whereClause(List<BoundColumn> column,
int position)
          {
              if (position == column.size() - 1 || column.get(position + 1).value == null)


Mime
View raw message