Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1fbdba2c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fbdba2c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1fbdba2c
Branch: refs/heads/trunk
Commit: 1fbdba2c4d7129eded4b57eac88566f10929a794
Parents: 17d43fa 83944f8
Author: Sam Tunnicliffe <s...@beobal.com>
Authored: Tue Jun 16 15:25:57 2015 +0100
Committer: Sam Tunnicliffe <s...@beobal.com>
Committed: Tue Jun 16 15:25:57 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
src/java/org/apache/cassandra/cql3/ResultSet.java | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fbdba2c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ba8ef12,022d868..221a46c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,9 +1,35 @@@
-2.1.7
-Merged from 2.0
+2.2
+ * Fix connection leak in CqlRecordWriter (CASSANDRA-9576)
+ * Mlockall before opening system sstables & remove boot_without_jna option
(CASSANDRA-9573)
+ * Add functions to convert timeuuid to date or time, deprecate dateOf and
unixTimestampOf (CASSANDRA-9229)
+ * Make sure we cancel non-compacting sstables from LifecycleTransaction
(CASSANDRA-9566)
+ * Fix deprecated repair JMX API (CASSANDRA-9570)
-
++Merged from 2.0:
+ * Set HAS_MORE_PAGES flag to false when PagingState is null (CASSANDRA-9571)
-
-2.1.6
+2.2.0-rc1
+ * Compressed commit log should measure compressed space used (CASSANDRA-9095)
+ * Fix comparison bug in CassandraRoleManager#collectRoles (CASSANDRA-9551)
+ * Add tinyint,smallint,time,date support for UDFs (CASSANDRA-9400)
+ * Deprecates SSTableSimpleWriter and SSTableSimpleUnsortedWriter
(CASSANDRA-9546)
+ * Empty INITCOND treated as null in aggregate (CASSANDRA-9457)
+ * Remove use of Cell in Thrift MapReduce classes (CASSANDRA-8609)
+ * Integrate pre-release Java Driver 2.2-rc1, custom build (CASSANDRA-9493)
+ * Clean up gossiper logic for old versions (CASSANDRA-9370)
+ * Fix custom payload coding/decoding to match the spec (CASSANDRA-9515)
+ * ant test-all results incomplete when parsed (CASSANDRA-9463)
+ * Disallow frozen<> types in function arguments and return types for
+ clarity (CASSANDRA-9411)
+ * Static Analysis to warn on unsafe use of Autocloseable instances
(CASSANDRA-9431)
+ * Update commitlog archiving examples now that commitlog segments are
+ not recycled (CASSANDRA-9350)
+ * Extend Transactional API to sstable lifecycle management (CASSANDRA-8568)
+ * (cqlsh) Add support for native protocol 4 (CASSANDRA-9399)
+ * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409)
+ * Revert CASSANDRA-7807 (tracing completion client notifications)
(CASSANDRA-9429)
+ * Add ability to stop compaction by ID (CASSANDRA-7207)
+ * Let CassandraVersion handle SNAPSHOT version (CASSANDRA-9438)
+Merged from 2.1:
* (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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fbdba2c/src/java/org/apache/cassandra/cql3/ResultSet.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/ResultSet.java
index 9698791,4ff513b..281923c
--- a/src/java/org/apache/cassandra/cql3/ResultSet.java
+++ b/src/java/org/apache/cassandra/cql3/ResultSet.java
@@@ -267,13 -282,31 +267,13 @@@ public class ResultSe
names.add(name);
}
- private boolean allInSameCF()
- {
- if (names == null)
- return false;
-
- assert !names.isEmpty();
-
- Iterator<ColumnSpecification> iter = names.iterator();
- ColumnSpecification first = iter.next();
- while (iter.hasNext())
- {
- ColumnSpecification name = iter.next();
- if (!name.ksName.equals(first.ksName) ||
!name.cfName.equals(first.cfName))
- return false;
- }
- return true;
- }
-
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);
}
public void setSkipMetadata()
