Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/db/BatchlogManager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4063bcc8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4063bcc8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4063bcc8
Branch: refs/heads/trunk
Commit: 4063bcc850ccc18a0238c8abdceb776a7ef8da71
Parents: e9c3ee9 5a43c39
Author: Aleksey Yeschenko <[email protected]>
Authored: Wed Apr 3 22:57:34 2013 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Wed Apr 3 22:57:34 2013 +0300
----------------------------------------------------------------------
.../org/apache/cassandra/config/CFMetaData.java | 2 +-
.../org/apache/cassandra/config/KSMetaData.java | 2 +-
.../org/apache/cassandra/db/BatchlogManager.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4063bcc8/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4063bcc8/src/java/org/apache/cassandra/config/KSMetaData.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4063bcc8/src/java/org/apache/cassandra/db/BatchlogManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/BatchlogManager.java
index 500021d,9da9b2d..a5139e8
--- a/src/java/org/apache/cassandra/db/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/db/BatchlogManager.java
@@@ -134,11 -135,13 +134,11 @@@ public class BatchlogManager implement
ByteBuffer writtenAt = LongType.instance.decompose(timestamp / 1000);
ByteBuffer data = serializeRowMutations(mutations);
- ColumnFamily cf =
ArrayBackedSortedColumns.factory.create(CFMetaData.BatchlogCF);
- ColumnFamily cf = ColumnFamily.create(CFMetaData.BatchlogCf);
- cf.addColumn(new Column(WRITTEN_AT, writtenAt, timestamp));
++ ColumnFamily cf =
ArrayBackedSortedColumns.factory.create(CFMetaData.BatchlogCf);
cf.addColumn(new Column(DATA, data, timestamp));
- RowMutation rm = new RowMutation(Table.SYSTEM_KS,
UUIDType.instance.decompose(uuid));
- rm.add(cf);
+ cf.addColumn(new Column(WRITTEN_AT, writtenAt, timestamp));
- return rm;
+ return new RowMutation(Table.SYSTEM_KS,
UUIDType.instance.decompose(uuid), cf);
}
private static ByteBuffer serializeRowMutations(Collection<RowMutation>
mutations)
