You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/08/03 15:45:20 UTC
[14/14] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk
* cassandra-3.9:
Fix RTE on mixed-version cluster due to CDC schema changes.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e21f726
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e21f726
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e21f726
Branch: refs/heads/trunk
Commit: 4e21f7267dc051fdd8214c67859e639ee5a9824f
Parents: 5cc0d15 b603720
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Aug 3 17:44:44 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Aug 3 17:44:44 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 5 +
NEWS.txt | 10 +-
.../cassandra/batchlog/BatchlogManager.java | 19 +-
.../batchlog/LegacyBatchlogMigrator.java | 9 +-
src/java/org/apache/cassandra/db/Mutation.java | 66 +++
.../apache/cassandra/db/RowUpdateBuilder.java | 400 ----------------
.../org/apache/cassandra/db/SimpleBuilders.java | 461 +++++++++++++++++++
.../org/apache/cassandra/db/SystemKeyspace.java | 11 +-
.../db/partitions/AbstractBTreePartition.java | 2 +-
.../db/partitions/PartitionUpdate.java | 154 +++++++
src/java/org/apache/cassandra/db/rows/Row.java | 99 ++++
src/java/org/apache/cassandra/db/rows/Rows.java | 16 +
.../apache/cassandra/db/transform/BaseRows.java | 3 +-
.../cassandra/schema/LegacySchemaMigrator.java | 12 +-
.../apache/cassandra/schema/SchemaKeyspace.java | 427 +++++++++--------
.../cassandra/service/MigrationManager.java | 8 +-
.../apache/cassandra/tracing/TraceKeyspace.java | 52 ++-
.../org/apache/cassandra/UpdateBuilder.java | 56 +--
test/unit/org/apache/cassandra/Util.java | 26 +-
.../apache/cassandra/batchlog/BatchTest.java | 17 +-
.../apache/cassandra/config/CFMetaDataTest.java | 2 +-
.../apache/cassandra/cql3/CDCStatementTest.java | 10 +
.../entities/RowUpdateBuilderTest.java | 79 ----
.../db/RecoveryManagerMissingHeaderTest.java | 4 +-
.../cassandra/db/RecoveryManagerTest.java | 8 +-
.../apache/cassandra/db/RowUpdateBuilder.java | 196 ++++++++
.../cassandra/db/compaction/TTLExpiryTest.java | 2 +-
.../db/partition/PartitionUpdateTest.java | 23 +-
.../org/apache/cassandra/hints/HintTest.java | 56 +--
.../hints/LegacyHintsMigratorTest.java | 3 +-
.../org/apache/cassandra/schema/DefsTest.java | 2 +-
.../schema/LegacySchemaMigratorTest.java | 111 ++---
.../cassandra/schema/SchemaKeyspaceTest.java | 6 +-
.../cassandra/service/DataResolverTest.java | 2 +-
.../streaming/StreamingTransferTest.java | 2 +-
35 files changed, 1452 insertions(+), 907 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e21f726/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6234687,62a6e6f..debdd74
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -53,7 -25,9 +53,12 @@@ Merged from 2.1
* cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
* Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
++<<<<<<< HEAD
++=======
+
++>>>>>>> cassandra-3.9
3.8
+ * RTE from new CDC column breaks in flight queries (CASSANDRA-12236)
* Fix hdr logging for single operation workloads (CASSANDRA-12145)
* Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
* Increase size of flushExecutor thread pool (CASSANDRA-12071)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e21f726/NEWS.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e21f726/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e21f726/src/java/org/apache/cassandra/db/partitions/AbstractBTreePartition.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e21f726/src/java/org/apache/cassandra/db/rows/Row.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e21f726/src/java/org/apache/cassandra/db/rows/Rows.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e21f726/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e21f726/test/unit/org/apache/cassandra/UpdateBuilder.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/UpdateBuilder.java
index 047baaa,19e48f2..9fcda15
--- a/test/unit/org/apache/cassandra/UpdateBuilder.java
+++ b/test/unit/org/apache/cassandra/UpdateBuilder.java
@@@ -21,8 -21,10 +21,9 @@@ import java.nio.ByteBuffer
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.db.*;
+ import org.apache.cassandra.db.rows.*;
import org.apache.cassandra.db.partitions.*;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.service.StorageService;
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e21f726/test/unit/org/apache/cassandra/Util.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e21f726/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e21f726/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java
----------------------------------------------------------------------