cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Wed, 02 Sep 2015 07:51:56 GMT
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 79628dd7076c125c9b434e90689057cdf08bb87b
Parents: 2dbf029 53a177a
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Sep 2 08:51:29 2015 +0100
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Sep 2 08:51:29 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 conf/cassandra.yaml                             |   1 -
 .../org/apache/cassandra/batchlog/Batch.java    | 155 +++++
 .../batchlog/BatchRemoveVerbHandler.java        |  31 +
 .../batchlog/BatchStoreVerbHandler.java         |  32 +
 .../cassandra/batchlog/BatchlogManager.java     | 554 +++++++++++++++++
 .../batchlog/BatchlogManagerMBean.java          |  38 ++
 .../batchlog/LegacyBatchlogMigrator.java        | 196 ++++++
 .../org/apache/cassandra/concurrent/Stage.java  |   2 -
 .../cassandra/concurrent/StageManager.java      |   1 -
 .../org/apache/cassandra/config/Config.java     |   1 -
 .../cassandra/config/DatabaseDescriptor.java    |   7 +-
 .../cql3/statements/BatchStatement.java         |   5 -
 .../apache/cassandra/db/BatchlogManager.java    | 596 -------------------
 .../cassandra/db/BatchlogManagerMBean.java      |  38 --
 .../db/CounterMutationVerbHandler.java          |   2 +-
 src/java/org/apache/cassandra/db/Mutation.java  |   7 +-
 .../cassandra/db/MutationVerbHandler.java       |  43 +-
 .../cassandra/db/ReadRepairVerbHandler.java     |   3 +-
 .../org/apache/cassandra/db/SystemKeyspace.java |   2 +-
 .../org/apache/cassandra/db/WriteResponse.java  |  18 +-
 .../cassandra/hints/EncodedHintMessage.java     |   6 +-
 src/java/org/apache/cassandra/hints/Hint.java   |  11 +-
 .../org/apache/cassandra/hints/HintMessage.java |  14 +-
 .../cassandra/hints/LegacyHintsMigrator.java    |   2 +-
 .../apache/cassandra/net/MessagingService.java  |  26 +-
 .../cassandra/service/CassandraDaemon.java      |   6 +-
 .../apache/cassandra/service/StorageProxy.java  | 208 ++++---
 .../cassandra/service/StorageService.java       |  19 +-
 .../service/paxos/CommitVerbHandler.java        |   6 +-
 .../org/apache/cassandra/tools/NodeProbe.java   |   4 +-
 .../cql3/MaterializedViewLongTest.java          |   2 +-
 .../apache/cassandra/batchlog/BatchTest.java    | 153 +++++
 .../batchlog/BatchlogEndpointFilterTest.java    | 115 ++++
 .../cassandra/batchlog/BatchlogManagerTest.java | 460 ++++++++++++++
 .../cassandra/db/BatchlogManagerTest.java       | 394 ------------
 .../service/BatchlogEndpointFilterTest.java     | 117 ----
 37 files changed, 1945 insertions(+), 1331 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/79628dd7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c916ac9,751b75d..2a1bd1c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-beta2
+  * Improve batchlog write patch (CASSANDRA-9673)
   * Re-apply MaterializedView updates on commitlog replay (CASSANDRA-10164)
   * Require AbstractType.isByteOrderComparable declaration in constructor (CASSANDRA-9901)
   * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/79628dd7/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------


Mime
View raw message