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/05/16 11:50:36 UTC
[1/3] cassandra git commit: fixup canonical view test
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 6c0a46262 -> f76bfd4f3
refs/heads/trunk ce0a25fa1 -> a1b1cf643
fixup canonical view test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f76bfd4f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f76bfd4f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f76bfd4f
Branch: refs/heads/cassandra-2.2
Commit: f76bfd4f3f895ba8e330becbc5dbf61162f2705f
Parents: 6c0a462
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sat May 16 10:50:06 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat May 16 10:50:06 2015 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f76bfd4f/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 e11d142..3104a96 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
@@ -817,8 +817,10 @@ public class SSTableRewriterTest extends SchemaLoader
}
}
}
- writer.finish();
+ writer.abort();
cfs.getDataTracker().unmarkCompacting(sstables);
+ truncateCF();
+ validateCFS(cfs);
}
private void validateKeys(Keyspace ks)
[2/3] cassandra git commit: fixup canonical view test
Posted by be...@apache.org.
fixup canonical view test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f76bfd4f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f76bfd4f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f76bfd4f
Branch: refs/heads/trunk
Commit: f76bfd4f3f895ba8e330becbc5dbf61162f2705f
Parents: 6c0a462
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sat May 16 10:50:06 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat May 16 10:50:06 2015 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f76bfd4f/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 e11d142..3104a96 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
@@ -817,8 +817,10 @@ public class SSTableRewriterTest extends SchemaLoader
}
}
}
- writer.finish();
+ writer.abort();
cfs.getDataTracker().unmarkCompacting(sstables);
+ truncateCF();
+ validateCFS(cfs);
}
private void validateKeys(Keyspace ks)
[3/3] 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/a1b1cf64
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1b1cf64
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1b1cf64
Branch: refs/heads/trunk
Commit: a1b1cf643ed406afda15fb02e8a2821bc2e2bef9
Parents: ce0a25f f76bfd4
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sat May 16 10:50:15 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat May 16 10:50:15 2015 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------