You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2015/08/10 15:14:06 UTC
[1/2] cassandra git commit: Fix Select * is only returning the first
page of data
Repository: cassandra
Updated Branches:
refs/heads/trunk 41c83e420 -> 402a12f96
Fix Select * is only returning the first page of data
patch by Benjamin Lerer; reviewed by Stefania Alborghetti for CASSANDRA-9913
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e98be186
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e98be186
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e98be186
Branch: refs/heads/trunk
Commit: e98be186d1e39c45aa34e6ea995f0bf718b99015
Parents: 6e1e336
Author: blerer <be...@datastax.com>
Authored: Mon Aug 10 15:09:03 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Mon Aug 10 15:09:03 2015 +0200
----------------------------------------------------------------------
.../cassandra/cql3/restrictions/StatementRestrictions.java | 4 +++-
.../org/apache/cassandra/cql3/statements/SelectStatement.java | 7 ++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e98be186/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java b/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
index 2bcd1f2..1a3b083 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
@@ -513,8 +513,10 @@ public final class StatementRestrictions
*/
public boolean isColumnRange()
{
+ // For static compact tables we need to ignore the fake clustering column.
+ int numberOfClusteringColumns = cfm.isStaticCompactTable() ? 0 : cfm.clusteringColumns().size();
// it is a range query if it has at least one the column alias for which no relation is defined or is not EQ.
- return clusteringColumnsRestrictions.size() < cfm.clusteringColumns().size()
+ return clusteringColumnsRestrictions.size() < numberOfClusteringColumns
|| (!clusteringColumnsRestrictions.isEQ() && !clusteringColumnsRestrictions.isIN());
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e98be186/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 9ac76d6..d08c56f 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -337,7 +337,12 @@ public class SelectStatement implements CQLStatement
try (PartitionIterator iter = pager.fetchPage(pageSize))
{
while (iter.hasNext())
- processPartition(iter.next(), options, result, nowInSec);
+ {
+ try (RowIterator partition = iter.next())
+ {
+ processPartition(partition, options, result, nowInSec);
+ }
+ }
}
}
return new ResultMessage.Rows(result.build(options.getProtocolVersion()));
[2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk
Posted by bl...@apache.org.
Merge branch cassandra-3.0 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/402a12f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/402a12f9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/402a12f9
Branch: refs/heads/trunk
Commit: 402a12f96b4aa6d120f6a6feebd4913b6ab6460f
Parents: 41c83e4 e98be18
Author: blerer <be...@datastax.com>
Authored: Mon Aug 10 15:13:07 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Mon Aug 10 15:13:17 2015 +0200
----------------------------------------------------------------------
.../cassandra/cql3/restrictions/StatementRestrictions.java | 4 +++-
.../org/apache/cassandra/cql3/statements/SelectStatement.java | 7 ++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------