[14/15] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11

2018-04-10 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1020d62
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1020d62
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1020d62

Branch: refs/heads/trunk
Commit: c1020d62ed05f7fa5735af6f09915cdc6850dbeb
Parents: b3e9908 73ca0e1
Author: Benjamin Lerer 
Authored: Tue Apr 10 10:02:36 2018 +0200
Committer: Benjamin Lerer 
Committed: Tue Apr 10 10:03:32 2018 +0200

--
 CHANGES.txt |  1 +
 .../io/util/CompressedChunkReader.java  | 65 +++-
 2 files changed, 38 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1020d62/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1020d62/src/java/org/apache/cassandra/io/util/CompressedChunkReader.java
--
diff --cc src/java/org/apache/cassandra/io/util/CompressedChunkReader.java
index 0919c29,000..177afb0
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/io/util/CompressedChunkReader.java
+++ b/src/java/org/apache/cassandra/io/util/CompressedChunkReader.java
@@@ -1,229 -1,0 +1,238 @@@
 +/*
 + * 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.io.util;
 +
 +import java.io.IOException;
 +import java.nio.ByteBuffer;
 +import java.util.concurrent.ThreadLocalRandom;
 +
 +import com.google.common.annotations.VisibleForTesting;
 +import com.google.common.primitives.Ints;
 +
 +import org.apache.cassandra.io.compress.BufferType;
 +import org.apache.cassandra.io.compress.CompressionMetadata;
 +import org.apache.cassandra.io.compress.CorruptBlockException;
 +import org.apache.cassandra.io.sstable.CorruptSSTableException;
 +
 +public abstract class CompressedChunkReader extends AbstractReaderFileProxy 
implements ChunkReader
 +{
 +final CompressionMetadata metadata;
 +
 +protected CompressedChunkReader(ChannelProxy channel, CompressionMetadata 
metadata)
 +{
 +super(channel, metadata.dataLength);
 +this.metadata = metadata;
 +assert Integer.bitCount(metadata.chunkLength()) == 1; //must be a 
power of two
 +}
 +
 +@VisibleForTesting
 +public double getCrcCheckChance()
 +{
 +return metadata.parameters.getCrcCheckChance();
 +}
 +
++protected final boolean shouldCheckCrc()
++{
++return getCrcCheckChance() >= 1d || getCrcCheckChance() > 
ThreadLocalRandom.current().nextDouble();
++}
++
 +@Override
 +public String toString()
 +{
 +return String.format("CompressedChunkReader.%s(%s - %s, chunk length 
%d, data length %d)",
 + getClass().getSimpleName(),
 + channel.filePath(),
 + metadata.compressor().getClass().getSimpleName(),
 + metadata.chunkLength(),
 + metadata.dataLength);
 +}
 +
 +@Override
 +public int chunkSize()
 +{
 +return metadata.chunkLength();
 +}
 +
 +@Override
 +public BufferType preferredBufferType()
 +{
 +return metadata.compressor().preferredBufferType();
 +}
 +
 +@Override
 +public Rebufferer instantiateRebufferer()
 +{
 +return new BufferManagingRebufferer.Aligned(this);
 +}
 +
 +public static class Standard extends CompressedChunkReader
 +{
 +// we read the raw compressed bytes into this buffer, then 
uncompressed them into the provided one.
 +private final ThreadLocal compressedHolder;
 +
 +public Standard(ChannelProxy channel, CompressionMetadata metadata)
 +{
 +super(channel, metadata);
 +compressedHolder = ThreadLocal.withInitial(this::allocateBuffer);
 +}
 +
 +public ByteBuffer alloca

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-02-14 Thread aweisberg 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/630c18eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/630c18eb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/630c18eb

Branch: refs/heads/trunk
Commit: 630c18eb38379a03d3766bb2be5835b1c78c66be
Parents: 1d506f9 2461187
Author: Ariel Weisberg 
Authored: Wed Feb 14 13:36:30 2018 -0500
Committer: Ariel Weisberg 
Committed: Wed Feb 14 13:36:30 2018 -0500

--
 CHANGES.txt | 4 
 NEWS.txt| 9 +
 2 files changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/630c18eb/CHANGES.txt
--
diff --cc CHANGES.txt
index e2ccc53,bbbca08..fdf045d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,14 +1,36 @@@
 -3.0.17
 -Merged from 2.1:
++3.11.3
++Merged from 2.1
+  * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt 
(CASSANDRA-14183)
+ 
 -3.0.16
 - * Fix unit test failures in ViewComplexTest (CASSANDRA-14219)
 - * Add MinGW uname check to start scripts (CASSANDRA-12940)
 - * Protect against overflow of local expiration time (CASSANDRA-14092)
 +3.11.2
 + * Fix ReadCommandTest (CASSANDRA-14234)
 + * Remove trailing period from latency reports at keyspace level 
(CASSANDRA-14233)
 + * Backport CASSANDRA-13080: Use new token allocation for non bootstrap case 
as well (CASSANDRA-14212)
 + * Remove dependencies on JVM internal classes from JMXServerUtils 
(CASSANDRA-14173) 
 + * Add DEFAULT, UNSET, MBEAN and MBEANS to `ReservedKeywords` 
(CASSANDRA-14205)
 + * Add Unittest for schema migration fix (CASSANDRA-14140)
 + * Print correct snitch info from nodetool describecluster (CASSANDRA-13528)
 + * Close socket on error during connect on OutboundTcpConnection 
(CASSANDRA-9630)
 + * Enable CDC unittest (CASSANDRA-14141)
 + * Acquire read lock before accessing CompactionStrategyManager fields 
(CASSANDRA-14139)
 + * Split CommitLogStressTest to avoid timeout (CASSANDRA-14143)
 + * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083)
 + * Avoid exposing compaction strategy index externally (CASSANDRA-14082)
 + * Prevent continuous schema exchange between 3.0 and 3.11 nodes 
(CASSANDRA-14109)
 + * Fix imbalanced disks when replacing node with same address with JBOD 
(CASSANDRA-14084)
 + * Reload compaction strategies when disk boundaries are invalidated 
(CASSANDRA-13948)
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 + * Correctly count range tombstones in traces and tombstone thresholds 
(CASSANDRA-8527)
 +Merged from 3.0:
 + * Add MinGW uname check to start scripts (CASSANDRA-12840)
   * Use the correct digest file and reload sstable metadata in nodetool verify 
(CASSANDRA-14217)
   * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
 - * Close socket on error during connect on OutboundTcpConnection 
(CASSANDRA-9630)
   * Set encoding for javadoc generation (CASSANDRA-14154)
   * Fix index target computation for dense composite tables with dropped 
compact storage (CASSANDRA-14104)
   * Improve commit log chain marker updating (CASSANDRA-14108)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/630c18eb/NEWS.txt
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-01-22 Thread spod 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8c12fba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8c12fba
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8c12fba

Branch: refs/heads/trunk
Commit: b8c12fba064fb0b6a3b6306b2670497434471920
Parents: c181943 010c477
Author: Stefan Podkowinski 
Authored: Mon Jan 22 14:22:10 2018 +0100
Committer: Stefan Podkowinski 
Committed: Mon Jan 22 14:25:36 2018 +0100

--
 CHANGES.txt   | 1 +
 redhat/cassandra.spec | 8 
 2 files changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8c12fba/CHANGES.txt
--
diff --cc CHANGES.txt
index 5e4c40a,0eaab6e..81b358d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -43,25 -25,12 +43,26 @@@ Merged from 2.2
   * Fix the inspectJvmOptions startup check (CASSANDRA-14112)
   * Fix race that prevents submitting compaction for a table when executor is 
full (CASSANDRA-13801)
   * Rely on the JVM to handle OutOfMemoryErrors (CASSANDRA-13006)
 + * Grab refs during scrub/index redistribution/cleanup (CASSANDRA-13873)
  Merged from 2.1:
 - * More PEP8 compliance for cqlsh (CASSANDRA-14021)
+  * RPM package spec: fix permissions for installed jars and config files 
(CASSANDRA-14181)
 -
 -
 -3.0.15
 + * More PEP8 compiance for cqlsh (CASSANDRA-14021)
 +
 +
 +3.11.1
 + * Fix the computation of cdc_total_space_in_mb for exabyte filesystems 
(CASSANDRA-13808)
 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is 
a single leaf and overflow collisions (CASSANDRA-13869)
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Add a skip read validation flag to cassandra-stress (CASSANDRA-13772)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
   * Improve TRUNCATE performance (CASSANDRA-13909)
   * Implement short read protection on partition boundaries (CASSANDRA-13595)
   * Fix ISE thrown by UPI.Serializer.hasNext() for some SELECT queries 
(CASSANDRA-13911)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8c12fba/redhat/cassandra.spec
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-09-20 Thread jasobrown 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1efaf3a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1efaf3a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1efaf3a

Branch: refs/heads/trunk
Commit: c1efaf3a72a1efae983b66599416081719dbf5ff
Parents: 6611513 ab5084a
Author: Jason Brown 
Authored: Wed Sep 20 07:06:02 2017 -0700
Committer: Jason Brown 
Committed: Wed Sep 20 07:06:02 2017 -0700

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-09-11 Thread mshuler 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b64a4e4f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b64a4e4f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b64a4e4f

Branch: refs/heads/trunk
Commit: b64a4e4f6b7fc8e49b9c3e9da0063df99615fbb3
Parents: fadf2e8 e86bef4
Author: Michael Shuler 
Authored: Mon Sep 11 16:53:55 2017 -0500
Committer: Michael Shuler 
Committed: Mon Sep 11 16:53:55 2017 -0500

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-09-07 Thread spod 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5dcb354c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5dcb354c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5dcb354c

Branch: refs/heads/trunk
Commit: 5dcb354cc6888f2681b80f8f9b269afcfe97ddec
Parents: 90b39dc d34f479
Author: Stefan Podkowinski 
Authored: Thu Sep 7 10:21:04 2017 +0200
Committer: Stefan Podkowinski 
Committed: Thu Sep 7 10:21:17 2017 +0200

--
 redhat/cassandra.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dcb354c/redhat/cassandra.spec
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-08-31 Thread aleksey 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd3aca03
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd3aca03
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd3aca03

Branch: refs/heads/trunk
Commit: cd3aca03686ee73ff683e9b42fd34c672232b5ee
Parents: 425880f f791c26
Author: Aleksey Yeschenko 
Authored: Thu Aug 31 14:49:00 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Thu Aug 31 14:49:00 2017 +0100

--
 .../org/apache/cassandra/metrics/HintedHandOffMetricsTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd3aca03/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-08-30 Thread marcuse 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f679b6fc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f679b6fc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f679b6fc

Branch: refs/heads/trunk
Commit: f679b6fc3bcc194c941abced6a5bac6642cd2fa1
Parents: 771ad53 d981309
Author: Marcus Eriksson 
Authored: Wed Aug 30 13:37:06 2017 +0200
Committer: Marcus Eriksson 
Committed: Wed Aug 30 13:37:40 2017 +0200

--
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f679b6fc/circle.yml
--
diff --cc circle.yml
index f4801b7,fa5d25a8..ae848aa
--- a/circle.yml
+++ b/circle.yml
@@@ -13,6 -13,6 +13,6 @@@ test
post:
  - mkdir -p $CIRCLE_TEST_REPORTS/junit/:
  parallel: true
- - find ./build/test/output/ -iname "*.xml" -exec cp {} 
$CIRCLE_TEST_REPORTS/junit/ \;:
 -- case $CIRCLE_NODE_INDEX in [012]) find ./build/test/output/ -iname 
"*.xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; ;;esac:
++- case $CIRCLE_NODE_INDEX in [0123]) find ./build/test/output/ -iname 
"*.xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; ;;esac:
  parallel: true
  


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-08-18 Thread marcuse 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/01f2855b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01f2855b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01f2855b

Branch: refs/heads/trunk
Commit: 01f2855b478413f3b8593aee86157c46a9bff666
Parents: 76e9e63 8378bfc
Author: Marcus Eriksson 
Authored: Fri Aug 18 19:19:31 2017 +0200
Committer: Marcus Eriksson 
Committed: Fri Aug 18 19:19:31 2017 +0200

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-08-17 Thread mshuler 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76e9e632
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76e9e632
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76e9e632

Branch: refs/heads/trunk
Commit: 76e9e632e60490dc37d01426b9d33171af604dfa
Parents: 2795d72 0614b27
Author: Michael Shuler 
Authored: Thu Aug 17 14:27:25 2017 -0500
Committer: Michael Shuler 
Committed: Thu Aug 17 14:27:25 2017 -0500

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-07-24 Thread jkni 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1aa14bc4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1aa14bc4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1aa14bc4

Branch: refs/heads/trunk
Commit: 1aa14bc464d2abd5df3587c74dd52c11ebc30353
Parents: 1db43a8 19adec1
Author: Joel Knighton 
Authored: Mon Jul 24 14:52:33 2017 -0500
Committer: Joel Knighton 
Committed: Mon Jul 24 14:52:33 2017 -0500

--
 CHANGES.txt   | 2 ++
 src/java/org/apache/cassandra/gms/Gossiper.java   | 5 +++--
 src/java/org/apache/cassandra/gms/HeartBeatState.java | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aa14bc4/CHANGES.txt
--
diff --cc CHANGES.txt
index 566c970,3247277..cfa4a24
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,47 -13,10 +17,49 @@@ Merged from 2.2
   * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272)
   * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592)
   * Fix nested Tuples/UDTs validation (CASSANDRA-13646)
+ Merged from 2.1:
+  * Clone HeartBeatState when building gossip messages. Make its 
generation/version volatile (CASSANDRA-13700)
  
 -3.0.14
 +3.11.0
 + * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
 + * Replace string comparison with regex/number checks in MessagingService 
test (CASSANDRA-13216)
 + * Fix formatting of duration columns in CQLSH (CASSANDRA-13549)
 + * Fix the problem with duplicated rows when using paging with SASI 
(CASSANDRA-13302)
 + * Allow CONTAINS statements filtering on the partition key and it’s parts 
(CASSANDRA-13275)
 + * Fall back to even ranges calculation in clusters with vnodes when tokens 
are distributed unevenly (CASSANDRA-13229)
 + * Fix duration type validation to prevent overflow (CASSANDRA-13218)
 + * Forbid unsupported creation of SASI indexes over partition key columns 
(CASSANDRA-13228)
 + * Reject multiple values for a key in CQL grammar. (CASSANDRA-13369)
 + * UDA fails without input rows (CASSANDRA-13399)
 + * Fix compaction-stress by using daemonInitialization (CASSANDRA-13188)
 + * V5 protocol flags decoding broken (CASSANDRA-13443)
 + * Use write lock not read lock for removing sstables from compaction 
strategies. (CASSANDRA-13422)
 + * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors 
(CASSANDRA-13329)
 + * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962)
 + * Add charset to Analyser input stream (CASSANDRA-13151)
 + * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
 + * cdc column addition strikes again (CASSANDRA-13382)
 + * Fix static column indexes (CASSANDRA-13277)
 + * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298)
 + * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
 + * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns 
(CASSANDRA-13247)
 + * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern 
(CASSANDRA-13317)
 + * Possible AssertionError in UnfilteredRowIteratorWithLowerBound 
(CASSANDRA-13366)
 + * Support unaligned memory access for AArch64 (CASSANDRA-13326)
 + * Improve SASI range iterator efficiency on intersection with an empty range 
(CASSANDRA-12915).
 + * Fix equality comparisons of columns using the duration type 
(CASSANDRA-13174)
 + * Obfuscate password in stress-graphs (CASSANDRA-12233)
 + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
 + * nodetool stopdaemon errors out (CASSANDRA-13030)
 + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 + * Fix primary index calculation for SASI (CASSANDRA-12910)
 + * More fixes to the TokenAllocator (CASSANDRA-12990)
 + * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)
 + * Address message coalescing regression (CASSANDRA-12676)
 + * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
 + * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
 + * Tracing payload not passed from QueryMessage to tracing session 
(CASSANDRA-12835)
 +Merged from 3.0:
   * Ensure int overflow doesn't occur when calculating large partition warning 
size (CASSANDRA-13172)
   * Ensure consistent view of partition columns between coordinator and 
replica in ColumnFilter (CASSANDRA-13004)
   * Failed unregistering mbean during drop keyspace (CASSANDRA-13346)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aa14bc4/src/java/org/apache/cassandra/gms/Gossiper.java
--


---

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-07-24 Thread jkni 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1db43a8d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1db43a8d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1db43a8d

Branch: refs/heads/trunk
Commit: 1db43a8d085f2ede42ae7a22d5e7f78a792b868b
Parents: 613ddc0 0054dcf
Author: Joel Knighton 
Authored: Mon Jul 24 13:24:55 2017 -0500
Committer: Joel Knighton 
Committed: Mon Jul 24 13:24:55 2017 -0500

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-06-26 Thread mshuler 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb7e522b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb7e522b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb7e522b

Branch: refs/heads/cassandra-3.11
Commit: bb7e522b472821d7297b944c5270054231876bc5
Parents: 24389f4 5aec834
Author: Michael Shuler 
Authored: Mon Jun 26 18:57:11 2017 -0500
Committer: Michael Shuler 
Committed: Mon Jun 26 18:57:11 2017 -0500

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-04-21 Thread aweisberg 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba9beea9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba9beea9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba9beea9

Branch: refs/heads/trunk
Commit: ba9beea9db45268e9e7ba80b2bc719788e6a718e
Parents: 4d24958 d079ce0
Author: Ariel Weisberg 
Authored: Fri Apr 21 16:21:54 2017 -0400
Committer: Ariel Weisberg 
Committed: Fri Apr 21 16:21:54 2017 -0400

--

--

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-04-10 Thread mshuler 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a7b1ee4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a7b1ee4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a7b1ee4

Branch: refs/heads/trunk
Commit: 1a7b1ee4d1e7ee44a4de6faab6d222aa5ef28c2b
Parents: fc58dbb f63ea27
Author: Michael Shuler 
Authored: Mon Apr 10 09:11:54 2017 -0500
Committer: Michael Shuler 
Committed: Mon Apr 10 09:11:54 2017 -0500

--
 debian/cassandra.install | 1 +
 1 file changed, 1 insertion(+)
--

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-04-06 Thread marcuse 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ebdf7719
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ebdf7719
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ebdf7719

Branch: refs/heads/trunk
Commit: ebdf77194c2835a01134635e9b71ed338c01aac2
Parents: 980f32d 8d34076
Author: Marcus Eriksson 
Authored: Fri Apr 7 08:11:19 2017 +0200
Committer: Marcus Eriksson 
Committed: Fri Apr 7 08:11:29 2017 +0200

--
 circle.yml | 19 ++-
 doc/source/development/testing.rst |  3 +++
 2 files changed, 13 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ebdf7719/doc/source/development/testing.rst
--
diff --cc doc/source/development/testing.rst
index eac336a,000..b8eea6b
mode 100644,00..100644
--- a/doc/source/development/testing.rst
+++ b/doc/source/development/testing.rst
@@@ -1,86 -1,0 +1,89 @@@
 +.. 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.
 +
 +.. highlight:: none
 +
 +Testing
 +***
 +
 +Creating tests is one of the most important and also most difficult parts of 
developing Cassandra. There are different ways to test your code depending on 
what you're working on.
 +
 +
 +Unit Testing
 +
 +
 +The most simple way to test code in Cassandra is probably by writing a unit 
test. Cassandra uses JUnit as a testing framework and test cases can be found 
in the ``test/unit`` directory. Ideally you’d be able to create a unit test 
for your implementation that would exclusively cover the class you created (the 
unit under test). Unfortunately this is not always possible and Cassandra 
doesn’t have a very mock friendly code base. Often you’ll find yourself in 
a situation where you have to make use of an embedded Cassandra instance that 
you’ll be able to interact with in your test. If you want to make use of CQL 
in your test, you can simply extend CQLTester and use some of the convenient 
helper methods such as in the following example.
 +
 +.. code-block:: java
 +
 +  @Test
 +  public void testBatchAndList() throws Throwable
 +  {
 + createTable("CREATE TABLE %s (k int PRIMARY KEY, l list)");
 + execute("BEGIN BATCH " +
 + "UPDATE %1$s SET l = l +[ 1 ] WHERE k = 0; " +
 + "UPDATE %1$s SET l = l + [ 2 ] WHERE k = 0; " +
 + "UPDATE %1$s SET l = l + [ 3 ] WHERE k = 0; " +
 + "APPLY BATCH");
 +
 + assertRows(execute("SELECT l FROM %s WHERE k = 0"),
 +row(list(1, 2, 3)));
 +  }
 +
 +Unit tests can be run from the command line using the ``ant test`` command, 
``ant test -Dtest.name=`` to execute a test suite or ``ant 
testsome -Dtest.name= -Dtest.methods=[,testmethod2]`` for 
individual tests.  For example, to run all test methods in the 
``org.apache.cassandra.cql3.SimpleQueryTest`` class, you would run::
 +
 +ant test -Dtest.name=SimpleQueryTest
 +
 +To run only the ``testStaticCompactTables()`` test method from that class, 
you would run::
 +
 +ant testsome -Dtest.name=org.apache.cassandra.cql3.SimpleQueryTest 
-Dtest.methods=testStaticCompactTables
 +
 +Long running tests
 +--
 +
 +Test that consume a significant amount of time during execution can be found 
in the ``test/long`` directory and executed as a regular JUnit test or 
standalone program. Except for the execution time, there’s nothing really 
special about them. However, ant will execute tests under ``test/long`` only 
when using the ``ant long-test`` target.
 +
 +DTests
 +==
 +
 +One way of doing integration or system testing at larger scale is by using 
`dtest `_, which stands for 
“Cassandra Distributed Tests”. The idea is to automatically setup Cassandra 
clusters using various configurations and simulate certain use cases you want 
to test. This is done using Python scripts and ``ccm

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-04-06 Thread stefania 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/980f32d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/980f32d5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/980f32d5

Branch: refs/heads/trunk
Commit: 980f32d563aa33ef45f579f198e0cfd6938c3936
Parents: ab1310b a8a3d4e
Author: Stefania Alborghetti 
Authored: Fri Apr 7 09:05:53 2017 +0800
Committer: Stefania Alborghetti 
Committed: Fri Apr 7 09:05:53 2017 +0800

--
 CHANGES.txt| 1 +
 pylib/cqlshlib/copyutil.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/980f32d5/CHANGES.txt
--
diff --cc CHANGES.txt
index 23e0225,5bcdf16..0761ca5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -58,147 -64,6 +58,148 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 + * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
 +Merged from 2.2:
 + * Fix JVM metric names (CASSANDRA-13103)
 + * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
 + * Discard in-flight shadow round responses (CASSANDRA-12653)
 + * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
 + * Wrong logger name in AnticompactionTask (CASSANDRA-13343)
 + * Commitlog replay may fail if last mutation is within 4 bytes of end of 
segment (CASSANDRA-13282)
 + * Fix queries updating multiple time the same list (CASSANDRA-13130)
 + * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 + * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
 + * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 + * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
++ * Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364)
 + * Remove unused repositories (CASSANDRA-13278)
 + * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-04-04 Thread jjirsa 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a3466e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a3466e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a3466e4

Branch: refs/heads/trunk
Commit: 1a3466e439618fe8004734fcd3a2b3aef42725c9
Parents: be96c28 0efb392
Author: Jeff Jirsa 
Authored: Tue Apr 4 14:30:29 2017 -0700
Committer: Jeff Jirsa 
Committed: Tue Apr 4 14:30:32 2017 -0700

--
 circle.yml | 17 +
 1 file changed, 17 insertions(+)
--

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-03-01 Thread jjirsa 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be0deb90
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be0deb90
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be0deb90

Branch: refs/heads/trunk
Commit: be0deb90e45d66a771fce4652a1548256ee5463e
Parents: b26db7a 218743d
Author: Jeff Jirsa 
Authored: Wed Mar 1 13:45:05 2017 -0800
Committer: Jeff Jirsa 
Committed: Wed Mar 1 13:45:59 2017 -0800

--
 CHANGES.txt  | 1 +
 build.properties.default | 3 ---
 build.xml| 6 ++
 3 files changed, 3 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/be0deb90/CHANGES.txt
--
diff --cc CHANGES.txt
index 497f5c4,c4622ab..cf15d3a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -26,136 -29,6 +26,137 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
 + * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
 + * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 + * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
++ * Remove unused repositories (CASSANDRA-13278)
 + * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-22 Thread tylerhobbs 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b0ed0f4c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0ed0f4c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0ed0f4c

Branch: refs/heads/trunk
Commit: b0ed0f4c3e595cb425dc36760e325724a6f6c467
Parents: 10524bd f70d8c0
Author: Tyler Hobbs 
Authored: Wed Feb 22 10:11:09 2017 -0600
Committer: Tyler Hobbs 
Committed: Wed Feb 22 10:11:09 2017 -0600

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0ed0f4c/CHANGES.txt
--
diff --cc CHANGES.txt
index fd758dc,a4bb9cd..6dd4edb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -20,133 -21,6 +20,134 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
 + * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
++ * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutd

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-15 Thread mshuler 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad702027
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad702027
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad702027

Branch: refs/heads/trunk
Commit: ad7020278353cabe330ab813f07f6679f382d6cd
Parents: ef9df6e 7cb2ef0
Author: Michael Shuler 
Authored: Wed Feb 15 18:00:06 2017 -0600
Committer: Michael Shuler 
Committed: Wed Feb 15 18:00:06 2017 -0600

--
 CHANGES.txt   | 1 +
 bin/cassandra | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad702027/CHANGES.txt
--
diff --cc CHANGES.txt
index ee5a5cb,ab345e6..1a9ce2d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -19,130 -12,6 +19,131 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
++ * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
 + * Add hint delivery metrics (CASSANDRA-12693)
 + * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
 + * ColumnIndex does not reuse buffer (CASSANDRA-12502)
 + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
 + * Up

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-11 Thread jasobrown 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/94a8c777
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94a8c777
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94a8c777

Branch: refs/heads/trunk
Commit: 94a8c777a176585f04fe2a0e79afe7c2c594c7c3
Parents: 3ae5a4d 8ec6090
Author: Jason Brown 
Authored: Sat Feb 11 08:01:52 2017 -0800
Committer: Jason Brown 
Committed: Sat Feb 11 08:02:23 2017 -0800

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/net/OutboundTcpConnection.java | 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/94a8c777/CHANGES.txt
--
diff --cc CHANGES.txt
index a69cbe3,700bde0..b34e5f6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,128 -10,6 +17,129 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
 +  * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
++ * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
 + * Add hint delivery metrics (CASSANDRA-12693)
 + * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
 + * ColumnIndex does not reuse buffer (CASSANDRA-12502)
 + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
 + * Upgrade metrics-reporter dependenc

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-10 Thread jjirsa 
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b221e8e1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b221e8e1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b221e8e1

Branch: refs/heads/trunk
Commit: b221e8e1692c111a236f956b5c1e1e8ff620d004
Parents: baa59cd 4e669cf
Author: Jeff Jirsa 
Authored: Fri Feb 10 15:27:53 2017 -0800
Committer: Jeff Jirsa 
Committed: Fri Feb 10 15:28:26 2017 -0800

--
 CHANGES.txt   | 2 ++
 src/java/org/apache/cassandra/utils/CoalescingStrategies.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b221e8e1/CHANGES.txt
--
diff --cc CHANGES.txt
index c785f84,91bfe12..aaad3e7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -14,126 -8,6 +14,128 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
 +  * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
++Merged from 2.1:
++ * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
 + * Add hint delivery metrics (CASSANDRA-12693)
 + * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
 + * ColumnIndex does not reuse buffer (CASSANDRA-12502)
 + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
 + * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
 + * Tune compaction thread count via nodetool