[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23cba991 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23cba991 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23cba991 Branch: refs/heads/trunk Commit: 23cba991ca0d1aafd7d3fb34156d9910d27c8c88 Parents: 48a48c7 7b1454f Author: Jay Zhuang Authored: Sun Dec 30 22:28:40 2018 -0800 Committer: Jay Zhuang Committed: Sun Dec 30 22:29:14 2018 -0800 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/23cba991/CHANGES.txt -- diff --cc CHANGES.txt index 3d41d83,64e989b..96a54d4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -35,29 -34,10 +36,28 @@@ Merged from 3.0 * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377) -3.0.17 +3.11.3 + * Validate supported column type with SASI analyzer (CASSANDRA-13669) + * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929) + * Reduce nodetool GC thread count (CASSANDRA-14475) + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055) + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416) + * Update metrics to 3.1.5 (CASSANDRA-12924) + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793) + * Don't use guava collections in the non-system keyspace jmx attributes (CASSANDRA-12271) + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851) + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299) + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370) + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891) + * Serialize empty buffer as empty string for json output format (CASSANDRA-14245) + * Allow logging implementation to be interchanged for embedded testing (CASSANDRA-13396) + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247) + * Fix Loss of digits when doing CAST from varint/bigint to decimal (CASSANDRA-14170) + * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163) + * Fix wildcard GROUP BY queries (CASSANDRA-14209) +Merged from 3.0: - * Don't enable client transports when bootstrap is pending (CASSANDRA-14525) * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages (CASSANDRA-14568) * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167) - * Restore resumable hints delivery, backport CASSANDRA-11960 (CASSANDRA-14419) * Always close RT markers returned by ReadCommand#executeLocally() (CASSANDRA-14515) * Reverse order queries with range tombstones can cause data loss (CASSANDRA-14513) * Fix regression of lagging commitlog flush log message (CASSANDRA-14451) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/48a48c7f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48a48c7f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48a48c7f Branch: refs/heads/trunk Commit: 48a48c7fcd06213c77a9490f0d2c8b32baa2b1e4 Parents: 08363af e2ee204 Author: Jay Zhuang Authored: Sun Dec 30 21:53:05 2018 -0800 Committer: Jay Zhuang Committed: Sun Dec 30 21:54:56 2018 -0800 -- CHANGES.txt | 1 + .../cassandra/service/CassandraDaemon.java | 47 ++ .../cassandra/service/StorageService.java | 66 +--- .../cassandra/service/StorageServiceMBean.java | 7 +++ .../org/apache/cassandra/tools/NodeProbe.java | 5 ++ .../apache/cassandra/tools/nodetool/Join.java | 1 + 6 files changed, 117 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/48a48c7f/CHANGES.txt -- diff --cc CHANGES.txt index 0d97d3c,d29cdc1..3d41d83 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -35,28 -33,10 +35,29 @@@ Merged from 3.0 * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377) -3.0.17 +3.11.3 + * Validate supported column type with SASI analyzer (CASSANDRA-13669) + * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929) + * Reduce nodetool GC thread count (CASSANDRA-14475) + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055) + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416) + * Update metrics to 3.1.5 (CASSANDRA-12924) + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793) + * Don't use guava collections in the non-system keyspace jmx attributes (CASSANDRA-12271) + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851) + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299) + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370) + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891) + * Serialize empty buffer as empty string for json output format (CASSANDRA-14245) + * Allow logging implementation to be interchanged for embedded testing (CASSANDRA-13396) + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247) + * Fix Loss of digits when doing CAST from varint/bigint to decimal (CASSANDRA-14170) + * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163) + * Fix wildcard GROUP BY queries (CASSANDRA-14209) +Merged from 3.0: ++ * Don't enable client transports when bootstrap is pending (CASSANDRA-14525) * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages (CASSANDRA-14568) * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167) - * Restore resumable hints delivery, backport CASSANDRA-11960 (CASSANDRA-14419) * Always close RT markers returned by ReadCommand#executeLocally() (CASSANDRA-14515) * Reverse order queries with range tombstones can cause data loss (CASSANDRA-14513) * Fix regression of lagging commitlog flush log message (CASSANDRA-14451) http://git-wip-us.apache.org/repos/asf/cassandra/blob/48a48c7f/src/java/org/apache/cassandra/service/CassandraDaemon.java -- diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java index d9bd5c3,6869d2c..fbafd35 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@@ -642,13 -633,31 +666,36 @@@ public class CassandraDaemo } } +public void applyConfig() +{ +DatabaseDescriptor.daemonInitialization(); +} + public void startNativeTransport() { + // We only start transports if bootstrap has completed and we're not in survey mode, OR if we are in + // survey mode and streaming has completed but we're not using auth. + // OR if we have not joined the ring yet. + if (StorageService.instance.hasJoined()) + { + if (StorageService.instance.isSurveyMode()) + { + if (StorageService.instance.isBootstrapMode() || DatabaseDescriptor.getAuthenticator().requireAuthentication()) + { + throw new IllegalStateException("Not starting client transports in write_survey mode as it's bootstrapping or " + + "auth is enabled"); + } + } + else + { + if (!SystemKeyspace.bootstrapComplete()) +
[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b022b8b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b022b8b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b022b8b Branch: refs/heads/trunk Commit: 9b022b8b55ae85c2ddf5fab64707428126d190e6 Parents: 620f37c 58e6c55 Author: Mick Semb WeverAuthored: Mon Mar 12 19:22:20 2018 +1100 Committer: Mick Semb Wever Committed: Mon Mar 12 19:25:35 2018 +1100 -- CHANGES.txt | 1 + NEWS.txt| 2 + .../apache/cassandra/db/ColumnFamilyStore.java | 4 +- .../io/sstable/format/SSTableReader.java| 97 ++-- .../cassandra/io/sstable/SSTableReaderTest.java | 91 +- 5 files changed, 161 insertions(+), 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b022b8b/CHANGES.txt -- diff --cc CHANGES.txt index 0e9ef6d,1d1a07a..6fd9c15 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ -3.0.17 +3.11.3 + * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163) + * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163) + * Fix wildcard GROUP BY queries (CASSANDRA-14209) +Merged from 3.0: * Fix NPE when performing comparison against a null frozen in LWT (CASSANDRA-14087) * Log when SSTables are deleted (CASSANDRA-14302) * Fix batch commitlog sync regression (CASSANDRA-14292) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b022b8b/NEWS.txt -- diff --cc NEWS.txt index 745dad2,c06030e..9af8439 --- a/NEWS.txt +++ b/NEWS.txt @@@ -47,11 -47,14 +47,13 @@@ using the provided 'sstableupgrade' too Upgrading - -- Materialized view users upgrading from 3.0.15 or later that have performed range movements (join, decommission, move, etc), - should run repair on the base tables, and subsequently on the views to ensure data affected by CASSANDRA-14251 is correctly - propagated to all replicas. +- Materialized view users upgrading from 3.0.15 (3.0.X series) or 3.11.1 (3.11.X series) and later that have performed range movements (join, decommission, move, etc), + should run repair on the base tables, and subsequently on the views to ensure data affected by CASSANDRA-14251 is correctly propagated to all replicas. + - Changes to bloom_filter_fp_chance will no longer take effect on existing sstables when the node is restarted. Only - compactions/upgradesstables regenerates bloom filters and Summaries sstable components. See CASSANDRA-11163 ++ compactions/upgradesstables regenerates bloom filters and Summaries sstable components. See CASSANDRA-11163 -3.0.16 -= +3.11.2 +== Upgrading - http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b022b8b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b022b8b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index d3dd2d3,c66fd8c..7d7fbf1 --- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java @@@ -759,34 -748,26 +774,36 @@@ public abstract class SSTableReader ext */ private void load(boolean recreateBloomFilter, boolean saveSummaryIfCreated) throws IOException { -try(SegmentedFile.Builder ibuilder = SegmentedFile.getBuilder(DatabaseDescriptor.getIndexAccessMode(), false); -SegmentedFile.Builder dbuilder = SegmentedFile.getBuilder(DatabaseDescriptor.getDiskAccessMode(), compression)) +try(FileHandle.Builder ibuilder = new FileHandle.Builder(descriptor.filenameFor(Component.PRIMARY_INDEX)) + .mmapped(DatabaseDescriptor.getIndexAccessMode() == Config.DiskAccessMode.mmap) + .withChunkCache(ChunkCache.instance); +FileHandle.Builder dbuilder = new FileHandle.Builder(descriptor.filenameFor(Component.DATA)).compressed(compression) + .mmapped(DatabaseDescriptor.getDiskAccessMode() == Config.DiskAccessMode.mmap) +
[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/30c35dd8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30c35dd8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30c35dd8 Branch: refs/heads/trunk Commit: 30c35dd8a4715703aade64e382d58f3db445c88a Parents: 8a5e88f 890f319 Author: Jason BrownAuthored: Tue Feb 13 15:02:21 2018 -0800 Committer: Jason Brown Committed: Tue Feb 13 15:07:48 2018 -0800 -- .../unit/org/apache/cassandra/cql3/ViewComplexTest.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/30c35dd8/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java -- - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43aa79d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43aa79d3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43aa79d3 Branch: refs/heads/trunk Commit: 43aa79d3cd96087dd8aa07592a7d0e87a1bd6824 Parents: 9d649d6 40148a1 Author: Dave BrosiusAuthored: Thu Feb 8 17:50:48 2018 -0500 Committer: Dave Brosius Committed: Thu Feb 8 17:50:48 2018 -0500 -- test/unit/org/apache/cassandra/cql3/ViewComplexTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/43aa79d3/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java -- - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[3/4] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11
Merge branch cassandra-3.0 into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d3882895 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3882895 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3882895 Branch: refs/heads/trunk Commit: d38828953397fdae686c59561c5b48799d3d504f Parents: e63c7a0 5f66d48 Author: Benjamin LererAuthored: Wed Jan 18 16:00:11 2017 +0100 Committer: Benjamin Lerer Committed: Wed Jan 18 16:07:14 2017 +0100 -- CHANGES.txt | 1 + NEWS.txt| 26 ++-- doc/cql3/CQL.textile| 14 +- doc/source/cql/changes.rst | 6 + doc/source/cql/ddl.rst | 52 +-- doc/source/cql/types.rst| 5 +- pylib/cqlshlib/cql3handling.py | 6 +- .../org/apache/cassandra/config/CFMetaData.java | 29 +--- .../apache/cassandra/cql3/QueryProcessor.java | 2 +- .../cql3/statements/AlterTableStatement.java| 86 +-- .../cql3/statements/AlterTypeStatement.java | 36 + .../apache/cassandra/cql3/ViewSchemaTest.java | 76 -- .../entities/FrozenCollectionsTest.java | 42 -- .../cql3/validation/entities/TypeTest.java | 32 - .../cql3/validation/entities/UserTypesTest.java | 1 - .../cql3/validation/operations/AlterTest.java | 144 +-- .../cql3/validation/operations/UpdateTest.java | 32 - 17 files changed, 44 insertions(+), 546 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3882895/CHANGES.txt -- diff --cc CHANGES.txt index 9c0b51b,5a63213..453445a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,118 -1,9 +1,119 @@@ -3.0.11 +3.10 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058) + * Fixed query monitoring for range queries (CASSANDRA-13050) + * Remove outboundBindAny configuration property (CASSANDRA-12673) + * Use correct bounds for all-data range when filtering (CASSANDRA-12666) + * Remove timing window in test case (CASSANDRA-12875) + * Resolve unit testing without JCE security libraries installed (CASSANDRA-12945) + * Fix inconsistencies in cassandra-stress load balancing policy (CASSANDRA-12919) + * Fix validation of non-frozen UDT cells (CASSANDRA-12916) + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903) + * Fix Murmur3PartitionerTest (CASSANDRA-12858) + * Move cqlsh syntax rules into separate module and allow easier customization (CASSANDRA-12897) + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283) + * Fix cassandra-stress truncate option (CASSANDRA-12695) + * Fix crossNode value when receiving messages (CASSANDRA-12791) + * Don't load MX4J beans twice (CASSANDRA-12869) + * Extend native protocol request flags, add versions to SUPPORTED, and introduce ProtocolVersion enum (CASSANDRA-12838) + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836) + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845) + * Properly format IPv6 addresses when logging JMX service URL (CASSANDRA-12454) + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777) + * Use non-token restrictions for bounds when token restrictions are overridden (CASSANDRA-12419) + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803) + * Use different build directories for Eclipse and Ant (CASSANDRA-12466) + * Avoid potential AttributeError in cqlsh due to no table metadata (CASSANDRA-12815) + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster (CASSANDRA-12812) + * Upgrade commons-codec to 1.9 (CASSANDRA-12790) + * Make the fanout size for LeveledCompactionStrategy to be configurable (CASSANDRA-11550) + * Add duration data type (CASSANDRA-11873) + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784) + * Improve sum aggregate functions (CASSANDRA-12417) + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes in CASSANDRA-10876 (CASSANDRA-12761) + * cqlsh fails to format collections when using aliases (CASSANDRA-11534) + * Check for hash conflicts in prepared statements (CASSANDRA-12733) + * Exit query parsing upon first error (CASSANDRA-12598) + * Fix cassandra-stress to use single seed in UUID generation (CASSANDRA-12729) + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450) + * Config class uses boxed types but DD exposes primitive types (CASSANDRA-12199) + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461) + * Add hint delivery metrics
[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/489be961 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/489be961 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/489be961 Branch: refs/heads/cassandra-3.X Commit: 489be961c945e4330a9426d21b2bb903cc1d3a54 Parents: 73547a3 48abc03 Author: Paulo MottaAuthored: Thu Dec 15 16:46:32 2016 -0200 Committer: Paulo Motta Committed: Thu Dec 15 16:49:10 2016 -0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Keyspace.java | 89 +++- src/java/org/apache/cassandra/db/Mutation.java | 17 ++-- .../db/commitlog/CommitLogReplayer.java | 10 +-- src/java/org/apache/cassandra/hints/Hint.java | 40 ++--- .../apache/cassandra/hints/HintVerbHandler.java | 4 +- .../cassandra/service/paxos/PaxosState.java | 9 +- .../cassandra/streaming/StreamReceiveTask.java | 6 +- 8 files changed, 90 insertions(+), 86 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/489be961/CHANGES.txt -- diff --cc CHANGES.txt index 3db0179,63e095d..fa0c94a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,114 -1,5 +1,115 @@@ -3.0.11 +3.10 + * Remove outboundBindAny configuration property (CASSANDRA-12673) + * Use correct bounds for all-data range when filtering (CASSANDRA-12666) + * Remove timing window in test case (CASSANDRA-12875) + * Resolve unit testing without JCE security libraries installed (CASSANDRA-12945) + * Fix inconsistencies in cassandra-stress load balancing policy (CASSANDRA-12919) + * Fix validation of non-frozen UDT cells (CASSANDRA-12916) + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903) + * Fix Murmur3PartitionerTest (CASSANDRA-12858) + * Move cqlsh syntax rules into separate module and allow easier customization (CASSANDRA-12897) + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283) + * Fix cassandra-stress truncate option (CASSANDRA-12695) + * Fix crossNode value when receiving messages (CASSANDRA-12791) + * Don't load MX4J beans twice (CASSANDRA-12869) + * Extend native protocol request flags, add versions to SUPPORTED, and introduce ProtocolVersion enum (CASSANDRA-12838) + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836) + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845) + * Properly format IPv6 addresses when logging JMX service URL (CASSANDRA-12454) + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777) + * Use non-token restrictions for bounds when token restrictions are overridden (CASSANDRA-12419) + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803) + * Use different build directories for Eclipse and Ant (CASSANDRA-12466) + * Avoid potential AttributeError in cqlsh due to no table metadata (CASSANDRA-12815) + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster (CASSANDRA-12812) + * Upgrade commons-codec to 1.9 (CASSANDRA-12790) + * Make the fanout size for LeveledCompactionStrategy to be configurable (CASSANDRA-11550) + * Add duration data type (CASSANDRA-11873) + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784) + * Improve sum aggregate functions (CASSANDRA-12417) + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes in CASSANDRA-10876 (CASSANDRA-12761) + * cqlsh fails to format collections when using aliases (CASSANDRA-11534) + * Check for hash conflicts in prepared statements (CASSANDRA-12733) + * Exit query parsing upon first error (CASSANDRA-12598) + * Fix cassandra-stress to use single seed in UUID generation (CASSANDRA-12729) + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450) + * Config class uses boxed types but DD exposes primitive types (CASSANDRA-12199) + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461) + * Add hint delivery metrics (CASSANDRA-12693) + * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731) + * ColumnIndex does not reuse buffer (CASSANDRA-12502) + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697) + * Upgrade metrics-reporter dependencies (CASSANDRA-12089) + * Tune compaction thread count via nodetool (CASSANDRA-12248) + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232) + * Include repair session IDs in repair start message (CASSANDRA-12532) + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039) + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667) + * Support optional backpressure strategies at the
[3/4] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11
Merge branch cassandra-3.0 into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c80b9fb3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c80b9fb3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c80b9fb3 Branch: refs/heads/cassandra-3.X Commit: c80b9fb395671411f1be53b607d7c384f4b37798 Parents: 4626b4c da94781 Author: Benjamin LererAuthored: Mon Dec 12 13:51:25 2016 +0100 Committer: Benjamin Lerer Committed: Mon Dec 12 13:51:25 2016 +0100 -- CHANGES.txt | 1 + .../operations/InsertUpdateIfConditionTest.java | 125 +++ 2 files changed, 76 insertions(+), 50 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c80b9fb3/CHANGES.txt -- diff --cc CHANGES.txt index 7b017bb,bbd47c1..d056492 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -164,10 -53,6 +164,11 @@@ Merged from 3.0 * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776) * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545) Merged from 2.2: ++ * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935) + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914) + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899) + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281) * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792) * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901) * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c80b9fb3/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java --
[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f176c574 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f176c574 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f176c574 Branch: refs/heads/cassandra-3.11 Commit: f176c574c570ba753d53416c2e84f8becb6199df Parents: e416c82 752f5d5 Author: Paulo MottaAuthored: Fri Dec 9 16:15:16 2016 -0200 Committer: Paulo Motta Committed: Fri Dec 9 16:15:16 2016 -0200 -- --