[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c59897b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c59897b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c59897b6 Branch: refs/heads/trunk Commit: c59897b6cab7eff453c1cb759fb209d3d229f3c4 Parents: 6c867f0 1dffa02 Author: Stefania Alborghetti Authored: Fri Jun 10 15:18:31 2016 -0500 Committer: Stefania Alborghetti Committed: Fri Jun 10 15:18:31 2016 -0500 -- CHANGES.txt | 3 ++- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c59897b6/CHANGES.txt -- diff --cc CHANGES.txt index cdbaebb,7ec3ae9..fd2fe79 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ -2.2.7 +3.0.8 + * Add TimeWindowCompactionStrategy (CASSANDRA-9666) - ++Merged from 2.2: + * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984) + +3.0.7 + * Fix legacy serialization of Thrift-generated non-compound range tombstones + when communicating with 2.x nodes (CASSANDRA-11930) + * Fix Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849) + * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912) + * Fix sstables not being protected from removal during index build (CASSANDRA-11905) + * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032) + * Remove unneeded code to repair index summaries that have + been improperly down-sampled (CASSANDRA-11127) + * Avoid WriteTimeoutExceptions during commit log replay due to materialized + view lock contention (CASSANDRA-11891) + * Prevent OOM failures on SSTable corruption, improve tests for corruption detection (CASSANDRA-9530) + * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705) + * Allow compaction strategies to disable early open (CASSANDRA-11754) + * Refactor Materialized View code (CASSANDRA-11475) + * Update Java Driver (CASSANDRA-11615) +Merged from 2.2: * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c59897b6/src/java/org/apache/cassandra/service/StorageService.java -- diff --cc src/java/org/apache/cassandra/service/StorageService.java index eb56089,6b64664..5167151 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -221,10 -209,10 +221,10 @@@ public class StorageService extends Not /* This abstraction maintains the token/endpoint metadata information */ private TokenMetadata tokenMetadata = new TokenMetadata(); -public volatile VersionedValue.VersionedValueFactory valueFactory = new VersionedValue.VersionedValueFactory(getPartitioner()); +public volatile VersionedValue.VersionedValueFactory valueFactory = new VersionedValue.VersionedValueFactory(tokenMetadata.partitioner); private Thread drainOnShutdown = null; - private boolean inShutdownHook = false; + private volatile boolean inShutdownHook = false; public static final StorageService instance = new StorageService();
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dbc40b1e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dbc40b1e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dbc40b1e Branch: refs/heads/trunk Commit: dbc40b1ed8dc0bd018b7e31c24363bb9e3e0e0c9 Parents: 70115ff fd91e15 Author: Josh McKenzie Authored: Fri Jun 17 12:50:02 2016 -0400 Committer: Josh McKenzie Committed: Fri Jun 17 12:50:02 2016 -0400 -- test/unit/org/apache/cassandra/db/marshal/TimeTypeTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0a0e97df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a0e97df Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a0e97df Branch: refs/heads/trunk Commit: 0a0e97df548db21ba8ed4469244c878b4da3ed93 Parents: 863dbc7 142f358 Author: Sam Tunnicliffe Authored: Mon Jun 20 14:05:13 2016 +0100 Committer: Sam Tunnicliffe Committed: Mon Jun 20 14:11:34 2016 +0100 -- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 137 +++ .../org/apache/cassandra/transport/Server.java | 22 ++- 3 files changed, 37 insertions(+), 123 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a0e97df/CHANGES.txt -- diff --cc CHANGES.txt index 4c0d9a0,76e601c..7873742 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,31 -1,6 +1,32 @@@ -2.2.7 +3.0.8 + * Add TimeWindowCompactionStrategy (CASSANDRA-9666) +Merged from 2.2: + * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038) * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984) +Merged from 2.1: + * Cache local ranges when calculating repair neighbors (CASSANDRA-11934) + * Allow LWT operation on static column with only partition keys (CASSANDRA-10532) + * Create interval tree over canonical sstables to avoid missing sstables during streaming (CASSANDRA-11886) + * cqlsh COPY FROM: shutdown parent cluster after forking, to avoid corrupting SSL connections (CASSANDRA-11749) + + +3.0.7 + * Fix legacy serialization of Thrift-generated non-compound range tombstones + when communicating with 2.x nodes (CASSANDRA-11930) + * Fix Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849) + * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912) + * Fix sstables not being protected from removal during index build (CASSANDRA-11905) + * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032) + * Remove unneeded code to repair index summaries that have + been improperly down-sampled (CASSANDRA-11127) + * Avoid WriteTimeoutExceptions during commit log replay due to materialized + view lock contention (CASSANDRA-11891) + * Prevent OOM failures on SSTable corruption, improve tests for corruption detection (CASSANDRA-9530) + * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705) + * Allow compaction strategies to disable early open (CASSANDRA-11754) + * Refactor Materialized View code (CASSANDRA-11475) + * Update Java Driver (CASSANDRA-11615) +Merged from 2.2: * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a0e97df/src/java/org/apache/cassandra/service/StorageService.java -- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 5167151,a877074..394220d --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -26,37 -22,12 +22,13 @@@ import java.lang.management.ManagementF import java.net.InetAddress; import java.net.UnknownHostException; import java.nio.ByteBuffer; - import java.util.ArrayList; - import java.util.Arrays; - import java.util.Collection; - import java.util.Collections; - import java.util.EnumMap; - import java.util.HashMap; - import java.util.HashSet; - import java.util.Iterator; - import java.util.LinkedHashMap; - import java.util.LinkedList; - import java.util.List; - import java.util.Map; + import java.util.*; import java.util.Map.Entry; - import java.util.Set; - import java.util.SortedMap; - import java.util.TreeMap; - import java.util.UUID; - import java.util.concurrent.CopyOnWriteArrayList; - import java.util.concurrent.ExecutionException; - import java.util.concurrent.ExecutorService; - import java.util.concurrent.Future; - import java.util.concurrent.FutureTask; - import java.util.concurrent.TimeUnit; - import java.util.concurrent.TimeoutException; + import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; +import javax.annotation.Nullable; - import javax.management.JMX; - import javax.management.MBeanServer; - import javax.management.NotificationBroadcasterSupport; - import javax.management.ObjectName; + import javax.management.*; import javax.manag
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6572234 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6572234 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6572234 Branch: refs/heads/trunk Commit: b6572234459c68ebae43a1e8594d1d801238bddc Parents: b671522 68398ad Author: Stefania Alborghetti Authored: Tue Jun 21 08:36:36 2016 +0200 Committer: Stefania Alborghetti Committed: Tue Jun 21 08:36:36 2016 +0200 -- --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 * cassandra-2.2: Fix CompressorTest on non-x86 environment Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d354ddcf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d354ddcf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d354ddcf Branch: refs/heads/trunk Commit: d354ddcfbedca0e0ed4175689260e1145ad62bae Parents: 969f797 8d5b7b6 Author: Sylvain Lebresne Authored: Thu Jun 23 10:46:31 2016 +0200 Committer: Sylvain Lebresne Committed: Thu Jun 23 10:46:31 2016 +0200 -- test/unit/org/apache/cassandra/io/compress/CompressorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d354ddcf/test/unit/org/apache/cassandra/io/compress/CompressorTest.java --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 * cassandra-2.2: Allow nodetool info to run with readonly JMX access Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d7eb187 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d7eb187 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d7eb187 Branch: refs/heads/trunk Commit: 0d7eb18786a1e589ec803a07ac9ae9e77f481edb Parents: 40ab631 774e59d Author: Sylvain Lebresne Authored: Thu Jun 23 11:12:51 2016 +0200 Committer: Sylvain Lebresne Committed: Thu Jun 23 11:12:51 2016 +0200 -- CHANGES.txt | 1 + .../cassandra/locator/EndpointSnitchInfo.java | 11 +++ .../locator/EndpointSnitchInfoMBean.java | 9 + .../org/apache/cassandra/tools/NodeProbe.java | 18 ++ 4 files changed, 23 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d7eb187/CHANGES.txt -- diff --cc CHANGES.txt index d57fb7d,0be1043..ddbac69 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,38 -1,10 +1,39 @@@ -2.2.7 +3.0.8 + * Fix upgrading schema with super columns with non-text subcomparators (CASSANDRA-12023) + * Add TimeWindowCompactionStrategy (CASSANDRA-9666) +Merged from 2.2: + * 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) +Merged from 2.1: + * Prevent select statements with clustering key > 64k (CASSANDRA-11882) + * Fix clock skew corrupting other nodes with paxos (CASSANDRA-11991) + * Remove distinction between non-existing static columns and existing but null in LWTs (CASSANDRA-9842) + * Cache local ranges when calculating repair neighbors (CASSANDRA-11934) + * Allow LWT operation on static column with only partition keys (CASSANDRA-10532) + * Create interval tree over canonical sstables to avoid missing sstables during streaming (CASSANDRA-11886) + * cqlsh COPY FROM: shutdown parent cluster after forking, to avoid corrupting SSL connections (CASSANDRA-11749) + + +3.0.7 + * Fix legacy serialization of Thrift-generated non-compound range tombstones + when communicating with 2.x nodes (CASSANDRA-11930) + * Fix Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849) + * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912) + * Fix sstables not being protected from removal during index build (CASSANDRA-11905) + * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032) + * Remove unneeded code to repair index summaries that have + been improperly down-sampled (CASSANDRA-11127) + * Avoid WriteTimeoutExceptions during commit log replay due to materialized + view lock contention (CASSANDRA-11891) + * Prevent OOM failures on SSTable corruption, improve tests for corruption detection (CASSANDRA-9530) + * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705) + * Allow compaction strategies to disable early open (CASSANDRA-11754) + * Refactor Materialized View code (CASSANDRA-11475) + * Update Java Driver (CASSANDRA-11615) +Merged from 2.2: * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d7eb187/src/java/org/apache/cassandra/tools/NodeProbe.java --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bfe09f4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bfe09f4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bfe09f4 Branch: refs/heads/trunk Commit: 8bfe09f4660aee6401b36f43322adfca6273d786 Parents: f2afd04 3db30aa Author: Marcus Eriksson Authored: Wed Apr 27 10:10:42 2016 +0200 Committer: Marcus Eriksson Committed: Wed Apr 27 10:10:42 2016 +0200 -- CHANGES.txt | 1 + .../apache/cassandra/db/compaction/CompactionManager.java| 8 2 files changed, 1 insertion(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bfe09f4/CHANGES.txt -- diff --cc CHANGES.txt index f02d4f2,e8a301a..bc15d32 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ -2.2.7 +3.0.6 + * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654) + * Ignore all LocalStrategy keyspaces for streaming and other related + operations (CASSANDRA-11627) + * Ensure columnfilter covers indexed columns for thrift 2i queries (CASSANDRA-11523) + * Only open one sstable scanner per sstable (CASSANDRA-11412) + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410) + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485) + * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470) + * Notify indexers of expired rows during compaction (CASSANDRA-11329) + * Properly respond with ProtocolError when a v1/v2 native protocol + header is received (CASSANDRA-11464) + * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120) +Merged from 2.2: + * 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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bfe09f4/src/java/org/apache/cassandra/db/compaction/CompactionManager.java --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3fc10676 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3fc10676 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3fc10676 Branch: refs/heads/trunk Commit: 3fc106761ca2618f4a1af518ca7b51f182790976 Parents: 7a2be8f 88f22b9 Author: Stefania Alborghetti Authored: Thu Apr 28 09:12:56 2016 +0800 Committer: Stefania Alborghetti Committed: Thu Apr 28 09:13:41 2016 +0800 -- CHANGES.txt | 1 + NEWS.txt| 8 .../apache/cassandra/serializers/TimestampSerializer.java | 9 ++--- .../apache/cassandra/cql3/validation/entities/JsonTest.java | 6 -- 4 files changed, 19 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fc10676/CHANGES.txt -- diff --cc CHANGES.txt index 8877fa9,91179b3..46206b1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,5 +1,19 @@@ -2.2.7 +3.0.6 + * Don't require HEAP_NEW_SIZE to be set when using G1 (CASSANDRA-11600) + * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654) + * Ignore all LocalStrategy keyspaces for streaming and other related + operations (CASSANDRA-11627) + * Ensure columnfilter covers indexed columns for thrift 2i queries (CASSANDRA-11523) + * Only open one sstable scanner per sstable (CASSANDRA-11412) + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410) + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485) + * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470) + * Notify indexers of expired rows during compaction (CASSANDRA-11329) + * Properly respond with ProtocolError when a v1/v2 native protocol + header is received (CASSANDRA-11464) + * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120) +Merged from 2.2: + * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fc10676/NEWS.txt -- diff --cc NEWS.txt index 1b982cb,a3ba0dd..3dcb387 --- a/NEWS.txt +++ b/NEWS.txt @@@ -13,7 -13,15 +13,15 @@@ restore snapshots created with the prev 'sstableloader' tool. You can upgrade the file format of your snapshots using the provided 'sstableupgrade' tool. -2.2.7 ++3.0.6 + = + + New features + + - JSON timestamps are now in UTC and contain the timezone information, see + CASSANDRA-11137 for more details. + -2.2.6 +3.0.5 = Upgrading http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fc10676/src/java/org/apache/cassandra/serializers/TimestampSerializer.java -- diff --cc src/java/org/apache/cassandra/serializers/TimestampSerializer.java index fbd98d1,77a5df9..9bd9a8d --- a/src/java/org/apache/cassandra/serializers/TimestampSerializer.java +++ b/src/java/org/apache/cassandra/serializers/TimestampSerializer.java @@@ -97,26 -96,16 +97,29 @@@ public class TimestampSerializer implem } }; +private static final String UTC_FORMAT = dateStringPatterns[40]; +private static final ThreadLocal FORMATTER_UTC = new ThreadLocal() +{ +protected SimpleDateFormat initialValue() +{ +SimpleDateFormat sdf = new SimpleDateFormat(UTC_FORMAT); +sdf.setTimeZone(TimeZone.getTimeZone("UTC")); +return sdf; +} +}; + + private static final String TO_JSON_FORMAT = dateStringPatterns[19]; private static final ThreadLocal FORMATTER_TO_JSON = new ThreadLocal() { protected SimpleDateFormat initialValue() { - return new SimpleDateFormat(dateStringPatterns[15]); + SimpleDateFormat sdf = new SimpleDateFormat(TO_JSON_FORMAT); + sdf.setTimeZone(TimeZone.getTimeZone("UTC")); + return sdf; } }; + + public static final TimestampSerializer instance = new TimestampSerializer(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fc10676/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/943e732c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/943e732c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/943e732c Branch: refs/heads/trunk Commit: 943e732caeb1da59e5e9af5479cd9d75ca9d9030 Parents: 474d3bf dff7b44 Author: Sam Tunnicliffe Authored: Fri Apr 29 11:50:03 2016 +0100 Committer: Sam Tunnicliffe Committed: Fri Apr 29 11:55:07 2016 +0100 -- CHANGES.txt | 1 + .../restrictions/PrimaryKeyRestrictionSet.java | 71 +++- .../restrictions/StatementRestrictions.java | 34 +++--- .../SelectSingleColumnRelationTest.java | 4 ++ 4 files changed, 97 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/943e732c/CHANGES.txt -- diff --cc CHANGES.txt index 268d011,fb06cd6..3184cce --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,5 +1,20 @@@ -2.2.7 +3.0.6 + * Fix paging for range queries where all clustering columns are specified (CASSANDRA-11669) + * Don't require HEAP_NEW_SIZE to be set when using G1 (CASSANDRA-11600) + * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654) + * Ignore all LocalStrategy keyspaces for streaming and other related + operations (CASSANDRA-11627) + * Ensure columnfilter covers indexed columns for thrift 2i queries (CASSANDRA-11523) + * Only open one sstable scanner per sstable (CASSANDRA-11412) + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410) + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485) + * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470) + * Notify indexers of expired rows during compaction (CASSANDRA-11329) + * Properly respond with ProtocolError when a v1/v2 native protocol + header is received (CASSANDRA-11464) + * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120) +Merged from 2.2: + * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/943e732c/src/java/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSet.java -- diff --cc src/java/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSet.java index 8121858,0c10f13..e063f91 --- a/src/java/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSet.java +++ b/src/java/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSet.java @@@ -64,27 -67,48 +64,58 @@@ final class PrimaryKeyRestrictionSet ex */ private boolean contains; +/** + * true if the restrictions corresponding to a partition key, false if it's clustering columns. + */ +private boolean isPartitionKey; + /** + * If restrictions apply to clustering columns, we need to check whether they can be satisfied by an index lookup + * as this affects which other restrictions can legally be specified (if an index is present, we are more lenient + * about what additional filtering can be performed on the results of a lookup - see CASSANDRA-11510). + * + * We don't hold a reference to the SecondaryIndexManager itself as this is not strictly a singleton (although + * we often treat is as one), the field would also require annotation with @Unmetered to avoid blowing up the + * object size (used when calculating the size of prepared statements for caching). Instead, we refer to the + * CFMetaData and retrieve the index manager when necessary. + * + * There are a couple of scenarios where the CFM can be null (and we make sure and test for null when we use it): + * * where an empty set of restrictions are created for use in processing query results - see + *SelectStatement.forSelection + * * where the restrictions apply to partition keys and not clustering columns e.g. + *StatementRestrictions.partitionKeyRestrictions + * * in unit tests (in particular PrimaryKeyRestrictionSetTest which is primarily concerned with the correct + *generation of bounds when secondary indexes are not used). + */ + private final CFMetaData cfm; + -public PrimaryKeyRestrictionSet(CType ctype) +public PrimaryKeyRestrictio
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a5d0a1e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a5d0a1e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a5d0a1e Branch: refs/heads/trunk Commit: 5a5d0a1eb46dfa308acc9cff28f8c65fbb026b81 Parents: 958183f 2837ec6 Author: Benedict Elliott Smith Authored: Wed May 18 21:51:40 2016 +0100 Committer: Benedict Elliott Smith Committed: Wed May 18 21:51:40 2016 +0100 -- .../apache/cassandra/db/ColumnFamilyStore.java | 41 +--- 1 file changed, 19 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a5d0a1e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 98ba781,45486c1..a6d5c17 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -1973,35 -2762,30 +1973,32 @@@ public class ColumnFamilyStore implemen final long truncatedAt; final ReplayPosition replayAfter; - synchronized (data) -if (keyspace.getMetadata().durableWrites || takeSnapshot) ++if (keyspace.getMetadata().params.durableWrites || DatabaseDescriptor.isAutoSnapshot()) + { + replayAfter = forceBlockingFlush(); ++viewManager.forceBlockingFlush(); + } + else { - if (keyspace.getMetadata().params.durableWrites || DatabaseDescriptor.isAutoSnapshot()) + // just nuke the memtable data w/o writing to disk first -Future replayAfterFuture; -synchronized (data) ++viewManager.dumpMemtables(); ++try { - replayAfter = forceBlockingFlush(); - viewManager.forceBlockingFlush(); -final Flush flush = new Flush(true); -flushExecutor.execute(flush); -replayAfterFuture = postFlushExecutor.submit(flush.postFlush); ++replayAfter = dumpMemtable().get(); +} - else ++catch (Exception e) +{ - // just nuke the memtable data w/o writing to disk first - viewManager.dumpMemtables(); - try - { - replayAfter = dumpMemtable().get(); - } - catch (Exception e) - { - throw new RuntimeException(e); - } ++throw new RuntimeException(e); } - - long now = System.currentTimeMillis(); - // make sure none of our sstables are somehow in the future (clock drift, perhaps) - for (ColumnFamilyStore cfs : concatWithIndexes()) - for (SSTableReader sstable : cfs.data.getSSTables()) - now = Math.max(now, sstable.maxDataAge); - truncatedAt = now; -replayAfter = FBUtilities.waitOnFuture(replayAfterFuture); } + long now = System.currentTimeMillis(); + // make sure none of our sstables are somehow in the future (clock drift, perhaps) + for (ColumnFamilyStore cfs : concatWithIndexes()) + for (SSTableReader sstable : cfs.data.getSSTables()) + now = Math.max(now, sstable.maxDataAge); + truncatedAt = now; + Runnable truncateRunnable = new Runnable() { public void run()
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/407dc30e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/407dc30e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/407dc30e Branch: refs/heads/trunk Commit: 407dc30e277e99644805b6a93f432bd5e80fbd3d Parents: fe3f3da 23d4822 Author: Tyler Hobbs Authored: Wed Aug 24 16:52:27 2016 -0500 Committer: Tyler Hobbs Committed: Wed Aug 24 16:52:27 2016 -0500 -- src/java/org/apache/cassandra/service/paxos/ProposeCallback.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/431ecdb6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/431ecdb6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/431ecdb6 Branch: refs/heads/trunk Commit: 431ecdb6b4dd01c4f32d9a64a7cef2a107d1366c Parents: 407dc30 b9fc6a5 Author: Stefania Alborghetti Authored: Thu Aug 25 09:10:20 2016 +0800 Committer: Stefania Alborghetti Committed: Thu Aug 25 09:10:20 2016 +0800 -- CHANGES.txt| 1 + pylib/cqlshlib/copyutil.py | 16 +--- 2 files changed, 14 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/431ecdb6/CHANGES.txt -- diff --cc CHANGES.txt index bd1fc5d,001a389..9bd0434 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,43 -1,5 +1,44 @@@ -2.2.8 +3.0.9 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385) + * Calculate last compacted key on startup (CASSANDRA-6216) + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE statements (CASSANDRA-7190) + * Fix clean interval not sent to commit log for empty memtable flush (CASSANDRA-12436) + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) + * Backport CASSANDRA-12002 (CASSANDRA-12177) + * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100) + * Fix potential bad messaging service message for paged range reads + within mixed-version 3.x clusters (CASSANDRA-12249) + * Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828) + * NullPointerException during compaction on table with static columns (CASSANDRA-12336) + * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823) + * Fix upgrade of super columns on thrift (CASSANDRA-12335) + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359) + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277) + * Exception when computing read-repair for range tombstones (CASSANDRA-12263) + * Lost counter writes in compact table and static columns (CASSANDRA-12219) + * AssertionError with MVs on updating a row that isn't indexed due to a null value (CASSANDRA-12247) + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980) + * Add option to override compaction space check (CASSANDRA-12180) + * Faster startup by only scanning each directory for temporary files once (CASSANDRA-12114) + * Respond with v1/v2 protocol header when responding to driver that attempts + to connect with too low of a protocol version (CASSANDRA-11464) + * NullPointerExpception when reading/compacting table (CASSANDRA-11988) + * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144) + * Fix paging logic for deleted partitions with static columns (CASSANDRA-12107) + * Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393) + * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147) + * Fix upgrading sparse tables that are incorrectly marked as dense (CASSANDRA-11315) + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733) + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098) + * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996) + * Always select the live sstables when getting sstables in bounds (CASSANDRA-11944) + * Fix column ordering of results with static columns for Thrift requests in + a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of + those static columns in query results (CASSANDRA-12123) + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090) + * Fix EOF exception when altering column type (CASSANDRA-11820) +Merged from 2.2: + * cqlsh copy: fix missing counter values (CASSANDRA-12476) * Move migration tasks to non-periodic queue, assure flush executor shutdown after non-periodic executor (CASSANDRA-12251) * cqlsh copy: fixed possible race in initializing feeding thread (CASSANDRA-11701) * Only set broadcast_rpc_address on Ec2MultiRegionSnitch if it's not set (CASSANDRA-11357) http://git-wip-us.apache.org/repos/asf/cassandra/blob/431ecdb6/pylib/cqlshlib/copyutil.py --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8303fd1f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8303fd1f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8303fd1f Branch: refs/heads/trunk Commit: 8303fd1f5c23b45b65b662db423fa6bbd2832635 Parents: 5cda140 acd46ab Author: Aleksey Yeschenko Authored: Tue Aug 30 16:33:31 2016 +0100 Committer: Aleksey Yeschenko Committed: Tue Aug 30 16:33:31 2016 +0100 -- CHANGES.txt | 1 + .../apache/cassandra/repair/RepairRunnable.java | 18 ++ 2 files changed, 15 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8303fd1f/CHANGES.txt -- diff --cc CHANGES.txt index 7a1fbc5,74c44f8..fcbf1e4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,49 -1,5 +1,50 @@@ -2.2.8 +3.0.9 + * Fix file system race condition that may cause LogAwareFileLister to fail to classify files (CASSANDRA-11889) + * Fix file handle leaks due to simultaneous compaction/repair and + listing snapshots, calculating snapshot sizes, or making schema + changes (CASSANDRA-11594) + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508) + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504) + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385) + * Calculate last compacted key on startup (CASSANDRA-6216) + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE statements (CASSANDRA-7190) + * Fix clean interval not sent to commit log for empty memtable flush (CASSANDRA-12436) + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) + * Backport CASSANDRA-12002 (CASSANDRA-12177) + * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100) + * Fix potential bad messaging service message for paged range reads + within mixed-version 3.x clusters (CASSANDRA-12249) + * Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828) + * NullPointerException during compaction on table with static columns (CASSANDRA-12336) + * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823) + * Fix upgrade of super columns on thrift (CASSANDRA-12335) + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359) + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277) + * Exception when computing read-repair for range tombstones (CASSANDRA-12263) + * Lost counter writes in compact table and static columns (CASSANDRA-12219) + * AssertionError with MVs on updating a row that isn't indexed due to a null value (CASSANDRA-12247) + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980) + * Add option to override compaction space check (CASSANDRA-12180) + * Faster startup by only scanning each directory for temporary files once (CASSANDRA-12114) + * Respond with v1/v2 protocol header when responding to driver that attempts + to connect with too low of a protocol version (CASSANDRA-11464) + * NullPointerExpception when reading/compacting table (CASSANDRA-11988) + * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144) + * Fix paging logic for deleted partitions with static columns (CASSANDRA-12107) + * Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393) + * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147) + * Fix upgrading sparse tables that are incorrectly marked as dense (CASSANDRA-11315) + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733) + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098) + * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996) + * Always select the live sstables when getting sstables in bounds (CASSANDRA-11944) + * Fix column ordering of results with static columns for Thrift requests in + a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of + those static columns in query results (CASSANDRA-12123) + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090) + * Fix EOF exception when altering column type (CASSANDRA-11820) +Merged from 2.2: + * Fail repair on non-existing table (CASSANDRA-12279) * cqlsh copy: fix missing counter values (CASSANDRA-12476) * Move migration tasks to non-periodic queue, assure flush executor shutdown after non-periodic executor (CASSANDRA-12251) * cqlsh cop
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3483418b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3483418b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3483418b Branch: refs/heads/trunk Commit: 3483418bda4eb34b7aab5e9f80c1a0cefbc072b7 Parents: 8303fd1 6eff082 Author: Aleksey Yeschenko Authored: Tue Aug 30 16:48:31 2016 +0100 Committer: Aleksey Yeschenko Committed: Tue Aug 30 16:48:31 2016 +0100 -- CHANGES.txt | 1 + .../cassandra/repair/messages/RepairOption.java | 6 +- .../cassandra/service/StorageService.java | 2 +- .../repair/messages/RepairOptionTest.java | 20 4 files changed, 27 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3483418b/CHANGES.txt -- diff --cc CHANGES.txt index fcbf1e4,0f7cf0e..5349c14 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,49 -1,5 +1,50 @@@ -2.2.8 +3.0.9 + * Fix file system race condition that may cause LogAwareFileLister to fail to classify files (CASSANDRA-11889) + * Fix file handle leaks due to simultaneous compaction/repair and + listing snapshots, calculating snapshot sizes, or making schema + changes (CASSANDRA-11594) + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508) + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504) + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385) + * Calculate last compacted key on startup (CASSANDRA-6216) + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE statements (CASSANDRA-7190) + * Fix clean interval not sent to commit log for empty memtable flush (CASSANDRA-12436) + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) + * Backport CASSANDRA-12002 (CASSANDRA-12177) + * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100) + * Fix potential bad messaging service message for paged range reads + within mixed-version 3.x clusters (CASSANDRA-12249) + * Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828) + * NullPointerException during compaction on table with static columns (CASSANDRA-12336) + * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823) + * Fix upgrade of super columns on thrift (CASSANDRA-12335) + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359) + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277) + * Exception when computing read-repair for range tombstones (CASSANDRA-12263) + * Lost counter writes in compact table and static columns (CASSANDRA-12219) + * AssertionError with MVs on updating a row that isn't indexed due to a null value (CASSANDRA-12247) + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980) + * Add option to override compaction space check (CASSANDRA-12180) + * Faster startup by only scanning each directory for temporary files once (CASSANDRA-12114) + * Respond with v1/v2 protocol header when responding to driver that attempts + to connect with too low of a protocol version (CASSANDRA-11464) + * NullPointerExpception when reading/compacting table (CASSANDRA-11988) + * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144) + * Fix paging logic for deleted partitions with static columns (CASSANDRA-12107) + * Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393) + * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147) + * Fix upgrading sparse tables that are incorrectly marked as dense (CASSANDRA-11315) + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733) + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098) + * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996) + * Always select the live sstables when getting sstables in bounds (CASSANDRA-11944) + * Fix column ordering of results with static columns for Thrift requests in + a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of + those static columns in query results (CASSANDRA-12123) + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090) + * Fix EOF exception when altering column type (CASSANDRA-11820) +Merged from 2.2: + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522) * Fail repair on non-existing table (CASSAND
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4a53f4d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4a53f4d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4a53f4d Branch: refs/heads/trunk Commit: e4a53f4d3160833af3ea7917a35e7e35ae02786d Parents: ab98b11 b39d984 Author: Aleksey Yeschenko Authored: Wed Aug 31 20:24:03 2016 +0100 Committer: Aleksey Yeschenko Committed: Wed Aug 31 20:25:24 2016 +0100 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 5 +- .../apache/cassandra/gms/VersionedValue.java| 6 + .../apache/cassandra/locator/TokenMetadata.java | 52 ++- .../cassandra/service/LoadBroadcaster.java | 2 +- .../cassandra/service/StorageService.java | 136 +++ 6 files changed, 173 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4a53f4d/CHANGES.txt -- diff --cc CHANGES.txt index 4b77e4d,d7e9394..30931d3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,50 -1,5 +1,51 @@@ -2.2.8 +3.0.9 + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata (CASSANDRA-12208) + * Fix file system race condition that may cause LogAwareFileLister to fail to classify files (CASSANDRA-11889) + * Fix file handle leaks due to simultaneous compaction/repair and + listing snapshots, calculating snapshot sizes, or making schema + changes (CASSANDRA-11594) + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508) + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504) + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385) + * Calculate last compacted key on startup (CASSANDRA-6216) + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE statements (CASSANDRA-7190) + * Fix clean interval not sent to commit log for empty memtable flush (CASSANDRA-12436) + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) + * Backport CASSANDRA-12002 (CASSANDRA-12177) + * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100) + * Fix potential bad messaging service message for paged range reads + within mixed-version 3.x clusters (CASSANDRA-12249) + * Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828) + * NullPointerException during compaction on table with static columns (CASSANDRA-12336) + * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823) + * Fix upgrade of super columns on thrift (CASSANDRA-12335) + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359) + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277) + * Exception when computing read-repair for range tombstones (CASSANDRA-12263) + * Lost counter writes in compact table and static columns (CASSANDRA-12219) + * AssertionError with MVs on updating a row that isn't indexed due to a null value (CASSANDRA-12247) + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980) + * Add option to override compaction space check (CASSANDRA-12180) + * Faster startup by only scanning each directory for temporary files once (CASSANDRA-12114) + * Respond with v1/v2 protocol header when responding to driver that attempts + to connect with too low of a protocol version (CASSANDRA-11464) + * NullPointerExpception when reading/compacting table (CASSANDRA-11988) + * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144) + * Fix paging logic for deleted partitions with static columns (CASSANDRA-12107) + * Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393) + * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147) + * Fix upgrading sparse tables that are incorrectly marked as dense (CASSANDRA-11315) + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733) + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098) + * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996) + * Always select the live sstables when getting sstables in bounds (CASSANDRA-11944) + * Fix column ordering of results with static columns for Thrift requests in + a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of + those static columns in query results (CASSANDRA-12123) + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090) + * Fix EO
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/20dd606e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20dd606e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/20dd606e Branch: refs/heads/trunk Commit: 20dd606e7bf49f3954af85407b65e304401fed7d Parents: a1d9a02 40c2d45 Author: Stefania Alborghetti Authored: Thu Sep 1 10:19:25 2016 +0800 Committer: Stefania Alborghetti Committed: Thu Sep 1 10:19:25 2016 +0800 -- CHANGES.txt| 1 + pylib/cqlshlib/test/cassconnect.py | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/20dd606e/CHANGES.txt -- diff --cc CHANGES.txt index 8fde74e,a6a1114..0d425d6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,51 -1,5 +1,52 @@@ -2.2.8 +3.0.9 + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565) + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata (CASSANDRA-12208) + * Fix file system race condition that may cause LogAwareFileLister to fail to classify files (CASSANDRA-11889) + * Fix file handle leaks due to simultaneous compaction/repair and + listing snapshots, calculating snapshot sizes, or making schema + changes (CASSANDRA-11594) + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508) + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504) + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385) + * Calculate last compacted key on startup (CASSANDRA-6216) + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE statements (CASSANDRA-7190) + * Fix clean interval not sent to commit log for empty memtable flush (CASSANDRA-12436) + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) + * Backport CASSANDRA-12002 (CASSANDRA-12177) + * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100) + * Fix potential bad messaging service message for paged range reads + within mixed-version 3.x clusters (CASSANDRA-12249) + * Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828) + * NullPointerException during compaction on table with static columns (CASSANDRA-12336) + * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823) + * Fix upgrade of super columns on thrift (CASSANDRA-12335) + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359) + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277) + * Exception when computing read-repair for range tombstones (CASSANDRA-12263) + * Lost counter writes in compact table and static columns (CASSANDRA-12219) + * AssertionError with MVs on updating a row that isn't indexed due to a null value (CASSANDRA-12247) + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980) + * Add option to override compaction space check (CASSANDRA-12180) + * Faster startup by only scanning each directory for temporary files once (CASSANDRA-12114) + * Respond with v1/v2 protocol header when responding to driver that attempts + to connect with too low of a protocol version (CASSANDRA-11464) + * NullPointerExpception when reading/compacting table (CASSANDRA-11988) + * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144) + * Fix paging logic for deleted partitions with static columns (CASSANDRA-12107) + * Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393) + * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147) + * Fix upgrading sparse tables that are incorrectly marked as dense (CASSANDRA-11315) + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733) + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098) + * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996) + * Always select the live sstables when getting sstables in bounds (CASSANDRA-11944) + * Fix column ordering of results with static columns for Thrift requests in + a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of + those static columns in query results (CASSANDRA-12123) + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090) + * Fix EOF exception when altering column type (CASSANDRA-11820) +Merged from 2.2: + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481) * Forward writes to replacement node when replace_address != broadcast_address
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cded2764 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cded2764 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cded2764 Branch: refs/heads/trunk Commit: cded2764534d3f7a6ed5bd379523258b7cd3a04a Parents: 5847222 ad4a91d Author: Carl Yeksigian Authored: Thu Sep 1 17:11:12 2016 -0400 Committer: Carl Yeksigian Committed: Thu Sep 1 17:11:12 2016 -0400 -- CHANGES.txt | 1 + .../org/apache/cassandra/locator/PropertyFileSnitch.java | 11 +-- 2 files changed, 10 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cded2764/CHANGES.txt -- diff --cc CHANGES.txt index e5e2b9c,fae713e..5cf351a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,53 -1,5 +1,54 @@@ -2.2.8 +3.0.9 + * select_distinct_with_deletions_test failing on non-vnode environments (CASSANDRA-11126) + * Stack Overflow returned to queries while upgrading (CASSANDRA-12527) + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565) + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata (CASSANDRA-12208) + * Fix file system race condition that may cause LogAwareFileLister to fail to classify files (CASSANDRA-11889) + * Fix file handle leaks due to simultaneous compaction/repair and + listing snapshots, calculating snapshot sizes, or making schema + changes (CASSANDRA-11594) + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508) + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504) + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385) + * Calculate last compacted key on startup (CASSANDRA-6216) + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE statements (CASSANDRA-7190) + * Fix clean interval not sent to commit log for empty memtable flush (CASSANDRA-12436) + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) + * Backport CASSANDRA-12002 (CASSANDRA-12177) + * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100) + * Fix potential bad messaging service message for paged range reads + within mixed-version 3.x clusters (CASSANDRA-12249) + * Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828) + * NullPointerException during compaction on table with static columns (CASSANDRA-12336) + * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823) + * Fix upgrade of super columns on thrift (CASSANDRA-12335) + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359) + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277) + * Exception when computing read-repair for range tombstones (CASSANDRA-12263) + * Lost counter writes in compact table and static columns (CASSANDRA-12219) + * AssertionError with MVs on updating a row that isn't indexed due to a null value (CASSANDRA-12247) + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980) + * Add option to override compaction space check (CASSANDRA-12180) + * Faster startup by only scanning each directory for temporary files once (CASSANDRA-12114) + * Respond with v1/v2 protocol header when responding to driver that attempts + to connect with too low of a protocol version (CASSANDRA-11464) + * NullPointerExpception when reading/compacting table (CASSANDRA-11988) + * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144) + * Fix paging logic for deleted partitions with static columns (CASSANDRA-12107) + * Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393) + * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147) + * Fix upgrading sparse tables that are incorrectly marked as dense (CASSANDRA-11315) + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733) + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098) + * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996) + * Always select the live sstables when getting sstables in bounds (CASSANDRA-11944) + * Fix column ordering of results with static columns for Thrift requests in + a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of + those static columns in query results (CASSANDRA-12123) + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090) + * Fix EOF
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc1cbdeb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc1cbdeb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc1cbdeb Branch: refs/heads/trunk Commit: fc1cbdeb6ee554da91a9be602b37e3628a34a484 Parents: ead27d9 38ff407 Author: Tyler Hobbs Authored: Wed Sep 21 13:53:27 2016 -0500 Committer: Tyler Hobbs Committed: Wed Sep 21 13:53:27 2016 -0500 -- CHANGES.txt | 3 +++ .../service/PendingRangeCalculatorService.java| 18 +++--- 2 files changed, 14 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc1cbdeb/CHANGES.txt -- diff --cc CHANGES.txt index abffd80,96f97f4..b873eb1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,66 -1,6 +1,69 @@@ -2.2.8 +3.0.10 + * Establish consistent distinction between non-existing partition and NULL value for LWTs on static columns (CASSANDRA-12060) + * Extend ColumnIdentifier.internedInstances key to include the type that generated the byte buffer (CASSANDRA-12516) + * Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472) + * If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499) ++Merged from 2.2: + * Decrement pending range calculator jobs counter in finally block + (CASSANDRA-12554) +Merged from 2.1: + * Add system property to set the max number of native transport requests in queue (CASSANDRA-11363) + + +3.0.9 + * Handle composite prefixes with final EOC=0 as in 2.x and refactor LegacyLayout.decodeBound (CASSANDRA-12423) + * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195) + * select_distinct_with_deletions_test failing on non-vnode environments (CASSANDRA-11126) + * Stack Overflow returned to queries while upgrading (CASSANDRA-12527) + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565) + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata (CASSANDRA-12208) + * Fix file system race condition that may cause LogAwareFileLister to fail to classify files (CASSANDRA-11889) + * Fix file handle leaks due to simultaneous compaction/repair and + listing snapshots, calculating snapshot sizes, or making schema + changes (CASSANDRA-11594) + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508) + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504) + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385) + * Calculate last compacted key on startup (CASSANDRA-6216) + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE statements (CASSANDRA-7190) + * Fix clean interval not sent to commit log for empty memtable flush (CASSANDRA-12436) + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) + * Backport CASSANDRA-12002 (CASSANDRA-12177) + * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100) + * Fix potential bad messaging service message for paged range reads + within mixed-version 3.x clusters (CASSANDRA-12249) + * Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828) + * NullPointerException during compaction on table with static columns (CASSANDRA-12336) + * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823) + * Fix upgrade of super columns on thrift (CASSANDRA-12335) + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359) + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277) + * Exception when computing read-repair for range tombstones (CASSANDRA-12263) + * Lost counter writes in compact table and static columns (CASSANDRA-12219) + * AssertionError with MVs on updating a row that isn't indexed due to a null value (CASSANDRA-12247) + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980) + * Add option to override compaction space check (CASSANDRA-12180) + * Faster startup by only scanning each directory for temporary files once (CASSANDRA-12114) + * Respond with v1/v2 protocol header when responding to driver that attempts + to connect with too low of a protocol version (CASSANDRA-11464) + * NullPointerExpception when reading/compacting table (CASSANDRA-11988) + * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144) + * Fix paging logic for deleted partitions with static columns (CASSANDRA-12107) + * Wait until the message is being
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47b50b45 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47b50b45 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47b50b45 Branch: refs/heads/trunk Commit: 47b50b45577ec5cb3b25729c866b71e80ab7722f Parents: 88d4791 50726e7 Author: Stefania Alborghetti Authored: Thu Sep 22 08:58:52 2016 +0800 Committer: Stefania Alborghetti Committed: Thu Sep 22 08:58:52 2016 +0800 -- CHANGES.txt | 1 + bin/cqlsh.py | 18 -- 2 files changed, 13 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/47b50b45/CHANGES.txt -- diff --cc CHANGES.txt index 1a97087,ee4015e..d9db977 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,70 -1,7 +1,71 @@@ -2.2.8 +3.0.10 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() (CASSANDRA-11670) + * Establish consistent distinction between non-existing partition and NULL value for LWTs on static columns (CASSANDRA-12060) + * Extend ColumnIdentifier.internedInstances key to include the type that generated the byte buffer (CASSANDRA-12516) + * Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472) + * If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499) +Merged from 2.2: + * Fix authentication problem when invoking clqsh copy from a SOURCE command (CASSANDRA-12642) * Decrement pending range calculator jobs counter in finally block (CASSANDRA-12554) +Merged from 2.1: + * Add system property to set the max number of native transport requests in queue (CASSANDRA-11363) + + +3.0.9 + * Handle composite prefixes with final EOC=0 as in 2.x and refactor LegacyLayout.decodeBound (CASSANDRA-12423) + * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195) + * select_distinct_with_deletions_test failing on non-vnode environments (CASSANDRA-11126) + * Stack Overflow returned to queries while upgrading (CASSANDRA-12527) + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565) + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata (CASSANDRA-12208) + * Fix file system race condition that may cause LogAwareFileLister to fail to classify files (CASSANDRA-11889) + * Fix file handle leaks due to simultaneous compaction/repair and + listing snapshots, calculating snapshot sizes, or making schema + changes (CASSANDRA-11594) + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508) + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504) + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385) + * Calculate last compacted key on startup (CASSANDRA-6216) + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE statements (CASSANDRA-7190) + * Fix clean interval not sent to commit log for empty memtable flush (CASSANDRA-12436) + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) + * Backport CASSANDRA-12002 (CASSANDRA-12177) + * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100) + * Fix potential bad messaging service message for paged range reads + within mixed-version 3.x clusters (CASSANDRA-12249) + * Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828) + * NullPointerException during compaction on table with static columns (CASSANDRA-12336) + * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823) + * Fix upgrade of super columns on thrift (CASSANDRA-12335) + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359) + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277) + * Exception when computing read-repair for range tombstones (CASSANDRA-12263) + * Lost counter writes in compact table and static columns (CASSANDRA-12219) + * AssertionError with MVs on updating a row that isn't indexed due to a null value (CASSANDRA-12247) + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980) + * Add option to override compaction space check (CASSANDRA-12180) + * Faster startup by only scanning each directory for temporary files once (CASSANDRA-12114) + * Respond with v1/v2 protocol header when responding to driver that attempts + to connect with too low of a protocol version (CASSANDRA-11464) + * NullPointerExpception when reading/compacting table (CASSANDRA-11988) + * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDR
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82d1600d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82d1600d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82d1600d Branch: refs/heads/trunk Commit: 82d1600d78fca3879f2204d46c597c93c53c40b2 Parents: 47b50b4 df819ec Author: Aleksey Yeschenko Authored: Wed Sep 21 18:13:41 2016 -0700 Committer: Aleksey Yeschenko Committed: Wed Sep 21 18:14:49 2016 -0700 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/gms/Gossiper.java| 4 ++-- .../apache/cassandra/service/StorageService.java | 17 ++--- 3 files changed, 17 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82d1600d/CHANGES.txt -- diff --cc CHANGES.txt index d9db977,bc9fc5b..0524e49 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ -2.2.8 +3.0.10 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() (CASSANDRA-11670) + * Establish consistent distinction between non-existing partition and NULL value for LWTs on static columns (CASSANDRA-12060) + * Extend ColumnIdentifier.internedInstances key to include the type that generated the byte buffer (CASSANDRA-12516) + * Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472) + * If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499) +Merged from 2.2: + * Fix exceptions when enabling gossip on nodes that haven't joined the ring (CASSANDRA-12253) * Fix authentication problem when invoking clqsh copy from a SOURCE command (CASSANDRA-12642) * Decrement pending range calculator jobs counter in finally block (CASSANDRA-12554) http://git-wip-us.apache.org/repos/asf/cassandra/blob/82d1600d/src/java/org/apache/cassandra/gms/Gossiper.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82d1600d/src/java/org/apache/cassandra/service/StorageService.java -- diff --cc src/java/org/apache/cassandra/service/StorageService.java index c06bed2,0b6e851..15a0146 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -707,17 -685,7 +718,17 @@@ public class StorageService extends Not { Map appStates = new EnumMap<>(ApplicationState.class); +if (SystemKeyspace.wasDecommissioned()) +{ +if (Boolean.getBoolean("cassandra.override_decommission")) +{ +logger.warn("This node was decommissioned, but overriding by operator request."); + SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.COMPLETED); +} +else +throw new ConfigurationException("This node was decommissioned and will not rejoin the ring unless cassandra.override_decommission=true has been set, or all existing data is removed and the node is bootstrapped again"); +} - if (replacing && !(Boolean.parseBoolean(System.getProperty("cassandra.join_ring", "true" + if (replacing && !joinRing) throw new ConfigurationException("Cannot set both join_ring=false and attempt to replace a node"); if (DatabaseDescriptor.getReplaceTokens().size() > 0 || DatabaseDescriptor.getReplaceNode() != null) throw new RuntimeException("Replace method removed; use cassandra.replace_address instead");
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/405a828c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/405a828c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/405a828c Branch: refs/heads/trunk Commit: 405a828c1f8f060bf0cb1cb7d0c601a5595c23f3 Parents: 82d1600 e9fe96f Author: Michael Shuler Authored: Fri Sep 23 16:43:29 2016 -0500 Committer: Michael Shuler Committed: Fri Sep 23 16:43:29 2016 -0500 -- --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9dd805d0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9dd805d0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9dd805d0 Branch: refs/heads/trunk Commit: 9dd805d0dcd172db54783450b5964931d26154b0 Parents: f2c5ad7 2383935 Author: Michael Shuler Authored: Wed Sep 28 13:10:44 2016 -0500 Committer: Michael Shuler Committed: Wed Sep 28 13:10:44 2016 -0500 -- --
[4/6] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0
http://git-wip-us.apache.org/repos/asf/cassandra/blob/88d2ac4f/src/java/org/apache/cassandra/db/filter/DataLimits.java -- diff --cc src/java/org/apache/cassandra/db/filter/DataLimits.java index 94f43dc,000..48ec06a mode 100644,00..100644 --- a/src/java/org/apache/cassandra/db/filter/DataLimits.java +++ b/src/java/org/apache/cassandra/db/filter/DataLimits.java @@@ -1,814 -1,0 +1,827 @@@ +/* + * 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.db.filter; + +import java.io.IOException; +import java.nio.ByteBuffer; + +import org.apache.cassandra.db.*; +import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.partitions.*; +import org.apache.cassandra.db.transform.BasePartitions; +import org.apache.cassandra.db.transform.BaseRows; +import org.apache.cassandra.db.transform.StoppingTransformation; +import org.apache.cassandra.db.transform.Transformation; +import org.apache.cassandra.io.util.DataInputPlus; +import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.utils.ByteBufferUtil; + +/** + * Object in charge of tracking if we have fetch enough data for a given query. + * + * The reason this is not just a simple integer is that Thrift and CQL3 count + * stuffs in different ways. This is what abstract those differences. + */ +public abstract class DataLimits +{ +public static final Serializer serializer = new Serializer(); + +public static final int NO_LIMIT = Integer.MAX_VALUE; + +public static final DataLimits NONE = new CQLLimits(NO_LIMIT) +{ +@Override - public boolean hasEnoughLiveData(CachedPartition cached, int nowInSec) ++public boolean hasEnoughLiveData(CachedPartition cached, int nowInSec, boolean countPartitionsWithOnlyStaticData) +{ +return false; +} + +@Override - public UnfilteredPartitionIterator filter(UnfilteredPartitionIterator iter, int nowInSec) ++public UnfilteredPartitionIterator filter(UnfilteredPartitionIterator iter, ++ int nowInSec, ++ boolean countPartitionsWithOnlyStaticData) +{ +return iter; +} + +@Override - public UnfilteredRowIterator filter(UnfilteredRowIterator iter, int nowInSec) ++public UnfilteredRowIterator filter(UnfilteredRowIterator iter, ++int nowInSec, ++boolean countPartitionsWithOnlyStaticData) +{ +return iter; +} +}; + +// We currently deal with distinct queries by querying full partitions but limiting the result at 1 row per +// partition (see SelectStatement.makeFilter). So an "unbounded" distinct is still actually doing some filtering. +public static final DataLimits DISTINCT_NONE = new CQLLimits(NO_LIMIT, 1, true); + +public enum Kind { CQL_LIMIT, CQL_PAGING_LIMIT, THRIFT_LIMIT, SUPER_COLUMN_COUNTING_LIMIT } + +public static DataLimits cqlLimits(int cqlRowLimit) +{ +return new CQLLimits(cqlRowLimit); +} + +public static DataLimits cqlLimits(int cqlRowLimit, int perPartitionLimit) +{ +return new CQLLimits(cqlRowLimit, perPartitionLimit); +} + +public static DataLimits distinctLimits(int cqlRowLimit) +{ +return CQLLimits.distinct(cqlRowLimit); +} + +public static DataLimits thriftLimits(int partitionLimit, int cellPerPartitionLimit) +{ +return new ThriftLimits(partitionLimit, cellPerPartitionLimit); +} + +public static DataLimits superColumnCountingLimits(int partitionLimit, int cellPerPartitionLimit) +{ +return new SuperColumnCountingLimits(partitionLimit, cellPerPartitionLimit); +} + +public abstract Kind kind(); + +public abstract boolean isUnlimited(); +public abstract boolean isDistinct(); + +public abstract DataLimits forPaging(int pageSize); +public abstract DataLi
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3bc585d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3bc585d5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3bc585d5 Branch: refs/heads/trunk Commit: 3bc585d5d0e01dd4f855994add67d3d120857eec Parents: 0828e24 0d2f403 Author: Jonathan Ellis Authored: Mon Aug 31 12:04:44 2015 -0500 Committer: Jonathan Ellis Committed: Mon Aug 31 12:04:44 2015 -0500 -- .../org/apache/cassandra/config/DatabaseDescriptor.java | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3bc585d5/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44e19947 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44e19947 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44e19947 Branch: refs/heads/trunk Commit: 44e19947f451945788c6f8fbaa167255347389a6 Parents: 00f0feb 0a4ce44 Author: Yuki Morishita Authored: Tue Sep 1 09:22:52 2015 -0500 Committer: Yuki Morishita Committed: Tue Sep 1 09:22:52 2015 -0500 -- CHANGES.txt | 1 + .../org/apache/cassandra/repair/RepairMessageVerbHandler.java | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/44e19947/CHANGES.txt -- diff --cc CHANGES.txt index 6a0b0b6,102..6539792 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,5 +1,19 @@@ -2.2.2 +3.0.0-beta2 + * Require AbstractType.isByteOrderComparable declaration in constructor (CASSANDRA-9901) + * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554) + * Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156) + * Choose better poolingOptions for protocol v4 in cassandra-stress (CASSANDRA-10182) + * Fix LWW bug affecting Materialized Views (CASSANDRA-10197) + * Ensures frozen sets and maps are always sorted (CASSANDRA-10162) + * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181) + * Fix double flushing of secondary index tables (CASSANDRA-10180) + * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046) + * Only use batchlog when paired materialized view replica is remote (CASSANDRA-10061) + * Reuse TemporalRow when updating multiple MaterializedViews (CASSANDRA-10060) + * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917) + * Fix sstablerepairedset (CASSANDRA-10132) +Merged from 2.2: + * Fix repair hang when snapshot failed (CASSANDRA-10057) * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks (CASSANDRA-10199) Merged from 2.1: http://git-wip-us.apache.org/repos/asf/cassandra/blob/44e19947/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/796b0f26 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/796b0f26 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/796b0f26 Branch: refs/heads/trunk Commit: 796b0f26a9ebc061fe30b86f089237e82ec90199 Parents: 53a177a f7644f2 Author: Jonathan Ellis Authored: Wed Sep 2 09:36:02 2015 -0500 Committer: Jonathan Ellis Committed: Wed Sep 2 09:36:02 2015 -0500 -- .../org/apache/cassandra/config/DatabaseDescriptor.java | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/796b0f26/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/53359607 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53359607 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53359607 Branch: refs/heads/cassandra-3.0 Commit: 53359607640b064db91ff772e3c0e487eb03f7c4 Parents: a7895cf 99c6ad6 Author: Marcus Eriksson Authored: Mon Sep 7 08:01:29 2015 +0200 Committer: Marcus Eriksson Committed: Mon Sep 7 08:01:29 2015 +0200 -- src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/53359607/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3818d30b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3818d30b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3818d30b Branch: refs/heads/trunk Commit: 3818d30bd1a253e39a296efd50185fe4d5bb3f42 Parents: 60e45c0 0c0f1ff Author: Sam Tunnicliffe Authored: Tue Sep 8 10:27:35 2015 +0100 Committer: Sam Tunnicliffe Committed: Tue Sep 8 10:27:35 2015 +0100 -- CHANGES.txt | 2 ++ .../org/apache/cassandra/config/DatabaseDescriptor.java | 6 +- src/java/org/apache/cassandra/service/ClientState.java| 10 +++--- 3 files changed, 14 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3818d30b/CHANGES.txt -- diff --cc CHANGES.txt index d6ebe7a,5dffb9b..b7c6669 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,29 -1,5 +1,31 @@@ -2.2.2 - * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) +3.0.0-rc1 + * Small optimizations of sstable index serialization (CASSANDRA-10232) + * Support for both encrypted and unencrypted native transport connections (CASSANDRA-9590) ++Merged from 2.2: ++ * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) + + +3.0.0-beta2 + * Fix columns returned by AbstractBtreePartitions (CASSANDRA-10220) + * Fix backward compatibility issue due to AbstractBounds serialization bug (CASSANDRA-9857) + * Fix startup error when upgrading nodes (CASSANDRA-10136) + * Base table PRIMARY KEY can be assumed to be NOT NULL in MV creation (CASSANDRA-10147) + * Improve batchlog write patch (CASSANDRA-9673) + * Re-apply MaterializedView updates on commitlog replay (CASSANDRA-10164) + * Require AbstractType.isByteOrderComparable declaration in constructor (CASSANDRA-9901) + * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554) + * Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156) + * Choose better poolingOptions for protocol v4 in cassandra-stress (CASSANDRA-10182) + * Fix LWW bug affecting Materialized Views (CASSANDRA-10197) + * Ensures frozen sets and maps are always sorted (CASSANDRA-10162) + * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181) + * Fix double flushing of secondary index tables (CASSANDRA-10180) + * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046) + * Only use batchlog when paired materialized view replica is remote (CASSANDRA-10061) + * Reuse TemporalRow when updating multiple MaterializedViews (CASSANDRA-10060) + * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917) + * Fix sstablerepairedset (CASSANDRA-10132) +Merged from 2.2: * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222) * Fix failure to start with space in directory path on Windows (CASSANDRA-10239) * Fix repair hang when snapshot failed (CASSANDRA-10057) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3818d30b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3818d30b/src/java/org/apache/cassandra/service/ClientState.java -- diff --cc src/java/org/apache/cassandra/service/ClientState.java index f8d3939,a15fa5c..f2ed984 --- a/src/java/org/apache/cassandra/service/ClientState.java +++ b/src/java/org/apache/cassandra/service/ClientState.java @@@ -60,14 -62,15 +61,17 @@@ public class ClientStat { // We want these system cfs to be always readable to authenticated users since many tools rely on them // (nodetool, cqlsh, bulkloader, etc.) -for (String cf : Iterables.concat(Arrays.asList(SystemKeyspace.LOCAL, SystemKeyspace.PEERS), LegacySchemaTables.ALL)) +for (String cf : Arrays.asList(SystemKeyspace.LOCAL, SystemKeyspace.PEERS)) READABLE_SYSTEM_RESOURCES.add(DataResource.table(SystemKeyspace.NAME, cf)); +SchemaKeyspace.ALL.forEach(table -> READABLE_SYSTEM_RESOURCES.add(DataResource.table(SchemaKeyspace.NAME, table))); + - PROTECTED_AUTH_RESOURCES.addAll(DatabaseDescriptor.getAuthenticator().protectedResources()); - PROTECTED_AUTH_RESOURCES.addAll(DatabaseDescriptor.getAuthorizer().protectedResources()); - PROTECTED_AUTH_RESOURCES.addAll(DatabaseDescriptor.getRoleManager().protectedResources()); + if (!Config.isClientMode()) + { + PROTECTED_AUTH_RESOURCES.addAll(DatabaseDescriptor.getAuthenticator().
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34bbb445 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34bbb445 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34bbb445 Branch: refs/heads/trunk Commit: 34bbb445cb14ba7159f735b0dee8c2f9dab45a77 Parents: 99d5c39 2a2394f Author: Benedict Elliott Smith Authored: Tue Sep 8 13:55:03 2015 +0100 Committer: Benedict Elliott Smith Committed: Tue Sep 8 13:55:03 2015 +0100 -- --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83248186 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83248186 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83248186 Branch: refs/heads/trunk Commit: 83248186ad7302d19a534310ea46ddd9b0d64b7f Parents: d996c36 b22ad42 Author: Sam Tunnicliffe Authored: Thu Sep 10 12:48:14 2015 +0100 Committer: Sam Tunnicliffe Committed: Thu Sep 10 12:50:10 2015 +0100 -- CHANGES.txt | 1 + .../cassandra/auth/CassandraRoleManager.java| 91 +--- .../apache/cassandra/net/MessagingService.java | 33 ++- 3 files changed, 95 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/83248186/CHANGES.txt -- diff --cc CHANGES.txt index 7b75b96,b927f95..cda5762 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,38 -1,8 +1,39 @@@ -2.2.2 +3.0.0-rc1 + * Cache selected index in read command to reduce lookups (CASSANDRA-10215) + * Small optimizations of sstable index serialization (CASSANDRA-10232) + * Support for both encrypted and unencrypted native transport connections (CASSANDRA-9590) +Merged from 2.2: + * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761) + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) +Merged from 2.1: + * (cqlsh) Fix error when starting cqlsh with --debug (CASSANDRA-10282) + * Scrub, Cleanup and Upgrade do not unmark compacting until all operations + have completed, regardless of the occurence of exceptions (CASSANDRA-10274) + + +3.0.0-beta2 + * Fix columns returned by AbstractBtreePartitions (CASSANDRA-10220) + * Fix backward compatibility issue due to AbstractBounds serialization bug (CASSANDRA-9857) + * Fix startup error when upgrading nodes (CASSANDRA-10136) + * Base table PRIMARY KEY can be assumed to be NOT NULL in MV creation (CASSANDRA-10147) + * Improve batchlog write patch (CASSANDRA-9673) + * Re-apply MaterializedView updates on commitlog replay (CASSANDRA-10164) + * Require AbstractType.isByteOrderComparable declaration in constructor (CASSANDRA-9901) + * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554) + * Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156) + * Choose better poolingOptions for protocol v4 in cassandra-stress (CASSANDRA-10182) + * Fix LWW bug affecting Materialized Views (CASSANDRA-10197) + * Ensures frozen sets and maps are always sorted (CASSANDRA-10162) + * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181) + * Fix double flushing of secondary index tables (CASSANDRA-10180) + * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046) + * Only use batchlog when paired materialized view replica is remote (CASSANDRA-10061) + * Reuse TemporalRow when updating multiple MaterializedViews (CASSANDRA-10060) + * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917) + * Fix sstablerepairedset (CASSANDRA-10132) +Merged from 2.2: * Cancel transaction for sstables we wont redistribute index summary for (CASSANDRA-10270) - * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222) * Fix failure to start with space in directory path on Windows (CASSANDRA-10239) * Fix repair hang when snapshot failed (CASSANDRA-10057) http://git-wip-us.apache.org/repos/asf/cassandra/blob/83248186/src/java/org/apache/cassandra/auth/CassandraRoleManager.java -- diff --cc src/java/org/apache/cassandra/auth/CassandraRoleManager.java index 802ae3c,9151958..1d44bf9 --- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java +++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java @@@ -149,22 -154,24 +154,16 @@@ public class CassandraRoleManager imple legacySelectUserStatement = (SelectStatement) prepare("SELECT * FROM %s.%s WHERE name = ?", AuthKeyspace.NAME, LEGACY_USERS_TABLE); - scheduleSetupTask(new Runnable() -scheduleSetupTask(new Callable() --{ - public void run() -public Void call() throws Exception --{ --convertLegacyData(); -return null; --} ++scheduleSetupTask(() -> { ++convertLegacyData(); ++return
[4/6] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0
Merge branch cassandra-2.2 into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b0073167 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0073167 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0073167 Branch: refs/heads/cassandra-3.0 Commit: b00731678d29d8c4bb2ffcba88b1a7eb1f4a17e4 Parents: cc559af a64bcfd Author: blerer Authored: Thu Sep 10 21:59:19 2015 +0200 Committer: blerer Committed: Thu Sep 10 21:59:28 2015 +0200 -- --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1d94dc2b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d94dc2b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d94dc2b Branch: refs/heads/trunk Commit: 1d94dc2b5b1854926a585a7e0a108ac597c07be2 Parents: e8691d7 8b2dc1f Author: Jonathan Ellis Authored: Wed Sep 16 10:39:46 2015 -0500 Committer: Jonathan Ellis Committed: Wed Sep 16 10:39:46 2015 -0500 -- .../org/apache/cassandra/io/sstable/format/big/BigTableWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d94dc2b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/97dc8d52 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97dc8d52 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97dc8d52 Branch: refs/heads/trunk Commit: 97dc8d525574a68a43fb05cf41d88c3342a68e72 Parents: 39bc5de f8783b7 Author: Joshua McKenzie Authored: Fri Nov 6 13:42:49 2015 -0500 Committer: Joshua McKenzie Committed: Fri Nov 6 13:42:49 2015 -0500 -- bin/cassandra.ps1 | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb8afb71 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb8afb71 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb8afb71 Branch: refs/heads/trunk Commit: eb8afb71f52c65855efa1d7e8d3ef314ab7373e2 Parents: c0480d8 99b82db Author: Marcus Eriksson Authored: Tue Nov 17 10:13:18 2015 +0100 Committer: Marcus Eriksson Committed: Tue Nov 17 10:13:18 2015 +0100 -- CHANGES.txt | 2 ++ .../cassandra/repair/messages/RepairOption.java | 18 +++--- .../cassandra/service/ActiveRepairService.java| 2 ++ .../apache/cassandra/service/StorageService.java | 9 +++-- .../repair/messages/RepairOptionTest.java | 17 +++-- 5 files changed, 41 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb8afb71/CHANGES.txt -- diff --cc CHANGES.txt index 8bb67e1,f5d3416..13647cc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,56 -1,8 +1,58 @@@ -2.2.4 +3.0.1 + * Correctly preserve deletion info on updated rows when notifying indexers + of single-row deletions (CASSANDRA-10694) + * Notify indexers of partition delete during cleanup (CASSANDRA-10685) + * Keep the file open in trySkipCache (CASSANDRA-10669) + * Updated trigger example (CASSANDRA-10257) +Merged from 2.2: + * 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) +Merged from 2.1: ++ * Reject incremental repair with subrange repair (CASSANDRA-10422) + * Add a nodetool command to refresh size_estimates (CASSANDRA-9579) + * 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) + + +3.0 + * Fix AssertionError while flushing memtable due to materialized views + incorrectly inserting empty rows (CASSANDRA-10614) + * Store UDA initcond as CQL literal in the schema table, instead of a blob (CASSANDRA-10650) + * Don't use -1 for the position of partition key in schema (CASSANDRA-10491) + * Fix distinct queries in mixed version cluster (CASSANDRA-10573) + * Skip sstable on clustering in names query (CASSANDRA-10571) + * Remove value skipping as it breaks read-repair (CASSANDRA-10655) + * Fix bootstrapping with MVs (CASSANDRA-10621) + * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584) + * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634) + * (Hadoop) fix CIF describeSplits() not handling 0 size estimates (CASSANDRA-10600) + * Fix reading of legacy sstables (CASSANDRA-10590) + * Use CQL type names in schema metadata tables (CASSANDRA-10365) + * Guard batchlog replay against integer division by zero (CASSANDRA-9223) + * Fix bug when adding a column to thrift with the same name than a primary key (CASSANDRA-10608) + * Add client address argument to IAuthenticator::newSaslNegotiator (CASSANDRA-8068) + * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602) + * Don't use 'names query' read path for counters (CASSANDRA-10572) + * Fix backward compatibility for counters (CASSANDRA-10470) + * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581,10628) + * Execute the metadata reload task of all registered indexes on CFS::reload (CASSANDRA-10604) + * Fix thrift cas operations with defined columns (CASSANDRA-10576) + * Fix PartitionUpdate.operationCount()for updates with static column operations (CASSANDRA-10606) + * Fix thrift get() queries with defined columns (CASSANDRA-10586) + * Fix marking of indexes as built and removed (CASSANDRA-10601) + * Skip initialization of non-registered 2i instances, remove Index::getIndexName (CASSANDRA-10595) + * Fix batches on multiple tables (CASSANDRA-10554) + * Ensure compaction options are validated when updating KeyspaceMetadata (CASSANDRA-10569) + * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975) + * Remove token generator (CASSANDRA-5261) + * RolesCache should not be created for any authenticator that does not requireAuthentication (CASSANDRA-10562) + * Fix LogTransaction checking only a single directory for files (CASSANDRA-10421) + * Fix handling of range tombstones when reading old format sstables (CASSANDRA-10360) + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367) +Merged from 2.2: * (cqlsh) show partial tr
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/84750421 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84750421 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84750421 Branch: refs/heads/trunk Commit: 84750421a90a0aa46ff067b683152138e442a448 Parents: 8a0615b b0fd517 Author: Sylvain Lebresne Authored: Fri Nov 20 15:12:16 2015 +0100 Committer: Sylvain Lebresne Committed: Fri Nov 20 15:12:16 2015 +0100 -- CHANGES.txt | 1 + bin/cqlsh.py | 28 ++-- 2 files changed, 23 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/84750421/CHANGES.txt -- diff --cc CHANGES.txt index d6f0379,146a0ce..a9b3f36 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -9,7 -3,16 +9,8 @@@ Merged from 2.2 * 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: + * (cqlsh) Support counters in COPY commands (CASSANDRA-9043) * Try next replica if not possible to connect to primary replica on ColumnFamilyRecordReader (CASSANDRA-2388) * Limit window size in DTCS (CASSANDRA-10280) http://git-wip-us.apache.org/repos/asf/cassandra/blob/84750421/bin/cqlsh.py -- diff --cc bin/cqlsh.py index 793afe5,41672c0..328ba30 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -2328,12 -2259,19 +2328,19 @@@ class ImportProcess(mp.Process) table_meta = new_cluster.metadata.keyspaces[self.ks].tables[self.cf] pk_cols = [col.name for col in table_meta.primary_key] -cqltypes = [table_meta.columns[name].typestring for name in self.columns] +cqltypes = [table_meta.columns[name].cql_type for name in self.columns] pk_indexes = [self.columns.index(col.name) for col in table_meta.primary_key] - query = 'INSERT INTO %s.%s (%s) VALUES (%%s)' % ( - protect_name(self.ks), - protect_name(self.cf), - ', '.join(protect_names(self.columns))) + is_counter_table = ("counter" in cqltypes) + + if is_counter_table: + query = 'UPDATE %s.%s SET %%s WHERE %%s' % ( + protect_name(table_meta.keyspace_name), + protect_name(table_meta.name)) + else: + query = 'INSERT INTO %s.%s (%s) VALUES (%%s)' % ( + protect_name(table_meta.keyspace_name), + protect_name(table_meta.name), + ', '.join(protect_names(self.columns))) # we need to handle some types specially should_escape = [t in ('ascii', 'text', 'timestamp', 'date', 'time', 'inet') for t in cqltypes]
[4/6] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0
Merge branch cassandra-2.2 into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29b988d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29b988d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29b988d8 Branch: refs/heads/trunk Commit: 29b988d8c42de38ae16998239ee7cd3789c4993e Parents: 9dac99f 1142183 Author: Benjamin Lerer Authored: Tue Nov 24 15:09:39 2015 +0100 Committer: Benjamin Lerer Committed: Tue Nov 24 15:10:17 2015 +0100 -- bin/cqlsh.py | 57 --- 1 file changed, 33 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29b988d8/bin/cqlsh.py -- diff --cc bin/cqlsh.py index 328ba30,ffcbcbd..36daa51 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1629,12 -1573,6 +1629,12 @@@ class Shell(cmd.Cmd) In some cases, there may be index metadata which is not representable and which will not be shown. +DESCRIBE MATERIALIZED VIEW + - Output CQL commands that could be used to recreate the given materialized view. ++ Output the CQL command that could be used to recreate the given materialized view. + In some cases, there may be materialized view metadata which is not representable + and which will not be shown. + DESCRIBE CLUSTER Output information about the connected Cassandra cluster, such as the
[4/6] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0
Merge branch cassandra-2.2 into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b430eee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b430eee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b430eee Branch: refs/heads/trunk Commit: 7b430eee69d8f70b086a30a6e9d3c42a9db4aa08 Parents: d300a18 61e0251 Author: Benjamin Lerer Authored: Fri Nov 27 11:15:08 2015 +0100 Committer: Benjamin Lerer Committed: Fri Nov 27 11:16:02 2015 +0100 -- CHANGES.txt | 1 + .../org/apache/cassandra/db/ReadCommand.java| 9 +- .../index/IndexNotAvailableException.java | 34 .../cassandra/index/SecondaryIndexManager.java | 64 +++--- .../index/internal/CassandraIndex.java | 6 +- .../cassandra/net/MessageDeliveryTask.java | 7 +- .../validation/entities/SecondaryIndexTest.java | 88 .../index/internal/CustomCassandraIndex.java| 4 +- 8 files changed, 178 insertions(+), 35 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b430eee/CHANGES.txt -- diff --cc CHANGES.txt index 5e6c03c,63305d6..252972c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,17 @@@ -2.2.4 +3.0.1 + * Fix SELECT statement with IN restrictions on partition key, + ORDER BY and LIMIT (CASSANDRA-10729) + * Improve stress performance over 1k threads (CASSANDRA-7217) + * Wait for migration responses to complete before bootstrapping (CASSANDRA-10731) + * Unable to create a function with argument of type Inet (CASSANDRA-10741) + * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717) + * Correctly preserve deletion info on updated rows when notifying indexers + of single-row deletions (CASSANDRA-10694) + * Notify indexers of partition delete during cleanup (CASSANDRA-10685) + * Keep the file open in trySkipCache (CASSANDRA-10669) + * Updated trigger example (CASSANDRA-10257) +Merged from 2.2: + * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b430eee/src/java/org/apache/cassandra/db/ReadCommand.java -- diff --cc src/java/org/apache/cassandra/db/ReadCommand.java index 301cb86,cd86336..5ab1ee5 --- a/src/java/org/apache/cassandra/db/ReadCommand.java +++ b/src/java/org/apache/cassandra/db/ReadCommand.java @@@ -17,92 -17,39 +17,93 @@@ */ package org.apache.cassandra.db; -import java.io.DataInput; import java.io.IOException; import java.nio.ByteBuffer; +import java.util.*; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.filter.IDiskAtomFilter; -import org.apache.cassandra.db.filter.NamesQueryFilter; -import org.apache.cassandra.db.filter.SliceQueryFilter; +import com.google.common.collect.Lists; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.cassandra.config.*; +import org.apache.cassandra.cql3.Operator; +import org.apache.cassandra.db.filter.*; +import org.apache.cassandra.db.partitions.*; +import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.transform.Transformation; +import org.apache.cassandra.dht.AbstractBounds; +import org.apache.cassandra.index.Index; ++import org.apache.cassandra.index.IndexNotAvailableException; import org.apache.cassandra.io.IVersionedSerializer; +import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; +import org.apache.cassandra.metrics.TableMetrics; import org.apache.cassandra.net.MessageOut; import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.service.IReadCommand; -import org.apache.cassandra.service.RowDataResolver; -import org.apache.cassandra.service.pager.Pageable; +import org.apache.cassandra.schema.IndexMetadata; +import org.apache.cassandra.schema.UnknownIndexException; +import org.apache.cassandra.service.ClientWarn; +import org.apache.cassandra.tracing.Tracing; +import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.Pair; -public abstract class ReadCommand implements IReadCommand, Pageable +/** + * General interface for storage-engine read commands (common to both range and + * single partition commands). + * + * This contains all the informations needed to do a local read. + */ +public abstract class ReadCommand im
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0a94c7a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a94c7a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a94c7a3 Branch: refs/heads/trunk Commit: 0a94c7a36c778e7429c68ac23c018e2f6db1b27e Parents: a472aa9 ed4fad1 Author: Yuki Morishita Authored: Thu Aug 6 22:06:02 2015 -0500 Committer: Yuki Morishita Committed: Thu Aug 6 22:06:02 2015 -0500 -- src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a94c7a3/src/java/org/apache/cassandra/net/IncomingTcpConnection.java --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b7caa13 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b7caa13 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b7caa13 Branch: refs/heads/trunk Commit: 8b7caa1361897aa387cde94f19ec7b24ab7a535e Parents: 3413e55 2d8ccf0 Author: Sam Tunnicliffe Authored: Fri Aug 14 14:35:12 2015 +0100 Committer: Sam Tunnicliffe Committed: Fri Aug 14 14:35:12 2015 +0100 -- .../cql3/selection/SelectionColumnMappingTest.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b7caa13/test/unit/org/apache/cassandra/cql3/selection/SelectionColumnMappingTest.java --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: test/unit/org/apache/cassandra/db/CommitLogTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da8d48a7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da8d48a7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da8d48a7 Branch: refs/heads/trunk Commit: da8d48a79abf031b6a4e7bfd381bd4689f2fc12c Parents: b294058 c645b11 Author: Benedict Elliott Smith Authored: Fri Aug 14 20:29:03 2015 +0100 Committer: Benedict Elliott Smith Committed: Fri Aug 14 20:29:03 2015 +0100 -- .../db/CommitLogFailurePolicyTest.java | 112 ++ .../org/apache/cassandra/db/CommitLogTest.java | 147 --- 2 files changed, 112 insertions(+), 147 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/da8d48a7/test/unit/org/apache/cassandra/db/CommitLogTest.java -- diff --cc test/unit/org/apache/cassandra/db/CommitLogTest.java index 0c5093a,2764da4..6db29a8 --- a/test/unit/org/apache/cassandra/db/CommitLogTest.java +++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java @@@ -317,187 -319,32 +317,40 @@@ public class CommitLogTes } @Test - public void testCommitFailurePolicy_stop() throws ConfigurationException - { - CassandraDaemon daemon = new CassandraDaemon(); - daemon.completeSetup(); //startup must be completed, otherwise commit log failure must kill JVM regardless of failure policy - StorageService.instance.registerDaemon(daemon); - - // Need storage service active so stop policy can shutdown gossip - StorageService.instance.initServer(); - Assert.assertTrue(Gossiper.instance.isEnabled()); - - Config.CommitFailurePolicy oldPolicy = DatabaseDescriptor.getCommitFailurePolicy(); - try - { - DatabaseDescriptor.setCommitFailurePolicy(Config.CommitFailurePolicy.stop); - CommitLog.handleCommitError("Test stop error", new Throwable()); - Assert.assertFalse(Gossiper.instance.isEnabled()); - } - finally - { - DatabaseDescriptor.setCommitFailurePolicy(oldPolicy); - } - } - - @Test - public void testCommitFailurePolicy_die() - { - CassandraDaemon daemon = new CassandraDaemon(); - daemon.completeSetup(); //startup must be completed, otherwise commit log failure must kill JVM regardless of failure policy - StorageService.instance.registerDaemon(daemon); - - KillerForTests killerForTests = new KillerForTests(); - JVMStabilityInspector.Killer originalKiller = JVMStabilityInspector.replaceKiller(killerForTests); - Config.CommitFailurePolicy oldPolicy = DatabaseDescriptor.getCommitFailurePolicy(); - try - { - DatabaseDescriptor.setCommitFailurePolicy(Config.CommitFailurePolicy.die); - CommitLog.handleCommitError("Testing die policy", new Throwable()); - Assert.assertTrue(killerForTests.wasKilled()); - Assert.assertFalse(killerForTests.wasKilledQuietly()); //only killed quietly on startup failure - } - finally - { - DatabaseDescriptor.setCommitFailurePolicy(oldPolicy); - JVMStabilityInspector.replaceKiller(originalKiller); - } - } - - @Test - public void testCommitFailurePolicy_mustDieIfNotStartedUp() - { - //startup was not completed successfuly (since method completeSetup() was not called) - CassandraDaemon daemon = new CassandraDaemon(); - StorageService.instance.registerDaemon(daemon); - - KillerForTests killerForTests = new KillerForTests(); - JVMStabilityInspector.Killer originalKiller = JVMStabilityInspector.replaceKiller(killerForTests); - Config.CommitFailurePolicy oldPolicy = DatabaseDescriptor.getCommitFailurePolicy(); - try - { - //even though policy is ignore, JVM must die because Daemon has not finished initializing - DatabaseDescriptor.setCommitFailurePolicy(Config.CommitFailurePolicy.ignore); - CommitLog.handleCommitError("Testing die policy", new Throwable()); - Assert.assertTrue(killerForTests.wasKilled()); - Assert.assertTrue(killerForTests.wasKilledQuietly()); //killed quietly due to startup failure - } - finally - { - DatabaseDescriptor.setCommitFailurePolicy(oldPolicy); - JVMStabilityInspector.replaceKiller(originalKiller); - } - } - - @Test - public void testCommitLogFailureBeforeInitialization_mustKillJVM() throws Excep
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2923011b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2923011b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2923011b Branch: refs/heads/trunk Commit: 2923011b7aadc2368b87065cee12dd428d8c875d Parents: 6c69f07 d61c026 Author: Benedict Elliott Smith Authored: Tue Aug 18 10:10:58 2015 +0100 Committer: Benedict Elliott Smith Committed: Tue Aug 18 10:10:58 2015 +0100 -- --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29d3d44d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29d3d44d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29d3d44d Branch: refs/heads/trunk Commit: 29d3d44d2056e5ab84a2a5357cd782344683fc8e Parents: 342e33f 941a5dd Author: Benedict Elliott Smith Authored: Sun Aug 23 11:51:10 2015 +0100 Committer: Benedict Elliott Smith Committed: Sun Aug 23 11:51:10 2015 +0100 -- test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29d3d44d/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9cc48906 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9cc48906 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9cc48906 Branch: refs/heads/trunk Commit: 9cc489065212ee89dda7d95af16d3f27a8a1486d Parents: e3baf28 408746c Author: Yuki Morishita Authored: Thu Aug 27 10:19:39 2015 -0500 Committer: Yuki Morishita Committed: Thu Aug 27 10:19:39 2015 -0500 -- CHANGES.txt | 1 + .../db/compaction/LeveledCompactionStrategyTest.java| 9 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9cc48906/CHANGES.txt -- diff --cc CHANGES.txt index 2ab4263,6cffd18..ca2ded8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,46 -1,8 +1,47 @@@ -2.2.1 +3.0.0-beta2 + * Ensures frozen sets and maps are always sorted (CASSANDRA-10162) + * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181) + * Fix double flushing of secondary index tables (CASSANDRA-10180) + * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046) + * Only use batchlog when paired materialized view replica is remote (CASSANDRA-10061) + * Reuse TemporalRow when updating multiple MaterializedViews (CASSANDRA-10060) + * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917) + * Fix sstablerepairedset (CASSANDRA-10132) +Merged from 2.2: + * Fix LeveledCompactionStrategyTest (CASSANDRA-9757) * Fix broken UnbufferedDataOutputStreamPlus.writeUTF (CASSANDRA-10203) + * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898) + * Avoid returning Permission.NONE when failing to query users table (CASSANDRA-10168) * (cqlsh) add CLEAR command (CASSANDRA-10086) * Support string literals as Role names for compatibility (CASSANDRA-10135) +Merged from 2.1: + * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611) + * (cqlsh) update list of CQL keywords (CASSANDRA-9232) + + +3.0.0-beta1 + * Redesign secondary index API (CASSANDRA-9459, 7771, 9041) + * Fix throwing ReadFailure instead of ReadTimeout on range queries (CASSANDRA-10125) + * Rewrite hinted handoff (CASSANDRA-6230) + * Fix query on static compact tables (CASSANDRA-10093) + * Fix race during construction of commit log (CASSANDRA-10049) + * Add option to only purge repaired tombstones (CASSANDRA-6434) + * Change authorization handling for MVs (CASSANDRA-9927) + * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026) + * Fix row deletion bug for Materialized Views (CASSANDRA-10014) + * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704) + * Fix multiple slices on RowSearchers (CASSANDRA-10002) + * Fix bug in merging of collections (CASSANDRA-10001) + * Optimize batchlog replay to avoid full scans (CASSANDRA-7237) + * Repair improvements when using vnodes (CASSANDRA-5220) + * Disable scripted UDFs by default (CASSANDRA-9889) + * Bytecode inspection for Java-UDFs (CASSANDRA-9890) + * Use byte to serialize MT hash length (CASSANDRA-9792) + * Replace usage of Adler32 with CRC32 (CASSANDRA-8684) + * Fix migration to new format from 2.1 SSTable (CASSANDRA-10006) + * SequentialWriter should extend BufferedDataOutputStreamPlus (CASSANDRA-9500) + * Use the same repairedAt timestamp within incremental repair session (CASSANDRA-9111) +Merged from 2.2: * Allow count(*) and count(1) to be use as normal aggregation (CASSANDRA-10114) * An NPE is thrown if the column name is unknown for an IN relation (CASSANDRA-10043) * Apply commit_failure_policy to more errors on startup (CASSANDRA-9749) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9cc48906/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java -- diff --cc test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java index 8050b6c,6b3383e..f2ddb00 --- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java @@@ -252,23 -265,22 +253,19 @@@ public class LeveledCompactionStrategyT // Adds enough data to trigger multiple sstable per level for (int r = 0; r < rows; r++) { -DecoratedKey key = Util.dk(String.valueOf(r)); -Mutation rm = new Mutation(KEYSPACE1, key.getKey()); +UpdateBuilder update = UpdateBuilder.create(cfs.metadata, String.valueOf(r)); for (int c = 0; c < columns; c++)
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e095833 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e095833 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e095833 Branch: refs/heads/trunk Commit: 2e095833d9a45a6f1032b8beac2d94a47409a5e0 Parents: d877ba0 9dd2b5e Author: Aleksey Yeschenko Authored: Fri Dec 18 22:48:12 2015 + Committer: Aleksey Yeschenko Committed: Fri Dec 18 22:48:12 2015 + -- bin/cqlsh.py | 4 +- pylib/cqlshlib/test/run_cqlsh.py | 108 +++--- pylib/cqlshlib/test/test_cqlsh_completion.py | 3 + pylib/cqlshlib/test/test_cqlsh_output.py | 22 +++-- pylib/cqlshlib/test/winpty.py| 50 ++ 5 files changed, 144 insertions(+), 43 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e095833/bin/cqlsh.py -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e095833/pylib/cqlshlib/test/test_cqlsh_completion.py -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e095833/pylib/cqlshlib/test/test_cqlsh_output.py --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/67fd42fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67fd42fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67fd42fd Branch: refs/heads/trunk Commit: 67fd42fd3fb564585294c7b98d8cbca8a696cfdd Parents: 11165f4 df49cec Author: Sam Tunnicliffe Authored: Mon Dec 21 11:57:06 2015 + Committer: Sam Tunnicliffe Committed: Mon Dec 21 11:57:06 2015 + -- NEWS.txt | 23 +++ 1 file changed, 23 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/67fd42fd/NEWS.txt --
[4/6] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0
Merge branch cassandra-2.2 into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95012dab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95012dab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95012dab Branch: refs/heads/trunk Commit: 95012dab5b9a6f70a419fb0a6f34bf665de1a285 Parents: 9803d66 c7f0032 Author: Benjamin Lerer Authored: Wed Jan 13 14:49:26 2016 +0100 Committer: Benjamin Lerer Committed: Wed Jan 13 14:49:41 2016 +0100 -- CHANGES.txt | 1 + bin/cqlsh.py | 22 +- 2 files changed, 14 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95012dab/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95012dab/bin/cqlsh.py -- diff --cc bin/cqlsh.py index 60ac1a2,c03a3c2..987aa59 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -163,9 -162,10 +163,10 @@@ from cqlshlib.util import get_file_enco DEFAULT_HOST = '127.0.0.1' DEFAULT_PORT = 9042 -DEFAULT_CQLVER = '3.3.1' +DEFAULT_CQLVER = '3.4.0' DEFAULT_PROTOCOL_VERSION = 4 DEFAULT_CONNECT_TIMEOUT_SECONDS = 5 + DEFAULT_REQUEST_TIMEOUT_SECONDS = 10 DEFAULT_FLOAT_PRECISION = 5 DEFAULT_MAX_TRACE_WAIT = 10
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/75038159 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/75038159 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/75038159 Branch: refs/heads/trunk Commit: 7503815987635129e654b2aa59e4e07105e30c34 Parents: 4bb56c4 ae9b7e0 Author: T Jake Luciani Authored: Thu Oct 1 09:40:12 2015 -0400 Committer: T Jake Luciani Committed: Thu Oct 1 09:40:12 2015 -0400 -- --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b324759e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b324759e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b324759e Branch: refs/heads/trunk Commit: b324759eada2cb4b60e3894ecefb2b8071716d7a Parents: 50fae5d cccaa17 Author: Sam Tunnicliffe Authored: Mon Oct 12 12:00:34 2015 +0100 Committer: Sam Tunnicliffe Committed: Mon Oct 12 12:00:34 2015 +0100 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b324759e/CHANGES.txt -- diff --cc CHANGES.txt index fa74c69,215bd76..f40c12c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,45 -1,25 +1,46 @@@ -2.2.3 +3.0 + * Only include modified cell data in indexing deltas (CASSANDRA-10438) + * Do not load keyspace when creating sstable writer (CASSANDRA-10443) + * If node is not yet gossiping write all MV updates to batchlog only (CASSANDRA-10413) + * Re-populate token metadata after commit log recovery (CASSANDRA-10293) + * Provide additional metrics for materialized views (CASSANDRA-10323) + * Flush system schema tables after local schema changes (CASSANDRA-10429) +Merged from 2.2: + * Preserve case of quoted Role & User names (CASSANDRA-10394) * cqlsh pg-style-strings broken (CASSANDRA-10484) - * Make Hadoop CF splits more polite to custom orderered partitioners (CASSANDRA-10400) + * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369) Merged from 2.1: - * Fix mmap file segment seeking to EOF (CASSANDRA-10478) * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275) * Mark nodes as dead even if they've already left (CASSANDRA-10205) - * Update internal python driver used by cqlsh (CASSANDRA-10161) -2.2.2 - * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369) + +3.0.0-rc1 + * Fix mixed version read request compatibility for compact static tables + (CASSANDRA-10373) + * Fix paging of DISTINCT with static and IN (CASSANDRA-10354) + * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key + columns (CASSANDRA-9664) + * Move crc_check_chance out of compression options (CASSANDRA-9839) + * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301) + * Transfer hints to a different node on decommission (CASSANDRA-10198) + * Check partition keys for CAS operations during stmt validation (CASSANDRA-10338) + * Add custom query expressions to SELECT (CASSANDRA-10217) + * Fix minor bugs in MV handling (CASSANDRA-10362) + * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124) + * Improve MV schema representation (CASSANDRA-9921) + * Add flag to enable/disable coordinator batchlog for MV writes (CASSANDRA-10230) + * Update cqlsh COPY for new internal driver serialization interface (CASSANDRA-10318) + * Give index implementations more control over rebuild operations (CASSANDRA-10312) + * Update index file format (CASSANDRA-10314) + * Add "shadowable" row tombstones to deal with mv timestamp issues (CASSANDRA-10261) + * CFS.loadNewSSTables() broken for pre-3.0 sstables + * Cache selected index in read command to reduce lookups (CASSANDRA-10215) + * Small optimizations of sstable index serialization (CASSANDRA-10232) + * Support for both encrypted and unencrypted native transport connections (CASSANDRA-9590) +Merged from 2.2: * Configurable page size in cqlsh (CASSANDRA-9855) * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761) - * Cancel transaction for sstables we wont redistribute index summary - for (CASSANDRA-10270) - * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) - * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222) - * Fix failure to start with space in directory path on Windows (CASSANDRA-10239) - * Fix repair hang when snapshot failed (CASSANDRA-10057) - * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks - (CASSANDRA-10199) + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) Merged from 2.1: * Bulk Loader API could not tolerate even node failure (CASSANDRA-10347) * Avoid misleading pushed notifications when multiple nodes http://git-wip-us.apache.org/repos/asf/cassandra/blob/b324759e/src/java/org/apache/cassandra/cql3/Cql.g --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/454268bc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/454268bc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/454268bc Branch: refs/heads/trunk Commit: 454268bc8bd1633626e78463db7d87f518959823 Parents: dc61fa6 2d825a1 Author: Yuki Morishita Authored: Tue Oct 13 10:27:50 2015 -0500 Committer: Yuki Morishita Committed: Tue Oct 13 10:27:50 2015 -0500 -- NEWS.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/454268bc/NEWS.txt -- diff --cc NEWS.txt index 61fb9ba,f9fbe43..b422453 --- a/NEWS.txt +++ b/NEWS.txt @@@ -44,79 -18,8 +44,76 @@@ New feature Upgrading - -- Nothing specific to this release, but please see 2.2 if you are upgrading - from a previous version. + - Upgrade to 3.0 is supported from Cassandra 2.1 versions greater or equal to 2.1.9, + or Cassandra 2.2 versions greater or equal to 2.2.1. Upgrade from Cassandra 2.0 and + older versions is not supported. + - The 'memtable_allocation_type: offheap_objects' option has been removed. It should + be re-introduced in a future release and you can follow CASSANDRA-9472 to know more. + - The native protocol versions 1 and 2 are not supported anymore. + - Max mutation size is now configurable via max_mutation_size_in_kb setting in + cassandra.yaml; the default is half the size commitlog_segment_size_in_mb * 1024. + - 3.0 requires Java 8u40 or later. + - The default JVM GC has been changed to G1GC. -- The default JVM flag -XX:+PerfDisableSharedMem will cause the following tools JVM - to stop working: jps, jstack, jinfo, jmc, jcmd as well as 3rd party tools like Jolokia. - If you wish to use these tools you can comment this flag out in cassandra-env.{sh,ps1} + - New transaction log files have been introduced to replace the compactions_in_progress + system table, temporary file markers (tmp and tmplink) and sstable ancerstors. + Therefore, compaction metadata no longer contains ancestors. Transaction log files + list sstable descriptors involved in compactions and other operations such as flushing + and streaming. Use the sstableutil tool to list any sstable files currently involved + in operations not yet completed, which previously would have been marked as temporary. + A transaction log file contains one sstable per line, with the prefix "add:" or "remove:". + They also contain a special line "commit", only inserted at the end when the transaction + is committed. On startup we use these files to cleanup any partial transactions that were + in progress when the process exited. If the commit line is found, we keep new sstables + (those with the "add" prefix) and delete the old sstables (those with the "remove" prefix), + vice-versa if the commit line is missing. Should you lose or delete these log files, + both old and new sstable files will be kept as live files, which will result in duplicated + sstables. These files are protected by incremental checksums so you should not manually + edit them. When restoring a full backup or moving sstable files, you should clean-up + any left over transactions and their temporary files first. You can use this command: + ===> sstableutil -c ks table + See CASSANDRA-7066 for full details. + - New write stages have been added for batchlog and materialized view mutations + you can set their size in cassandra.yaml + - User defined functions are now executed in a sandbox. + To use UDFs and UDAs, you have to enable them in cassandra.yaml. + - New SSTable version 'la' with improved bloom-filter false-positive handling + compared to previous version 'ka' used in 2.2 and 2.1. Running sstableupgrade + is not necessary but recommended. + - Before upgrading to 3.0, make sure that your cluster is in complete agreement + (schema versions outputted by `nodetool describecluster` are all the same). + - Schema metadata is now stored in the new `system_schema` keyspace, and + legacy `system.schema_*` tables are now gone; see CASSANDRA-6717 for details. + - Pig's CassandraStorage has been removed. Use CqlNativeStorage instead. + - Hadoop BulkOutputFormat and BulkRecordWriter have been removed; use + CqlBulkOutputFormat and CqlBulkRecordWriter instead. + - Hadoop ColumnFamilyInputFormat and ColumnFamilyOutputFormat have been removed; + use CqlInputFormat and CqlOutputFormat instead. + - Hadoop ColumnFamilyR
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f5e9602 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f5e9602 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f5e9602 Branch: refs/heads/trunk Commit: 5f5e9602df803ba34260a62e12faec33a98dd428 Parents: 1415fa5 7875326 Author: Joshua McKenzie Authored: Wed Oct 14 14:44:24 2015 -0400 Committer: Joshua McKenzie Committed: Wed Oct 14 14:44:24 2015 -0400 -- bin/cassandra.ps1 | 8 1 file changed, 8 insertions(+) --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db10cb25 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db10cb25 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db10cb25 Branch: refs/heads/cassandra-3.5 Commit: db10cb25c036175ac51474ea1e1169524d0e98a6 Parents: 1dbfa4b b06bcf7 Author: Sylvain Lebresne Authored: Fri Mar 18 10:54:16 2016 +0100 Committer: Sylvain Lebresne Committed: Fri Mar 18 10:54:16 2016 +0100 -- --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f52f299c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f52f299c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f52f299c Branch: refs/heads/trunk Commit: f52f299cdf4cf5d2fea6253a41561d439cebcb3e Parents: 736a0ce a33038b Author: Robert Stupp Authored: Mon Apr 4 14:10:25 2016 +0200 Committer: Robert Stupp Committed: Mon Apr 4 14:10:25 2016 +0200 -- CHANGES.txt | 5 + .../apache/cassandra/net/IncomingStreamingConnection.java | 9 ++--- 2 files changed, 11 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f52f299c/CHANGES.txt -- diff --cc CHANGES.txt index 8305852,b6438b8..d03705a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,5 +1,25 @@@ -2.2.6 ++3.0.6 ++Merged from 2.2: + * IncomingStreamingConnection version check message wrong (CASSANDRA-11462) ++ ++ +3.0.5 + * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943) + * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320) + * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131) + * Upgrade ohc to 0.4.3 + * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093) + * Allocate merkletrees with the correct size (CASSANDRA-11390) + * Support streaming pre-3.0 sstables (CASSANDRA-10990) + * Add backpressure to compressed commit log (CASSANDRA-10971) + * SSTableExport supports secondary index tables (CASSANDRA-11330) + * Fix sstabledump to include missing info in debug output (CASSANDRA-11321) + * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331) + * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208) + * Remove recursive call from CompositesSearcher (CASSANDRA-11304) + * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377) + * Fix sstableloader fail when using materialized view (CASSANDRA-11275) +Merged from 2.2: * DatabaseDescriptor should log stacktrace in case of Eception during seed provider creation (CASSANDRA-11312) * Use canonical path for directory in SSTable descriptor (CASSANDRA-10587) * Add cassandra-stress keystore option (CASSANDRA-9325) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f52f299c/src/java/org/apache/cassandra/net/IncomingStreamingConnection.java -- diff --cc src/java/org/apache/cassandra/net/IncomingStreamingConnection.java index 19e0671,79a814d..82ce18e --- a/src/java/org/apache/cassandra/net/IncomingStreamingConnection.java +++ b/src/java/org/apache/cassandra/net/IncomingStreamingConnection.java @@@ -57,11 -56,12 +57,12 @@@ public class IncomingStreamingConnectio { try { - // streaming connections are per-session and have a fixed version. we can't do anything with a wrong-version stream connection, so drop it. + // streaming connections are per-session and have a fixed version. + // we can't do anything with a wrong-version stream connection, so drop it. if (version != StreamMessage.CURRENT_VERSION) - throw new IOException(String.format("Received stream using protocol version %d (my version %d). Terminating connection", version, MessagingService.current_version)); + throw new IOException(String.format("Received stream using protocol version %d (my version %d). Terminating connection", version, StreamMessage.CURRENT_VERSION)); -DataInput input = new DataInputStream(socket.getInputStream()); +DataInputPlus input = new DataInputStreamPlus(socket.getInputStream()); StreamInitMessage init = StreamInitMessage.serializer.deserialize(input, version); //Set SO_TIMEOUT on follower side
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04a75a63 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04a75a63 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04a75a63 Branch: refs/heads/trunk Commit: 04a75a6344433c89531f1e5435566e8bf8d45286 Parents: 4245932 96c53e0 Author: Josh McKenzie Authored: Wed Apr 6 18:44:48 2016 -0400 Committer: Josh McKenzie Committed: Wed Apr 6 18:45:09 2016 -0400 -- conf/cassandra-env.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04a75a63/conf/cassandra-env.ps1 -- diff --cc conf/cassandra-env.ps1 index 5eefb04,321a9ca..a322a4d --- a/conf/cassandra-env.ps1 +++ b/conf/cassandra-env.ps1 @@@ -332,57 -331,6 +332,57 @@@ Function SetCassandraEnvironmen CalculateHeapSizes ParseJVMInfo + +#GC log path has to be defined here since it needs to find CASSANDRA_HOME - $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc.log" ++$env:JVM_OPTS="$env:JVM_OPTS -Xloggc:""$env:CASSANDRA_HOME/logs/gc.log""" + +# Read user-defined JVM options from jvm.options file +$content = Get-Content "$env:CASSANDRA_CONF\jvm.options" +for ($i = 0; $i -lt $content.Count; $i++) +{ +$line = $content[$i] +if ($line.StartsWith("-")) +{ +$env:JVM_OPTS = "$env:JVM_OPTS $line" +} +} + +$defined_xmn = $env:JVM_OPTS -like '*Xmn*' +$defined_xmx = $env:JVM_OPTS -like '*Xmx*' +$defined_xms = $env:JVM_OPTS -like '*Xms*' +$using_cms = $env:JVM_OPTS -like '*UseConcMarkSweepGC*' + +# We only set -Xms and -Xmx if they were not defined on jvm.options file +# If defined, both Xmx and Xms should be defined together. +if (($defined_xmx -eq $false) -and ($defined_xms -eq $false)) +{ +$env:JVM_OPTS="$env:JVM_OPTS -Xms$env:MAX_HEAP_SIZE" +$env:JVM_OPTS="$env:JVM_OPTS -Xmx$env:MAX_HEAP_SIZE" +} +elseif (($defined_xmx -eq $false) -or ($defined_xms -eq $false)) +{ +echo "Please set or unset -Xmx and -Xms flags in pairs on jvm.options file." +exit +} + +# We only set -Xmn flag if it was not defined in jvm.options file +# and if the CMS GC is being used +# If defined, both Xmn and Xmx should be defined together. +if (($defined_xmn -eq $true) -and ($defined_xmx -eq $false)) +{ +echo "Please set or unset -Xmx and -Xmn flags in pairs on jvm.options file." +exit +} +elseif (($defined_xmn -eq $false) -and ($using_cms -eq $true)) +{ +$env:JVM_OPTS="$env:JVM_OPTS -Xmn$env:HEAP_NEWSIZE" +} + +if (($env:JVM_ARCH -eq "64-Bit") -and ($using_cms -eq $true)) +{ +$env:JVM_OPTS="$env:JVM_OPTS -XX:+UseCondCardMark" +} + # Add sigar env - see Cassandra-7838 $env:JVM_OPTS = "$env:JVM_OPTS -Djava.library.path=""$env:CASSANDRA_HOME\lib\sigar-bin"""
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f0cd3261 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0cd3261 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0cd3261 Branch: refs/heads/trunk Commit: f0cd3261be946fd9835e8c978841bc930d1e07d9 Parents: 063b376 3557d2e Author: Yuki Morishita Authored: Mon Apr 11 11:30:28 2016 -0500 Committer: Yuki Morishita Committed: Mon Apr 11 11:30:28 2016 -0500 -- CHANGES.txt | 1 + .../apache/cassandra/repair/RepairRunnable.java | 10 ++ .../cassandra/service/ActiveRepairService.java | 11 ++ .../cassandra/service/StorageService.java | 28 - .../progress/jmx/LegacyJMXProgressSupport.java | 107 + .../jmx/LegacyJMXProgressSupportTest.java | 118 +++ 6 files changed, 269 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0cd3261/CHANGES.txt -- diff --cc CHANGES.txt index 47e6105,e935e57..8c40e63 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,29 -1,6 +1,30 @@@ -2.2.6 +3.0.6 + * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470) + * Notify indexers of expired rows during compaction (CASSANDRA-11329) + * Properly respond with ProtocolError when a v1/v2 native protocol + header is received (CASSANDRA-11464) + * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120) +Merged from 2.2: + * Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430) * IncomingStreamingConnection version check message wrong (CASSANDRA-11462) + +3.0.5 + * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943) + * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320) + * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131) + * Upgrade ohc to 0.4.3 + * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093) + * Allocate merkletrees with the correct size (CASSANDRA-11390) + * Support streaming pre-3.0 sstables (CASSANDRA-10990) + * Add backpressure to compressed commit log (CASSANDRA-10971) + * SSTableExport supports secondary index tables (CASSANDRA-11330) + * Fix sstabledump to include missing info in debug output (CASSANDRA-11321) + * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331) + * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208) + * Remove recursive call from CompositesSearcher (CASSANDRA-11304) + * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377) + * Fix sstableloader fail when using materialized view (CASSANDRA-11275) +Merged from 2.2: * DatabaseDescriptor should log stacktrace in case of Eception during seed provider creation (CASSANDRA-11312) * Use canonical path for directory in SSTable descriptor (CASSANDRA-10587) * Add cassandra-stress keystore option (CASSANDRA-9325) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0cd3261/src/java/org/apache/cassandra/repair/RepairRunnable.java -- diff --cc src/java/org/apache/cassandra/repair/RepairRunnable.java index eb25457,d2b6ab6..354cb2a --- a/src/java/org/apache/cassandra/repair/RepairRunnable.java +++ b/src/java/org/apache/cassandra/repair/RepairRunnable.java @@@ -230,8 -227,13 +230,13 @@@ public class RepairRunnable extends Wra { public void onSuccess(RepairSessionResult result) { + /** + * If the success message below is modified, it must also be updated on + * {@link org.apache.cassandra.utils.progress.jmx.LegacyJMXProgressSupport} + * for backward-compatibility support. + */ String message = String.format("Repair session %s for range %s finished", session.getId(), - session.getRange().toString()); + session.getRanges().toString()); logger.info(message); fireProgressEvent(tag, new ProgressEvent(ProgressEventType.PROGRESS, progress.incrementAndGet(), @@@ -241,8 -243,13 +246,13 @@@ public void onFailure(Throwable t) { + /** + * If the failure message below is modified, it must also be updated on +
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4238cdd9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4238cdd9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4238cdd9 Branch: refs/heads/trunk Commit: 4238cdd99fd58f96a1c933f1c8113cf349300982 Parents: 5dbeef3 19b4b63 Author: Aleksey Yeschenko Authored: Mon Apr 11 20:07:04 2016 +0100 Committer: Aleksey Yeschenko Committed: Mon Apr 11 20:07:04 2016 +0100 -- CHANGES.txt | 2 + .../cassandra/hadoop/cql3/CqlConfigHelper.java | 58 +--- 2 files changed, 41 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4238cdd9/CHANGES.txt -- diff --cc CHANGES.txt index 76c9d99,54013a3..ed4c412 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,30 -1,7 +1,32 @@@ -2.2.6 +3.0.6 + * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470) + * Notify indexers of expired rows during compaction (CASSANDRA-11329) + * Properly respond with ProtocolError when a v1/v2 native protocol + header is received (CASSANDRA-11464) + * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120) +Merged from 2.2: + * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532) * Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430) * IncomingStreamingConnection version check message wrong (CASSANDRA-11462) + ++ +3.0.5 + * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943) + * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320) + * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131) + * Upgrade ohc to 0.4.3 + * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093) + * Allocate merkletrees with the correct size (CASSANDRA-11390) + * Support streaming pre-3.0 sstables (CASSANDRA-10990) + * Add backpressure to compressed commit log (CASSANDRA-10971) + * SSTableExport supports secondary index tables (CASSANDRA-11330) + * Fix sstabledump to include missing info in debug output (CASSANDRA-11321) + * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331) + * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208) + * Remove recursive call from CompositesSearcher (CASSANDRA-11304) + * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377) + * Fix sstableloader fail when using materialized view (CASSANDRA-11275) +Merged from 2.2: * DatabaseDescriptor should log stacktrace in case of Eception during seed provider creation (CASSANDRA-11312) * Use canonical path for directory in SSTable descriptor (CASSANDRA-10587) * Add cassandra-stress keystore option (CASSANDRA-9325) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4238cdd9/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f4b5e30 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f4b5e30 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f4b5e30 Branch: refs/heads/trunk Commit: 7f4b5e3051ea1f314a517e6406e834efd4ee280b Parents: 99ea2ee 77ab773 Author: Aleksey Yeschenko Authored: Mon Apr 18 15:26:26 2016 +0100 Committer: Aleksey Yeschenko Committed: Mon Apr 18 15:26:26 2016 +0100 -- CHANGES.txt| 3 ++- src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f4b5e30/CHANGES.txt -- diff --cc CHANGES.txt index c9538a8,baaf227..6586299 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,9 +1,14 @@@ -2.2.7 +3.0.6 + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410) + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485) - * Allow only DISTINCT queries with partition keys or static columns restrictions (CASSANDRA-11339) + * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470) + * Notify indexers of expired rows during compaction (CASSANDRA-11329) + * Properly respond with ProtocolError when a v1/v2 native protocol + header is received (CASSANDRA-11464) + * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120) +Merged from 2.2: + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553) - - -2.2.6 + * Allow only DISTINCT queries with partition keys restrictions (CASSANDRA-11339) * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532) * Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430) * IncomingStreamingConnection version check message wrong (CASSANDRA-11462) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f4b5e30/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c568efee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c568efee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c568efee Branch: refs/heads/trunk Commit: c568efee54fd118ee9039394391e911fe690a1f3 Parents: dab1d57 eb072a0 Author: Stefania Alborghetti Authored: Thu Apr 21 09:44:08 2016 +0800 Committer: Stefania Alborghetti Committed: Thu Apr 21 09:45:49 2016 +0800 -- CHANGES.txt| 2 ++ pylib/cqlshlib/copyutil.py | 40 ++-- 2 files changed, 28 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c568efee/CHANGES.txt -- diff --cc CHANGES.txt index ae73437,6e6e17b..6fffe2a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,13 +1,17 @@@ -2.2.7 +3.0.6 + * Ensure columnfilter covers indexed columns for thrift 2i queries (CASSANDRA-11523) + * Only open one sstable scanner per sstable (CASSANDRA-11412) + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410) + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485) + * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470) + * Notify indexers of expired rows during compaction (CASSANDRA-11329) + * Properly respond with ProtocolError when a v1/v2 native protocol + header is received (CASSANDRA-11464) + * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120) +Merged from 2.2: + * 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) -Merged from 2.1: - * (cqlsh) Fix potential COPY deadlock when parent process is terminating child - processes (CASSANDRA-11505) - - -2.2.6 * Allow only DISTINCT queries with partition keys restrictions (CASSANDRA-11339) * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532) * Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c568efee/pylib/cqlshlib/copyutil.py --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/caae9870 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/caae9870 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/caae9870 Branch: refs/heads/trunk Commit: caae9870dd19c38251d14a3bcb7b5b2b9839ff79 Parents: bb68078 3244774 Author: Sam Tunnicliffe Authored: Thu Apr 21 18:42:43 2016 +0100 Committer: Sam Tunnicliffe Committed: Thu Apr 21 18:42:43 2016 +0100 -- --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44424bb5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44424bb5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44424bb5 Branch: refs/heads/trunk Commit: 44424bba2ddd427ffe666d7963185a6b8398 Parents: 4ac4335 dd76858 Author: T Jake Luciani Authored: Tue Jan 26 09:17:35 2016 -0500 Committer: T Jake Luciani Committed: Tue Jan 26 09:17:35 2016 -0500 -- --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23f62962 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23f62962 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23f62962 Branch: refs/heads/trunk Commit: 23f629628ecb00bc997b88c9ffcc296be5d4f701 Parents: 58821ce d295c7c Author: Aleksey Yeschenko Authored: Mon Feb 8 12:19:38 2016 + Committer: Aleksey Yeschenko Committed: Mon Feb 8 12:19:38 2016 + -- CHANGES.txt | 1 + bin/cqlsh.py | 41 - 2 files changed, 37 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/23f62962/CHANGES.txt -- diff --cc CHANGES.txt index 0fb8f34,b0a5062..6302ce6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,7 +1,8 @@@ -2.2.6 +3.0.4 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) +Merged from 2.2.6 + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) * Gossiper#isEnabled is not thread safe (CASSANDRA-6) - * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010) Merged from 2.1: * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-3) http://git-wip-us.apache.org/repos/asf/cassandra/blob/23f62962/bin/cqlsh.py --
[4/6] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aa97e30/test/unit/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSetTest.java -- diff --cc test/unit/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSetTest.java index d738c46,1deeb9e..abbd36b --- a/test/unit/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSetTest.java +++ b/test/unit/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSetTest.java @@@ -28,10 -28,13 +28,11 @@@ import org.apache.cassandra.config.Colu import org.apache.cassandra.cql3.*; import org.apache.cassandra.cql3.Term.MultiItemTerminal; import org.apache.cassandra.cql3.statements.Bound; -import org.apache.cassandra.db.ColumnFamilyType; -import org.apache.cassandra.db.composites.Composite; -import org.apache.cassandra.db.composites.Composite.EOC; -import org.apache.cassandra.db.composites.CompoundSparseCellNameType; ++ +import org.apache.cassandra.db.*; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.Int32Type; - import org.apache.cassandra.exceptions.InvalidRequestException; + import org.apache.cassandra.db.marshal.ReversedType; import org.apache.cassandra.utils.ByteBufferUtil; import static java.util.Arrays.asList; @@@ -41,28 -44,28 +42,28 @@@ import static org.junit.Assert.assertTr public class PrimaryKeyRestrictionSetTest { @Test - public void testboundsAsClusteringWithNoRestrictions() throws InvalidRequestException -public void testBoundsAsCompositesWithNoRestrictions() ++public void testBoundsAsClusteringWithNoRestrictions() { - CFMetaData cfMetaData = newCFMetaData(1); + CFMetaData cfMetaData = newCFMetaData(Sort.ASC); -PrimaryKeyRestrictions restrictions = new PrimaryKeyRestrictionSet(cfMetaData.comparator); +PrimaryKeyRestrictions restrictions = new PrimaryKeyRestrictionSet(cfMetaData.comparator, false); -List bounds = restrictions.boundsAsComposites(Bound.START, QueryOptions.DEFAULT); +SortedSet bounds = restrictions.boundsAsClustering(Bound.START, QueryOptions.DEFAULT); assertEquals(1, bounds.size()); -assertEmptyComposite(bounds.get(0)); +assertEmptyStart(get(bounds, 0)); -bounds = restrictions.boundsAsComposites(Bound.END, QueryOptions.DEFAULT); +bounds = restrictions.boundsAsClustering(Bound.END, QueryOptions.DEFAULT); assertEquals(1, bounds.size()); -assertEmptyComposite(bounds.get(0)); +assertEmptyEnd(get(bounds, 0)); } /** * Test 'clustering_0 = 1' with only one clustering column */ @Test - public void testboundsAsClusteringWithOneEqRestrictionsAndOneClusteringColumn() throws InvalidRequestException -public void testBoundsAsCompositesWithOneEqRestrictionsAndOneClusteringColumn() ++public void testBoundsAsClusteringWithOneEqRestrictionsAndOneClusteringColumn() { - CFMetaData cfMetaData = newCFMetaData(1); + CFMetaData cfMetaData = newCFMetaData(Sort.ASC); ByteBuffer clustering_0 = ByteBufferUtil.bytes(1); Restriction eq = newSingleEq(cfMetaData, 0, clustering_0); @@@ -83,9 -86,9 +84,9 @@@ * Test 'clustering_1 = 1' with 2 clustering columns */ @Test - public void testboundsAsClusteringWithOneEqRestrictionsAndTwoClusteringColumns() throws InvalidRequestException -public void testBoundsAsCompositesWithOneEqRestrictionsAndTwoClusteringColumns() ++public void testBoundsAsClusteringWithOneEqRestrictionsAndTwoClusteringColumns() { - CFMetaData cfMetaData = newCFMetaData(2); + CFMetaData cfMetaData = newCFMetaData(Sort.ASC, Sort.ASC); ByteBuffer clustering_0 = ByteBufferUtil.bytes(1); Restriction eq = newSingleEq(cfMetaData, 0, clustering_0); @@@ -106,7 -109,7 +107,7 @@@ * Test 'clustering_0 IN (1, 2, 3)' with only one clustering column */ @Test - public void testboundsAsClusteringWithOneInRestrictionsAndOneClusteringColumn() throws InvalidRequestException -public void testBoundsAsCompositesWithOneInRestrictionsAndOneClusteringColumn() ++public void testBoundsAsClusteringWithOneInRestrictionsAndOneClusteringColumn() { ByteBuffer value1 = ByteBufferUtil.bytes(1); ByteBuffer value2 = ByteBufferUtil.bytes(2); @@@ -136,9 -139,9 +137,9 @@@ * Test slice restriction (e.g 'clustering_0 > 1') with only one clustering column */ @Test - public void testboundsAsClusteringWithSliceRestrictionsAndOneClusteringColumn() throws InvalidRequestException -public void testBoundsAsCompositesWithSliceRestrictionsAndOneClusteringColumn() ++public void testBoundsAsClusteringWithSliceRestrictionsAndOneClusteringColumn() { - CFMetaData cfMetaData = newCFMetaData(1);
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/efbcd15d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efbcd15d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efbcd15d Branch: refs/heads/trunk Commit: efbcd15d642008866f82d89f881b703c011dce19 Parents: f3b7599 1b201e9 Author: Aleksey Yeschenko Authored: Fri Feb 12 17:29:15 2016 + Committer: Aleksey Yeschenko Committed: Fri Feb 12 17:31:21 2016 + -- CHANGES.txt | 5 - src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java | 6 -- src/java/org/apache/cassandra/locator/TokenMetadata.java| 7 +++ 3 files changed, 11 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/efbcd15d/CHANGES.txt -- diff --cc CHANGES.txt index 15012b1,49bc581..a7669bb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -15,8 -5,9 +15,11 @@@ Merged from 2.2 * (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) ++ * Use cloned TokenMetadata in size estimates to avoid race against membership check ++ (CASSANDRA-10736) * (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) + * Fix paging on DISTINCT queries repeats result when first row in partition changes +(CASSANDRA-10010) Merged from 2.1: * Properly release sstable ref when doing offline scrub (CASSANDRA-10697) * Improve nodetool status performance for large cluster (CASSANDRA-7238) http://git-wip-us.apache.org/repos/asf/cassandra/blob/efbcd15d/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/efbcd15d/src/java/org/apache/cassandra/locator/TokenMetadata.java -- diff --cc src/java/org/apache/cassandra/locator/TokenMetadata.java index f6e9cf7,de16fda..97c5f10 --- a/src/java/org/apache/cassandra/locator/TokenMetadata.java +++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java @@@ -26,8 -26,8 +26,9 @@@ import java.util.concurrent.atomic.Atom import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.*; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fcc40e58 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcc40e58 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fcc40e58 Branch: refs/heads/trunk Commit: fcc40e58869df76cf8f6c6e066f9aef2bd9d4b1a Parents: 7a3c3ab 97f3aa6 Author: Robert Stupp Authored: Wed Feb 17 13:42:54 2016 +0100 Committer: Robert Stupp Committed: Wed Feb 17 13:42:54 2016 +0100 -- CHANGES.txt| 1 + bin/cqlsh.py | 4 ++-- pylib/cqlshlib/cqlhandling.py | 3 ++- pylib/cqlshlib/test/cassconnect.py | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcc40e58/CHANGES.txt -- diff --cc CHANGES.txt index f1a9719,288f204..1d89446 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,7 +1,19 @@@ -2.2.6 +3.0.4 + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721) + * Add query time validation method on Index (CASSANDRA-11043) + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128) + * Properly handle hinted handoff after topology changes (CASSANDRA-5902) + * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156) + * Fix wrong rack counting and invalid conditions check for TokenAllocation + (CASSANDRA-11139) + * Avoid creating empty hint files (CASSANDRA-11090) + * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120) + * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062) + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) + * Add dropped_columns to the list of schema table so it gets handled + properly (CASSANDRA-11050) +Merged from 2.2: + * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcc40e58/bin/cqlsh.py --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5dbab320 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5dbab320 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5dbab320 Branch: refs/heads/trunk Commit: 5dbab32042924787d333053baa5e4af2d31b475a Parents: 39e966d 128d144 Author: Joshua McKenzie Authored: Wed Feb 17 19:23:10 2016 -0500 Committer: Joshua McKenzie Committed: Wed Feb 17 19:23:10 2016 -0500 -- CHANGES.txt | 1 + bin/cqlsh.py | 38 ++- conf/cqlshrc.sample | 3 +++ pylib/cqlshlib/formatting.py | 14 ++ pylib/cqlshlib/test/test_cqlsh_output.py | 18 + 5 files changed, 68 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dbab320/CHANGES.txt -- diff --cc CHANGES.txt index 4bb5a5e,904a913..a1125f5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -32,45 -18,10 +32,46 @@@ Merged from 2.1 * Gossiper#isEnabled is not thread safe (CASSANDRA-6) * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-3) * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041) - * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938) + * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397) +3.0.3 + * Remove double initialization of newly added tables (CASSANDRA-11027) + * Filter keys searcher results by target range (CASSANDRA-11104) + * Fix deserialization of legacy read commands (CASSANDRA-11087) + * Fix incorrect computation of deletion time in sstable metadata (CASSANDRA-11102) + * Avoid memory leak when collecting sstable metadata (CASSANDRA-11026) + * Mutations do not block for completion under view lock contention (CASSANDRA-10779) + * Invalidate legacy schema tables when unloading them (CASSANDRA-11071) + * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly + (CASSANDRA-11003) + * Fix DISTINCT queries in mixed version clusters (CASSANDRA-10762) + * Migrate build status for indexes along with legacy schema (CASSANDRA-11046) + * Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045) + * Added support for IBM zSystems architecture (CASSANDRA-11054) + * Update CQL documentation (CASSANDRA-10899) + * Check the column name, not cell name, for dropped columns when reading + legacy sstables (CASSANDRA-11018) + * Don't attempt to index clustering values of static rows (CASSANDRA-11021) + * Remove checksum files after replaying hints (CASSANDRA-10947) + * Support passing base table metadata to custom 2i validation (CASSANDRA-10924) + * Ensure stale index entries are purged during reads (CASSANDRA-11013) + * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954) + * Fix UnsupportedOperationException when reading old sstable with range + tombstone (CASSANDRA-10743) + * MV should use the maximum timestamp of the primary key (CASSANDRA-10910) + * Fix potential assertion error during compaction (CASSANDRA-10944) + * Fix counting of received sstables in streaming (CASSANDRA-10949) + * Implement hints compression (CASSANDRA-9428) + * Fix potential assertion error when reading static columns (CASSANDRA-10903) + * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711) + * Avoid building PartitionUpdate in toString (CASSANDRA-10897) + * Reduce heap spent when receiving many SSTables (CASSANDRA-10797) + * Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873) + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653) + * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837) + * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806) +Merged from 2.2: 2.2.5 * maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949) * Apply change to compaction throughput in real time (CASSANDRA-10025) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dbab320/bin/cqlsh.py -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dbab320/pylib/cqlshlib/test/test_cqlsh_output.py --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15ac9e89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15ac9e89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15ac9e89 Branch: refs/heads/trunk Commit: 15ac9e899bf0448c42e2cce9cf867556f161c186 Parents: 5dbab32 c003951 Author: Marcus Eriksson Authored: Thu Feb 18 12:51:32 2016 +0100 Committer: Marcus Eriksson Committed: Thu Feb 18 12:51:32 2016 +0100 -- CHANGES.txt | 1 + .../apache/cassandra/db/compaction/CompactionManager.java | 9 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15ac9e89/CHANGES.txt -- diff --cc CHANGES.txt index a1125f5,7cbfea7..f68eea5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,8 +1,20 @@@ -2.2.6 +3.0.4 + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721) + * Add query time validation method on Index (CASSANDRA-11043) + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128) + * Properly handle hinted handoff after topology changes (CASSANDRA-5902) + * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156) + * Fix wrong rack counting and invalid conditions check for TokenAllocation + (CASSANDRA-11139) + * Avoid creating empty hint files (CASSANDRA-11090) + * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120) + * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062) + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) + * Add dropped_columns to the list of schema table so it gets handled + properly (CASSANDRA-11050) +Merged from 2.2: + * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/15ac9e89/src/java/org/apache/cassandra/db/compaction/CompactionManager.java --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4354fb27 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4354fb27 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4354fb27 Branch: refs/heads/trunk Commit: 4354fb27dcb706cdb3e7cb611d3ff1b9b53f04e9 Parents: c64d3a5 37680ee Author: Yuki Morishita Authored: Thu Feb 18 11:23:02 2016 -0600 Committer: Yuki Morishita Committed: Thu Feb 18 11:23:02 2016 -0600 -- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 36 .../repair/RepairMessageVerbHandler.java| 43 ++-- 3 files changed, 68 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4354fb27/CHANGES.txt -- diff --cc CHANGES.txt index a79a411,53fc168..1e69cd0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,5 +1,19 @@@ -2.2.6 +3.0.4 + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721) + * Add query time validation method on Index (CASSANDRA-11043) + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128) + * Properly handle hinted handoff after topology changes (CASSANDRA-5902) + * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156) + * Fix wrong rack counting and invalid conditions check for TokenAllocation + (CASSANDRA-11139) + * Avoid creating empty hint files (CASSANDRA-11090) + * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120) + * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062) + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) + * Add dropped_columns to the list of schema table so it gets handled + properly (CASSANDRA-11050) +Merged from 2.2: + * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4354fb27/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 3d7be4e,da4a84a..c564d8d --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -2322,4 -3043,72 +2322,40 @@@ public class ColumnFamilyStore implemen fileIndexGenerator.set(0); } -// returns the "canonical" version of any current sstable, i.e. if an sstable is being replaced and is only partially -// visible to reads, this sstable will be returned as its original entirety, and its replacement will not be returned -// (even if it completely replaces it) -public static final Function> CANONICAL_SSTABLES = new Function>() -{ -public List apply(View view) -{ -List sstables = new ArrayList<>(); -for (SSTableReader sstable : view.compacting) -if (sstable.openReason != SSTableReader.OpenReason.EARLY) -sstables.add(sstable); -for (SSTableReader sstable : view.sstables) -if (!view.compacting.contains(sstable) && sstable.openReason != SSTableReader.OpenReason.EARLY) -sstables.add(sstable); -return sstables; -} -}; - -public static final Function> UNREPAIRED_SSTABLES = new Function>() -{ -public List apply(View view) -{ -List sstables = new ArrayList<>(); -for (SSTableReader sstable : CANONICAL_SSTABLES.apply(view)) -{ -if (!sstable.isRepaired()) -sstables.add(sstable); -} -return sstables; -} -}; - + /** + * Returns a ColumnFamilyStore by cfId if it exists, null otherwise + * Differently from others, this method does not throw exception if the table does not exist. + */ + public static ColumnFamilyStore getIfExists(UUID cfId) + { + Pair kscf = Schema.instance.getCF(cfId); + if (kscf == null) + return null; + + Keyspace keyspace = Keyspace.open(kscf.left); + if (keyspace == null) + return null; + + return keyspace.getColumnFamilyStore(cfId); + } + + /** + * Returns a ColumnFamilyStore by ksname and cfname if it exists, null otherwise + *
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b5df24f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b5df24f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b5df24f Branch: refs/heads/trunk Commit: 9b5df24f5a84c37be2a587322aae81ff07881195 Parents: 4354fb2 71f4406 Author: Robert Stupp Authored: Thu Feb 18 21:40:10 2016 +0100 Committer: Robert Stupp Committed: Thu Feb 18 21:40:10 2016 +0100 -- CHANGES.txt | 1 + build.xml | 15 +-- 2 files changed, 6 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5df24f/CHANGES.txt -- diff --cc CHANGES.txt index 1e69cd0,10f23af..ae9cd75 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,5 +1,19 @@@ -2.2.6 +3.0.4 + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721) + * Add query time validation method on Index (CASSANDRA-11043) + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128) + * Properly handle hinted handoff after topology changes (CASSANDRA-5902) + * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156) + * Fix wrong rack counting and invalid conditions check for TokenAllocation + (CASSANDRA-11139) + * Avoid creating empty hint files (CASSANDRA-11090) + * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120) + * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062) + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) + * Add dropped_columns to the list of schema table so it gets handled + properly (CASSANDRA-11050) +Merged from 2.2: + * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5df24f/build.xml -- diff --cc build.xml index f9ff00d,361a057..d27b77a --- a/build.xml +++ b/build.xml @@@ -394,13 -402,13 +394,11 @@@ -- ++ - - - + + + @@@ -447,14 -454,14 +445,12 @@@ - -- - + + @@@ -468,9 -475,18 +464,7 @@@ artifactId="cassandra-parent" version="${version}"/> - - - - - - - - - -- @@@ -540,20 -559,25 +534,21 @@@ - -- ----> - + - - - - + + - - + +
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65033350 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65033350 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65033350 Branch: refs/heads/trunk Commit: 65033350891aa58b772c026c46818bb300102872 Parents: 9b5df24 4985fcc Author: Carl Yeksigian Authored: Thu Feb 18 15:50:44 2016 -0500 Committer: Carl Yeksigian Committed: Thu Feb 18 15:50:44 2016 -0500 -- CHANGES.txt | 1 + bin/cqlsh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/65033350/CHANGES.txt -- diff --cc CHANGES.txt index ae9cd75,d3dcdbc..275bc04 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,5 +1,19 @@@ -2.2.6 +3.0.4 + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721) + * Add query time validation method on Index (CASSANDRA-11043) + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128) + * Properly handle hinted handoff after topology changes (CASSANDRA-5902) + * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156) + * Fix wrong rack counting and invalid conditions check for TokenAllocation + (CASSANDRA-11139) + * Avoid creating empty hint files (CASSANDRA-11090) + * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120) + * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062) + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) + * Add dropped_columns to the list of schema table so it gets handled + properly (CASSANDRA-11050) +Merged from 2.2: + * (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)
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b0f2266b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0f2266b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0f2266b Branch: refs/heads/trunk Commit: b0f2266b27e493b84dd61b59f1c926fc22754962 Parents: 70c8a53 61ac125 Author: Robert Stupp Authored: Sat Feb 20 11:01:19 2016 +0100 Committer: Robert Stupp Committed: Sat Feb 20 11:01:19 2016 +0100 -- CHANGES.txt | 1 + .../apache/cassandra/schema/SchemaKeyspace.java | 8 ++- .../validation/operations/AggregationTest.java | 60 +++- 3 files changed, 65 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0f2266b/CHANGES.txt -- diff --cc CHANGES.txt index f0aa996,9d0046b..0c01009 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,5 +1,20 @@@ -2.2.6 +3.0.4 + * Prevent logging in sandboxed state (CASSANDRA-11033) + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721) + * Add query time validation method on Index (CASSANDRA-11043) + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128) + * Properly handle hinted handoff after topology changes (CASSANDRA-5902) + * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156) + * Fix wrong rack counting and invalid conditions check for TokenAllocation + (CASSANDRA-11139) + * Avoid creating empty hint files (CASSANDRA-11090) + * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120) + * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062) + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) + * Add dropped_columns to the list of schema table so it gets handled + properly (CASSANDRA-11050) +Merged from 2.2: + * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0f2266b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java -- diff --cc src/java/org/apache/cassandra/schema/SchemaKeyspace.java index 62c78fd,000..9e05a73 mode 100644,00..100644 --- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java +++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java @@@ -1,1408 -1,0 +1,1410 @@@ +/* + * 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.schema; + +import java.nio.ByteBuffer; +import java.nio.charset.CharacterCodingException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.*; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.MapDifference; +import com.google.common.collect.Maps; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.cassandra.config.*; +import org.apache.cassandra.config.ColumnDefinition.ClusteringOrder; +import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.functions.*; +import org.apache.cassandra.cql3.statements.SelectStatement; +import org.apache.cassandra.db.*; +import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.db.partitions.*; +import org.apache.cassandra.db.rows.*; +import org.apache.cassandra.db.view.View; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.transport.Server; +import org.apa
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7cb6f61 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7cb6f61 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7cb6f61 Branch: refs/heads/trunk Commit: d7cb6f61adec951c082cdeea64ffe5f68b8f7651 Parents: 9961b69 ecbeb08 Author: Jason Brown Authored: Fri Feb 26 14:49:35 2016 -0800 Committer: Jason Brown Committed: Fri Feb 26 14:50:13 2016 -0800 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/dht/Range.java| 20 +++- .../org/apache/cassandra/dht/RangeTest.java | 15 +++ 3 files changed, 27 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7cb6f61/CHANGES.txt -- diff --cc CHANGES.txt index fbc1c8a,aa3adf5..2dacd3a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ -2.2.6 +3.0.4 + * MV should only query complex columns included in the view (CASSANDRA-11069) + * Failed aggregate creation breaks server permanently (CASSANDRA-11064) + * Add sstabledump tool (CASSANDRA-7464) + * Introduce backpressure for hints (CASSANDRA-10972) + * Fix ClusteringPrefix not being able to read tombstone range boundaries (CASSANDRA-11158) + * Prevent logging in sandboxed state (CASSANDRA-11033) + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721) + * Add query time validation method on Index (CASSANDRA-11043) + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128) + * Properly handle hinted handoff after topology changes (CASSANDRA-5902) + * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156) + * Fix wrong rack counting and invalid conditions check for TokenAllocation + (CASSANDRA-11139) + * Avoid creating empty hint files (CASSANDRA-11090) + * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120) + * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062) + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) + * Add dropped_columns to the list of schema table so it gets handled + properly (CASSANDRA-11050) +Merged from 2.2: + * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7cb6f61/src/java/org/apache/cassandra/dht/Range.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7cb6f61/test/unit/org/apache/cassandra/dht/RangeTest.java --
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63285908 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63285908 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63285908 Branch: refs/heads/trunk Commit: 6328590808ff16fd026fd80cb28635d4313b8cc8 Parents: a20a0f7 a24bd6c Author: Aleksey Yeschenko Authored: Mon Feb 29 17:19:19 2016 + Committer: Aleksey Yeschenko Committed: Mon Feb 29 17:19:19 2016 + -- CHANGES.txt | 2 +- .../apache/cassandra/security/SSLFactory.java | 41 ++ .../thrift/CustomTThreadPoolServer.java | 4 +- .../org/apache/cassandra/transport/Server.java | 3 +- .../cassandra/transport/SimpleClient.java | 3 +- test/conf/keystore.jks | Bin 0 -> 2191 bytes .../cassandra/security/SSLFactoryTest.java | 75 +++ 7 files changed, 108 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63285908/CHANGES.txt -- diff --cc CHANGES.txt index ba3d2fd,103ac16..a7b5c8a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,5 +1,26 @@@ -2.2.6 +3.0.4 + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164) + * MV should only query complex columns included in the view (CASSANDRA-11069) + * Failed aggregate creation breaks server permanently (CASSANDRA-11064) + * Add sstabledump tool (CASSANDRA-7464) + * Introduce backpressure for hints (CASSANDRA-10972) + * Fix ClusteringPrefix not being able to read tombstone range boundaries (CASSANDRA-11158) + * Prevent logging in sandboxed state (CASSANDRA-11033) + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721) + * Add query time validation method on Index (CASSANDRA-11043) + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128) + * Properly handle hinted handoff after topology changes (CASSANDRA-5902) + * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156) + * Fix wrong rack counting and invalid conditions check for TokenAllocation + (CASSANDRA-11139) + * Avoid creating empty hint files (CASSANDRA-11090) + * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120) + * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062) + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) + * Add dropped_columns to the list of schema table so it gets handled + properly (CASSANDRA-11050) + * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239) +Merged from 2.2: * 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) @@@ -50,48 -30,12 +51,47 @@@ Merged from 2.1 * Gossiper#isEnabled is not thread safe (CASSANDRA-6) * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-3) * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041) - * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938) * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397) - * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124) + * (cqlsh) Display milliseconds when datetime overflows (CASSANDRA-10625) -2.2.5 +3.0.3 + * Remove double initialization of newly added tables (CASSANDRA-11027) + * Filter keys searcher results by target range (CASSANDRA-11104) + * Fix deserialization of legacy read commands (CASSANDRA-11087) + * Fix incorrect computation of deletion time in sstable metadata (CASSANDRA-11102) + * Avoid memory leak when collecting sstable metadata (CASSANDRA-11026) + * Mutations do not block for completion under view lock contention (CASSANDRA-10779) + * Invalidate legacy schema tables when unloading them (CASSANDRA-11071) + * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly + (CASSANDRA-11003) + * Fix DISTINCT queries in mixed version clusters (CASSANDRA-10762) + * Migrate build status for indexes along with legacy schema (CASSANDRA-11046) + * Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045) + * Added support for IBM zSystems architecture (CASSANDRA-11054) + * Update CQL documentation (CASSANDRA-10899) + * Check the column name, not cell name, for dropped columns when reading + legacy sstables (CASSANDRA-11018) + * Don't attempt to index clustering values of static rows (CASSANDRA-11021) + * Remove checksum files afte