[cassandra] branch trunk updated (26a134a -> ba6821b)

[jzhuang]

This is an automated email from the ASF dual-hosted git repository.

jzhuang pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


from 26a134a  Merge branch 'cassandra-3.11' into trunk
 add 3f70e7c  Avoid updating unchanged gossip states
 add 71cb061  Merge branch 'cassandra-3.0' into cassandra-3.11
 new ba6821b  Merge branch 'cassandra-3.11' into trunk

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.txt|   1 +
 src/java/org/apache/cassandra/gms/Gossiper.java|  51 ++---
 .../org/apache/cassandra/gms/GossiperTest.java | 123 ++---
 3 files changed, 140 insertions(+), 35 deletions(-)


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

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[jzhuang]

This is an automated email from the ASF dual-hosted git repository.

jzhuang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit ba6821be4f952781d573cd6ed705250de6aeb5f7
Merge: 26a134a 71cb061
Author: Jay Zhuang 
AuthorDate: Thu Jul 18 21:25:55 2019 -0700

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|   1 +
 src/java/org/apache/cassandra/gms/Gossiper.java|  51 ++---
 .../org/apache/cassandra/gms/GossiperTest.java | 123 ++---
 3 files changed, 140 insertions(+), 35 deletions(-)

diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index a6c9be7,6a862e5..062abe0
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -22,14 -24,10 +22,15 @@@ import java.util.*
  import java.util.Map.Entry;
  import java.util.concurrent.*;
  import java.util.concurrent.locks.ReentrantLock;
 +import java.util.function.BooleanSupplier;
 +import java.util.function.Supplier;
 +import java.util.stream.Collectors;
 +
  import javax.annotation.Nullable;
+ import java.util.stream.Collectors;
  
  import com.google.common.annotations.VisibleForTesting;
 +import com.google.common.base.Suppliers;
  import com.google.common.base.Throwables;
  import com.google.common.collect.ImmutableList;
  import com.google.common.collect.ImmutableMap;
@@@ -1377,25 -1289,24 +1378,41 @@@ public class Gossiper implements IFailu
  
  Set> remoteStates = 
remoteState.states();
  assert remoteState.getHeartBeatState().getGeneration() == 
localState.getHeartBeatState().getGeneration();
- localState.addApplicationStates(remoteStates);
- 
- //Filter out pre-4.0 versions of data for more complete 4.0 versions
- Set> filtered = 
remoteStates.stream().filter(entry -> {
-switch (entry.getKey())
-{
-case INTERNAL_IP:
- return 
remoteState.getApplicationState(ApplicationState.INTERNAL_ADDRESS_AND_PORT) == 
null;
-case STATUS:
-return 
remoteState.getApplicationState(ApplicationState.STATUS_WITH_PORT) == null;
-case RPC_ADDRESS:
-return 
remoteState.getApplicationState(ApplicationState.NATIVE_ADDRESS_AND_PORT) == 
null;
-default:
-return true;
-}
+ 
 -// filter out the states that are already up to date (has the same or 
higher version)
++
+ Set> updatedStates = 
remoteStates.stream().filter(entry -> {
++// Filter out pre-4.0 versions of data for more complete 4.0 
versions
++switch (entry.getKey())
++{
++case INTERNAL_IP:
++if 
(remoteState.getApplicationState(ApplicationState.INTERNAL_ADDRESS_AND_PORT) != 
null) return false;
++break;
++case STATUS:
++if 
(remoteState.getApplicationState(ApplicationState.STATUS_WITH_PORT) != null) 
return false;
++break;
++case RPC_ADDRESS:
++if 
(remoteState.getApplicationState(ApplicationState.NATIVE_ADDRESS_AND_PORT) != 
null) return false;
++break;
++default:
++break;
++}
++
++// filter out the states that are already up to date (has the 
same or higher version)
+ VersionedValue local = 
localState.getApplicationState(entry.getKey());
+ return (local == null || local.version < 
entry.getValue().version);
 -}).collect(Collectors.toSet());
 +}).collect(Collectors.toSet());
  
- for (Entry remoteEntry : filtered)
- doOnChangeNotifications(addr, remoteEntry.getKey(), 
remoteEntry.getValue());
+ if (logger.isTraceEnabled() && updatedStates.size() > 0)
+ {
+ for (Entry entry : 
updatedStates)
+ {
+ logger.trace("Updating {} state version to {} for {}", 
entry.getKey().toString(), entry.getValue().version, addr);
+ }
+ }
+ localState.addApplicationStates(updatedStates);
+ 
+ for (Entry updatedEntry : 
updatedStates)
+ doOnChangeNotifications(addr, updatedEntry.getKey(), 
updatedEntry.getValue());
  }
  
  // notify that a local application state is going to change (doesn't get 
triggered for remote changes)
diff --cc test/unit/org/apache/cassandra/gms/GossiperTest.java
index 9c25b86,b6b3ffb..97c577c
--- a/test/unit/org/apache/cassandra/gms/GossiperTest.java
+++ b/test/unit/org/apache/cassandra/gms/GossiperTest.java
@@@ -114,158 -74,171 +115,244 @@@ public class GossiperTes
  }
  
  @Test
 -public void testLargeGenerationJump() throws UnknownHostException
 +public void testLargeGenerationJump() throws Unkn

[cassandra] branch cassandra-3.0 updated: Avoid updating unchanged gossip states

[jzhuang]

This is an automated email from the ASF dual-hosted git repository.

jzhuang pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/cassandra-3.0 by this push:
 new 3f70e7c  Avoid updating unchanged gossip states
3f70e7c is described below

commit 3f70e7c72c703bc323b169a28e8754ce67d4e479
Author: Jay Zhuang 
AuthorDate: Thu Apr 18 14:59:39 2019 -0700

Avoid updating unchanged gossip states

patch by Jay Zhuang; reviewed by Sam Tunnicliffe for CASSANDRA-15097
---
 CHANGES.txt|   1 +
 src/java/org/apache/cassandra/gms/Gossiper.java|  21 +++-
 .../org/apache/cassandra/gms/GossiperTest.java | 128 +
 3 files changed, 124 insertions(+), 26 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e0494f5..f04b489 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.19
+ * Avoid updating unchanged gossip states (CASSANDRA-15097)
  * Prevent recreation of previously dropped columns with a different kind 
(CASSANDRA-14948)
  * Prevent client requests from blocking on executor task queue 
(CASSANDRA-15013)
  * Toughen up column drop/recreate type validations (CASSANDRA-15204)
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java 
b/src/java/org/apache/cassandra/gms/Gossiper.java
index 4ea0a4a..c39f45a 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -23,6 +23,7 @@ import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.*;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
@@ -1252,10 +1253,24 @@ public class Gossiper implements 
IFailureDetectionEventListener, GossiperMBean
 
 Set> remoteStates = 
remoteState.states();
 assert remoteState.getHeartBeatState().getGeneration() == 
localState.getHeartBeatState().getGeneration();
-localState.addApplicationStates(remoteStates);
 
-for (Entry remoteEntry : 
remoteStates)
-doOnChangeNotifications(addr, remoteEntry.getKey(), 
remoteEntry.getValue());
+// filter out the states that are already up to date (has the same or 
higher version)
+Set> updatedStates = 
remoteStates.stream().filter(entry -> {
+VersionedValue local = 
localState.getApplicationState(entry.getKey());
+return (local == null || local.version < entry.getValue().version);
+}).collect(Collectors.toSet());
+
+if (logger.isTraceEnabled() && updatedStates.size() > 0)
+{
+for (Entry entry : updatedStates)
+{
+logger.trace("Updating {} state version to {} for {}", 
entry.getKey().toString(), entry.getValue().version, addr);
+}
+}
+localState.addApplicationStates(updatedStates);
+
+for (Entry updatedEntry : 
updatedStates)
+doOnChangeNotifications(addr, updatedEntry.getKey(), 
updatedEntry.getValue());
 }
 
 // notify that a local application state is going to change (doesn't get 
triggered for remote changes)
diff --git a/test/unit/org/apache/cassandra/gms/GossiperTest.java 
b/test/unit/org/apache/cassandra/gms/GossiperTest.java
index f23c016..42e4483 100644
--- a/test/unit/org/apache/cassandra/gms/GossiperTest.java
+++ b/test/unit/org/apache/cassandra/gms/GossiperTest.java
@@ -21,23 +21,19 @@ package org.apache.cassandra.gms;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
 import com.google.common.collect.ImmutableMap;
-import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
-import org.apache.cassandra.SchemaLoader;
 import org.apache.cassandra.Util;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.dht.RandomPartitioner;
 import org.apache.cassandra.dht.Token;
-import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.locator.TokenMetadata;
 import org.apache.cassandra.service.StorageService;
 
@@ -68,32 +64,118 @@ public class GossiperTest
 public void testLargeGenerationJump() throws UnknownHostException, 
InterruptedException
 {
 Util.createInitialRing(ss, partitioner, endpointTokens, keyTokens, 
hosts, hostIds, 2);
-InetAddress remoteHostAddress = hosts.get(1);
+try
+{
+InetAddress remoteHostAddress = hosts.get(1);
 
-EndpointState initialRemoteState = 
Gossiper.instance.getEndpointStateForEndpoint(remoteHostAddress);
-Hear

[cassandra] branch cassandra-3.11 updated (670dde9 -> 71cb061)

[jzhuang]

This is an automated email from the ASF dual-hosted git repository.

jzhuang pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


from 670dde9  Merge branch 'cassandra-3.0' into cassandra-3.11
 add 3f70e7c  Avoid updating unchanged gossip states
 new 71cb061  Merge branch 'cassandra-3.0' into cassandra-3.11

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.txt|   1 +
 src/java/org/apache/cassandra/gms/Gossiper.java|  21 +++-
 .../org/apache/cassandra/gms/GossiperTest.java | 123 ++---
 3 files changed, 124 insertions(+), 21 deletions(-)


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

[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11

[jzhuang]

This is an automated email from the ASF dual-hosted git repository.

jzhuang pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 71cb0616b7710366a8cd364348c864d656dc5542
Merge: 670dde9 3f70e7c
Author: Jay Zhuang 
AuthorDate: Thu Jul 18 21:23:17 2019 -0700

Merge branch 'cassandra-3.0' into cassandra-3.11

 CHANGES.txt|   1 +
 src/java/org/apache/cassandra/gms/Gossiper.java|  21 +++-
 .../org/apache/cassandra/gms/GossiperTest.java | 123 ++---
 3 files changed, 124 insertions(+), 21 deletions(-)

diff --cc CHANGES.txt
index f055068,f04b489..0233c0f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 -3.0.19
 +3.11.5
 + * Fix cassandra-env.sh to use $CASSANDRA_CONF to find cassandra-jaas.config 
(CASSANDRA-14305)
 + * Fixed nodetool cfstats printing index name twice (CASSANDRA-14903)
 + * Add flag to disable SASI indexes, and warnings on creation 
(CASSANDRA-14866)
 +Merged from 3.0:
+  * Avoid updating unchanged gossip states (CASSANDRA-15097)
   * Prevent recreation of previously dropped columns with a different kind 
(CASSANDRA-14948)
   * Prevent client requests from blocking on executor task queue 
(CASSANDRA-15013)
   * Toughen up column drop/recreate type validations (CASSANDRA-15204)
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index 5d2e997,c39f45a..6a862e5
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -24,7 -23,7 +24,8 @@@ import java.util.*
  import java.util.Map.Entry;
  import java.util.concurrent.*;
  import java.util.concurrent.locks.ReentrantLock;
 +import javax.annotation.Nullable;
+ import java.util.stream.Collectors;
  
  import com.google.common.annotations.VisibleForTesting;
  import com.google.common.base.Throwables;
@@@ -1288,12 -1253,26 +1289,26 @@@ public class Gossiper implements IFailu
  
  Set> remoteStates = 
remoteState.states();
  assert remoteState.getHeartBeatState().getGeneration() == 
localState.getHeartBeatState().getGeneration();
- localState.addApplicationStates(remoteStates);
  
- for (Entry remoteEntry : 
remoteStates)
- doOnChangeNotifications(addr, remoteEntry.getKey(), 
remoteEntry.getValue());
+ // filter out the states that are already up to date (has the same or 
higher version)
+ Set> updatedStates = 
remoteStates.stream().filter(entry -> {
+ VersionedValue local = 
localState.getApplicationState(entry.getKey());
+ return (local == null || local.version < 
entry.getValue().version);
+ }).collect(Collectors.toSet());
+ 
+ if (logger.isTraceEnabled() && updatedStates.size() > 0)
+ {
+ for (Entry entry : 
updatedStates)
+ {
+ logger.trace("Updating {} state version to {} for {}", 
entry.getKey().toString(), entry.getValue().version, addr);
+ }
+ }
+ localState.addApplicationStates(updatedStates);
+ 
+ for (Entry updatedEntry : 
updatedStates)
+ doOnChangeNotifications(addr, updatedEntry.getKey(), 
updatedEntry.getValue());
  }
 -
 +
  // notify that a local application state is going to change (doesn't get 
triggered for remote changes)
  private void doBeforeChangeNotifications(InetAddress addr, EndpointState 
epState, ApplicationState apState, VersionedValue newValue)
  {
diff --cc test/unit/org/apache/cassandra/gms/GossiperTest.java
index 448620a,42e4483..b6b3ffb
--- a/test/unit/org/apache/cassandra/gms/GossiperTest.java
+++ b/test/unit/org/apache/cassandra/gms/GossiperTest.java
@@@ -70,88 -58,124 +71,174 @@@ public class GossiperTes
  public void setup()
  {
  tmd.clearUnsafe();
 -};
 +}
  
  @Test
 -public void testLargeGenerationJump() throws UnknownHostException, 
InterruptedException
 +public void testLargeGenerationJump() throws UnknownHostException
  {
  Util.createInitialRing(ss, partitioner, endpointTokens, keyTokens, 
hosts, hostIds, 2);
- InetAddress remoteHostAddress = hosts.get(1);
+ try
+ {
+ InetAddress remoteHostAddress = hosts.get(1);
  
- EndpointState initialRemoteState = 
Gossiper.instance.getEndpointStateForEndpoint(remoteHostAddress);
- HeartBeatState initialRemoteHeartBeat = 
initialRemoteState.getHeartBeatState();
+ EndpointState initialRemoteState = 
Gossiper.instance.getEndpointStateForEndpoint(remoteHostAddress);
+ HeartBeatState initialRemoteHeartBeat = 
initialRemoteState.getHeartBeatState();
  
- //Util.createInitialRing should have initialized remoteHost's 
HeartBeatState's generation to 1
- assertEquals(initialRemoteHeartBeat.getGeneration(), 1);
+ //Util.createInitialRing should have initialized remoteHost's 

[cassandra-dtest] branch master updated: Check nativetransport while bootstrap not complete

[jzhuang]

This is an automated email from the ASF dual-hosted git repository.

jzhuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git


The following commit(s) were added to refs/heads/master by this push:
 new e6f58cb  Check nativetransport while bootstrap not complete
e6f58cb is described below

commit e6f58cb33f7a09f273c5990d5d21c7b529ba80bf
Author: jaydeepkumar1984 
AuthorDate: Sun Jun 17 22:01:46 2018 -0700

Check nativetransport while bootstrap not complete

patch by Jaydeepkumar Chovatia; reviewed by Jay Zhuang for CASSANDRA-14526
---
 bootstrap_test.py | 103 +-
 byteman/pre4.0/stream_failure.btm |   2 +-
 secondary_indexes_test.py |   5 +-
 tools/assertions.py   |   6 ++-
 4 files changed, 98 insertions(+), 18 deletions(-)

diff --git a/bootstrap_test.py b/bootstrap_test.py
index 6e7682f..e33749e 100644
--- a/bootstrap_test.py
+++ b/bootstrap_test.py
@@ -10,7 +10,8 @@ import signal
 
 from cassandra import ConsistencyLevel
 from cassandra.concurrent import execute_concurrent_with_args
-from ccmlib.node import NodeError
+from ccmlib.node import NodeError, TimeoutError, ToolError
+from ccmlib.node import TimeoutError
 
 import pytest
 
@@ -20,12 +21,14 @@ from tools.assertions import (assert_almost_equal, 
assert_bootstrap_state, asser
 from tools.data import query_c1c2
 from tools.intervention import InterruptBootstrap, KillOnBootstrap
 from tools.misc import new_node
-from tools.misc import generate_ssl_stores, retry_till_success
+from tools.misc import generate_ssl_stores
 
 since = pytest.mark.since
 logger = logging.getLogger(__name__)
 
 class TestBootstrap(Tester):
+byteman_submit_path_pre_4_0 = './byteman/pre4.0/stream_failure.btm'
+byteman_submit_path_4_0 = './byteman/4.0/stream_failure.btm'
 
 @pytest.fixture(autouse=True)
 def fixture_add_additional_log_patterns(self, fixture_dtest_setup):
@@ -308,26 +311,22 @@ class TestBootstrap(Tester):
 cluster.start(wait_other_notice=True)
 # kill stream to node3 in the middle of streaming to let it fail
 if cluster.version() < '4.0':
-node1.byteman_submit(['./byteman/pre4.0/stream_failure.btm'])
+node1.byteman_submit([self.byteman_submit_path_pre_4_0])
 else:
-node1.byteman_submit(['./byteman/4.0/stream_failure.btm'])
+node1.byteman_submit([self.byteman_submit_path_4_0])
 node1.stress(['write', 'n=1K', 'no-warmup', 'cl=TWO', '-schema', 
'replication(factor=2)', '-rate', 'threads=50'])
 cluster.flush()
 
 # start bootstrapping node3 and wait for streaming
 node3 = new_node(cluster)
-node3.start(wait_other_notice=False, wait_for_binary_proto=True)
+node3.start(wait_other_notice=False)
 
-# wait for node3 ready to query
-node3.watch_log_for("Starting listening for CQL clients")
-mark = node3.mark_log()
-# check if node3 is still in bootstrap mode
-retry_till_success(assert_bootstrap_state, tester=self, node=node3, 
expected_bootstrap_state='IN_PROGRESS', timeout=120)
+# let streaming fail as we expect
+node3.watch_log_for('Some data streaming failed')
 
-# bring back node1 and invoke nodetool bootstrap to resume 
bootstrapping
+# bring back node3 and invoke nodetool bootstrap to resume 
bootstrapping
 node3.nodetool('bootstrap resume')
-
-node3.watch_log_for("Resume complete", from_mark=mark)
+node3.wait_for_binary_interface()
 assert_bootstrap_state(self, node3, 'COMPLETED')
 
 # cleanup to guarantee each node will only have sstables of its ranges
@@ -706,3 +705,81 @@ class TestBootstrap(Tester):
 logger.debug("Deleting {}".format(data_dir))
 shutil.rmtree(data_dir)
 shutil.rmtree(commitlog_dir)
+
+@since('2.2')
+def test_bootstrap_binary_disabled(self):
+"""
+Test binary while bootstrapping and streaming fails
+@jira_ticket CASSANDRA-14526, CASSANDRA-14525
+"""
+config = {'authenticator': 
'org.apache.cassandra.auth.PasswordAuthenticator',
+  'authorizer': 
'org.apache.cassandra.auth.CassandraAuthorizer',
+  'role_manager': 
'org.apache.cassandra.auth.CassandraRoleManager',
+  'permissions_validity_in_ms': 0,
+  'roles_validity_in_ms': 0}
+
+cluster = self.cluster
+cluster.populate(1)
+
+node1 = cluster.nodes['node1']
+# set up byteman
+node1.byteman_port = '8100'
+node1.import_config_files()
+
+cluster.start(wait_other_notice=True)
+# kill stream to node2 in the middle of streaming to let it fail
+if cluster.version() < '4.0':
+node1.byteman_submit([self.byteman_subm

[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[jzhuang]

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: 23cba991ca0d1aafd7d3fb34156d9910d27c8c88
Parents: 48a48c7 7b1454f
Author: Jay Zhuang 
Authored: Sun Dec 30 22:28:40 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 22:29:14 2018 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/23cba991/CHANGES.txt
--
diff --cc CHANGES.txt
index 3d41d83,64e989b..96a54d4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -35,29 -34,10 +36,28 @@@ Merged from 3.0
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
  
 -3.0.17
 +3.11.3
 + * Validate supported column type with SASI analyzer (CASSANDRA-13669)
 + * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929)
 + * Reduce nodetool GC thread count (CASSANDRA-14475)
 + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
 + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
 + * Update metrics to 3.1.5 (CASSANDRA-12924)
 + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
 + * Don't use guava collections in the non-system keyspace jmx attributes 
(CASSANDRA-12271)
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
-  * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
   * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
   * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 - * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
   * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
   * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
   * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)


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

[4/4] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jzhuang]

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: e027e4569f8d6871680bebf6392ebb4642f317c3
Parents: e7a603d 23cba99
Author: Jay Zhuang 
Authored: Sun Dec 30 22:29:28 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 22:29:28 2018 -0800

--

--



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

[1/4] cassandra git commit: ninja fix: Fix CHANGES.txt for #14525

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/trunk e7a603da4 -> e027e4569


ninja fix: Fix CHANGES.txt for #14525


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

Branch: refs/heads/trunk
Commit: 7bb2b7a039ac334b9bc91ee221a89c7a4a472859
Parents: a6196a3
Author: Jay Zhuang 
Authored: Sun Dec 30 22:21:00 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 22:26:54 2018 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bb2b7a0/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 16695c8..398a70e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.14
+ * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
  * MigrationManager attempts to pull schema from different major version nodes 
(CASSANDRA-14928)
  * Don't skip entire sstables when reading backwards with mixed clustering 
column order
(CASSANDRA-14910)
@@ -9,7 +10,6 @@
 
 
 2.2.13
- * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
  * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
  * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)


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

[2/4] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jzhuang]

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

Branch: refs/heads/trunk
Commit: 7b1454f3e139dd8a6b42145af314b730f6c68ed0
Parents: e2ee204 7bb2b7a
Author: Jay Zhuang 
Authored: Sun Dec 30 22:27:58 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 22:28:20 2018 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b1454f3/CHANGES.txt
--
diff --cc CHANGES.txt
index d29cdc1,398a70e..64e989b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,72 -1,15 +1,72 @@@
 -2.2.14
 +3.0.18
 + * Streaming needs to synchronise access to LifecycleTransaction 
(CASSANDRA-14554)
 + * Fix cassandra-stress write hang with default options (CASSANDRA-14616)
 + * Differentiate between slices and RTs when decoding legacy bounds 
(CASSANDRA-14919)
 + * CommitLogReplayer.handleReplayError should print stack traces 
(CASSANDRA-14589)
 + * Netty epoll IOExceptions caused by unclean client disconnects being logged 
at INFO (CASSANDRA-14909)
 + * Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty 
(CASSANDRA-14588)
 + * RangeTombstoneList doesn't properly clean up mergeable or superseded rts 
in some cases (CASSANDRA-14894)
 + * Fix handling of collection tombstones for dropped columns from legacy 
sstables (CASSANDRA-14912)
 + * Throw exception if Columns serialized subset encode more columns than 
possible (CASSANDRA-14591)
 + * Drop/add column name with different Kind can result in corruption 
(CASSANDRA-14843)
 + * Fix missing rows when reading 2.1 SSTables with static columns in 3.0 
(CASSANDRA-14873)
 + * Move TWCS message 'No compaction necessary for bucket size' to Trace level 
(CASSANDRA-14884)
 + * Sstable min/max metadata can cause data loss (CASSANDRA-14861)
 + * Dropped columns can cause reverse sstable iteration to return prematurely 
(CASSANDRA-14838)
 + * Legacy sstables with  multi block range tombstones create invalid bound 
sequences (CASSANDRA-14823)
 + * Expand range tombstone validation checks to multiple interim request 
stages (CASSANDRA-14824)
 + * Reverse order reads can return incomplete results (CASSANDRA-14803)
 + * Avoid calling iter.next() in a loop when notifying indexers about range 
tombstones (CASSANDRA-14794)
 + * Fix purging semi-expired RT boundaries in reversed iterators 
(CASSANDRA-14672)
 + * DESC order reads can fail to return the last Unfiltered in the partition 
(CASSANDRA-14766)
 + * Fix corrupted collection deletions for dropped columns in 3.0 <-> 2.{1,2} 
messages (CASSANDRA-14568)
 + * Fix corrupted static collection deletions in 3.0 <-> 2.{1,2} messages 
(CASSANDRA-14568)
 + * Handle failures in parallelAllSSTableOperation 
(cleanup/upgradesstables/etc) (CASSANDRA-14657)
 + * Improve TokenMetaData cache populating performance avoid long locking 
(CASSANDRA-14660)
 + * Backport: Flush netty client messages immediately (not by default) 
(CASSANDRA-13651)
 + * Fix static column order for SELECT * wildcard queries (CASSANDRA-14638)
 + * sstableloader should use discovered broadcast address to connect 
intra-cluster (CASSANDRA-14522)
 + * Fix reading columns with non-UTF names from schema (CASSANDRA-14468)
 + Merged from 2.2:
+  * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
   * MigrationManager attempts to pull schema from different major version 
nodes (CASSANDRA-14928)
 - * Don't skip entire sstables when reading backwards with mixed clustering 
column order
 -   (CASSANDRA-14910)
 - * Cannot perform slice reads in reverse direction against tables with 
clustering columns
 -   in mixed order (CASSANDRA-14899)
   * Fix incorrect cqlsh results when selecting same columns multiple times 
(CASSANDRA-13262)
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
  
 -2.2.13
 +3.0.17
 + * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
 + * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 + * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
 + * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
 + * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
 + * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)
 + * Add Missing dependencies in pom-all (CASSANDRA-14422)
 + * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
 + * Fix deprecated repair error notifications from 

[2/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jzhuang]

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

Branch: refs/heads/cassandra-3.11
Commit: 7b1454f3e139dd8a6b42145af314b730f6c68ed0
Parents: e2ee204 7bb2b7a
Author: Jay Zhuang 
Authored: Sun Dec 30 22:27:58 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 22:28:20 2018 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b1454f3/CHANGES.txt
--
diff --cc CHANGES.txt
index d29cdc1,398a70e..64e989b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,72 -1,15 +1,72 @@@
 -2.2.14
 +3.0.18
 + * Streaming needs to synchronise access to LifecycleTransaction 
(CASSANDRA-14554)
 + * Fix cassandra-stress write hang with default options (CASSANDRA-14616)
 + * Differentiate between slices and RTs when decoding legacy bounds 
(CASSANDRA-14919)
 + * CommitLogReplayer.handleReplayError should print stack traces 
(CASSANDRA-14589)
 + * Netty epoll IOExceptions caused by unclean client disconnects being logged 
at INFO (CASSANDRA-14909)
 + * Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty 
(CASSANDRA-14588)
 + * RangeTombstoneList doesn't properly clean up mergeable or superseded rts 
in some cases (CASSANDRA-14894)
 + * Fix handling of collection tombstones for dropped columns from legacy 
sstables (CASSANDRA-14912)
 + * Throw exception if Columns serialized subset encode more columns than 
possible (CASSANDRA-14591)
 + * Drop/add column name with different Kind can result in corruption 
(CASSANDRA-14843)
 + * Fix missing rows when reading 2.1 SSTables with static columns in 3.0 
(CASSANDRA-14873)
 + * Move TWCS message 'No compaction necessary for bucket size' to Trace level 
(CASSANDRA-14884)
 + * Sstable min/max metadata can cause data loss (CASSANDRA-14861)
 + * Dropped columns can cause reverse sstable iteration to return prematurely 
(CASSANDRA-14838)
 + * Legacy sstables with  multi block range tombstones create invalid bound 
sequences (CASSANDRA-14823)
 + * Expand range tombstone validation checks to multiple interim request 
stages (CASSANDRA-14824)
 + * Reverse order reads can return incomplete results (CASSANDRA-14803)
 + * Avoid calling iter.next() in a loop when notifying indexers about range 
tombstones (CASSANDRA-14794)
 + * Fix purging semi-expired RT boundaries in reversed iterators 
(CASSANDRA-14672)
 + * DESC order reads can fail to return the last Unfiltered in the partition 
(CASSANDRA-14766)
 + * Fix corrupted collection deletions for dropped columns in 3.0 <-> 2.{1,2} 
messages (CASSANDRA-14568)
 + * Fix corrupted static collection deletions in 3.0 <-> 2.{1,2} messages 
(CASSANDRA-14568)
 + * Handle failures in parallelAllSSTableOperation 
(cleanup/upgradesstables/etc) (CASSANDRA-14657)
 + * Improve TokenMetaData cache populating performance avoid long locking 
(CASSANDRA-14660)
 + * Backport: Flush netty client messages immediately (not by default) 
(CASSANDRA-13651)
 + * Fix static column order for SELECT * wildcard queries (CASSANDRA-14638)
 + * sstableloader should use discovered broadcast address to connect 
intra-cluster (CASSANDRA-14522)
 + * Fix reading columns with non-UTF names from schema (CASSANDRA-14468)
 + Merged from 2.2:
+  * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
   * MigrationManager attempts to pull schema from different major version 
nodes (CASSANDRA-14928)
 - * Don't skip entire sstables when reading backwards with mixed clustering 
column order
 -   (CASSANDRA-14910)
 - * Cannot perform slice reads in reverse direction against tables with 
clustering columns
 -   in mixed order (CASSANDRA-14899)
   * Fix incorrect cqlsh results when selecting same columns multiple times 
(CASSANDRA-13262)
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
  
 -2.2.13
 +3.0.17
 + * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
 + * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 + * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
 + * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
 + * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
 + * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)
 + * Add Missing dependencies in pom-all (CASSANDRA-14422)
 + * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
 + * Fix deprecated repair error 

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

[jzhuang]

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

Branch: refs/heads/cassandra-3.0
Commit: 7b1454f3e139dd8a6b42145af314b730f6c68ed0
Parents: e2ee204 7bb2b7a
Author: Jay Zhuang 
Authored: Sun Dec 30 22:27:58 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 22:28:20 2018 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b1454f3/CHANGES.txt
--
diff --cc CHANGES.txt
index d29cdc1,398a70e..64e989b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,72 -1,15 +1,72 @@@
 -2.2.14
 +3.0.18
 + * Streaming needs to synchronise access to LifecycleTransaction 
(CASSANDRA-14554)
 + * Fix cassandra-stress write hang with default options (CASSANDRA-14616)
 + * Differentiate between slices and RTs when decoding legacy bounds 
(CASSANDRA-14919)
 + * CommitLogReplayer.handleReplayError should print stack traces 
(CASSANDRA-14589)
 + * Netty epoll IOExceptions caused by unclean client disconnects being logged 
at INFO (CASSANDRA-14909)
 + * Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty 
(CASSANDRA-14588)
 + * RangeTombstoneList doesn't properly clean up mergeable or superseded rts 
in some cases (CASSANDRA-14894)
 + * Fix handling of collection tombstones for dropped columns from legacy 
sstables (CASSANDRA-14912)
 + * Throw exception if Columns serialized subset encode more columns than 
possible (CASSANDRA-14591)
 + * Drop/add column name with different Kind can result in corruption 
(CASSANDRA-14843)
 + * Fix missing rows when reading 2.1 SSTables with static columns in 3.0 
(CASSANDRA-14873)
 + * Move TWCS message 'No compaction necessary for bucket size' to Trace level 
(CASSANDRA-14884)
 + * Sstable min/max metadata can cause data loss (CASSANDRA-14861)
 + * Dropped columns can cause reverse sstable iteration to return prematurely 
(CASSANDRA-14838)
 + * Legacy sstables with  multi block range tombstones create invalid bound 
sequences (CASSANDRA-14823)
 + * Expand range tombstone validation checks to multiple interim request 
stages (CASSANDRA-14824)
 + * Reverse order reads can return incomplete results (CASSANDRA-14803)
 + * Avoid calling iter.next() in a loop when notifying indexers about range 
tombstones (CASSANDRA-14794)
 + * Fix purging semi-expired RT boundaries in reversed iterators 
(CASSANDRA-14672)
 + * DESC order reads can fail to return the last Unfiltered in the partition 
(CASSANDRA-14766)
 + * Fix corrupted collection deletions for dropped columns in 3.0 <-> 2.{1,2} 
messages (CASSANDRA-14568)
 + * Fix corrupted static collection deletions in 3.0 <-> 2.{1,2} messages 
(CASSANDRA-14568)
 + * Handle failures in parallelAllSSTableOperation 
(cleanup/upgradesstables/etc) (CASSANDRA-14657)
 + * Improve TokenMetaData cache populating performance avoid long locking 
(CASSANDRA-14660)
 + * Backport: Flush netty client messages immediately (not by default) 
(CASSANDRA-13651)
 + * Fix static column order for SELECT * wildcard queries (CASSANDRA-14638)
 + * sstableloader should use discovered broadcast address to connect 
intra-cluster (CASSANDRA-14522)
 + * Fix reading columns with non-UTF names from schema (CASSANDRA-14468)
 + Merged from 2.2:
+  * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
   * MigrationManager attempts to pull schema from different major version 
nodes (CASSANDRA-14928)
 - * Don't skip entire sstables when reading backwards with mixed clustering 
column order
 -   (CASSANDRA-14910)
 - * Cannot perform slice reads in reverse direction against tables with 
clustering columns
 -   in mixed order (CASSANDRA-14899)
   * Fix incorrect cqlsh results when selecting same columns multiple times 
(CASSANDRA-13262)
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
  
 -2.2.13
 +3.0.17
 + * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
 + * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 + * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
 + * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
 + * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
 + * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)
 + * Add Missing dependencies in pom-all (CASSANDRA-14422)
 + * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
 + * Fix deprecated repair error 

cassandra git commit: ninja fix: Fix CHANGES.txt for #14525

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 a6196a3a7 -> 7bb2b7a03


ninja fix: Fix CHANGES.txt for #14525


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

Branch: refs/heads/cassandra-2.2
Commit: 7bb2b7a039ac334b9bc91ee221a89c7a4a472859
Parents: a6196a3
Author: Jay Zhuang 
Authored: Sun Dec 30 22:21:00 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 22:26:54 2018 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bb2b7a0/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 16695c8..398a70e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.14
+ * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
  * MigrationManager attempts to pull schema from different major version nodes 
(CASSANDRA-14928)
  * Don't skip entire sstables when reading backwards with mixed clustering 
column order
(CASSANDRA-14910)
@@ -9,7 +10,6 @@
 
 
 2.2.13
- * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
  * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
  * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)


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

[1/2] cassandra git commit: ninja fix: Fix CHANGES.txt for #14525

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 e2ee20458 -> 7b1454f3e


ninja fix: Fix CHANGES.txt for #14525


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

Branch: refs/heads/cassandra-3.0
Commit: 7bb2b7a039ac334b9bc91ee221a89c7a4a472859
Parents: a6196a3
Author: Jay Zhuang 
Authored: Sun Dec 30 22:21:00 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 22:26:54 2018 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bb2b7a0/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 16695c8..398a70e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.14
+ * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
  * MigrationManager attempts to pull schema from different major version nodes 
(CASSANDRA-14928)
  * Don't skip entire sstables when reading backwards with mixed clustering 
column order
(CASSANDRA-14910)
@@ -9,7 +10,6 @@
 
 
 2.2.13
- * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
  * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
  * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)


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

[1/3] cassandra git commit: ninja fix: Fix CHANGES.txt for #14525

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 48a48c7fc -> 23cba991c


ninja fix: Fix CHANGES.txt for #14525


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

Branch: refs/heads/cassandra-3.11
Commit: 7bb2b7a039ac334b9bc91ee221a89c7a4a472859
Parents: a6196a3
Author: Jay Zhuang 
Authored: Sun Dec 30 22:21:00 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 22:26:54 2018 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bb2b7a0/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 16695c8..398a70e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.14
+ * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
  * MigrationManager attempts to pull schema from different major version nodes 
(CASSANDRA-14928)
  * Don't skip entire sstables when reading backwards with mixed clustering 
column order
(CASSANDRA-14910)
@@ -9,7 +10,6 @@
 
 
 2.2.13
- * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
  * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
  * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)


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

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

[jzhuang]

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 23cba991ca0d1aafd7d3fb34156d9910d27c8c88
Parents: 48a48c7 7b1454f
Author: Jay Zhuang 
Authored: Sun Dec 30 22:28:40 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 22:29:14 2018 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/23cba991/CHANGES.txt
--
diff --cc CHANGES.txt
index 3d41d83,64e989b..96a54d4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -35,29 -34,10 +36,28 @@@ Merged from 3.0
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
  
 -3.0.17
 +3.11.3
 + * Validate supported column type with SASI analyzer (CASSANDRA-13669)
 + * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929)
 + * Reduce nodetool GC thread count (CASSANDRA-14475)
 + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
 + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
 + * Update metrics to 3.1.5 (CASSANDRA-12924)
 + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
 + * Don't use guava collections in the non-system keyspace jmx attributes 
(CASSANDRA-12271)
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
-  * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
   * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
   * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 - * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
   * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
   * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
   * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)


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

[4/4] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jzhuang]

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: e7a603da48800ec1a3383239d3ff7b7b133e9f35
Parents: 11384c3 48a48c7
Author: Jay Zhuang 
Authored: Sun Dec 30 21:57:13 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 22:01:07 2018 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/service/CassandraDaemon.java  | 47 +
 .../cassandra/service/StorageService.java   | 54 +++-
 .../cassandra/service/StorageServiceMBean.java  |  6 +++
 .../org/apache/cassandra/tools/NodeProbe.java   |  5 ++
 .../apache/cassandra/tools/nodetool/Join.java   |  3 +-
 6 files changed, 102 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7a603da/CHANGES.txt
--
diff --cc CHANGES.txt
index 66442e9,3d41d83..4254ae2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,342 -1,3 +1,343 @@@
 +4.0
++ * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
 + * Make antiCompactGroup throw exception on error and anticompaction non 
cancellable
 +   again (CASSANDRA-14936)
 + * Catch empty/invalid bounds in SelectStatement (CASSANDRA-14849)
 + * Auto-expand replication_factor for NetworkTopologyStrategy 
(CASSANDRA-14303)
 + * Transient Replication: support EACH_QUORUM (CASSANDRA-14727)
 + * BufferPool: allocating thread for new chunks should acquire directly 
(CASSANDRA-14832)
 + * Send correct messaging version in internode messaging handshake's third 
message (CASSANDRA-14896)
 + * Make Read and Write Latency columns consistent for proxyhistograms and 
tablehistograms (CASSANDRA-11939)
 + * Make protocol checksum type option case insensitive (CASSANDRA-14716)
 + * Forbid re-adding static columns as regular and vice versa (CASSANDRA-14913)
 + * Audit log allows system keyspaces to be audited via configuration options 
(CASSANDRA-14498)
 + * Lower default chunk_length_in_kb from 64kb to 16kb (CASSANDRA-13241)
 + * Startup checker should wait for count rather than percentage 
(CASSANDRA-14297)
 + * Fix incorrect sorting of replicas in 
SimpleStrategy.calculateNaturalReplicas (CASSANDRA-14862)
 + * Partitioned outbound internode TCP connections can occur when nodes 
restart (CASSANDRA-14358)
 + * Don't write to system_distributed.repair_history, system_traces.sessions, 
system_traces.events in mixed version 3.X/4.0 clusters (CASSANDRA-14841)
 + * Avoid running query to self through messaging service (CASSANDRA-14807)
 + * Allow using custom script for chronicle queue BinLog archival 
(CASSANDRA-14373)
 + * Transient->Full range movements mishandle consistency level upgrade 
(CASSANDRA-14759)
 + * ReplicaCollection follow-up (CASSANDRA-14726)
 + * Transient node receives full data requests (CASSANDRA-14762)
 + * Enable snapshot artifacts publish (CASSANDRA-12704)
 + * Introduce RangesAtEndpoint.unwrap to simplify 
StreamSession.addTransferRanges (CASSANDRA-14770)
 + * LOCAL_QUORUM may speculate to non-local nodes, resulting in Timeout 
instead of Unavailable (CASSANDRA-14735)
 + * Avoid creating empty compaction tasks after truncate (CASSANDRA-14780)
 + * Fail incremental repair prepare phase if it encounters sstables from 
un-finalized sessions (CASSANDRA-14763)
 + * Add a check for receiving digest response from transient node 
(CASSANDRA-14750)
 + * Fail query on transient replica if coordinator only expects full data 
(CASSANDRA-14704)
 + * Remove mentions of transient replication from repair path (CASSANDRA-14698)
 + * Fix handleRepairStatusChangedNotification to remove first then add 
(CASSANDRA-14720)
 + * Allow transient node to serve as a repair coordinator (CASSANDRA-14693)
 + * DecayingEstimatedHistogramReservoir.EstimatedHistogramReservoirSnapshot 
returns wrong value for size() and incorrectly calculates count 
(CASSANDRA-14696)
 + * AbstractReplicaCollection equals and hash code should throw due to 
conflict between order sensitive/insensitive uses (CASSANDRA-14700)
 + * Detect inconsistencies in repaired data on the read path (CASSANDRA-14145)
 + * Add checksumming to the native protocol (CASSANDRA-13304)
 + * Make AuthCache more easily extendable (CASSANDRA-14662)
 + * Extend RolesCache to include detailed role info (CASSANDRA-14497)
 + * Add fqltool compare (CASSANDRA-14619)
 + * Add fqltool replay (CASSANDRA-14618)
 + * Log keyspace in full query log (CASSANDRA-14656)
 + * Transient Replication and Cheap Quorums (CASSANDRA-14404)
 + * Log server-generated timestamp and nowInSeconds used by queries in FQL 

[1/4] cassandra git commit: Do not enable native transport if bootstrap is pending

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 11384c327 -> e7a603da4


Do not enable native transport if bootstrap is pending

patch by Jaydeepkumar Chovatia; reviewed by Kurt Greaves for CASSANDRA-14525


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

Branch: refs/heads/trunk
Commit: a6196a3a79b67dc6577747e591456328e57c314f
Parents: 505a03c
Author: jaydeepkumar1984 
Authored: Thu Jun 14 21:52:20 2018 -0700
Committer: Jay Zhuang 
Committed: Sun Dec 30 21:35:08 2018 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/service/CassandraDaemon.java  | 24 +
 .../cassandra/service/StorageService.java   | 94 +---
 .../cassandra/service/StorageServiceMBean.java  |  7 ++
 .../org/apache/cassandra/tools/NodeProbe.java   |  5 ++
 .../apache/cassandra/tools/nodetool/Join.java   |  1 +
 6 files changed, 119 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6196a3a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 58309fa..16695c8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@
 
 
 2.2.13
+ * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
  * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
  * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6196a3a/src/java/org/apache/cassandra/service/CassandraDaemon.java
--
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java 
b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 18b568d..e250050 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -440,6 +440,30 @@ public class CassandraDaemon
  */
 public void start()
 {
+// We only start transports if bootstrap has completed and we're not 
in survey mode, OR if we are in
+// survey mode and streaming has completed but we're not using auth.
+// OR if we have not joined the ring yet.
+if (StorageService.instance.hasJoined())
+{
+if (StorageService.instance.isSurveyMode())
+{
+if (StorageService.instance.isBootstrapMode() || 
DatabaseDescriptor.getAuthenticator().requireAuthentication())
+{
+logger.info("Not starting client transports in 
write_survey mode as it's bootstrapping or " +
+"auth is enabled");
+return;
+}
+}
+else
+{
+if (!SystemKeyspace.bootstrapComplete())
+{
+logger.info("Not starting client transports as bootstrap 
has not completed");
+return;
+}
+}
+}
+
 String nativeFlag = 
System.getProperty("cassandra.start_native_transport");
 if ((nativeFlag != null && Boolean.parseBoolean(nativeFlag)) || 
(nativeFlag == null && DatabaseDescriptor.startNativeTransport()))
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6196a3a/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 2c9ac4d..03470b6 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -156,7 +156,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 private volatile boolean isBootstrapMode;
 
 /* we bootstrap but do NOT join the ring unless told to do so */
-private boolean isSurveyMode = 
Boolean.parseBoolean(System.getProperty("cassandra.write_survey", "false"));
+private boolean isSurveyMode = Boolean.parseBoolean(System.getProperty
+("cassandra.write_survey", "false"));
 /* true if node is rebuilding and receiving data */
 private final AtomicBoolean isRebuilding = new AtomicBoolean();
 
@@ -193,6 +194,16 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private final AtomicBoolean doneAuthSetup = new AtomicBoolean(false);
 
+  

[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[jzhuang]

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: 48a48c7fcd06213c77a9490f0d2c8b32baa2b1e4
Parents: 08363af e2ee204
Author: Jay Zhuang 
Authored: Sun Dec 30 21:53:05 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 21:54:56 2018 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/service/CassandraDaemon.java  | 47 ++
 .../cassandra/service/StorageService.java   | 66 +---
 .../cassandra/service/StorageServiceMBean.java  |  7 +++
 .../org/apache/cassandra/tools/NodeProbe.java   |  5 ++
 .../apache/cassandra/tools/nodetool/Join.java   |  1 +
 6 files changed, 117 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/48a48c7f/CHANGES.txt
--
diff --cc CHANGES.txt
index 0d97d3c,d29cdc1..3d41d83
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -35,28 -33,10 +35,29 @@@ Merged from 3.0
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
  
 -3.0.17
 +3.11.3
 + * Validate supported column type with SASI analyzer (CASSANDRA-13669)
 + * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929)
 + * Reduce nodetool GC thread count (CASSANDRA-14475)
 + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
 + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
 + * Update metrics to 3.1.5 (CASSANDRA-12924)
 + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
 + * Don't use guava collections in the non-system keyspace jmx attributes 
(CASSANDRA-12271)
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
++ * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
   * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
   * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 - * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
   * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
   * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
   * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/48a48c7f/src/java/org/apache/cassandra/service/CassandraDaemon.java
--
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index d9bd5c3,6869d2c..fbafd35
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -642,13 -633,31 +666,36 @@@ public class CassandraDaemo
  }
  }
  
 +public void applyConfig()
 +{
 +DatabaseDescriptor.daemonInitialization();
 +}
 +
  public void startNativeTransport()
  {
+ // We only start transports if bootstrap has completed and we're not 
in survey mode, OR if we are in
+ // survey mode and streaming has completed but we're not using auth.
+ // OR if we have not joined the ring yet.
+ if (StorageService.instance.hasJoined())
+ {
+ if (StorageService.instance.isSurveyMode())
+ {
+ if (StorageService.instance.isBootstrapMode() || 
DatabaseDescriptor.getAuthenticator().requireAuthentication())
+ {
+ throw new IllegalStateException("Not starting client 
transports in write_survey mode as it's bootstrapping or " +
+ "auth is enabled");
+ }
+ }
+ else
+ {
+ if (!SystemKeyspace.bootstrapComplete())
+ 

[2/4] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jzhuang]

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

Branch: refs/heads/trunk
Commit: e2ee204580a0ee87b36e1df6aa2717830dfb33d0
Parents: 23d722e a6196a3
Author: Jay Zhuang 
Authored: Sun Dec 30 21:41:28 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 21:49:33 2018 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/service/CassandraDaemon.java  | 47 
 .../cassandra/service/StorageService.java   | 78 
 .../cassandra/service/StorageServiceMBean.java  |  7 ++
 .../org/apache/cassandra/tools/NodeProbe.java   |  5 ++
 .../apache/cassandra/tools/nodetool/Join.java   |  1 +
 6 files changed, 126 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2ee2045/CHANGES.txt
--
diff --cc CHANGES.txt
index 8fd0200,16695c8..d29cdc1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -33,39 -8,8 +33,40 @@@
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
  
 -2.2.13
 +3.0.17
 + * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
 + * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 + * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
 + * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
 + * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
 + * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)
 + * Add Missing dependencies in pom-all (CASSANDRA-14422)
 + * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
 + * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
 + * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)
 + * Fix progress stats and units in compactionstats (CASSANDRA-12244)
 + * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
 + * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * 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:
+  * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
   * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
   * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2ee2045/src/java/org/apache/cassandra/service/CassandraDaemon.java
--
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index 177f8e3,e250050..6869d2c
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -609,26 -597,6 +633,49 @@@ public class CassandraDaemo
  }
  }
  
 +public void startNativeTransport()
 +{
++// We only start transports if bootstrap has completed and we're not 
in survey mode, OR if we are in
++// survey mode and 

[1/3] cassandra git commit: Do not enable native transport if bootstrap is pending

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 08363afa5 -> 48a48c7fc


Do not enable native transport if bootstrap is pending

patch by Jaydeepkumar Chovatia; reviewed by Kurt Greaves for CASSANDRA-14525


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

Branch: refs/heads/cassandra-3.11
Commit: a6196a3a79b67dc6577747e591456328e57c314f
Parents: 505a03c
Author: jaydeepkumar1984 
Authored: Thu Jun 14 21:52:20 2018 -0700
Committer: Jay Zhuang 
Committed: Sun Dec 30 21:35:08 2018 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/service/CassandraDaemon.java  | 24 +
 .../cassandra/service/StorageService.java   | 94 +---
 .../cassandra/service/StorageServiceMBean.java  |  7 ++
 .../org/apache/cassandra/tools/NodeProbe.java   |  5 ++
 .../apache/cassandra/tools/nodetool/Join.java   |  1 +
 6 files changed, 119 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6196a3a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 58309fa..16695c8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@
 
 
 2.2.13
+ * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
  * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
  * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6196a3a/src/java/org/apache/cassandra/service/CassandraDaemon.java
--
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java 
b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 18b568d..e250050 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -440,6 +440,30 @@ public class CassandraDaemon
  */
 public void start()
 {
+// We only start transports if bootstrap has completed and we're not 
in survey mode, OR if we are in
+// survey mode and streaming has completed but we're not using auth.
+// OR if we have not joined the ring yet.
+if (StorageService.instance.hasJoined())
+{
+if (StorageService.instance.isSurveyMode())
+{
+if (StorageService.instance.isBootstrapMode() || 
DatabaseDescriptor.getAuthenticator().requireAuthentication())
+{
+logger.info("Not starting client transports in 
write_survey mode as it's bootstrapping or " +
+"auth is enabled");
+return;
+}
+}
+else
+{
+if (!SystemKeyspace.bootstrapComplete())
+{
+logger.info("Not starting client transports as bootstrap 
has not completed");
+return;
+}
+}
+}
+
 String nativeFlag = 
System.getProperty("cassandra.start_native_transport");
 if ((nativeFlag != null && Boolean.parseBoolean(nativeFlag)) || 
(nativeFlag == null && DatabaseDescriptor.startNativeTransport()))
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6196a3a/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 2c9ac4d..03470b6 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -156,7 +156,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 private volatile boolean isBootstrapMode;
 
 /* we bootstrap but do NOT join the ring unless told to do so */
-private boolean isSurveyMode = 
Boolean.parseBoolean(System.getProperty("cassandra.write_survey", "false"));
+private boolean isSurveyMode = Boolean.parseBoolean(System.getProperty
+("cassandra.write_survey", "false"));
 /* true if node is rebuilding and receiving data */
 private final AtomicBoolean isRebuilding = new AtomicBoolean();
 
@@ -193,6 +194,16 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private final AtomicBoolean doneAuthSetup = new 

[1/2] cassandra git commit: Do not enable native transport if bootstrap is pending

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 23d722ee3 -> e2ee20458


Do not enable native transport if bootstrap is pending

patch by Jaydeepkumar Chovatia; reviewed by Kurt Greaves for CASSANDRA-14525


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

Branch: refs/heads/cassandra-3.0
Commit: a6196a3a79b67dc6577747e591456328e57c314f
Parents: 505a03c
Author: jaydeepkumar1984 
Authored: Thu Jun 14 21:52:20 2018 -0700
Committer: Jay Zhuang 
Committed: Sun Dec 30 21:35:08 2018 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/service/CassandraDaemon.java  | 24 +
 .../cassandra/service/StorageService.java   | 94 +---
 .../cassandra/service/StorageServiceMBean.java  |  7 ++
 .../org/apache/cassandra/tools/NodeProbe.java   |  5 ++
 .../apache/cassandra/tools/nodetool/Join.java   |  1 +
 6 files changed, 119 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6196a3a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 58309fa..16695c8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@
 
 
 2.2.13
+ * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
  * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
  * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6196a3a/src/java/org/apache/cassandra/service/CassandraDaemon.java
--
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java 
b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 18b568d..e250050 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -440,6 +440,30 @@ public class CassandraDaemon
  */
 public void start()
 {
+// We only start transports if bootstrap has completed and we're not 
in survey mode, OR if we are in
+// survey mode and streaming has completed but we're not using auth.
+// OR if we have not joined the ring yet.
+if (StorageService.instance.hasJoined())
+{
+if (StorageService.instance.isSurveyMode())
+{
+if (StorageService.instance.isBootstrapMode() || 
DatabaseDescriptor.getAuthenticator().requireAuthentication())
+{
+logger.info("Not starting client transports in 
write_survey mode as it's bootstrapping or " +
+"auth is enabled");
+return;
+}
+}
+else
+{
+if (!SystemKeyspace.bootstrapComplete())
+{
+logger.info("Not starting client transports as bootstrap 
has not completed");
+return;
+}
+}
+}
+
 String nativeFlag = 
System.getProperty("cassandra.start_native_transport");
 if ((nativeFlag != null && Boolean.parseBoolean(nativeFlag)) || 
(nativeFlag == null && DatabaseDescriptor.startNativeTransport()))
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6196a3a/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 2c9ac4d..03470b6 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -156,7 +156,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 private volatile boolean isBootstrapMode;
 
 /* we bootstrap but do NOT join the ring unless told to do so */
-private boolean isSurveyMode = 
Boolean.parseBoolean(System.getProperty("cassandra.write_survey", "false"));
+private boolean isSurveyMode = Boolean.parseBoolean(System.getProperty
+("cassandra.write_survey", "false"));
 /* true if node is rebuilding and receiving data */
 private final AtomicBoolean isRebuilding = new AtomicBoolean();
 
@@ -193,6 +194,16 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private final AtomicBoolean doneAuthSetup = new 

[2/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jzhuang]

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

Branch: refs/heads/cassandra-3.11
Commit: e2ee204580a0ee87b36e1df6aa2717830dfb33d0
Parents: 23d722e a6196a3
Author: Jay Zhuang 
Authored: Sun Dec 30 21:41:28 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 21:49:33 2018 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/service/CassandraDaemon.java  | 47 
 .../cassandra/service/StorageService.java   | 78 
 .../cassandra/service/StorageServiceMBean.java  |  7 ++
 .../org/apache/cassandra/tools/NodeProbe.java   |  5 ++
 .../apache/cassandra/tools/nodetool/Join.java   |  1 +
 6 files changed, 126 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2ee2045/CHANGES.txt
--
diff --cc CHANGES.txt
index 8fd0200,16695c8..d29cdc1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -33,39 -8,8 +33,40 @@@
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
  
 -2.2.13
 +3.0.17
 + * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
 + * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 + * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
 + * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
 + * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
 + * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)
 + * Add Missing dependencies in pom-all (CASSANDRA-14422)
 + * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
 + * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
 + * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)
 + * Fix progress stats and units in compactionstats (CASSANDRA-12244)
 + * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
 + * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * 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:
+  * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
   * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
   * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2ee2045/src/java/org/apache/cassandra/service/CassandraDaemon.java
--
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index 177f8e3,e250050..6869d2c
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -609,26 -597,6 +633,49 @@@ public class CassandraDaemo
  }
  }
  
 +public void startNativeTransport()
 +{
++// We only start transports if bootstrap has completed and we're not 
in survey mode, OR if we are in
++// survey mode 

cassandra git commit: Do not enable native transport if bootstrap is pending

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 505a03c77 -> a6196a3a7


Do not enable native transport if bootstrap is pending

patch by Jaydeepkumar Chovatia; reviewed by Kurt Greaves for CASSANDRA-14525


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

Branch: refs/heads/cassandra-2.2
Commit: a6196a3a79b67dc6577747e591456328e57c314f
Parents: 505a03c
Author: jaydeepkumar1984 
Authored: Thu Jun 14 21:52:20 2018 -0700
Committer: Jay Zhuang 
Committed: Sun Dec 30 21:35:08 2018 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/service/CassandraDaemon.java  | 24 +
 .../cassandra/service/StorageService.java   | 94 +---
 .../cassandra/service/StorageServiceMBean.java  |  7 ++
 .../org/apache/cassandra/tools/NodeProbe.java   |  5 ++
 .../apache/cassandra/tools/nodetool/Join.java   |  1 +
 6 files changed, 119 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6196a3a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 58309fa..16695c8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@
 
 
 2.2.13
+ * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
  * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
  * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6196a3a/src/java/org/apache/cassandra/service/CassandraDaemon.java
--
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java 
b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 18b568d..e250050 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -440,6 +440,30 @@ public class CassandraDaemon
  */
 public void start()
 {
+// We only start transports if bootstrap has completed and we're not 
in survey mode, OR if we are in
+// survey mode and streaming has completed but we're not using auth.
+// OR if we have not joined the ring yet.
+if (StorageService.instance.hasJoined())
+{
+if (StorageService.instance.isSurveyMode())
+{
+if (StorageService.instance.isBootstrapMode() || 
DatabaseDescriptor.getAuthenticator().requireAuthentication())
+{
+logger.info("Not starting client transports in 
write_survey mode as it's bootstrapping or " +
+"auth is enabled");
+return;
+}
+}
+else
+{
+if (!SystemKeyspace.bootstrapComplete())
+{
+logger.info("Not starting client transports as bootstrap 
has not completed");
+return;
+}
+}
+}
+
 String nativeFlag = 
System.getProperty("cassandra.start_native_transport");
 if ((nativeFlag != null && Boolean.parseBoolean(nativeFlag)) || 
(nativeFlag == null && DatabaseDescriptor.startNativeTransport()))
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6196a3a/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 2c9ac4d..03470b6 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -156,7 +156,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 private volatile boolean isBootstrapMode;
 
 /* we bootstrap but do NOT join the ring unless told to do so */
-private boolean isSurveyMode = 
Boolean.parseBoolean(System.getProperty("cassandra.write_survey", "false"));
+private boolean isSurveyMode = Boolean.parseBoolean(System.getProperty
+("cassandra.write_survey", "false"));
 /* true if node is rebuilding and receiving data */
 private final AtomicBoolean isRebuilding = new AtomicBoolean();
 
@@ -193,6 +194,16 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private final AtomicBoolean doneAuthSetup = new 

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

[jzhuang]

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 48a48c7fcd06213c77a9490f0d2c8b32baa2b1e4
Parents: 08363af e2ee204
Author: Jay Zhuang 
Authored: Sun Dec 30 21:53:05 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 21:54:56 2018 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/service/CassandraDaemon.java  | 47 ++
 .../cassandra/service/StorageService.java   | 66 +---
 .../cassandra/service/StorageServiceMBean.java  |  7 +++
 .../org/apache/cassandra/tools/NodeProbe.java   |  5 ++
 .../apache/cassandra/tools/nodetool/Join.java   |  1 +
 6 files changed, 117 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/48a48c7f/CHANGES.txt
--
diff --cc CHANGES.txt
index 0d97d3c,d29cdc1..3d41d83
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -35,28 -33,10 +35,29 @@@ Merged from 3.0
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
  
 -3.0.17
 +3.11.3
 + * Validate supported column type with SASI analyzer (CASSANDRA-13669)
 + * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929)
 + * Reduce nodetool GC thread count (CASSANDRA-14475)
 + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
 + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
 + * Update metrics to 3.1.5 (CASSANDRA-12924)
 + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
 + * Don't use guava collections in the non-system keyspace jmx attributes 
(CASSANDRA-12271)
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
++ * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
   * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
   * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 - * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
   * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
   * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
   * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/48a48c7f/src/java/org/apache/cassandra/service/CassandraDaemon.java
--
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index d9bd5c3,6869d2c..fbafd35
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -642,13 -633,31 +666,36 @@@ public class CassandraDaemo
  }
  }
  
 +public void applyConfig()
 +{
 +DatabaseDescriptor.daemonInitialization();
 +}
 +
  public void startNativeTransport()
  {
+ // We only start transports if bootstrap has completed and we're not 
in survey mode, OR if we are in
+ // survey mode and streaming has completed but we're not using auth.
+ // OR if we have not joined the ring yet.
+ if (StorageService.instance.hasJoined())
+ {
+ if (StorageService.instance.isSurveyMode())
+ {
+ if (StorageService.instance.isBootstrapMode() || 
DatabaseDescriptor.getAuthenticator().requireAuthentication())
+ {
+ throw new IllegalStateException("Not starting client 
transports in write_survey mode as it's bootstrapping or " +
+ "auth is enabled");
+ }
+ }
+ else
+ {
+ if (!SystemKeyspace.bootstrapComplete())
+

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

[jzhuang]

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

Branch: refs/heads/cassandra-3.0
Commit: e2ee204580a0ee87b36e1df6aa2717830dfb33d0
Parents: 23d722e a6196a3
Author: Jay Zhuang 
Authored: Sun Dec 30 21:41:28 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 21:49:33 2018 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/service/CassandraDaemon.java  | 47 
 .../cassandra/service/StorageService.java   | 78 
 .../cassandra/service/StorageServiceMBean.java  |  7 ++
 .../org/apache/cassandra/tools/NodeProbe.java   |  5 ++
 .../apache/cassandra/tools/nodetool/Join.java   |  1 +
 6 files changed, 126 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2ee2045/CHANGES.txt
--
diff --cc CHANGES.txt
index 8fd0200,16695c8..d29cdc1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -33,39 -8,8 +33,40 @@@
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
  
 -2.2.13
 +3.0.17
 + * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
 + * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 + * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
 + * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
 + * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
 + * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)
 + * Add Missing dependencies in pom-all (CASSANDRA-14422)
 + * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
 + * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
 + * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)
 + * Fix progress stats and units in compactionstats (CASSANDRA-12244)
 + * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
 + * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * 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:
+  * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
   * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
   * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2ee2045/src/java/org/apache/cassandra/service/CassandraDaemon.java
--
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index 177f8e3,e250050..6869d2c
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -609,26 -597,6 +633,49 @@@ public class CassandraDaemo
  }
  }
  
 +public void startNativeTransport()
 +{
++// We only start transports if bootstrap has completed and we're not 
in survey mode, OR if we are in
++// survey mode and 

cassandra-dtest git commit: Add basic test for cassandra-stress

[jzhuang]

Repository: cassandra-dtest
Updated Branches:
  refs/heads/master c0d9c9744 -> 325ef3fa0


Add basic test for cassandra-stress

patch by Jay Zhuang; reviewed by Stefania Alborghetti for CASSANDRA-14616


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

Branch: refs/heads/master
Commit: 325ef3fa063252e6dad88473613abbd829e8c24d
Parents: c0d9c97
Author: Jay Zhuang 
Authored: Wed Nov 14 14:25:14 2018 -0800
Committer: Jay Zhuang 
Committed: Thu Dec 6 19:01:20 2018 -0800

--
 stress_tool_test.py | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/325ef3fa/stress_tool_test.py
--
diff --git a/stress_tool_test.py b/stress_tool_test.py
index 9a1ccd2..7d15c4d 100644
--- a/stress_tool_test.py
+++ b/stress_tool_test.py
@@ -54,3 +54,19 @@ class TestStressSparsenessRatio(Tester):
 num_results = sum(len(row) for row in written)
 
 assert abs(float(num_nones) / num_results - expected_ratio) <= delta
+
+
+@since('3.0')
+class TestStressWrite(Tester):
+
+@pytest.mark.timeout(3 * 60)
+def test_quick_write(self):
+"""
+@jira_ticket CASSANDRA-14890
+A simple write stress test should be done very quickly
+"""
+self.cluster.populate(1).start(wait_for_binary_proto=True)
+node = self.cluster.nodelist()[0]
+node.stress(['write', 'err<0.9', 'n>1', '-rate', 'threads=1'])
+out, err, _ = node.run_cqlsh('describe table keyspace1.standard1')
+assert 'standard1' in out


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

[2/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[jzhuang]

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: 6a449b88d9ca7e6a73a9335c9983301f8e72bcff
Parents: 8961246 bbf7dac
Author: Jay Zhuang 
Authored: Thu Dec 6 16:39:50 2018 -0800
Committer: Jay Zhuang 
Committed: Thu Dec 6 16:42:41 2018 -0800

--
 CHANGES.txt| 1 +
 tools/stress/src/org/apache/cassandra/stress/StressAction.java | 6 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a449b88/CHANGES.txt
--
diff --cc CHANGES.txt
index 57d493b,f9b59df..369d96e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,7 +1,9 @@@
 -3.0.18
 +3.11.4
 + * Make stop-server.bat wait for Cassandra to terminate (CASSANDRA-14829)
 + * Correct sstable sorting for garbagecollect and levelled compaction 
(CASSANDRA-14870)
 +Merged from 3.0:
+  * Fix cassandra-stress write hang with default options (CASSANDRA-14616)
   * Differentiate between slices and RTs when decoding legacy bounds 
(CASSANDRA-14919)
 - * CommitLogReplayer.handleReplayError should print stack traces 
(CASSANDRA-14589)
   * Netty epoll IOExceptions caused by unclean client disconnects being logged 
at INFO (CASSANDRA-14909)
   * Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty 
(CASSANDRA-14588)
   * RangeTombstoneList doesn't properly clean up mergeable or superseded rts 
in some cases (CASSANDRA-14894)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a449b88/tools/stress/src/org/apache/cassandra/stress/StressAction.java
--
diff --cc tools/stress/src/org/apache/cassandra/stress/StressAction.java
index 670c187,657117c..4e268eb
--- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
@@@ -101,11 -90,15 +101,15 @@@ public class StressAction implements Ru
  }
  
  // type provided separately to support recursive call for mixed command 
with each command type it is performing
 +@SuppressWarnings("resource") // warmupOutput doesn't need closing
  private void warmup(OpDistributionFactory operations)
  {
 -PrintStream warmupOutput = new PrintStream(new OutputStream() { 
@Override public void write(int b) throws IOException { } } );
  // do 25% of iterations as warmup but no more than 50k (by default 
hotspot compiles methods after 10k invocations)
- int iterations = Math.min(5, (int) (settings.command.count * 
0.25)) * settings.node.nodes.size();
+ int iterations = (settings.command.count >= 0
+   ? Math.min(5, (int)(settings.command.count * 
0.25))
+   : 5) * settings.node.nodes.size();
+ if (iterations <= 0) return;
+ 
  int threads = 100;
  
  if (settings.rate.maxThreads > 0)


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

[1/3] cassandra git commit: Fix cassandra-stress hang with default options

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 82305d1c3 -> 4dd7faa75


Fix cassandra-stress hang with default options

patch by Jay Zhuang; reviewed by Stefania Alborghetti for CASSANDRA-14616


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

Branch: refs/heads/trunk
Commit: bbf7dac87cdc41bf8e138a99f630e7a827ad0d98
Parents: 1104361
Author: Jay Zhuang 
Authored: Wed Nov 14 11:43:58 2018 -0800
Committer: Jay Zhuang 
Committed: Thu Dec 6 16:34:55 2018 -0800

--
 CHANGES.txt| 1 +
 tools/stress/src/org/apache/cassandra/stress/StressAction.java | 6 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbf7dac8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4520989..f9b59df 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.18
+ * Fix cassandra-stress write hang with default options (CASSANDRA-14616)
  * Differentiate between slices and RTs when decoding legacy bounds 
(CASSANDRA-14919)
  * CommitLogReplayer.handleReplayError should print stack traces 
(CASSANDRA-14589)
  * Netty epoll IOExceptions caused by unclean client disconnects being logged 
at INFO (CASSANDRA-14909)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbf7dac8/tools/stress/src/org/apache/cassandra/stress/StressAction.java
--
diff --git a/tools/stress/src/org/apache/cassandra/stress/StressAction.java 
b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
index 8b15e92..657117c 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
@@ -94,7 +94,11 @@ public class StressAction implements Runnable
 {
 PrintStream warmupOutput = new PrintStream(new OutputStream() { 
@Override public void write(int b) throws IOException { } } );
 // do 25% of iterations as warmup but no more than 50k (by default 
hotspot compiles methods after 10k invocations)
-int iterations = Math.min(5, (int) (settings.command.count * 
0.25)) * settings.node.nodes.size();
+int iterations = (settings.command.count >= 0
+  ? Math.min(5, (int)(settings.command.count * 
0.25))
+  : 5) * settings.node.nodes.size();
+if (iterations <= 0) return;
+
 int threads = 100;
 
 if (settings.rate.maxThreads > 0)


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

[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jzhuang]

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 4dd7faa75210f635af36c0852e9b0d2e8bdbb95c
Parents: 82305d1 6a449b8
Author: Jay Zhuang 
Authored: Thu Dec 6 16:43:48 2018 -0800
Committer: Jay Zhuang 
Committed: Thu Dec 6 16:48:25 2018 -0800

--
 CHANGES.txt| 1 +
 tools/stress/src/org/apache/cassandra/stress/StressAction.java | 6 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dd7faa7/CHANGES.txt
--
diff --cc CHANGES.txt
index 847e772,369d96e..75b05ea
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -338,6 -2,8 +338,7 @@@
   * Make stop-server.bat wait for Cassandra to terminate (CASSANDRA-14829)
   * Correct sstable sorting for garbagecollect and levelled compaction 
(CASSANDRA-14870)
  Merged from 3.0:
+  * Fix cassandra-stress write hang with default options (CASSANDRA-14616)
 - * Differentiate between slices and RTs when decoding legacy bounds 
(CASSANDRA-14919)
   * Netty epoll IOExceptions caused by unclean client disconnects being logged 
at INFO (CASSANDRA-14909)
   * Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty 
(CASSANDRA-14588)
   * RangeTombstoneList doesn't properly clean up mergeable or superseded rts 
in some cases (CASSANDRA-14894)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dd7faa7/tools/stress/src/org/apache/cassandra/stress/StressAction.java
--


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

cassandra git commit: Fix cassandra-stress hang with default options

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 11043610e -> bbf7dac87


Fix cassandra-stress hang with default options

patch by Jay Zhuang; reviewed by Stefania Alborghetti for CASSANDRA-14616


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

Branch: refs/heads/cassandra-3.0
Commit: bbf7dac87cdc41bf8e138a99f630e7a827ad0d98
Parents: 1104361
Author: Jay Zhuang 
Authored: Wed Nov 14 11:43:58 2018 -0800
Committer: Jay Zhuang 
Committed: Thu Dec 6 16:34:55 2018 -0800

--
 CHANGES.txt| 1 +
 tools/stress/src/org/apache/cassandra/stress/StressAction.java | 6 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbf7dac8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4520989..f9b59df 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.18
+ * Fix cassandra-stress write hang with default options (CASSANDRA-14616)
  * Differentiate between slices and RTs when decoding legacy bounds 
(CASSANDRA-14919)
  * CommitLogReplayer.handleReplayError should print stack traces 
(CASSANDRA-14589)
  * Netty epoll IOExceptions caused by unclean client disconnects being logged 
at INFO (CASSANDRA-14909)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbf7dac8/tools/stress/src/org/apache/cassandra/stress/StressAction.java
--
diff --git a/tools/stress/src/org/apache/cassandra/stress/StressAction.java 
b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
index 8b15e92..657117c 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
@@ -94,7 +94,11 @@ public class StressAction implements Runnable
 {
 PrintStream warmupOutput = new PrintStream(new OutputStream() { 
@Override public void write(int b) throws IOException { } } );
 // do 25% of iterations as warmup but no more than 50k (by default 
hotspot compiles methods after 10k invocations)
-int iterations = Math.min(5, (int) (settings.command.count * 
0.25)) * settings.node.nodes.size();
+int iterations = (settings.command.count >= 0
+  ? Math.min(5, (int)(settings.command.count * 
0.25))
+  : 5) * settings.node.nodes.size();
+if (iterations <= 0) return;
+
 int threads = 100;
 
 if (settings.rate.maxThreads > 0)


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

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

[jzhuang]

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 6a449b88d9ca7e6a73a9335c9983301f8e72bcff
Parents: 8961246 bbf7dac
Author: Jay Zhuang 
Authored: Thu Dec 6 16:39:50 2018 -0800
Committer: Jay Zhuang 
Committed: Thu Dec 6 16:42:41 2018 -0800

--
 CHANGES.txt| 1 +
 tools/stress/src/org/apache/cassandra/stress/StressAction.java | 6 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a449b88/CHANGES.txt
--
diff --cc CHANGES.txt
index 57d493b,f9b59df..369d96e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,7 +1,9 @@@
 -3.0.18
 +3.11.4
 + * Make stop-server.bat wait for Cassandra to terminate (CASSANDRA-14829)
 + * Correct sstable sorting for garbagecollect and levelled compaction 
(CASSANDRA-14870)
 +Merged from 3.0:
+  * Fix cassandra-stress write hang with default options (CASSANDRA-14616)
   * Differentiate between slices and RTs when decoding legacy bounds 
(CASSANDRA-14919)
 - * CommitLogReplayer.handleReplayError should print stack traces 
(CASSANDRA-14589)
   * Netty epoll IOExceptions caused by unclean client disconnects being logged 
at INFO (CASSANDRA-14909)
   * Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty 
(CASSANDRA-14588)
   * RangeTombstoneList doesn't properly clean up mergeable or superseded rts 
in some cases (CASSANDRA-14894)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a449b88/tools/stress/src/org/apache/cassandra/stress/StressAction.java
--
diff --cc tools/stress/src/org/apache/cassandra/stress/StressAction.java
index 670c187,657117c..4e268eb
--- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
@@@ -101,11 -90,15 +101,15 @@@ public class StressAction implements Ru
  }
  
  // type provided separately to support recursive call for mixed command 
with each command type it is performing
 +@SuppressWarnings("resource") // warmupOutput doesn't need closing
  private void warmup(OpDistributionFactory operations)
  {
 -PrintStream warmupOutput = new PrintStream(new OutputStream() { 
@Override public void write(int b) throws IOException { } } );
  // do 25% of iterations as warmup but no more than 50k (by default 
hotspot compiles methods after 10k invocations)
- int iterations = Math.min(5, (int) (settings.command.count * 
0.25)) * settings.node.nodes.size();
+ int iterations = (settings.command.count >= 0
+   ? Math.min(5, (int)(settings.command.count * 
0.25))
+   : 5) * settings.node.nodes.size();
+ if (iterations <= 0) return;
+ 
  int threads = 100;
  
  if (settings.rate.maxThreads > 0)


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

[1/2] cassandra git commit: Fix cassandra-stress hang with default options

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 8961246db -> 6a449b88d


Fix cassandra-stress hang with default options

patch by Jay Zhuang; reviewed by Stefania Alborghetti for CASSANDRA-14616


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

Branch: refs/heads/cassandra-3.11
Commit: bbf7dac87cdc41bf8e138a99f630e7a827ad0d98
Parents: 1104361
Author: Jay Zhuang 
Authored: Wed Nov 14 11:43:58 2018 -0800
Committer: Jay Zhuang 
Committed: Thu Dec 6 16:34:55 2018 -0800

--
 CHANGES.txt| 1 +
 tools/stress/src/org/apache/cassandra/stress/StressAction.java | 6 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbf7dac8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4520989..f9b59df 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.18
+ * Fix cassandra-stress write hang with default options (CASSANDRA-14616)
  * Differentiate between slices and RTs when decoding legacy bounds 
(CASSANDRA-14919)
  * CommitLogReplayer.handleReplayError should print stack traces 
(CASSANDRA-14589)
  * Netty epoll IOExceptions caused by unclean client disconnects being logged 
at INFO (CASSANDRA-14909)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbf7dac8/tools/stress/src/org/apache/cassandra/stress/StressAction.java
--
diff --git a/tools/stress/src/org/apache/cassandra/stress/StressAction.java 
b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
index 8b15e92..657117c 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
@@ -94,7 +94,11 @@ public class StressAction implements Runnable
 {
 PrintStream warmupOutput = new PrintStream(new OutputStream() { 
@Override public void write(int b) throws IOException { } } );
 // do 25% of iterations as warmup but no more than 50k (by default 
hotspot compiles methods after 10k invocations)
-int iterations = Math.min(5, (int) (settings.command.count * 
0.25)) * settings.node.nodes.size();
+int iterations = (settings.command.count >= 0
+  ? Math.min(5, (int)(settings.command.count * 
0.25))
+  : 5) * settings.node.nodes.size();
+if (iterations <= 0) return;
+
 int threads = 100;
 
 if (settings.rate.maxThreads > 0)


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

cassandra git commit: Create Temporary folder for CompressedInputStreamTest

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/trunk a9138c5e9 -> 73ebd200c


Create Temporary folder for CompressedInputStreamTest

Use JUnit temporary folder which will be auto deleted after the test.

patch by Jay Zhuang; reviewed by Marcus Eriksson for CASSANDRA-14791


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

Branch: refs/heads/trunk
Commit: 73ebd200c04335624f956e79624cf8494d872f19
Parents: a9138c5
Author: Jay Zhuang 
Authored: Sun Oct 7 16:16:38 2018 -0700
Committer: Jay Zhuang 
Committed: Mon Oct 8 08:47:11 2018 -0700

--
 .../streaming/compression/CompressedInputStreamTest.java  | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/73ebd200/test/unit/org/apache/cassandra/streaming/compression/CompressedInputStreamTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/streaming/compression/CompressedInputStreamTest.java
 
b/test/unit/org/apache/cassandra/streaming/compression/CompressedInputStreamTest.java
index 14321fa..be443b5 100644
--- 
a/test/unit/org/apache/cassandra/streaming/compression/CompressedInputStreamTest.java
+++ 
b/test/unit/org/apache/cassandra/streaming/compression/CompressedInputStreamTest.java
@@ -21,7 +21,9 @@ import java.io.*;
 import java.util.*;
 
 import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.ClusteringComparator;
@@ -47,6 +49,9 @@ import static org.junit.Assert.fail;
  */
 public class CompressedInputStreamTest
 {
+@Rule
+public TemporaryFolder tempFolder = new TemporaryFolder();
+
 @BeforeClass
 public static void setupDD()
 {
@@ -109,7 +114,7 @@ public class CompressedInputStreamTest
 assert valuesToCheck != null && valuesToCheck.length > 0;
 
 // write compressed data file of longs
-File parentDir = FileUtils.getTempDir();
+File parentDir = tempFolder.newFolder();
 Descriptor desc = new Descriptor(parentDir, "ks", "cf", 1);
 File tmp = new File(desc.filenameFor(Component.DATA));
 MetadataCollector collector = new MetadataCollector(new 
ClusteringComparator(BytesType.instance));


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

cassandra git commit: Enable snapshot artifacts publish

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 29f83b888 -> 87abe


Enable snapshot artifacts publish

So "ant publish" is able to upload snapshot artifacts to artifactory.

patch by Jay Zhuang; reviewed by Mick Semb Wever for CASSANDRA-12704


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

Branch: refs/heads/trunk
Commit: 87abe7249f7ad8b11235d61e048735bd6d62
Parents: 29f83b8
Author: Jay Zhuang 
Authored: Tue Oct 4 14:26:18 2016 -0700
Committer: Jay Zhuang 
Committed: Thu Sep 27 17:39:22 2018 -0700

--
 CHANGES.txt | 1 +
 build.xml   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/87ab/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index e227c40..0d3571d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0
+ * Enable snapshot artifacts publish (CASSANDRA-12704)
  * Introduce RangesAtEndpoint.unwrap to simplify 
StreamSession.addTransferRanges (CASSANDRA-14770)
  * LOCAL_QUORUM may speculate to non-local nodes, resulting in Timeout instead 
of Unavailable (CASSANDRA-14735)
  * Avoid creating empty compaction tasks after truncate (CASSANDRA-14780)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/87ab/build.xml
--
diff --git a/build.xml b/build.xml
index 86462f7..28c33bf 100644
--- a/build.xml
+++ b/build.xml
@@ -2038,7 +2038,6 @@
 
   
 
 


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

cassandra git commit: Improve BTree build performance by avoiding data copy

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/trunk f25a765b6 -> 2e59ea8c7


Improve BTree build performance by avoiding data copy

patch by Jay Zhuang; reviewed by Benedict for CASSANDRA-9989


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

Branch: refs/heads/trunk
Commit: 2e59ea8c7f21cb11b7ce71a5cdf303a8ed453bc0
Parents: f25a765
Author: Jay Zhuang 
Authored: Tue Jun 12 14:10:06 2018 -0700
Committer: Jay Zhuang 
Committed: Thu Aug 30 07:48:10 2018 -0700

--
 CHANGES.txt |   1 +
 build.xml   |   2 +-
 .../org/apache/cassandra/utils/btree/BTree.java | 129 +++-
 .../cassandra/utils/btree/TreeBuilder.java  |  28 +-
 .../apache/cassandra/utils/LongBTreeTest.java   | 226 ---
 .../test/microbench/BTreeBuildBench.java|   6 +
 .../org/apache/cassandra/utils/BTreeTest.java   | 503 ---
 .../apache/cassandra/utils/btree/BTreeTest.java | 608 +++
 8 files changed, 860 insertions(+), 643 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e59ea8c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 1e8e91d..5fb84a2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0
+ * Improve BTree build performance by avoiding data copy (CASSANDRA-9989)
  * Make monotonic read / read repair configurable (CASSANDRA-14635)
  * Refactor CompactionStrategyManager (CASSANDRA-14621)
  * Flush netty client messages immediately by default (CASSANDRA-13651)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e59ea8c/build.xml
--
diff --git a/build.xml b/build.xml
index 5fb9edf..b53c47b 100644
--- a/build.xml
+++ b/build.xml
@@ -102,7 +102,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e59ea8c/src/java/org/apache/cassandra/utils/btree/BTree.java
--
diff --git a/src/java/org/apache/cassandra/utils/btree/BTree.java 
b/src/java/org/apache/cassandra/utils/btree/BTree.java
index 0c620bc..6d0af6e 100644
--- a/src/java/org/apache/cassandra/utils/btree/BTree.java
+++ b/src/java/org/apache/cassandra/utils/btree/BTree.java
@@ -34,6 +34,7 @@ import static com.google.common.collect.Iterables.filter;
 import static com.google.common.collect.Iterables.transform;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
+import static java.util.Comparator.naturalOrder;
 
 public class BTree
 {
@@ -57,18 +58,42 @@ public class BTree
 
 // The maximum fan factor used for B-Trees
 static final int FAN_SHIFT;
+
+// The maximun tree size for certain heigth of tree
+static final int[] TREE_SIZE;
+
+// NB we encode Path indexes as Bytes, so this needs to be less than 
Byte.MAX_VALUE / 2
+static final int FAN_FACTOR;
+
+static final int MAX_TREE_SIZE = Integer.MAX_VALUE;
+
 static
 {
-int fanfactor = 32;
-if (System.getProperty("cassandra.btree.fanfactor") != null)
-fanfactor = 
Integer.parseInt(System.getProperty("cassandra.btree.fanfactor"));
+int fanfactor = 
Integer.parseInt(System.getProperty("cassandra.btree.fanfactor", "32"));
+assert fanfactor >= 2 : "the minimal btree fanfactor is 2";
 int shift = 1;
 while (1 << shift < fanfactor)
 shift += 1;
+
 FAN_SHIFT = shift;
+FAN_FACTOR = 1 << FAN_SHIFT;
+
+// For current FAN_FACTOR, calculate the maximum height of the tree we 
could build
+int maxHeight = 0;
+for (long maxSize = 0; maxSize < MAX_TREE_SIZE; maxHeight++)
+// each tree node could have (FAN_FACTOR + 1) children,
+// plus current node could have FAN_FACTOR number of values
+maxSize = maxSize * (FAN_FACTOR + 1) + FAN_FACTOR;
+
+TREE_SIZE = new int[maxHeight];
+
+TREE_SIZE[0] = FAN_FACTOR;
+for (int i = 1; i < maxHeight - 1; i++)
+TREE_SIZE[i] = TREE_SIZE[i - 1] * (FAN_FACTOR + 1) + FAN_FACTOR;
+
+TREE_SIZE[maxHeight - 1] = MAX_TREE_SIZE;
 }
-// NB we encode Path indexes as Bytes, so this needs to be less than 
Byte.MAX_VALUE / 2
-static final int FAN_FACTOR = 1 << FAN_SHIFT;
+
 
 static final int MINIMAL_NODE_SIZE = FAN_FACTOR >> 1;
 
@@ -102,11 +127,6 @@ public class BTree
 return buildInternal(source, source.size(), updateF);
 }
 
-public static  Object[] build(Iterable 
source, UpdateFunction updateF)
-{
- 

cassandra-dtest git commit: test_mutation_v5: test protocol version v5 since 4.0

[jzhuang]

Repository: cassandra-dtest
Updated Branches:
  refs/heads/master 17e0656a9 -> 2572ddce6


test_mutation_v5: test protocol version v5 since 4.0

v5 protocol introduced result_metadata_id in prepared statement
response in 4.0: CASSANDRA-10786. New driver is unable to parse response
from 3.10, 3.11.

patch by Jay Zhuang; reviewed by Jason Brown for CASSANDRA-14596


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

Branch: refs/heads/master
Commit: 2572ddce6c9a33ae81e1543195bfae084f835d6d
Parents: 17e0656
Author: Jay Zhuang 
Authored: Wed Aug 1 16:02:07 2018 -0700
Committer: Jay Zhuang 
Committed: Fri Aug 10 15:40:16 2018 -0700

--
 write_failures_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/2572ddce/write_failures_test.py
--
diff --git a/write_failures_test.py b/write_failures_test.py
index bb2deb8..3ae721b 100644
--- a/write_failures_test.py
+++ b/write_failures_test.py
@@ -126,7 +126,7 @@ class TestWriteFailures(Tester):
 self.protocol_version = 4
 self._perform_cql_statement("INSERT INTO mytable (key, value) VALUES 
('key1', 'Value 1')")
 
-@since('3.10')
+@since('4.0')
 def test_mutation_v5(self):
 """
 A failed mutation at v5 receives a WriteFailure with an error code map 
containing error code 0x


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

cassandra-dtest git commit: TestAuth: shutdown client before cluster stop

[jzhuang]

Repository: cassandra-dtest
Updated Branches:
  refs/heads/master 79d8ddd4a -> 17e0656a9


TestAuth: shutdown client before cluster stop

patch by Jay Zhuang; reviewed by Jason Brown for CASSANDRA-14600


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

Branch: refs/heads/master
Commit: 17e0656a948d52cc55a40e8bf6dc139dd5fa6920
Parents: 79d8ddd
Author: Jay Zhuang 
Authored: Sat Jul 28 18:56:56 2018 -0700
Committer: Jay Zhuang 
Committed: Mon Jul 30 10:32:15 2018 -0700

--
 auth_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/17e0656a/auth_test.py
--
diff --git a/auth_test.py b/auth_test.py
index 8d82b63..f2cd844 100644
--- a/auth_test.py
+++ b/auth_test.py
@@ -69,8 +69,8 @@ class TestAuth(Tester):
 logger.debug("Repairing before altering RF")
 self.cluster.repair()
 
-logger.debug("Shutting down client session")
-session.shutdown()
+logger.debug("Shutting down client cluster")
+session.cluster.shutdown()
 
 # make sure schema change is persistent
 logger.debug("Stopping cluster..")


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

cassandra-dtest git commit: paging_test: use function to check protocol v5 support

[jzhuang]

Repository: cassandra-dtest
Updated Branches:
  refs/heads/master c13a78c53 -> 79d8ddd4a


paging_test: use function to check protocol v5 support

patch by Jay Zhuang; reviewed by Jason Brown for CASSANDRA-14601


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

Branch: refs/heads/master
Commit: 79d8ddd4a418c52d913ccd5f535f75228877301d
Parents: c13a78c
Author: Jay Zhuang 
Authored: Sat Jul 28 21:14:09 2018 -0700
Committer: Jay Zhuang 
Committed: Mon Jul 30 10:26:01 2018 -0700

--
 paging_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/79d8ddd4/paging_test.py
--
diff --git a/paging_test.py b/paging_test.py
index d41b8f3..6be3f7d 100644
--- a/paging_test.py
+++ b/paging_test.py
@@ -3419,7 +3419,7 @@ class TestPagingWithDeletions(BasePagingTester, 
PageAssertionMixin):
 
 def test_failure_threshold_deletions(self):
 """Test that paging throws a failure in case of tombstone threshold """
-supports_v5_protocol = self.cluster.version() >= LooseVersion('3.10')
+supports_v5_protocol = 
self.supports_v5_protocol(self.cluster.version())
 
 self.fixture_dtest_setup.allow_log_errors = True
 self.cluster.set_configuration_options(


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

cassandra-dtest git commit: test_describecluster_more_information_three_datacenters only for 4.0

[jzhuang]

Repository: cassandra-dtest
Updated Branches:
  refs/heads/master d291b2b90 -> bed040c54


test_describecluster_more_information_three_datacenters only for 4.0

patch by Jay Zhuang; reviewed by Jason Brown for CASSANDRA-14484


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

Branch: refs/heads/master
Commit: bed040c543b25984d9bcaf87e597fc1315b59008
Parents: d291b2b
Author: Jay Zhuang 
Authored: Fri Jul 27 13:55:46 2018 -0700
Committer: Jay Zhuang 
Committed: Sat Jul 28 21:44:51 2018 -0700

--
 nodetool_test.py | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/bed040c5/nodetool_test.py
--
diff --git a/nodetool_test.py b/nodetool_test.py
index 457f0bf..d6446e9 100644
--- a/nodetool_test.py
+++ b/nodetool_test.py
@@ -330,6 +330,7 @@ class TestNodetool(Tester):
 else:
 self.fail("Expected error when setting and invalid value")
 
+@since('4.0')
 def test_describecluster_more_information_three_datacenters(self):
 """
 nodetool describecluster should be more informative. It should include 
detailes


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

[2/6] cassandra git commit: Revert "use zero as default score in DynamicEndpointSnitch" from 3.0 and 3.11

[jzhuang]

Revert "use zero as default score in DynamicEndpointSnitch" from 3.0 and 3.11

This reverts commit 15bd10afbfc5eda024e7048438b00bfc81a9e3ea.

More details CASSANDRA-14555


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

Branch: refs/heads/cassandra-3.11
Commit: 8ead7af140c778542d3ea1244675320cd22b3042
Parents: a4b8d1e
Author: Jay Zhuang 
Authored: Thu Jul 5 09:38:17 2018 -0700
Committer: Jay Zhuang 
Committed: Thu Jul 5 09:38:17 2018 -0700

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java   | 2 +-
 .../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java| 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ead7af1/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 00944dc..6f6ae20 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,7 +19,6 @@
  * Handle all exceptions when opening sstables (CASSANDRA-14202)
  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ead7af1/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
--
diff --git a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java 
b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
index 5356e8c..8c255f5 100644
--- a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
+++ b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
@@ -186,7 +186,7 @@ public class DynamicEndpointSnitch extends 
AbstractEndpointSnitch implements ILa
 {
 Double score = scores.get(inet);
 if (score == null)
-score = 0.0;
+continue;
 subsnitchOrderedScores.add(score);
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ead7af1/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java 
b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
index 866cd82..af7dc17 100644
--- a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
+++ b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
@@ -92,7 +92,7 @@ public class DynamicEndpointSnitchTest
 assertEquals(order, dsnitch.getSortedListByProximity(self, 
Arrays.asList(host1, host2, host3, host4)));
 
 setScores(dsnitch, 20, hosts, 10, 10, 10);
-order = Arrays.asList(host4, host1, host2, host3);
+order = Arrays.asList(host1, host2, host3, host4);
 assertEquals(order, dsnitch.getSortedListByProximity(self, 
Arrays.asList(host1, host2, host3, host4)));
 }
 }


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

[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[jzhuang]

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 847b84323962b57699ccbbad21207c85ab392681
Parents: 942fe3f 8ead7af
Author: Jay Zhuang 
Authored: Thu Jul 5 09:42:05 2018 -0700
Committer: Jay Zhuang 
Committed: Thu Jul 5 09:58:31 2018 -0700

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java   | 2 +-
 .../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java| 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/847b8432/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/847b8432/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
--


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

[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jzhuang]

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 28217f8576d416fa8fff9f695058750e2bb943df
Parents: 9e3b886 847b843
Author: Jay Zhuang 
Authored: Thu Jul 5 10:01:12 2018 -0700
Committer: Jay Zhuang 
Committed: Thu Jul 5 10:01:12 2018 -0700

--

--



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

[3/6] cassandra git commit: Revert "use zero as default score in DynamicEndpointSnitch" from 3.0 and 3.11

[jzhuang]

Revert "use zero as default score in DynamicEndpointSnitch" from 3.0 and 3.11

This reverts commit 15bd10afbfc5eda024e7048438b00bfc81a9e3ea.

More details CASSANDRA-14555


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

Branch: refs/heads/trunk
Commit: 8ead7af140c778542d3ea1244675320cd22b3042
Parents: a4b8d1e
Author: Jay Zhuang 
Authored: Thu Jul 5 09:38:17 2018 -0700
Committer: Jay Zhuang 
Committed: Thu Jul 5 09:38:17 2018 -0700

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java   | 2 +-
 .../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java| 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ead7af1/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 00944dc..6f6ae20 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,7 +19,6 @@
  * Handle all exceptions when opening sstables (CASSANDRA-14202)
  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ead7af1/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
--
diff --git a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java 
b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
index 5356e8c..8c255f5 100644
--- a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
+++ b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
@@ -186,7 +186,7 @@ public class DynamicEndpointSnitch extends 
AbstractEndpointSnitch implements ILa
 {
 Double score = scores.get(inet);
 if (score == null)
-score = 0.0;
+continue;
 subsnitchOrderedScores.add(score);
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ead7af1/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java 
b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
index 866cd82..af7dc17 100644
--- a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
+++ b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
@@ -92,7 +92,7 @@ public class DynamicEndpointSnitchTest
 assertEquals(order, dsnitch.getSortedListByProximity(self, 
Arrays.asList(host1, host2, host3, host4)));
 
 setScores(dsnitch, 20, hosts, 10, 10, 10);
-order = Arrays.asList(host4, host1, host2, host3);
+order = Arrays.asList(host1, host2, host3, host4);
 assertEquals(order, dsnitch.getSortedListByProximity(self, 
Arrays.asList(host1, host2, host3, host4)));
 }
 }


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

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[jzhuang]

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: 847b84323962b57699ccbbad21207c85ab392681
Parents: 942fe3f 8ead7af
Author: Jay Zhuang 
Authored: Thu Jul 5 09:42:05 2018 -0700
Committer: Jay Zhuang 
Committed: Thu Jul 5 09:58:31 2018 -0700

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java   | 2 +-
 .../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java| 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/847b8432/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/847b8432/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
--


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

[1/6] cassandra git commit: Revert "use zero as default score in DynamicEndpointSnitch" from 3.0 and 3.11

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 a4b8d1e9b -> 8ead7af14
  refs/heads/cassandra-3.11 942fe3fb3 -> 847b84323
  refs/heads/trunk 9e3b88646 -> 28217f857


Revert "use zero as default score in DynamicEndpointSnitch" from 3.0 and 3.11

This reverts commit 15bd10afbfc5eda024e7048438b00bfc81a9e3ea.

More details CASSANDRA-14555


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

Branch: refs/heads/cassandra-3.0
Commit: 8ead7af140c778542d3ea1244675320cd22b3042
Parents: a4b8d1e
Author: Jay Zhuang 
Authored: Thu Jul 5 09:38:17 2018 -0700
Committer: Jay Zhuang 
Committed: Thu Jul 5 09:38:17 2018 -0700

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java   | 2 +-
 .../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java| 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ead7af1/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 00944dc..6f6ae20 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,7 +19,6 @@
  * Handle all exceptions when opening sstables (CASSANDRA-14202)
  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ead7af1/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
--
diff --git a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java 
b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
index 5356e8c..8c255f5 100644
--- a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
+++ b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
@@ -186,7 +186,7 @@ public class DynamicEndpointSnitch extends 
AbstractEndpointSnitch implements ILa
 {
 Double score = scores.get(inet);
 if (score == null)
-score = 0.0;
+continue;
 subsnitchOrderedScores.add(score);
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ead7af1/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java 
b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
index 866cd82..af7dc17 100644
--- a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
+++ b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
@@ -92,7 +92,7 @@ public class DynamicEndpointSnitchTest
 assertEquals(order, dsnitch.getSortedListByProximity(self, 
Arrays.asList(host1, host2, host3, host4)));
 
 setScores(dsnitch, 20, hosts, 10, 10, 10);
-order = Arrays.asList(host4, host1, host2, host3);
+order = Arrays.asList(host1, host2, host3, host4);
 assertEquals(order, dsnitch.getSortedListByProximity(self, 
Arrays.asList(host1, host2, host3, host4)));
 }
 }


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

cassandra git commit: Bump the hints messaging version to match the current one

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 5cc68a873 -> 062ca4c7c


Bump the hints messaging version to match the current one

patch by Jay Zhuang; reviewed by Aleksey Yeschenko for CASSANDRA-14536


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

Branch: refs/heads/trunk
Commit: 062ca4c7ca753ce1cee08cdc264588208ee2a23c
Parents: 5cc68a8
Author: Jay Zhuang 
Authored: Thu Jun 21 17:33:12 2018 -0700
Committer: Jay Zhuang 
Committed: Mon Jul 2 10:27:27 2018 -0700

--
 CHANGES.txt|  1 +
 .../org/apache/cassandra/hints/HintsDescriptor.java|  5 -
 .../apache/cassandra/hints/HintsDescriptorTest.java| 13 +
 3 files changed, 18 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/062ca4c7/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 856672c..491792e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0
+ * Bump the hints messaging version to match the current one (CASSANDRA-14536)
  * OffsetAwareConfigurationLoader doesn't set ssl storage port causing bind 
errors in CircleCI (CASSANDRA-14546)
  * Report why native_transport_port fails to bind (CASSANDRA-14544)
  * Optimize internode messaging protocol (CASSANDRA-14485)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/062ca4c7/src/java/org/apache/cassandra/hints/HintsDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/hints/HintsDescriptor.java 
b/src/java/org/apache/cassandra/hints/HintsDescriptor.java
index dd56232..12d9598 100644
--- a/src/java/org/apache/cassandra/hints/HintsDescriptor.java
+++ b/src/java/org/apache/cassandra/hints/HintsDescriptor.java
@@ -61,7 +61,8 @@ final class HintsDescriptor
 private static final Logger logger = 
LoggerFactory.getLogger(HintsDescriptor.class);
 
 static final int VERSION_30 = 1;
-static final int CURRENT_VERSION = VERSION_30;
+static final int VERSION_40 = 2;
+static final int CURRENT_VERSION = VERSION_40;
 
 static final String COMPRESSION = "compression";
 static final String ENCRYPTION = "encryption";
@@ -215,6 +216,8 @@ final class HintsDescriptor
 {
 case VERSION_30:
 return MessagingService.VERSION_30;
+case VERSION_40:
+return MessagingService.VERSION_40;
 default:
 throw new AssertionError();
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/062ca4c7/test/unit/org/apache/cassandra/hints/HintsDescriptorTest.java
--
diff --git a/test/unit/org/apache/cassandra/hints/HintsDescriptorTest.java 
b/test/unit/org/apache/cassandra/hints/HintsDescriptorTest.java
index 08487d1..2d9f972 100644
--- a/test/unit/org/apache/cassandra/hints/HintsDescriptorTest.java
+++ b/test/unit/org/apache/cassandra/hints/HintsDescriptorTest.java
@@ -29,9 +29,11 @@ import org.junit.Test;
 
 import org.apache.cassandra.io.compress.LZ4Compressor;
 import org.apache.cassandra.io.util.DataOutputBuffer;
+import org.apache.cassandra.net.MessagingService;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotSame;
+import static junit.framework.Assert.assertTrue;
 import static junit.framework.Assert.fail;
 
 public class HintsDescriptorTest
@@ -115,6 +117,17 @@ public class HintsDescriptorTest
 }
 }
 
+@Test
+public void testMessagingVersion()
+{
+String errorMsg = "Please update the current Hints messaging version 
to match the current messaging version";
+int messageVersion = 
HintsDescriptor.messagingVersion(HintsDescriptor.CURRENT_VERSION);
+assertEquals(errorMsg, messageVersion, 
MessagingService.current_version);
+
+HintsDescriptor descriptor = new HintsDescriptor(UUID.randomUUID(), 
HintsDescriptor.CURRENT_VERSION, System.currentTimeMillis(), ImmutableMap.of());
+assertEquals(errorMsg, descriptor.messagingVersion(), 
MessagingService.current_version);
+}
+
 private static void testSerializeDeserializeLoop(HintsDescriptor 
descriptor) throws IOException
 {
 // serialize to a byte array


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

[2/3] cassandra git commit: Remove BTree.Builder Recycler to reduce memory usage

[jzhuang]

Remove BTree.Builder Recycler to reduce memory usage

patch by Jay Zhuang; reviewed by jasobrown for CASSANDRA-13929


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

Branch: refs/heads/trunk
Commit: ed5f8347ef0c7175cd96e59bc8bfaf3ed1f4697a
Parents: b174819
Author: Jay Zhuang 
Authored: Mon Jan 29 18:17:56 2018 -0800
Committer: Jay Zhuang 
Committed: Fri Jun 8 10:40:06 2018 -0700

--
 CHANGES.txt |  1 +
 build.xml   |  4 +-
 .../columniterator/SSTableReversedIterator.java |  2 +-
 .../org/apache/cassandra/db/rows/BTreeRow.java  |  2 +-
 .../cassandra/db/rows/ComplexColumnData.java|  5 +-
 .../org/apache/cassandra/utils/btree/BTree.java | 69 +-
 .../test/microbench/BTreeBuildBench.java| 96 
 .../org/apache/cassandra/utils/BTreeTest.java   | 33 ++-
 8 files changed, 161 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 2e77d2e..7f4b655 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.11.3
+ * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929)
  * Reduce nodetool GC thread count (CASSANDRA-14475)
  * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
  * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/build.xml
--
diff --git a/build.xml b/build.xml
index 4edfbb1..54c5372 100644
--- a/build.xml
+++ b/build.xml
@@ -422,8 +422,8 @@
   
 
 
-  
-  
+  
+  
 
   
   

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
--
diff --git 
a/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java 
b/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
index cf8798d..6a0b7be 100644
--- 
a/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
+++ 
b/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
@@ -426,7 +426,7 @@ public class SSTableReversedIterator extends 
AbstractSSTableIterator
 public void reset()
 {
 built = null;
-rowBuilder = BTree.builder(metadata.comparator);
+rowBuilder.reuse();
 deletionBuilder = 
MutableDeletionInfo.builder(partitionLevelDeletion, metadata().comparator, 
false);
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/src/java/org/apache/cassandra/db/rows/BTreeRow.java
--
diff --git a/src/java/org/apache/cassandra/db/rows/BTreeRow.java 
b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
index 15ac30a..c70e0e2 100644
--- a/src/java/org/apache/cassandra/db/rows/BTreeRow.java
+++ b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
@@ -738,7 +738,7 @@ public class BTreeRow extends AbstractRow
 this.clustering = null;
 this.primaryKeyLivenessInfo = LivenessInfo.EMPTY;
 this.deletion = Deletion.LIVE;
-this.cells_ = null;
+this.cells_.reuse();
 this.hasComplex = false;
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
--
diff --git a/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java 
b/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
index 380af7a..1395782 100644
--- a/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
+++ b/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
@@ -242,7 +242,10 @@ public class ComplexColumnData extends ColumnData 
implements Iterable
 {
 this.column = column;
 this.complexDeletion = DeletionTime.LIVE; // default if 
writeComplexDeletion is not called
-this.builder = BTree.builder(column.cellComparator());
+if (builder == null)
+builder = BTree.builder(column.cellComparator());
+else
+builder.reuse(column.cellComparator());
 }
 
 public void addComplexDeletion(DeletionTime 

[1/3] cassandra git commit: Remove BTree.Builder Recycler to reduce memory usage

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 b1748198e -> ed5f8347e
  refs/heads/trunk 800f0b394 -> 958e13d16


Remove BTree.Builder Recycler to reduce memory usage

patch by Jay Zhuang; reviewed by jasobrown for CASSANDRA-13929


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

Branch: refs/heads/cassandra-3.11
Commit: ed5f8347ef0c7175cd96e59bc8bfaf3ed1f4697a
Parents: b174819
Author: Jay Zhuang 
Authored: Mon Jan 29 18:17:56 2018 -0800
Committer: Jay Zhuang 
Committed: Fri Jun 8 10:40:06 2018 -0700

--
 CHANGES.txt |  1 +
 build.xml   |  4 +-
 .../columniterator/SSTableReversedIterator.java |  2 +-
 .../org/apache/cassandra/db/rows/BTreeRow.java  |  2 +-
 .../cassandra/db/rows/ComplexColumnData.java|  5 +-
 .../org/apache/cassandra/utils/btree/BTree.java | 69 +-
 .../test/microbench/BTreeBuildBench.java| 96 
 .../org/apache/cassandra/utils/BTreeTest.java   | 33 ++-
 8 files changed, 161 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 2e77d2e..7f4b655 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.11.3
+ * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929)
  * Reduce nodetool GC thread count (CASSANDRA-14475)
  * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
  * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/build.xml
--
diff --git a/build.xml b/build.xml
index 4edfbb1..54c5372 100644
--- a/build.xml
+++ b/build.xml
@@ -422,8 +422,8 @@
   
 
 
-  
-  
+  
+  
 
   
   

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
--
diff --git 
a/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java 
b/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
index cf8798d..6a0b7be 100644
--- 
a/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
+++ 
b/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
@@ -426,7 +426,7 @@ public class SSTableReversedIterator extends 
AbstractSSTableIterator
 public void reset()
 {
 built = null;
-rowBuilder = BTree.builder(metadata.comparator);
+rowBuilder.reuse();
 deletionBuilder = 
MutableDeletionInfo.builder(partitionLevelDeletion, metadata().comparator, 
false);
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/src/java/org/apache/cassandra/db/rows/BTreeRow.java
--
diff --git a/src/java/org/apache/cassandra/db/rows/BTreeRow.java 
b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
index 15ac30a..c70e0e2 100644
--- a/src/java/org/apache/cassandra/db/rows/BTreeRow.java
+++ b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
@@ -738,7 +738,7 @@ public class BTreeRow extends AbstractRow
 this.clustering = null;
 this.primaryKeyLivenessInfo = LivenessInfo.EMPTY;
 this.deletion = Deletion.LIVE;
-this.cells_ = null;
+this.cells_.reuse();
 this.hasComplex = false;
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
--
diff --git a/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java 
b/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
index 380af7a..1395782 100644
--- a/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
+++ b/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
@@ -242,7 +242,10 @@ public class ComplexColumnData extends ColumnData 
implements Iterable
 {
 this.column = column;
 this.complexDeletion = DeletionTime.LIVE; // default if 
writeComplexDeletion is not called
-this.builder = BTree.builder(column.cellComparator());
+if (builder == null)
+builder = 

[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jzhuang]

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 958e13d1667391c69ec82f54da7d371e6eba29d6
Parents: 800f0b3 ed5f834
Author: Jay Zhuang 
Authored: Fri Jun 8 10:47:14 2018 -0700
Committer: Jay Zhuang 
Committed: Fri Jun 8 10:48:15 2018 -0700

--
 CHANGES.txt |  1 +
 build.xml   |  4 +-
 .../columniterator/SSTableReversedIterator.java |  2 +-
 .../org/apache/cassandra/db/rows/BTreeRow.java  |  2 +-
 .../cassandra/db/rows/ComplexColumnData.java|  5 +-
 .../org/apache/cassandra/utils/btree/BTree.java | 69 +-
 .../test/microbench/BTreeBuildBench.java| 96 
 .../org/apache/cassandra/utils/BTreeTest.java   | 33 ++-
 8 files changed, 161 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/958e13d1/CHANGES.txt
--
diff --cc CHANGES.txt
index 9857704,7f4b655..27c9561
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,253 -1,5 +1,254 @@@
 +4.0
 + * Add option to sanity check tombstones on reads/compactions 
(CASSANDRA-14467)
 + * Add a virtual table to expose all running sstable tasks (CASSANDRA-14457)
 + * Let nodetool import take a list of directories (CASSANDRA-14442)
 + * Avoid unneeded memory allocations / cpu for disabled log levels 
(CASSANDRA-14488)
 + * Implement virtual keyspace interface (CASSANDRA-7622)
 + * nodetool import cleanup and improvements (CASSANDRA-14417)
 + * Bump jackson version to >= 2.9.5 (CASSANDRA-14427)
 + * Allow nodetool toppartitions without specifying table (CASSANDRA-14360)
 + * Audit logging for database activity (CASSANDRA-12151)
 + * Clean up build artifacts in docs container (CASSANDRA-14432)
 + * Minor network authz improvements (Cassandra-14413)
 + * Automatic sstable upgrades (CASSANDRA-14197)
 + * Replace deprecated junit.framework.Assert usages with org.junit.Assert 
(CASSANDRA-14431)
 + * Cassandra-stress throws NPE if insert section isn't specified in user 
profile (CASSSANDRA-14426)
 + * List clients by protocol versions `nodetool clientstats --by-protocol` 
(CASSANDRA-14335)
 + * Improve LatencyMetrics performance by reducing write path processing 
(CASSANDRA-14281)
 + * Add network authz (CASSANDRA-13985)
 + * Use the correct IP/Port for Streaming when localAddress is left unbound 
(CASSANDRA-14389)
 + * nodetool listsnapshots is missing local system keyspace snapshots 
(CASSANDRA-14381)
 + * Remove StreamCoordinator.streamExecutor thread pool (CASSANDRA-14402)
 + * Rename nodetool --with-port to --print-port to disambiguate from --port 
(CASSANDRA-14392)
 + * Client TOPOLOGY_CHANGE messages have wrong port. (CASSANDRA-14398)
 + * Add ability to load new SSTables from a separate directory (CASSANDRA-6719)
 + * Eliminate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Bind to correct local address in 4.0 streaming (CASSANDRA-14362)
 + * Use standard Amazon naming for datacenter and rack in Ec2Snitch 
(CASSANDRA-7839)
 + * Fix junit failure for SSTableReaderTest (CASSANDRA-14387)
 + * Abstract write path for pluggable storage (CASSANDRA-14118)
 + * nodetool describecluster should be more informative (CASSANDRA-13853)
 + * Compaction performance improvements (CASSANDRA-14261) 
 + * Refactor Pair usage to avoid boxing ints/longs (CASSANDRA-14260)
 + * Add options to nodetool tablestats to sort and limit output 
(CASSANDRA-13889)
 + * Rename internals to reflect CQL vocabulary (CASSANDRA-14354)
 + * Add support for hybrid MIN(), MAX() speculative retry policies
 +   (CASSANDRA-14293, CASSANDRA-14338, CASSANDRA-14352)
 + * Fix some regressions caused by 14058 (CASSANDRA-14353)
 + * Abstract repair for pluggable storage (CASSANDRA-14116)
 + * Add meaningful toString() impls (CASSANDRA-13653)
 + * Add sstableloader option to accept target keyspace name (CASSANDRA-13884)
 + * Move processing of EchoMessage response to gossip stage (CASSANDRA-13713)
 + * Add coordinator write metric per CF (CASSANDRA-14232)
 + * Correct and clarify SSLFactory.getSslContext method and call sites 
(CASSANDRA-14314)
 + * Handle static and partition deletion properly on 
ThrottledUnfilteredIterator (CASSANDRA-14315)
 + * NodeTool clientstats should show SSL Cipher (CASSANDRA-14322)
 + * Add ability to specify driver name and version (CASSANDRA-14275)
 + * Abstract streaming for pluggable storage (CASSANDRA-14115)
 + * Forced incremental repairs should promote sstables if they can 
(CASSANDRA-14294)
 + * Use 

[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jzhuang]

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 069e383f57e3106bbe2e6ddcebeae77da1ea53e1
Parents: 7b38b7e b92d90d
Author: Jay Zhuang 
Authored: Wed May 30 22:01:21 2018 -0700
Committer: Jay Zhuang 
Committed: Wed May 30 22:02:21 2018 -0700

--
 CHANGES.txt | 1 +
 build.xml   | 2 ++
 2 files changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/069e383f/CHANGES.txt
--
diff --cc CHANGES.txt
index 111f644,2d4ef25..b94fc62
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -260,7 -16,9 +260,8 @@@
   * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
   * Fix wildcard GROUP BY queries (CASSANDRA-14209)
  Merged from 3.0:
+  * Add Missing dependencies in pom-all (CASSANDRA-14422)
   * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
 - * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
   * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)
   * Fix progress stats and units in compactionstats (CASSANDRA-12244)
   * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)

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


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

[2/6] cassandra git commit: Add missing dependencies in pom-all

[jzhuang]

Add missing dependencies in pom-all

patch by Shichao An; reviewed by Jay Zhuang for CASSANDRA-14422


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

Branch: refs/heads/cassandra-3.11
Commit: 38096da25bd72346628c001d5b310417f8f703cd
Parents: 06b3521
Author: Shichao An 
Authored: Thu Apr 26 17:35:39 2018 -0700
Committer: Jay Zhuang 
Committed: Wed May 30 21:55:53 2018 -0700

--
 CHANGES.txt |  1 +
 build.xml   | 96 +---
 2 files changed, 51 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/38096da2/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 1293bd4..16fe6d1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.17
+ * Add Missing dependencies in pom-all (CASSANDRA-14422)
  * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
  * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
  * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/38096da2/build.xml
--
diff --git a/build.xml b/build.xml
index 7bab97c..3fc64fb 100644
--- a/build.xml
+++ b/build.xml
@@ -65,10 +65,10 @@
 
 
 
-   
+
 
 
-   
+
 
   
 
@@ -76,7 +76,7 @@
 
 
- 
+
 
 
 
@@ -102,7 +102,7 @@
 
 
 
-
+
 
 
 
@@ -215,7 +215,7 @@
 srcfile="${build.src.java}/org/apache/cassandra/cql3/Cql.g"
 
targetfile="${build.src.gen-java}/org/apache/cassandra/cql3/Cql.tokens"/>
 
- 
+
 
   Building Grammar ${build.src.java}/org/apache/cassandra/cql3/Cql.g 
 ...
   
   
   
-   
+
   
 
   
@@ -414,6 +414,7 @@

   
   
+  
 
 
 
@@ -552,6 +553,7 @@
 
 
 
+
 
 
 
@@ -582,6 +584,8 @@
 
 
 
+
+
   
   
   
   
-  
+
   
   
 
 
@@ -822,7 +826,7 @@



-   
+
 
@@ -946,7 +950,7 @@
   
   
-  
   
 
@@ -1037,7 +1041,7 @@
 
 
   
-  
   
@@ -1134,7 +1138,7 @@
  debuglevel="${debuglevel}"
  destdir="${test.classes}"
  includeantruntime="true"
- source="${source.version}" 
+ source="${source.version}"
  target="${target.version}"
  encoding="utf-8">
  
@@ -1273,7 +1277,7 @@
 
 
   
-  
+
   
   
@@ -1340,7 +1344,7 @@
   
 
   
-
+
   
 
 
@@ -1360,12 +1364,12 @@
   
 
   
-  
+
   
   
   
-  
+
   
 
@@ -1464,10 +1468,10 @@
 
   
 
-  
-  
+
   
   
 
@@ -1523,7 +1527,7 @@
   
 
   
-
   
 
@@ -1791,7 +1795,7 @@
   
   
 ]]>
-  
+   

 

@@ -1805,27 +1809,27 @@
var File = java.io.File;
var FilenameUtils = 
Packages.org.apache.commons.io.FilenameUtils;
jars = 
project.getProperty("eclipse-project-libs").split(project.getProperty("path.separator"));
-   
+
cp = "";
for (i=0; i< jars.length; i++) {
   srcjar = FilenameUtils.getBaseName(jars[i]) + '-sources.jar';
   srcdir = 
FilenameUtils.concat(project.getProperty("build.dir.lib"), 'sources');
   srcfile = new File(FilenameUtils.concat(srcdir, srcjar));
-   
+
   cp += '  
 
   
@@ -1845,29 +1849,29 @@
   
 
 
-  
+  
 
 
 
 
-
+
 
-
-
-   
+
+
+maxmemory="512m">
 
-
+   

-
+   

 
-
+   
 
- 
+
 
 
 
@@ -1875,13 +1879,13 @@
 
 
   
-  
+
 
   
   
-  
+
 
 
-  
-  
+
+
 
 
 
-  
+
 
 
-  
+
 
 
-  
-  
+
+
 
 
 
-  
+
 
 

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[jzhuang]

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: b92d90dc14ef978fbfa9e09520a641f6669cf631
Parents: b8cbdde 38096da
Author: Jay Zhuang 
Authored: Wed May 30 21:59:22 2018 -0700
Committer: Jay Zhuang 
Committed: Wed May 30 22:00:51 2018 -0700

--
 CHANGES.txt |  1 +
 build.xml   | 84 +---
 2 files changed, 44 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b92d90dc/CHANGES.txt
--
diff --cc CHANGES.txt
index 3879a55,16fe6d1..2d4ef25
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
 -3.0.17
 +3.11.3
 + * Reduce nodetool GC thread count (CASSANDRA-14475)
 + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
 + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
 + * Update metrics to 3.1.5 (CASSANDRA-12924)
 + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
 + * Don't use guava collections in the non-system keyspace jmx attributes 
(CASSANDRA-12271)
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Add Missing dependencies in pom-all (CASSANDRA-14422)
   * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
   * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
   * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b92d90dc/build.xml
--
diff --cc build.xml
index f8cdf82,3fc64fb..4edfbb1
--- a/build.xml
+++ b/build.xml
@@@ -67,11 -66,9 +67,11 @@@
  
  
  
 +
-   
++
  
  
-   
+ 
  

  
@@@ -216,15 -212,12 +216,15 @@@
  -->
  
  
 +
targetfile="${build.src.gen-java}/org/apache/cassandra/cql3/Cql.tokens">
 +
 +
 +
 +
  
-  
+ 
  
 -  Building Grammar 
${build.src.java}/org/apache/cassandra/cql3/Cql.g  ...
 +  Building Grammar ${build.src.antlr}/Cql.g  ...



-   
+ 

  
 +



@@@ -639,9 -584,8 +640,10 @@@
  
  
  
+ 
 -
 +
 +
 +


  
-   

  
@@@ -1396,8 -1344,8 +1398,8 @@@

  

- 
+ 
 -  
 +  
  
  

@@@ -1533,10 -1468,10 +1535,10 @@@
  

  
-   
-   
+ 


  


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

[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[jzhuang]

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: b92d90dc14ef978fbfa9e09520a641f6669cf631
Parents: b8cbdde 38096da
Author: Jay Zhuang 
Authored: Wed May 30 21:59:22 2018 -0700
Committer: Jay Zhuang 
Committed: Wed May 30 22:00:51 2018 -0700

--
 CHANGES.txt |  1 +
 build.xml   | 84 +---
 2 files changed, 44 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b92d90dc/CHANGES.txt
--
diff --cc CHANGES.txt
index 3879a55,16fe6d1..2d4ef25
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
 -3.0.17
 +3.11.3
 + * Reduce nodetool GC thread count (CASSANDRA-14475)
 + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
 + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
 + * Update metrics to 3.1.5 (CASSANDRA-12924)
 + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
 + * Don't use guava collections in the non-system keyspace jmx attributes 
(CASSANDRA-12271)
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Add Missing dependencies in pom-all (CASSANDRA-14422)
   * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
   * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
   * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b92d90dc/build.xml
--
diff --cc build.xml
index f8cdf82,3fc64fb..4edfbb1
--- a/build.xml
+++ b/build.xml
@@@ -67,11 -66,9 +67,11 @@@
  
  
  
 +
-   
++
  
  
-   
+ 
  

  
@@@ -216,15 -212,12 +216,15 @@@
  -->
  
  
 +
targetfile="${build.src.gen-java}/org/apache/cassandra/cql3/Cql.tokens">
 +
 +
 +
 +
  
-  
+ 
  
 -  Building Grammar 
${build.src.java}/org/apache/cassandra/cql3/Cql.g  ...
 +  Building Grammar ${build.src.antlr}/Cql.g  ...



-   
+ 

  
 +



@@@ -639,9 -584,8 +640,10 @@@
  
  
  
+ 
 -
 +
 +
 +


  
-   

  
@@@ -1396,8 -1344,8 +1398,8 @@@

  

- 
+ 
 -  
 +  
  
  

@@@ -1533,10 -1468,10 +1535,10 @@@
  

  
-   
-   
+ 


  


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

[3/6] cassandra git commit: Add missing dependencies in pom-all

[jzhuang]

Add missing dependencies in pom-all

patch by Shichao An; reviewed by Jay Zhuang for CASSANDRA-14422


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

Branch: refs/heads/trunk
Commit: 38096da25bd72346628c001d5b310417f8f703cd
Parents: 06b3521
Author: Shichao An 
Authored: Thu Apr 26 17:35:39 2018 -0700
Committer: Jay Zhuang 
Committed: Wed May 30 21:55:53 2018 -0700

--
 CHANGES.txt |  1 +
 build.xml   | 96 +---
 2 files changed, 51 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/38096da2/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 1293bd4..16fe6d1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.17
+ * Add Missing dependencies in pom-all (CASSANDRA-14422)
  * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
  * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
  * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/38096da2/build.xml
--
diff --git a/build.xml b/build.xml
index 7bab97c..3fc64fb 100644
--- a/build.xml
+++ b/build.xml
@@ -65,10 +65,10 @@
 
 
 
-   
+
 
 
-   
+
 
   
 
@@ -76,7 +76,7 @@
 
 
- 
+
 
 
 
@@ -102,7 +102,7 @@
 
 
 
-
+
 
 
 
@@ -215,7 +215,7 @@
 srcfile="${build.src.java}/org/apache/cassandra/cql3/Cql.g"
 
targetfile="${build.src.gen-java}/org/apache/cassandra/cql3/Cql.tokens"/>
 
- 
+
 
   Building Grammar ${build.src.java}/org/apache/cassandra/cql3/Cql.g 
 ...
   
   
   
-   
+
   
 
   
@@ -414,6 +414,7 @@

   
   
+  
 
 
 
@@ -552,6 +553,7 @@
 
 
 
+
 
 
 
@@ -582,6 +584,8 @@
 
 
 
+
+
   
   
   
   
-  
+
   
   
 
 
@@ -822,7 +826,7 @@



-   
+
 
@@ -946,7 +950,7 @@
   
   
-  
   
 
@@ -1037,7 +1041,7 @@
 
 
   
-  
   
@@ -1134,7 +1138,7 @@
  debuglevel="${debuglevel}"
  destdir="${test.classes}"
  includeantruntime="true"
- source="${source.version}" 
+ source="${source.version}"
  target="${target.version}"
  encoding="utf-8">
  
@@ -1273,7 +1277,7 @@
 
 
   
-  
+
   
   
@@ -1340,7 +1344,7 @@
   
 
   
-
+
   
 
 
@@ -1360,12 +1364,12 @@
   
 
   
-  
+
   
   
   
-  
+
   
 
@@ -1464,10 +1468,10 @@
 
   
 
-  
-  
+
   
   
 
@@ -1523,7 +1527,7 @@
   
 
   
-
   
 
@@ -1791,7 +1795,7 @@
   
   
 ]]>
-  
+   

 

@@ -1805,27 +1809,27 @@
var File = java.io.File;
var FilenameUtils = 
Packages.org.apache.commons.io.FilenameUtils;
jars = 
project.getProperty("eclipse-project-libs").split(project.getProperty("path.separator"));
-   
+
cp = "";
for (i=0; i< jars.length; i++) {
   srcjar = FilenameUtils.getBaseName(jars[i]) + '-sources.jar';
   srcdir = 
FilenameUtils.concat(project.getProperty("build.dir.lib"), 'sources');
   srcfile = new File(FilenameUtils.concat(srcdir, srcjar));
-   
+
   cp += '  
 
   
@@ -1845,29 +1849,29 @@
   
 
 
-  
+  
 
 
 
 
-
+
 
-
-
-   
+
+
+maxmemory="512m">
 
-
+   

-
+   

 
-
+   
 
- 
+
 
 
 
@@ -1875,13 +1879,13 @@
 
 
   
-  
+
 
   
   
-  
+
 
 
-  
-  
+
+
 
 
 
-  
+
 
 
-  
+
 
 
-  
-  
+
+
 
 
 
-  
+
 
 

[1/6] cassandra git commit: Add missing dependencies in pom-all

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 06b3521ac -> 38096da25
  refs/heads/cassandra-3.11 b8cbdde2b -> b92d90dc1
  refs/heads/trunk 7b38b7e54 -> 069e383f5


Add missing dependencies in pom-all

patch by Shichao An; reviewed by Jay Zhuang for CASSANDRA-14422


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

Branch: refs/heads/cassandra-3.0
Commit: 38096da25bd72346628c001d5b310417f8f703cd
Parents: 06b3521
Author: Shichao An 
Authored: Thu Apr 26 17:35:39 2018 -0700
Committer: Jay Zhuang 
Committed: Wed May 30 21:55:53 2018 -0700

--
 CHANGES.txt |  1 +
 build.xml   | 96 +---
 2 files changed, 51 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/38096da2/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 1293bd4..16fe6d1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.17
+ * Add Missing dependencies in pom-all (CASSANDRA-14422)
  * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
  * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
  * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/38096da2/build.xml
--
diff --git a/build.xml b/build.xml
index 7bab97c..3fc64fb 100644
--- a/build.xml
+++ b/build.xml
@@ -65,10 +65,10 @@
 
 
 
-   
+
 
 
-   
+
 
   
 
@@ -76,7 +76,7 @@
 
 
- 
+
 
 
 
@@ -102,7 +102,7 @@
 
 
 
-
+
 
 
 
@@ -215,7 +215,7 @@
 srcfile="${build.src.java}/org/apache/cassandra/cql3/Cql.g"
 
targetfile="${build.src.gen-java}/org/apache/cassandra/cql3/Cql.tokens"/>
 
- 
+
 
   Building Grammar ${build.src.java}/org/apache/cassandra/cql3/Cql.g 
 ...
   
   
   
-   
+
   
 
   
@@ -414,6 +414,7 @@

   
   
+  
 
 
 
@@ -552,6 +553,7 @@
 
 
 
+
 
 
 
@@ -582,6 +584,8 @@
 
 
 
+
+
   
   
   
   
-  
+
   
   
 
 
@@ -822,7 +826,7 @@



-   
+
 
@@ -946,7 +950,7 @@
   
   
-  
   
 
@@ -1037,7 +1041,7 @@
 
 
   
-  
   
@@ -1134,7 +1138,7 @@
  debuglevel="${debuglevel}"
  destdir="${test.classes}"
  includeantruntime="true"
- source="${source.version}" 
+ source="${source.version}"
  target="${target.version}"
  encoding="utf-8">
  
@@ -1273,7 +1277,7 @@
 
 
   
-  
+
   
   
@@ -1340,7 +1344,7 @@
   
 
   
-
+
   
 
 
@@ -1360,12 +1364,12 @@
   
 
   
-  
+
   
   
   
-  
+
   
 
@@ -1464,10 +1468,10 @@
 
   
 
-  
-  
+
   
   
 
@@ -1523,7 +1527,7 @@
   
 
   
-
   
 
@@ -1791,7 +1795,7 @@
   
   
 ]]>
-  
+   

 

@@ -1805,27 +1809,27 @@
var File = java.io.File;
var FilenameUtils = 
Packages.org.apache.commons.io.FilenameUtils;
jars = 
project.getProperty("eclipse-project-libs").split(project.getProperty("path.separator"));
-   
+
cp = "";
for (i=0; i< jars.length; i++) {
   srcjar = FilenameUtils.getBaseName(jars[i]) + '-sources.jar';
   srcdir = 
FilenameUtils.concat(project.getProperty("build.dir.lib"), 'sources');
   srcfile = new File(FilenameUtils.concat(srcdir, srcjar));
-   
+
   cp += '  
 
   
@@ -1845,29 +1849,29 @@
   
 
 
-  
+  
 
 
 
 
-
+
 
-
-
-   
+
+
+maxmemory="512m">
 
-
+   

-
+   

 
-
+   
 
- 
+
 
 
 
@@ -1875,13 +1879,13 @@
 
 
   
-  
+
 
   
   
-  
+
 
 
-  
-  
+
+
 
 
 
-  
+
 
 
-  
+
 
 
-  
-  
+
+
 
 
 
-  
+
 

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[jzhuang]

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: 2d19de1cfabdc848477b33ba922c63013a7a9a1a
Parents: 783bbb3 eb68c31
Author: Jay Zhuang 
Authored: Wed May 2 11:02:03 2018 -0700
Committer: Jay Zhuang 
Committed: Wed May 2 11:03:34 2018 -0700

--
 CHANGES.txt |  1 +
 .../apache/cassandra/schema/SchemaKeyspace.java | 35 +---
 .../cassandra/schema/SchemaKeyspaceTest.java| 29 
 3 files changed, 53 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d19de1c/CHANGES.txt
--
diff --cc CHANGES.txt
index 443c298,39edeb1..837b891
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -3.0.17
 +3.11.3
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
   * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
   * Deprecate background repair and probablistic read_repair_chance table 
options
 (CASSANDRA-13910)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d19de1c/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
--
diff --cc src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 164e32d,81cc2e1..027b7cf
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@@ -999,18 -961,24 +999,24 @@@ public final class SchemaKeyspac
  }
  catch (MissingColumns exc)
  {
- if (!IGNORE_CORRUPTED_SCHEMA_TABLES)
+ String errorMsg = String.format("No partition columns found 
for table %s.%s in %s.%s.  This may be due to " +
+ "corruption or concurrent 
dropping and altering of a table. If this table is supposed " +
+ "to be dropped, {}run the 
following query to cleanup: " +
+ "\"DELETE FROM %s.%s WHERE 
keyspace_name = '%s' AND table_name = '%s'; " +
+ "DELETE FROM %s.%s WHERE 
keyspace_name = '%s' AND table_name = '%s';\" " +
+ "If the table is not supposed 
to be dropped, restore %s.%s sstables from backups.",
 -keyspaceName, tableName, 
NAME, COLUMNS,
 -NAME, TABLES, keyspaceName, 
tableName,
 -NAME, COLUMNS, keyspaceName, 
tableName,
 -NAME, COLUMNS);
++keyspaceName, tableName, 
SchemaConstants.SCHEMA_KEYSPACE_NAME, COLUMNS,
++
SchemaConstants.SCHEMA_KEYSPACE_NAME, TABLES, keyspaceName, tableName,
++
SchemaConstants.SCHEMA_KEYSPACE_NAME, COLUMNS, keyspaceName, tableName,
++
SchemaConstants.SCHEMA_KEYSPACE_NAME, COLUMNS);
+ 
+ if (IGNORE_CORRUPTED_SCHEMA_TABLES)
  {
- logger.error("No columns found for table {}.{} in {}.{}.  
This may be due to " +
-  "corruption or concurrent dropping and 
altering of a table.  If this table " +
-  "is supposed to be dropped, restart 
cassandra with -Dcassandra.ignore_corrupted_schema_tables=true " +
-  

[2/6] cassandra git commit: Better handle missing partition columns in system_schema.columns

[jzhuang]

Better handle missing partition columns in system_schema.columns

Provide the user workaround if schema table is corrupted.

patch by Jay Zhuang; reviewed by Aleksey Yeschenko for CASSANDRA-14379


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

Branch: refs/heads/cassandra-3.11
Commit: eb68c3126270e27fd9c88ef867bbcb8c7942a8e8
Parents: 733f6b0
Author: Jay Zhuang 
Authored: Wed Apr 4 13:49:08 2018 -0700
Committer: Jay Zhuang 
Committed: Wed May 2 10:59:47 2018 -0700

--
 CHANGES.txt |  1 +
 .../apache/cassandra/schema/SchemaKeyspace.java | 32 +++-
 .../cassandra/schema/SchemaKeyspaceTest.java| 29 ++
 3 files changed, 54 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb68c312/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 9992802..39edeb1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.17
+ * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
  * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
  * Deprecate background repair and probablistic read_repair_chance table 
options
(CASSANDRA-13910)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb68c312/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
--
diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java 
b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 578f501..81cc2e1 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -25,6 +25,7 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.*;
 import com.google.common.collect.Maps;
 import org.slf4j.Logger;
@@ -960,14 +961,24 @@ public final class SchemaKeyspace
 }
 catch (MissingColumns exc)
 {
-if (!IGNORE_CORRUPTED_SCHEMA_TABLES)
+String errorMsg = String.format("No partition columns found 
for table %s.%s in %s.%s.  This may be due to " +
+"corruption or concurrent 
dropping and altering of a table. If this table is supposed " +
+"to be dropped, {}run the 
following query to cleanup: " +
+"\"DELETE FROM %s.%s WHERE 
keyspace_name = '%s' AND table_name = '%s'; " +
+"DELETE FROM %s.%s WHERE 
keyspace_name = '%s' AND table_name = '%s';\" " +
+"If the table is not supposed 
to be dropped, restore %s.%s sstables from backups.",
+keyspaceName, tableName, NAME, 
COLUMNS,
+NAME, TABLES, keyspaceName, 
tableName,
+NAME, COLUMNS, keyspaceName, 
tableName,
+NAME, COLUMNS);
+
+if (IGNORE_CORRUPTED_SCHEMA_TABLES)
 {
-logger.error("No columns found for table {}.{} in {}.{}.  
This may be due to " +
- "corruption or concurrent dropping and 
altering of a table.  If this table " +
- "is supposed to be dropped, restart cassandra 
with -Dcassandra.ignore_corrupted_schema_tables=true " +
- "and run the following query: \"DELETE FROM 
{}.{} WHERE keyspace_name = '{}' AND table_name = '{}';\"." +
- "If the table is not supposed to be dropped, 
restore {}.{} sstables from backups.",
- keyspaceName, tableName, NAME, COLUMNS, NAME, 
TABLES, keyspaceName, tableName, NAME, COLUMNS);
+logger.error(errorMsg, "", exc);
+}
+else
+{
+logger.error(errorMsg, "restart cassandra with 
-Dcassandra.ignore_corrupted_schema_tables=true and ");
 throw exc;
 }
 }
@@ -1043,6 +1054,10 @@ public final class SchemaKeyspace
 
 List columns = new ArrayList<>();
 columnRows.forEach(row -> 

[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[jzhuang]

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 2d19de1cfabdc848477b33ba922c63013a7a9a1a
Parents: 783bbb3 eb68c31
Author: Jay Zhuang 
Authored: Wed May 2 11:02:03 2018 -0700
Committer: Jay Zhuang 
Committed: Wed May 2 11:03:34 2018 -0700

--
 CHANGES.txt |  1 +
 .../apache/cassandra/schema/SchemaKeyspace.java | 35 +---
 .../cassandra/schema/SchemaKeyspaceTest.java| 29 
 3 files changed, 53 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d19de1c/CHANGES.txt
--
diff --cc CHANGES.txt
index 443c298,39edeb1..837b891
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -3.0.17
 +3.11.3
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
   * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
   * Deprecate background repair and probablistic read_repair_chance table 
options
 (CASSANDRA-13910)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d19de1c/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
--
diff --cc src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 164e32d,81cc2e1..027b7cf
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@@ -999,18 -961,24 +999,24 @@@ public final class SchemaKeyspac
  }
  catch (MissingColumns exc)
  {
- if (!IGNORE_CORRUPTED_SCHEMA_TABLES)
+ String errorMsg = String.format("No partition columns found 
for table %s.%s in %s.%s.  This may be due to " +
+ "corruption or concurrent 
dropping and altering of a table. If this table is supposed " +
+ "to be dropped, {}run the 
following query to cleanup: " +
+ "\"DELETE FROM %s.%s WHERE 
keyspace_name = '%s' AND table_name = '%s'; " +
+ "DELETE FROM %s.%s WHERE 
keyspace_name = '%s' AND table_name = '%s';\" " +
+ "If the table is not supposed 
to be dropped, restore %s.%s sstables from backups.",
 -keyspaceName, tableName, 
NAME, COLUMNS,
 -NAME, TABLES, keyspaceName, 
tableName,
 -NAME, COLUMNS, keyspaceName, 
tableName,
 -NAME, COLUMNS);
++keyspaceName, tableName, 
SchemaConstants.SCHEMA_KEYSPACE_NAME, COLUMNS,
++
SchemaConstants.SCHEMA_KEYSPACE_NAME, TABLES, keyspaceName, tableName,
++
SchemaConstants.SCHEMA_KEYSPACE_NAME, COLUMNS, keyspaceName, tableName,
++
SchemaConstants.SCHEMA_KEYSPACE_NAME, COLUMNS);
+ 
+ if (IGNORE_CORRUPTED_SCHEMA_TABLES)
  {
- logger.error("No columns found for table {}.{} in {}.{}.  
This may be due to " +
-  "corruption or concurrent dropping and 
altering of a table.  If this table " +
-  "is supposed to be dropped, restart 
cassandra with 

[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jzhuang]

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 60ed982d5309b674abfb32584f75f676951c2668
Parents: 0143974 2d19de1
Author: Jay Zhuang 
Authored: Wed May 2 11:05:25 2018 -0700
Committer: Jay Zhuang 
Committed: Wed May 2 11:08:18 2018 -0700

--
 CHANGES.txt |  1 +
 .../apache/cassandra/schema/SchemaKeyspace.java | 36 +---
 .../cassandra/schema/SchemaKeyspaceTest.java| 29 
 3 files changed, 54 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/60ed982d/CHANGES.txt
--
diff --cc CHANGES.txt
index 27e69b8,837b891..5831978
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -246,7 -10,10 +246,8 @@@
   * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
   * Fix wildcard GROUP BY queries (CASSANDRA-14209)
  Merged from 3.0:
+  * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
   * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
 - * Deprecate background repair and probablistic read_repair_chance table 
options
 -   (CASSANDRA-13910)
   * Add missed CQL keywords to documentation (CASSANDRA-14359)
   * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
   * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60ed982d/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
--
diff --cc src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index ca3c69f,027b7cf..638e912
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@@ -23,9 -25,9 +23,10 @@@ import java.util.*
  import java.util.concurrent.TimeUnit;
  import java.util.stream.Collectors;
  
+ import com.google.common.annotations.VisibleForTesting;
  import com.google.common.collect.*;
  import com.google.common.collect.Maps;
 +import com.google.common.hash.Hasher;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
@@@ -1012,8 -1097,12 +1019,12 @@@ public final class SchemaKeyspac
  if (columnRows.isEmpty())
  throw new MissingColumns("Columns not found in schema table for " 
+ keyspace + "." + table);
  
 -List columns = new ArrayList<>();
 +List columns = new ArrayList<>();
  columnRows.forEach(row -> columns.add(createColumnFromRow(row, 
types)));
+ 
 -if (columns.stream().noneMatch(ColumnDefinition::isPartitionKey))
++if (columns.stream().noneMatch(ColumnMetadata::isPartitionKey))
+ throw new MissingColumns("No partition key columns found in 
schema table for " + keyspace + "." + table);
+ 
  return columns;
  }
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60ed982d/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java
--
diff --cc test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java
index d4c4bb4,f3ee85d..b3a7047
--- a/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java
+++ b/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java
@@@ -39,9 -47,22 +39,10 @@@ import org.apache.cassandra.db.Mutation
  import org.apache.cassandra.db.partitions.PartitionUpdate;
  import org.apache.cassandra.db.rows.UnfilteredRowIterators;
  import org.apache.cassandra.exceptions.ConfigurationException;
 -import org.apache.cassandra.io.util.DataInputBuffer;
 -import org.apache.cassandra.io.util.DataOutputBuffer;
 -import org.apache.cassandra.net.MessagingService;
 -import org.apache.cassandra.thrift.CfDef;
 -import org.apache.cassandra.thrift.ColumnDef;
 -import org.apache.cassandra.thrift.IndexType;
 -import org.apache.cassandra.thrift.ThriftConversion;
 -import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.FBUtilities;
 -import org.apache.cassandra.utils.Pair;
  
+ import static org.apache.cassandra.cql3.QueryProcessor.executeOnceInternal;
  import static org.junit.Assert.assertEquals;
 -import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertTrue;
  
  public class SchemaKeyspaceTest
@@@ -131,7 -212,129 +132,35 @@@
  for (UntypedResultSet.Row row : columnsRows)

[3/6] cassandra git commit: Better handle missing partition columns in system_schema.columns

[jzhuang]

Better handle missing partition columns in system_schema.columns

Provide the user workaround if schema table is corrupted.

patch by Jay Zhuang; reviewed by Aleksey Yeschenko for CASSANDRA-14379


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

Branch: refs/heads/trunk
Commit: eb68c3126270e27fd9c88ef867bbcb8c7942a8e8
Parents: 733f6b0
Author: Jay Zhuang 
Authored: Wed Apr 4 13:49:08 2018 -0700
Committer: Jay Zhuang 
Committed: Wed May 2 10:59:47 2018 -0700

--
 CHANGES.txt |  1 +
 .../apache/cassandra/schema/SchemaKeyspace.java | 32 +++-
 .../cassandra/schema/SchemaKeyspaceTest.java| 29 ++
 3 files changed, 54 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb68c312/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 9992802..39edeb1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.17
+ * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
  * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
  * Deprecate background repair and probablistic read_repair_chance table 
options
(CASSANDRA-13910)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb68c312/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
--
diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java 
b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 578f501..81cc2e1 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -25,6 +25,7 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.*;
 import com.google.common.collect.Maps;
 import org.slf4j.Logger;
@@ -960,14 +961,24 @@ public final class SchemaKeyspace
 }
 catch (MissingColumns exc)
 {
-if (!IGNORE_CORRUPTED_SCHEMA_TABLES)
+String errorMsg = String.format("No partition columns found 
for table %s.%s in %s.%s.  This may be due to " +
+"corruption or concurrent 
dropping and altering of a table. If this table is supposed " +
+"to be dropped, {}run the 
following query to cleanup: " +
+"\"DELETE FROM %s.%s WHERE 
keyspace_name = '%s' AND table_name = '%s'; " +
+"DELETE FROM %s.%s WHERE 
keyspace_name = '%s' AND table_name = '%s';\" " +
+"If the table is not supposed 
to be dropped, restore %s.%s sstables from backups.",
+keyspaceName, tableName, NAME, 
COLUMNS,
+NAME, TABLES, keyspaceName, 
tableName,
+NAME, COLUMNS, keyspaceName, 
tableName,
+NAME, COLUMNS);
+
+if (IGNORE_CORRUPTED_SCHEMA_TABLES)
 {
-logger.error("No columns found for table {}.{} in {}.{}.  
This may be due to " +
- "corruption or concurrent dropping and 
altering of a table.  If this table " +
- "is supposed to be dropped, restart cassandra 
with -Dcassandra.ignore_corrupted_schema_tables=true " +
- "and run the following query: \"DELETE FROM 
{}.{} WHERE keyspace_name = '{}' AND table_name = '{}';\"." +
- "If the table is not supposed to be dropped, 
restore {}.{} sstables from backups.",
- keyspaceName, tableName, NAME, COLUMNS, NAME, 
TABLES, keyspaceName, tableName, NAME, COLUMNS);
+logger.error(errorMsg, "", exc);
+}
+else
+{
+logger.error(errorMsg, "restart cassandra with 
-Dcassandra.ignore_corrupted_schema_tables=true and ");
 throw exc;
 }
 }
@@ -1043,6 +1054,10 @@ public final class SchemaKeyspace
 
 List columns = new ArrayList<>();
 columnRows.forEach(row -> 

[1/6] cassandra git commit: Better handle missing partition columns in system_schema.columns

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 733f6b0cf -> eb68c3126
  refs/heads/cassandra-3.11 783bbb3c8 -> 2d19de1cf
  refs/heads/trunk 01439740b -> 60ed982d5


Better handle missing partition columns in system_schema.columns

Provide the user workaround if schema table is corrupted.

patch by Jay Zhuang; reviewed by Aleksey Yeschenko for CASSANDRA-14379


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

Branch: refs/heads/cassandra-3.0
Commit: eb68c3126270e27fd9c88ef867bbcb8c7942a8e8
Parents: 733f6b0
Author: Jay Zhuang 
Authored: Wed Apr 4 13:49:08 2018 -0700
Committer: Jay Zhuang 
Committed: Wed May 2 10:59:47 2018 -0700

--
 CHANGES.txt |  1 +
 .../apache/cassandra/schema/SchemaKeyspace.java | 32 +++-
 .../cassandra/schema/SchemaKeyspaceTest.java| 29 ++
 3 files changed, 54 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb68c312/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 9992802..39edeb1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.17
+ * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
  * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
  * Deprecate background repair and probablistic read_repair_chance table 
options
(CASSANDRA-13910)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb68c312/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
--
diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java 
b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 578f501..81cc2e1 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -25,6 +25,7 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.*;
 import com.google.common.collect.Maps;
 import org.slf4j.Logger;
@@ -960,14 +961,24 @@ public final class SchemaKeyspace
 }
 catch (MissingColumns exc)
 {
-if (!IGNORE_CORRUPTED_SCHEMA_TABLES)
+String errorMsg = String.format("No partition columns found 
for table %s.%s in %s.%s.  This may be due to " +
+"corruption or concurrent 
dropping and altering of a table. If this table is supposed " +
+"to be dropped, {}run the 
following query to cleanup: " +
+"\"DELETE FROM %s.%s WHERE 
keyspace_name = '%s' AND table_name = '%s'; " +
+"DELETE FROM %s.%s WHERE 
keyspace_name = '%s' AND table_name = '%s';\" " +
+"If the table is not supposed 
to be dropped, restore %s.%s sstables from backups.",
+keyspaceName, tableName, NAME, 
COLUMNS,
+NAME, TABLES, keyspaceName, 
tableName,
+NAME, COLUMNS, keyspaceName, 
tableName,
+NAME, COLUMNS);
+
+if (IGNORE_CORRUPTED_SCHEMA_TABLES)
 {
-logger.error("No columns found for table {}.{} in {}.{}.  
This may be due to " +
- "corruption or concurrent dropping and 
altering of a table.  If this table " +
- "is supposed to be dropped, restart cassandra 
with -Dcassandra.ignore_corrupted_schema_tables=true " +
- "and run the following query: \"DELETE FROM 
{}.{} WHERE keyspace_name = '{}' AND table_name = '{}';\"." +
- "If the table is not supposed to be dropped, 
restore {}.{} sstables from backups.",
- keyspaceName, tableName, NAME, COLUMNS, NAME, 
TABLES, keyspaceName, tableName, NAME, COLUMNS);
+logger.error(errorMsg, "", exc);
+}
+else
+{
+logger.error(errorMsg, "restart cassandra with 
-Dcassandra.ignore_corrupted_schema_tables=true and ");
 throw 

[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jzhuang]

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

Branch: refs/heads/cassandra-3.11
Commit: 733f6b0cf8c5f8d89b9a9bf102e9e37548bba601
Parents: e16f0ed 3a71382
Author: Jay Zhuang 
Authored: Tue May 1 15:08:51 2018 -0700
Committer: Jay Zhuang 
Committed: Tue May 1 15:10:13 2018 -0700

--
 CHANGES.txt |   1 +
 .../io/compress/CompressedSequentialWriter.java |  17 ++-
 .../cassandra/io/util/SequentialWriter.java |   2 +
 .../CompressedSequentialWriterReopenTest.java   | 148 +++
 .../CompressedSequentialWriterTest.java |  53 +++
 .../cassandra/io/util/SequentialWriterTest.java |  41 +
 6 files changed, 260 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/733f6b0c/CHANGES.txt
--
diff --cc CHANGES.txt
index 857cf96,22ee346..9992802
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 -2.2.13
 +3.0.17
 + * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * 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:
+  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
   * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/733f6b0c/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
--
diff --cc 
src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
index 74258cf,a7f9bb4..43f1fd0
--- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
@@@ -132,7 -129,10 +132,7 @@@ public class CompressedSequentialWrite
  // write corresponding checksum
  compressed.rewind();
  crcMetadata.appendDirect(compressed, true);
- lastFlushOffset += compressedLength + 4;
+ lastFlushOffset = uncompressedSize;
 -
 -// adjust our bufferOffset to account for the new uncompressed 
data we've now written out
 -resetBuffer();
  }
  catch (IOException e)
  {
@@@ -240,6 -239,19 +240,19 @@@
  metadataWriter.resetAndTruncate(realMark.nextChunkIndex - 1);
  }
  
+ private void truncate(long toFileSize, long toBufferOffset)
+ {
+ try
+ {
 -channel.truncate(toFileSize);
++fchannel.truncate(toFileSize);
+ lastFlushOffset = toBufferOffset;
+ }
+ catch (IOException e)
+ {
+ throw new FSWriteError(e, getPath());
+ }
+ }
+ 
  /**
   * Seek to the offset where next compressed data chunk should be stored.
   */

[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[jzhuang]

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: 783bbb3c817e7dbfee8181d210487edc13414ac1
Parents: b67d6fb 733f6b0
Author: Jay Zhuang 
Authored: Tue May 1 15:11:22 2018 -0700
Committer: Jay Zhuang 
Committed: Tue May 1 15:12:14 2018 -0700

--
 CHANGES.txt |   1 +
 .../io/compress/CompressedSequentialWriter.java |  17 ++-
 .../CompressedSequentialWriterReopenTest.java   | 148 +++
 .../CompressedSequentialWriterTest.java |   6 +
 4 files changed, 170 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/783bbb3c/CHANGES.txt
--
diff --cc CHANGES.txt
index c392059,9992802..443c298
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -31,8 -20,10 +31,9 @@@ Merged from 3.0
   * Fully utilise specified compaction threads (CASSANDRA-14210)
   * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
  Merged from 2.2:
+  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
 - * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
   * Backport circleci yaml (CASSANDRA-14240)
  Merged from 2.1:
   * Check checksum before decompressing data (CASSANDRA-14284)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/783bbb3c/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/783bbb3c/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java
--
diff --cc 
test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java
index a088e20,f04439a..52b18a9
--- 
a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java
+++ 
b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java
@@@ -26,10 -27,9 +26,11 @@@ import java.util.*
  
  import static org.apache.commons.io.FileUtils.readFileToByteArray;
  import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertTrue;
  
 +import com.google.common.io.Files;
  import org.junit.After;
 +import org.junit.BeforeClass;
  import org.junit.Test;
  
  import junit.framework.Assert;
@@@ -89,42 -88,46 +90,47 @@@ public class CompressedSequentialWriter
  private void testWrite(File f, int bytesToTest) throws IOException
  {
  final String filename = f.getAbsolutePath();
 -final ChannelProxy channel = new ChannelProxy(f);
 -
 -try
 +MetadataCollector sstableMetadataCollector = new 
MetadataCollector(new 
ClusteringComparator(Collections.singletonList(BytesType.instance)));
 +
 +byte[] dataPre = new byte[bytesToTest];
 +byte[] rawPost = new byte[bytesToTest];
 +try (CompressedSequentialWriter writer = new 
CompressedSequentialWriter(f, filename + ".metadata",
 +null, SequentialWriterOption.DEFAULT,
 +compressionParameters,
 +sstableMetadataCollector))
  {
 -MetadataCollector sstableMetadataCollector = new 
MetadataCollector(new 
ClusteringComparator(Arrays.asList(BytesType.instance)));
 +Random r = new Random(42);
 +
 +// Test both write with byte[] and ByteBuffer
 +r.nextBytes(dataPre);
 +r.nextBytes(rawPost);
 +ByteBuffer dataPost = makeBB(bytesToTest);
 +dataPost.put(rawPost);
 +dataPost.flip();
 +
 +writer.write(dataPre);
 +DataPosition mark = writer.mark();
  
 -byte[] dataPre = new byte[bytesToTest];
 -byte[] rawPost = new byte[bytesToTest];
 -try (CompressedSequentialWriter writer = new 
CompressedSequentialWriter(f, filename + ".metadata", compressionParameters, 
sstableMetadataCollector);)
 +// Write enough garbage to transition chunk
 +for (int i = 0; i < CompressionParams.DEFAULT_CHUNK_LENGTH; i++)
  {
 -Random r = new Random(42);
 -
 -// Test both write with byte[] and ByteBuffer
 -r.nextBytes(dataPre);
 -r.nextBytes(rawPost);
 -

[03/10] cassandra git commit: Fix compaction failure caused by reading un-flushed data

[jzhuang]

Fix compaction failure caused by reading un-flushed data

patch by Jay Zhuang; reviewed by Marcus Eriksson for CASSANDRA-12743


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

Branch: refs/heads/cassandra-3.11
Commit: 3a713827f48399f389ea851a19b8ec8cd2cc5773
Parents: 334dca9
Author: Jay Zhuang 
Authored: Sat Apr 21 11:15:06 2018 -0700
Committer: Jay Zhuang 
Committed: Tue May 1 15:07:01 2018 -0700

--
 CHANGES.txt |   1 +
 .../io/compress/CompressedSequentialWriter.java |  17 ++-
 .../cassandra/io/util/SequentialWriter.java |   2 +
 .../CompressedSequentialWriterReopenTest.java   | 153 +++
 .../CompressedSequentialWriterTest.java |  52 +++
 .../cassandra/io/util/SequentialWriterTest.java |  41 +
 6 files changed, 264 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a713827/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5f6189f..22ee346 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.13
+ * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
  * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a713827/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
--
diff --git 
a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java 
b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
index 9c7c776..a7f9bb4 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
@@ -129,7 +129,7 @@ public class CompressedSequentialWriter extends 
SequentialWriter
 // write corresponding checksum
 compressed.rewind();
 crcMetadata.appendDirect(compressed, true);
-lastFlushOffset += compressedLength + 4;
+lastFlushOffset = uncompressedSize;
 
 // adjust our bufferOffset to account for the new uncompressed 
data we've now written out
 resetBuffer();
@@ -235,10 +235,23 @@ public class CompressedSequentialWriter extends 
SequentialWriter
 chunkCount = realMark.nextChunkIndex - 1;
 
 // truncate data and index file
-truncate(chunkOffset);
+truncate(chunkOffset, bufferOffset);
 metadataWriter.resetAndTruncate(realMark.nextChunkIndex - 1);
 }
 
+private void truncate(long toFileSize, long toBufferOffset)
+{
+try
+{
+channel.truncate(toFileSize);
+lastFlushOffset = toBufferOffset;
+}
+catch (IOException e)
+{
+throw new FSWriteError(e, getPath());
+}
+}
+
 /**
  * Seek to the offset where next compressed data chunk should be stored.
  */

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a713827/src/java/org/apache/cassandra/io/util/SequentialWriter.java
--
diff --git a/src/java/org/apache/cassandra/io/util/SequentialWriter.java 
b/src/java/org/apache/cassandra/io/util/SequentialWriter.java
index 0c39469..452318e 100644
--- a/src/java/org/apache/cassandra/io/util/SequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/util/SequentialWriter.java
@@ -430,6 +430,7 @@ public class SequentialWriter extends OutputStream 
implements WritableByteChanne
 throw new FSReadError(e, getPath());
 }
 
+bufferOffset = truncateTarget;
 resetBuffer();
 }
 
@@ -443,6 +444,7 @@ public class SequentialWriter extends OutputStream 
implements WritableByteChanne
 try
 {
 channel.truncate(toSize);
+lastFlushOffset = toSize;
 }
 catch (IOException e)
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a713827/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterReopenTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterReopenTest.java
 
b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterReopenTest.java
new 

[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jzhuang]

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

Branch: refs/heads/cassandra-3.0
Commit: 733f6b0cf8c5f8d89b9a9bf102e9e37548bba601
Parents: e16f0ed 3a71382
Author: Jay Zhuang 
Authored: Tue May 1 15:08:51 2018 -0700
Committer: Jay Zhuang 
Committed: Tue May 1 15:10:13 2018 -0700

--
 CHANGES.txt |   1 +
 .../io/compress/CompressedSequentialWriter.java |  17 ++-
 .../cassandra/io/util/SequentialWriter.java |   2 +
 .../CompressedSequentialWriterReopenTest.java   | 148 +++
 .../CompressedSequentialWriterTest.java |  53 +++
 .../cassandra/io/util/SequentialWriterTest.java |  41 +
 6 files changed, 260 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/733f6b0c/CHANGES.txt
--
diff --cc CHANGES.txt
index 857cf96,22ee346..9992802
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 -2.2.13
 +3.0.17
 + * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * 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:
+  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
   * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/733f6b0c/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
--
diff --cc 
src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
index 74258cf,a7f9bb4..43f1fd0
--- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
@@@ -132,7 -129,10 +132,7 @@@ public class CompressedSequentialWrite
  // write corresponding checksum
  compressed.rewind();
  crcMetadata.appendDirect(compressed, true);
- lastFlushOffset += compressedLength + 4;
+ lastFlushOffset = uncompressedSize;
 -
 -// adjust our bufferOffset to account for the new uncompressed 
data we've now written out
 -resetBuffer();
  }
  catch (IOException e)
  {
@@@ -240,6 -239,19 +240,19 @@@
  metadataWriter.resetAndTruncate(realMark.nextChunkIndex - 1);
  }
  
+ private void truncate(long toFileSize, long toBufferOffset)
+ {
+ try
+ {
 -channel.truncate(toFileSize);
++fchannel.truncate(toFileSize);
+ lastFlushOffset = toBufferOffset;
+ }
+ catch (IOException e)
+ {
+ throw new FSWriteError(e, getPath());
+ }
+ }
+ 
  /**
   * Seek to the offset where next compressed data chunk should be stored.
   */

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jzhuang]

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: e9418f808c03b82837a1ab7627abe08057c1388f
Parents: 2fe4b9d 783bbb3
Author: Jay Zhuang 
Authored: Tue May 1 15:16:05 2018 -0700
Committer: Jay Zhuang 
Committed: Tue May 1 15:18:26 2018 -0700

--
 CHANGES.txt |   1 +
 .../io/compress/CompressedSequentialWriter.java |  17 ++-
 .../CompressedSequentialWriterReopenTest.java   | 148 +++
 .../CompressedSequentialWriterTest.java |   6 +
 4 files changed, 170 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9418f80/CHANGES.txt
--
diff --cc CHANGES.txt
index 33c81d1,443c298..2545e83
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -264,11 -31,13 +264,12 @@@ Merged from 3.0
   * Fully utilise specified compaction threads (CASSANDRA-14210)
   * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
  Merged from 2.2:
+  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
 - * Backport circleci yaml (CASSANDRA-14240)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
  Merged from 2.1:
   * Check checksum before decompressing data (CASSANDRA-14284)
 - * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt 
(CASSANDRA-14183)
  
  
  3.11.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9418f80/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
--
diff --cc 
src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
index 8955d4f,5694616..c35ecc8
--- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
@@@ -165,13 -155,13 +165,13 @@@ public class CompressedSequentialWrite
  chunkCount++;
  
  // write out the compressed data
 -compressed.flip();
 -channel.write(compressed);
 +toWrite.flip();
 +channel.write(toWrite);
  
  // write corresponding checksum
 -compressed.rewind();
 -crcMetadata.appendDirect(compressed, true);
 +toWrite.rewind();
 +crcMetadata.appendDirect(toWrite, true);
- lastFlushOffset += compressedLength + 4;
+ lastFlushOffset = uncompressedSize;
  }
  catch (IOException e)
  {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9418f80/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java
--


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[jzhuang]

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 783bbb3c817e7dbfee8181d210487edc13414ac1
Parents: b67d6fb 733f6b0
Author: Jay Zhuang 
Authored: Tue May 1 15:11:22 2018 -0700
Committer: Jay Zhuang 
Committed: Tue May 1 15:12:14 2018 -0700

--
 CHANGES.txt |   1 +
 .../io/compress/CompressedSequentialWriter.java |  17 ++-
 .../CompressedSequentialWriterReopenTest.java   | 148 +++
 .../CompressedSequentialWriterTest.java |   6 +
 4 files changed, 170 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/783bbb3c/CHANGES.txt
--
diff --cc CHANGES.txt
index c392059,9992802..443c298
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -31,8 -20,10 +31,9 @@@ Merged from 3.0
   * Fully utilise specified compaction threads (CASSANDRA-14210)
   * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
  Merged from 2.2:
+  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
 - * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
   * Backport circleci yaml (CASSANDRA-14240)
  Merged from 2.1:
   * Check checksum before decompressing data (CASSANDRA-14284)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/783bbb3c/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/783bbb3c/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java
--
diff --cc 
test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java
index a088e20,f04439a..52b18a9
--- 
a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java
+++ 
b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java
@@@ -26,10 -27,9 +26,11 @@@ import java.util.*
  
  import static org.apache.commons.io.FileUtils.readFileToByteArray;
  import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertTrue;
  
 +import com.google.common.io.Files;
  import org.junit.After;
 +import org.junit.BeforeClass;
  import org.junit.Test;
  
  import junit.framework.Assert;
@@@ -89,42 -88,46 +90,47 @@@ public class CompressedSequentialWriter
  private void testWrite(File f, int bytesToTest) throws IOException
  {
  final String filename = f.getAbsolutePath();
 -final ChannelProxy channel = new ChannelProxy(f);
 -
 -try
 +MetadataCollector sstableMetadataCollector = new 
MetadataCollector(new 
ClusteringComparator(Collections.singletonList(BytesType.instance)));
 +
 +byte[] dataPre = new byte[bytesToTest];
 +byte[] rawPost = new byte[bytesToTest];
 +try (CompressedSequentialWriter writer = new 
CompressedSequentialWriter(f, filename + ".metadata",
 +null, SequentialWriterOption.DEFAULT,
 +compressionParameters,
 +sstableMetadataCollector))
  {
 -MetadataCollector sstableMetadataCollector = new 
MetadataCollector(new 
ClusteringComparator(Arrays.asList(BytesType.instance)));
 +Random r = new Random(42);
 +
 +// Test both write with byte[] and ByteBuffer
 +r.nextBytes(dataPre);
 +r.nextBytes(rawPost);
 +ByteBuffer dataPost = makeBB(bytesToTest);
 +dataPost.put(rawPost);
 +dataPost.flip();
 +
 +writer.write(dataPre);
 +DataPosition mark = writer.mark();
  
 -byte[] dataPre = new byte[bytesToTest];
 -byte[] rawPost = new byte[bytesToTest];
 -try (CompressedSequentialWriter writer = new 
CompressedSequentialWriter(f, filename + ".metadata", compressionParameters, 
sstableMetadataCollector);)
 +// Write enough garbage to transition chunk
 +for (int i = 0; i < CompressionParams.DEFAULT_CHUNK_LENGTH; i++)
  {
 -Random r = new Random(42);
 -
 -// Test both write with byte[] and ByteBuffer
 -r.nextBytes(dataPre);
 -r.nextBytes(rawPost);
 

[02/10] cassandra git commit: Fix compaction failure caused by reading un-flushed data

[jzhuang]

Fix compaction failure caused by reading un-flushed data

patch by Jay Zhuang; reviewed by Marcus Eriksson for CASSANDRA-12743


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

Branch: refs/heads/cassandra-3.0
Commit: 3a713827f48399f389ea851a19b8ec8cd2cc5773
Parents: 334dca9
Author: Jay Zhuang 
Authored: Sat Apr 21 11:15:06 2018 -0700
Committer: Jay Zhuang 
Committed: Tue May 1 15:07:01 2018 -0700

--
 CHANGES.txt |   1 +
 .../io/compress/CompressedSequentialWriter.java |  17 ++-
 .../cassandra/io/util/SequentialWriter.java |   2 +
 .../CompressedSequentialWriterReopenTest.java   | 153 +++
 .../CompressedSequentialWriterTest.java |  52 +++
 .../cassandra/io/util/SequentialWriterTest.java |  41 +
 6 files changed, 264 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a713827/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5f6189f..22ee346 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.13
+ * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
  * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a713827/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
--
diff --git 
a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java 
b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
index 9c7c776..a7f9bb4 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
@@ -129,7 +129,7 @@ public class CompressedSequentialWriter extends 
SequentialWriter
 // write corresponding checksum
 compressed.rewind();
 crcMetadata.appendDirect(compressed, true);
-lastFlushOffset += compressedLength + 4;
+lastFlushOffset = uncompressedSize;
 
 // adjust our bufferOffset to account for the new uncompressed 
data we've now written out
 resetBuffer();
@@ -235,10 +235,23 @@ public class CompressedSequentialWriter extends 
SequentialWriter
 chunkCount = realMark.nextChunkIndex - 1;
 
 // truncate data and index file
-truncate(chunkOffset);
+truncate(chunkOffset, bufferOffset);
 metadataWriter.resetAndTruncate(realMark.nextChunkIndex - 1);
 }
 
+private void truncate(long toFileSize, long toBufferOffset)
+{
+try
+{
+channel.truncate(toFileSize);
+lastFlushOffset = toBufferOffset;
+}
+catch (IOException e)
+{
+throw new FSWriteError(e, getPath());
+}
+}
+
 /**
  * Seek to the offset where next compressed data chunk should be stored.
  */

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a713827/src/java/org/apache/cassandra/io/util/SequentialWriter.java
--
diff --git a/src/java/org/apache/cassandra/io/util/SequentialWriter.java 
b/src/java/org/apache/cassandra/io/util/SequentialWriter.java
index 0c39469..452318e 100644
--- a/src/java/org/apache/cassandra/io/util/SequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/util/SequentialWriter.java
@@ -430,6 +430,7 @@ public class SequentialWriter extends OutputStream 
implements WritableByteChanne
 throw new FSReadError(e, getPath());
 }
 
+bufferOffset = truncateTarget;
 resetBuffer();
 }
 
@@ -443,6 +444,7 @@ public class SequentialWriter extends OutputStream 
implements WritableByteChanne
 try
 {
 channel.truncate(toSize);
+lastFlushOffset = toSize;
 }
 catch (IOException e)
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a713827/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterReopenTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterReopenTest.java
 
b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterReopenTest.java
new file 

[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jzhuang]

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

Branch: refs/heads/trunk
Commit: 733f6b0cf8c5f8d89b9a9bf102e9e37548bba601
Parents: e16f0ed 3a71382
Author: Jay Zhuang 
Authored: Tue May 1 15:08:51 2018 -0700
Committer: Jay Zhuang 
Committed: Tue May 1 15:10:13 2018 -0700

--
 CHANGES.txt |   1 +
 .../io/compress/CompressedSequentialWriter.java |  17 ++-
 .../cassandra/io/util/SequentialWriter.java |   2 +
 .../CompressedSequentialWriterReopenTest.java   | 148 +++
 .../CompressedSequentialWriterTest.java |  53 +++
 .../cassandra/io/util/SequentialWriterTest.java |  41 +
 6 files changed, 260 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/733f6b0c/CHANGES.txt
--
diff --cc CHANGES.txt
index 857cf96,22ee346..9992802
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 -2.2.13
 +3.0.17
 + * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * 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:
+  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
   * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/733f6b0c/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
--
diff --cc 
src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
index 74258cf,a7f9bb4..43f1fd0
--- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
@@@ -132,7 -129,10 +132,7 @@@ public class CompressedSequentialWrite
  // write corresponding checksum
  compressed.rewind();
  crcMetadata.appendDirect(compressed, true);
- lastFlushOffset += compressedLength + 4;
+ lastFlushOffset = uncompressedSize;
 -
 -// adjust our bufferOffset to account for the new uncompressed 
data we've now written out
 -resetBuffer();
  }
  catch (IOException e)
  {
@@@ -240,6 -239,19 +240,19 @@@
  metadataWriter.resetAndTruncate(realMark.nextChunkIndex - 1);
  }
  
+ private void truncate(long toFileSize, long toBufferOffset)
+ {
+ try
+ {
 -channel.truncate(toFileSize);
++fchannel.truncate(toFileSize);
+ lastFlushOffset = toBufferOffset;
+ }
+ catch (IOException e)
+ {
+ throw new FSWriteError(e, getPath());
+ }
+ }
+ 
  /**
   * Seek to the offset where next compressed data chunk should be stored.
   */

http://git-wip-us.apache.org/repos/asf/cassandra/blob/733f6b0c/src/java/org/apache/cassandra/io/util/SequentialWriter.java

[01/10] cassandra git commit: Fix compaction failure caused by reading un-flushed data

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 334dca9aa -> 3a713827f
  refs/heads/cassandra-3.0 e16f0ed06 -> 733f6b0cf
  refs/heads/cassandra-3.11 b67d6fb60 -> 783bbb3c8
  refs/heads/trunk 2fe4b9dc6 -> e9418f808


Fix compaction failure caused by reading un-flushed data

patch by Jay Zhuang; reviewed by Marcus Eriksson for CASSANDRA-12743


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

Branch: refs/heads/cassandra-2.2
Commit: 3a713827f48399f389ea851a19b8ec8cd2cc5773
Parents: 334dca9
Author: Jay Zhuang 
Authored: Sat Apr 21 11:15:06 2018 -0700
Committer: Jay Zhuang 
Committed: Tue May 1 15:07:01 2018 -0700

--
 CHANGES.txt |   1 +
 .../io/compress/CompressedSequentialWriter.java |  17 ++-
 .../cassandra/io/util/SequentialWriter.java |   2 +
 .../CompressedSequentialWriterReopenTest.java   | 153 +++
 .../CompressedSequentialWriterTest.java |  52 +++
 .../cassandra/io/util/SequentialWriterTest.java |  41 +
 6 files changed, 264 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a713827/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5f6189f..22ee346 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.13
+ * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
  * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a713827/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
--
diff --git 
a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java 
b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
index 9c7c776..a7f9bb4 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
@@ -129,7 +129,7 @@ public class CompressedSequentialWriter extends 
SequentialWriter
 // write corresponding checksum
 compressed.rewind();
 crcMetadata.appendDirect(compressed, true);
-lastFlushOffset += compressedLength + 4;
+lastFlushOffset = uncompressedSize;
 
 // adjust our bufferOffset to account for the new uncompressed 
data we've now written out
 resetBuffer();
@@ -235,10 +235,23 @@ public class CompressedSequentialWriter extends 
SequentialWriter
 chunkCount = realMark.nextChunkIndex - 1;
 
 // truncate data and index file
-truncate(chunkOffset);
+truncate(chunkOffset, bufferOffset);
 metadataWriter.resetAndTruncate(realMark.nextChunkIndex - 1);
 }
 
+private void truncate(long toFileSize, long toBufferOffset)
+{
+try
+{
+channel.truncate(toFileSize);
+lastFlushOffset = toBufferOffset;
+}
+catch (IOException e)
+{
+throw new FSWriteError(e, getPath());
+}
+}
+
 /**
  * Seek to the offset where next compressed data chunk should be stored.
  */

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a713827/src/java/org/apache/cassandra/io/util/SequentialWriter.java
--
diff --git a/src/java/org/apache/cassandra/io/util/SequentialWriter.java 
b/src/java/org/apache/cassandra/io/util/SequentialWriter.java
index 0c39469..452318e 100644
--- a/src/java/org/apache/cassandra/io/util/SequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/util/SequentialWriter.java
@@ -430,6 +430,7 @@ public class SequentialWriter extends OutputStream 
implements WritableByteChanne
 throw new FSReadError(e, getPath());
 }
 
+bufferOffset = truncateTarget;
 resetBuffer();
 }
 
@@ -443,6 +444,7 @@ public class SequentialWriter extends OutputStream 
implements WritableByteChanne
 try
 {
 channel.truncate(toSize);
+lastFlushOffset = toSize;
 }
 catch (IOException e)
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a713827/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterReopenTest.java

[04/10] cassandra git commit: Fix compaction failure caused by reading un-flushed data

[jzhuang]

Fix compaction failure caused by reading un-flushed data

patch by Jay Zhuang; reviewed by Marcus Eriksson for CASSANDRA-12743


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

Branch: refs/heads/trunk
Commit: 3a713827f48399f389ea851a19b8ec8cd2cc5773
Parents: 334dca9
Author: Jay Zhuang 
Authored: Sat Apr 21 11:15:06 2018 -0700
Committer: Jay Zhuang 
Committed: Tue May 1 15:07:01 2018 -0700

--
 CHANGES.txt |   1 +
 .../io/compress/CompressedSequentialWriter.java |  17 ++-
 .../cassandra/io/util/SequentialWriter.java |   2 +
 .../CompressedSequentialWriterReopenTest.java   | 153 +++
 .../CompressedSequentialWriterTest.java |  52 +++
 .../cassandra/io/util/SequentialWriterTest.java |  41 +
 6 files changed, 264 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a713827/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5f6189f..22ee346 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.13
+ * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
  * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a713827/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
--
diff --git 
a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java 
b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
index 9c7c776..a7f9bb4 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
@@ -129,7 +129,7 @@ public class CompressedSequentialWriter extends 
SequentialWriter
 // write corresponding checksum
 compressed.rewind();
 crcMetadata.appendDirect(compressed, true);
-lastFlushOffset += compressedLength + 4;
+lastFlushOffset = uncompressedSize;
 
 // adjust our bufferOffset to account for the new uncompressed 
data we've now written out
 resetBuffer();
@@ -235,10 +235,23 @@ public class CompressedSequentialWriter extends 
SequentialWriter
 chunkCount = realMark.nextChunkIndex - 1;
 
 // truncate data and index file
-truncate(chunkOffset);
+truncate(chunkOffset, bufferOffset);
 metadataWriter.resetAndTruncate(realMark.nextChunkIndex - 1);
 }
 
+private void truncate(long toFileSize, long toBufferOffset)
+{
+try
+{
+channel.truncate(toFileSize);
+lastFlushOffset = toBufferOffset;
+}
+catch (IOException e)
+{
+throw new FSWriteError(e, getPath());
+}
+}
+
 /**
  * Seek to the offset where next compressed data chunk should be stored.
  */

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a713827/src/java/org/apache/cassandra/io/util/SequentialWriter.java
--
diff --git a/src/java/org/apache/cassandra/io/util/SequentialWriter.java 
b/src/java/org/apache/cassandra/io/util/SequentialWriter.java
index 0c39469..452318e 100644
--- a/src/java/org/apache/cassandra/io/util/SequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/util/SequentialWriter.java
@@ -430,6 +430,7 @@ public class SequentialWriter extends OutputStream 
implements WritableByteChanne
 throw new FSReadError(e, getPath());
 }
 
+bufferOffset = truncateTarget;
 resetBuffer();
 }
 
@@ -443,6 +444,7 @@ public class SequentialWriter extends OutputStream 
implements WritableByteChanne
 try
 {
 channel.truncate(toSize);
+lastFlushOffset = toSize;
 }
 catch (IOException e)
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a713827/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterReopenTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterReopenTest.java
 
b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterReopenTest.java
new file mode 

[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jzhuang]

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: b65b28a9e7a3ff049f4e4d0c9d31622b39398145
Parents: c413b6d b3e9908
Author: Jay Zhuang 
Authored: Mon Apr 9 15:12:43 2018 -0700
Committer: Jay Zhuang 
Committed: Mon Apr 9 15:14:40 2018 -0700

--
 CHANGES.txt| 1 +
 .../cassandra/db/commitlog/AbstractCommitLogSegmentManager.java| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b65b28a9/CHANGES.txt
--
diff --cc CHANGES.txt
index d6cf162,b7e2553..d191810
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,219 -1,5 +1,220 @@@
 +4.0
 + * Fix some regressions caused by 14058 (CASSANDRA-14353)
 + * Abstract repair for pluggable storage (CASSANDRA-14116)
 + * Add meaningful toString() impls (CASSANDRA-13653)
 + * Add sstableloader option to accept target keyspace name (CASSANDRA-13884)
 + * Move processing of EchoMessage response to gossip stage (CASSANDRA-13713)
 + * Add coordinator write metric per CF (CASSANDRA-14232)
 + * Fix scheduling of speculative retry threshold recalculation 
(CASSANDRA-14338)
 + * Add support for hybrid MIN(), MAX() speculative retry policies 
(CASSANDRA-14293)
 + * Correct and clarify SSLFactory.getSslContext method and call sites 
(CASSANDRA-14314)
 + * Handle static and partition deletion properly on 
ThrottledUnfilteredIterator (CASSANDRA-14315)
 + * NodeTool clientstats should show SSL Cipher (CASSANDRA-14322)
 + * Add ability to specify driver name and version (CASSANDRA-14275)
 + * Abstract streaming for pluggable storage (CASSANDRA-14115)
 + * Forced incremental repairs should promote sstables if they can 
(CASSANDRA-14294)
 + * Use Murmur3 for validation compactions (CASSANDRA-14002)
 + * Comma at the end of the seed list is interpretated as localhost 
(CASSANDRA-14285)
 + * Refactor read executor and response resolver, abstract read repair 
(CASSANDRA-14058)
 + * Add optional startup delay to wait until peers are ready (CASSANDRA-13993)
 + * Add a few options to nodetool verify (CASSANDRA-14201)
 + * CVE-2017-5929 Security vulnerability and redefine default log rotation 
policy (CASSANDRA-14183)
 + * Use JVM default SSL validation algorithm instead of custom default 
(CASSANDRA-13259)
 + * Better document in code InetAddressAndPort usage post 7544, incorporate 
port into UUIDGen node (CASSANDRA-14226)
 + * Fix sstablemetadata date string for minLocalDeletionTime (CASSANDRA-14132)
 + * Make it possible to change neverPurgeTombstones during runtime 
(CASSANDRA-14214)
 + * Remove GossipDigestSynVerbHandler#doSort() (CASSANDRA-14174)
 + * Add nodetool clientlist (CASSANDRA-13665)
 + * Revert ProtocolVersion changes from CASSANDRA-7544 (CASSANDRA-14211)
 + * Non-disruptive seed node list reload (CASSANDRA-14190)
 + * Nodetool tablehistograms to print statics for all the tables 
(CASSANDRA-14185)
 + * Migrate dtests to use pytest and python3 (CASSANDRA-14134)
 + * Allow storage port to be configurable per node (CASSANDRA-7544)
 + * Make sub-range selection for non-frozen collections return null instead of 
empty (CASSANDRA-14182)
 + * BloomFilter serialization format should not change byte ordering 
(CASSANDRA-9067)
 + * Remove unused on-heap BloomFilter implementation (CASSANDRA-14152)
 + * Delete temp test files on exit (CASSANDRA-14153)
 + * Make PartitionUpdate and Mutation immutable (CASSANDRA-13867)
 + * Fix CommitLogReplayer exception for CDC data (CASSANDRA-14066)
 + * Fix cassandra-stress startup failure (CASSANDRA-14106)
 + * Remove initialDirectories from CFS (CASSANDRA-13928)
 + * Fix trivial log format error (CASSANDRA-14015)
 + * Allow sstabledump to do a json object per partition (CASSANDRA-13848)
 + * Add option to optimise merkle tree comparison across replicas 
(CASSANDRA-3200)
 + * Remove unused and deprecated methods from AbstractCompactionStrategy 
(CASSANDRA-14081)
 + * Fix Distribution.average in cassandra-stress (CASSANDRA-14090)
 + * Support a means of logging all queries as they were invoked 
(CASSANDRA-13983)
 + * Presize collections (CASSANDRA-13760)
 + * Add GroupCommitLogService (CASSANDRA-13530)
 + * Parallelize initial materialized view build (CASSANDRA-12245)
 + * Fix flaky SecondaryIndexManagerTest.assert[Not]MarkedAsBuilt 
(CASSANDRA-13965)
 + * Make LWTs send resultset metadata on every request (CASSANDRA-13992)
 + * Fix flaky indexWithFailedInitializationIsNotQueryableAfterPartialRebuild 

[1/3] cassandra git commit: Downgrade log level to trace for CommitLogSegmentManager

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 ad52c95ae -> b3e99085a
  refs/heads/trunk c413b6dee -> b65b28a9e


Downgrade log level to trace for CommitLogSegmentManager

patch by Nicolas GUYOMAR; reviewed by Jay Zhuang for CASSANDRA-14370


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

Branch: refs/heads/cassandra-3.11
Commit: b3e99085a5c34754fbbc2350f0e69c1691b06a11
Parents: ad52c95
Author: Nicolas GUYOMAR 
Authored: Mon Apr 9 09:49:54 2018 +0200
Committer: Jay Zhuang 
Committed: Mon Apr 9 15:10:19 2018 -0700

--
 CHANGES.txt| 1 +
 .../cassandra/db/commitlog/AbstractCommitLogSegmentManager.java| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3e99085/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 03b7442..b7e2553 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.11.3
+ * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
  * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
  * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
  * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3e99085/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
--
diff --git 
a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
 
b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
index 2c324aa..20c59a4 100755
--- 
a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
+++ 
b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
@@ -106,7 +106,7 @@ public abstract class AbstractCommitLogSegmentManager
 try
 {
 assert availableSegment == null;
-logger.debug("No segments in reserve; creating a fresh 
one");
+logger.trace("No segments in reserve; creating a fresh 
one");
 availableSegment = createSegment();
 if (shutdown)
 {


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

[2/3] cassandra git commit: Downgrade log level to trace for CommitLogSegmentManager

[jzhuang]

Downgrade log level to trace for CommitLogSegmentManager

patch by Nicolas GUYOMAR; reviewed by Jay Zhuang for CASSANDRA-14370


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

Branch: refs/heads/trunk
Commit: b3e99085a5c34754fbbc2350f0e69c1691b06a11
Parents: ad52c95
Author: Nicolas GUYOMAR 
Authored: Mon Apr 9 09:49:54 2018 +0200
Committer: Jay Zhuang 
Committed: Mon Apr 9 15:10:19 2018 -0700

--
 CHANGES.txt| 1 +
 .../cassandra/db/commitlog/AbstractCommitLogSegmentManager.java| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3e99085/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 03b7442..b7e2553 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.11.3
+ * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
  * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
  * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
  * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3e99085/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
--
diff --git 
a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
 
b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
index 2c324aa..20c59a4 100755
--- 
a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
+++ 
b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
@@ -106,7 +106,7 @@ public abstract class AbstractCommitLogSegmentManager
 try
 {
 assert availableSegment == null;
-logger.debug("No segments in reserve; creating a fresh 
one");
+logger.trace("No segments in reserve; creating a fresh 
one");
 availableSegment = createSegment();
 if (shutdown)
 {


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

cassandra git commit: Add sstableloader option to accept target keyspace name

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/trunk fc2e420fd -> c22ee2bd4


Add sstableloader option to accept target keyspace name

patch by Jaydeepkumar Chovatia; reviewed by Jay Zhuang for CASSANDRA-13884


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

Branch: refs/heads/trunk
Commit: c22ee2bd451d030e99cfb65be839bbc735a5352f
Parents: fc2e420
Author: jaydeepkumar1984 
Authored: Mon Sep 18 17:07:56 2017 -0700
Committer: Jay Zhuang 
Committed: Thu Mar 29 10:41:27 2018 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/io/sstable/SSTableLoader.java |  6 +--
 .../org/apache/cassandra/tools/BulkLoader.java  |  3 +-
 .../apache/cassandra/tools/LoaderOptions.java   | 14 ++
 .../cassandra/io/sstable/SSTableLoaderTest.java | 48 
 5 files changed, 68 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c22ee2bd/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index c0551b7..04705ba 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0
+ * Add sstableloader option to accept target keyspace name (CASSANDRA-13884)
  * Move processing of EchoMessage response to gossip stage (CASSANDRA-13713)
  * Add coordinator write metric per CF (CASSANDRA-14232)
  * Fix scheduling of speculative retry threshold recalculation 
(CASSANDRA-14338)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c22ee2bd/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
--
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java 
b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
index 980fdf1..a6985f7 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
@@ -56,13 +56,13 @@ public class SSTableLoader implements StreamEventHandler
 
 public SSTableLoader(File directory, Client client, OutputHandler 
outputHandler)
 {
-this(directory, client, outputHandler, 1);
+this(directory, client, outputHandler, 1, null);
 }
 
-public SSTableLoader(File directory, Client client, OutputHandler 
outputHandler, int connectionsPerHost)
+public SSTableLoader(File directory, Client client, OutputHandler 
outputHandler, int connectionsPerHost, String targetKeyspace)
 {
 this.directory = directory;
-this.keyspace = directory.getParentFile().getName();
+this.keyspace = targetKeyspace != null ? targetKeyspace : 
directory.getParentFile().getName();
 this.client = client;
 this.outputHandler = outputHandler;
 this.connectionsPerHost = connectionsPerHost;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c22ee2bd/src/java/org/apache/cassandra/tools/BulkLoader.java
--
diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java 
b/src/java/org/apache/cassandra/tools/BulkLoader.java
index 545d1f7..d85c605 100644
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@ -65,7 +65,8 @@ public class BulkLoader
 buildSSLOptions(options.clientEncOptions),
 options.allowServerPortDiscovery),
 handler,
-options.connectionsPerHost);
+options.connectionsPerHost,
+options.targetKeyspace);
 
DatabaseDescriptor.setStreamThroughputOutboundMegabitsPerSec(options.throttle);
 
DatabaseDescriptor.setInterDCStreamThroughputOutboundMegabitsPerSec(options.interDcThrottle);
 StreamResultFuture future = null;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c22ee2bd/src/java/org/apache/cassandra/tools/LoaderOptions.java
--
diff --git a/src/java/org/apache/cassandra/tools/LoaderOptions.java 
b/src/java/org/apache/cassandra/tools/LoaderOptions.java
index 3686584..d6cb670 100644
--- a/src/java/org/apache/cassandra/tools/LoaderOptions.java
+++ b/src/java/org/apache/cassandra/tools/LoaderOptions.java
@@ -38,6 +38,7 @@ import org.apache.cassandra.tools.BulkLoader.CmdLineOptions;
 import com.datastax.driver.core.AuthProvider;
 import com.datastax.driver.core.PlainTextAuthProvider;
 import org.apache.commons.cli.*;
+import org.apache.commons.lang3.StringUtils;
 
 

cassandra git commit: Suppress 2 eclipse-warnings

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 5c67a7852 -> a7141e6c9


Suppress 2 eclipse-warnings

patch by Jay Zhuang; reviewed by Stefan Podkowinski for CASSANDRA-14061


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

Branch: refs/heads/trunk
Commit: a7141e6c9df03287567c22c76372e166fc83d18e
Parents: 5c67a78
Author: Jay Zhuang 
Authored: Sun Nov 19 22:13:42 2017 -0800
Committer: Jay Zhuang 
Committed: Thu Mar 8 15:32:46 2018 -0800

--
 .../org/apache/cassandra/io/sstable/SSTableIdentityIterator.java   | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7141e6c/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
--
diff --git 
a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java 
b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
index 3ade9ff..f9c6e82 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
@@ -49,6 +49,7 @@ public class SSTableIdentityIterator implements 
Comparable indexEntry, DecoratedKey key, boolean 
tombstoneOnly)
 {
 try


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

[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jzhuang]

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: f7d140e2a934e343dedc7d4057784551d4adac48
Parents: b86801e c494696
Author: Jay Zhuang 
Authored: Tue Feb 27 21:47:24 2018 -0800
Committer: Jay Zhuang 
Committed: Tue Feb 27 21:47:24 2018 -0800

--
 build.xml | 1 +
 1 file changed, 1 insertion(+)
--


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


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

[2/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[jzhuang]

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: c4946960a20e12f0f574b5608c886467466ee3b9
Parents: abd9be1 79cead0
Author: Jay Zhuang 
Authored: Tue Feb 27 21:37:59 2018 -0800
Committer: Jay Zhuang 
Committed: Tue Feb 27 21:40:25 2018 -0800

--
 build.xml | 1 +
 1 file changed, 1 insertion(+)
--


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


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

[1/3] cassandra git commit: Add new developer to build.xml file

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/trunk b86801e95 -> f7d140e2a


Add new developer to build.xml file


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

Branch: refs/heads/trunk
Commit: 79cead093e9a2fe8273f9c2ea85e7d8d9f8fabf2
Parents: d73f45b
Author: Jay Zhuang 
Authored: Tue Feb 27 18:07:14 2018 -0800
Committer: Jay Zhuang 
Committed: Tue Feb 27 19:12:02 2018 -0800

--
 build.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/79cead09/build.xml
--
diff --git a/build.xml b/build.xml
index 6f98242..7bab97c 100644
--- a/build.xml
+++ b/build.xml
@@ -443,6 +443,7 @@
 
 
 
+
 
 
 


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

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

[jzhuang]

Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: c4946960a20e12f0f574b5608c886467466ee3b9
Parents: abd9be1 79cead0
Author: Jay Zhuang 
Authored: Tue Feb 27 21:37:59 2018 -0800
Committer: Jay Zhuang 
Committed: Tue Feb 27 21:40:25 2018 -0800

--
 build.xml | 1 +
 1 file changed, 1 insertion(+)
--


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


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

[2/3] cassandra git commit: Add new developer to build.xml file

[jzhuang]

Add new developer to build.xml file


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

Branch: refs/heads/cassandra-3.11
Commit: 79cead093e9a2fe8273f9c2ea85e7d8d9f8fabf2
Parents: d73f45b
Author: Jay Zhuang 
Authored: Tue Feb 27 18:07:14 2018 -0800
Committer: Jay Zhuang 
Committed: Tue Feb 27 19:12:02 2018 -0800

--
 build.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/79cead09/build.xml
--
diff --git a/build.xml b/build.xml
index 6f98242..7bab97c 100644
--- a/build.xml
+++ b/build.xml
@@ -443,6 +443,7 @@
 
 
 
+
 
 
 


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

[1/3] cassandra git commit: Add new developer to build.xml file

[jzhuang]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 d73f45bad -> 79cead093
  refs/heads/cassandra-3.11 abd9be1e4 -> c4946960a


Add new developer to build.xml file


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

Branch: refs/heads/cassandra-3.0
Commit: 79cead093e9a2fe8273f9c2ea85e7d8d9f8fabf2
Parents: d73f45b
Author: Jay Zhuang 
Authored: Tue Feb 27 18:07:14 2018 -0800
Committer: Jay Zhuang 
Committed: Tue Feb 27 19:12:02 2018 -0800

--
 build.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/79cead09/build.xml
--
diff --git a/build.xml b/build.xml
index 6f98242..7bab97c 100644
--- a/build.xml
+++ b/build.xml
@@ -443,6 +443,7 @@
 
 
 
+
 
 
 


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