[11/15] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

[blerer]

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/73ca0e1e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73ca0e1e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73ca0e1e

Branch: refs/heads/cassandra-3.11
Commit: 73ca0e1e131bdf14177c026a60f19e33c379ffd4
Parents: 41f3b96 b3ac793
Author: Benjamin Lerer 
Authored: Tue Apr 10 09:54:27 2018 +0200
Committer: Benjamin Lerer 
Committed: Tue Apr 10 09:57:43 2018 +0200

--
 CHANGES.txt |  1 +
 .../compress/CompressedRandomAccessReader.java  | 58 ++--
 2 files changed, 30 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/73ca0e1e/CHANGES.txt
--
diff --cc CHANGES.txt
index 7917712,5221b1e..1564fa3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,52 -1,12 +1,53 @@@
 -2.2.13
 - * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 - * Fix query pager DEBUG log leak causing hit in paged reads throughput 
(CASSANDRA-14318)
 +3.0.17
 + * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
 + * Respect max hint window when hinting for LWT (CASSANDRA-14215)
 + * Adding missing WriteType enum values to v3, v4, and v5 spec 
(CASSANDRA-13697)
 + * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
 + * Fix NPE when performing comparison against a null frozen in LWT 
(CASSANDRA-14087)
 + * Log when SSTables are deleted (CASSANDRA-14302)
 + * Fix batch commitlog sync regression (CASSANDRA-14292)
 + * Write to pending endpoint when view replica is also base replica 
(CASSANDRA-14251)
 + * Chain commit log marker potential performance regression in batch commit 
mode (CASSANDRA-14194)
 + * Fully utilise specified compaction threads (CASSANDRA-14210)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
   * Backport circleci yaml (CASSANDRA-14240)
  Merged from 2.1:
+  * Check checksum before decompressing data (CASSANDRA-14284)
   * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt 
(CASSANDRA-14183)
  
 -2.2.12
 +
 +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)
 + * 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)
 + * Extra range tombstone bound creates double rows (CASSANDRA-14008)
 + * Fix SStable ordering by max timestamp in SinglePartitionReadCommand 
(CASSANDRA-14010)
 + * Accept role names containing forward-slash (CASSANDRA-14088)
 + * Optimize CRC check chance probability calculations (CASSANDRA-14094)
 + * Fix cleanup on keyspace with no replicas (CASSANDRA-13526)
 + * Fix updating base table rows with TTL not removing materialized view 
entries (CASSANDRA-14071)
 + * Reduce garbage created by DynamicSnitch (CASSANDRA-14091)
 + * More frequent commitlog chained markers (CASSANDRA-13987)
 + * Fix serialized size of DataLimits (CASSANDRA-14057)
 + * Add flag to allow dropping oversized read repair mutations 
(CASSANDRA-13975)
 + * Fix SSTableLoader logger message (CASSANDRA-14003)
 + * Fix repair race that caused gossip to block (CASSANDRA-13849)
 + * Tracing interferes with digest requests when using RandomPartitioner 
(CASSANDRA-13964)
 + * Add flag to disable materialized views, and warnings on creation 
(CASSANDRA-13959)
 + * Don't let user drop or generally break tables in system_distributed 
(CASSANDRA-13813)
 + * Provide a JMX call to sync schema with local storage (CASSANDRA-13954)
 + * Mishandling of cells for removed/dropped columns when reading legacy files 
(CASSANDRA-13939)
 + * Deserialise sstable metadata in nodetool verify (CASSANDRA-13922)
 +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)

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aweisberg]

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/2461187c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2461187c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2461187c

Branch: refs/heads/cassandra-3.11
Commit: 2461187c0e82d047e143f059124a6dc740ee853f
Parents: 890f319 08ebe82
Author: Ariel Weisberg 
Authored: Wed Feb 14 13:29:17 2018 -0500
Committer: Ariel Weisberg 
Committed: Wed Feb 14 13:32:59 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2461187c/CHANGES.txt
--
diff --cc CHANGES.txt
index 90bd53f,09930ce..bbbca08
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,8 +1,36 @@@
 -2.2.13
++3.0.17
+ Merged from 2.1:
+  * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt 
(CASSANDRA-14183)
+ 
 -2.2.12
 +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)
 + * 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)
 + * Extra range tombstone bound creates double rows (CASSANDRA-14008)
 + * Fix SStable ordering by max timestamp in SinglePartitionReadCommand 
(CASSANDRA-14010)
 + * Accept role names containing forward-slash (CASSANDRA-14088)
 + * Optimize CRC check chance probability calculations (CASSANDRA-14094)
 + * Fix cleanup on keyspace with no replicas (CASSANDRA-13526)
 + * Fix updating base table rows with TTL not removing materialized view 
entries (CASSANDRA-14071)
 + * Reduce garbage created by DynamicSnitch (CASSANDRA-14091)
 + * More frequent commitlog chained markers (CASSANDRA-13987)
 + * Fix serialized size of DataLimits (CASSANDRA-14057)
 + * Add flag to allow dropping oversized read repair mutations 
(CASSANDRA-13975)
 + * Fix SSTableLoader logger message (CASSANDRA-14003)
 + * Fix repair race that caused gossip to block (CASSANDRA-13849)
 + * Tracing interferes with digest requests when using RandomPartitioner 
(CASSANDRA-13964)
 + * Add flag to disable materialized views, and warnings on creation 
(CASSANDRA-13959)
 + * Don't let user drop or generally break tables in system_distributed 
(CASSANDRA-13813)
 + * Provide a JMX call to sync schema with local storage (CASSANDRA-13954)
 + * Mishandling of cells for removed/dropped columns when reading legacy files 
(CASSANDRA-13939)
 + * Deserialise sstable metadata in nodetool verify (CASSANDRA-13922)
 +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)

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


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

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[spod]

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/010c477e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/010c477e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/010c477e

Branch: refs/heads/cassandra-3.11
Commit: 010c477e4c1b8b452cc0fa33b3fdb6c286e4037d
Parents: 0628520 aa831c9
Author: Stefan Podkowinski 
Authored: Mon Jan 22 14:21:11 2018 +0100
Committer: Stefan Podkowinski 
Committed: Mon Jan 22 14:21: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/010c477e/CHANGES.txt
--
diff --cc CHANGES.txt
index 8696653,0f6e61c..0eaab6e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -25,68 -2,12 +25,69 @@@ 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)
  
 -2.2.11
 +
 +3.0.15
 + * 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)
 + * Filter header only commit logs before recovery (CASSANDRA-13918)
 + * AssertionError prepending to a list (CASSANDRA-13149)
 + * Fix support for SuperColumn tables (CASSANDRA-12373)
 + * Handle limit correctly on tables with strict liveness (CASSANDRA-13883)
 + * Fix missing original update in TriggerExecutor (CASSANDRA-13894)
 + * Remove non-rpc-ready nodes from counter leader candidates (CASSANDRA-13043)
 + * Improve short read protection performance (CASSANDRA-13794)
 + * Fix sstable reader to support range-tombstone-marker for multi-slices 
(CASSANDRA-13787)
 + * Fix short read protection for tables with no clustering columns 
(CASSANDRA-13880)
 + * Make isBuilt volatile in PartitionUpdate (CASSANDRA-13619)
 + * Prevent integer overflow of timestamps in CellTest and RowsTest 
(CASSANDRA-13866)
 + * Fix counter application order in short read protection (CASSANDRA-12872)
 + * Don't block RepairJob execution on validation futures (CASSANDRA-13797)
 + * Wait for all management tasks to complete before shutting down CLSM 
(CASSANDRA-13123)
 + * INSERT statement fails when Tuple type is used as clustering column with 
default DESC order (CASSANDRA-13717)
 + * Fix pending view mutations handling and cleanup batchlog when there are 
local and remote paired mutations (CASSANDRA-13069)
 + * Improve config validation and documentation on overflow and NPE 
(CASSANDRA-13622)
 + * Range deletes in a CAS batch are ignored (CASSANDRA-13655)
 + * Avoid assertion error when IndexSummary > 2G (CASSANDRA-12014)
 + * Change repair midpoint logging for tiny ranges (CASSANDRA-13603)
 + * Better handle corrupt final commitlog segment (CASSANDRA-11995)
 + * StreamingHistogram is not thread safe (CASSANDRA-13756)
 + * Fix MV timestamp issues (CASSANDRA-11500)
 + * Better tolerate improperly formatted bcrypt hashes (CASSANDRA-13626) 
 + * Fix race condition in read command serialization (CASSANDRA-13363)
 + * Enable segement creation before recovering commitlogs (CASSANDRA-13587)
 + * Fix AssertionError in short read protection (CASSANDRA-13747)
 + * Don't skip corrupted sstables on startup (CASSANDRA-13620)
 + * Fix the merging of cells with different user type versions 
(CASSANDRA-13776)
 + * Copy session properties on cqlsh.py do_login (CASSANDRA-13640)
 + * Potential AssertionError during ReadRepair of range tombstone and 
partition deletions (CASSANDRA-13719)
 + * Don't let stress write warmup data if n=0 (CASSANDRA-13773)
 + * Gossip thread slows down when using batch commit log (CASSANDRA-12966)
 + * Randomize batchlog endpoint selection with only 1 or 2 racks 
(CASSANDRA-12884)
 + * Fix digest calculation for counter cells (CASSANDRA-13750)
 + * Fix ColumnDefinition.cellValueType() for non-frozen collection and change 
SSTabledump to use type.toJSONString() (CASSANDRA-13573)
 + * Skip materialized view addition if the base table doesn't exist 
(CASSANDRA-13737)
 + * Drop table should remove corresponding entries in dropped_columns table 
(CASSANDRA-13730)
 + * Log warn message until legacy auth tables have been migrated 
(CASSANDRA-13371)
 + * Fix incorrect 

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jasobrown]

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/ab5084a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab5084a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab5084a5

Branch: refs/heads/cassandra-3.11
Commit: ab5084a529254b3d7494409ce5a77c35ebcbccf9
Parents: 975c3d8 405ad00
Author: Jason Brown 
Authored: Wed Sep 20 07:05:37 2017 -0700
Committer: Jason Brown 
Committed: Wed Sep 20 07:05:37 2017 -0700

--

--



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

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[mshuler]

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/e86bef43
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e86bef43
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e86bef43

Branch: refs/heads/cassandra-3.11
Commit: e86bef4394650dfb96a041533de50c4fbf47bbdb
Parents: 433f24c 717dbe7
Author: Michael Shuler 
Authored: Mon Sep 11 16:53:32 2017 -0500
Committer: Michael Shuler 
Committed: Mon Sep 11 16:53:32 2017 -0500

--

--



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

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[spod]

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/d34f4795
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d34f4795
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d34f4795

Branch: refs/heads/cassandra-3.11
Commit: d34f4795180897a20bc1d21954728ab6a88bfded
Parents: bc5c231 8715c88
Author: Stefan Podkowinski 
Authored: Thu Sep 7 10:20:40 2017 +0200
Committer: Stefan Podkowinski 
Committed: Thu Sep 7 10:20:47 2017 +0200

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


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


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

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/f791c269
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f791c269
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f791c269

Branch: refs/heads/cassandra-3.11
Commit: f791c2690df0cee4f6308872917f6f5f572a3b1e
Parents: 5e7f60f 4d90573
Author: Aleksey Yeschenko 
Authored: Thu Aug 31 14:46:30 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Thu Aug 31 14:46:30 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/f791c269/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
--
diff --cc test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
index a2c9cf9,000..1d3863a
mode 100644,00..100644
--- a/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
+++ b/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
@@@ -1,63 -1,0 +1,63 @@@
 +/*
 + * 
 + * 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.metrics;
 +
 +import java.net.InetAddress;
 +import java.util.Map;
 +import java.util.UUID;
 +
 +import org.junit.BeforeClass;
 +import org.junit.Test;
 +
 +import com.google.common.collect.Iterators;
 +
 +import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.cql3.UntypedResultSet;
 +import org.apache.cassandra.db.SystemKeyspace;
 +import org.apache.cassandra.db.marshal.Int32Type;
 +import org.apache.cassandra.db.marshal.UUIDType;
 +import org.apache.cassandra.hints.HintsService;
 +
 +import static org.junit.Assert.assertEquals;
 +import static org.apache.cassandra.cql3.QueryProcessor.executeInternal;
 +
 +public class HintedHandOffMetricsTest
 +{
 +@BeforeClass
 +public static void initDD()
 +{
 +DatabaseDescriptor.setDaemonInitialized();
 +}
 +
 +@Test
 +public void testHintsMetrics() throws Exception
 +{
 +DatabaseDescriptor.getHintsDirectory().mkdirs();
 +
 +for (int i = 0; i < 99; i++)
- 
HintsService.instance.metrics.incrPastWindow(InetAddress.getLocalHost());
++
HintsService.instance.metrics.incrPastWindow(InetAddress.getByName("127.0.0.1"));
 +HintsService.instance.metrics.log();
 +
 +UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM 
system." + SystemKeyspace.PEER_EVENTS);
 +Map returned = rows.one().getMap("hints_dropped", 
UUIDType.instance, Int32Type.instance);
 +
assertEquals(Iterators.getLast(returned.values().iterator()).intValue(), 99);
 +}
 +}


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

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[marcuse]

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/d9813098
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9813098
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9813098

Branch: refs/heads/cassandra-3.11
Commit: d98130985e32cbaa927cd2e02706050458672d16
Parents: 67ac149 f210b17
Author: Marcus Eriksson 
Authored: Wed Aug 30 13:36:48 2017 +0200
Committer: Marcus Eriksson 
Committed: Wed Aug 30 13:36:48 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9813098/circle.yml
--


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

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[marcuse]

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/8378bfc5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8378bfc5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8378bfc5

Branch: refs/heads/cassandra-3.11
Commit: 8378bfc510265f46e76f0030bf17e340f82a8041
Parents: 0614b27 9b6fd54
Author: Marcus Eriksson 
Authored: Fri Aug 18 19:18:57 2017 +0200
Committer: Marcus Eriksson 
Committed: Fri Aug 18 19:18:57 2017 +0200

--
 build.xml  | 4 +++-
 circle.yml | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8378bfc5/build.xml
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8378bfc5/circle.yml
--
diff --cc circle.yml
index a51cf25,a6a8b98..eefb5f9
--- a/circle.yml
+++ b/circle.yml
@@@ -7,7 -7,7 +7,7 @@@ test
  - sudo apt-get update; sudo apt-get install wamerican:
  parallel: true
override:
- - case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test 
-Dtest.runners=1;; 1) ant long-test ;; 2) ant test-compression ;;esac:
 -- case $CIRCLE_NODE_INDEX in 0) ant test ;; 1) ant long-test ;; 2) ant 
test-compression ;; 3) ant eclipse-warnings ;;esac:
++- case $CIRCLE_NODE_INDEX in 0) ant test -Dtest.runners=1 ;; 1) ant 
long-test ;; 2) ant test-compression ;; 3) ant eclipse-warnings ;;esac:
  parallel: true
  
post:


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

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[mshuler]

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/0614b274
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0614b274
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0614b274

Branch: refs/heads/cassandra-3.11
Commit: 0614b274faa6410904d24b81d7dd62df1dfae4c6
Parents: c2b635a 830b012
Author: Michael Shuler 
Authored: Thu Aug 17 14:27:03 2017 -0500
Committer: Michael Shuler 
Committed: Thu Aug 17 14:27:03 2017 -0500

--
 CHANGES.txt | 3 ++-
 circle.yml  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0614b274/CHANGES.txt
--
diff --cc CHANGES.txt
index 358dd04,5c1d1e5..6faaa48
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,12 +1,32 @@@
 -2.2.11
 - * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067) 
 +3.0.15
 + * Randomize batchlog endpoint selection with only 1 or 2 racks 
(CASSANDRA-12884)
 + * Fix digest calculation for counter cells (CASSANDRA-13750)
 + * Fix ColumnDefinition.cellValueType() for non-frozen collection and change 
SSTabledump to use type.toJSONString() (CASSANDRA-13573)
 + * Skip materialized view addition if the base table doesn't exist 
(CASSANDRA-13737)
 + * Drop table should remove corresponding entries in dropped_columns table 
(CASSANDRA-13730)
 + * Log warn message until legacy auth tables have been migrated 
(CASSANDRA-13371)
 + * Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 
(CASSANDRA-13691)
 + * Fix invalid writetime for null cells (CASSANDRA-13711)
 + * Fix ALTER TABLE statement to atomically propagate changes to the table and 
its MVs (CASSANDRA-12952)
 + * Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722)
 + * JMXEnabledThreadPoolExecutor with corePoolSize equal to maxPoolSize 
(Backport CASSANDRA-13329)
 + * Fix Digest mismatch Exception if hints file has UnknownColumnFamily 
(CASSANDRA-13696)
 + * Purge tombstones created by expired cells (CASSANDRA-13643)
 + * Make concat work with iterators that have different subsets of columns 
(CASSANDRA-13482)
 + * Set test.runners based on cores and memory size (CASSANDRA-13078)
 + * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
 + * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
 + * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
 + * Nodetool listsnapshots output is missing a newline, if there are no 
snapshots (CASSANDRA-13568)
 + * sstabledump reports incorrect usage for argument order (CASSANDRA-13532)
-  Merged from 2.2:
++Merged from 2.2:
 + * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067)
   * Fix queries with LIMIT and filtering on clustering columns 
(CASSANDRA-11223)
   * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272)
   * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592)
   * Fix nested Tuples/UDTs validation (CASSANDRA-13646)
 - * Remove unused max_value_size_in_mb config setting from yaml 
(CASSANDRA-13625
  Merged from 2.1:
+  * Remove stress-test target in CircleCI as it's not existing 
(CASSANDRA-13775)
   * Clone HeartBeatState when building gossip messages. Make its 
generation/version volatile (CASSANDRA-13700)
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0614b274/circle.yml
--
diff --cc circle.yml
index f4801b7,5b4c72d..a51cf25
--- a/circle.yml
+++ b/circle.yml
@@@ -7,7 -7,7 +7,7 @@@ test
  - sudo apt-get update; sudo apt-get install wamerican:
  parallel: true
override:
- - case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test 
-Dtest.runners=1;; 1) ant long-test ;; 2) ant test-compression ;; 3) ant 
stress-test ;;esac:
 -- case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test ;; 1) ant 
long-test ;; 2) ant test-compression ;;esac:
++- case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test 
-Dtest.runners=1;; 1) ant long-test ;; 2) ant test-compression ;;esac:
  parallel: true
  
post:


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

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jkni]

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/19adec1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19adec1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19adec1f

Branch: refs/heads/cassandra-3.11
Commit: 19adec1f83d84254d2282344237a79f026e90d79
Parents: 0054dcf 739cd2b
Author: Joel Knighton 
Authored: Mon Jul 24 14:52:21 2017 -0500
Committer: Joel Knighton 
Committed: Mon Jul 24 14:52:21 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/19adec1f/CHANGES.txt
--
diff --cc CHANGES.txt
index c420164,36c34a1..3247277
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -13,57 -3,18 +13,59 @@@
   * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272)
   * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592)
   * Fix nested Tuples/UDTs validation (CASSANDRA-13646)
 - * Remove unused max_value_size_in_mb config setting from yaml 
(CASSANDRA-13625
+ Merged from 2.1:
+  * Clone HeartBeatState when building gossip messages. Make its 
generation/version volatile (CASSANDRA-13700)
  
 -
 -2.2.10
 +3.0.14
 + * 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)
 + * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542)
 + * Fix the reported number of sstable data files accessed per read 
(CASSANDRA-13120)
 + * Fix schema digest mismatch during rolling upgrades from versions before 
3.0.12 (CASSANDRA-13559)
 + * Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
 + * Interned ColumnIdentifiers should use minimal ByteBuffers (CASSANDRA-13533)
 + * ReverseIndexedReader may drop rows during 2.1 to 3.0 upgrade 
(CASSANDRA-13525)
 + * Fix repair process violating start/end token limits for small ranges 
(CASSANDRA-13052)
 + * Add storage port options to sstableloader (CASSANDRA-13518)
 + * Properly handle quoted index names in cqlsh DESCRIBE output 
(CASSANDRA-12847)
 + * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
 + * Fix NPE in StorageService.excise() (CASSANDRA-13163)
 + * Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
 + * Fail repair if insufficient responses received (CASSANDRA-13397)
 + * Fix SSTableLoader fail when the loaded table contains dropped columns 
(CASSANDRA-13276)
 + * Avoid name clashes in CassandraIndexTest (CASSANDRA-13427)
 + * Handling partially written hint files (CASSANDRA-12728)
 + * Interrupt replaying hints on decommission (CASSANDRA-13308)
 + * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
 +Merged from 2.2:
   * Nodes started with join_ring=False should be able to serve requests when 
authentication is enabled (CASSANDRA-11381)
   * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)
 - * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
 +
 +3.0.13
 + * Make reading of range tombstones more reliable (CASSANDRA-12811)
 + * Fix startup problems due to schema tables not completely flushed 
(CASSANDRA-12213)
 + * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
 + * Fix 2i page size calculation when there are no regular columns 
(CASSANDRA-13400)
 + * Fix the conversion of 2.X expired rows without regular column data 
(CASSANDRA-13395)
 + * Fix hint delivery when using ext+internal IPs with prefer_local enabled 
(CASSANDRA-13020)
 + * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors 
(CASSANDRA-13389)
 + * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
 + * Use the Kernel32 library to retrieve the PID on Windows and fix startup 
checks (CASSANDRA-1)
 + * Fix code to not exchange schema across major versions (CASSANDRA-13274)
 + * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
 + * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
 + * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
 + * Applying: Use a unique metric reservoir per test run when using 
Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
 + * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
 + * Slice.isEmpty() returns false 

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jkni]

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/0054dcf5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0054dcf5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0054dcf5

Branch: refs/heads/cassandra-3.11
Commit: 0054dcf5b0f797be6026f7ea642db343dd7dd8bc
Parents: 16a5e82 462fe26
Author: Joel Knighton 
Authored: Mon Jul 24 13:24:31 2017 -0500
Committer: Joel Knighton 
Committed: Mon Jul 24 13:24:31 2017 -0500

--

--



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

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aweisberg]

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/d079ce01
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d079ce01
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d079ce01

Branch: refs/heads/cassandra-3.11
Commit: d079ce0156aca9f26941da6069b0388db1e73bf9
Parents: f5b36f1 cba5c7f
Author: Ariel Weisberg 
Authored: Fri Apr 21 16:19:41 2017 -0400
Committer: Ariel Weisberg 
Committed: Fri Apr 21 16:19:41 2017 -0400

--

--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[mshuler]

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/f63ea272
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f63ea272
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f63ea272

Branch: refs/heads/cassandra-3.11
Commit: f63ea2727654a048922f931915cb10b30e4cead2
Parents: 5e13020 590e151
Author: Michael Shuler 
Authored: Mon Apr 10 09:11:32 2017 -0500
Committer: Michael Shuler 
Committed: Mon Apr 10 09:11:32 2017 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f63ea272/debian/cassandra.install
--
diff --cc debian/cassandra.install
index 706f316,e8da5e9..50db32d
--- a/debian/cassandra.install
+++ b/debian/cassandra.install
@@@ -5,7 -5,7 +5,8 @@@ conf/commitlog_archiving.properties etc
  conf/cassandra-topology.properties etc/cassandra
  conf/logback.xml etc/cassandra
  conf/logback-tools.xml etc/cassandra
 +conf/jvm.options etc/cassandra
+ conf/hotspot_compiler etc/cassandra
  conf/triggers/* etc/cassandra/triggers
  debian/cassandra.in.sh usr/share/cassandra
  debian/cassandra.conf etc/security/limits.d

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[marcuse]

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/8d34076a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d34076a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d34076a

Branch: refs/heads/cassandra-3.11
Commit: 8d34076aac88a29d6d8a4f3050fdc7a75389298e
Parents: a8a3d4e 1e102b4
Author: Marcus Eriksson 
Authored: Fri Apr 7 08:09:45 2017 +0200
Committer: Marcus Eriksson 
Committed: Fri Apr 7 08:09:45 2017 +0200

--
 circle.yml | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[stefania]

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/a8a3d4e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8a3d4e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8a3d4e2

Branch: refs/heads/cassandra-3.11
Commit: a8a3d4e282334216a39ceeabea06b9f60f7b4dc1
Parents: 6991556 377f611
Author: Stefania Alborghetti 
Authored: Fri Apr 7 09:02:59 2017 +0800
Committer: Stefania Alborghetti 
Committed: Fri Apr 7 09:03:54 2017 +0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8a3d4e2/CHANGES.txt
--
diff --cc CHANGES.txt
index 212c738,e01a63c..5bcdf16
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -22,21 -4,8 +22,22 @@@ Merged from 2.2
   * 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)
- 
++Merged from 2.1:
++ * Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364)
 +
 +3.0.12
 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to 
LogRecord absolute path (CASSANDRA-13294)
 + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
 + * Cqlsh copy-from should error out when csv contains invalid data for 
collections (CASSANDRA-13071)
 + * Update c.yaml doc for offheap memtables (CASSANDRA-13179)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 +Merged from 2.2:
   * Avoid race on receiver by starting streaming sender thread after sending 
init message (CASSANDRA-12886)
   * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
   * Coalescing strategy sleeps too much (CASSANDRA-13090)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8a3d4e2/pylib/cqlshlib/copyutil.py
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jjirsa]

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/0efb392b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0efb392b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0efb392b

Branch: refs/heads/cassandra-3.11
Commit: 0efb392bc07f7a2df96a73048e0cbf2ffa73cf1f
Parents: 2f1ab4a fbb061b
Author: Jeff Jirsa 
Authored: Tue Apr 4 14:30:13 2017 -0700
Committer: Jeff Jirsa 
Committed: Tue Apr 4 14:30:17 2017 -0700

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

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jjirsa]

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/218743dc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/218743dc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/218743dc

Branch: refs/heads/cassandra-3.11
Commit: 218743dc39a49bd31182c8e796d10781b6c236eb
Parents: 873660c 9bbb449
Author: Jeff Jirsa 
Authored: Wed Mar 1 13:43:53 2017 -0800
Committer: Jeff Jirsa 
Committed: Wed Mar 1 13:44:55 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/218743dc/CHANGES.txt
--
diff --cc CHANGES.txt
index 2289334,404440a..c4622ab
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -12,49 -7,10 +12,50 @@@ Merged from 2.
   * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
   * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
  Merged from 2.1:
+  * Remove unused repositories (CASSANDRA-13278)
   * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
  
 -2.2.9
 +3.0.11
 + * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to 
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Abort or retry on failed hints delivery (CASSANDRA-13124)
 + * Fix handling of partition with partition-level deletion plus
 +   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)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace 
(CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables 
(CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair 
(CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
   * Fix negative mean latency metric (CASSANDRA-12876)
   * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
   * Fix speculative retry bugs (CASSANDRA-13009)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/218743dc/build.xml
--
diff --cc build.xml
index 69b6bdf,6dbdb9e..cffaa17
--- a/build.xml
+++ b/build.xml
@@@ -386,9 -387,15 +385,10 @@@


  
 -  
 -  
 -  
++  
 +  
 +  
 +   

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[tylerhobbs]

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/f70d8c06
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f70d8c06
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f70d8c06

Branch: refs/heads/cassandra-3.11
Commit: f70d8c06c052b5e65e4f6f843d29d39970082408
Parents: f0502aa 15e71ba
Author: Tyler Hobbs 
Authored: Wed Feb 22 10:09:48 2017 -0600
Committer: Tyler Hobbs 
Committed: Wed Feb 22 10:09:48 2017 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f70d8c06/CHANGES.txt
--
diff --cc CHANGES.txt
index 91a6b31,91c11fa..a4bb9cd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,51 -1,10 +1,53 @@@
 -2.2.10
 +3.0.12
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 +
 +Merged from 2.2
   * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
   * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
+ Merged from 2.1:
+  * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
  
 -2.2.9
 +3.0.11
 + * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to 
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Abort or retry on failed hints delivery (CASSANDRA-13124)
 + * Fix handling of partition with partition-level deletion plus
 +   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)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace 
(CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables 
(CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair 
(CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
   * Coalescing strategy sleeps too much (CASSANDRA-13090)
   * Fix negative mean latency metric (CASSANDRA-12876)
   * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f70d8c06/src/java/org/apache/cassandra/service/CassandraDaemon.java
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[mshuler]

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/7cb2ef09
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7cb2ef09
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7cb2ef09

Branch: refs/heads/cassandra-3.11
Commit: 7cb2ef09013df4987c74238bf6af4e7445c05ee2
Parents: f02f154 0b9f6de
Author: Michael Shuler 
Authored: Wed Feb 15 17:59:06 2017 -0600
Committer: Michael Shuler 
Committed: Wed Feb 15 17:59: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/7cb2ef09/CHANGES.txt
--
diff --cc CHANGES.txt
index 732e14b,d53457f..ab345e6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -57,50 -15,6 +57,51 @@@ Merged from 2.2
   * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
   * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
   * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
 +Merged from 2.1:
++ * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 + * Upgrade netty version to fix memory leak with client encryption 
(CASSANDRA-13114)
 + * cqlsh copy-from: sort user type fields in csv (CASSANDRA-12959)
 +
 +
 +
 +3.0.10
 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
 + * Fix partition count log during compaction (CASSANDRA-12184)
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * 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)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jasobrown]

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/8ec60900
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ec60900
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ec60900

Branch: refs/heads/cassandra-3.11
Commit: 8ec60900211c47f3231058de6b09b04f78456eea
Parents: 0cc1c1b c884b70
Author: Jason Brown 
Authored: Sat Feb 11 08:00:56 2017 -0800
Committer: Jason Brown 
Committed: Sat Feb 11 08:01:34 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/8ec60900/CHANGES.txt
--
diff --cc CHANGES.txt
index 007d06c,fc79796..700bde0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -53,49 -13,6 +53,50 @@@ Merged from 2.2
   * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
   * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
   * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
 +Merged from 2.1:
++ * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 + * Upgrade netty version to fix memory leak with client encryption 
(CASSANDRA-13114)
 + * cqlsh copy-from: sort user type fields in csv (CASSANDRA-12959)
 +
 +
 +
 +3.0.10
 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
 + * Fix partition count log during compaction (CASSANDRA-12184)
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * 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)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ec60900/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jjirsa]

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/4e669cfd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e669cfd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e669cfd

Branch: refs/heads/cassandra-3.11
Commit: 4e669cfdc88c3fd916193654512b93feb9862638
Parents: 46e81b5 d24d07e
Author: Jeff Jirsa 
Authored: Fri Feb 10 15:27:16 2017 -0800
Committer: Jeff Jirsa 
Committed: Fri Feb 10 15:27:37 2017 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e669cfd/CHANGES.txt
--
diff --cc CHANGES.txt
index bf8412c,a109042..91bfe12
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -51,48 -13,6 +51,49 @@@ Merged from 2.2
   * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
   * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
   * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
 +Merged from 2.1:
++ * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 + * Upgrade netty version to fix memory leak with client encryption 
(CASSANDRA-13114)
 + * cqlsh copy-from: sort user type fields in csv (CASSANDRA-12959)
 +
 +
 +
 +3.0.10
 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
 + * Fix partition count log during compaction (CASSANDRA-12184)
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * 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)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e669cfd/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[stefania]

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/e9ff6ae6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9ff6ae6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9ff6ae6

Branch: refs/heads/cassandra-3.X
Commit: e9ff6ae6f549b789eb17e4619678dd95ecef790a
Parents: c0886d8 eaf46a1
Author: Stefania Alborghetti 
Authored: Wed Oct 26 08:50:43 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Oct 26 08:50:43 2016 +0800

--

--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[mshuler]

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/45d01762
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45d01762
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45d01762

Branch: refs/heads/cassandra-3.X
Commit: 45d017629053fba65949869aceed0797b15b6995
Parents: db869bc 975284c
Author: Michael Shuler 
Authored: Wed Oct 5 17:21:11 2016 -0500
Committer: Michael Shuler 
Committed: Wed Oct 5 17:21:11 2016 -0500

--

--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[marcuse]

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/10e719cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10e719cb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10e719cb

Branch: refs/heads/cassandra-3.9
Commit: 10e719cb6c15b38ff2ae769734d0508509d2ea22
Parents: 1823c84 25159c3
Author: Marcus Eriksson 
Authored: Mon Aug 1 10:44:36 2016 +0200
Committer: Marcus Eriksson 
Committed: Mon Aug 1 10:44:36 2016 +0200

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/db/compaction/LeveledCompactionTask.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/10e719cb/CHANGES.txt
--
diff --cc CHANGES.txt
index bb67fc9,c18bad7..c2d7a4d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -29,21 -4,19 +29,22 @@@ Merged from 2.2
   * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
   * Synchronize ThriftServer::stop() (CASSANDRA-12105)
   * Use dedicated thread for JMX notifications (CASSANDRA-12146)
 - * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143)
   * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
   * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
 - * Don't write shadowed range tombstone (CASSANDRA-12030)
  Merged from 2.1:
+  * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
   * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
 - * Improve digest calculation in the presence of overlapping tombstones 
(CASSANDRA-11349)
   * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
 - * Account for partition deletions in tombstone histogram (CASSANDRA-12112)
  
  
 -2.2.7
 +3.0.8
 + * Fix potential race in schema during new table creation (CASSANDRA-12083)
 + * cqlsh: fix error handling in rare COPY FROM failure scenario 
(CASSANDRA-12070)
 + * Disable autocompaction during drain (CASSANDRA-11878)
 + * Add a metrics timer to MemtablePool and use it to track time spent blocked 
on memory in MemtableAllocator (CASSANDRA-11327)
 + * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/10e719cb/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[marcuse]

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/b23fcc2c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b23fcc2c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b23fcc2c

Branch: refs/heads/cassandra-3.9
Commit: b23fcc2cde66f70df36ec7c811cee153c07882ff
Parents: e4c344c f72927e
Author: Marcus Eriksson 
Authored: Thu Jun 30 13:18:12 2016 +0200
Committer: Marcus Eriksson 
Committed: Thu Jun 30 13:18:12 2016 +0200

--

--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[stefania]

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/bedc7425
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bedc7425
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bedc7425

Branch: refs/heads/cassandra-3.7
Commit: bedc7425796afe311e148669a3e7b5255e5150a2
Parents: 1e82695 bb88b8c
Author: Stefania Alborghetti 
Authored: Thu Jun 2 14:07:36 2016 +0200
Committer: Stefania Alborghetti 
Committed: Thu Jun 2 14:07:36 2016 +0200

--

--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[marcuse]

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/a3d05566
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3d05566
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3d05566

Branch: refs/heads/cassandra-3.7
Commit: a3d055662fe80115c0fbca71f09312910ae55498
Parents: 716f02e 63efa07
Author: Marcus Eriksson 
Authored: Thu May 26 09:20:47 2016 +0200
Committer: Marcus Eriksson 
Committed: Thu May 26 09:20:47 2016 +0200

--
 .../compaction/AbstractCompactionStrategy.java  |   2 +-
 .../db/compaction/CompactionController.java |  22 +++-
 .../cassandra/db/compaction/NeverPurgeTest.java | 132 +++
 3 files changed, 152 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3d05566/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3d05566/src/java/org/apache/cassandra/db/compaction/CompactionController.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionController.java
index 5cb60c5,699bc55..a5b8308
--- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
@@@ -44,11 -41,14 +44,15 @@@ import static org.apache.cassandra.db.l
  public class CompactionController implements AutoCloseable
  {
  private static final Logger logger = 
LoggerFactory.getLogger(CompactionController.class);
+ static final boolean NEVER_PURGE_TOMBSTONES = 
Boolean.getBoolean("cassandra.never_purge_tombstones");
  
  public final ColumnFamilyStore cfs;
 +private final boolean compactingRepaired;
+ // note that overlapIterator and overlappingSSTables will be null if 
NEVER_PURGE_TOMBSTONES is set - this is a
+ // good thing so that noone starts using them and thinks that if 
overlappingSSTables is empty, there
+ // is no overlap.
  private Refs overlappingSSTables;
 -private OverlapIterator overlapIterator;
 +private OverlapIterator overlapIterator;
  private final Iterable compacting;
  
  public final int gcBefore;
@@@ -64,12 -64,19 +68,20 @@@
  this.cfs = cfs;
  this.gcBefore = gcBefore;
  this.compacting = compacting;
 +compactingRepaired = compacting != null && 
compacting.stream().allMatch(SSTableReader::isRepaired);
  refreshOverlaps();
+ if (NEVER_PURGE_TOMBSTONES)
+ logger.warn("You are running with 
-Dcassandra.never_purge_tombstones=true, this is dangerous!");
  }
  
 -void maybeRefreshOverlaps()
 +public void maybeRefreshOverlaps()
  {
+ if (NEVER_PURGE_TOMBSTONES)
+ {
+ logger.debug("not refreshing overlaps - running with 
-Dcassandra.never_purge_tombstones=true");
+ return;
+ }
+ 
  for (SSTableReader reader : overlappingSSTables)
  {
  if (reader.isMarkedCompacted())
@@@ -117,12 -127,9 +132,12 @@@
  {
  logger.trace("Checking droppable sstables in {}", cfStore);
  
- if (compacting == null)
+ if (compacting == null || NEVER_PURGE_TOMBSTONES)
  return Collections.emptySet();
  
 +if 
(cfStore.getCompactionStrategyManager().onlyPurgeRepairedTombstones() && 
!Iterables.all(compacting, SSTableReader::isRepaired))
 +return Collections.emptySet();
 +
  List candidates = new ArrayList<>();
  
  long minTimestamp = Long.MAX_VALUE;
@@@ -187,7 -194,7 +202,7 @@@
   */
  public long maxPurgeableTimestamp(DecoratedKey key)
  {
- if (!compactingRepaired())
 -if (NEVER_PURGE_TOMBSTONES)
++if (!compactingRepaired() || NEVER_PURGE_TOMBSTONES)
  return Long.MIN_VALUE;
  
  long min = Long.MAX_VALUE;
@@@ -213,12 -220,8 +228,13 @@@
  
  public void close()
  {
- overlappingSSTables.release();
+ if (overlappingSSTables != null)
+ overlappingSSTables.release();
  }
  
 +public boolean compactingRepaired()
 +{
 +return 
!cfs.getCompactionStrategyManager().onlyPurgeRepairedTombstones() || 
compactingRepaired;
 +}
 +
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3d05566/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java
--
diff --cc test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java
index 

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[marcuse]

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/716f02e9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/716f02e9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/716f02e9

Branch: refs/heads/cassandra-3.7
Commit: 716f02e9ae71d9f3f55260042f1dbdbb26dea800
Parents: 85cc390 118bea5
Author: Marcus Eriksson 
Authored: Thu May 26 08:20:25 2016 +0200
Committer: Marcus Eriksson 
Committed: Thu May 26 08:23:05 2016 +0200

--
 CHANGES.txt |  1 +
 .../repair/RepairMessageVerbHandler.java| 11 +--
 .../apache/cassandra/repair/RepairRunnable.java |  2 +-
 .../cassandra/service/ActiveRepairService.java  | 93 ++--
 .../LeveledCompactionStrategyTest.java  |  2 +-
 .../cassandra/repair/LocalSyncTaskTest.java |  3 +-
 .../service/ActiveRepairServiceTest.java|  2 +-
 7 files changed, 97 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/716f02e9/CHANGES.txt
--
diff --cc CHANGES.txt
index ddfb24f,190c2fa..062bb7b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,43 -1,9 +1,44 @@@
 -2.2.7
 +3.0.7
 + * 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:
   * Enable client encryption in sstableloader with cli options 
(CASSANDRA-11708)
   * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
 - * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
   * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
 - * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
 + * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
 +Merged from 2.1:
++ * Clear out parent repair session if repair coordinator dies 
(CASSANDRA-11824)
 + * Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840)
 + * Do not consider local node a valid source during replace (CASSANDRA-11848)
 + * Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
 + * Avoid holding SSTableReaders for duration of incremental repair 
(CASSANDRA-11739)
 +
 +
 +3.0.6
 + * Disallow creating view with a static column (CASSANDRA-11602)
 + * Reduce the amount of object allocations caused by the getFunctions methods 
(CASSANDRA-11593)
 + * Potential error replaying commitlog with smallint/tinyint/date/time types 
(CASSANDRA-11618)
 + * Fix queries with filtering on counter columns (CASSANDRA-11629)
 + * Improve tombstone printing in sstabledump (CASSANDRA-11655)
 + * 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:
 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
   * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
   * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
   * Produce a heap dump when exiting on OOM (CASSANDRA-9861)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/716f02e9/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
--
diff --cc src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
index eeefec4,6e7922f..c536b13
--- a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
+++ b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
@@@ -71,12 -75,18 +71,13 @@@ public 

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/e000ebbe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e000ebbe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e000ebbe

Branch: refs/heads/cassandra-3.7
Commit: e000ebbe50dafc502255bf5fb5dbfba24f90a8e5
Parents: ed84bbc 2bacc9a
Author: Yuki Morishita 
Authored: Wed May 25 19:30:52 2016 -0500
Committer: Yuki Morishita 
Committed: Wed May 25 19:30:52 2016 -0500

--
 CHANGES.txt|  1 +
 conf/cassandra.yaml| 10 ++
 src/java/org/apache/cassandra/config/Config.java   |  2 +-
 .../org/apache/cassandra/streaming/StreamSession.java  | 13 -
 4 files changed, 20 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e000ebbe/CHANGES.txt
--
diff --cc CHANGES.txt
index 0277f16,6a952c4..9a449fd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,9 +1,42 @@@
 -2.2.7
 +3.0.7
 + * 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:
   * Enable client encryption in sstableloader with cli options 
(CASSANDRA-11708)
   * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
 - * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
   * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
 - * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
 + * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
 +Merged from 2.1:
++ * Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840)
 + * Do not consider local node a valid source during replace (CASSANDRA-11848)
 + * Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
 + * Avoid holding SSTableReaders for duration of incremental repair 
(CASSANDRA-11739)
 +
 +
 +3.0.6
 + * Disallow creating view with a static column (CASSANDRA-11602)
 + * Reduce the amount of object allocations caused by the getFunctions methods 
(CASSANDRA-11593)
 + * Potential error replaying commitlog with smallint/tinyint/date/time types 
(CASSANDRA-11618)
 + * Fix queries with filtering on counter columns (CASSANDRA-11629)
 + * Improve tombstone printing in sstabledump (CASSANDRA-11655)
 + * 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:
 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
   * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
   * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
   * Produce a heap dump when exiting on OOM (CASSANDRA-9861)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e000ebbe/conf/cassandra.yaml
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e000ebbe/src/java/org/apache/cassandra/config/Config.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e000ebbe/src/java/org/apache/cassandra/streaming/StreamSession.java
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/ed84bbcb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed84bbcb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed84bbcb

Branch: refs/heads/cassandra-3.7
Commit: ed84bbcbb1c80941f7a5d948799b90c8c1740edb
Parents: d63ede5 907c826
Author: Yuki Morishita 
Authored: Wed May 25 18:54:08 2016 -0500
Committer: Yuki Morishita 
Committed: Wed May 25 18:54:08 2016 -0500

--
 CHANGES.txt |  3 +-
 .../org/apache/cassandra/dht/BootStrapper.java  |  1 +
 .../org/apache/cassandra/dht/RangeStreamer.java | 48 +++-
 .../cassandra/service/StorageService.java   |  2 +-
 4 files changed, 41 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed84bbcb/CHANGES.txt
--
diff --cc CHANGES.txt
index 7239dc9,d6750ab..0277f16
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,40 -1,9 +1,41 @@@
 -2.2.7
 +3.0.7
 + * 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:
   * Enable client encryption in sstableloader with cli options 
(CASSANDRA-11708)
   * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
-  * Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
 - * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
   * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
 - * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
 + * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
 +Merged from 2.1:
++ * Do not consider local node a valid source during replace (CASSANDRA-11848)
++ * Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
 + * Avoid holding SSTableReaders for duration of incremental repair 
(CASSANDRA-11739)
 +
 +
 +3.0.6
 + * Disallow creating view with a static column (CASSANDRA-11602)
 + * Reduce the amount of object allocations caused by the getFunctions methods 
(CASSANDRA-11593)
 + * Potential error replaying commitlog with smallint/tinyint/date/time types 
(CASSANDRA-11618)
 + * Fix queries with filtering on counter columns (CASSANDRA-11629)
 + * Improve tombstone printing in sstabledump (CASSANDRA-11655)
 + * 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:
 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
   * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
   * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
   * Produce a heap dump when exiting on OOM (CASSANDRA-9861)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed84bbcb/src/java/org/apache/cassandra/dht/BootStrapper.java
--
diff --cc src/java/org/apache/cassandra/dht/BootStrapper.java
index c44bad7,26fa6b3..1c40482
--- a/src/java/org/apache/cassandra/dht/BootStrapper.java
+++ b/src/java/org/apache/cassandra/dht/BootStrapper.java
@@@ -75,8 -75,9 +75,9 @@@ public class BootStrapper extends Progr
 
DatabaseDescriptor.getEndpointSnitch(),
 stateStore);
  streamer.addSourceFilter(new 
RangeStreamer.FailureDetectorSourceFilter(FailureDetector.instance));
+ streamer.addSourceFilter(new RangeStreamer.ExcludeLocalNodeFilter());
  
 -for (String keyspaceName : 

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[marcuse]

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/d572ab0a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d572ab0a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d572ab0a

Branch: refs/heads/cassandra-3.7
Commit: d572ab0ac86b4e635c2dd83e56926cc6192f1c2a
Parents: 9904c62 d6ffa4b
Author: Marcus Eriksson 
Authored: Tue May 24 07:42:07 2016 +0200
Committer: Marcus Eriksson 
Committed: Tue May 24 07:42:07 2016 +0200

--
 CHANGES.txt |  2 +
 .../db/compaction/CompactionManager.java|  2 +-
 .../cassandra/service/ActiveRepairService.java  | 59 ++---
 .../service/ActiveRepairServiceTest.java| 66 +++-
 4 files changed, 102 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d572ab0a/CHANGES.txt
--
diff --cc CHANGES.txt
index 608d6c9,af97cd1..69e8c5d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,7 +1,38 @@@
 -2.2.7
 - * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
 +3.0.7
 + * 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:
 + * Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
   * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
 - * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
 + * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
++Merged from 2.1:
++ * Avoid holding SSTableReaders for duration of incremental repair 
(CASSANDRA-11739)
 +
 +
 +3.0.6
 + * Disallow creating view with a static column (CASSANDRA-11602)
 + * Reduce the amount of object allocations caused by the getFunctions methods 
(CASSANDRA-11593)
 + * Potential error replaying commitlog with smallint/tinyint/date/time types 
(CASSANDRA-11618)
 + * Fix queries with filtering on counter columns (CASSANDRA-11629)
 + * Improve tombstone printing in sstabledump (CASSANDRA-11655)
 + * 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:
 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
   * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
   * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
   * Produce a heap dump when exiting on OOM (CASSANDRA-9861)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d572ab0a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d572ab0a/src/java/org/apache/cassandra/service/ActiveRepairService.java
--
diff --cc src/java/org/apache/cassandra/service/ActiveRepairService.java
index 6c75149,1ea5aaf..5aac886
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@@ -446,39 -448,50 +446,50 @@@ public class ActiveRepairServic
  }
  this.ranges = ranges;
  this.repairedAt = repairedAt;
 -this.isGlobal = isGlobal;
  this.isIncremental = isIncremental;
 +this.isGlobal = isGlobal;
  }
  
- public void addSSTables(UUID cfId, Set sstables)
- {
- sstableMap.get(cfId).addAll(sstables);
- }
- 
  @SuppressWarnings("resource")
- public 

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/4cdce564
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4cdce564
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4cdce564

Branch: refs/heads/cassandra-3.7
Commit: 4cdce5645080c288bcee64a79d68a840e0299cba
Parents: 6663c5f e0c6a9e
Author: Yuki Morishita 
Authored: Mon May 23 09:57:14 2016 -0500
Committer: Yuki Morishita 
Committed: Mon May 23 09:57:14 2016 -0500

--
 CHANGES.txt  |  1 +
 .../cassandra/tools/nodetool/NetStats.java   | 19 +++
 2 files changed, 16 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4cdce564/CHANGES.txt
--
diff --cc CHANGES.txt
index 27398db,795e823..608d6c9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,7 +1,36 @@@
 -2.2.7
 - * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
 +3.0.7
 + * 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:
++ * Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
   * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
 - * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
 + * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
 +
 +
 +3.0.6
 + * Disallow creating view with a static column (CASSANDRA-11602)
 + * Reduce the amount of object allocations caused by the getFunctions methods 
(CASSANDRA-11593)
 + * Potential error replaying commitlog with smallint/tinyint/date/time types 
(CASSANDRA-11618)
 + * Fix queries with filtering on counter columns (CASSANDRA-11629)
 + * Improve tombstone printing in sstabledump (CASSANDRA-11655)
 + * 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:
 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
   * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
   * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
   * Produce a heap dump when exiting on OOM (CASSANDRA-9861)

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jake]

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/f73b4850
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f73b4850
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f73b4850

Branch: refs/heads/cassandra-3.7
Commit: f73b48502d8455ef27f915f5a5bc14a9682f8ab0
Parents: 54b7438 89344f1
Author: T Jake Luciani 
Authored: Wed May 18 09:10:06 2016 -0400
Committer: T Jake Luciani 
Committed: Wed May 18 09:10:06 2016 -0400

--
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jmckenzie]

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/14918b76
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14918b76
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14918b76

Branch: refs/heads/cassandra-3.7
Commit: 14918b76f3fccb96d4187afd26819b34284e74b5
Parents: eda763b 280da18
Author: Josh McKenzie 
Authored: Fri May 13 12:37:53 2016 -0400
Committer: Josh McKenzie 
Committed: Fri May 13 12:37:53 2016 -0400

--
 src/java/org/apache/cassandra/service/GCInspector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/14918b76/src/java/org/apache/cassandra/service/GCInspector.java
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/e9657a43
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9657a43
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9657a43

Branch: refs/heads/cassandra-3.7
Commit: e9657a43a8a64c1c273c15c166e88672cd0e55aa
Parents: ecb4ae8 e614433
Author: Aleksey Yeschenko 
Authored: Tue May 10 16:00:59 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Tue May 10 16:00:59 2016 +0100

--
 CHANGES.txt | 1 +
 .../org/apache/cassandra/locator/DynamicEndpointSnitch.java | 5 -
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9657a43/CHANGES.txt
--
diff --cc CHANGES.txt
index af8be97,2bb3518..306f46f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -37,11 -13,9 +37,12 @@@ 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)
 - * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988)
 + * 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)
  Merged from 2.1:
+  * Add option to disable use of severity in DynamicEndpointSnitch 
(CASSANDRA-11737)
   * cqlsh COPY FROM fails for null values with non-prepared statements 
(CASSANDRA-11631)
   * Make cython optional in pylib/setup.py (CASSANDRA-11630)
   * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[snazy]

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/2e202d47
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e202d47
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e202d47

Branch: refs/heads/cassandra-3.7
Commit: 2e202d47d34a3a0b91670b7fe7bf0e1e35d20b1b
Parents: 7480202 3d73282
Author: Robert Stupp 
Authored: Wed May 4 18:44:52 2016 +0200
Committer: Robert Stupp 
Committed: Wed May 4 18:44:52 2016 +0200

--
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e202d47/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jmckenzie]

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/c7d216e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7d216e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7d216e3

Branch: refs/heads/cassandra-3.7
Commit: c7d216e3fe86535948d521aa96db3bdac56cfafc
Parents: 5244787 8bf453a
Author: Josh McKenzie 
Authored: Tue May 3 14:06:03 2016 -0400
Committer: Josh McKenzie 
Committed: Tue May 3 14:06:18 2016 -0400

--
 conf/cassandra-env.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7d216e3/conf/cassandra-env.sh
--
diff --cc conf/cassandra-env.sh
index 0ba0c4e,b519b76..44fe110
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@@ -97,8 -99,8 +97,8 @@@ if [ "$JVM_VERSION" \< "1.8" ] ; the
  exit 1;
  fi
  
- if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" \< "40" ] ; then
 -if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" -lt 25 ] ; then
 -echo "Cassandra 2.0 and later require Java 7u25 or later."
++if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" -lt 40 ] ; then
 +echo "Cassandra 3.0 and later require Java 8u40 or later."
  exit 1;
  fi
  

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jmckenzie]

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/bd4cab24
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd4cab24
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd4cab24

Branch: refs/heads/cassandra-3.5
Commit: bd4cab24bb9582d15d6b4cf251e7da21230f1460
Parents: be38081 caaa9fc
Author: Josh McKenzie 
Authored: Fri Apr 1 11:47:39 2016 -0400
Committer: Josh McKenzie 
Committed: Fri Apr 1 11:49:41 2016 -0400

--
 CHANGES.txt |   1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  24 ++-
 .../org/apache/cassandra/db/Directories.java|   2 +-
 .../db/commitlog/CommitLogSegmentManager.java   |   4 +-
 .../cassandra/io/util/DiskAwareRunnable.java|   5 +-
 .../apache/cassandra/cql3/OutOfSpaceTest.java   | 157 +++
 6 files changed, 185 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd4cab24/CHANGES.txt
--
diff --cc CHANGES.txt
index 7fc628e,78ea961..b9376bc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -75,8 -38,10 +75,9 @@@ Merged from 2.2
   * (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)
 + * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124)
  Merged from 2.1:
 - * Add a -j parameter to scrub/cleanup/upgradesstables to state how
 -   many threads to use (CASSANDRA-11179)
 - * Backport CASSANDRA-10679 (CASSANDRA-9598)
++ * Fix out-of-space error treatment in memtable flushing (CASSANDRA-11448).
   * Don't do defragmentation if reading from repaired sstables 
(CASSANDRA-10342)
   * Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286)
   * Avoid dropping message too quickly due to missing unit conversion 
(CASSANDRA-11302)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd4cab24/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd4cab24/src/java/org/apache/cassandra/db/Directories.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd4cab24/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
--
diff --cc 
src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
index 8a8d0e7,636c73b..2ee4eed
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
@@@ -34,8 -34,10 +34,9 @@@ import java.util.concurrent.LinkedBlock
  import java.util.concurrent.TimeUnit;
  import java.util.concurrent.atomic.AtomicLong;
  
+ import com.google.common.annotations.VisibleForTesting;
  import com.google.common.collect.Iterables;
  import com.google.common.util.concurrent.*;
 -
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd4cab24/test/unit/org/apache/cassandra/cql3/OutOfSpaceTest.java
--
diff --cc test/unit/org/apache/cassandra/cql3/OutOfSpaceTest.java
index 000,8304aff..1527b1e
mode 00,100644..100644
--- a/test/unit/org/apache/cassandra/cql3/OutOfSpaceTest.java
+++ b/test/unit/org/apache/cassandra/cql3/OutOfSpaceTest.java
@@@ -1,0 -1,157 +1,157 @@@
+ /*
+  * 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.cql3;
+ 
+ import static junit.framework.Assert.fail;
+ 
+ import java.io.IOError;
+ import java.util.UUID;
+ import java.util.concurrent.ExecutionException;
+ 
+ import org.junit.Assert;
+ import org.junit.Test;
+ 
+ import 

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/202786e0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/202786e0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/202786e0

Branch: refs/heads/cassandra-3.5
Commit: 202786e065acc82482333a11d92dd942017506f3
Parents: 500d6b3 1dac59d
Author: Yuki Morishita 
Authored: Wed Mar 30 16:51:42 2016 -0500
Committer: Yuki Morishita 
Committed: Wed Mar 30 16:51:42 2016 -0500

--

--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/c9e81ea7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9e81ea7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9e81ea7

Branch: refs/heads/cassandra-3.5
Commit: c9e81ea7fc6a8a2acfbd4778ca846542d250c8c4
Parents: 1de5342 6ff0065
Author: Aleksey Yeschenko 
Authored: Tue Mar 29 17:57:21 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Mar 29 17:57:21 2016 +0100

--

--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[marcuse]

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/0c91977d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c91977d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c91977d

Branch: refs/heads/cassandra-3.5
Commit: 0c91977da68f054cf0ddf996b49423d736b42006
Parents: 3efc609 897ffe8
Author: Marcus Eriksson 
Authored: Tue Mar 29 11:00:13 2016 +0200
Committer: Marcus Eriksson 
Committed: Tue Mar 29 11:00:13 2016 +0200

--
 CHANGES.txt |  2 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 16 
 .../db/compaction/CompactionManager.java| 40 +---
 .../cassandra/service/StorageService.java   | 23 +--
 .../cassandra/service/StorageServiceMBean.java  |  6 +++
 .../org/apache/cassandra/tools/NodeProbe.java   | 34 +++--
 .../cassandra/tools/nodetool/Cleanup.java   |  9 -
 .../apache/cassandra/tools/nodetool/Scrub.java  | 13 +--
 .../tools/nodetool/UpgradeSSTable.java  | 10 -
 .../org/apache/cassandra/db/CleanupTest.java|  6 +--
 .../unit/org/apache/cassandra/db/ScrubTest.java | 16 
 11 files changed, 120 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c91977d/CHANGES.txt
--
diff --cc CHANGES.txt
index fe19df7,098d062..fdc873e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -20,36 -8,13 +20,38 @@@ Merged from 2.2
   * Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
   * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
   * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
 - * Fix filtering on non-primary key columns for thrift static column families
 -   (CASSANDRA-6377)
   * Only log yaml config once, at startup (CASSANDRA-11217)
 - * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
   * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 +Merged from 2.1:
++ * Add a -j parameter to scrub/cleanup/upgradesstables to state how
++   many threads to use (CASSANDRA-11179)
 + * Backport CASSANDRA-10679 (CASSANDRA-9598)
 + * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
 + * COPY FROM on large datasets: fix progress report and debug performance 
(CASSANDRA-11053)
 +
 +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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c91977d/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c91977d/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 7c46fcb,ca02747..f339660
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ 

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jmckenzie]

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/3efc609e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3efc609e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3efc609e

Branch: refs/heads/cassandra-3.5
Commit: 3efc609e01f95cfdcaae3a6d153291c15607455a
Parents: 70eab63 6c1ef2b
Author: Josh McKenzie 
Authored: Mon Mar 28 13:55:11 2016 -0400
Committer: Josh McKenzie 
Committed: Mon Mar 28 13:55:11 2016 -0400

--
 pylib/cqlshlib/copyutil.py | 98 +
 1 file changed, 69 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3efc609e/pylib/cqlshlib/copyutil.py
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/5e722ee0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e722ee0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e722ee0

Branch: refs/heads/cassandra-3.5
Commit: 5e722ee0a0360a589c0497235ead0ea5ee85a805
Parents: 842e7c3 b6d0a75
Author: Yuki Morishita 
Authored: Tue Mar 22 16:09:06 2016 -0500
Committer: Yuki Morishita 
Committed: Tue Mar 22 16:09:06 2016 -0500

--
 CHANGES.txt  |  1 +
 bin/nodetool | 38 +-
 bin/sstableloader| 13 ++---
 bin/sstablescrub |  7 -
 bin/sstableupgrade   | 24 ++---
 bin/sstableutil  |  7 -
 bin/sstableverify|  9 +--
 tools/bin/cassandra-stress   | 37 --
 tools/bin/cassandra-stressd  | 50 ++-
 tools/bin/sstabledump| 20 +-
 tools/bin/sstableexpiredblockers | 10 +--
 tools/bin/sstablelevelreset  | 36 -
 tools/bin/sstablemetadata| 22 ++-
 tools/bin/sstableofflinerelevel  | 10 +--
 tools/bin/sstablerepairedset | 49 +-
 tools/bin/sstablesplit   | 29 +---
 16 files changed, 231 insertions(+), 131 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e722ee0/CHANGES.txt
--
diff --cc CHANGES.txt
index 21eb3e5,91dc588..904206b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -18,35 -8,13 +18,36 @@@ Merged from 2.2
   * Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
   * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
   * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
 - * Fix filtering on non-primary key columns for thrift static column families
 -   (CASSANDRA-6377)
   * Only log yaml config once, at startup (CASSANDRA-11217)
 - * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
   * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 +Merged from 2.1:
++ * Backport CASSANDRA-10679 (CASSANDRA-9598)
 + * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
 + * COPY FROM on large datasets: fix progress report and debug performance 
(CASSANDRA-11053)
 +
 +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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e722ee0/bin/sstableutil
--
diff --cc bin/sstableutil
index 2860729,000..9f07785
mode 100755,00..100755
--- a/bin/sstableutil
+++ b/bin/sstableutil
@@@ -1,55 -1,0 +1,60 @@@
 +#!/bin/sh
 +
 +# 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 

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[slebresne]

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/8d101fdd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d101fdd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d101fdd

Branch: refs/heads/cassandra-3.5
Commit: 8d101fdd5c8a5ba1795b5c233b5e4bcdf5ddff19
Parents: a64ad4e 5e2d3d2
Author: Sylvain Lebresne 
Authored: Thu Mar 17 10:21:46 2016 +0100
Committer: Sylvain Lebresne 
Committed: Thu Mar 17 10:21:46 2016 +0100

--
 doc/cql3/CQL.textile | 26 +-
 1 file changed, 17 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d101fdd/doc/cql3/CQL.textile
--
diff --cc doc/cql3/CQL.textile
index 68333ab,af584d0..059b195
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@@ -875,11 -822,8 +879,11 @@@ bc(syntax).
   ::=  ( AND  )*
  
   ::=  '=' 
 - |  IN '(' (  ( ','  )* )? ')'
 + | '('  (',' )* ')' '=' 
 + |  IN '(' (  ( ',' )* )? ')'
-  |  IN '?'
+  |  IN 
 + | '('  (',' )* ')' IN '(' (  
( ',' )* )? ')'
-  | '('  (',' )* ')' IN '?'
++ | '('  (',' )* ')' IN 
  
   ::= TIMESTAMP 
 | TTL 
@@@ -895,11 -839,11 +899,11 @@@ WHERE movie = 'Serenity'
  
  UPDATE UserActions SET total = total + 2 WHERE user = 
B70DE1D0-9908-4AE3-BE34-5573E5B09F14 AND action = 'click';
  p. 
 -The @UPDATE@ statement writes one or more columns for a given row in a table. 
The @@ is used to select the row to update and must include all 
columns composing the @PRIMARY KEY@ (the @IN@ relation is only supported for 
the last column of the partition key). Other columns values are specified 
through @@ after the @SET@ keyword.
 +The @UPDATE@ statement writes one or more columns for a given row in a table. 
The @@ is used to select the row to update and must include all 
columns composing the @PRIMARY KEY@. Other columns values are specified through 
@@ after the @SET@ keyword.
  
- Note that unlike in SQL, @UPDATE@ does not check the prior existence of the 
row by default: the row is created if none existed before, and updated 
otherwise. Furthermore, there are no means to know whether a creation or update 
occurred.
 -Note that unlike in SQL, @UPDATE@ does not check the prior existence of the 
row by default (except through the use of @@, see below): the row is 
created if none existed before, and updated otherwise. Furthermore, there is no 
mean to know which of creation or update happened.
++Note that unlike in SQL, @UPDATE@ does not check the prior existence of the 
row by default (except through the use of @@, see below): the row is 
created if none existed before, and updated otherwise. Furthermore, there are 
no means to know whether a creation or update occurred.
  
 -It is however possible to use the conditions on some columns through @IF@, in 
which case the row will not be updated unless such condition are met. But 
please note that using @IF@ conditions will incur a non negligible performance 
cost (internally, Paxos will be used) so this should be used sparingly.
 +It is however possible to use the conditions on some columns through @IF@, in 
which case the row will not be updated unless the conditions are met. But, 
please note that using @IF@ conditions will incur a non-negligible performance 
cost (internally, Paxos will be used) so this should be used sparingly.
  
  In an @UPDATE@ statement, all updates within the same partition key are 
applied atomically and in isolation.
  
@@@ -929,16 -873,16 +933,20 @@@ bc(syntax).
  
   ::=  ( AND  )*
  
 - ::=  '=' 
 - |  IN '(' (  ( ','  )* )? ')'
 + ::=   
 + | '('  (',' )* ')'  
 + |  IN '(' (  ( ',' )* )? ')'
-  |  IN '?'
+  |  IN 
 + | '('  (',' )* ')' IN '(' (  
( ',' )* )? ')'
-  | '('  (',' )* ')' IN '?'
++ | '('  (',' )* ')' IN 
  
 - ::=   
 + ::= '=' | '<' | '>' | '<=' | '>='
-  ::=  '=' 
-   |  '['  ']' '=' 
++
++ ::=  ( | '!=') 
+   |  IN ( | '(' (  ( ','  )* )? 
')')
 -  |  '['  ']'  
++  |  '['  ']' ( | '!=') 
+   |  '['  ']' IN 
+ 
 - ::= '<' | '<=' | '=' | '!=' | '>=' | '>'
  p. 
  __Sample:__
  

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[marcuse]

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/dcc57d0b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dcc57d0b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dcc57d0b

Branch: refs/heads/cassandra-3.5
Commit: dcc57d0bb2761f0b71f6064f4830af9fa140d0cf
Parents: ec0092b 5182376
Author: Marcus Eriksson 
Authored: Wed Mar 16 10:48:30 2016 +0100
Committer: Marcus Eriksson 
Committed: Wed Mar 16 10:48:30 2016 +0100

--
 CHANGES.txt | 1 +
 .../org/apache/cassandra/db/SinglePartitionReadCommand.java | 5 -
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dcc57d0b/CHANGES.txt
--
diff --cc CHANGES.txt
index 126039a,dca4f8a..87691f9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -58,12 -29,15 +58,13 @@@ Merged from 2.2
   * (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)
 + * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124)
  Merged from 2.1:
+  * Don't do defragmentation if reading from repaired sstables 
(CASSANDRA-10342)
   * Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286)
   * Avoid dropping message too quickly due to missing unit conversion 
(CASSANDRA-11302)
 - * COPY FROM on large datasets: fix progress report and debug performance 
(CASSANDRA-11053)
 - * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
   * Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
   * Only notify if repair status changed (CASSANDRA-11172)
 - * Add partition key to TombstoneOverwhelmingException error message 
(CASSANDRA-10888)
   * Use logback setting for 'cassandra -v' command (CASSANDRA-10767)
   * Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714)
   * Fix incorrect warning in 'nodetool status' (CASSANDRA-10176)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dcc57d0b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
--
diff --cc src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
index de4c9c7,000..14923b9
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
+++ b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
@@@ -1,988 -1,0 +1,991 @@@
 +/*
 + * 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;
 +
 +import java.io.IOException;
 +import java.nio.ByteBuffer;
 +import java.util.*;
 +
 +import com.google.common.collect.Iterables;
 +import com.google.common.collect.Sets;
 +
 +import org.apache.cassandra.cache.IRowCacheEntry;
 +import org.apache.cassandra.cache.RowCacheKey;
 +import org.apache.cassandra.cache.RowCacheSentinel;
 +import org.apache.cassandra.concurrent.Stage;
 +import org.apache.cassandra.concurrent.StageManager;
 +import org.apache.cassandra.config.CFMetaData;
 +import org.apache.cassandra.config.ColumnDefinition;
 +import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.db.lifecycle.*;
 +import org.apache.cassandra.db.filter.*;
 +import org.apache.cassandra.db.partitions.*;
 +import org.apache.cassandra.db.rows.*;
 +import org.apache.cassandra.exceptions.RequestExecutionException;
 +import org.apache.cassandra.io.sstable.format.SSTableReader;
 +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.schema.IndexMetadata;
 +import org.apache.cassandra.service.CacheService;
 +import 

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/c9d2b7ad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9d2b7ad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9d2b7ad

Branch: refs/heads/cassandra-3.5
Commit: c9d2b7addcfefb4cfa2bfcb96215153030d9d624
Parents: 232e12b b9ff7fe
Author: Yuki Morishita 
Authored: Thu Mar 10 13:01:30 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Mar 10 13:01:30 2016 -0600

--
 CHANGES.txt |  1 +
 conf/cassandra.yaml |  7 +++
 .../net/IncomingStreamingConnection.java|  5 +
 .../cassandra/streaming/ConnectionHandler.java  | 21 +---
 .../cassandra/streaming/StreamSession.java  |  2 ++
 5 files changed, 25 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9d2b7ad/CHANGES.txt
--
diff --cc CHANGES.txt
index 7b93083,045b867..4c00994
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -56,8 -26,8 +56,9 @@@ Merged from 2.2
   * (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)
 + * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124)
  Merged from 2.1:
+  * Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286)
   * Avoid dropping message too quickly due to missing unit conversion 
(CASSANDRA-11302)
   * COPY FROM on large datasets: fix progress report and debug performance 
(CASSANDRA-11053)
   * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9d2b7ad/conf/cassandra.yaml
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9d2b7ad/src/java/org/apache/cassandra/net/IncomingStreamingConnection.java
--
diff --cc src/java/org/apache/cassandra/net/IncomingStreamingConnection.java
index e58d227,842676d..19e0671
--- a/src/java/org/apache/cassandra/net/IncomingStreamingConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingStreamingConnection.java
@@@ -25,8 -27,7 +25,9 @@@ import java.util.Set
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
 +import org.apache.cassandra.io.util.DataInputPlus;
 +import org.apache.cassandra.io.util.DataInputPlus.DataInputStreamPlus;
+ import org.apache.cassandra.config.DatabaseDescriptor;
  import org.apache.cassandra.streaming.StreamResultFuture;
  import org.apache.cassandra.streaming.messages.StreamInitMessage;
  import org.apache.cassandra.streaming.messages.StreamMessage;
@@@ -60,9 -60,13 +61,13 @@@ public class IncomingStreamingConnectio
  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));
  
 -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
+ if (!init.isForOutgoing)
+ 
socket.setSoTimeout(DatabaseDescriptor.getStreamingSocketTimeout());
+ 
  // The initiator makes two connections, one for incoming and one 
for outgoing.
  // The receiving side distinguish two connections by looking at 
StreamInitMessage#isForOutgoing.
  // Note: we cannot use the same socket for incoming and outgoing 
streams because we want to

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9d2b7ad/src/java/org/apache/cassandra/streaming/StreamSession.java
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[slebresne]

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/c2b47baf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2b47baf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2b47baf

Branch: refs/heads/cassandra-3.5
Commit: c2b47baf3fdae0750c3b66289b9e9b57d36e2381
Parents: 504760c 9b53d6a
Author: Sylvain Lebresne 
Authored: Tue Mar 8 17:21:59 2016 +0100
Committer: Sylvain Lebresne 
Committed: Tue Mar 8 17:21:59 2016 +0100

--
 CHANGES.txt  | 3 +++
 src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2b47baf/CHANGES.txt
--
diff --cc CHANGES.txt
index 5b92143,9d4779a..384e7ea
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -52,10 -24,13 +52,13 @@@ Merged from 2.2
   * (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)
 + * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124)
  Merged from 2.1:
+  * Avoid dropping message too quickly due to missing unit conversion 
(CASSANDRA-11302)
+  * COPY FROM on large datasets: fix progress report and debug performance 
(CASSANDRA-11053)
+  * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
   * Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
   * Only notify if repair status changed (CASSANDRA-11172)
 - * Add partition key to TombstoneOverwhelmingException error message 
(CASSANDRA-10888)
   * Use logback setting for 'cassandra -v' command (CASSANDRA-10767)
   * Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714)
   * Fix incorrect warning in 'nodetool status' (CASSANDRA-10176)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2b47baf/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[slebresne]

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/504760c4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/504760c4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/504760c4

Branch: refs/heads/cassandra-3.5
Commit: 504760c464998c6d2c1b1015bb885f7921959701
Parents: 49c616c 2971ff3
Author: Sylvain Lebresne 
Authored: Tue Mar 8 10:41:46 2016 +0100
Committer: Sylvain Lebresne 
Committed: Tue Mar 8 10:41:46 2016 +0100

--
 src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/504760c4/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/34b07a74
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34b07a74
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34b07a74

Branch: refs/heads/cassandra-3.5
Commit: 34b07a74fbde87d2a671ace8bf10d32057817f9a
Parents: 1543290 6e0395e
Author: Yuki Morishita 
Authored: Mon Mar 7 12:45:55 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Mar 7 12:45:55 2016 -0600

--
 CHANGES.txt |  2 ++
 .../tools/nodetool/TableHistograms.java | 10 --
 .../cassandra/utils/EstimatedHistogram.java | 20 
 3 files changed, 26 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/34b07a74/CHANGES.txt
--
diff --cc CHANGES.txt
index 4eef41f,89fa904..38bf2ee
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,11 +1,39 @@@
 -2.2.6
 +3.0.5
 + * 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:
+  * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
+  * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
 - * Fix filtering on non-primary key columns for thrift static column families
 -   (CASSANDRA-6377)
   * Only log yaml config once, at startup (CASSANDRA-11217)
 - * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
   * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 +Merged from 2.1:
 + * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
 +
 +
 +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:
 + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/34b07a74/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
--
diff --cc src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
index 23f1c43,207a74e..be3f799
--- a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java
@@@ -66,14 -66,12 +66,12 @@@ public class TableHistograms extends No
  }
  else
  {
- long[] partitionSizeBucketOffsets = new 
EstimatedHistogram(estimatedPartitionSize.length).getBucketOffsets();
- long[] columnCountBucketOffsets = new 
EstimatedHistogram(estimatedColumnCount.length).getBucketOffsets();
- EstimatedHistogram partitionSizeHist = new 
EstimatedHistogram(partitionSizeBucketOffsets, estimatedPartitionSize);
- EstimatedHistogram columnCountHist = new 
EstimatedHistogram(columnCountBucketOffsets, estimatedColumnCount);
 -EstimatedHistogram rowSizeHist = new 
EstimatedHistogram(estimatedRowSize);
++

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[slebresne]

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/b087b4c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b087b4c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b087b4c7

Branch: refs/heads/cassandra-3.3
Commit: b087b4c7d5c0fd4e024f1d970437de59d44cd0c8
Parents: bc3ea66 af2b858
Author: Sylvain Lebresne 
Authored: Tue Feb 2 14:59:41 2016 +0100
Committer: Sylvain Lebresne 
Committed: Tue Feb 2 14:59:41 2016 +0100

--
 CHANGES.txt |  1 +
 pylib/cqlshlib/copyutil.py  | 87 +---
 .../cassandra/transport/ServerConnection.java   |  4 +-
 3 files changed, 58 insertions(+), 34 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b087b4c7/src/java/org/apache/cassandra/transport/ServerConnection.java
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[marcuse]

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/682812d1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/682812d1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/682812d1

Branch: refs/heads/cassandra-3.3
Commit: 682812d1f831c45546b8bf5c4cd39c2b664c70c9
Parents: 414c1c5 c1ae9d0
Author: Marcus Eriksson 
Authored: Fri Jan 29 08:13:41 2016 +0100
Committer: Marcus Eriksson 
Committed: Fri Jan 29 08:13:41 2016 +0100

--

--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[slebresne]

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/13314aa2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13314aa2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13314aa2

Branch: refs/heads/cassandra-3.3
Commit: 13314aa2eb926ecba56221ad77b037fcc4d0bfe1
Parents: e07c7d0 0b479a7
Author: Sylvain Lebresne 
Authored: Fri Jan 22 15:44:16 2016 +0100
Committer: Sylvain Lebresne 
Committed: Fri Jan 22 15:44:16 2016 +0100

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/gms/Gossiper.java | 10 ++-
 .../org/apache/cassandra/gms/GossiperTest.java  | 93 
 3 files changed, 100 insertions(+), 4 deletions(-)
--


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

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

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/0b05203f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b05203f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b05203f

Branch: refs/heads/cassandra-3.3
Commit: 0b05203feaab296c6530469fdd128c24cc2c6a97
Parents: d2b7051 3b244a3
Author: Yuki Morishita 
Authored: Fri Jan 22 11:43:35 2016 -0600
Committer: Yuki Morishita 
Committed: Fri Jan 22 11:43:35 2016 -0600

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b05203f/src/java/org/apache/cassandra/service/StorageService.java
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[marcuse]

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/5006e1c8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5006e1c8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5006e1c8

Branch: refs/heads/cassandra-3.3
Commit: 5006e1c810bb4ada0b795227465733dae1ec8087
Parents: 2e19d98 968b134
Author: Marcus Eriksson 
Authored: Thu Jan 21 09:12:03 2016 +0100
Committer: Marcus Eriksson 
Committed: Thu Jan 21 09:12:03 2016 +0100

--
 CHANGES.txt | 1 +
 .../org/apache/cassandra/service/ActiveRepairService.java   | 9 -
 2 files changed, 5 insertions(+), 5 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5006e1c8/src/java/org/apache/cassandra/service/ActiveRepairService.java
--
diff --cc src/java/org/apache/cassandra/service/ActiveRepairService.java
index 4722156,9ac1186..46d1e2c
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@@ -426,14 -428,17 +426,17 @@@ public class ActiveRepairServic
  public final boolean isIncremental;
  private final boolean isGlobal;
  
 -public ParentRepairSession(List 
columnFamilyStores, Collection ranges, boolean isIncremental, 
boolean isGlobal, long repairedAt)
 +public ParentRepairSession(List 
columnFamilyStores, Collection ranges, boolean isIncremental, 
long repairedAt, boolean isGlobal)
  {
  for (ColumnFamilyStore cfs : columnFamilyStores)
+ {
  this.columnFamilyStores.put(cfs.metadata.cfId, cfs);
+ sstableMap.put(cfs.metadata.cfId, new 
HashSet());
+ }
  this.ranges = ranges;
  this.repairedAt = repairedAt;
 -this.isGlobal = isGlobal;
  this.isIncremental = isIncremental;
 +this.isGlobal = isGlobal;
  }
  
  public void addSSTables(UUID cfId, Set sstables)

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[marcuse]

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/85176356
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85176356
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85176356

Branch: refs/heads/cassandra-3.3
Commit: 85176356673b76f2364dee9be40fd4a87802f856
Parents: 2445ea7 476b68a
Author: Marcus Eriksson 
Authored: Tue Jan 19 09:05:56 2016 +0100
Committer: Marcus Eriksson 
Committed: Tue Jan 19 09:05:56 2016 +0100

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/85176356/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/6cd3bef6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6cd3bef6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6cd3bef6

Branch: refs/heads/cassandra-3.3
Commit: 6cd3bef6196c364d6b71aa54dd181a764eeff725
Parents: a029976 1b59357
Author: Yuki Morishita 
Authored: Fri Jan 15 12:10:29 2016 -0600
Committer: Yuki Morishita 
Committed: Fri Jan 15 12:10:29 2016 -0600

--

--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/162edc26
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/162edc26
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/162edc26

Branch: refs/heads/cassandra-3.3
Commit: 162edc26eba31607ccacf430460139f3e48ae6d8
Parents: 06960d7 97474ee
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 15:49:49 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 15:49:49 2016 +

--

--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[samt]

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/eca74ad2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eca74ad2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eca74ad2

Branch: refs/heads/cassandra-3.3
Commit: eca74ad240b13ad2d051a9a1ca42162afdaf3bea
Parents: 9c1679d e8bd8a4
Author: Sam Tunnicliffe 
Authored: Fri Jan 8 16:07:26 2016 +
Committer: Sam Tunnicliffe 
Committed: Fri Jan 8 16:07:26 2016 +

--
 CHANGES.txt|  1 +
 src/java/org/apache/cassandra/gms/Gossiper.java| 13 ++---
 .../apache/cassandra/net/IncomingTcpConnection.java|  2 ++
 .../apache/cassandra/net/OutboundTcpConnection.java|  2 ++
 4 files changed, 15 insertions(+), 3 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eca74ad2/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/e00e32eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e00e32eb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e00e32eb

Branch: refs/heads/cassandra-3.1
Commit: e00e32ebb02aa892e53942153831feae5c3e98bb
Parents: bb6973a 9751eb5
Author: Yuki Morishita 
Authored: Wed Dec 2 08:53:09 2015 -0600
Committer: Yuki Morishita 
Committed: Wed Dec 2 08:53:09 2015 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/repair/AnticompactionTask.java| 23 ++--
 .../cassandra/service/ActiveRepairService.java  | 15 ++---
 3 files changed, 29 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e00e32eb/CHANGES.txt
--
diff --cc CHANGES.txt
index 1b7f3a2,787d145..d5a8dea
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -25,7 -8,18 +25,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)
 - * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large 
buffers (CASSANDRA-10592)
  Merged from 2.1:
+  * Fix incremental repair hang when replica is down (CASSANDRA-10288)
 - * Avoid writing range tombstones after END_OF_ROW marker (CASSANDRA-10791)
   * Optimize the way we check if a token is repaired in anticompaction 
(CASSANDRA-10768)
   * Add proper error handling to stream receiver (CASSANDRA-10774)
   * Warn or fail when changing cluster topology live (CASSANDRA-10243)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e00e32eb/src/java/org/apache/cassandra/service/ActiveRepairService.java
--
diff --cc src/java/org/apache/cassandra/service/ActiveRepairService.java
index f9de140,61f4196..4722156
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@@ -268,9 -267,21 +268,18 @@@ public class ActiveRepairServic
  
  for (InetAddress neighbour : endpoints)
  {
- PrepareMessage message = new PrepareMessage(parentRepairSession, 
cfIds, options.getRanges(), options.isIncremental(), timestamp, 
options.isGlobal());
- MessageOut msg = message.createMessage();
- MessagingService.instance().sendRR(msg, neighbour, callback, 
TimeUnit.HOURS.toMillis(1), true);
+ if (FailureDetector.instance.isAlive(neighbour))
+ {
 -CassandraVersion peerVersion = 
SystemKeyspace.getReleaseVersion(neighbour);
 -boolean isGlobal = options.isGlobal() && peerVersion != null 
&& peerVersion.compareTo(SUPPORTS_GLOBAL_PREPARE_FLAG_VERSION) >= 0;
 -logger.debug("Sending prepare message: options.isGlobal = {}, 
peerVersion = {}", options.isGlobal(), peerVersion);
 -PrepareMessage message = new 
PrepareMessage(parentRepairSession, cfIds, options.getRanges(), 
options.isIncremental(), isGlobal);
++PrepareMessage message = new 
PrepareMessage(parentRepairSession, cfIds, options.getRanges(), 
options.isIncremental(), timestamp, options.isGlobal());
+ MessageOut msg = message.createMessage();
+ MessagingService.instance().sendRR(msg, neighbour, callback, 
TimeUnit.HOURS.toMillis(1), true);
+ }
+ else
+ {
+ status.set(false);
+ failedNodes.add(neighbour.getHostAddress());
+ prepareLatch.countDown();
+ }
  }
  try
  {

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[samt]

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/b950c380
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b950c380
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b950c380

Branch: refs/heads/cassandra-3.1
Commit: b950c3801c00ae60a642b6d6f804145714ca63ec
Parents: bcdbb0e 29ed6fe
Author: Sam Tunnicliffe 
Authored: Wed Dec 2 13:17:37 2015 +
Committer: Sam Tunnicliffe 
Committed: Wed Dec 2 13:17:37 2015 +

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 21 +++-
 .../cassandra/locator/PropertyFileSnitch.java   |  7 ++-
 .../cassandra/service/MigrationManager.java |  4 ++--
 .../apache/cassandra/service/StorageProxy.java  |  8 
 .../cassandra/service/StorageService.java   | 12 +--
 5 files changed, 30 insertions(+), 22 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b950c380/src/java/org/apache/cassandra/service/MigrationManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b950c380/src/java/org/apache/cassandra/service/StorageProxy.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b950c380/src/java/org/apache/cassandra/service/StorageService.java
--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/ccb20ad4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ccb20ad4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ccb20ad4

Branch: refs/heads/cassandra-3.1
Commit: ccb20ad46ab38961aac39cc8634f450046bdf16b
Parents: 803a3d9 2491ede
Author: Yuki Morishita 
Authored: Tue Dec 1 13:07:39 2015 -0600
Committer: Yuki Morishita 
Committed: Tue Dec 1 13:07:39 2015 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/streaming/StreamReceiveTask.java  | 60 ++--
 2 files changed, 31 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccb20ad4/CHANGES.txt
--
diff --cc CHANGES.txt
index 7fffbbf,7541212..a01011b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -23,7 -8,16 +23,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:
+  * Add proper error handling to stream receiver (CASSANDRA-10774)
   * Warn or fail when changing cluster topology live (CASSANDRA-10243)
   * Status command in debian/ubuntu init script doesn't work (CASSANDRA-10213)
   * Some DROP ... IF EXISTS incorrectly result in exceptions on non-existing 
KS (CASSANDRA-10658)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccb20ad4/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
--
diff --cc src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
index 54ce711,dd56b8b..dfc91f9
--- a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
@@@ -126,110 -113,73 +126,110 @@@ public class StreamReceiveTask extends 
  
  public void run()
  {
- Pair kscf = Schema.instance.getCF(task.cfId);
- if (kscf == null)
- {
- // schema was dropped during streaming
- task.sstables.forEach(SSTableMultiWriter::abortOrDie);
- 
- task.sstables.clear();
- task.txn.abort();
- return;
- }
- ColumnFamilyStore cfs = 
Keyspace.open(kscf.left).getColumnFamilyStore(kscf.right);
- boolean hasViews = !Iterables.isEmpty(View.findAll(kscf.left, 
kscf.right));
- 
++boolean hasViews = false;
++ColumnFamilyStore cfs = null;
  try
  {
+ Pair kscf = Schema.instance.getCF(task.cfId);
+ if (kscf == null)
+ {
+ // schema was dropped during streaming
 -for (SSTableWriter writer : task.sstables)
 -writer.abort();
++task.sstables.forEach(SSTableMultiWriter::abortOrDie);
+ task.sstables.clear();
++task.txn.abort();
+ task.session.taskCompleted(task);
+ return;
+ }
 -ColumnFamilyStore cfs = 
Keyspace.open(kscf.left).getColumnFamilyStore(kscf.right);
++cfs = 
Keyspace.open(kscf.left).getColumnFamilyStore(kscf.right);
++hasViews = !Iterables.isEmpty(View.findAll(kscf.left, 
kscf.right));
+ 
 -File lockfiledir = 
cfs.directories.getWriteableLocationAsFile(task.sstables.size() * 256L);
 -if (lockfiledir == null)
 -throw new IOError(new IOException("All disks full"));
 -StreamLockfile lockfile = new StreamLockfile(lockfiledir, 
UUID.randomUUID());
 -lockfile.create(task.sstables);
  List readers = new ArrayList<>();
 -for (SSTableWriter writer : task.sstables)
 -readers.add(writer.finish(true));
 -lockfile.delete();
 +for (SSTableMultiWriter writer : task.sstables)
 + 

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[samt]

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/602f736e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/602f736e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/602f736e

Branch: refs/heads/cassandra-3.1
Commit: 602f736e2b1585c2bc223ef524fbc7c415b3c6e4
Parents: ae315b5 a907533
Author: Sam Tunnicliffe 
Authored: Wed Nov 25 10:05:02 2015 +
Committer: Sam Tunnicliffe 
Committed: Wed Nov 25 10:05:02 2015 +

--

--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/0b3cfae4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b3cfae4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b3cfae4

Branch: refs/heads/cassandra-3.1
Commit: 0b3cfae4e619d1ece5ff8afc774eeb52b93166d8
Parents: 9fe790d 056055f
Author: Yuki Morishita 
Authored: Mon Nov 23 13:58:58 2015 -0600
Committer: Yuki Morishita 
Committed: Mon Nov 23 13:58:58 2015 -0600

--
 CHANGES.txt |  1 +
 .../compress/CompressedInputStream.java | 46 --
 .../compress/CompressedStreamReader.java|  4 +
 .../compression/CompressedInputStreamTest.java  | 88 
 4 files changed, 114 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b3cfae4/CHANGES.txt
--
diff --cc CHANGES.txt
index 4182cc1,d11be26..608d8f8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -11,7 -3,16 +11,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:
+  * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
   * (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
   * Try next replica if not possible to connect to primary replica on
 ColumnFamilyRecordReader (CASSANDRA-2388)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b3cfae4/src/java/org/apache/cassandra/streaming/compress/CompressedInputStream.java
--
diff --cc 
src/java/org/apache/cassandra/streaming/compress/CompressedInputStream.java
index ccd0ac5,daa339a..56dc63a
--- 
a/src/java/org/apache/cassandra/streaming/compress/CompressedInputStream.java
+++ 
b/src/java/org/apache/cassandra/streaming/compress/CompressedInputStream.java
@@@ -42,10 -41,9 +42,10 @@@ public class CompressedInputStream exte
  private final CompressionInfo info;
  // chunk buffer
  private final BlockingQueue dataBuffer;
 +private final Supplier crcCheckChanceSupplier;
  
  // uncompressed bytes
- private byte[] buffer;
+ private final byte[] buffer;
  
  // offset from the beginning of the buffer
  protected long bufferOffset = 0;
@@@ -67,16 -67,16 +69,17 @@@
   * @param source Input source to read compressed data from
   * @param info Compression info
   */
 -public CompressedInputStream(InputStream source, CompressionInfo info)
 +public CompressedInputStream(InputStream source, CompressionInfo info, 
ChecksumType checksumType, Supplier crcCheckChanceSupplier)
  {
  this.info = info;
 -this.checksum =  new Adler32();
 +this.checksum =  checksumType.newInstance();
  this.buffer = new byte[info.parameters.chunkLength()];
  // buffer is limited to store up to 1024 chunks
- this.dataBuffer = new 
ArrayBlockingQueue(Math.min(info.chunks.length, 1024));
+ this.dataBuffer = new 
ArrayBlockingQueue<>(Math.min(info.chunks.length, 1024));
 +this.crcCheckChanceSupplier = crcCheckChanceSupplier;
  
- new Thread(new Reader(source, info, dataBuffer)).start();
+ readerThread = new Thread(new Reader(source, info, dataBuffer));
+ readerThread.start();
  }
  
  public int read() throws IOException

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b3cfae4/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b3cfae4/test/unit/org/apache/cassandra/streaming/compression/CompressedInputStreamTest.java
--
diff --cc 
test/unit/org/apache/cassandra/streaming/compression/CompressedInputStreamTest.java
index 5646592,000..2162e32
mode 100644,00..100644
--- 

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/5cc02dd9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cc02dd9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cc02dd9

Branch: refs/heads/cassandra-3.1
Commit: 5cc02dd9ac4e9f081540586769e82e1544532e1e
Parents: 63a9f9b ae64cc0
Author: Yuki Morishita 
Authored: Tue Nov 17 19:31:38 2015 -0600
Committer: Yuki Morishita 
Committed: Tue Nov 17 19:31:38 2015 -0600

--
 CHANGES.txt |  1 +
 .../io/compress/CompressionMetadata.java| 30 +++
 .../streaming/messages/FileMessageHeader.java   | 55 ++--
 .../streaming/messages/IncomingFileMessage.java |  2 +-
 .../streaming/messages/OutgoingFileMessage.java | 14 ++---
 .../compression/CompressedInputStreamTest.java  |  7 +++
 6 files changed, 93 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc02dd9/CHANGES.txt
--
diff --cc CHANGES.txt
index b68cf0d,572afc2..4510462
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,7 -3,17 +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:
+  * Create compression chunk for sending file only (CASSANDRA-10680)
 - * Make buffered read size configurable (CASSANDRA-10249)
   * Forbid compact clustering column type changes in ALTER TABLE 
(CASSANDRA-8879)
   * Reject incremental repair with subrange repair (CASSANDRA-10422)
   * Add a nodetool command to refresh size_estimates (CASSANDRA-9579)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc02dd9/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc02dd9/src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java
--
diff --cc 
src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java
index 123b983,e9a727f..e1e13b7
--- a/src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java
+++ b/src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java
@@@ -52,10 -49,15 +52,16 @@@ public class FileMessageHeade
  public final SSTableFormat.Type format;
  public final long estimatedKeys;
  public final List> sections;
+ /**
+  * Compression info for SSTable to send. Can be null if SSTable is not 
compressed.
+  * On sender, this field is always null to avoid holding large number of 
Chunks.
+  * Use compressionMetadata instead.
+  */
  public final CompressionInfo compressionInfo;
+ private final CompressionMetadata compressionMetadata;
  public final long repairedAt;
  public final int sstableLevel;
 +public final SerializationHeader.Component header;
  
  public FileMessageHeader(UUID cfId,
   int sequenceNumber,
@@@ -75,11 -76,38 +81,41 @@@
  this.estimatedKeys = estimatedKeys;
  this.sections = sections;
  this.compressionInfo = compressionInfo;
+ this.compressionMetadata = null;
+ this.repairedAt = repairedAt;
+ this.sstableLevel = sstableLevel;
++this.header = header;
+ }
+ 
+ public FileMessageHeader(UUID cfId,
+  int sequenceNumber,
 - String version,
++ Version version,
+  SSTableFormat.Type format,
+  long estimatedKeys,
+  List> sections,
+  CompressionMetadata compressionMetadata,
+  long repairedAt,
 - int sstableLevel)
++ int sstableLevel,
++ SerializationHeader.Component header)
+ {
+ this.cfId = 

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jmckenzie]

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/79bf03d4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79bf03d4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/79bf03d4

Branch: refs/heads/cassandra-3.1
Commit: 79bf03d4e3af93b8bef5b2acceedd3da05203fcb
Parents: 464f8f0 bfbcca1
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:17:51 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:17:51 2015 -0500

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


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

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/b54836b1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b54836b1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b54836b1

Branch: refs/heads/cassandra-3.1
Commit: b54836b120a0acc5d820f3465a7354eea73d9290
Parents: 0de23f2 d84b42b
Author: Yuki Morishita 
Authored: Thu Nov 12 09:44:59 2015 -0600
Committer: Yuki Morishita 
Committed: Thu Nov 12 09:44:59 2015 -0600

--
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b54836b1/CHANGES.txt
--
diff --cc CHANGES.txt
index 02dc249,2cfcb55..8f1b163
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -51,7 -6,15 +51,8 @@@ Merged from 2.2
   * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
   * Expose phi values from failure detector via JMX and tweak debug
 and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * Shutdown compaction in drain to prevent leak (CASSANDRA-10079)
 - * Invalidate cache after stream receive task is completed (CASSANDRA-10341)
 - * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258)
 - * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)
 - * Improve json2sstable error reporting on nonexistent columns 
(CASSANDRA-10401)
   * (cqlsh) fix COPY using wrong variable name for time_format 
(CASSANDRA-10633)
   * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/0de23f20
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0de23f20
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0de23f20

Branch: refs/heads/cassandra-3.1
Commit: 0de23f20ae4bd95f040017e2db653c6c1b5eabe9
Parents: 9a90e98 e487553
Author: Yuki Morishita 
Authored: Wed Nov 11 16:16:23 2015 -0600
Committer: Yuki Morishita 
Committed: Wed Nov 11 16:16:23 2015 -0600

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 34 +++
 .../db/compaction/CompactionController.java |  5 --
 src/java/org/apache/cassandra/dht/Bounds.java   | 62 
 .../cassandra/streaming/StreamReader.java   | 12 ++--
 .../cassandra/streaming/StreamReceiveTask.java  | 37 +++-
 .../compress/CompressedStreamReader.java|  2 +-
 .../apache/cassandra/db/CounterCacheTest.java   | 48 +++
 .../org/apache/cassandra/db/RowCacheTest.java   | 50 
 .../org/apache/cassandra/dht/BoundsTest.java| 61 +++
 10 files changed, 298 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0de23f20/CHANGES.txt
--
diff --cc CHANGES.txt
index d271c95,0fcf037..02dc249
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,6 +1,51 @@@
 -2.2.4
 +3.0.1
 + * Keep the file open in trySkipCache (CASSANDRA-10669)
 + * Updated trigger example (CASSANDRA-10257)
 +Merged from 2.2:
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 +Merged from 2.1:
++ * Invalidate cache after stream receive task is completed (CASSANDRA-10341)
 + * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258)
 + * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)
 +
 +
 +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 trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
   * Use most up-to-date version of schema for