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 12:02:40 UTC
[1/6] cassandra git commit: fixup canonical view test
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 9f8c45d6d -> 8ad70cf25
refs/heads/cassandra-2.2 f76bfd4f3 -> ff10d636c
refs/heads/trunk a1b1cf643 -> c2a1cd496
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/8ad70cf2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ad70cf2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ad70cf2
Branch: refs/heads/cassandra-2.1
Commit: 8ad70cf257c63114b65cb1c32f56caf14290579f
Parents: 9f8c45d
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sat May 16 10:59:11 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat May 16 10:59:11 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/8ad70cf2/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 b940b7b..56b15fe 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
@@ -774,8 +774,10 @@ public class SSTableRewriterTest extends SchemaLoader
}
}
}
- writer.finish();
+ writer.abort();
cfs.getDataTracker().unmarkCompacting(sstables);
+ truncateCF();
+ validateCFS(cfs);
}
private void validateKeys(Keyspace ks)
[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/ff10d636
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff10d636
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff10d636
Branch: refs/heads/cassandra-2.2
Commit: ff10d636c7f379d2882b7f863eadbdd0ffacdc6c
Parents: f76bfd4 8ad70cf
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sat May 16 11:01:57 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat May 16 11:01:57 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[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/c2a1cd49
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2a1cd49
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2a1cd49
Branch: refs/heads/trunk
Commit: c2a1cd49687ad1e4dec35ef01c0bac75fbd0f806
Parents: a1b1cf6 ff10d63
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sat May 16 11:02:16 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat May 16 11:02:16 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[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/ff10d636
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff10d636
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff10d636
Branch: refs/heads/trunk
Commit: ff10d636c7f379d2882b7f863eadbdd0ffacdc6c
Parents: f76bfd4 8ad70cf
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sat May 16 11:01:57 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat May 16 11:01:57 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] 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/8ad70cf2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ad70cf2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ad70cf2
Branch: refs/heads/trunk
Commit: 8ad70cf257c63114b65cb1c32f56caf14290579f
Parents: 9f8c45d
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sat May 16 10:59:11 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat May 16 10:59:11 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/8ad70cf2/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 b940b7b..56b15fe 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
@@ -774,8 +774,10 @@ public class SSTableRewriterTest extends SchemaLoader
}
}
}
- writer.finish();
+ writer.abort();
cfs.getDataTracker().unmarkCompacting(sstables);
+ truncateCF();
+ validateCFS(cfs);
}
private void validateKeys(Keyspace ks)
[2/6] 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/8ad70cf2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ad70cf2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ad70cf2
Branch: refs/heads/cassandra-2.2
Commit: 8ad70cf257c63114b65cb1c32f56caf14290579f
Parents: 9f8c45d
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sat May 16 10:59:11 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat May 16 10:59:11 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/8ad70cf2/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 b940b7b..56b15fe 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
@@ -774,8 +774,10 @@ public class SSTableRewriterTest extends SchemaLoader
}
}
}
- writer.finish();
+ writer.abort();
cfs.getDataTracker().unmarkCompacting(sstables);
+ truncateCF();
+ validateCFS(cfs);
}
private void validateKeys(Keyspace ks)