Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 38EC0187E8 for ; Mon, 10 Aug 2015 13:14:13 +0000 (UTC) Received: (qmail 84811 invoked by uid 500); 10 Aug 2015 13:14:06 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 84779 invoked by uid 500); 10 Aug 2015 13:14:06 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 84758 invoked by uid 99); 10 Aug 2015 13:14:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Aug 2015 13:14:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A24D5E0501; Mon, 10 Aug 2015 13:14:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blerer@apache.org To: commits@cassandra.apache.org Date: Mon, 10 Aug 2015 13:14:06 -0000 Message-Id: <8577ea97ae774965a71d30c38328b3af@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Mon Aug 10 15:09:03 2015 +0200 Committer: blerer 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()));