You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/10/28 18:25:25 UTC
[1/2] git commit: Ninja: use v1 (time) instead of v4 (random) UUID
for the batchlog
Updated Branches:
refs/heads/trunk 7950dc31f -> 4e5ed3a64
Ninja: use v1 (time) instead of v4 (random) UUID for the batchlog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5d563ec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5d563ec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5d563ec
Branch: refs/heads/trunk
Commit: b5d563ec3c7d569e626119bd5900026c07f247b6
Parents: 27da625
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Oct 28 20:21:24 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Oct 28 20:21:24 2013 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5d563ec/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 52a2a47..6e6d98c 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -610,7 +610,7 @@ public class StorageProxy implements StorageProxyMBean
// write to the batchlog
Collection<InetAddress> batchlogEndpoints = getBatchlogEndpoints(localDataCenter, consistency_level);
- UUID batchUUID = UUID.randomUUID();
+ UUID batchUUID = UUIDGen.getTimeUUID();
syncWriteToBatchlog(mutations, batchlogEndpoints, batchUUID);
// now actually perform the writes and wait for them to complete
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.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/4e5ed3a6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e5ed3a6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e5ed3a6
Branch: refs/heads/trunk
Commit: 4e5ed3a64c4fbce090f73f9653eb08277d64b6e0
Parents: 7950dc3 b5d563e
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Oct 28 20:25:09 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Oct 28 20:25:09 2013 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e5ed3a6/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------