You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ca...@apache.org on 2016/01/13 20:49:02 UTC
[11/13] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93f65293
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93f65293
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93f65293
Branch: refs/heads/cassandra-3.3
Commit: 93f6529393baa83bd232c48f94b1805a996ceb9a
Parents: a7feb80 94e7ef1
Author: Carl Yeksigian <ca...@apache.org>
Authored: Wed Jan 13 14:46:34 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Wed Jan 13 14:46:34 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../AbstractLocalAwareExecutorService.java | 230 +++++++++++++++++++
.../AbstractTracingAwareExecutorService.java | 230 -------------------
.../DebuggableThreadPoolExecutor.java | 48 ++--
.../cassandra/concurrent/ExecutorLocal.java | 44 ++++
.../cassandra/concurrent/ExecutorLocals.java | 84 +++++++
.../concurrent/LocalAwareExecutorService.java | 34 +++
.../cassandra/concurrent/SEPExecutor.java | 3 +-
.../concurrent/SharedExecutorPool.java | 2 +-
.../cassandra/concurrent/StageManager.java | 12 +-
.../concurrent/TracingAwareExecutorService.java | 36 ---
.../cassandra/cql3/functions/UDFunction.java | 2 +-
.../cql3/statements/BatchStatement.java | 9 +-
.../cql3/statements/CreateViewStatement.java | 2 +-
.../cql3/statements/SelectStatement.java | 4 +-
.../org/apache/cassandra/db/ReadCommand.java | 2 +-
.../apache/cassandra/net/MessagingService.java | 7 +-
.../apache/cassandra/service/ClientWarn.java | 62 +++--
.../apache/cassandra/service/StorageProxy.java | 2 +-
.../org/apache/cassandra/tracing/Tracing.java | 3 +-
.../org/apache/cassandra/transport/Message.java | 6 +-
.../transport/RequestThreadPoolExecutor.java | 4 +-
.../cql3/validation/entities/UFTest.java | 6 +-
.../cassandra/service/ClientWarningsTest.java | 58 +++++
24 files changed, 545 insertions(+), 346 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93f65293/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index aae5efe,a37ec99..85bc100
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -7,29 -4,6 +7,30 @@@ Merged from 3.0
tombstone (CASSANDRA-10743)
* MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
* Fix potential assertion error during compaction (CASSANDRA-10944)
+Merged from 2.2:
++ * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
+ * Fix error streaming section more than 2GB (CASSANDRA-10961)
+ * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
+ * Enable GC logging by default (CASSANDRA-10140)
+ * Optimize pending range computation (CASSANDRA-9258)
+ * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
+ * drop/alter user should be case sensitive (CASSANDRA-10817)
+Merged from 2.1:
+ * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
+ * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
+ * If CompactionMetadata is not in stats file, use index summary instead (CASSANDRA-10676)
+ * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072)
+ * Fix pending range calculation during moves (CASSANDRA-10887)
+ * Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-8708)
+
+
+3.2
+ * Make sure tokens don't exist in several data directories (CASSANDRA-6696)
+ * Add requireAuthorization method to IAuthorizer (CASSANDRA-10852)
+ * Move static JVM options to conf/jvm.options file (CASSANDRA-10494)
+ * Fix CassandraVersion to accept x.y version string (CASSANDRA-10931)
+ * Add forceUserDefinedCleanup to allow more flexible cleanup (CASSANDRA-10708)
+ * (cqlsh) allow setting TTL with COPY (CASSANDRA-9494)
* Fix counting of received sstables in streaming (CASSANDRA-10949)
* Implement hints compression (CASSANDRA-9428)
* Fix potential assertion error when reading static columns (CASSANDRA-10903)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93f65293/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93f65293/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93f65293/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93f65293/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/MessagingService.java
index d95c49b,d416dca..76f4967
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@@ -820,11 -821,11 +821,11 @@@ public final class MessagingService imp
if (!ms.allowIncomingMessage(message, id))
return;
- Runnable runnable = new MessageDeliveryTask(message, id, timestamp, isCrossNodeTimestamp);
+ Runnable runnable = new MessageDeliveryTask(message, id);
- TracingAwareExecutorService stage = StageManager.getStage(message.getMessageType());
+ LocalAwareExecutorService stage = StageManager.getStage(message.getMessageType());
assert stage != null : "No stage for message type " + message.verb;
- stage.execute(runnable, state);
+ stage.execute(runnable, ExecutorLocals.create(state));
}
public void setCallbackForTests(int messageId, CallbackInfo callback)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93f65293/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------