cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [01/10] cassandra git commit: Unset HAS_MORE_PAGES flag if PagingState is null
Date Tue, 16 Jun 2015 14:31:10 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 9e60611fb -> 80d46b8ac
  refs/heads/cassandra-2.1 c1702b0b3 -> 83944f82b
  refs/heads/cassandra-2.2 17d43fa55 -> 1fbdba2c4
  refs/heads/trunk 81858ebcb -> be6cb9d97


Unset HAS_MORE_PAGES flag if PagingState is null

patch by Berenguer Blasi and Sam Tunnicliffe; reviewed by Aleksey
Yeschenko for CASSANDRA-7787


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/80d46b8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/80d46b8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/80d46b8a

Branch: refs/heads/cassandra-2.0
Commit: 80d46b8acc417978fd8c43862c3352a6381fbf2e
Parents: 9e60611
Author: Berenguer Blasi <bblasi@jblasi.com>
Authored: Tue Jun 9 18:21:14 2015 +0100
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Tue Jun 16 15:16:28 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                       | 1 +
 src/java/org/apache/cassandra/cql3/ResultSet.java | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/80d46b8a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f2693a4..7f507c2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.16:
+ * Set HAS_MORE_PAGES flag to false when PagingState is null (CASSANDRA-9571)
  * Backport indexed value validation fix from CASSANDRA-9057 (CASSANDRA-9564)
  * Don't accumulate more range than necessary in RangeTombstone.Tracker (CASSANDRA-9486)
  * Add broadcast and rpc addresses to system.local (CASSANDRA-9436)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/80d46b8a/src/java/org/apache/cassandra/cql3/ResultSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/ResultSet.java b/src/java/org/apache/cassandra/cql3/ResultSet.java
index 4cda0cd..659ed50 100644
--- a/src/java/org/apache/cassandra/cql3/ResultSet.java
+++ b/src/java/org/apache/cassandra/cql3/ResultSet.java
@@ -283,11 +283,11 @@ public class ResultSet
 
         public Metadata setHasMorePages(PagingState pagingState)
         {
-            if (pagingState == null)
-                return this;
-
-            flags.add(Flag.HAS_MORE_PAGES);
             this.pagingState = pagingState;
+            if (pagingState == null)
+                flags.remove(Flag.HAS_MORE_PAGES);
+            else
+                flags.add(Flag.HAS_MORE_PAGES);
             return this;
         }
 


Mime
View raw message