You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/11/04 20:41:35 UTC
[1/6] git commit: modify test after CASSANDRA-7463 change
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 b3c1e147b -> 7bfb34714
refs/heads/cassandra-2.1 2d4a305c5 -> c816a7a49
refs/heads/trunk 07068e204 -> bd32104ec
modify test after CASSANDRA-7463 change
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bfb3471
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bfb3471
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bfb3471
Branch: refs/heads/cassandra-2.0
Commit: 7bfb34714a19ff3ab44f253e55cc47ffd77baba3
Parents: b3c1e14
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Nov 4 13:39:28 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Nov 4 13:39:28 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/7bfb3471/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index 611d6af..292b7f2 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@ -1829,7 +1829,16 @@ public class ColumnFamilyStoreTest extends SchemaLoader
ByteBuffer key = bytes("key");
SSTableSimpleWriter writer = new SSTableSimpleWriter(dir.getDirectoryForNewSSTables(),
- 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();
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by yu...@apache.org.
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 <yu...@apache.org>
Authored: Tue Nov 4 13:41:18 2014 -0600
Committer: Yuki Morishita <yu...@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();
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd32104e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd32104e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd32104e
Branch: refs/heads/trunk
Commit: bd32104ec229b8ec56cb4514cd441a16b814efcb
Parents: 07068e2 c816a7a
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Nov 4 13:41:24 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Nov 4 13:41:24 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/bd32104e/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
----------------------------------------------------------------------
[2/6] git commit: modify test after CASSANDRA-7463 change
Posted by yu...@apache.org.
modify test after CASSANDRA-7463 change
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bfb3471
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bfb3471
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bfb3471
Branch: refs/heads/cassandra-2.1
Commit: 7bfb34714a19ff3ab44f253e55cc47ffd77baba3
Parents: b3c1e14
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Nov 4 13:39:28 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Nov 4 13:39:28 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/7bfb3471/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index 611d6af..292b7f2 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@ -1829,7 +1829,16 @@ public class ColumnFamilyStoreTest extends SchemaLoader
ByteBuffer key = bytes("key");
SSTableSimpleWriter writer = new SSTableSimpleWriter(dir.getDirectoryForNewSSTables(),
- 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();
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by yu...@apache.org.
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/cassandra-2.1
Commit: c816a7a49e42de244994a22f8903eecc26314252
Parents: 2d4a305 7bfb347
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Nov 4 13:41:18 2014 -0600
Committer: Yuki Morishita <yu...@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();
[3/6] git commit: modify test after CASSANDRA-7463 change
Posted by yu...@apache.org.
modify test after CASSANDRA-7463 change
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bfb3471
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bfb3471
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bfb3471
Branch: refs/heads/trunk
Commit: 7bfb34714a19ff3ab44f253e55cc47ffd77baba3
Parents: b3c1e14
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Nov 4 13:39:28 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Nov 4 13:39:28 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/7bfb3471/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index 611d6af..292b7f2 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@ -1829,7 +1829,16 @@ public class ColumnFamilyStoreTest extends SchemaLoader
ByteBuffer key = bytes("key");
SSTableSimpleWriter writer = new SSTableSimpleWriter(dir.getDirectoryForNewSSTables(),
- 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();