cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Tue, 04 Nov 2014 19:41:38 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java


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

Branch: refs/heads/trunk
Commit: c816a7a49e42de244994a22f8903eecc26314252
Parents: 2d4a305 7bfb347
Author: Yuki Morishita <yukim@apache.org>
Authored: Tue Nov 4 13:41:18 2014 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Tue Nov 4 13:41:18 2014 -0600

----------------------------------------------------------------------
 .../org/apache/cassandra/db/ColumnFamilyStoreTest.java   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c816a7a4/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index 243b2d2,292b7f2..2732be5
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@@ -1853,7 -1829,16 +1853,16 @@@ public class ColumnFamilyStoreTest exte
          ByteBuffer key = bytes("key");
  
          SSTableSimpleWriter writer = new SSTableSimpleWriter(dir.getDirectoryForNewSSTables(),
-                                                              cfmeta, StorageService.getPartitioner());
 -                                                              cfmeta, StorageService.getPartitioner())
++                                                             cfmeta, StorageService.getPartitioner())
+         {
+             @Override
+             protected SSTableWriter getWriter()
+             {
+                 // hack for reset generation
+                 generation.set(0);
+                 return super.getWriter();
+             }
+         };
          writer.newRow(key);
          writer.addColumn(bytes("col"), bytes("val"), 1);
          writer.close();


Mime
View raw message