[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9
Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a902bab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a902bab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a902bab Branch: refs/heads/trunk Commit: 5a902babc3f729858772f7d2de484e8a495dd357 Parents: aab33f1 2d73f3b Author: Tyler Hobbs Authored: Fri Aug 5 16:35:27 2016 -0500 Committer: Tyler Hobbs Committed: Fri Aug 5 16:35:27 2016 -0500 -- CHANGES.txt | 1 + .../apache/cassandra/db/marshal/ByteType.java | 19 ++--- .../apache/cassandra/db/marshal/ShortType.java | 19 ++--- .../cql3/validation/entities/JsonTest.java | 76 4 files changed, 85 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a902bab/CHANGES.txt -- diff --cc CHANGES.txt index 5df8b2f,78bd32d..2c5c221 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -21,46 -15,6 +21,47 @@@ Merged from 3.0 to connect with too low of a protocol version (CASSANDRA-11464) * NullPointerExpception when reading/compacting table (CASSANDRA-11988) * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144) +Merged from 2.2: ++ * Fix INSERT JSON, fromJson() support of smallint, tinyint types (CASSANDRA-12371) + * Release sstables of failed stream sessions only when outgoing transfers are finished (CASSANDRA-11345) + * Wait for tracing events before returning response and query at same consistency level client side (CASSANDRA-11465) + * cqlsh copyutil should get host metadata by connected address (CASSANDRA-11979) + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214) +Merged from 2.1: + * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850) + * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040) + + +3.8 + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236) + * Fix hdr logging for single operation workloads (CASSANDRA-12145) + * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073) + * Increase size of flushExecutor thread pool (CASSANDRA-12071) + * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950) + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034) + * Improve details in compaction log message (CASSANDRA-12080) + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911) + * Chunk cache to request compressor-compatible buffers if pool space is exhausted (CASSANDRA-11993) + * Remove DatabaseDescriptor dependencies from SequentialWriter (CASSANDRA-11579) + * Move skip_stop_words filter before stemming (CASSANDRA-12078) + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957) + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002) + * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966) + * Add cross-DC latency metrics (CASSANDRA-11596) + * Allow terms in selection clause (CASSANDRA-10783) + * Add bind variables to trace (CASSANDRA-11719) + * Switch counter shards' clock to timestamps (CASSANDRA-9811) + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853) + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718) + * Support older ant versions (CASSANDRA-11807) + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623) + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546) + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578) + * Faster streaming (CASSANDRA-9766) + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425) + * Add repaired percentage metric (CASSANDRA-11503) + * Add Change-Data-Capture (CASSANDRA-8844) +Merged from 3.0: * 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)
[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9
Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d769f0c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d769f0c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d769f0c Branch: refs/heads/cassandra-3.9 Commit: 2d769f0c5721be06a7401c69f45cfddf4d8fc736 Parents: 8458e4e 465def8 Author: Tyler Hobbs Authored: Wed Aug 10 11:12:18 2016 -0500 Committer: Tyler Hobbs Committed: Wed Aug 10 11:12:18 2016 -0500 -- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/net/MessageOut.java | 2 +- src/java/org/apache/cassandra/net/MessagingService.java | 10 ++ 3 files changed, 13 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d769f0c/CHANGES.txt -- diff --cc CHANGES.txt index 8fbd774,86746ad..9f7631d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -22,48 -17,6 +22,50 @@@ Merged from 3.0 to connect with too low of a protocol version (CASSANDRA-11464) * NullPointerExpception when reading/compacting table (CASSANDRA-11988) * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144) +Merged from 2.2: + * Fix hanging stream session (CASSANDRA-10992) + * Fix INSERT JSON, fromJson() support of smallint, tinyint types (CASSANDRA-12371) + * Release sstables of failed stream sessions only when outgoing transfers are finished (CASSANDRA-11345) + * Wait for tracing events before returning response and query at same consistency level client side (CASSANDRA-11465) + * cqlsh copyutil should get host metadata by connected address (CASSANDRA-11979) + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214) +Merged from 2.1: + * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850) + * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040) + + +3.8 + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236) + * Fix hdr logging for single operation workloads (CASSANDRA-12145) + * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073) + * Increase size of flushExecutor thread pool (CASSANDRA-12071) + * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950) + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034) + * Improve details in compaction log message (CASSANDRA-12080) + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911) + * Chunk cache to request compressor-compatible buffers if pool space is exhausted (CASSANDRA-11993) + * Remove DatabaseDescriptor dependencies from SequentialWriter (CASSANDRA-11579) + * Move skip_stop_words filter before stemming (CASSANDRA-12078) + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957) + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002) + * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966) + * Add cross-DC latency metrics (CASSANDRA-11596) + * Allow terms in selection clause (CASSANDRA-10783) + * Add bind variables to trace (CASSANDRA-11719) + * Switch counter shards' clock to timestamps (CASSANDRA-9811) + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853) + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718) + * Support older ant versions (CASSANDRA-11807) + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623) + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546) + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578) + * Faster streaming (CASSANDRA-9766) + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425) + * Add repaired percentage metric (CASSANDRA-11503) + * Add Change-Data-Capture (CASSANDRA-8844) +Merged from 3.0: ++ * Fix potential bad messaging service message for paged range reads ++ within mixed-version 3.x clusters (CASSANDRA-12249) * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d769f0c/src/java/org/apache/cassandra/net/MessageOut.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d769f0c/src/java/org/apache/cassandra/net/MessagingService.java ---
[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9
Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4c3e14f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4c3e14f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4c3e14f Branch: refs/heads/trunk Commit: f4c3e14fdebe9ec3fb9be4a6918b55f489891f3a Parents: 02f48c8 2a828af Author: Tyler Hobbs Authored: Thu Aug 11 13:47:11 2016 -0500 Committer: Tyler Hobbs Committed: Thu Aug 11 13:47:11 2016 -0500 -- CHANGES.txt | 1 + build.xml | 4 2 files changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4c3e14f/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4c3e14f/build.xml --
[3/4] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.9
Merge branch cassandra-3.0 into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c771a2d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c771a2d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c771a2d Branch: refs/heads/trunk Commit: 0c771a2db1d94901b4c7b194b9b71a115a1dc828 Parents: f4c3e14 c85749e Author: Benjamin Lerer Authored: Fri Aug 12 15:40:10 2016 +0200 Committer: Benjamin Lerer Committed: Fri Aug 12 15:40:55 2016 +0200 -- CHANGES.txt | 1 + .../apache/cassandra/service/StorageProxy.java | 49 +--- 2 files changed, 34 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c771a2d/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c771a2d/src/java/org/apache/cassandra/service/StorageProxy.java --
[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9
Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d597910b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d597910b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d597910b
Branch: refs/heads/trunk
Commit: d597910b2e5438962eefb5217887e844e011063a
Parents: d052c90 5fdb90e
Author: Tyler Hobbs
Authored: Fri Aug 12 18:34:44 2016 -0500
Committer: Tyler Hobbs
Committed: Fri Aug 12 18:34:44 2016 -0500
--
CHANGES.txt | 1 +
NEWS.txt| 2 ++
.../cassandra/config/DatabaseDescriptor.java| 6 ++--
.../cassandra/locator/Ec2MultiRegionSnitch.java | 6 +++-
.../cassandra/service/StorageService.java | 4 +--
.../org/apache/cassandra/transport/Server.java | 2 +-
.../org/apache/cassandra/utils/FBUtilities.java | 19
.../apache/cassandra/utils/FBUtilitiesTest.java | 32
8 files changed, 66 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d597910b/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d597910b/NEWS.txt
--
diff --cc NEWS.txt
index d8d84f5,6b8dfd3..249077d
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -45,12 -26,11 +45,14 @@@ New feature
Upgrading
-
- - A maximum size for SSTables values has been introduced, to prevent out
of memory
- exceptions when reading corrupt SSTables. This maximum size can be set
via
- max_value_size_in_mb in cassandra.yaml. The default is 256MB, which
matches the default
- value of native_transport_max_frame_size_in_mb. SSTables will be
considered corrupt if
- they contain values whose size exceeds this limit. See CASSANDRA-9530
for more details.
++- Ec2MultiRegionSnitch will no longer automatically set
broadcast_rpc_address
++ to the public instance IP if this property is defined on cassandra.yaml.
+- The name "json" and "distinct" are not valid anymore a user-defined
function
+ names (they are still valid as column name however). In the unlikely
case where
+ you had defined functions with such names, you will need to recreate
+ those under a different name, change your code to use the new names and
+ drop the old versions, and this _before_ upgrade (see CASSANDRA-10783
for more
+ details).
Deprecation
---
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d597910b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d597910b/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 7500593,0c91784..bc69d93
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -785,14 -740,9 +785,14 @@@ public class StorageService extends Not
getTokenMetadata().updateHostId(localHostId,
FBUtilities.getBroadcastAddress());
appStates.put(ApplicationState.NET_VERSION,
valueFactory.networkVersion());
appStates.put(ApplicationState.HOST_ID,
valueFactory.hostId(localHostId));
- appStates.put(ApplicationState.RPC_ADDRESS,
valueFactory.rpcaddress(DatabaseDescriptor.getBroadcastRpcAddress()));
+ appStates.put(ApplicationState.RPC_ADDRESS,
valueFactory.rpcaddress(FBUtilities.getBroadcastRpcAddress()));
appStates.put(ApplicationState.RELEASE_VERSION,
valueFactory.releaseVersion());
+
+// load the persisted ring state. This used to be done earlier in
the init process,
+// but now we always perform a shadow round when preparing to
join and we have to
+// clear endpoint states after doing that.
+loadRingState();
+
logger.info("Starting up server gossip");
Gossiper.instance.register(this);
Gossiper.instance.start(SystemKeyspace.incrementAndGetGeneration(), appStates);
// needed for node-ring gathering.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d597910b/src/java/org/apache/cassandra/transport/Server.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d597910b/src/java/org/apache/cassandra/utils/FBUtilities.java
--
diff --cc src/java/
