You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/02/02 14:40:13 UTC
[1/6] cassandra git commit: Add regression test for CASSANDRA-11102
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 df3d0b00b -> bc3ea6692
refs/heads/cassandra-3.3 8996b64e4 -> fddace61e
refs/heads/trunk be1efd283 -> 9b629d0dc
Add regression test for CASSANDRA-11102
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc3ea669
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc3ea669
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc3ea669
Branch: refs/heads/cassandra-3.0
Commit: bc3ea66925429b743b672d417700d17e9936b187
Parents: df3d0b0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Feb 2 14:39:28 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Feb 2 14:39:28 2016 +0100
----------------------------------------------------------------------
.../cql3/validation/operations/DeleteTest.java | 29 ++++++++++++++++++++
1 file changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc3ea669/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
index 4f35afa..be858e7 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
@@ -1008,6 +1008,35 @@ public class DeleteTest extends CQLTester
"DELETE FROM %s WHERE values CONTAINS ?", 3);
}
+ @Test
+ public void testDeleteWithOnlyPK() throws Throwable
+ {
+ // This is a regression test for CASSANDRA-11102
+
+ createTable("CREATE TABLE %s (k int, v int, PRIMARY KEY (k, v)) WITH gc_grace_seconds=1");
+
+ execute("INSERT INTO %s(k, v) VALUES (?, ?)", 1, 2);
+
+ execute("DELETE FROM %s WHERE k = ? AND v = ?", 1, 2);
+ execute("INSERT INTO %s(k, v) VALUES (?, ?)", 2, 3);
+
+ Thread.sleep(500);
+
+ execute("DELETE FROM %s WHERE k = ? AND v = ?", 2, 3);
+ execute("INSERT INTO %s(k, v) VALUES (?, ?)", 1, 2);
+
+ Thread.sleep(500);
+
+ flush();
+
+ assertRows(execute("SELECT * FROM %s"), row(1, 2));
+
+ Thread.sleep(1000);
+ compact();
+
+ assertRows(execute("SELECT * FROM %s"), row(1, 2));
+ }
+
private void flush(boolean forceFlush)
{
if (forceFlush)
[3/6] cassandra git commit: Add regression test for CASSANDRA-11102
Posted by sl...@apache.org.
Add regression test for CASSANDRA-11102
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc3ea669
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc3ea669
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc3ea669
Branch: refs/heads/trunk
Commit: bc3ea66925429b743b672d417700d17e9936b187
Parents: df3d0b0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Feb 2 14:39:28 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Feb 2 14:39:28 2016 +0100
----------------------------------------------------------------------
.../cql3/validation/operations/DeleteTest.java | 29 ++++++++++++++++++++
1 file changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc3ea669/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
index 4f35afa..be858e7 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
@@ -1008,6 +1008,35 @@ public class DeleteTest extends CQLTester
"DELETE FROM %s WHERE values CONTAINS ?", 3);
}
+ @Test
+ public void testDeleteWithOnlyPK() throws Throwable
+ {
+ // This is a regression test for CASSANDRA-11102
+
+ createTable("CREATE TABLE %s (k int, v int, PRIMARY KEY (k, v)) WITH gc_grace_seconds=1");
+
+ execute("INSERT INTO %s(k, v) VALUES (?, ?)", 1, 2);
+
+ execute("DELETE FROM %s WHERE k = ? AND v = ?", 1, 2);
+ execute("INSERT INTO %s(k, v) VALUES (?, ?)", 2, 3);
+
+ Thread.sleep(500);
+
+ execute("DELETE FROM %s WHERE k = ? AND v = ?", 2, 3);
+ execute("INSERT INTO %s(k, v) VALUES (?, ?)", 1, 2);
+
+ Thread.sleep(500);
+
+ flush();
+
+ assertRows(execute("SELECT * FROM %s"), row(1, 2));
+
+ Thread.sleep(1000);
+ compact();
+
+ assertRows(execute("SELECT * FROM %s"), row(1, 2));
+ }
+
private void flush(boolean forceFlush)
{
if (forceFlush)
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fddace61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fddace61
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fddace61
Branch: refs/heads/cassandra-3.3
Commit: fddace61e53e1c2f8d221db541f183b8acf1cbe4
Parents: 8996b64 bc3ea66
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Feb 2 14:39:52 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Feb 2 14:39:52 2016 +0100
----------------------------------------------------------------------
.../cql3/validation/operations/DeleteTest.java | 29 ++++++++++++++++++++
1 file changed, 29 insertions(+)
----------------------------------------------------------------------
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fddace61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fddace61
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fddace61
Branch: refs/heads/trunk
Commit: fddace61e53e1c2f8d221db541f183b8acf1cbe4
Parents: 8996b64 bc3ea66
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Feb 2 14:39:52 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Feb 2 14:39:52 2016 +0100
----------------------------------------------------------------------
.../cql3/validation/operations/DeleteTest.java | 29 ++++++++++++++++++++
1 file changed, 29 insertions(+)
----------------------------------------------------------------------
[2/6] cassandra git commit: Add regression test for CASSANDRA-11102
Posted by sl...@apache.org.
Add regression test for CASSANDRA-11102
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc3ea669
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc3ea669
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc3ea669
Branch: refs/heads/cassandra-3.3
Commit: bc3ea66925429b743b672d417700d17e9936b187
Parents: df3d0b0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Feb 2 14:39:28 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Feb 2 14:39:28 2016 +0100
----------------------------------------------------------------------
.../cql3/validation/operations/DeleteTest.java | 29 ++++++++++++++++++++
1 file changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc3ea669/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
index 4f35afa..be858e7 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
@@ -1008,6 +1008,35 @@ public class DeleteTest extends CQLTester
"DELETE FROM %s WHERE values CONTAINS ?", 3);
}
+ @Test
+ public void testDeleteWithOnlyPK() throws Throwable
+ {
+ // This is a regression test for CASSANDRA-11102
+
+ createTable("CREATE TABLE %s (k int, v int, PRIMARY KEY (k, v)) WITH gc_grace_seconds=1");
+
+ execute("INSERT INTO %s(k, v) VALUES (?, ?)", 1, 2);
+
+ execute("DELETE FROM %s WHERE k = ? AND v = ?", 1, 2);
+ execute("INSERT INTO %s(k, v) VALUES (?, ?)", 2, 3);
+
+ Thread.sleep(500);
+
+ execute("DELETE FROM %s WHERE k = ? AND v = ?", 2, 3);
+ execute("INSERT INTO %s(k, v) VALUES (?, ?)", 1, 2);
+
+ Thread.sleep(500);
+
+ flush();
+
+ assertRows(execute("SELECT * FROM %s"), row(1, 2));
+
+ Thread.sleep(1000);
+ compact();
+
+ assertRows(execute("SELECT * FROM %s"), row(1, 2));
+ }
+
private void flush(boolean forceFlush)
{
if (forceFlush)
[6/6] cassandra git commit: Merge branch 'cassandra-3.3' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b629d0d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b629d0d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b629d0d
Branch: refs/heads/trunk
Commit: 9b629d0dca3847e77143eb7d0734626d24bf798a
Parents: be1efd2 fddace6
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Feb 2 14:39:59 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Feb 2 14:39:59 2016 +0100
----------------------------------------------------------------------
.../cql3/validation/operations/DeleteTest.java | 29 ++++++++++++++++++++
1 file changed, 29 insertions(+)
----------------------------------------------------------------------