[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 # Conflicts: # CHANGES.txt # src/java/org/apache/cassandra/config/DatabaseDescriptor.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12841938 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12841938 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12841938 Branch: refs/heads/cassandra-3.11 Commit: 12841938a0cd420d626749e91f5f696f26354b03 Parents: eb027a1 8fc9275 Author: AndreÌs de la PenÌa Authored: Tue Sep 12 14:52:18 2017 +0100 Committer: AndreÌs de la PenÌa Committed: Tue Sep 12 14:52:18 2017 +0100 -- CHANGES.txt | 1 + conf/cassandra.yaml | 5 +++-- .../apache/cassandra/config/DatabaseDescriptor.java | 15 +++ src/java/org/apache/cassandra/utils/FBUtilities.java | 7 +-- 4 files changed, 24 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/12841938/CHANGES.txt -- diff --cc CHANGES.txt index 099a869,b00e47c..752d9aa --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +1,18 @@@ -3.0.15 +3.11.1 + * Add a compaction option to TWCS to ignore sstables overlapping checks (CASSANDRA-13418) + * BTree.Builder memory leak (CASSANDRA-13754) + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to correctness (CASSANDRA-13798) + * Fix cassandra-stress hang issues when an error during cluster connection happens (CASSANDRA-12938) + * Better bootstrap failure message when blocked by (potential) range movement (CASSANDRA-13744) + * "ignore" option is ignored in sstableloader (CASSANDRA-13721) + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652) + * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512) + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) +Merged from 3.0: + * Improve config validation and documentation on overflow and NPE (CASSANDRA-13622) + * Fix pending view mutations handling and cleanup batchlog when there are local and remote paired mutations (CASSANDRA-13069) * Range deletes in a CAS batch are ignored (CASSANDRA-13655) + * Avoid assertion error when IndexSummary > 2G (CASSANDRA-12014) * Change repair midpoint logging for tiny ranges (CASSANDRA-13603) * Better handle corrupt final commitlog segment (CASSANDRA-11995) * StreamingHistogram is not thread safe (CASSANDRA-13756) http://git-wip-us.apache.org/repos/asf/cassandra/blob/12841938/conf/cassandra.yaml -- diff --cc conf/cassandra.yaml index 4bb5840,d77d27a..e847e54 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@@ -1105,96 -959,11 +1106,96 @@@ enable_scripted_user_defined_functions # setting. windows_timer_interval: 1 + +# Enables encrypting data at-rest (on disk). Different key providers can be plugged in, but the default reads from +# a JCE-style keystore. A single keystore can hold multiple keys, but the one referenced by +# the "key_alias" is the only key that will be used for encrypt opertaions; previously used keys +# can still (and should!) be in the keystore and will be used on decrypt operations +# (to handle the case of key rotation). +# +# It is strongly recommended to download and install Java Cryptography Extension (JCE) +# Unlimited Strength Jurisdiction Policy Files for your version of the JDK. +# (current link: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html) +# +# Currently, only the following file types are supported for transparent data encryption, although +# more are coming in future cassandra releases: commitlog, hints +transparent_data_encryption_options: +enabled: false +chunk_length_kb: 64 +cipher: AES/CBC/PKCS5Padding +key_alias: testing:1 +# CBC IV length for AES needs to be 16 bytes (which is also the default size) +# iv_length: 16 +key_provider: + - class_name: org.apache.cassandra.security.JKSKeyProvider +parameters: + - keystore: conf/.keystore +keystore_password: cassandra +store_type: JCEKS +key_password: cassandra + + +# +# SAFETY THRESHOLDS # +# + +# When executing a scan, within or across a partition, we need to keep the +# tombstones seen in memory so we can return them to the coordinator, which +# will use them to make sure other replicas also know about the deleted rows. +# With workloads that generate a lot of tombstones, this can cause performance +# problems and even exaust the server heap. +# (ht
[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 # Conflicts: # src/java/org/apache/cassandra/config/DatabaseDescriptor.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c05d98a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c05d98a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c05d98a3 Branch: refs/heads/cassandra-3.11 Commit: c05d98a30b56fb8dd3924780150a631123ce0851 Parents: 1284193 a586f6c Author: AndreÌs de la PenÌa Authored: Tue Sep 12 15:29:13 2017 +0100 Committer: AndreÌs de la PenÌa Committed: Tue Sep 12 15:29:13 2017 +0100 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c05d98a3/CHANGES.txt -- diff --cc CHANGES.txt index 752d9aa,6053117..2c48ab2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,7 +1,18 @@@ -3.0.15 +3.11.1 + * Add a compaction option to TWCS to ignore sstables overlapping checks (CASSANDRA-13418) + * BTree.Builder memory leak (CASSANDRA-13754) + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to correctness (CASSANDRA-13798) + * Fix cassandra-stress hang issues when an error during cluster connection happens (CASSANDRA-12938) + * Better bootstrap failure message when blocked by (potential) range movement (CASSANDRA-13744) + * "ignore" option is ignored in sstableloader (CASSANDRA-13721) + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652) + * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512) + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) +Merged from 3.0: - * Improve config validation and documentation on overflow and NPE (CASSANDRA-13622) * Fix pending view mutations handling and cleanup batchlog when there are local and remote paired mutations (CASSANDRA-13069) + * Improve config validation and documentation on overflow and NPE (CASSANDRA-13622) * Range deletes in a CAS batch are ignored (CASSANDRA-13655) + * Avoid assertion error when IndexSummary > 2G (CASSANDRA-12014) * Change repair midpoint logging for tiny ranges (CASSANDRA-13603) * Better handle corrupt final commitlog segment (CASSANDRA-11995) * StreamingHistogram is not thread safe (CASSANDRA-13756) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
Legacy deserializer can create unexpected boundary range tombstones
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1dc1aa19
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dc1aa19
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1dc1aa19
Branch: refs/heads/cassandra-3.11
Commit: 1dc1aa1982a7ab84034c95fa6ce6b3e4e2346fd2
Parents: 6487876 ab71748
Author: Sylvain Lebresne
Authored: Thu Feb 23 14:37:35 2017 +0100
Committer: Sylvain Lebresne
Committed: Thu Feb 23 14:37:35 2017 +0100
--
CHANGES.txt | 1 +
.../cassandra/db/UnfilteredDeserializer.java| 334 ++-
.../cassandra/db/rows/RangeTombstoneMarker.java | 1 -
.../apache/cassandra/service/DataResolver.java | 31 +-
.../cassandra/db/OldFormatDeserializerTest.java | 110 ++
.../cassandra/service/DataResolverTest.java | 125 ++-
6 files changed, 432 insertions(+), 170 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dc1aa19/CHANGES.txt
--
diff --cc CHANGES.txt
index 233898f,386029e..f5b9d28
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,19 +1,19 @@@
-3.0.12
+3.11.0
+ * Fix equality comparisons of columns using the duration type
(CASSANDRA-13174)
+ * Obfuscate password in stress-graphs (CASSANDRA-12233)
+ * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
+ * nodetool stopdaemon errors out (CASSANDRA-13030)
+ * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
+ * Fix primary index calculation for SASI (CASSANDRA-12910)
+ * More fixes to the TokenAllocator (CASSANDRA-12990)
+ * NoReplicationTokenAllocator should work with zero replication factor
(CASSANDRA-12983)
+Merged from 3.0:
+ * Legacy deserializer can create unexpected boundary range tombstones
(CASSANDRA-13237)
* Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
* Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
-Merged from 2.2
- * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
- * Fix failing COPY TO STDOUT (CASSANDRA-12497)
- * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
- * Exceptions encountered calling getSeeds() breaks OTC thread
(CASSANDRA-13018)
-Merged from 2.1:
- * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
-
-3.0.11
* Use keyspace replication settings on system.size_estimates table
(CASSANDRA-9639)
* Add vm.max_map_count StartupCheck (CASSANDRA-13008)
- * Hint related logging should include the IP address of the destination in
addition to
+ * Hint related logging should include the IP address of the destination in
addition to
host ID (CASSANDRA-13205)
* Reloading logback.xml does not work (CASSANDRA-13173)
* Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0
(CASSANDRA-13109)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dc1aa19/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
--
diff --cc src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
index 2c3bc1b,42a806a..79b8636
--- a/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
+++ b/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
@@@ -317,16 -331,7 +331,7 @@@ public abstract class UnfilteredDeseria
}
}
- private boolean isRow(LegacyLayout.LegacyAtom atom)
- {
- if (atom.isCell())
- return true;
-
- LegacyLayout.LegacyRangeTombstone tombstone =
atom.asRangeTombstone();
- return tombstone.isCollectionTombstone() ||
tombstone.isRowDeletion(metadata);
- }
-
-public int compareNextTo(Slice.Bound bound) throws IOException
+public int compareNextTo(ClusteringBound bound) throws IOException
{
if (!hasNext())
throw new IllegalStateException();
@@@ -397,13 -405,27 +405,28 @@@
private Unfiltered next;
- private UnfilteredIterator(DeletionTime partitionDeletion)
+ UnfilteredIterator(CFMetaData metadata,
+DeletionTime partitionDeletion,
+SerializationHelper helper,
+Supplier atomReader)
{
+ this.metadata = metadata;
+ this.helper = helper;
this.grouper = new LegacyLayout.CellGrouper(metadata, helper);
this.tombstoneTracker = new
TombstoneTracker(partitionDeletion);
-
[4/5] 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/863ad11c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/863ad11c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/863ad11c
Branch: refs/heads/cassandra-3.11
Commit: 863ad11c8acb6c5f811d2cb2668eb353863f29e6
Parents: 5efaaf9 2d6fd78
Author: Alex Petrov
Authored: Fri Apr 7 12:16:22 2017 +0200
Committer: Alex Petrov
Committed: Fri Apr 7 12:16:22 2017 +0200
--
CHANGES.txt | 1 +
.../db/SinglePartitionReadCommand.java | 11 +--
.../db/filter/ClusteringIndexNamesFilter.java | 6 +-
.../db/partitions/AbstractBTreePartition.java | 5 --
.../cassandra/utils/IndexedSearchIterator.java | 5 ++
.../apache/cassandra/utils/SearchIterator.java | 2 -
.../cassandra/utils/memory/EnsureOnHeap.java| 5 --
.../cql3/validation/operations/DeleteTest.java | 82 +++-
.../partition/PartitionImplementationTest.java | 2 +-
9 files changed, 92 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/863ad11c/CHANGES.txt
--
diff --cc CHANGES.txt
index 26e64d2,440ccd8..aa8c3ff
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,5 +1,28 @@@
-3.0.13
+3.11.0
+ * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962)
+ * Add charset to Analyser input stream (CASSANDRA-13151)
+ * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
+ * cdc column addition strikes again (CASSANDRA-13382)
+ * Fix static column indexes (CASSANDRA-13277)
+ * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298)
+ * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
+ * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns
(CASSANDRA-13247)
+ * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern
(CASSANDRA-13317)
+ * Possible AssertionError in UnfilteredRowIteratorWithLowerBound
(CASSANDRA-13366)
+ * Support unaligned memory access for AArch64 (CASSANDRA-13326)
+ * Improve SASI range iterator efficiency on intersection with an empty range
(CASSANDRA-12915).
+ * Fix equality comparisons of columns using the duration type
(CASSANDRA-13174)
+ * Obfuscate password in stress-graphs (CASSANDRA-12233)
+ * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
+ * nodetool stopdaemon errors out (CASSANDRA-13030)
+ * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
+ * Fix primary index calculation for SASI (CASSANDRA-12910)
+ * More fixes to the TokenAllocator (CASSANDRA-12990)
+ * NoReplicationTokenAllocator should work with zero replication factor
(CASSANDRA-12983)
+ * Address message coalescing regression (CASSANDRA-12676)
+ * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
+Merged from 3.0:
+ * Make reading of range tombstones more reliable (CASSANDRA-12811)
* Fix startup problems due to schema tables not completely flushed
(CASSANDRA-12213)
* Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
* Fix 2i page size calculation when there are no regular columns
(CASSANDRA-13400)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/863ad11c/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
--
diff --cc src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
index 724f59e,99abd10..1358f29
--- a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
+++ b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
@@@ -778,13 -736,13 +778,13 @@@ public class SinglePartitionReadComman
// We need to get the partition deletion and include it if
it's live. In any case though, we're done with that sstable.
sstable.incrementReadCount();
- try (UnfilteredRowIterator iter =
StorageHook.instance.makeRowIterator(cfs, sstable, partitionKey(), Slices.ALL,
columnFilter(), filter.isReversed(), isForThrift()))
-try (UnfilteredRowIterator iter =
filter.filter(sstable.iterator(partitionKey(), columnFilter(),
filter.isReversed(), isForThrift(
++try (UnfilteredRowIterator iter =
StorageHook.instance.makeRowIterator(cfs, sstable, partitionKey(),
filter.getSlices(metadata()), columnFilter(), filter.isReversed(),
isForThrift()))
{
+ sstablesIterated++;
if (!iter.partitionLevelDeletion().isLive())
- {
- sstablesIterated++;
result =
add(Unfil
[4/5] 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/3a064332 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a064332 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a064332 Branch: refs/heads/cassandra-3.11 Commit: 3a06433299aae8f48b7a84ca6aa42e612dd9d2df Parents: 8693357 263740d Author: Sam Tunnicliffe Authored: Thu May 11 15:16:31 2017 +0100 Committer: Sam Tunnicliffe Committed: Thu May 11 15:16:31 2017 +0100 -- -- - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[4/5] 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/c2299e68 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2299e68 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2299e68 Branch: refs/heads/cassandra-3.11 Commit: c2299e6890b65f6042c74e679dd90713917e9062 Parents: 5af7c5f 95635f3 Author: Yuki Morishita Authored: Fri May 12 15:58:58 2017 +0900 Committer: Yuki Morishita Committed: Fri May 12 15:58:58 2017 +0900 -- CHANGES.txt | 1 + .../apache/cassandra/tools/LoaderOptions.java | 26 ++-- 2 files changed, 19 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2299e68/CHANGES.txt -- diff --cc CHANGES.txt index 4f26344,84aba99..9b31d48 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,38 -1,5 +1,39 @@@ -3.0.14 +3.11.0 + * Fall back to even ranges calculation in clusters with vnodes when tokens are distributed unevenly (CASSANDRA-13229) + * Fix duration type validation to prevent overflow (CASSANDRA-13218) + * Forbid unsupported creation of SASI indexes over partition key columns (CASSANDRA-13228) + * Reject multiple values for a key in CQL grammar. (CASSANDRA-13369) + * UDA fails without input rows (CASSANDRA-13399) + * Fix compaction-stress by using daemonInitialization (CASSANDRA-13188) + * V5 protocol flags decoding broken (CASSANDRA-13443) + * Use write lock not read lock for removing sstables from compaction strategies. (CASSANDRA-13422) + * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors (CASSANDRA-13329) + * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962) + * Add charset to Analyser input stream (CASSANDRA-13151) + * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820) + * cdc column addition strikes again (CASSANDRA-13382) + * Fix static column indexes (CASSANDRA-13277) + * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298) + * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370) + * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns (CASSANDRA-13247) + * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317) + * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366) + * Support unaligned memory access for AArch64 (CASSANDRA-13326) + * Improve SASI range iterator efficiency on intersection with an empty range (CASSANDRA-12915). + * Fix equality comparisons of columns using the duration type (CASSANDRA-13174) + * Obfuscate password in stress-graphs (CASSANDRA-12233) + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034) + * nodetool stopdaemon errors out (CASSANDRA-13030) + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954) + * Fix primary index calculation for SASI (CASSANDRA-12910) + * More fixes to the TokenAllocator (CASSANDRA-12990) + * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) + * Address message coalescing regression (CASSANDRA-12676) + * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417) + * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307) + * Tracing payload not passed from QueryMessage to tracing session (CASSANDRA-12835) +Merged from 3.0: + * Add storage port options to sstableloader (CASSANDRA-13518) * Properly handle quoted index names in cqlsh DESCRIBE output (CASSANDRA-12847) * Avoid reading static row twice from old format sstables (CASSANDRA-13236) * Fix NPE in StorageService.excise() (CASSANDRA-13163) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2299e68/src/java/org/apache/cassandra/tools/LoaderOptions.java -- diff --cc src/java/org/apache/cassandra/tools/LoaderOptions.java index 28d7bce,000..8b3d852 mode 100644,00..100644 --- a/src/java/org/apache/cassandra/tools/LoaderOptions.java +++ b/src/java/org/apache/cassandra/tools/LoaderOptions.java @@@ -1,563 -1,0 +1,573 @@@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writ
[4/5] 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/5ea7f7c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ea7f7c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ea7f7c6 Branch: refs/heads/trunk Commit: 5ea7f7c6f2f3abf4faf5d91a046239806ee010a4 Parents: 2a0890d 5b8ae9f Author: Michael Shuler Authored: Thu Jun 15 14:06:45 2017 -0500 Committer: Michael Shuler Committed: Thu Jun 15 14:06:45 2017 -0500 -- build.properties.default | 2 +- build.xml| 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ea7f7c6/build.xml -- - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[4/5] 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/6d5cd2d4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d5cd2d4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d5cd2d4 Branch: refs/heads/trunk Commit: 6d5cd2d459940f37dd1bb629b37add33d8f7272f Parents: 6a504f4 a696ab3 Author: Robert Stupp Authored: Thu Feb 9 20:50:41 2017 +0100 Committer: Robert Stupp Committed: Thu Feb 9 20:50:41 2017 +0100 -- CHANGES.txt | 1 + build.xml | 2 +- lib/licenses/netty-all-4.0.39.Final.txt | 202 --- lib/licenses/netty-all-4.0.44.Final.txt | 202 +++ lib/netty-all-4.0.39.Final.jar | Bin 2271610 -> 0 bytes lib/netty-all-4.0.44.Final.jar | Bin 0 -> 2342652 bytes .../org/apache/cassandra/transport/Message.java | 6 +- 7 files changed, 208 insertions(+), 205 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d5cd2d4/CHANGES.txt -- diff --cc CHANGES.txt index eb10bad,d8c1625..3073fd7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -235,13 -107,10 +235,14 @@@ Merged from 2.2 * Fix exceptions when enabling gossip on nodes that haven't joined the ring (CASSANDRA-12253) * Fix authentication problem when invoking cqlsh copy from a SOURCE command (CASSANDRA-12642) * Decrement pending range calculator jobs counter in finally block - (CASSANDRA-12554) + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481) + * Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523) + * Fail repair on non-existing table (CASSANDRA-12279) + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522) * Split consistent range movement flag correction (CASSANDRA-12786) Merged from 2.1: - * Add system property to set the max number of native transport requests in queue (CASSANDRA-11363) ++ * Upgrade netty version to fix memory leak with client encryption (CASSANDRA-13114) + * cqlsh copy-from: sort user type fields in csv (CASSANDRA-12959) * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d5cd2d4/build.xml -- diff --cc build.xml index 0fdf5f3,a182f45..49dd95a --- a/build.xml +++ b/build.xml @@@ -426,21 -396,16 +426,21 @@@ - + - + - + + + + + + - - + + http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d5cd2d4/src/java/org/apache/cassandra/transport/Message.java --
[4/5] 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/e819fec8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e819fec8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e819fec8 Branch: refs/heads/trunk Commit: e819fec89c38d4b6347ea9a683798e050c65dd86 Parents: be21174 15cee48 Author: Aleksey Yeschenko Authored: Sat Sep 30 10:53:06 2017 +0100 Committer: Aleksey Yeschenko Committed: Sat Sep 30 10:56:07 2017 +0100 -- CHANGES.txt | 8 +- .../cassandra/db/PartitionRangeReadCommand.java | 14 ++ .../org/apache/cassandra/db/ReadCommand.java| 2 + .../db/SinglePartitionReadCommand.java | 5 + .../apache/cassandra/db/filter/DataLimits.java | 5 +- .../UnfilteredPartitionIterators.java | 19 +- .../apache/cassandra/service/DataResolver.java | 239 ++- 7 files changed, 219 insertions(+), 73 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e819fec8/CHANGES.txt -- diff --cc CHANGES.txt index a782333,4a45469..61f3405 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,11 +1,22 @@@ -3.0.15 +3.11.1 + * Fix the computation of cdc_total_space_in_mb for exabyte filesystems (CASSANDRA-13808) - * Handle limit correctly on tables with strict liveness (CASSANDRA-13883) + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is a single leaf and overflow collisions (CASSANDRA-13869) + * Add a compaction option to TWCS to ignore sstables overlapping checks (CASSANDRA-13418) + * BTree.Builder memory leak (CASSANDRA-13754) + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to correctness (CASSANDRA-13798) + * Fix cassandra-stress hang issues when an error during cluster connection happens (CASSANDRA-12938) + * Better bootstrap failure message when blocked by (potential) range movement (CASSANDRA-13744) + * "ignore" option is ignored in sstableloader (CASSANDRA-13721) + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652) + * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512) + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) +Merged from 3.0: + * Implement short read protection on partition boundaries (CASSANDRA-13595) + * Fix ISE thrown by UPI.Serializer.hasNext() for some SELECT queries (CASSANDRA-13911) * Filter header only commit logs before recovery (CASSANDRA-13918) * AssertionError prepending to a list (CASSANDRA-13149) * Fix support for SuperColumn tables (CASSANDRA-12373) + * Handle limit correctly on tables with strict liveness (CASSANDRA-13883) - * Fix missing original update in TriggerExecutor (CASSANDRA-13894) * Remove non-rpc-ready nodes from counter leader candidates (CASSANDRA-13043) * Improve short read protection performance (CASSANDRA-13794) * Fix sstable reader to support range-tombstone-marker for multi-slices (CASSANDRA-13787) @@@ -155,35 -115,12 +157,39 @@@ Merged from 3.0 * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320) * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305) * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238) - * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384) + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to LogRecord absolute path (CASSANDRA-13294) + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233) + * Cqlsh copy-from should error out when csv contains invalid data for collections (CASSANDRA-13071) + * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232) + * Coalescing strategy sleeps too much (CASSANDRA-13090) + * Faster StreamingHistogram (CASSANDRA-13038) + * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237) + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070) + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185) + * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639) + * Add vm.max_map_count StartupCheck (CASSANDRA-13008) + * Hint related logging should include the IP address of the destination in addition to + host ID (CASSANDRA-13205) + * Reloading logback.xml does not work (CASSANDRA-13173) + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109) + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125) + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152) + * Fix handling of partition with partition-level deletion plus + liv
[4/5] 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/a31a848d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a31a848d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a31a848d Branch: refs/heads/cassandra-3.11 Commit: a31a848d6fecf6b365ae1dc789c3991c7c470afb Parents: e9462b9 9b5ba6c Author: AndreÌs de la PenÌa Authored: Wed Apr 18 11:19:06 2018 +0100 Committer: AndreÌs de la PenÌa Committed: Wed Apr 18 11:19:06 2018 +0100 -- CHANGES.txt | 1 + doc/cql3/CQL.textile | 13 + 2 files changed, 14 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a31a848d/CHANGES.txt -- diff --cc CHANGES.txt index 7253ec6,0143fc5..da048e7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,5 +1,20 @@@ -3.0.17 +3.11.3 + * 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: + * Add missed CQL keywords to documentation (CASSANDRA-14359) + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 (CASSANDRA-14332) + * Avoid deadlock when running nodetool refresh before node is fully up (CASSANDRA-14310) + * Handle all exceptions when opening sstables (CASSANDRA-14202) + * Handle incompletely written hint descriptors during startup (CASSANDRA-14080) * Handle repeat open bound from SRP in read repair (CASSANDRA-14330) * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252) * Respect max hint window when hinting for LWT (CASSANDRA-14215) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a31a848d/doc/cql3/CQL.textile -- diff --cc doc/cql3/CQL.textile index fad69d7,cc2b9aa..f32e30c --- a/doc/cql3/CQL.textile +++ b/doc/cql3/CQL.textile @@@ -2299,6 -2155,6 +2299,7 @@@ CQL distinguishes between _reserved_ an | @BOOLEAN@ | no | | @BY@ | yes | | @CALLED@ | no | ++| @CAST@ | no | | @CLUSTERING@ | no | | @COLUMNFAMILY@ | yes | | @COMPACT@ | no | @@@ -2309,12 -2165,12 +2310,14 @@@ | @CUSTOM@ | no | | @DATE@ | no | | @DECIMAL@ | no | ++| @DEFAULT@ | yes | | @DELETE@ | yes | | @DESC@ | yes | | @DESCRIBE@ | yes | | @DISTINCT@ | no | | @DOUBLE@ | no | | @DROP@ | yes | ++| @DURATION@ | no | | @ENTRIES@ | yes | | @EXECUTE@ | yes | | @EXISTS@ | no | @@@ -2327,6 -2183,6 +2330,7 @@@ | @FUNCTION@ | no | | @FUNCTIONS@| no | | @GRANT@| yes | ++| @GROUP@| no | | @IF@ | yes | | @IN@ | yes | | @INDEX@| yes | @@@ -2343,10 -2200,11 +2348,14 @@@ | @KEYSPACE@ | yes | | @KEYSPACES@| no | | @LANGUAGE@ | no | ++| @LIKE@ | no | | @LIMIT@| yes | | @LIST@ | no | | @LOGIN@| no | | @MAP@ | no | + | @MATERIALIZED@ | yes | ++| @MBEAN@| yes | ++| @MBEANS@ | yes | | @MODIFY@ | yes | | @NAN@ | yes | | @NOLOGIN@ | no | @@@ -2359,7 -2217,7 +2368,9 @@@ | @OPTIONS@ | no | | @OR@ | yes | | @ORDER@| yes | ++| @PARTITION@| no | | @PASSWORD@ | no | ++| @PER@ | no | | @PERMISSION@ | no | | @PERMISSIONS@ | no | | @PRIMARY@ | yes | @@@ -2392,6 -2250,6 +2403,7 @@@ | @TUPLE@| no | | @TYPE@ | no | | @UNLOGGED@ | yes | ++| @UNSET@| yes | | @UPDATE@ | yes | | @USE@ | yes | | @USER@ | no | - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[4/5] 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/22bb2cf6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22bb2cf6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22bb2cf6 Branch: refs/heads/cassandra-3.11 Commit: 22bb2cf671966a342adffb59c56a60f520974ac8 Parents: 35823fc e42d9e7 Author: Marcus Eriksson Authored: Tue Apr 24 08:38:03 2018 +0200 Committer: Marcus Eriksson Committed: Tue Apr 24 08:38:03 2018 +0200 -- -- - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[4/5] 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/af600c79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af600c79 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af600c79 Branch: refs/heads/cassandra-3.11 Commit: af600c7931e7e1e7d8cac960b3fc506d18c26243 Parents: 7eecf89 7bf6171 Author: Blake Eggleston Authored: Tue Nov 6 15:56:25 2018 -0800 Committer: Blake Eggleston Committed: Tue Nov 6 15:56:40 2018 -0800 -- .../io/sstable/format/big/BigFormat.java| 2 +- .../org/apache/cassandra/db/KeyspaceTest.java | 34 -- .../apache/cassandra/db/filter/SliceTest.java | 42 - .../io/sstable/SSTableMetadataTest.java | 49 4 files changed, 1 insertion(+), 126 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/af600c79/src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/af600c79/test/unit/org/apache/cassandra/db/KeyspaceTest.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/af600c79/test/unit/org/apache/cassandra/db/filter/SliceTest.java -- - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
