[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2017-01-05 Thread snazy 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: eca51a0348141f45ea9bb31b76571ed81284c32c
Parents: 5f3b359 6e716c6
Author: Robert Stupp 
Authored: Thu Jan 5 22:26:48 2017 +0100
Committer: Robert Stupp 
Committed: Thu Jan 5 22:26:48 2017 +0100

--
 CHANGES.txt |  2 +
 NEWS.txt|  3 ++
 doc/cql3/CQL.textile|  2 +-
 lib/jsr223/clojure/README.txt   |  8 ---
 lib/jsr223/groovy/README.txt| 35 -
 lib/jsr223/jaskell/README.txt   |  5 --
 lib/jsr223/jruby/README.txt | 54 
 lib/jsr223/jython/README.txt| 33 
 lib/jsr223/scala/README.txt | 37 --
 .../cql3/functions/ScriptBasedUDFunction.java   | 35 +
 .../cql3/validation/entities/UFScriptTest.java  |  3 +-
 .../validation/entities/UFSecurityTest.java | 12 -
 12 files changed, 31 insertions(+), 198 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eca51a03/CHANGES.txt
--
diff --cc CHANGES.txt
index cacb7cd,77a310d..66c2ee6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,136 -1,5 +1,138 @@@
 -3.0.11
 - * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 +3.12
 + * Use new token allocation for non bootstrap case as well (CASSANDRA-13080)
 + * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084)
 + * More fixes to the TokenAllocator (CASSANDRA-12990)
 + * Require forceful decommission if number of nodes is less than replication 
factor (CASSANDRA-12510)
 + * Allow IN restrictions on column families with collections (CASSANDRA-12654)
 + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
 + * nodetool stopdaemon errors out (CASSANDRA-13030)
 + * Log message size in trace message in OutboundTcpConnection 
(CASSANDRA-13028)
 + * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
 + * Add mutation size and batch metrics (CASSANDRA-12649)
 + * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
 + * Fix primary index calculation for SASI (CASSANDRA-12910)
 + * Expose time spent waiting in thread pool queue (CASSANDRA-8398)
 + * Conditionally update index built status to avoid unnecessary flushes 
(CASSANDRA-12969)
 + * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)
 + * cqlsh auto completion: refactor definition of compaction strategy options 
(CASSANDRA-12946)
 + * Add support for arithmetic operators (CASSANDRA-11935)
 + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
++Merged from 3.0:
++ * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
 +
 +
 +3.10
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-12-05 Thread carl 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: caa26e4fb9ba7b905d2806da6c1eff222d429b8c
Parents: afbc2e8 5f64ed7
Author: Carl Yeksigian 
Authored: Mon Dec 5 11:46:37 2016 -0500
Committer: Carl Yeksigian 
Committed: Mon Dec 5 11:46:37 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/caa26e4f/CHANGES.txt
--
diff --cc CHANGES.txt
index 3d27690,5cacdd0..3918cfd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -170,9 -48,6 +170,10 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
   * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
++ * Use saved tokens when setting local tokens on StorageService.joinRing 
(CASSANDRA-12935)
 + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
 + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/caa26e4f/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 07eb1d8,9bf8c54..a53187f
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -986,7 -917,8 +987,7 @@@ public class StorageService extends Not
  {
  if (dataAvailable)
  {
- finishJoiningRing(bootstrap);
 -finishJoiningRing(bootstrapTokens);
 -
++finishJoiningRing(bootstrap, bootstrapTokens);
  // remove the existing info about the replaced node.
  if (!current.isEmpty())
  {
@@@ -1041,26 -967,17 +1042,26 @@@
  }
  else if (isSurveyMode)
  {
 -isSurveyMode = false;
  logger.info("Leaving write survey mode and joining ring at 
operator request");
- finishJoiningRing(resumedBootstrap);
 -finishJoiningRing(SystemKeyspace.getSavedTokens());
++finishJoiningRing(resumedBootstrap, 
SystemKeyspace.getSavedTokens());
 +isSurveyMode = false;
  }
  }
  
 -private void finishJoiningRing(Collection tokens)
 +private void executePreJoinTasks(boolean bootstrap)
 +{
 +StreamSupport.stream(ColumnFamilyStore.all().spliterator(), false)
 +.filter(cfs -> 
Schema.instance.getUserKeyspaces().contains(cfs.keyspace.getName()))
 +.forEach(cfs -> 
cfs.indexManager.executePreJoinTasksBlocking(bootstrap));
 +}
 +
- private void finishJoiningRing(boolean didBootstrap)
++private void finishJoiningRing(boolean didBootstrap, Collection 
tokens)
  {
  // start participating in the ring.
 +setMode(Mode.JOINING, "Finish joining ring", true);
  
SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.COMPLETED);
 +executePreJoinTasks(didBootstrap);
- setTokens(bootstrapTokens);
+ setTokens(tokens);
  
  assert tokenMetadata.sortedTokens().size() > 0;
  doAuthSetup();

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-11-18 Thread aleksey 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 96d67b109a2ef858c2753bbb9853d01460cb8f8e
Parents: f33cd55 59b40b3
Author: Aleksey Yeschenko 
Authored: Fri Nov 18 17:31:11 2016 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 18 17:38:31 2016 +

--
 CHANGES.txt |   2 +-
 .../apache/cassandra/locator/TokenMetadata.java | 211 +++
 .../service/PendingRangeCalculatorService.java  |   6 +-
 .../gms/PendingRangeCalculatorServiceTest.java  | 133 
 4 files changed, 264 insertions(+), 88 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/96d67b10/CHANGES.txt
--
diff --cc CHANGES.txt
index ee73b81,bcd0b5c..2826011
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -150,7 -40,6 +150,7 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
   * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
- ===
++ * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/96d67b10/src/java/org/apache/cassandra/locator/TokenMetadata.java
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-11-16 Thread yukim 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: a1eef56cc021772619eeb4a048cb785078547515
Parents: 0cb3128 14f36fc
Author: Yuki Morishita 
Authored: Wed Nov 16 17:24:29 2016 -0600
Committer: Yuki Morishita 
Committed: Wed Nov 16 17:24:29 2016 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/repair/AnticompactionTask.java| 80 ++--
 .../apache/cassandra/repair/RepairSession.java  | 13 
 .../cassandra/service/ActiveRepairService.java  | 30 ++--
 4 files changed, 99 insertions(+), 25 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1eef56c/src/java/org/apache/cassandra/repair/AnticompactionTask.java
--
diff --cc src/java/org/apache/cassandra/repair/AnticompactionTask.java
index 16a0a12,c5e066d..bc09b38
--- a/src/java/org/apache/cassandra/repair/AnticompactionTask.java
+++ b/src/java/org/apache/cassandra/repair/AnticompactionTask.java
@@@ -28,8 -33,12 +33,13 @@@ import org.apache.cassandra.config.Data
  import org.apache.cassandra.db.SystemKeyspace;
  import org.apache.cassandra.dht.Range;
  import org.apache.cassandra.dht.Token;
 +import org.apache.cassandra.exceptions.RequestFailureReason;
+ import org.apache.cassandra.gms.ApplicationState;
+ import org.apache.cassandra.gms.EndpointState;
  import org.apache.cassandra.gms.FailureDetector;
+ import org.apache.cassandra.gms.IEndpointStateChangeSubscriber;
+ import org.apache.cassandra.gms.IFailureDetectionEventListener;
+ import org.apache.cassandra.gms.VersionedValue;
  import org.apache.cassandra.net.IAsyncCallbackWithFailure;
  import org.apache.cassandra.net.MessageIn;
  import org.apache.cassandra.net.MessagingService;
@@@ -100,9 -132,42 +133,42 @@@ public class AnticompactionTask extend
  return false;
  }
  
 -public void onFailure(InetAddress from)
 +public void onFailure(InetAddress from, RequestFailureReason 
failureReason)
  {
- task.setException(new RuntimeException("Anticompaction failed or 
timed out in " + from));
+ maybeSetException(new RuntimeException("Anticompaction failed or 
timed out in " + from));
+ }
+ }
+ 
+ public void onJoin(InetAddress endpoint, EndpointState epState) {}
+ public void beforeChange(InetAddress endpoint, EndpointState 
currentState, ApplicationState newStateKey, VersionedValue newValue) {}
+ public void onChange(InetAddress endpoint, ApplicationState state, 
VersionedValue value) {}
+ public void onAlive(InetAddress endpoint, EndpointState state) {}
+ public void onDead(InetAddress endpoint, EndpointState state) {}
+ 
+ public void onRemove(InetAddress endpoint)
+ {
+ convict(endpoint, Double.MAX_VALUE);
+ }
+ 
+ public void onRestart(InetAddress endpoint, EndpointState epState)
+ {
+ convict(endpoint, Double.MAX_VALUE);
+ }
+ 
+ public void convict(InetAddress endpoint, double phi)
+ {
+ if (!neighbor.equals(endpoint))
+ return;
+ 
+ // We want a higher confidence in the failure detection than usual 
because failing a repair wrongly has a high cost.
+ if (phi < 2 * DatabaseDescriptor.getPhiConvictThreshold())
+ return;
+ 
+ Exception exception = new IOException(String.format("Endpoint %s died 
during anti-compaction.", endpoint));
+ if (maybeSetException(exception))
+ {
+ // Though unlikely, it is possible to arrive here multiple time 
and we want to avoid print an error message twice
+ logger.error("[repair #{}] Endpoint {} died during 
anti-compaction", endpoint, parentSession, exception);
  }
  }
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1eef56c/src/java/org/apache/cassandra/repair/RepairSession.java
--
diff --cc src/java/org/apache/cassandra/repair/RepairSession.java
index 528115a,5fe306d..00340a1
--- a/src/java/org/apache/cassandra/repair/RepairSession.java
+++ b/src/java/org/apache/cassandra/repair/RepairSession.java
@@@ -141,8 -134,6 +137,7 @@@ public class RepairSession extends Abst
  this.ranges = ranges;
  this.endpoints = endpoints;
  this.repairedAt = repairedAt;
-

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-11-11 Thread samt 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: a26d25f78a538890fa8d58699cc6a0abde214d66
Parents: e3f37c4 304c47f
Author: Sam Tunnicliffe 
Authored: Fri Nov 11 17:41:13 2016 +
Committer: Sam Tunnicliffe 
Committed: Fri Nov 11 17:41:13 2016 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a26d25f7/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-11-11 Thread samt 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: e3f37c44358a101809751aeac09a374713a01844
Parents: 574ca2e d81a490
Author: Sam Tunnicliffe 
Authored: Fri Nov 11 11:32:14 2016 +
Committer: Sam Tunnicliffe 
Committed: Fri Nov 11 11:32:14 2016 +

--
 .../cassandra/auth/CassandraRoleManager.java| 23 +++-
 1 file changed, 17 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3f37c44/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
--
diff --cc src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 6c2a9ca,c3e2626..89f0e24
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@@ -162,11 -161,10 +162,10 @@@ public class CassandraRoleManager imple
  // it, so we can continue to use the old tables while the cluster is 
upgraded.
  // Otherwise, we may need to create a default superuser role to 
enable others
  // to be added.
 -if (Schema.instance.getCFMetaData(AuthKeyspace.NAME, "users") != null)
 +if (Schema.instance.getCFMetaData(SchemaConstants.AUTH_KEYSPACE_NAME, 
"users") != null)
  {
-  legacySelectUserStatement = (SelectStatement) prepare("SELECT * 
FROM %s.%s WHERE name = ?",
-
SchemaConstants.AUTH_KEYSPACE_NAME,
-
LEGACY_USERS_TABLE);
+ legacySelectUserStatement = prepareLegacySelectUserStatement();
+ 
  scheduleSetupTask(() -> {
  convertLegacyData();
  return null;
@@@ -452,6 -450,13 +451,13 @@@
  }
  }
  
+ private SelectStatement prepareLegacySelectUserStatement()
+ {
+ return (SelectStatement) prepare("SELECT * FROM %s.%s WHERE name = ?",
 - AuthKeyspace.NAME,
++ SchemaConstants.AUTH_KEYSPACE_NAME,
+  LEGACY_USERS_TABLE);
+ }
+ 
  private CQLStatement prepare(String template, String keyspace, String 
table)
  {
  try
@@@ -493,9 -498,14 +499,14 @@@
  // If it exists, try the legacy users table in case the cluster
  // is in the process of being upgraded and so is running with 
mixed
  // versions of the authn schema.
- return 
(Schema.instance.getCFMetaData(SchemaConstants.AUTH_KEYSPACE_NAME, "users") != 
null)
- ? getRoleFromTable(name, legacySelectUserStatement, 
LEGACY_ROW_TO_ROLE)
- : getRoleFromTable(name, loadRoleStatement, ROW_TO_ROLE);
 -if (Schema.instance.getCFMetaData(AuthKeyspace.NAME, "users") == 
null)
++if 
(Schema.instance.getCFMetaData(SchemaConstants.AUTH_KEYSPACE_NAME, "users") == 
null)
+ return getRoleFromTable(name, loadRoleStatement, ROW_TO_ROLE);
+ else
+ {
+ if (legacySelectUserStatement == null)
+ prepareLegacySelectUserStatement();
+ return getRoleFromTable(name, legacySelectUserStatement, 
LEGACY_ROW_TO_ROLE);
+ }
  }
  catch (RequestExecutionException | RequestValidationException e)
  {

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-11-10 Thread stefania 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 574ca2e2ddcf785f8cb607953a60d70218ed54e2
Parents: 699fa9a 14b52bc
Author: Stefania Alborghetti 
Authored: Fri Nov 11 11:01:41 2016 +0800
Committer: Stefania Alborghetti 
Committed: Fri Nov 11 11:01:41 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 11 +++
 2 files changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/574ca2e2/CHANGES.txt
--
diff --cc CHANGES.txt
index e765a9c,1b2b61f..2468da5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -147,6 -37,6 +147,7 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
   * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
++ * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)
   * Fix Util.spinAssertEquals (CASSANDRA-12283)
   * Fix potential NPE for compactionstats (CASSANDRA-12462)
   * Prepare legacy authenticate statement if credentials table initialised 
after node startup (CASSANDRA-12813)

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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-11-10 Thread samt 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 90eed50c956dafd27946963d91315b683a99fab6
Parents: 072b527 bfa8c80
Author: Sam Tunnicliffe 
Authored: Thu Nov 10 10:08:10 2016 +
Committer: Sam Tunnicliffe 
Committed: Thu Nov 10 10:08:10 2016 +

--
 .../io/sstable/IndexSummaryManagerTest.java | 68 ++--
 1 file changed, 35 insertions(+), 33 deletions(-)
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-11-08 Thread yukim 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: bc78a2afac1bca4cd17ae3e156033ff0b205f3fc
Parents: d582d03 92594d8
Author: Yuki Morishita 
Authored: Tue Nov 8 09:42:54 2016 -0600
Committer: Yuki Morishita 
Committed: Tue Nov 8 09:42:54 2016 -0600

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/db/compaction/CompactionInfo.java   | 8 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc78a2af/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index 535217f,3cd8737..344fa58
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@@ -23,8 -23,8 +23,6 @@@ import java.util.Map
  import java.util.UUID;
  
  import org.apache.cassandra.config.CFMetaData;
--import org.apache.cassandra.metrics.StorageMetrics;
--import org.apache.cassandra.service.StorageService;
  
  /** Implements serializable to allow structured info to be returned via JMX. 
*/
  public final class CompactionInfo implements Serializable

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-10-28 Thread samt 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 9be467a22ab646c23710eb2b23dd21e5a46b07bd
Parents: 49ce0a4 e4f840a
Author: Sam Tunnicliffe 
Authored: Fri Oct 28 16:11:13 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Fri Oct 28 16:17:52 2016 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/auth/CassandraAuthorizer.java | 13 --
 .../cassandra/auth/PasswordAuthenticator.java   | 42 ++--
 3 files changed, 41 insertions(+), 15 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9be467a2/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
--
diff --cc src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
index 8c3485d,7ffef27..7f44eef
--- a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
+++ b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
@@@ -215,12 -209,20 +215,19 @@@ public class CassandraAuthorizer implem
   
Lists.newArrayList(ByteBufferUtil.bytes(role.getRoleName()),

  ByteBufferUtil.bytes(resource.getName(;
  
+ SelectStatement statement;
  // If it exists, read from the legacy user permissions table to 
handle the case where the cluster
  // is being upgraded and so is running with mixed versions of the 
authz schema
- SelectStatement statement = 
Schema.instance.getCFMetaData(SchemaConstants.AUTH_KEYSPACE_NAME, 
USER_PERMISSIONS) == null
- ? authorizeRoleStatement
- : legacyAuthorizeRoleStatement;
 -if (Schema.instance.getCFMetaData(AuthKeyspace.NAME, 
USER_PERMISSIONS) == null)
++if (Schema.instance.getCFMetaData(SchemaConstants.AUTH_KEYSPACE_NAME, 
USER_PERMISSIONS) == null)
+ statement = authorizeRoleStatement;
+ else
+ {
+ // If the permissions table was initialised only after the 
statement got prepared, re-prepare (CASSANDRA-12813)
+ if (legacyAuthorizeRoleStatement == null)
+ legacyAuthorizeRoleStatement = prepare(USERNAME, 
USER_PERMISSIONS);
+ statement = legacyAuthorizeRoleStatement;
+ }
 -
 -ResultMessage.Rows rows = 
statement.execute(QueryState.forInternalCalls(), options) ;
 +ResultMessage.Rows rows = 
statement.execute(QueryState.forInternalCalls(), options, System.nanoTime());
  UntypedResultSet result = UntypedResultSet.create(rows.result);
  
  if (!result.isEmpty() && result.one().has(PERMISSIONS))

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9be467a2/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java
--
diff --cc src/java/org/apache/cassandra/auth/PasswordAuthenticator.java
index b0317f3,ca610d1..4b667ae
--- a/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java
+++ b/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java
@@@ -86,56 -78,8 +86,52 @@@ public class PasswordAuthenticator impl
  {
  try
  {
 +String hash = cache.get(username);
 +if (!BCrypt.checkpw(password, hash))
 +throw new AuthenticationException(String.format("Provided 
username %s and/or password are incorrect", username));
 +
 +return new AuthenticatedUser(username);
 +}
 +catch (ExecutionException | UncheckedExecutionException e)
 +{
 +// the credentials were somehow invalid - either a non-existent 
role, or one without a defined password
 +if (e.getCause() instanceof NoSuchCredentialsException)
 +throw new AuthenticationException(String.format("Provided 
username %s and/or password are incorrect", username));
 +
 +// an unanticipated exception occured whilst querying the 
credentials table
 +if (e.getCause() instanceof RequestExecutionException)
 +{
 +logger.trace("Error performing internal authentication", e);
 +throw new AuthenticationException(String.format("Error during 
authentication of user %s : %s", username,

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-10-24 Thread stefania 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 94a01f62a6db2ffed561fbfac05c6caf5e2ba53c
Parents: 7c759e2 ee85507
Author: Stefania Alborghetti 
Authored: Tue Oct 25 09:43:17 2016 +0800
Committer: Stefania Alborghetti 
Committed: Tue Oct 25 09:43:57 2016 +0800

--
 CHANGES.txt  |  1 +
 .../apache/cassandra/tracing/TraceStateImpl.java |  7 +--
 .../org/apache/cassandra/cql3/TraceCqlTest.java  | 19 +++
 3 files changed, 25 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/94a01f62/src/java/org/apache/cassandra/tracing/TraceStateImpl.java
--
diff --cc src/java/org/apache/cassandra/tracing/TraceStateImpl.java
index fe78e64,000..349000a
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/tracing/TraceStateImpl.java
+++ b/src/java/org/apache/cassandra/tracing/TraceStateImpl.java
@@@ -1,127 -1,0 +1,130 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.cassandra.tracing;
 +
 +import java.net.InetAddress;
 +import java.util.Collections;
 +import java.util.Set;
 +import java.util.UUID;
 +import java.util.concurrent.CompletableFuture;
 +import java.util.concurrent.ConcurrentHashMap;
 +import java.util.concurrent.Future;
 +import java.util.concurrent.TimeUnit;
 +import java.util.concurrent.TimeoutException;
 +
++import com.google.common.annotations.VisibleForTesting;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import org.apache.cassandra.concurrent.Stage;
 +import org.apache.cassandra.concurrent.StageManager;
 +import org.apache.cassandra.db.ConsistencyLevel;
 +import org.apache.cassandra.db.Mutation;
 +import org.apache.cassandra.exceptions.OverloadedException;
 +import org.apache.cassandra.service.StorageProxy;
 +import org.apache.cassandra.utils.JVMStabilityInspector;
 +import org.apache.cassandra.utils.WrappedRunnable;
 +
 +/**
 + * ThreadLocal state for a tracing session. The presence of an instance of 
this class as a ThreadLocal denotes that an
 + * operation is being traced.
 + */
 +public class TraceStateImpl extends TraceState
 +{
 +private static final Logger logger = 
LoggerFactory.getLogger(TraceStateImpl.class);
- private static final int WAIT_FOR_PENDING_EVENTS_TIMEOUT_SECS =
-   
Integer.parseInt(System.getProperty("cassandra.wait_for_tracing_events_timeout_secs",
 "1"));
++
++@VisibleForTesting
++public static int WAIT_FOR_PENDING_EVENTS_TIMEOUT_SECS =
++  
Integer.parseInt(System.getProperty("cassandra.wait_for_tracing_events_timeout_secs",
 "0"));
 +
 +private final Set pendingFutures = 
ConcurrentHashMap.newKeySet();
 +
 +public TraceStateImpl(InetAddress coordinator, UUID sessionId, 
Tracing.TraceType traceType)
 +{
 +super(coordinator, sessionId, traceType);
 +}
 +
 +protected void traceImpl(String message)
 +{
 +final String threadName = Thread.currentThread().getName();
 +final int elapsed = elapsed();
 +
 +executeMutation(TraceKeyspace.makeEventMutation(sessionIdBytes, 
message, elapsed, threadName, ttl));
 +if (logger.isTraceEnabled())
 +logger.trace("Adding <{}> to trace events", message);
 +}
 +
 +/**
 + * Wait on submitted futures
 + */
 +protected void waitForPendingEvents()
 +{
 +if (WAIT_FOR_PENDING_EVENTS_TIMEOUT_SECS <= 0)
 +return;
 +
 +try
 +{
 +if

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-10-21 Thread jjirsa 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: d4a914d2166f8fa2345127bb3d86503b2921be33
Parents: 575927b 5883e43
Author: Jeff Jirsa 
Authored: Fri Oct 21 19:04:04 2016 -0700
Committer: Jeff Jirsa 
Committed: Fri Oct 21 19:04:40 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4a914d2/CHANGES.txt
--
diff --cc CHANGES.txt
index 105791b,46f27a6..b965262
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -136,11 -33,10 +136,12 @@@ Merged from 2.2
   * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
   * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
   * Decrement pending range calculator jobs counter in finally block
 -  (CASSANDRA-12554)
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
+  * Split consistent range movement flag correction (CASSANDRA-12786)
  Merged from 2.1:
 - * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
   * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
  
  

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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-10-13 Thread samt 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 771a1a2fa20ca1be614eaf41ec27ceae83ab5f9c
Parents: 7234c79 a889852
Author: Sam Tunnicliffe 
Authored: Thu Oct 13 17:49:14 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Thu Oct 13 17:49:14 2016 +0100

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/auth/AuthMigrationListener.java | 6 ++
 2 files changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/771a1a2f/CHANGES.txt
--
diff --cc CHANGES.txt
index 682656d,f291674..bc5dcd1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -110,62 -47,12 +110,63 @@@ Merged from 3.0
   * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
   * Calculate last compacted key on startup (CASSANDRA-6216)
   * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 +Merged from 2.2:
++ * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
 + * Limit colUpdateTimeDelta histogram updates to reasonable deltas 
(CASSANDRA-7)
 + * Fix leak errors and execution rejected exceptions when draining 
(CASSANDRA-12457)
 + * Fix merkle tree depth calculation (CASSANDRA-12580)
 + * Make Collections deserialization more robust (CASSANDRA-12618)
 + * Better handle invalid system roles table (CASSANDRA-12700)
 + * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
 + * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
 +
 +
 +3.8, 3.9
 + * Fix value skipping with counter columns (CASSANDRA-11726)
 + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session (CASSANDRA-11425)

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-10-13 Thread marcuse 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 2931a1938db4de877f2e1e3c2916e0f308dafa3e
Parents: a041908 7a274dd
Author: Marcus Eriksson 
Authored: Thu Oct 13 15:08:58 2016 +0200
Committer: Marcus Eriksson 
Committed: Thu Oct 13 15:08:58 2016 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  7 -
 .../cassandra/db/ColumnFamilyMetricTest.java| 29 
 3 files changed, 36 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2931a193/CHANGES.txt
--
diff --cc CHANGES.txt
index f0df0e6,dc7bcab..c0b1b20
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -109,61 -45,12 +109,62 @@@ Merged from 3.0
   * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
   * Calculate last compacted key on startup (CASSANDRA-6216)
   * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 +Merged from 2.2:
++ * Limit colUpdateTimeDelta histogram updates to reasonable deltas 
(CASSANDRA-7)
 + * Fix leak errors and execution rejected exceptions when draining 
(CASSANDRA-12457)
 + * Fix merkle tree depth calculation (CASSANDRA-12580)
 + * Make Collections deserialization more robust (CASSANDRA-12618)
 + * Better handle invalid system roles table (CASSANDRA-12700)
 + * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
 + * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
 +
 +
 +3.8, 3.9
 + * Fix value skipping with counter columns (CASSANDRA-11726)
 + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-10-11 Thread jjirsa 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: b25d9030a898bd867d55d8d7f564cdf4c332d08f
Parents: f9ae1b7 703b151
Author: Jeff Jirsa 
Authored: Tue Oct 11 21:26:00 2016 -0700
Committer: Jeff Jirsa 
Committed: Tue Oct 11 21:27:09 2016 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/auth/CassandraRoleManager.java| 22 +++-
 .../serializers/BooleanSerializer.java  |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25d9030/CHANGES.txt
--
diff --cc CHANGES.txt
index 2e9186f,81fb544..c59459c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -106,60 -42,12 +106,61 @@@ Merged from 3.0
   * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
   * Calculate last compacted key on startup (CASSANDRA-6216)
   * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 +Merged from 2.2:
 + * Fix leak errors and execution rejected exceptions when draining 
(CASSANDRA-12457)
 + * Fix merkle tree depth calculation (CASSANDRA-12580)
 + * Make Collections deserialization more robust (CASSANDRA-12618)
++ * Better handle invalid system roles table (CASSANDRA-12700)
 + * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
 + * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
 +
 +
 +3.8, 3.9
 + * Fix value skipping with counter columns (CASSANDRA-11726)
 + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session (CASSANDRA-11425)
 + * Add repaired percentage metric (CASSANDRA-11503)
 + * Add

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-10-11 Thread stefania 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: f9ae1b7c61454f53ee34a78d2388084c21479458
Parents: c7fb95c 74f1e0a
Author: Stefania Alborghetti 
Authored: Wed Oct 12 09:50:46 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Oct 12 09:50:46 2016 +0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9ae1b7c/CHANGES.txt
--
diff --cc CHANGES.txt
index 5907c74,186a8d3..2e9186f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -106,60 -41,12 +106,60 @@@ Merged from 3.0
   * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
   * Calculate last compacted key on startup (CASSANDRA-6216)
   * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 +Merged from 2.2:
 + * Fix leak errors and execution rejected exceptions when draining 
(CASSANDRA-12457)
 + * Fix merkle tree depth calculation (CASSANDRA-12580)
 + * Make Collections deserialization more robust (CASSANDRA-12618)
 + * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
-  * Fix authentication problem when invoking clqsh copy from a SOURCE command 
(CASSANDRA-12642)
++ * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
 +
 +
 +3.8, 3.9
 + * Fix value skipping with counter columns (CASSANDRA-11726)
 + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session (CASSANDRA-11425)
 + * Add repaired percentage metric (CASSANDRA-11503)
 + * Add Change-Data-Capture (CASSANDRA-8844)
 +Merged from 3.0:
 + * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195)
   *

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-10-07 Thread stefania 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 316e1cd7b4ee092a78a1790b0350c5c82e0a4dbe
Parents: 47c473a 695065e
Author: Stefania Alborghetti 
Authored: Fri Oct 7 16:54:26 2016 +0800
Committer: Stefania Alborghetti 
Committed: Fri Oct 7 16:54:26 2016 +0800

--
 CHANGES.txt |   1 +
 .../DebuggableScheduledThreadPoolExecutor.java  |   2 +-
 .../concurrent/ScheduledExecutors.java  |   4 -
 .../db/compaction/CompactionManager.java| 127 +++
 .../db/lifecycle/LifecycleTransaction.java  |  14 +-
 .../io/sstable/format/SSTableReader.java|  15 ++-
 .../apache/cassandra/net/MessagingService.java  |   3 +-
 .../cassandra/service/StorageService.java   |  12 +-
 .../org/apache/cassandra/utils/ExpiringMap.java |   4 +-
 9 files changed, 116 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/316e1cd7/CHANGES.txt
--
diff --cc CHANGES.txt
index f566b1b,894113a..50750bc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -101,59 -39,12 +101,60 @@@ Merged from 3.0
   * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
   * Calculate last compacted key on startup (CASSANDRA-6216)
   * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 +Merged from 2.2:
++ * Fix leak errors and execution rejected exceptions when draining 
(CASSANDRA-12457)
 + * Fix merkle tree depth calculation (CASSANDRA-12580)
 + * Make Collections deserialization more robust (CASSANDRA-12618)
 + * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
 + * Fix authentication problem when invoking clqsh copy from a SOURCE command 
(CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
 +
 +
 +3.8, 3.9
 + * Fix value skipping with counter columns (CASSANDRA-11726)
 + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-09-29 Thread yukim 
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: e3b34dc8584373c9f503e830ff3241e0865ab994
Parents: 57e9a83 413e48e
Author: Yuki Morishita 
Authored: Thu Sep 29 15:05:12 2016 -0500
Committer: Yuki Morishita 
Committed: Thu Sep 29 15:05:12 2016 -0500

--
 CHANGES.txt |   1 +
 .../db/compaction/CompactionManager.java|   6 +-
 .../org/apache/cassandra/repair/Validator.java  |   9 +-
 .../org/apache/cassandra/utils/MerkleTree.java  |  10 ++
 .../org/apache/cassandra/utils/MerkleTrees.java |  10 ++
 .../db/compaction/CompactionsTest.java  |   2 +-
 .../apache/cassandra/repair/ValidatorTest.java  | 167 ---
 7 files changed, 145 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3b34dc8/CHANGES.txt
--
diff --cc CHANGES.txt
index c33b1d3,9076e7a..ba08745
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -91,59 -35,12 +91,60 @@@ Merged from 3.0
   * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
   * Calculate last compacted key on startup (CASSANDRA-6216)
   * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 +Merged from 2.2:
++ * Fix merkle tree depth calculation (CASSANDRA-12580)
 + * Make Collections deserialization more robust (CASSANDRA-12618)
 + * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
 + * Fix authentication problem when invoking clqsh copy from a SOURCE command 
(CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
 +
 +
 +3.8, 3.9
 + * Fix value skipping with counter columns (CASSANDRA-11726)
 + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add