Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5045d3ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5045d3ea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5045d3ea
Branch: refs/heads/trunk
Commit: 5045d3ea866c23ba38462d8700221303e02867e4
Parents: ef67b60 3a73e39
Author: Aleksey Yeschenko <[email protected]>
Authored: Tue Apr 22 19:49:54 2014 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Tue Apr 22 19:49:54 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/BatchlogManager.java | 2 +-
.../cassandra/db/HintedHandOffManager.java | 4 +--
.../apache/cassandra/net/MessagingService.java | 27 ++++++++++++++------
.../apache/cassandra/net/WriteCallbackInfo.java | 16 +++++++++---
.../apache/cassandra/service/StorageProxy.java | 7 ++++-
6 files changed, 41 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5045d3ea/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e9f07a8,dbed949..2f70c63
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -103,9 -63,6 +103,10 @@@ Merged from 2.0
(CASSANDRA-6906)
* Fix SSTable not released if stream session fails (CASSANDRA-6818)
* Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
+ * Queries on compact tables can return more rows that requested
(CASSANDRA-7052)
+ * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
+ * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
++ * Ensure that batchlog and hint timeouts do not produce hints
(CASSANDRA-7058)
Merged from 1.2:
* Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
* add extra SSL cipher suites (CASSANDRA-6613)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5045d3ea/src/java/org/apache/cassandra/db/BatchlogManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5045d3ea/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/HintedHandOffManager.java
index e83aefc,13d1bb0..4415e63
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@@ -447,11 -447,11 +447,11 @@@ public class HintedHandOffManager imple
public void run()
{
rowsReplayed.incrementAndGet();
- deleteHint(hostIdBytes, hint.name(),
hint.maxTimestamp());
+ deleteHint(hostIdBytes, hint.name(),
hint.timestamp());
}
};
- WriteResponseHandler responseHandler = new
WriteResponseHandler(endpoint, WriteType.UNLOGGED_BATCH, callback);
- MessagingService.instance().sendRR(message, endpoint,
responseHandler);
+ WriteResponseHandler responseHandler = new
WriteResponseHandler(endpoint, WriteType.SIMPLE, callback);
+ MessagingService.instance().sendRR(message, endpoint,
responseHandler, false);
responseHandlers.add(responseHandler);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5045d3ea/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5045d3ea/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
