cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 29 May 2014 21:32:15 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 62b3c1ea6cc39d3a36956f18d19918184f03322c
Parents: e3df7e2 5420b7a
Author: belliottsmith <github@sub.laerad.com>
Authored: Thu May 29 22:31:47 2014 +0100
Committer: belliottsmith <github@sub.laerad.com>
Committed: Thu May 29 22:31:47 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../AbstractTracingAwareExecutorService.java    | 227 ++++++++++++
 .../DebuggableThreadPoolExecutor.java           |   5 +
 .../JMXEnabledSharedExecutorPool.java           | 114 ++++++
 .../cassandra/concurrent/SEPExecutor.java       | 274 ++++++++++++++
 .../apache/cassandra/concurrent/SEPWorker.java  | 368 +++++++++++++++++++
 .../concurrent/SharedExecutorPool.java          |  99 +++++
 .../cassandra/concurrent/StageManager.java      |  22 +-
 .../concurrent/TracingAwareExecutorService.java |   3 +
 .../apache/cassandra/metrics/SEPMetrics.java    |  98 +++++
 .../metrics/ThreadPoolMetricNameFactory.java    |  47 +++
 .../cassandra/metrics/ThreadPoolMetrics.java    |  28 +-
 .../apache/cassandra/net/MessagingService.java  |   1 +
 .../org/apache/cassandra/repair/RepairJob.java  |   2 +-
 .../apache/cassandra/repair/RepairSession.java  |   1 +
 .../cassandra/service/AbstractReadExecutor.java |   9 +-
 .../service/AbstractWriteResponseHandler.java   |   2 +-
 .../apache/cassandra/service/ReadCallback.java  |   2 +-
 .../apache/cassandra/service/StorageProxy.java  |   8 +-
 .../service/TruncateResponseHandler.java        |   2 +-
 .../org/apache/cassandra/tools/NodeProbe.java   |   2 +-
 .../org/apache/cassandra/transport/Message.java |   2 +-
 .../transport/RequestThreadPoolExecutor.java    |  19 +-
 .../apache/cassandra/utils/SimpleCondition.java |  84 -----
 .../utils/concurrent/SimpleCondition.java       |  97 +++++
 .../cassandra/utils/concurrent/WaitQueue.java   |  72 ++--
 .../concurrent/LongSharedExecutorPoolTest.java  | 228 ++++++++++++
 .../apache/cassandra/repair/ValidatorTest.java  |   2 +-
 28 files changed, 1638 insertions(+), 181 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/62b3c1ea/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d36aec3,3b09b7d..75d8533
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +3.0
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Make incremental repair default (CASSANDRA-7250)
 +
  2.1.0-rc1
+  * More efficient executor service for fast operations (CASSANDRA-4718)
   * Move less common tools into a new cassandra-tools package (CASSANDRA-7160)
   * Support more concurrent requests in native protocol (CASSANDRA-7231)
   * Add tab-completion to debian nodetool packaging (CASSANDRA-6421)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/62b3c1ea/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------


Mime
View raw message