You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/07/06 13:50:22 UTC
[1/6] cassandra git commit: fixup SSTableRewriterTest
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 ec320e8a1 -> aa8a7b557
refs/heads/cassandra-2.2 1f430c539 -> 77a666c69
refs/heads/trunk 2d7fec94f -> 160296cd3
fixup SSTableRewriterTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa8a7b55
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa8a7b55
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa8a7b55
Branch: refs/heads/cassandra-2.1
Commit: aa8a7b5576417c0469417eace131f270afc29923
Parents: ec320e8
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon Jul 6 12:49:48 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon Jul 6 12:49:48 2015 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa8a7b55/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
index 5ebfef7..a735657 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
@@ -647,8 +647,13 @@ public class SSTableRewriterTest extends SchemaLoader
{
assertEquals(1, cfs.getSSTables().size());
validateCFS(cfs);
+ truncate(cfs);
+ }
+ else
+ {
+ assertEquals(0, cfs.getSSTables().size());
+ cfs.truncateBlocking();
}
- truncate(cfs);
filecount = assertFileCounts(s.descriptor.directory.list(), 0, 0);
if (offline)
{
[4/6] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/77a666c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77a666c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77a666c6
Branch: refs/heads/trunk
Commit: 77a666c69eb947a5c94bf46ab5c7f639ef2e6391
Parents: 1f430c5 aa8a7b5
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon Jul 6 12:49:55 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon Jul 6 12:49:55 2015 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/77a666c6/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
----------------------------------------------------------------------
[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by be...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/160296cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/160296cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/160296cd
Branch: refs/heads/trunk
Commit: 160296cd307681e736ac63d67891d9d2b01759e5
Parents: 2d7fec9 77a666c
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon Jul 6 12:50:03 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon Jul 6 12:50:03 2015 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/160296cd/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
----------------------------------------------------------------------
[5/6] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/77a666c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77a666c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77a666c6
Branch: refs/heads/cassandra-2.2
Commit: 77a666c69eb947a5c94bf46ab5c7f639ef2e6391
Parents: 1f430c5 aa8a7b5
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon Jul 6 12:49:55 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon Jul 6 12:49:55 2015 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/77a666c6/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
----------------------------------------------------------------------
[3/6] cassandra git commit: fixup SSTableRewriterTest
Posted by be...@apache.org.
fixup SSTableRewriterTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa8a7b55
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa8a7b55
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa8a7b55
Branch: refs/heads/trunk
Commit: aa8a7b5576417c0469417eace131f270afc29923
Parents: ec320e8
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon Jul 6 12:49:48 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon Jul 6 12:49:48 2015 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa8a7b55/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
index 5ebfef7..a735657 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
@@ -647,8 +647,13 @@ public class SSTableRewriterTest extends SchemaLoader
{
assertEquals(1, cfs.getSSTables().size());
validateCFS(cfs);
+ truncate(cfs);
+ }
+ else
+ {
+ assertEquals(0, cfs.getSSTables().size());
+ cfs.truncateBlocking();
}
- truncate(cfs);
filecount = assertFileCounts(s.descriptor.directory.list(), 0, 0);
if (offline)
{
[2/6] cassandra git commit: fixup SSTableRewriterTest
Posted by be...@apache.org.
fixup SSTableRewriterTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa8a7b55
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa8a7b55
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa8a7b55
Branch: refs/heads/cassandra-2.2
Commit: aa8a7b5576417c0469417eace131f270afc29923
Parents: ec320e8
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon Jul 6 12:49:48 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon Jul 6 12:49:48 2015 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa8a7b55/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
index 5ebfef7..a735657 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
@@ -647,8 +647,13 @@ public class SSTableRewriterTest extends SchemaLoader
{
assertEquals(1, cfs.getSSTables().size());
validateCFS(cfs);
+ truncate(cfs);
+ }
+ else
+ {
+ assertEquals(0, cfs.getSSTables().size());
+ cfs.truncateBlocking();
}
- truncate(cfs);
filecount = assertFileCounts(s.descriptor.directory.list(), 0, 0);
if (offline)
{