cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [06/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Tue, 16 Jun 2015 14:31:15 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/ResultSet.java


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

Branch: refs/heads/cassandra-2.1
Commit: 83944f82b8897d4cd1613d046028b296474e2cd7
Parents: c1702b0 80d46b8
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Tue Jun 16 15:20:11 2015 +0100
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Tue Jun 16 15:20:11 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/83944f82/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 928eb55,7f507c2..022d868
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,44 -1,6 +1,49 @@@
 -2.0.16:
++2.1.7
++Merged from 2.0
+  * Set HAS_MORE_PAGES flag to false when PagingState is null (CASSANDRA-9571)
 - * Backport indexed value validation fix from CASSANDRA-9057 (CASSANDRA-9564)
++
++
 +2.1.6
 + * (cqlsh) Fix using COPY through SOURCE or -f (CASSANDRA-9083)
 + * Fix occasional lack of `system` keyspace in schema tables (CASSANDRA-8487)
 + * Use ProtocolError code instead of ServerError code for native protocol
 +   error responses to unsupported protocol versions (CASSANDRA-9451)
 + * Default commitlog_sync_batch_window_in_ms changed to 2ms (CASSANDRA-9504)
 + * Fix empty partition assertion in unsorted sstable writing tools (CASSANDRA-9071)
 + * Ensure truncate without snapshot cannot produce corrupt responses (CASSANDRA-9388) 
 + * Consistent error message when a table mixes counter and non-counter
 +   columns (CASSANDRA-9492)
 + * Avoid getting unreadable keys during anticompaction (CASSANDRA-9508)
 + * (cqlsh) Better float precision by default (CASSANDRA-9224)
 + * Improve estimated row count (CASSANDRA-9107)
 + * Optimize range tombstone memory footprint (CASSANDRA-8603)
 + * Use configured gcgs in anticompaction (CASSANDRA-9397)
 + * Warn on misuse of unlogged batches (CASSANDRA-9282)
 + * Failure detector detects and ignores local pauses (CASSANDRA-9183)
 + * Add utility class to support for rate limiting a given log statement (CASSANDRA-9029)
 + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361)
 + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339)
 + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564)
 + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i (CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles (CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 + * Repair waits for anticompaction to finish (CASSANDRA-9097)
 + * Fix streaming not holding ref when stream error (CASSANDRA-9295)
 + * Fix canonical view returning early opened SSTables (CASSANDRA-9396)
 +Merged from 2.0:
   * Don't accumulate more range than necessary in RangeTombstone.Tracker (CASSANDRA-9486)
   * Add broadcast and rpc addresses to system.local (CASSANDRA-9436)
   * Always mark sstable suspect when corrupted (CASSANDRA-9478)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83944f82/src/java/org/apache/cassandra/cql3/ResultSet.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/ResultSet.java
index e463b29,659ed50..4ff513b
--- a/src/java/org/apache/cassandra/cql3/ResultSet.java
+++ b/src/java/org/apache/cassandra/cql3/ResultSet.java
@@@ -300,13 -281,14 +300,13 @@@ public class ResultSe
              return true;
          }
  
 -        public Metadata setHasMorePages(PagingState pagingState)
 +        public void setHasMorePages(PagingState pagingState)
          {
-             if (pagingState == null)
-                 return;
- 
-             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;
          }
  
          public void setSkipMetadata()


Mime
View raw message