[06/15] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2
Merge branch cassandra-2.1 into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b3ac7937 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3ac7937 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b3ac7937 Branch: refs/heads/trunk Commit: b3ac7937edce41a341d1d01c7f3201592e1caa8f Parents: 2e5e11d 34a1d5d Author: Benjamin Lerer Authored: Tue Apr 10 09:51:02 2018 +0200 Committer: Benjamin Lerer Committed: Tue Apr 10 09:52:18 2018 +0200 -- CHANGES.txt | 1 + .../compress/CompressedRandomAccessReader.java | 52 ++-- 2 files changed, 27 insertions(+), 26 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3ac7937/CHANGES.txt -- diff --cc CHANGES.txt index 527975c,aeb3009..5221b1e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,8 +1,17 @@@ -2.1.21 +2.2.13 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891) + * Fix query pager DEBUG log leak causing hit in paged reads throughput (CASSANDRA-14318) + * Backport circleci yaml (CASSANDRA-14240) +Merged from 2.1: + * Check checksum before decompressing data (CASSANDRA-14284) * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183) -2.1.20 +2.2.12 + * Fix the inspectJvmOptions startup check (CASSANDRA-14112) + * Fix race that prevents submitting compaction for a table when executor is full (CASSANDRA-13801) + * Rely on the JVM to handle OutOfMemoryErrors (CASSANDRA-13006) + * Grab refs during scrub/index redistribution/cleanup (CASSANDRA-13873) +Merged from 2.1: * Protect against overflow of local expiration time (CASSANDRA-14092) * More PEP8 compliance for cqlsh (CASSANDRA-14021) * RPM package spec: fix permissions for installed jars and config files (CASSANDRA-14181) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3ac7937/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java -- diff --cc src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java index ccfa5e7,fe90cc9..0fc96ed --- a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java +++ b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java @@@ -99,54 -77,7 +99,54 @@@ public class CompressedRandomAccessRead { try { -decompressChunk(metadata.chunkFor(current)); +long position = current(); +assert position < metadata.dataLength; + +CompressionMetadata.Chunk chunk = metadata.chunkFor(position); + +if (compressed.capacity() < chunk.length) +compressed = allocateBuffer(chunk.length, metadata.compressor().preferredBufferType()); +else +compressed.clear(); +compressed.limit(chunk.length); + +if (channel.read(compressed, chunk.offset) != chunk.length) +throw new CorruptBlockException(getPath(), chunk); +compressed.flip(); +buffer.clear(); + ++if (metadata.parameters.getCrcCheckChance() > ThreadLocalRandom.current().nextDouble()) ++{ ++FBUtilities.directCheckSum(checksum, compressed); ++ ++if (checksum(chunk) != (int) checksum.getValue()) ++throw new CorruptBlockException(getPath(), chunk); ++ ++// reset checksum object back to the original (blank) state ++checksum.reset(); ++compressed.rewind(); ++} ++ +try +{ +metadata.compressor().uncompress(compressed, buffer); +} +catch (IOException e) +{ +throw new CorruptBlockException(getPath(), chunk); +} +finally +{ +buffer.flip(); +} + - if (metadata.parameters.getCrcCheckChance() > ThreadLocalRandom.current().nextDouble()) - { - compressed.rewind(); - FBUtilities.directCheckSum(checksum, compressed); - - if (checksum(chunk) != (int) checksum.getValue()) - throw new CorruptBlockException(getPath(), chunk); - - // reset checksum object back to the original (blank) state - checksum.reset(); - } - +// buffer offset is always aligned +bufferOffset = position & ~(buffer.capacity() - 1); +buffer.position((int) (position - bufferOffset)); +// the length() can
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08ebe829 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08ebe829 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08ebe829 Branch: refs/heads/trunk Commit: 08ebe8297b0ffbfda522036c0f750c4f6cf67e6f Parents: 1602e60 4bbd28a Author: Ariel Weisberg Authored: Wed Feb 14 13:23:41 2018 -0500 Committer: Ariel Weisberg Committed: Wed Feb 14 13:23:41 2018 -0500 -- CHANGES.txt | 4 NEWS.txt| 9 + 2 files changed, 13 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/08ebe829/CHANGES.txt -- diff --cc CHANGES.txt index 82da6ad,0c25388..09930ce --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,7 +1,13 @@@ -2.1.21 ++2.2.13 ++Merged from 2.1: + * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183) + -2.1.20 +2.2.12 + * Fix the inspectJvmOptions startup check (CASSANDRA-14112) + * Fix race that prevents submitting compaction for a table when executor is full (CASSANDRA-13801) + * Rely on the JVM to handle OutOfMemoryErrors (CASSANDRA-13006) + * Grab refs during scrub/index redistribution/cleanup (CASSANDRA-13873) +Merged from 2.1: * Protect against overflow of local expiration time (CASSANDRA-14092) * More PEP8 compliance for cqlsh (CASSANDRA-14021) * RPM package spec: fix permissions for installed jars and config files (CASSANDRA-14181) http://git-wip-us.apache.org/repos/asf/cassandra/blob/08ebe829/NEWS.txt -- - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa831c98 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa831c98 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa831c98 Branch: refs/heads/trunk Commit: aa831c98f7a6268046915036bdc2d2f3b537dd78 Parents: 503aec7 5ba9e6d Author: Stefan Podkowinski Authored: Mon Jan 22 14:18:24 2018 +0100 Committer: Stefan Podkowinski Committed: Mon Jan 22 14:19:57 2018 +0100 -- CHANGES.txt | 1 + redhat/cassandra.spec | 8 2 files changed, 5 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa831c98/CHANGES.txt -- diff --cc CHANGES.txt index 055a35d,e17093d..0f6e61c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,27 -1,10 +1,28 @@@ -2.1.20 +2.2.12 + * Fix the inspectJvmOptions startup check (CASSANDRA-14112) + * Fix race that prevents submitting compaction for a table when executor is full (CASSANDRA-13801) + * Rely on the JVM to handle OutOfMemoryErrors (CASSANDRA-13006) + * Grab refs during scrub/index redistribution/cleanup (CASSANDRA-13873) +Merged from 2.1: * More PEP8 compliance for cqlsh (CASSANDRA-14021) + * RPM package spec: fix permissions for installed jars and config files (CASSANDRA-14181) -2.1.19 +2.2.11 + * Safely handle empty buffers when outputting to JSON (CASSANDRA-13868) + * Copy session properties on cqlsh.py do_login (CASSANDRA-13847) + * Fix load over calculated issue in IndexSummaryRedistribution (CASSANDRA-13738) + * Fix compaction and flush exception not captured (CASSANDRA-13833) + * Make BatchlogManagerMBean.forceBatchlogReplay() blocking (CASSANDRA-13809) + * Uncaught exceptions in Netty pipeline (CASSANDRA-13649) + * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067) + * Fix queries with LIMIT and filtering on clustering columns (CASSANDRA-11223) + * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272) + * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592) + * Fix nested Tuples/UDTs validation (CASSANDRA-13646) + * Remove unused max_value_size_in_mb config setting from yaml (CASSANDRA-13625 +Merged from 2.1: * Add storage port options to sstableloader (CASSANDRA-13844) - * Remove stress-test target in CircleCI as it's not existing (CASSANDRA-13775) + * Remove stress-test target in CircleCI as it's not existing (CASSANDRA-13775) * Clone HeartBeatState when building gossip messages. Make its generation/version volatile (CASSANDRA-13700) http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa831c98/redhat/cassandra.spec -- - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/405ad009 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/405ad009 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/405ad009 Branch: refs/heads/trunk Commit: 405ad0099bf6318fa47072b32c3d6ad2cbc68c41 Parents: a8e2dc5 428eaa3 Author: Jason Brown Authored: Wed Sep 20 06:58:02 2017 -0700 Committer: Jason Brown Committed: Wed Sep 20 07:05:13 2017 -0700 -- CHANGES.txt | 1 + .../org/apache/cassandra/tools/BulkLoader.java | 38 2 files changed, 33 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/405ad009/CHANGES.txt -- diff --cc CHANGES.txt index 0af156f,848628b..0b3421f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,6 +1,19 @@@ -2.1.19 +2.2.11 + * Safely handle empty buffers when outputting to JSON (CASSANDRA-13868) + * Copy session properties on cqlsh.py do_login (CASSANDRA-13847) + * Fix load over calculated issue in IndexSummaryRedistribution (CASSANDRA-13738) + * Fix compaction and flush exception not captured (CASSANDRA-13833) + * Make BatchlogManagerMBean.forceBatchlogReplay() blocking (CASSANDRA-13809) + * Uncaught exceptions in Netty pipeline (CASSANDRA-13649) + * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067) + * Fix queries with LIMIT and filtering on clustering columns (CASSANDRA-11223) + * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272) + * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592) + * Fix nested Tuples/UDTs validation (CASSANDRA-13646) + * Remove unused max_value_size_in_mb config setting from yaml (CASSANDRA-13625 +Merged from 2.1: + * Add storage port options to sstableloader (CASSANDRA-13844) - * Remove stress-test target in CircleCI as it's not existing (CASSANDRA-13775) + * Remove stress-test target in CircleCI as it's not existing (CASSANDRA-13775) * Clone HeartBeatState when building gossip messages. Make its generation/version volatile (CASSANDRA-13700) http://git-wip-us.apache.org/repos/asf/cassandra/blob/405ad009/src/java/org/apache/cassandra/tools/BulkLoader.java -- diff --cc src/java/org/apache/cassandra/tools/BulkLoader.java index 7d0fdc8,52f9467..093a063 --- a/src/java/org/apache/cassandra/tools/BulkLoader.java +++ b/src/java/org/apache/cassandra/tools/BulkLoader.java @@@ -47,7 -55,9 +47,9 @@@ public class BulkLoade private static final String NOPROGRESS_OPTION = "no-progress"; private static final String IGNORE_NODES_OPTION = "ignore"; private static final String INITIAL_HOST_ADDRESS_OPTION = "nodes"; -private static final String RPC_PORT_OPTION = "port"; +private static final String NATIVE_PORT_OPTION = "port"; + private static final String STORAGE_PORT_OPTION = "storage-port"; + private static final String SSL_STORAGE_PORT_OPTION = "ssl-storage-port"; private static final String USER_OPTION = "username"; private static final String PASSWD_OPTION = "password"; private static final String THROTTLE_MBITS = "throttle"; @@@ -306,7 -401,7 +308,7 @@@ public boolean debug; public boolean verbose; public boolean noProgress; - public int nativePort = 9042; -public int rpcPort; ++public int nativePort; public String user; public String passwd; public int throttle = 0; @@@ -438,13 -531,38 +437,38 @@@ config.stream_throughput_outbound_megabits_per_sec = 0; config.inter_dc_stream_throughput_outbound_megabits_per_sec = 0; } - opts.storagePort = config.storage_port; - opts.sslStoragePort = config.ssl_storage_port; opts.throttle = config.stream_throughput_outbound_megabits_per_sec; opts.interDcThrottle = config.inter_dc_stream_throughput_outbound_megabits_per_sec; -opts.encOptions = config.client_encryption_options; +opts.clientEncOptions = config.client_encryption_options; opts.serverEncOptions = config.server_encryption_options; -if (cmd.hasOption(RPC_PORT_OPTION)) ++if (cmd.hasOption(NATIVE_PORT_OPTION)) + { -opts.rpcPort = Integer.parseInt(cmd.getOptionValue(RPC_PORT_OPTION)); ++opts.nativePort = Integer.parseInt(cmd.getOptionValue(NATIVE_PORT_OPTION)); + } + else + {
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/717dbe74 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/717dbe74 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/717dbe74 Branch: refs/heads/trunk Commit: 717dbe741d0c0fcd417546a9244fce8c1ba730d1 Parents: 8715c88 665f693 Author: Michael Shuler Authored: Mon Sep 11 16:53:21 2017 -0500 Committer: Michael Shuler Committed: Mon Sep 11 16:53:21 2017 -0500 -- -- - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8715c889 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8715c889 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8715c889 Branch: refs/heads/trunk Commit: 8715c889a77094f8fdcc65767453a20ea630f8ec Parents: 4e834c5 fc38c38 Author: Stefan Podkowinski Authored: Thu Sep 7 10:18:21 2017 +0200 Committer: Stefan Podkowinski Committed: Thu Sep 7 10:20:01 2017 +0200 -- redhat/cassandra.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8715c889/redhat/cassandra.spec -- - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d90573c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d90573c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d90573c Branch: refs/heads/trunk Commit: 4d90573c55f08f2a8d72c9ae358618258c4e8b31 Parents: f210b17 5469f21 Author: Aleksey Yeschenko Authored: Thu Aug 31 14:45:49 2017 +0100 Committer: Aleksey Yeschenko Committed: Thu Aug 31 14:45:49 2017 +0100 -- test/unit/org/apache/cassandra/db/HintedHandOffTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d90573c/test/unit/org/apache/cassandra/db/HintedHandOffTest.java -- diff --cc test/unit/org/apache/cassandra/db/HintedHandOffTest.java index 6bb6be2,a2b0ae1..3d6e5cf --- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java +++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java @@@ -99,10 -85,10 +99,10 @@@ public class HintedHandOffTes public void testHintsMetrics() throws Exception { for (int i = 0; i < 99; i++) - HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getLocalHost()); + HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getByName("127.0.0.1")); HintedHandOffManager.instance.metrics.log(); -UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS_CF); +UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS); Map returned = rows.one().getMap("hints_dropped", UUIDType.instance, Int32Type.instance); assertEquals(Iterators.getLast(returned.values().iterator()).intValue(), 99); } - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f210b177 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f210b177 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f210b177 Branch: refs/heads/trunk Commit: f210b1776b8cfc881c49869ebc51040440906e66 Parents: 4b52a68 0ffce2e Author: Marcus Eriksson Authored: Wed Aug 30 13:36:03 2017 +0200 Committer: Marcus Eriksson Committed: Wed Aug 30 13:36:36 2017 +0200 -- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f210b177/circle.yml -- diff --cc circle.yml index a6a8b98,0c3f86b..02a1664 --- a/circle.yml +++ b/circle.yml @@@ -13,6 -13,6 +13,6 @@@ test post: - mkdir -p $CIRCLE_TEST_REPORTS/junit/: parallel: true - - find ./build/test/output/ -iname "*.xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;: -- case $CIRCLE_NODE_INDEX in [0123]) find ./build/test/output/ -iname "*.xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; ;;esac: ++- case $CIRCLE_NODE_INDEX in [012]) find ./build/test/output/ -iname "*.xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; ;;esac: parallel: true - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b6fd54a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b6fd54a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b6fd54a Branch: refs/heads/trunk Commit: 9b6fd54a4e3f90c468b4c36a5ad3b88239094681 Parents: 830b012 a3498d5 Author: Marcus Eriksson Authored: Fri Aug 18 19:16:56 2017 +0200 Committer: Marcus Eriksson Committed: Fri Aug 18 19:16:56 2017 +0200 -- build.xml | 4 +++- circle.yml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b6fd54a/build.xml -- diff --cc build.xml index ea71e6e,e5ab405..38c7d24 --- a/build.xml +++ b/build.xml @@@ -1275,11 -1164,11 +1275,13 @@@ classpath which only contains what we expect users to need. --> + + + - + + http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b6fd54a/circle.yml -- diff --cc circle.yml index 5b4c72d,f4db279..a6a8b98 --- a/circle.yml +++ b/circle.yml @@@ -7,7 -7,7 +7,7 @@@ test - sudo apt-get update; sudo apt-get install wamerican: parallel: true override: - - case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test ;; 1) ant long-test ;; 2) ant test-compression ;;esac: -- case $CIRCLE_NODE_INDEX in 0) ant test ;; 1) ant long-test ;; 2) ant test-compression ;; 3) ant test-clientutil-jar ;;esac: ++- case $CIRCLE_NODE_INDEX in 0) ant test ;; 1) ant long-test ;; 2) ant test-compression ;; 3) ant eclipse-warnings ;;esac: parallel: true post: - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/830b0127 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/830b0127 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/830b0127 Branch: refs/heads/trunk Commit: 830b01272c227503f74b5fe5a5340331ee3ce685 Parents: 270f690 3c0c462 Author: Michael Shuler Authored: Thu Aug 17 14:24:09 2017 -0500 Committer: Michael Shuler Committed: Thu Aug 17 14:24:09 2017 -0500 -- CHANGES.txt | 1 + circle.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/830b0127/CHANGES.txt -- diff --cc CHANGES.txt index f712333,4f8f65f..5c1d1e5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ -2.1.19 - * Remove stress-test target in CircleCI as it's not existing (CASSANDRA-13775) +2.2.11 + * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067) + * Fix queries with LIMIT and filtering on clustering columns (CASSANDRA-11223) + * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272) + * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592) + * Fix nested Tuples/UDTs validation (CASSANDRA-13646) + * Remove unused max_value_size_in_mb config setting from yaml (CASSANDRA-13625 +Merged from 2.1: ++ * Remove stress-test target in CircleCI as it's not existing (CASSANDRA-13775) * Clone HeartBeatState when building gossip messages. Make its generation/version volatile (CASSANDRA-13700) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/739cd2bc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/739cd2bc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/739cd2bc Branch: refs/heads/trunk Commit: 739cd2bc2565bc1f388c4b1e618623497e7dd43e Parents: 462fe26 2290c0d Author: Joel Knighton Authored: Mon Jul 24 14:47:01 2017 -0500 Committer: Joel Knighton Committed: Mon Jul 24 14:47:01 2017 -0500 -- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/gms/Gossiper.java | 5 +++-- src/java/org/apache/cassandra/gms/HeartBeatState.java | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/739cd2bc/CHANGES.txt -- diff --cc CHANGES.txt index bda510f,4dbd984..36c34a1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,34 -1,8 +1,36 @@@ -2.1.19 +2.2.11 + * Fix queries with LIMIT and filtering on clustering columns (CASSANDRA-11223) + * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272) + * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592) + * Fix nested Tuples/UDTs validation (CASSANDRA-13646) + * Remove unused max_value_size_in_mb config setting from yaml (CASSANDRA-13625 ++Merged from 2.1: + * Clone HeartBeatState when building gossip messages. Make its generation/version volatile (CASSANDRA-13700) -2.1.18 +2.2.10 + * Nodes started with join_ring=False should be able to serve requests when authentication is enabled (CASSANDRA-11381) + * cqlsh COPY FROM: increment error count only for failures, not for attempts (CASSANDRA-13209) + * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119) + * Avoid starting gossiper in RemoveTest (CASSANDRA-13407) + * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393) + * Fix JVM metric paths (CASSANDRA-13103) + * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773) + * Discard in-flight shadow round responses (CASSANDRA-12653) + * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153) + * Wrong logger name in AnticompactionTask (CASSANDRA-13343) + * Fix queries updating multiple time the same list (CASSANDRA-13130) + * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053) + * Avoid race on receiver by starting streaming sender thread after sending init message (CASSANDRA-12886) + * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232) + * Coalescing strategy sleeps too much (CASSANDRA-13090) + * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100) + * 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) + * Commitlog replay may fail if last mutation is within 4 bytes of end of segment (CASSANDRA-13282) +Merged from 2.1: * Fix 2ndary indexes on primary key columns to don't create expiring entries (CASSANDRA-13412) * Set javac encoding to utf-8 (CASSANDRA-13466) * Fix 2ndary index queries on partition keys for tables with static columns (CASSANDRA-13147) http://git-wip-us.apache.org/repos/asf/cassandra/blob/739cd2bc/src/java/org/apache/cassandra/gms/Gossiper.java -- diff --cc src/java/org/apache/cassandra/gms/Gossiper.java index c2eccba,7c37917..020d372 --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@@ -859,9 -864,9 +860,9 @@@ public class Gossiper implements IFailu int localHbVersion = epState.getHeartBeatState().getHeartBeatVersion(); if (localHbVersion > version) { - reqdEndpointState = new EndpointState(epState.getHeartBeatState()); + reqdEndpointState = new EndpointState(new HeartBeatState(localHbGeneration, localHbVersion)); if (logger.isTraceEnabled()) -logger.trace("local heartbeat version " + localHbVersion + " greater than " + version + " for " + forEndpoint); +logger.trace("local heartbeat version {} greater than {} for {}", localHbVersion, version, forEndpoint); } /* Accumulate all application states whose versions are greater than "version" variable */ Map states = new EnumMap<>(ApplicationState.class);
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/462fe26b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/462fe26b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/462fe26b Branch: refs/heads/trunk Commit: 462fe26bd45456e6e84a5222a49bfa6a64b39b62 Parents: b08843d 77aba07 Author: Joel Knighton Authored: Mon Jul 24 13:24:03 2017 -0500 Committer: Joel Knighton Committed: Mon Jul 24 13:24:03 2017 -0500 -- -- - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cba5c7fa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cba5c7fa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cba5c7fa Branch: refs/heads/trunk Commit: cba5c7fa8b3d2889ef41bfbf98c9efa1a354dc29 Parents: 31590f5 572fef8 Author: Ariel Weisberg Authored: Fri Apr 21 16:16:33 2017 -0400 Committer: Ariel Weisberg Committed: Fri Apr 21 16:18:59 2017 -0400 -- CHANGES.txt | 1 + build.xml | 5 - 2 files changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cba5c7fa/CHANGES.txt -- diff --cc CHANGES.txt index 33c24ad,2517432..6ffddc0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,61 -1,11 +1,62 @@@ -2.1.18 +2.2.10 + * Avoid starting gossiper in RemoveTest (CASSANDRA-13407) + * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393) + * Fix JVM metric paths (CASSANDRA-13103) + * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773) + * Discard in-flight shadow round responses (CASSANDRA-12653) + * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153) + * Wrong logger name in AnticompactionTask (CASSANDRA-13343) + * Fix queries updating multiple time the same list (CASSANDRA-13130) + * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053) + * Avoid race on receiver by starting streaming sender thread after sending init message (CASSANDRA-12886) + * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232) + * Coalescing strategy sleeps too much (CASSANDRA-13090) + * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100) + * 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) + * Commitlog replay may fail if last mutation is within 4 bytes of end of segment (CASSANDRA-13282) +Merged from 2.1: + * Set javac encoding to utf-8 (CASSANDRA-13466) * Fix 2ndary index queries on partition keys for tables with static columns (CASSANDRA-13147) * Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364) - * Log stacktrace of uncaught exceptions (CASSANDRA-13108) * Remove unused repositories (CASSANDRA-13278) + * Log stacktrace of uncaught exceptions (CASSANDRA-13108) + -2.1.17 +2.2.9 + * Fix negative mean latency metric (CASSANDRA-12876) + * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) + * Fix speculative retry bugs (CASSANDRA-13009) + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673) + * 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) + * Fix Util.spinAssertEquals (CASSANDRA-12283) + * Fix potential NPE for compactionstats (CASSANDRA-12462) + * Prepare legacy authenticate statement if credentials table initialised after node startup (CASSANDRA-12813) + * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 (CASSANDRA-12754) + * Clean up permissions when a UDA is dropped (CASSANDRA-12720) + * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-7) + * Fix leak errors and execution rejected exceptions when draining (CASSANDRA-12457) + * Fix merkle tree depth calculation (CASSANDRA-12580) + * Make Collections deserializatio
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/590e1512 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/590e1512 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/590e1512 Branch: refs/heads/trunk Commit: 590e1512a9751c437b170d03da9428d18b152def Parents: 470f15b 3dfc784 Author: Michael Shuler Authored: Mon Apr 10 09:09:22 2017 -0500 Committer: Michael Shuler Committed: Mon Apr 10 09:09:22 2017 -0500 -- debian/cassandra.install | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/590e1512/debian/cassandra.install --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e102b41 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e102b41 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e102b41 Branch: refs/heads/trunk Commit: 1e102b41e8ac03e1974a5eafacadc49809831f08 Parents: 377f611 b021a1b Author: Marcus Eriksson Authored: Fri Apr 7 08:09:09 2017 +0200 Committer: Marcus Eriksson Committed: Fri Apr 7 08:09:09 2017 +0200 -- circle.yml | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/377f6117 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/377f6117 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/377f6117 Branch: refs/heads/trunk Commit: 377f6117ce0870758f1b207c3288121e784741e0 Parents: fbb061b 010b5f3 Author: Stefania Alborghetti Authored: Fri Apr 7 09:02:40 2017 +0800 Committer: Stefania Alborghetti Committed: Fri Apr 7 09:02:40 2017 +0800 -- CHANGES.txt| 1 + pylib/cqlshlib/copyutil.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/377f6117/CHANGES.txt -- diff --cc CHANGES.txt index c77576b,31c7b8a..e01a63c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,57 -1,9 +1,58 @@@ -2.1.18 +2.2.10 + * Fix JVM metric paths (CASSANDRA-13103) + * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773) + * Discard in-flight shadow round responses (CASSANDRA-12653) + * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153) + * Wrong logger name in AnticompactionTask (CASSANDRA-13343) + * Fix queries updating multiple time the same list (CASSANDRA-13130) + * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053) + * Avoid race on receiver by starting streaming sender thread after sending init message (CASSANDRA-12886) + * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232) + * Coalescing strategy sleeps too much (CASSANDRA-13090) + * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100) + * 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) + * Commitlog replay may fail if last mutation is within 4 bytes of end of segment (CASSANDRA-13282) +Merged from 2.1: + * Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364) - * Log stacktrace of uncaught exceptions (CASSANDRA-13108) * Remove unused repositories (CASSANDRA-13278) + * Log stacktrace of uncaught exceptions (CASSANDRA-13108) + -2.1.17 +2.2.9 + * Fix negative mean latency metric (CASSANDRA-12876) + * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) + * Fix speculative retry bugs (CASSANDRA-13009) + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673) + * 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) + * Fix Util.spinAssertEquals (CASSANDRA-12283) + * Fix potential NPE for compactionstats (CASSANDRA-12462) + * Prepare legacy authenticate statement if credentials table initialised after node startup (CASSANDRA-12813) + * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 (CASSANDRA-12754) + * Clean up permissions when a UDA is dropped (CASSANDRA-12720) + * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-7) + * Fix leak errors and execution rejected exceptions when draining (CASSANDRA-12457) + * Fix merkle tree depth calculation (CASSANDRA-12580) + * Make Collections deserialization more robust (CASSANDRA-12618) + * Better handle invalid system roles table (CASSANDRA-12700) + * Split consistent range movement flag correction (CASSANDRA-12786) + * CompactionTasks now correctly drops sstables out of compaction when not enough disk spa
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fbb061be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbb061be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbb061be Branch: refs/heads/trunk Commit: fbb061be6c6e832c13da448bdb7e86e2e1fdba75 Parents: a79cc98 d718d42 Author: Jeff Jirsa Authored: Tue Apr 4 14:29:45 2017 -0700 Committer: Jeff Jirsa Committed: Tue Apr 4 14:30:01 2017 -0700 -- circle.yml | 17 + 1 file changed, 17 insertions(+) --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9bbb4497 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bbb4497 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bbb4497 Branch: refs/heads/trunk Commit: 9bbb449736912562348f9f6565a17e6be1c1fba6 Parents: aa66c99 301f7c5 Author: Jeff Jirsa Authored: Wed Mar 1 13:41:06 2017 -0800 Committer: Jeff Jirsa Committed: Wed Mar 1 13:43:37 2017 -0800 -- CHANGES.txt | 1 + build.properties.default | 3 --- build.xml| 5 - 3 files changed, 1 insertion(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bbb4497/CHANGES.txt -- diff --cc CHANGES.txt index c27c2b1,111f3de..404440a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,46 -1,8 +1,47 @@@ -2.1.18 - * Log stacktrace of uncaught exceptions (CASSANDRA-13108) +2.2.10 + * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232) + * Coalescing strategy sleeps too much (CASSANDRA-13090) + * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100) + * 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: + * Remove unused repositories (CASSANDRA-13278) + * Log stacktrace of uncaught exceptions (CASSANDRA-13108) -2.1.17 +2.2.9 + * Fix negative mean latency metric (CASSANDRA-12876) + * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) + * Fix speculative retry bugs (CASSANDRA-13009) + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673) + * 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) + * Fix Util.spinAssertEquals (CASSANDRA-12283) + * Fix potential NPE for compactionstats (CASSANDRA-12462) + * Prepare legacy authenticate statement if credentials table initialised after node startup (CASSANDRA-12813) + * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 (CASSANDRA-12754) + * Clean up permissions when a UDA is dropped (CASSANDRA-12720) + * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-7) + * Fix leak errors and execution rejected exceptions when draining (CASSANDRA-12457) + * Fix merkle tree depth calculation (CASSANDRA-12580) + * Make Collections deserialization more robust (CASSANDRA-12618) + * Better handle invalid system roles table (CASSANDRA-12700) + * Split consistent range movement flag correction (CASSANDRA-12786) + * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979) +Merged from 2.1: * Use portable stderr for java error in startup (CASSANDRA-13211) * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204) * Coalescing strategy can enter infinite loop (CASSANDRA-13159) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bbb4497/build.xml -- diff --cc build.xml index d815ede,da42975..6dbdb9e --- a/build.xml +++ b/build.xml @@@ -654,17 -571,12 +653,15 @@@ dependencyRefsBuildFile="${build.dir}/build-dependencies.xml"> - - + + + - -
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15e71baf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15e71baf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15e71baf Branch: refs/heads/trunk Commit: 15e71baf05f03eeb07aeb3b6dcc547eacf4ee932 Parents: 7841908 3c2f876 Author: Tyler Hobbs Authored: Wed Feb 22 10:09:40 2017 -0600 Committer: Tyler Hobbs Committed: Wed Feb 22 10:09:40 2017 -0600 -- CHANGES.txt| 2 ++ src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15e71baf/CHANGES.txt -- diff --cc CHANGES.txt index 78f55f6,f3de538..91c11fa --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,40 -1,7 +1,42 @@@ -2.1.18 +2.2.10 + * 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) -2.1.17 +2.2.9 + * Coalescing strategy sleeps too much (CASSANDRA-13090) + * Fix negative mean latency metric (CASSANDRA-12876) + * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) + * Fix speculative retry bugs (CASSANDRA-13009) + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673) + * 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) + * Fix Util.spinAssertEquals (CASSANDRA-12283) + * Fix potential NPE for compactionstats (CASSANDRA-12462) + * Prepare legacy authenticate statement if credentials table initialised after node startup (CASSANDRA-12813) + * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 (CASSANDRA-12754) + * Clean up permissions when a UDA is dropped (CASSANDRA-12720) + * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-7) + * Fix leak errors and execution rejected exceptions when draining (CASSANDRA-12457) + * Fix merkle tree depth calculation (CASSANDRA-12580) + * Make Collections deserialization more robust (CASSANDRA-12618) + * Better handle invalid system roles table (CASSANDRA-12700) + * Split consistent range movement flag correction (CASSANDRA-12786) + * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979) +Merged from 2.1: * Use portable stderr for java error in startup (CASSANDRA-13211) * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204) * Coalescing strategy can enter infinite loop (CASSANDRA-13159) http://git-wip-us.apache.org/repos/asf/cassandra/blob/15e71baf/src/java/org/apache/cassandra/service/CassandraDaemon.java --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b9f6de7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b9f6de7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b9f6de7 Branch: refs/heads/trunk Commit: 0b9f6de7a8a68ee7637cde8c17177b21f801f652 Parents: 753d90c cb09079 Author: Michael Shuler Authored: Wed Feb 15 17:57:03 2017 -0600 Committer: Michael Shuler Committed: Wed Feb 15 17:57:03 2017 -0600 -- CHANGES.txt | 1 + bin/cassandra | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b9f6de7/CHANGES.txt -- diff --cc CHANGES.txt index 4052b0f,a3de742..d53457f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,36 -1,5 +1,37 @@@ -2.1.17 +2.2.9 + * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) + * Fix negative mean latency metric (CASSANDRA-12876) + * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) + * Fix speculative retry bugs (CASSANDRA-13009) + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673) + * 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) + * Fix Util.spinAssertEquals (CASSANDRA-12283) + * Fix potential NPE for compactionstats (CASSANDRA-12462) + * Prepare legacy authenticate statement if credentials table initialised after node startup (CASSANDRA-12813) + * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 (CASSANDRA-12754) + * Clean up permissions when a UDA is dropped (CASSANDRA-12720) + * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-7) + * Fix leak errors and execution rejected exceptions when draining (CASSANDRA-12457) + * Fix merkle tree depth calculation (CASSANDRA-12580) + * Make Collections deserialization more robust (CASSANDRA-12618) + * Better handle invalid system roles table (CASSANDRA-12700) + * Split consistent range movement flag correction (CASSANDRA-12786) + * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979) +Merged from 2.1: + * Use portable stderr for java error in startup (CASSANDRA-13211) * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204) * Coalescing strategy can enter infinite loop (CASSANDRA-13159) * Upgrade netty version to fix memory leak with client encryption (CASSANDRA-13114) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b9f6de7/bin/cassandra --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c884b701 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c884b701 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c884b701 Branch: refs/heads/trunk Commit: c884b701d9cd6d8a6e3efbd01b377ac24d3c8e07 Parents: d24d07e a6237bf Author: Jason Brown Authored: Sat Feb 11 07:59:40 2017 -0800 Committer: Jason Brown Committed: Sat Feb 11 08:00:18 2017 -0800 -- CHANGES.txt | 1 + .../org/apache/cassandra/net/OutboundTcpConnection.java | 12 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c884b701/CHANGES.txt -- diff --cc CHANGES.txt index a109042,9ce8d49..fc79796 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,34 -1,5 +1,35 @@@ -2.1.17 +2.2.9 + * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) + * Fix speculative retry bugs (CASSANDRA-13009) + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673) + * 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) + * Fix Util.spinAssertEquals (CASSANDRA-12283) + * Fix potential NPE for compactionstats (CASSANDRA-12462) + * Prepare legacy authenticate statement if credentials table initialised after node startup (CASSANDRA-12813) + * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 (CASSANDRA-12754) + * Clean up permissions when a UDA is dropped (CASSANDRA-12720) + * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-7) + * Fix leak errors and execution rejected exceptions when draining (CASSANDRA-12457) + * Fix merkle tree depth calculation (CASSANDRA-12580) + * Make Collections deserialization more robust (CASSANDRA-12618) + * Better handle invalid system roles table (CASSANDRA-12700) + * Split consistent range movement flag correction (CASSANDRA-12786) + * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979) +Merged from 2.1: + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204) * Coalescing strategy can enter infinite loop (CASSANDRA-13159) * Upgrade netty version to fix memory leak with client encryption (CASSANDRA-13114) * Fix paging for DISTINCT queries on partition keys and static columns (CASSANDRA-13017) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c884b701/src/java/org/apache/cassandra/net/OutboundTcpConnection.java --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d24d07eb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d24d07eb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d24d07eb Branch: refs/heads/trunk Commit: d24d07eb0642484b15064dfa79f47600a932a673 Parents: 7680aeb f6a7057 Author: Jeff Jirsa Authored: Fri Feb 10 15:25:57 2017 -0800 Committer: Jeff Jirsa Committed: Fri Feb 10 15:26:58 2017 -0800 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/utils/CoalescingStrategies.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d24d07eb/CHANGES.txt -- diff --cc CHANGES.txt index 4295dd8,5c86687..a109042 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,34 -1,5 +1,35 @@@ -2.1.17 +2.2.9 + * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) + * Fix speculative retry bugs (CASSANDRA-13009) + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673) + * 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) + * Fix Util.spinAssertEquals (CASSANDRA-12283) + * Fix potential NPE for compactionstats (CASSANDRA-12462) + * Prepare legacy authenticate statement if credentials table initialised after node startup (CASSANDRA-12813) + * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 (CASSANDRA-12754) + * Clean up permissions when a UDA is dropped (CASSANDRA-12720) + * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-7) + * Fix leak errors and execution rejected exceptions when draining (CASSANDRA-12457) + * Fix merkle tree depth calculation (CASSANDRA-12580) + * Make Collections deserialization more robust (CASSANDRA-12618) + * Better handle invalid system roles table (CASSANDRA-12700) + * Split consistent range movement flag correction (CASSANDRA-12786) + * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979) +Merged from 2.1: + * Coalescing strategy can enter infinite loop (CASSANDRA-13159) * Upgrade netty version to fix memory leak with client encryption (CASSANDRA-13114) * Fix paging for DISTINCT queries on partition keys and static columns (CASSANDRA-13017) * Fix race causing infinite loop if Thrift server is stopped before it starts listening (CASSANDRA-12856) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d24d07eb/src/java/org/apache/cassandra/utils/CoalescingStrategies.java --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eaf46a1c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eaf46a1c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eaf46a1c Branch: refs/heads/trunk Commit: eaf46a1c941468c514b3beb56318d9e82ead7697 Parents: 2122ff8 079029a Author: Stefania Alborghetti Authored: Wed Oct 26 08:50:26 2016 +0800 Committer: Stefania Alborghetti Committed: Wed Oct 26 08:50:26 2016 +0800 -- --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/975284cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/975284cd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/975284cd Branch: refs/heads/trunk Commit: 975284cd570324b83fc3b45e7b25499a0429a95c Parents: c70ce63 87034cd Author: Michael Shuler Authored: Wed Oct 5 17:20:44 2016 -0500 Committer: Michael Shuler Committed: Wed Oct 5 17:20:44 2016 -0500 -- --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25159c38 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25159c38 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25159c38 Branch: refs/heads/trunk Commit: 25159c388bf5270e60775171344d9bf9838bbdb4 Parents: 7bd65a1 bc0d1da Author: Marcus Eriksson Authored: Mon Aug 1 10:41:04 2016 +0200 Committer: Marcus Eriksson Committed: Mon Aug 1 10:41:04 2016 +0200 -- CHANGES.txt| 1 + .../org/apache/cassandra/db/compaction/LeveledCompactionTask.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/25159c38/CHANGES.txt -- diff --cc CHANGES.txt index 9a16ee3,8ecc787..c18bad7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,52 -1,12 +1,53 @@@ -2.1.16 +2.2.8 + * 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) + * Synchronize ThriftServer::stop() (CASSANDRA-12105) + * Use dedicated thread for JMX notifications (CASSANDRA-12146) + * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143) + * Improve streaming synchronization and fault tolerance (CASSANDRA-11414) + * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973) + * Don't write shadowed range tombstone (CASSANDRA-12030) +Merged from 2.1: + * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040) * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850) - * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907) * Improve digest calculation in the presence of overlapping tombstones (CASSANDRA-11349) + * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907) + * Account for partition deletions in tombstone histogram (CASSANDRA-12112) -2.1.15 - * Account for partition deletions in tombstone histogram (CASSANDRA-12112) +2.2.7 + * Allow nodetool info to run with readonly JMX access (CASSANDRA-11755) + * Validate bloom_filter_fp_chance against lowest supported + value when the table is created (CASSANDRA-11920) + * RandomAccessReader: call isEOF() only when rebuffering, not for every read operation (CASSANDRA-12013) + * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038) + * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984) + * Persist local metadata earlier in startup sequence (CASSANDRA-11742) + * Run CommitLog tests with different compression settings (CASSANDRA-9039) + * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664) + * Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587) + * Fix possible race condition in CommitLog.recover (CASSANDRA-11743) + * Enable client encryption in sstableloader with cli options (CASSANDRA-11708) + * Possible memory leak in NIODataInputStream (CASSANDRA-11867) + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669) + * Add seconds to cqlsh tracing session duration (CASSANDRA-11753) + * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395) + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626) + * Exit JVM if JMX server fails to startup (CASSANDRA-11540) + * Produce a heap dump when exiting on OOM (CASSANDRA-9861) + * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427) + * Restore ability to filter on clustering columns when using a 2i (CASSANDRA-11510) + * JSON datetime formatting needs timezone (CASSANDRA-11137) + * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502) + * Remove unnescessary file existence check during anticompaction (CASSANDRA-11660) + * Add missing files to debian packages (CASSANDRA-11642) + * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621) + * cqlsh: COPY FROM should use regular inserts for single statement batches and + report errors correctly if workers processes crash on initialization (CASSANDRA-11474) + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553) + * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988) +Merged from 2.1: * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043) * Remove finished incoming streaming connections from MessagingService (CASSANDRA-11854)
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f72927e8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f72927e8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f72927e8 Branch: refs/heads/trunk Commit: f72927e8e502ef97d6edadb4961151b9feee580a Parents: 38ed061 5a9820d Author: Marcus Eriksson Authored: Thu Jun 30 13:13:37 2016 +0200 Committer: Marcus Eriksson Committed: Thu Jun 30 13:15:24 2016 +0200 -- CHANGES.txt | 3 +++ .../cassandra/db/compaction/LazilyCompactedRow.java | 2 ++ .../cassandra/db/compaction/CompactionsCQLTest.java | 15 +++ 3 files changed, 20 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f72927e8/CHANGES.txt -- diff --cc CHANGES.txt index 48bd5aa,354a1c2..13a1c4f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,38 -1,5 +1,41 @@@ -2.1.15 +2.2.8 + * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973) ++Merged from 2.1: + * Account for partition deletions in tombstone histogram (CASSANDRA-12112) ++ + +2.2.7 + * Allow nodetool info to run with readonly JMX access (CASSANDRA-11755) + * Validate bloom_filter_fp_chance against lowest supported + value when the table is created (CASSANDRA-11920) + * RandomAccessReader: call isEOF() only when rebuffering, not for every read operation (CASSANDRA-12013) + * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038) + * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984) + * Persist local metadata earlier in startup sequence (CASSANDRA-11742) + * Run CommitLog tests with different compression settings (CASSANDRA-9039) + * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664) + * Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587) + * Fix possible race condition in CommitLog.recover (CASSANDRA-11743) + * Enable client encryption in sstableloader with cli options (CASSANDRA-11708) + * Possible memory leak in NIODataInputStream (CASSANDRA-11867) + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669) + * Add seconds to cqlsh tracing session duration (CASSANDRA-11753) + * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395) + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626) + * Exit JVM if JMX server fails to startup (CASSANDRA-11540) + * Produce a heap dump when exiting on OOM (CASSANDRA-9861) + * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427) + * Restore ability to filter on clustering columns when using a 2i (CASSANDRA-11510) + * JSON datetime formatting needs timezone (CASSANDRA-11137) + * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502) + * Remove unnescessary file existence check during anticompaction (CASSANDRA-11660) + * Add missing files to debian packages (CASSANDRA-11642) + * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621) + * cqlsh: COPY FROM should use regular inserts for single statement batches and + report errors correctly if workers processes crash on initialization (CASSANDRA-11474) + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553) + * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988) +Merged from 2.1: * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043) * Remove finished incoming streaming connections from MessagingService (CASSANDRA-11854) * Don't try to get sstables for non-repairing column families (CASSANDRA-12077) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f72927e8/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f72927e8/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java -- diff --cc test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java index 4553a45,c8fd781..aa29808 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java @@@ -26,6 -26,8 +26,8 @@@ import org.apache.cassandra.cql3.CQLTes import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.io.sstable.SSTableReader; ++import org.apache.cassan
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb88b8cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb88b8cd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb88b8cd Branch: refs/heads/trunk Commit: bb88b8cdc98a4290c4db6409719cc4e7f3440f7f Parents: 6c445d6 06bb6b9 Author: Stefania Alborghetti Authored: Thu Jun 2 14:07:14 2016 +0200 Committer: Stefania Alborghetti Committed: Thu Jun 2 14:07:14 2016 +0200 -- --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63efa077 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63efa077 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63efa077 Branch: refs/heads/trunk Commit: 63efa07758856ccf8971e2ebbe3bfef190ea2bc2 Parents: 118bea5 5dc7414 Author: Marcus Eriksson Authored: Thu May 26 09:01:11 2016 +0200 Committer: Marcus Eriksson Committed: Thu May 26 09:10:44 2016 +0200 -- .../compaction/AbstractCompactionStrategy.java | 2 +- .../db/compaction/CompactionController.java | 25 +++- .../cassandra/db/compaction/NeverPurgeTest.java | 125 +++ 3 files changed, 148 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63efa077/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63efa077/src/java/org/apache/cassandra/db/compaction/CompactionController.java -- diff --cc src/java/org/apache/cassandra/db/compaction/CompactionController.java index 00d1344,1139ee4..699bc55 --- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java @@@ -41,10 -41,15 +41,14 @@@ import static org.apache.cassandra.db.l public class CompactionController implements AutoCloseable { private static final Logger logger = LoggerFactory.getLogger(CompactionController.class); + static final boolean NEVER_PURGE_TOMBSTONES = Boolean.getBoolean("cassandra.never_purge_tombstones"); public final ColumnFamilyStore cfs; - -// note that overlappingTree and overlappingSSTables will be null if NEVER_PURGE_TOMBSTONES is set - this is a ++// note that overlapIterator and overlappingSSTables will be null if NEVER_PURGE_TOMBSTONES is set - this is a + // good thing so that noone starts using them and thinks that if overlappingSSTables is empty, there + // is no overlap. -private DataTracker.SSTableIntervalTree overlappingTree; private Refs overlappingSSTables; +private OverlapIterator overlapIterator; private final Iterable compacting; public final int gcBefore; @@@ -110,12 -126,12 +125,12 @@@ */ public static Set getFullyExpiredSSTables(ColumnFamilyStore cfStore, Iterable compacting, Iterable overlapping, int gcBefore) { -logger.debug("Checking droppable sstables in {}", cfStore); +logger.trace("Checking droppable sstables in {}", cfStore); - if (compacting == null) + if (compacting == null || NEVER_PURGE_TOMBSTONES) return Collections.emptySet(); -List candidates = new ArrayList(); +List candidates = new ArrayList<>(); long minTimestamp = Long.MAX_VALUE; @@@ -179,9 -191,12 +194,12 @@@ */ public long maxPurgeableTimestamp(DecoratedKey key) { + if (NEVER_PURGE_TOMBSTONES) + return Long.MIN_VALUE; + -List filteredSSTables = overlappingTree.search(key); long min = Long.MAX_VALUE; -for (SSTableReader sstable : filteredSSTables) +overlapIterator.update(key); +for (SSTableReader sstable : overlapIterator.overlaps()) { // if we don't have bloom filter(bf_fp_chance=1.0 or filter file is missing), // we check index file instead. @@@ -202,7 -210,7 +220,8 @@@ public void close() { - overlappingSSTables.release(); + if (overlappingSSTables != null) + overlappingSSTables.release(); } + } http://git-wip-us.apache.org/repos/asf/cassandra/blob/63efa077/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java -- diff --cc test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java index 000,41db92d..5211065 mode 00,100644..100644 --- a/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java @@@ -1,0 -1,125 +1,125 @@@ + /* + * 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://ww
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/118bea59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/118bea59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/118bea59 Branch: refs/heads/trunk Commit: 118bea59e4a0bdc0b9cca9d717685f1157764c15 Parents: 2bacc9a 0318046 Author: Marcus Eriksson Authored: Thu May 26 08:18:21 2016 +0200 Committer: Marcus Eriksson Committed: Thu May 26 08:18:21 2016 +0200 -- CHANGES.txt | 1 + .../repair/RepairMessageVerbHandler.java| 9 +- .../apache/cassandra/repair/RepairRunnable.java | 2 +- .../cassandra/service/ActiveRepairService.java | 92 ++-- .../LeveledCompactionStrategyTest.java | 2 +- .../cassandra/repair/LocalSyncTaskTest.java | 3 +- .../service/ActiveRepairServiceTest.java| 2 +- 7 files changed, 95 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/118bea59/CHANGES.txt -- diff --cc CHANGES.txt index 6a952c4,f73db6e..190c2fa --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ -2.1.15 +2.2.7 + * Enable client encryption in sstableloader with cli options (CASSANDRA-11708) + * Possible memory leak in NIODataInputStream (CASSANDRA-11867) + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669) + * Add seconds to cqlsh tracing session duration (CASSANDRA-11753) + * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395) + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626) + * Exit JVM if JMX server fails to startup (CASSANDRA-11540) + * Produce a heap dump when exiting on OOM (CASSANDRA-9861) + * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427) + * Restore ability to filter on clustering columns when using a 2i (CASSANDRA-11510) + * JSON datetime formatting needs timezone (CASSANDRA-11137) + * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502) + * Remove unnescessary file existence check during anticompaction (CASSANDRA-11660) + * Add missing files to debian packages (CASSANDRA-11642) + * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621) + * cqlsh: COPY FROM should use regular inserts for single statement batches and + report errors correctly if workers processes crash on initialization (CASSANDRA-11474) + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553) + * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988) +Merged from 2.1: + * Clear out parent repair session if repair coordinator dies (CASSANDRA-11824) * Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840) * Do not consider local node a valid source during replace (CASSANDRA-11848) * Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739) http://git-wip-us.apache.org/repos/asf/cassandra/blob/118bea59/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java -- diff --cc src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java index 8a0706a,7debc93..6e7922f --- a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java +++ b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java @@@ -66,26 -66,14 +66,27 @@@ public class RepairMessageVerbHandler i List columnFamilyStores = new ArrayList<>(prepareMessage.cfIds.size()); for (UUID cfId : prepareMessage.cfIds) { -Pair kscf = Schema.instance.getCF(cfId); -ColumnFamilyStore columnFamilyStore = Keyspace.open(kscf.left).getColumnFamilyStore(kscf.right); +ColumnFamilyStore columnFamilyStore = ColumnFamilyStore.getIfExists(cfId); +if (columnFamilyStore == null) +{ + logErrorAndSendFailureResponse(String.format("Table with id %s was dropped during prepare phase of repair", + cfId.toString()), message.from, id); +return; +} columnFamilyStores.add(columnFamilyStore); } +CassandraVersion peerVersion = SystemKeyspace.getReleaseVersion(message.from); +// note that we default isGlobal to true since old version always default to true: +boolean isGlobal
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2bacc9a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2bacc9a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2bacc9a5 Branch: refs/heads/trunk Commit: 2bacc9a5c7a6db3dba59e3039af05b403391cf09 Parents: 907c826 d27f9b0 Author: Yuki Morishita Authored: Wed May 25 19:28:01 2016 -0500 Committer: Yuki Morishita Committed: Wed May 25 19:28:01 2016 -0500 -- CHANGES.txt| 1 + conf/cassandra.yaml| 10 ++ src/java/org/apache/cassandra/config/Config.java | 2 +- .../org/apache/cassandra/streaming/StreamSession.java | 13 - 4 files changed, 20 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/CHANGES.txt -- diff --cc CHANGES.txt index d6750ab,8dfa02a..6a952c4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ -2.1.15 +2.2.7 + * Enable client encryption in sstableloader with cli options (CASSANDRA-11708) + * Possible memory leak in NIODataInputStream (CASSANDRA-11867) + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669) + * Add seconds to cqlsh tracing session duration (CASSANDRA-11753) + * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395) + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626) + * Exit JVM if JMX server fails to startup (CASSANDRA-11540) + * Produce a heap dump when exiting on OOM (CASSANDRA-9861) + * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427) + * Restore ability to filter on clustering columns when using a 2i (CASSANDRA-11510) + * JSON datetime formatting needs timezone (CASSANDRA-11137) + * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502) + * Remove unnescessary file existence check during anticompaction (CASSANDRA-11660) + * Add missing files to debian packages (CASSANDRA-11642) + * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621) + * cqlsh: COPY FROM should use regular inserts for single statement batches and + report errors correctly if workers processes crash on initialization (CASSANDRA-11474) + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553) + * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988) +Merged from 2.1: + * Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840) * Do not consider local node a valid source during replace (CASSANDRA-11848) * Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739) * Add message dropped tasks to nodetool netstats (CASSANDRA-11855) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/conf/cassandra.yaml -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/src/java/org/apache/cassandra/config/Config.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/src/java/org/apache/cassandra/streaming/StreamSession.java --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/907c8263 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/907c8263 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/907c8263 Branch: refs/heads/trunk Commit: 907c8263b7c814de31f4b4e17610e56e68b3a4aa Parents: 148f369 6100eb2 Author: Yuki Morishita Authored: Wed May 25 18:49:20 2016 -0500 Committer: Yuki Morishita Committed: Wed May 25 18:49:20 2016 -0500 -- CHANGES.txt | 1 + .../org/apache/cassandra/dht/BootStrapper.java | 1 + .../org/apache/cassandra/dht/RangeStreamer.java | 48 +++- .../cassandra/service/StorageService.java | 2 +- 4 files changed, 40 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/907c8263/CHANGES.txt -- diff --cc CHANGES.txt index acdf2e9,d914420..d6750ab --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ -2.1.15 +2.2.7 + * Enable client encryption in sstableloader with cli options (CASSANDRA-11708) + * Possible memory leak in NIODataInputStream (CASSANDRA-11867) + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669) + * Add seconds to cqlsh tracing session duration (CASSANDRA-11753) + * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395) + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626) + * Exit JVM if JMX server fails to startup (CASSANDRA-11540) + * Produce a heap dump when exiting on OOM (CASSANDRA-9861) + * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427) + * Restore ability to filter on clustering columns when using a 2i (CASSANDRA-11510) + * JSON datetime formatting needs timezone (CASSANDRA-11137) + * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502) + * Remove unnescessary file existence check during anticompaction (CASSANDRA-11660) + * Add missing files to debian packages (CASSANDRA-11642) + * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621) + * cqlsh: COPY FROM should use regular inserts for single statement batches and + report errors correctly if workers processes crash on initialization (CASSANDRA-11474) + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553) + * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988) +Merged from 2.1: + * Do not consider local node a valid source during replace (CASSANDRA-11848) * Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739) * Add message dropped tasks to nodetool netstats (CASSANDRA-11855) * Don't compute expensive MaxPurgeableTimestamp until we've verified there's an http://git-wip-us.apache.org/repos/asf/cassandra/blob/907c8263/src/java/org/apache/cassandra/dht/BootStrapper.java -- diff --cc src/java/org/apache/cassandra/dht/BootStrapper.java index a6b1ad7,dfefbe9..26fa6b3 --- a/src/java/org/apache/cassandra/dht/BootStrapper.java +++ b/src/java/org/apache/cassandra/dht/BootStrapper.java @@@ -60,21 -55,17 +60,22 @@@ public class BootStrapper extends Progr this.address = address; this.tokens = tokens; -tokenMetadata = tmd; +this.tokenMetadata = tmd; } -public void bootstrap() +public ListenableFuture bootstrap(StreamStateStore stateStore, boolean useStrictConsistency) { -if (logger.isDebugEnabled()) -logger.debug("Beginning bootstrap process"); - -RangeStreamer streamer = new RangeStreamer(tokenMetadata, tokens, address, "Bootstrap"); +logger.trace("Beginning bootstrap process"); + +RangeStreamer streamer = new RangeStreamer(tokenMetadata, + tokens, + address, + "Bootstrap", + useStrictConsistency, + DatabaseDescriptor.getEndpointSnitch(), + stateStore); streamer.addSourceFilter(new RangeStreamer.FailureDetectorSourceFilter(FailureDetector.instance)); + streamer.addSourceFilter(new RangeStreamer.ExcludeLocalNodeFilter()); for (String keyspaceName : Schema.instance.getNonSystemKeyspaces()) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/907c8263/src/java/org/apache/cassandra/dht/RangeStreamer.java -
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6ffa4b7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6ffa4b7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6ffa4b7 Branch: refs/heads/trunk Commit: d6ffa4b7de9ec8b66239b2c75ff860ad6e3aa77a Parents: f463fed 675591d Author: Marcus Eriksson Authored: Tue May 24 07:34:56 2016 +0200 Committer: Marcus Eriksson Committed: Tue May 24 07:34:56 2016 +0200 -- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java| 2 +- .../cassandra/service/ActiveRepairService.java | 59 --- .../service/ActiveRepairServiceTest.java| 75 +++- 4 files changed, 110 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6ffa4b7/CHANGES.txt -- diff --cc CHANGES.txt index 795e823,fcd7c3c..af97cd1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,5 +1,23 @@@ -2.1.15 +2.2.7 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669) + * Add seconds to cqlsh tracing session duration (CASSANDRA-11753) + * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395) + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626) + * Exit JVM if JMX server fails to startup (CASSANDRA-11540) + * Produce a heap dump when exiting on OOM (CASSANDRA-9861) + * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427) + * Restore ability to filter on clustering columns when using a 2i (CASSANDRA-11510) + * JSON datetime formatting needs timezone (CASSANDRA-11137) + * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502) + * Remove unnescessary file existence check during anticompaction (CASSANDRA-11660) + * Add missing files to debian packages (CASSANDRA-11642) + * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621) + * cqlsh: COPY FROM should use regular inserts for single statement batches and + report errors correctly if workers processes crash on initialization (CASSANDRA-11474) + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553) + * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988) +Merged from 2.1: + * Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739) * Add message dropped tasks to nodetool netstats (CASSANDRA-11855) * Don't compute expensive MaxPurgeableTimestamp until we've verified there's an expired tombstone (CASSANDRA-11834) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6ffa4b7/src/java/org/apache/cassandra/db/compaction/CompactionManager.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6ffa4b7/src/java/org/apache/cassandra/service/ActiveRepairService.java -- diff --cc src/java/org/apache/cassandra/service/ActiveRepairService.java index 21cdeae,5297ce3..1ea5aaf --- a/src/java/org/apache/cassandra/service/ActiveRepairService.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java @@@ -373,26 -378,13 +373,26 @@@ public class ActiveRepairServic { assert parentRepairSession != null; ParentRepairSession prs = getParentRepairSession(parentRepairSession); +//A repair will be marked as not global if it is a subrange repair to avoid many small anti-compactions +//in addition to other scenarios such as repairs not involving all DCs or hosts +if (!prs.isGlobal) +{ +logger.info("Not a global repair, will not do anticompaction"); +removeParentRepairSession(parentRepairSession); +return Futures.immediateFuture(Collections.emptyList()); +} +assert prs.ranges.containsAll(successfulRanges) : "Trying to perform anticompaction on unknown ranges"; List> futures = new ArrayList<>(); -for (Map.Entry columnFamilyStoreEntry : prs.columnFamilyStores.entrySet()) +// if we don't have successful repair ranges, then just skip anticompaction +if (!successfulRanges.isEmpty()) { -Refs sstables = prs.getActiveRepairedSSTableRefs(columnFamilyStoreEntry.getKey()); -ColumnFamilyStore cfs = columnFamilyStoreEntry.getValue(); -futures.add(CompactionManager.instance.submitAntiCompaction(cfs, prs.ranges, sstables, prs.repairedAt)); +for (Map.Entry columnFamilyStoreEntry : prs.columnFamilyStores.entrySet()) +
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e0c6a9ec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0c6a9ec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0c6a9ec Branch: refs/heads/trunk Commit: e0c6a9eca074f1be00ef60131f4db40cc4ea5307 Parents: 2837ec6 129b119 Author: Yuki Morishita Authored: Mon May 23 09:52:45 2016 -0500 Committer: Yuki Morishita Committed: Mon May 23 09:52:45 2016 -0500 -- CHANGES.txt | 1 + .../cassandra/tools/nodetool/NetStats.java | 19 +++ 2 files changed, 16 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0c6a9ec/CHANGES.txt -- diff --cc CHANGES.txt index 103d057,7a0ccba..795e823 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,9 +1,25 @@@ -2.1.15 +2.2.7 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669) + * Add seconds to cqlsh tracing session duration (CASSANDRA-11753) + * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395) + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626) + * Exit JVM if JMX server fails to startup (CASSANDRA-11540) + * Produce a heap dump when exiting on OOM (CASSANDRA-9861) + * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427) + * Restore ability to filter on clustering columns when using a 2i (CASSANDRA-11510) + * JSON datetime formatting needs timezone (CASSANDRA-11137) + * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502) + * Remove unnescessary file existence check during anticompaction (CASSANDRA-11660) + * Add missing files to debian packages (CASSANDRA-11642) + * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621) + * cqlsh: COPY FROM should use regular inserts for single statement batches and + report errors correctly if workers processes crash on initialization (CASSANDRA-11474) + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553) + * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988) +Merged from 2.1: + * Add message dropped tasks to nodetool netstats (CASSANDRA-11855) * Don't compute expensive MaxPurgeableTimestamp until we've verified there's an expired tombstone (CASSANDRA-11834) - * Fix paging on DISTINCT queries repeats result when first row in partition changes - (CASSANDRA-11679) * Add option to disable use of severity in DynamicEndpointSnitch (CASSANDRA-11737) * cqlsh COPY FROM fails for null values with non-prepared statements (CASSANDRA-11631) * Make cython optional in pylib/setup.py (CASSANDRA-11630) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0c6a9ec/src/java/org/apache/cassandra/tools/nodetool/NetStats.java -- diff --cc src/java/org/apache/cassandra/tools/nodetool/NetStats.java index 3e06ca0,000..5b84dff mode 100644,00..100644 --- a/src/java/org/apache/cassandra/tools/nodetool/NetStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/NetStats.java @@@ -1,123 -1,0 +1,134 @@@ +/* + * 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 writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.cassandra.tools.nodetool; + +import io.airlift.command.Command; +import io.airlift.command.Option; + +import java.util.Set; + +import org.apache.cassandra.io.util.FileUtils; +import org.apache.cassandra.net.MessagingServiceMBean; +import org.apache.cassandra.streaming.ProgressInfo; +import org.apache.cassandra.streaming.SessionInfo; +import org.apache.cassandra.streaming.StreamState; +import org.apache.cassandra.tools.NodeProbe; +import org.apache.cassandra.tools.NodeTool.NodeToolCmd; + +@Command(name = "netstats", description = "Print network information on provided host (connecting node by defau
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89344f18 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89344f18 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89344f18 Branch: refs/heads/trunk Commit: 89344f182aac51e2047c7d4309c6cc5ed4a0b373 Parents: e8e917f 9359af2 Author: T Jake Luciani Authored: Wed May 18 09:09:43 2016 -0400 Committer: T Jake Luciani Committed: Wed May 18 09:09:43 2016 -0400 -- .../org/apache/cassandra/stress/settings/SettingsPopulation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/280da184 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/280da184 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/280da184 Branch: refs/heads/trunk Commit: 280da1843ee4e2da0274b92afeaf0cd66cf8a5ff Parents: 849a438 fccded5 Author: Josh McKenzie Authored: Fri May 13 12:37:36 2016 -0400 Committer: Josh McKenzie Committed: Fri May 13 12:37:36 2016 -0400 -- src/java/org/apache/cassandra/service/GCInspector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/280da184/src/java/org/apache/cassandra/service/GCInspector.java -- diff --cc src/java/org/apache/cassandra/service/GCInspector.java index 89a4a7e,2d3d4f3..de5acc0 --- a/src/java/org/apache/cassandra/service/GCInspector.java +++ b/src/java/org/apache/cassandra/service/GCInspector.java @@@ -50,32 -48,8 +50,32 @@@ public class GCInspector implements Not private static final Logger logger = LoggerFactory.getLogger(GCInspector.class); final static long MIN_LOG_DURATION = 200; final static long GC_WARN_THRESHOLD_IN_MS = DatabaseDescriptor.getGCWarnThreshold(); - final static long STAT_THRESHOLD = Math.min(GC_WARN_THRESHOLD_IN_MS != 0 ? GC_WARN_THRESHOLD_IN_MS : MIN_LOG_DURATION, MIN_LOG_DURATION); + final static long STAT_THRESHOLD = GC_WARN_THRESHOLD_IN_MS != 0 ? GC_WARN_THRESHOLD_IN_MS : MIN_LOG_DURATION; +/* + * The field from java.nio.Bits that tracks the total number of allocated + * bytes of direct memory requires via ByteBuffer.allocateDirect that have not been GCed. + */ +final static Field BITS_TOTAL_CAPACITY; + +static +{ +Field temp = null; +try +{ +Class bitsClass = Class.forName("java.nio.Bits"); +Field f = bitsClass.getDeclaredField("totalCapacity"); +f.setAccessible(true); +temp = f; +} +catch (Throwable t) +{ +logger.debug("Error accessing field of java.nio.Bits", t); +//Don't care, will just return the dummy value -1 if we can't get at the field in this JVM +} +BITS_TOTAL_CAPACITY = temp; +} + static final class State { final double maxRealTimeElapsed;
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e614433c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e614433c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e614433c Branch: refs/heads/trunk Commit: e614433ce24199a2871f286115c75569d10f1c6f Parents: ac9844b 11d4e73 Author: Aleksey Yeschenko Authored: Tue May 10 16:00:39 2016 +0100 Committer: Aleksey Yeschenko Committed: Tue May 10 16:00:39 2016 +0100 -- CHANGES.txt | 1 + .../org/apache/cassandra/locator/DynamicEndpointSnitch.java | 5 - 2 files changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e614433c/CHANGES.txt -- diff --cc CHANGES.txt index 18cd90b,edf5aa3..2bb3518 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,5 +1,21 @@@ -2.1.15 +2.2.7 + * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395) + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626) + * Exit JVM if JMX server fails to startup (CASSANDRA-11540) + * Produce a heap dump when exiting on OOM (CASSANDRA-9861) + * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427) + * Restore ability to filter on clustering columns when using a 2i (CASSANDRA-11510) + * JSON datetime formatting needs timezone (CASSANDRA-11137) + * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502) + * Remove unnescessary file existence check during anticompaction (CASSANDRA-11660) + * Add missing files to debian packages (CASSANDRA-11642) + * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621) + * cqlsh: COPY FROM should use regular inserts for single statement batches and + report errors correctly if workers processes crash on initialization (CASSANDRA-11474) + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553) + * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988) +Merged from 2.1: + * Add option to disable use of severity in DynamicEndpointSnitch (CASSANDRA-11737) * cqlsh COPY FROM fails for null values with non-prepared statements (CASSANDRA-11631) * Make cython optional in pylib/setup.py (CASSANDRA-11630) * Change order of directory searching for cassandra.in.sh to favor local one (CASSANDRA-11628) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e614433c/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d732823 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d732823 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d732823 Branch: refs/heads/trunk Commit: 3d7328232552d14daaa9f99d842aa53d92fb51f9 Parents: b189a7f aacd452 Author: Robert Stupp Authored: Wed May 4 18:44:35 2016 +0200 Committer: Robert Stupp Committed: Wed May 4 18:44:35 2016 +0200 -- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d732823/src/java/org/apache/cassandra/db/ColumnFamilyStore.java --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bf453a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bf453a4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bf453a4 Branch: refs/heads/trunk Commit: 8bf453a4491c766ec8a920a12f8a87111a7546e4 Parents: d3db33c 5202147 Author: Josh McKenzie Authored: Tue May 3 14:05:23 2016 -0400 Committer: Josh McKenzie Committed: Tue May 3 14:05:23 2016 -0400 -- conf/cassandra-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bf453a4/conf/cassandra-env.sh --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/caaa9fc8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/caaa9fc8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/caaa9fc8 Branch: refs/heads/trunk Commit: caaa9fc82cd51b7321da4dad0715ebc561d180dd Parents: 106750c f3b3c41 Author: Josh McKenzie Authored: Fri Apr 1 11:46:15 2016 -0400 Committer: Josh McKenzie Committed: Fri Apr 1 11:46:15 2016 -0400 -- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 24 ++- .../org/apache/cassandra/db/Directories.java| 2 +- .../db/commitlog/CommitLogSegmentManager.java | 4 +- .../cassandra/io/util/DiskAwareRunnable.java| 5 +- .../apache/cassandra/cql3/OutOfSpaceTest.java | 157 +++ 6 files changed, 185 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/caaa9fc8/CHANGES.txt -- diff --cc CHANGES.txt index 3e51935,50bc894..78ea961 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,45 -1,7 +1,46 @@@ -2.1.14 +2.2.6 + * Add cassandra-stress keystore option (CASSANDRA-9325) + * Fix out-of-space error treatment in memtable flushing (CASSANDRA-11448). - * Backport CASSANDRA-10859 (CASSANDRA-11415) - * COPY FROM fails when importing blob (CASSANDRA-11375) + * Dont mark sstables as repairing with sub range repairs (CASSANDRA-11451) + * Fix use of NullUpdater for 2i during compaction (CASSANDRA-11450) + * Notify when sstables change after cancelling compaction (CASSANDRA-11373) + * cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333) + * Add -Dcassandra.start_gossip startup option (CASSANDRA-10809) + * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748) + * Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900) + * Fix bloom filter sizing with LCS (CASSANDRA-11344) + * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092) + * Fix intra-node serialization issue for multicolumn-restrictions (CASSANDRA-11196) + * Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301) + * Add missing newline at end of bin/cqlsh (CASSANDRA-11325) + * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297) + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210) + * Fix filtering on non-primary key columns for thrift static column families + (CASSANDRA-6377) + * Only log yaml config once, at startup (CASSANDRA-11217) + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164) + * Reference leak with parallel repairs on the same table (CASSANDRA-11215) + * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216) + * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167) + * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840) + * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037) + * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793) + * Protect from keyspace dropped during repair (CASSANDRA-11065) + * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146) + * Better error message for cleanup (CASSANDRA-10991) + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123) + * Use cloned TokenMetadata in size estimates to avoid race against membership check + (CASSANDRA-10736) + * Always persist upsampled index summaries (CASSANDRA-10512) + * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733) + * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048) + * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281) + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) + * Fix paging on DISTINCT queries repeats result when first row in partition changes + (CASSANDRA-10010) +Merged from 2.1: + * Add a -j parameter to scrub/cleanup/upgradesstables to state how + many threads to use (CASSANDRA-11179) * Backport CASSANDRA-10679 (CASSANDRA-9598) * Don't do defragmentation if reading from repaired sstables (CASSANDRA-10342) * Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286) http://git-wip-us.apache.org/repos/asf/cassandra/blob/caaa9fc8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/caaa9fc8/src/java/org/apache/cassandra/db/Directories.java -
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1dac59d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dac59d1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1dac59d1 Branch: refs/heads/trunk Commit: 1dac59d1e75102480a1cb4575cd5c0c30ba6c8c0 Parents: 6ff0065 105fbb3 Author: Yuki Morishita Authored: Wed Mar 30 16:51:35 2016 -0500 Committer: Yuki Morishita Committed: Wed Mar 30 16:51:35 2016 -0500 -- --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ff00655 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ff00655 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ff00655 Branch: refs/heads/trunk Commit: 6ff006554f09b549414ce6af89ba0f7f2982ce62 Parents: fc972b9 5a45aa6 Author: Aleksey Yeschenko Authored: Tue Mar 29 17:57:04 2016 +0100 Committer: Aleksey Yeschenko Committed: Tue Mar 29 17:57:04 2016 +0100 -- --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/897ffe87 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/897ffe87 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/897ffe87 Branch: refs/heads/trunk Commit: 897ffe87e41ab128c9e8969d535cb2a706baf563 Parents: 6c1ef2b 8b8a3f5 Author: Marcus Eriksson Authored: Tue Mar 29 10:54:45 2016 +0200 Committer: Marcus Eriksson Committed: Tue Mar 29 10:54:45 2016 +0200 -- CHANGES.txt | 2 + .../apache/cassandra/db/ColumnFamilyStore.java | 16 .../db/compaction/CompactionManager.java| 40 +--- .../cassandra/service/StorageService.java | 24 +--- .../cassandra/service/StorageServiceMBean.java | 6 +++ .../org/apache/cassandra/tools/NodeProbe.java | 34 +++-- .../cassandra/tools/nodetool/Cleanup.java | 8 +++- .../apache/cassandra/tools/nodetool/Scrub.java | 7 +++- .../tools/nodetool/UpgradeSSTable.java | 7 +++- .../org/apache/cassandra/db/CleanupTest.java| 6 +-- .../unit/org/apache/cassandra/db/ScrubTest.java | 20 +- .../LeveledCompactionStrategyTest.java | 2 +- 12 files changed, 117 insertions(+), 55 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/897ffe87/CHANGES.txt -- diff --cc CHANGES.txt index 91dc588,7794d4f..098d062 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,39 -1,4 +1,41 @@@ -2.1.14 +2.2.6 + * cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333) + * Add -Dcassandra.start_gossip startup option (CASSANDRA-10809) + * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748) + * Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900) + * Fix bloom filter sizing with LCS (CASSANDRA-11344) + * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092) + * Fix intra-node serialization issue for multicolumn-restrictions (CASSANDRA-11196) + * Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301) + * Add missing newline at end of bin/cqlsh (CASSANDRA-11325) + * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297) + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210) + * Fix filtering on non-primary key columns for thrift static column families + (CASSANDRA-6377) + * Only log yaml config once, at startup (CASSANDRA-11217) + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164) + * Reference leak with parallel repairs on the same table (CASSANDRA-11215) + * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216) + * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167) + * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840) + * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037) + * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793) + * Protect from keyspace dropped during repair (CASSANDRA-11065) + * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146) + * Better error message for cleanup (CASSANDRA-10991) + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123) + * Use cloned TokenMetadata in size estimates to avoid race against membership check + (CASSANDRA-10736) + * Always persist upsampled index summaries (CASSANDRA-10512) + * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733) + * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048) + * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281) + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) + * Fix paging on DISTINCT queries repeats result when first row in partition changes + (CASSANDRA-10010) +Merged from 2.1: ++ * Add a -j parameter to scrub/cleanup/upgradesstables to state how ++ many threads to use (CASSANDRA-11179) * Backport CASSANDRA-10679 (CASSANDRA-9598) * Don't do defragmentation if reading from repaired sstables (CASSANDRA-10342) * Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286) http://git-wip-us.apache.org/repos/asf/cassandra/blob/897ffe87/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index da4a84a,3d66d3a..09f58ac --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -1499,74 -1
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c1ef2ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c1ef2ba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c1ef2ba Branch: refs/heads/trunk Commit: 6c1ef2ba4e98d17d7f8b409c2a8c08189b777da9 Parents: cab3d5d a9b5422 Author: Josh McKenzie Authored: Mon Mar 28 13:54:54 2016 -0400 Committer: Josh McKenzie Committed: Mon Mar 28 13:54:54 2016 -0400 -- pylib/cqlshlib/copyutil.py | 98 + 1 file changed, 69 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c1ef2ba/pylib/cqlshlib/copyutil.py --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6d0a752 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6d0a752 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6d0a752 Branch: refs/heads/trunk Commit: b6d0a752e4f681d409518c13bded34086d3d Parents: c74df40 42644c3 Author: Yuki Morishita Authored: Tue Mar 22 16:04:58 2016 -0500 Committer: Yuki Morishita Committed: Tue Mar 22 16:04:58 2016 -0500 -- CHANGES.txt | 1 + bin/nodetool| 38 --- bin/sstablekeys | 21 +--- bin/sstableloader | 13 +++-- bin/sstablescrub| 7 ++- bin/sstableupgrade | 24 ++ bin/sstableverify | 9 +++- .../apache/cassandra/tools/SSTableExport.java | 1 + tools/bin/cassandra-stress | 37 +-- tools/bin/cassandra-stressd | 50 ++-- tools/bin/json2sstable | 19 ++-- tools/bin/sstable2json | 20 +--- tools/bin/sstableexpiredblockers| 10 +++- tools/bin/sstablelevelreset | 36 +- tools/bin/sstablemetadata | 22 ++--- tools/bin/sstableofflinerelevel | 10 +++- tools/bin/sstablerepairedset| 49 --- tools/bin/sstablesplit | 29 18 files changed, 255 insertions(+), 141 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6d0a752/CHANGES.txt -- diff --cc CHANGES.txt index e4db50e,5f01114..91dc588 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,39 -1,5 +1,40 @@@ -2.1.14 +2.2.6 + * cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333) + * Add -Dcassandra.start_gossip startup option (CASSANDRA-10809) + * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748) + * Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900) + * Fix bloom filter sizing with LCS (CASSANDRA-11344) + * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092) + * Fix intra-node serialization issue for multicolumn-restrictions (CASSANDRA-11196) + * Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301) + * Add missing newline at end of bin/cqlsh (CASSANDRA-11325) + * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297) + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210) + * Fix filtering on non-primary key columns for thrift static column families + (CASSANDRA-6377) + * Only log yaml config once, at startup (CASSANDRA-11217) + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164) + * Reference leak with parallel repairs on the same table (CASSANDRA-11215) + * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216) + * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167) + * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840) + * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037) + * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793) + * Protect from keyspace dropped during repair (CASSANDRA-11065) + * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146) + * Better error message for cleanup (CASSANDRA-10991) + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123) + * Use cloned TokenMetadata in size estimates to avoid race against membership check + (CASSANDRA-10736) + * Always persist upsampled index summaries (CASSANDRA-10512) + * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733) + * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048) + * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281) + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) + * Fix paging on DISTINCT queries repeats result when first row in partition changes + (CASSANDRA-10010) +Merged from 2.1: + * Backport CASSANDRA-10679 (CASSANDRA-9598) * Don't do defragmentation if reading from repaired sstables (CASSANDRA-10342) * Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286) * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302) http://git-wip-us.apache.org/repos/asf/cassandra
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5e2d3d2f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e2d3d2f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e2d3d2f Branch: refs/heads/trunk Commit: 5e2d3d2fa751e3ae0b1b1a0643a578709e715448 Parents: 6d383be 41bb4bc Author: Sylvain Lebresne Authored: Thu Mar 17 10:18:58 2016 +0100 Committer: Sylvain Lebresne Committed: Thu Mar 17 10:18:58 2016 +0100 -- doc/cql3/CQL.textile | 22 +++--- 1 file changed, 15 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e2d3d2f/doc/cql3/CQL.textile --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5182376b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5182376b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5182376b Branch: refs/heads/trunk Commit: 5182376b9a6eb3f51c5c1ee2ab63076723660798 Parents: a48b836 0c53c3a Author: Marcus Eriksson Authored: Wed Mar 16 10:47:31 2016 +0100 Committer: Marcus Eriksson Committed: Wed Mar 16 10:47:31 2016 +0100 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/CollationController.java | 6 -- 2 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5182376b/CHANGES.txt -- diff --cc CHANGES.txt index a69164e,04c9204..dca4f8a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,35 -1,5 +1,36 @@@ -2.1.14 +2.2.6 + * Fix bloom filter sizing with LCS (CASSANDRA-11344) + * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092) + * Fix intra-node serialization issue for multicolumn-restrictions (CASSANDRA-11196) + * Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301) + * Add missing newline at end of bin/cqlsh (CASSANDRA-11325) + * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297) + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210) + * Fix filtering on non-primary key columns for thrift static column families + (CASSANDRA-6377) + * Only log yaml config once, at startup (CASSANDRA-11217) + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164) + * Reference leak with parallel repairs on the same table (CASSANDRA-11215) + * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216) + * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167) + * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840) + * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037) + * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793) + * Protect from keyspace dropped during repair (CASSANDRA-11065) + * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146) + * Better error message for cleanup (CASSANDRA-10991) + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123) + * Use cloned TokenMetadata in size estimates to avoid race against membership check + (CASSANDRA-10736) + * Always persist upsampled index summaries (CASSANDRA-10512) + * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733) + * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048) + * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281) + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) + * Fix paging on DISTINCT queries repeats result when first row in partition changes + (CASSANDRA-10010) +Merged from 2.1: + * Don't do defragmentation if reading from repaired sstables (CASSANDRA-10342) * Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286) * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302) * COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5182376b/src/java/org/apache/cassandra/db/CollationController.java --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9ff7fe1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9ff7fe1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9ff7fe1 Branch: refs/heads/trunk Commit: b9ff7fe13740a21da25ed6414ea17fe5530652ea Parents: 7e220bc 561000a Author: Yuki Morishita Authored: Thu Mar 10 13:00:09 2016 -0600 Committer: Yuki Morishita Committed: Thu Mar 10 13:00:09 2016 -0600 -- CHANGES.txt | 1 + conf/cassandra.yaml | 7 +++ .../net/IncomingStreamingConnection.java| 7 ++- .../cassandra/streaming/ConnectionHandler.java | 21 +--- .../cassandra/streaming/StreamSession.java | 2 ++ 5 files changed, 26 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9ff7fe1/CHANGES.txt -- diff --cc CHANGES.txt index b9596d9,4b505f8..045b867 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,32 -1,5 +1,33 @@@ -2.1.14 +2.2.6 + * Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301) + * Add missing newline at end of bin/cqlsh (CASSANDRA-11325) + * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297) + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210) + * Fix filtering on non-primary key columns for thrift static column families + (CASSANDRA-6377) + * Only log yaml config once, at startup (CASSANDRA-11217) + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164) + * Reference leak with parallel repairs on the same table (CASSANDRA-11215) + * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216) + * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167) + * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840) + * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037) + * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793) + * Protect from keyspace dropped during repair (CASSANDRA-11065) + * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146) + * Better error message for cleanup (CASSANDRA-10991) + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123) + * Use cloned TokenMetadata in size estimates to avoid race against membership check + (CASSANDRA-10736) + * Always persist upsampled index summaries (CASSANDRA-10512) + * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733) + * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048) + * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281) + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) + * Fix paging on DISTINCT queries repeats result when first row in partition changes + (CASSANDRA-10010) +Merged from 2.1: + * Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286) * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302) * COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053) * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9ff7fe1/conf/cassandra.yaml -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9ff7fe1/src/java/org/apache/cassandra/net/IncomingStreamingConnection.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9ff7fe1/src/java/org/apache/cassandra/streaming/ConnectionHandler.java -- diff --cc src/java/org/apache/cassandra/streaming/ConnectionHandler.java index 1ec7e1c,52268b2..d4662c7 --- a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java +++ b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java @@@ -170,14 -175,10 +180,11 @@@ public class ConnectionHandle protected static ReadableByteChannel getReadChannel(Socket socket) throws IOException { - ReadableByteChannel in = socket.getChannel(); - // socket channel is null when encrypted(SSL) - return in == null - ? Channels.newChannel(socket.getInputStream()) - : in; + //we do this instead of socket.getChannel() so socketSoTimeout is respected + return Channels.newChannel(socket.getInputStream()); } +@SuppressWarning
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b53d6a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b53d6a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b53d6a5 Branch: refs/heads/trunk Commit: 9b53d6a5b7f8d92203765effaa2e20e88d3b08ae Parents: 2971ff3 e94a2a0 Author: Sylvain Lebresne Authored: Tue Mar 8 17:21:25 2016 +0100 Committer: Sylvain Lebresne Committed: Tue Mar 8 17:21:25 2016 +0100 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 2 files changed, 5 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b53d6a5/CHANGES.txt -- diff --cc CHANGES.txt index 7b67cdc,e7c997a..9d4779a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,30 -1,5 +1,31 @@@ -2.1.14 +2.2.6 + * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297) + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210) + * Fix filtering on non-primary key columns for thrift static column families + (CASSANDRA-6377) + * Only log yaml config once, at startup (CASSANDRA-11217) + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164) + * Reference leak with parallel repairs on the same table (CASSANDRA-11215) + * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216) + * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167) + * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840) + * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037) + * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793) + * Protect from keyspace dropped during repair (CASSANDRA-11065) + * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146) + * Better error message for cleanup (CASSANDRA-10991) + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123) + * Use cloned TokenMetadata in size estimates to avoid race against membership check + (CASSANDRA-10736) + * Always persist upsampled index summaries (CASSANDRA-10512) + * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733) + * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048) + * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281) + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) + * Fix paging on DISTINCT queries repeats result when first row in partition changes + (CASSANDRA-10010) +Merged from 2.1: + * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302) * COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053) * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176) * Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b53d6a5/src/java/org/apache/cassandra/net/OutboundTcpConnection.java --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2971ff3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2971ff3b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2971ff3b Branch: refs/heads/trunk Commit: 2971ff3b4330181518281e11e2b713390294fb72 Parents: b74ffea e01b3a9 Author: Sylvain Lebresne Authored: Tue Mar 8 10:41:32 2016 +0100 Committer: Sylvain Lebresne Committed: Tue Mar 8 10:41:32 2016 +0100 -- src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2971ff3b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1ae9d09 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1ae9d09 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1ae9d09 Branch: refs/heads/trunk Commit: c1ae9d095c9fc8ccc277b04a8aff6b1328294571 Parents: fa2fa60 3b794f0 Author: Marcus Eriksson Authored: Fri Jan 29 08:13:33 2016 +0100 Committer: Marcus Eriksson Committed: Fri Jan 29 08:13:33 2016 +0100 -- --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3b244a3d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b244a3d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b244a3d Branch: refs/heads/trunk Commit: 3b244a3d1419e458248b144fdfb122703c22e405 Parents: dd2006b 8408c76 Author: Yuki Morishita Authored: Fri Jan 22 11:43:27 2016 -0600 Committer: Yuki Morishita Committed: Fri Jan 22 11:43:27 2016 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b244a3d/CHANGES.txt -- diff --cc CHANGES.txt index dcaccfc,e3e53d8..59997ff --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,31 -1,5 +1,32 @@@ -2.1.13 +2.2.5 + * Apply change to compaction throughput in real time (CASSANDRA-10025) + * Fix potential NPE on ORDER BY queries with IN (CASSANDRA-10955) + * Avoid over-fetching during the page of range queries (CASSANDRA-8521) + * Start L0 STCS-compactions even if there is a L0 -> L1 compaction + going (CASSANDRA-10979) + * Make UUID LSB unique per process (CASSANDRA-7925) + * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980) + * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465) + * Fix error streaming section more than 2GB (CASSANDRA-10961) + * (cqlsh) Also apply --connect-timeout to control connection + timeout (CASSANDRA-10959) + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975) + * Enable GC logging by default (CASSANDRA-10140) + * Optimize pending range computation (CASSANDRA-9258) + * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902) + * drop/alter user should be case sensitive (CASSANDRA-10817) + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946) + * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977) + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813) + * Add new types to Stress (CASSANDRA-9556) + * Add property to allow listening on broadcast interface (CASSANDRA-9748) + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) + * Better handling of SSL connection errors inter-node (CASSANDRA-10816) + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) + * (cqlsh) encode input correctly when saving history +Merged from 2.1: + * Fix isJoined return true only after becoming cluster member (CASANDRA-11007) * Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969) * Avoid NPE when incremental repair fails (CASSANDRA-10909) * Unmark sstables compacting once they are done in cleanup/scrub/upgradesstables (CASSANDRA-10829) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b244a3d/src/java/org/apache/cassandra/service/StorageService.java --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/968b1340 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/968b1340 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/968b1340 Branch: refs/heads/trunk Commit: 968b1340a5a12baa649306f4ba793a8abac16cec Parents: e66dcc7 98cc2c8 Author: Marcus Eriksson Authored: Thu Jan 21 09:03:50 2016 +0100 Committer: Marcus Eriksson Committed: Thu Jan 21 09:03:50 2016 +0100 -- CHANGES.txt | 1 + .../org/apache/cassandra/service/ActiveRepairService.java | 9 - 2 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/968b1340/CHANGES.txt -- diff --cc CHANGES.txt index 7003c9c,7175953..ae3082a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,26 -1,7 +1,27 @@@ -2.1.13 +2.2.5 + * Make UUID LSB unique per process (CASSANDRA-7925) + * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980) + * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465) + * Fix error streaming section more than 2GB (CASSANDRA-10961) + * (cqlsh) Also apply --connect-timeout to control connection + timeout (CASSANDRA-10959) + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975) + * Enable GC logging by default (CASSANDRA-10140) + * Optimize pending range computation (CASSANDRA-9258) + * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902) + * drop/alter user should be case sensitive (CASSANDRA-10817) + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946) + * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977) + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813) + * Add new types to Stress (CASSANDRA-9556) + * Add property to allow listening on broadcast interface (CASSANDRA-9748) + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) + * Better handling of SSL connection errors inter-node (CASSANDRA-10816) + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) +Merged from 2.1: + * Avoid NPE when incremental repair fails (CASSANDRA-10909) * Unmark sstables compacting once they are done in cleanup/scrub/upgradesstables (CASSANDRA-10829) - * Revert CASSANDRA-10012 and add more logging (CASSANDRA-10961) * Allow simultaneous bootstrapping with strict consistency when no vnodes are used (CASSANDRA-11005) * Log a message when major compaction does not result in a single file (CASSANDRA-10847) * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997) http://git-wip-us.apache.org/repos/asf/cassandra/blob/968b1340/src/java/org/apache/cassandra/service/ActiveRepairService.java -- diff --cc src/java/org/apache/cassandra/service/ActiveRepairService.java index 61f4196,732267e..9ac1186 --- a/src/java/org/apache/cassandra/service/ActiveRepairService.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java @@@ -421,33 -426,22 +421,32 @@@ public class ActiveRepairServic public static class ParentRepairSession { -public final Map columnFamilyStores = new HashMap<>(); -public final Collection> ranges; -public final Map> sstableMap = new HashMap<>(); -public final long repairedAt; - -public ParentRepairSession(List columnFamilyStores, Collection> ranges, long repairedAt) +private final Map columnFamilyStores = new HashMap<>(); +private final Collection> ranges; +private final Map> sstableMap = new HashMap<>(); +private final long repairedAt; +public final boolean isIncremental; +private final boolean isGlobal; + +public ParentRepairSession(List columnFamilyStores, Collection> ranges, boolean isIncremental, boolean isGlobal, long repairedAt) { for (ColumnFamilyStore cfs : columnFamilyStores) + { this.columnFamilyStores.put(cfs.metadata.cfId, cfs); + sstableMap.put(cfs.metadata.cfId, new HashSet()); + } this.ranges = ranges; this.repairedAt = repairedAt; +this.isGlobal = isGlobal; +this.isIncremental = isIncremental; } +public void addSSTables(UUID cfId, Set sstables) +{ - Set existingSSTables = this.sstableMap.get(cfId); - if (existingSSTables ==
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/476b68a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/476b68a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/476b68a3 Branch: refs/heads/trunk Commit: 476b68a3d78702bc0b6052bdb6b94a7507b7ced1 Parents: 47e8ef9 1b02a6e Author: Marcus Eriksson Authored: Tue Jan 19 09:02:40 2016 +0100 Committer: Marcus Eriksson Committed: Tue Jan 19 09:04:30 2016 +0100 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/476b68a3/CHANGES.txt -- diff --cc CHANGES.txt index f571c29,9b1b79c..7003c9c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,6 +1,26 @@@ -2.1.13 +2.2.5 + * Make UUID LSB unique per process (CASSANDRA-7925) + * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980) + * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465) + * Fix error streaming section more than 2GB (CASSANDRA-10961) + * (cqlsh) Also apply --connect-timeout to control connection + timeout (CASSANDRA-10959) + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975) + * Enable GC logging by default (CASSANDRA-10140) + * Optimize pending range computation (CASSANDRA-9258) + * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902) + * drop/alter user should be case sensitive (CASSANDRA-10817) + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946) + * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977) + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813) + * Add new types to Stress (CASSANDRA-9556) + * Add property to allow listening on broadcast interface (CASSANDRA-9748) + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) + * Better handling of SSL connection errors inter-node (CASSANDRA-10816) + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) +Merged from 2.1: + * Unmark sstables compacting once they are done in cleanup/scrub/upgradesstables (CASSANDRA-10829) - * Revert CASSANDRA-10012 and add more logging (CASSANDRA-10961) * Allow simultaneous bootstrapping with strict consistency when no vnodes are used (CASSANDRA-11005) * Log a message when major compaction does not result in a single file (CASSANDRA-10847) * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997) http://git-wip-us.apache.org/repos/asf/cassandra/blob/476b68a3/src/java/org/apache/cassandra/db/ColumnFamilyStore.java --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b593573 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b593573 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b593573 Branch: refs/heads/trunk Commit: 1b593573603e973379fe1dea9c403f95a212717a Parents: e2050c9 58a0079 Author: Yuki Morishita Authored: Fri Jan 15 12:10:05 2016 -0600 Committer: Yuki Morishita Committed: Fri Jan 15 12:10:05 2016 -0600 -- --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/97474ee3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97474ee3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97474ee3 Branch: refs/heads/trunk Commit: 97474ee36adcd960db4916cd33b533c086228f70 Parents: dbf6e62 26dc07b Author: Aleksey Yeschenko Authored: Thu Jan 14 15:49:16 2016 + Committer: Aleksey Yeschenko Committed: Thu Jan 14 15:49:16 2016 + -- --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8bd8a44 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8bd8a44 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8bd8a44 Branch: refs/heads/trunk Commit: e8bd8a44bcedbefd6874d0eb35e4a03c0027e9f1 Parents: 23123f0 0f27d68 Author: Sam Tunnicliffe Authored: Fri Jan 8 16:05:14 2016 + Committer: Sam Tunnicliffe Committed: Fri Jan 8 16:05:14 2016 + -- CHANGES.txt| 1 + src/java/org/apache/cassandra/gms/Gossiper.java| 13 ++--- .../apache/cassandra/net/IncomingTcpConnection.java| 2 ++ .../apache/cassandra/net/OutboundTcpConnection.java| 2 ++ 4 files changed, 15 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/CHANGES.txt -- diff --cc CHANGES.txt index e5c4430,a6a0c60..50d5f60 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,5 +1,20 @@@ -2.1.13 +2.2.5 + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975) + * Enable GC logging by default (CASSANDRA-10140) + * Optimize pending range computation (CASSANDRA-9258) + * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902) + * drop/alter user should be case sensitive (CASSANDRA-10817) + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946) + * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977) + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813) + * Add new types to Stress (CASSANDRA-9556) + * Add property to allow listening on broadcast interface (CASSANDRA-9748) + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) + * Better handling of SSL connection errors inter-node (CASSANDRA-10816) + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) +Merged from 2.1: + * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072) * Fix pending range calculation during moves (CASSANDRA-10887) * Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708) * Match cassandra-loader options in COPY FROM (CASSANDRA-9303) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/gms/Gossiper.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/net/IncomingTcpConnection.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/net/OutboundTcpConnection.java --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9751eb5c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9751eb5c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9751eb5c Branch: refs/heads/trunk Commit: 9751eb5c320c879b33d7d90e91591a0da23cce9c Parents: 882df8a 1538c09 Author: Yuki Morishita Authored: Wed Dec 2 08:49:32 2015 -0600 Committer: Yuki Morishita Committed: Wed Dec 2 08:49:32 2015 -0600 -- CHANGES.txt | 1 + .../cassandra/repair/AnticompactionTask.java| 23 ++-- .../cassandra/service/ActiveRepairService.java | 21 +- 3 files changed, 32 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9751eb5c/CHANGES.txt -- diff --cc CHANGES.txt index bca5fb0,9c5e2d5..787d145 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,5 +1,24 @@@ -2.1.12 +2.2.4 + * Show CQL help in cqlsh in web browser (CASSANDRA-7225) + * Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775) + * Reject index queries while the index is building (CASSANDRA-8505) + * CQL.textile syntax incorrectly includes optional keyspace for aggregate SFUNC and FINALFUNC (CASSANDRA-10747) + * Fix JSON update with prepared statements (CASSANDRA-10631) + * Don't do anticompaction after subrange repair (CASSANDRA-10422) + * Fix SimpleDateType type compatibility (CASSANDRA-10027) + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) + * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large buffers (CASSANDRA-10592) +Merged from 2.1: + * Fix incremental repair hang when replica is down (CASSANDRA-10288) * Avoid writing range tombstones after END_OF_ROW marker (CASSANDRA-10791) * Optimize the way we check if a token is repaired in anticompaction (CASSANDRA-10768) * Add proper error handling to stream receiver (CASSANDRA-10774) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9751eb5c/src/java/org/apache/cassandra/repair/AnticompactionTask.java -- diff --cc src/java/org/apache/cassandra/repair/AnticompactionTask.java index 16de071,8b68fd3..8ecae23 --- a/src/java/org/apache/cassandra/repair/AnticompactionTask.java +++ b/src/java/org/apache/cassandra/repair/AnticompactionTask.java @@@ -17,16 -17,15 +17,18 @@@ */ package org.apache.cassandra.repair; + import java.io.IOException; import java.net.InetAddress; +import java.util.Collection; import java.util.UUID; import java.util.concurrent.TimeUnit; import com.google.common.util.concurrent.AbstractFuture; import org.apache.cassandra.db.SystemKeyspace; +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Token; + import org.apache.cassandra.gms.FailureDetector; import org.apache.cassandra.net.IAsyncCallbackWithFailure; import org.apache.cassandra.net.MessageIn; import org.apache.cassandra.net.MessagingService; @@@ -54,11 -54,28 +56,20 @@@ public class AnticompactionTask extend public void run() { - AnticompactionRequest acr = new AnticompactionRequest(parentSession, successfulRanges); - CassandraVersion peerVersion = SystemKeyspace.getReleaseVersion(neighbor); - if (peerVersion != null && peerVersion.compareTo(VERSION_CHECKER) > 0) + if (FailureDetector.instance.isAlive(neighbor)) { - MessagingService.instance().sendRR(acr.createMessage(), neighbor, new AnticompactionCallback(this), TimeUnit.DAYS.toMillis(1), true); -AnticompactionRequest acr = new AnticompactionRequest(parentSession); -SemanticVersion peerVersion = SystemKeyspace.getReleaseVersion(neighbor); ++AnticompactionRequest acr = new AnticompactionRequest(parentSession, successfulRanges); ++CassandraVersion peerVersion = SystemKeyspace.getReleaseVersion(neighbor); + if (peerVersion != null && peerVersion.compareTo(VERSION_CHECKER) > 0) + { -if (doAnticompactio
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29ed6fe2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29ed6fe2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29ed6fe2 Branch: refs/heads/trunk Commit: 29ed6fe2ed214b4415ae8d1581579757d44b89c4 Parents: 9f19dd4 5175326 Author: Sam Tunnicliffe Authored: Wed Dec 2 13:11:53 2015 + Committer: Sam Tunnicliffe Committed: Wed Dec 2 13:14:53 2015 + -- src/java/org/apache/cassandra/gms/Gossiper.java | 21 +++- .../cassandra/locator/PropertyFileSnitch.java | 7 ++- .../cassandra/service/MigrationManager.java | 4 ++-- .../apache/cassandra/service/StorageProxy.java | 8 .../cassandra/service/StorageService.java | 12 +-- 5 files changed, 30 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ed6fe2/src/java/org/apache/cassandra/gms/Gossiper.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ed6fe2/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java -- diff --cc src/java/org/apache/cassandra/locator/PropertyFileSnitch.java index 8843b77,dc9a3b8..bfd8e8e --- a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java +++ b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java @@@ -32,8 -31,7 +31,6 @@@ import org.slf4j.Logger import org.slf4j.LoggerFactory; import org.apache.cassandra.exceptions.ConfigurationException; - import org.apache.cassandra.gms.Gossiper; --import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.ResourceWatcher; http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ed6fe2/src/java/org/apache/cassandra/service/MigrationManager.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ed6fe2/src/java/org/apache/cassandra/service/StorageProxy.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ed6fe2/src/java/org/apache/cassandra/service/StorageService.java --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2491ede3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2491ede3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2491ede3 Branch: refs/heads/trunk Commit: 2491ede3515f4b774069ffd645b0fb18f9c73630 Parents: 1b81ad1 5ba69a3 Author: Yuki Morishita Authored: Tue Dec 1 13:05:36 2015 -0600 Committer: Yuki Morishita Committed: Tue Dec 1 13:05:36 2015 -0600 -- CHANGES.txt | 1 + .../cassandra/streaming/StreamReceiveTask.java | 105 ++- 2 files changed, 59 insertions(+), 47 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2491ede3/CHANGES.txt -- diff --cc CHANGES.txt index af1a186,3ce2da6..7541212 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,5 +1,23 @@@ -2.1.12 +2.2.4 + * Show CQL help in cqlsh in web browser (CASSANDRA-7225) + * Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775) + * Reject index queries while the index is building (CASSANDRA-8505) + * CQL.textile syntax incorrectly includes optional keyspace for aggregate SFUNC and FINALFUNC (CASSANDRA-10747) + * Fix JSON update with prepared statements (CASSANDRA-10631) + * Don't do anticompaction after subrange repair (CASSANDRA-10422) + * Fix SimpleDateType type compatibility (CASSANDRA-10027) + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * Add proper error handling to stream receiver (CASSANDRA-10774) * Warn or fail when changing cluster topology live (CASSANDRA-10243) * Status command in debian/ubuntu init script doesn't work (CASSANDRA-10213) * Some DROP ... IF EXISTS incorrectly result in exceptions on non-existing KS (CASSANDRA-10658) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2491ede3/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java -- diff --cc src/java/org/apache/cassandra/streaming/StreamReceiveTask.java index 846524b,8773cab..dd56b8b --- a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java +++ b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java @@@ -37,8 -37,10 +37,9 @@@ import org.apache.cassandra.db.ColumnFa import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.Bounds; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.io.sstable.SSTableReader; -import org.apache.cassandra.io.sstable.SSTableWriter; -import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.io.sstable.format.SSTableWriter; + import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.concurrent.Refs; @@@ -112,63 -117,73 +113,73 @@@ public class StreamReceiveTask extends public void run() { - Pair kscf = Schema.instance.getCF(task.cfId); - if (kscf == null) + try { - // schema was dropped during streaming + Pair kscf = Schema.instance.getCF(task.cfId); + if (kscf == null) + { + // schema was dropped during streaming + for (SSTableWriter writer : task.sstables) + writer.abort(); + task.sstables.clear(); + task.session.taskCompleted(task); + return; + } + ColumnFamilyStore cfs = Keyspace.open(kscf.left).getColumnFamilyStore(kscf.right); + + File lockfiledir = cfs.directories.getWriteableLocationAsFile(task.sstables.size() * 256L); + if (lockfiledir == null) + throw new IOError(new IOException("All disks full")); + StreamLockfile lockfile = new StreamLockfile(lockfiledir, UUID.randomUUID()); + lockfile.create(task.sstables); + List readers =
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9075339 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9075339 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9075339 Branch: refs/heads/trunk Commit: a9075339227fc689a04977f0b9fa714cbc958f15 Parents: 1142183 f5a09c1 Author: Sam Tunnicliffe Authored: Wed Nov 25 10:01:12 2015 + Committer: Sam Tunnicliffe Committed: Wed Nov 25 10:01:12 2015 + -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9075339/CHANGES.txt -- diff --cc CHANGES.txt index d11be26,91f4577..a274ea9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ -2.1.12 +2.2.4 + * Don't do anticompaction after subrange repair (CASSANDRA-10422) + * Fix SimpleDateType type compatibility (CASSANDRA-10027) + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043) * Try next replica if not possible to connect to primary replica on http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9075339/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/056055fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/056055fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/056055fe Branch: refs/heads/trunk Commit: 056055febd55e1c19a6216627b8568e60141b9fa Parents: 2aa8342 8b9a916 Author: Yuki Morishita Authored: Mon Nov 23 13:17:39 2015 -0600 Committer: Yuki Morishita Committed: Mon Nov 23 13:17:39 2015 -0600 -- CHANGES.txt | 1 + .../compress/CompressedInputStream.java | 46 +++-- .../compress/CompressedStreamReader.java| 4 + .../compress/CompressedInputStreamTest.java | 98 +++- 4 files changed, 117 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/056055fe/CHANGES.txt -- diff --cc CHANGES.txt index 146a0ce,c4dd54e..d11be26 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ -2.1.12 +2.2.4 + * Don't do anticompaction after subrange repair (CASSANDRA-10422) + * Fix SimpleDateType type compatibility (CASSANDRA-10027) + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043) * Try next replica if not possible to connect to primary replica on ColumnFamilyRecordReader (CASSANDRA-2388) http://git-wip-us.apache.org/repos/asf/cassandra/blob/056055fe/src/java/org/apache/cassandra/streaming/compress/CompressedInputStream.java -- diff --cc src/java/org/apache/cassandra/streaming/compress/CompressedInputStream.java index 872afcd,b4a3065..daa339a --- a/src/java/org/apache/cassandra/streaming/compress/CompressedInputStream.java +++ b/src/java/org/apache/cassandra/streaming/compress/CompressedInputStream.java @@@ -60,20 -62,25 +60,23 @@@ public class CompressedInputStream exte private static final byte[] POISON_PILL = new byte[0]; private long totalCompressedBytesRead; -private final boolean hasPostCompressionAdlerChecksums; + private Thread readerThread; + /** * @param source Input source to read compressed data from * @param info Compression info */ -public CompressedInputStream(InputStream source, CompressionInfo info, boolean hasPostCompressionAdlerChecksums) +public CompressedInputStream(InputStream source, CompressionInfo info) { this.info = info; -this.checksum = hasPostCompressionAdlerChecksums ? new Adler32() : new CRC32(); -this.hasPostCompressionAdlerChecksums = hasPostCompressionAdlerChecksums; +this.checksum = new Adler32(); this.buffer = new byte[info.parameters.chunkLength()]; // buffer is limited to store up to 1024 chunks - this.dataBuffer = new ArrayBlockingQueue(Math.min(info.chunks.length, 1024)); + this.dataBuffer = new ArrayBlockingQueue<>(Math.min(info.chunks.length, 1024)); - new Thread(new Reader(source, info, dataBuffer)).start(); + readerThread = new Thread(new Reader(source, info, dataBuffer)); + readerThread.start(); } public int read() throws IOException http://git-wip-us.apache.org/repos/asf/cassandra/blob/056055fe/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/056055fe/test/unit/org/apache/cassandra/streaming/compress/CompressedInputStreamTest.java -- diff --cc test/unit/org/apache/cassandra/streaming/compress/CompressedInputStreamTest.java index 0214c76,87e0003..e692441 --- a/test/unit/org/apache/cassandra/streaming/compress/CompressedInputStreamTest.java +++ b/test/unit/org/apache/cassandra/streaming/compress/CompressedInputStreamTest.java @@@ -58,6 -56,53 +56,53 @@@ public class CompressedIn
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ae64cc0d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae64cc0d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae64cc0d Branch: refs/heads/trunk Commit: ae64cc0da4b83289a88478c48ae73f608990a0ec Parents: afe3fe3 8385bb6 Author: Yuki Morishita Authored: Tue Nov 17 18:07:42 2015 -0600 Committer: Yuki Morishita Committed: Tue Nov 17 18:07:42 2015 -0600 -- CHANGES.txt | 1 + .../io/compress/CompressionMetadata.java| 30 +++ .../streaming/messages/FileMessageHeader.java | 53 ++-- .../streaming/messages/IncomingFileMessage.java | 2 +- .../streaming/messages/OutgoingFileMessage.java | 14 ++ .../compress/CompressedInputStreamTest.java | 7 +++ 6 files changed, 91 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae64cc0d/CHANGES.txt -- diff --cc CHANGES.txt index 4cb9275,008d4d4..572afc2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ -2.1.12 +2.2.4 + * Don't do anticompaction after subrange repair (CASSANDRA-10422) + * Fix SimpleDateType type compatibility (CASSANDRA-10027) + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * Create compression chunk for sending file only (CASSANDRA-10680) * Make buffered read size configurable (CASSANDRA-10249) * Forbid compact clustering column type changes in ALTER TABLE (CASSANDRA-8879) * Reject incremental repair with subrange repair (CASSANDRA-10422) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae64cc0d/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae64cc0d/src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java -- diff --cc src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java index e9c99fe,34d9a01..e9a727f --- a/src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java +++ b/src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java @@@ -44,14 -43,16 +44,20 @@@ public class FileMessageHeade public final int sequenceNumber; /** SSTable version */ public final String version; + +/** SSTable format **/ +public final SSTableFormat.Type format; public final long estimatedKeys; public final List> sections; + /** + * Compression info for SSTable to send. Can be null if SSTable is not compressed. + * On sender, this field is always null to avoid holding large number of Chunks. + * Use compressionMetadata instead. + */ public final CompressionInfo compressionInfo; + private final CompressionMetadata compressionMetadata; public final long repairedAt; +public final int sstableLevel; public FileMessageHeader(UUID cfId, int sequenceNumber, @@@ -70,10 -68,33 +76,38 @@@ this.estimatedKeys = estimatedKeys; this.sections = sections; this.compressionInfo = compressionInfo; + this.compressionMetadata = null; + this.repairedAt = repairedAt; ++this.sstableLevel = sstableLevel; + } + + public FileMessageHeader(UUID cfId, + int sequenceNumber, + String version, ++ SSTableFormat.Type format, + long estimatedKeys, + List> sections, + CompressionMetadata compressionMetadata, - long repairedAt) ++ long repairedAt, ++ int sstableLevel) + { + this.cfId = cfId; + this.sequenceNumber = sequenceNumber; + this.version = version; ++this.format = format; + this.estimatedKeys = es
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bfbcca1b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfbcca1b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bfbcca1b Branch: refs/heads/trunk Commit: bfbcca1bf536e4d3eff0ad438e8c3221dc2485d8 Parents: b05fe4f 582b66f Author: Joshua McKenzie Authored: Fri Nov 13 09:17:40 2015 -0500 Committer: Joshua McKenzie Committed: Fri Nov 13 09:17:40 2015 -0500 -- src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfbcca1b/src/java/org/apache/cassandra/gms/Gossiper.java --
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d84b42b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d84b42b3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d84b42b3 Branch: refs/heads/trunk Commit: d84b42b325f711e9a7cf0ae65c2428b884464936 Parents: e487553 9ab1c83 Author: Yuki Morishita Authored: Thu Nov 12 09:44:18 2015 -0600 Committer: Yuki Morishita Committed: Thu Nov 12 09:44:18 2015 -0600 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d84b42b3/CHANGES.txt -- diff --cc CHANGES.txt index 0fcf037,d0c0af9..2cfcb55 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ -2.1.12 +2.2.4 + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * Shutdown compaction in drain to prevent leak (CASSANDRA-10079) * Invalidate cache after stream receive task is completed (CASSANDRA-10341) * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258) * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4875535 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4875535 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4875535 Branch: refs/heads/trunk Commit: e487553575d95cb5fcf28a98a8be6d4b8a26bced Parents: 6bb6bb0 1c3ff92 Author: Yuki Morishita Authored: Wed Nov 11 16:13:58 2015 -0600 Committer: Yuki Morishita Committed: Wed Nov 11 16:13:58 2015 -0600 -- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 35 +++ .../db/compaction/CompactionController.java | 5 -- src/java/org/apache/cassandra/dht/Bounds.java | 62 .../cassandra/io/sstable/SSTableRewriter.java | 1 - .../cassandra/streaming/StreamReader.java | 1 - .../cassandra/streaming/StreamReceiveTask.java | 35 +++ .../apache/cassandra/db/CounterCacheTest.java | 45 ++ .../org/apache/cassandra/db/RowCacheTest.java | 51 .../org/apache/cassandra/dht/BoundsTest.java| 61 +++ 10 files changed, 290 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4875535/CHANGES.txt -- diff --cc CHANGES.txt index 0557786,92244a0..0fcf037 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ -2.1.12 +2.2.4 + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * Invalidate cache after stream receive task is completed (CASSANDRA-10341) * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258) * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605) * Improve json2sstable error reporting on nonexistent columns (CASSANDRA-10401) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4875535/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index d553f4d,54f6fff..2d58219 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -2519,6 -2505,37 +2519,41 @@@ public class ColumnFamilyStore implemen CacheService.instance.invalidateCounterCacheForCf(metadata.ksAndCFName); } + public int invalidateRowCache(Collection> boundsToInvalidate) + { + int invalidatedKeys = 0; -for (RowCacheKey key : CacheService.instance.rowCache.getKeySet()) ++for (Iterator keyIter = CacheService.instance.rowCache.keyIterator(); ++ keyIter.hasNext(); ) + { ++RowCacheKey key = keyIter.next(); + DecoratedKey dk = partitioner.decorateKey(ByteBuffer.wrap(key.key)); + if (key.ksAndCFName.equals(metadata.ksAndCFName) && Bounds.isInBounds(dk.getToken(), boundsToInvalidate)) + { + invalidateCachedRow(dk); + invalidatedKeys++; + } + } + + return invalidatedKeys; + } + + public int invalidateCounterCache(Collection> boundsToInvalidate) + { + int invalidatedKeys = 0; -for (CounterCacheKey key : CacheService.instance.counterCache.getKeySet()) ++for (Iterator keyIter = CacheService.instance.counterCache.keyIterator(); ++ keyIter.hasNext(); ) + { ++CounterCacheKey key = keyIter.next(); + DecoratedKey dk = partitioner.decorateKey(ByteBuffer.wrap(key.partitionKey)); + if (key.ksAndCFName.equals(metadata.ksAndCFName) && Bounds.isInBounds(dk.getToken(), boundsToInvalidate)) + { + CacheService.instance.counterCache.remove(key); + invalidatedKeys++; + } + } + return invalidatedKeys; + } + /** * @return true if @param key is contained in the row cache */ http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4875535/src/java/org/apache/cassandra/db/compaction/CompactionController.java