Merge branch 'cassandra-3.8' into cassandra-3.9 * cassandra-3.8: Fix RTE on mixed-version cluster due to CDC schema changes. c* uses commons-lang3, not commons-lang Update build.xml and CHANGES.txt for 3.8
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b603720e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b603720e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b603720e Branch: refs/heads/trunk Commit: b603720e4e0e9a9ed5f077e3a0f8819ef2d11441 Parents: 1323ad0 2683806 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Aug 3 17:42:06 2016 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Aug 3 17:42:06 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 10 +- build.xml | 2 +- .../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 +- .../cassandra/db/commitlog/CommitLogReader.java | 2 +- .../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 +- 37 files changed, 1450 insertions(+), 909 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b603720e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0d79a9f,388a290..62a6e6f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,32 -1,5 +1,33 @@@ +3.9 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189) + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109) +Merged from 3.0: + * Fix upgrade of super columns on thrift (CASSANDRA-12335) + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359) + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277) + * Exception when computing read-repair for range tombstones (CASSANDRA-12263) + * Lost counter writes in compact table and static columns (CASSANDRA-12219) + * AssertionError with MVs on updating a row that isn't indexed due to a null value (CASSANDRA-12247) + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980) + * Add option to override compaction space check (CASSANDRA-12180) + * Faster startup by only scanning each directory for temporary files once (CASSANDRA-12114) + * Respond with v1/v2 protocol header when responding to driver that attempts + to connect with too low of a protocol version (CASSANDRA-11464) + * NullPointerExpception when reading/compacting table (CASSANDRA-11988) + * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144) +Merged from 2.2: + * Wait for tracing events before returning response and query at same consistency level client side (CASSANDRA-11465) + * cqlsh copyutil should get host metadata by connected address (CASSANDRA-11979) + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214) +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) + + 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/b603720e/src/java/org/apache/cassandra/db/partitions/AbstractBTreePartition.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b603720e/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b603720e/src/java/org/apache/cassandra/db/rows/Row.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b603720e/src/java/org/apache/cassandra/db/transform/BaseRows.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b603720e/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b603720e/test/unit/org/apache/cassandra/Util.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b603720e/test/unit/org/apache/cassandra/service/DataResolverTest.java ----------------------------------------------------------------------