You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2017/05/11 14:20:13 UTC
[1/5] cassandra git commit: Fix 2ndary indexes on primary key columns
to don't create expiring entries (CASSANDRA-13412)
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 869335710 -> 3a0643329
refs/heads/trunk 6deafff5a -> c43371bf8
Fix 2ndary indexes on primary key columns to don't create expiring entries (CASSANDRA-13412)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/263740da
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/263740da
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/263740da
Branch: refs/heads/cassandra-3.11
Commit: 263740daa4c8162a157aa6fbb97793f158d142d1
Parents: 415d06b
Author: adelapena <a....@gmail.com>
Authored: Fri Apr 21 09:33:16 2017 +0100
Committer: adelapena <a....@gmail.com>
Committed: Wed May 10 11:55:45 2017 +0100
----------------------------------------------------------------------
.../validation/entities/SecondaryIndexTest.java | 42 ++++++++++++++++++++
1 file changed, 42 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/263740da/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java
index 8376652..1a1b881 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java
@@ -1231,4 +1231,46 @@ public class SecondaryIndexTest extends CQLTester
return super.getInvalidateTask();
}
}
+
+ @Test
+ public void testIndexOnPartitionKeyInsertExpiringColumn() throws Throwable
+ {
+ createTable("CREATE TABLE %s (k1 int, k2 int, a int, b int, PRIMARY KEY ((k1, k2)))");
+ createIndex("CREATE INDEX on %s(k1)");
+ execute("INSERT INTO %s (k1, k2, a, b) VALUES (1, 2, 3, 4)");
+ assertRows(execute("SELECT * FROM %s WHERE k1 = 1"), row(1, 2, 3, 4));
+ execute("UPDATE %s USING TTL 1 SET b = 10 WHERE k1 = 1 AND k2 = 2");
+ Thread.sleep(1000);
+ assertRows(execute("SELECT * FROM %s WHERE k1 = 1"), row(1, 2, 3, null));
+ }
+
+ @Test
+ public void testIndexOnClusteringKeyInsertExpiringColumn() throws Throwable
+ {
+ createTable("CREATE TABLE %s (pk int, ck int, a int, b int, PRIMARY KEY (pk, ck))");
+ createIndex("CREATE INDEX on %s(ck)");
+ execute("INSERT INTO %s (pk, ck, a, b) VALUES (1, 2, 3, 4)");
+ assertRows(execute("SELECT * FROM %s WHERE ck = 2"), row(1, 2, 3, 4));
+ execute("UPDATE %s USING TTL 1 SET b = 10 WHERE pk = 1 AND ck = 2");
+ Thread.sleep(1000);
+ assertRows(execute("SELECT * FROM %s WHERE ck = 2"), row(1, 2, 3, null));
+ }
+
+ @Test
+ public void testIndexOnRegularColumnInsertExpiringColumn() throws Throwable
+ {
+ createTable("CREATE TABLE %s (pk int, ck int, a int, b int, PRIMARY KEY (pk, ck))");
+ createIndex("CREATE INDEX on %s(a)");
+ execute("INSERT INTO %s (pk, ck, a, b) VALUES (1, 2, 3, 4)");
+ assertRows(execute("SELECT * FROM %s WHERE a = 3"), row(1, 2, 3, 4));
+
+ execute("UPDATE %s USING TTL 1 SET b = 10 WHERE pk = 1 AND ck = 2");
+ Thread.sleep(1000);
+ assertRows(execute("SELECT * FROM %s WHERE a = 3"), row(1, 2, 3, null));
+
+ execute("UPDATE %s USING TTL 1 SET a = 5 WHERE pk = 1 AND ck = 2");
+ Thread.sleep(1000);
+ assertEmpty(execute("SELECT * FROM %s WHERE a = 3"));
+ assertEmpty(execute("SELECT * FROM %s WHERE a = 5"));
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/5] cassandra git commit: Fix 2ndary indexes on primary key columns
to don't create expiring entries (CASSANDRA-13412)
Posted by sa...@apache.org.
Fix 2ndary indexes on primary key columns to don't create expiring entries (CASSANDRA-13412)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/263740da
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/263740da
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/263740da
Branch: refs/heads/trunk
Commit: 263740daa4c8162a157aa6fbb97793f158d142d1
Parents: 415d06b
Author: adelapena <a....@gmail.com>
Authored: Fri Apr 21 09:33:16 2017 +0100
Committer: adelapena <a....@gmail.com>
Committed: Wed May 10 11:55:45 2017 +0100
----------------------------------------------------------------------
.../validation/entities/SecondaryIndexTest.java | 42 ++++++++++++++++++++
1 file changed, 42 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/263740da/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java
index 8376652..1a1b881 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java
@@ -1231,4 +1231,46 @@ public class SecondaryIndexTest extends CQLTester
return super.getInvalidateTask();
}
}
+
+ @Test
+ public void testIndexOnPartitionKeyInsertExpiringColumn() throws Throwable
+ {
+ createTable("CREATE TABLE %s (k1 int, k2 int, a int, b int, PRIMARY KEY ((k1, k2)))");
+ createIndex("CREATE INDEX on %s(k1)");
+ execute("INSERT INTO %s (k1, k2, a, b) VALUES (1, 2, 3, 4)");
+ assertRows(execute("SELECT * FROM %s WHERE k1 = 1"), row(1, 2, 3, 4));
+ execute("UPDATE %s USING TTL 1 SET b = 10 WHERE k1 = 1 AND k2 = 2");
+ Thread.sleep(1000);
+ assertRows(execute("SELECT * FROM %s WHERE k1 = 1"), row(1, 2, 3, null));
+ }
+
+ @Test
+ public void testIndexOnClusteringKeyInsertExpiringColumn() throws Throwable
+ {
+ createTable("CREATE TABLE %s (pk int, ck int, a int, b int, PRIMARY KEY (pk, ck))");
+ createIndex("CREATE INDEX on %s(ck)");
+ execute("INSERT INTO %s (pk, ck, a, b) VALUES (1, 2, 3, 4)");
+ assertRows(execute("SELECT * FROM %s WHERE ck = 2"), row(1, 2, 3, 4));
+ execute("UPDATE %s USING TTL 1 SET b = 10 WHERE pk = 1 AND ck = 2");
+ Thread.sleep(1000);
+ assertRows(execute("SELECT * FROM %s WHERE ck = 2"), row(1, 2, 3, null));
+ }
+
+ @Test
+ public void testIndexOnRegularColumnInsertExpiringColumn() throws Throwable
+ {
+ createTable("CREATE TABLE %s (pk int, ck int, a int, b int, PRIMARY KEY (pk, ck))");
+ createIndex("CREATE INDEX on %s(a)");
+ execute("INSERT INTO %s (pk, ck, a, b) VALUES (1, 2, 3, 4)");
+ assertRows(execute("SELECT * FROM %s WHERE a = 3"), row(1, 2, 3, 4));
+
+ execute("UPDATE %s USING TTL 1 SET b = 10 WHERE pk = 1 AND ck = 2");
+ Thread.sleep(1000);
+ assertRows(execute("SELECT * FROM %s WHERE a = 3"), row(1, 2, 3, null));
+
+ execute("UPDATE %s USING TTL 1 SET a = 5 WHERE pk = 1 AND ck = 2");
+ Thread.sleep(1000);
+ assertEmpty(execute("SELECT * FROM %s WHERE a = 3"));
+ assertEmpty(execute("SELECT * FROM %s WHERE a = 5"));
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by sa...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c43371bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c43371bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c43371bf
Branch: refs/heads/trunk
Commit: c43371bf8fb7e1ec761a37a5f9938df9731fac4e
Parents: 6deafff 3a06433
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Thu May 11 15:18:00 2017 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Thu May 11 15:18:00 2017 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/5] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by sa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a064332
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a064332
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a064332
Branch: refs/heads/trunk
Commit: 3a06433299aae8f48b7a84ca6aa42e612dd9d2df
Parents: 8693357 263740d
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Thu May 11 15:16:31 2017 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Thu May 11 15:16:31 2017 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by sa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a064332
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a064332
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a064332
Branch: refs/heads/cassandra-3.11
Commit: 3a06433299aae8f48b7a84ca6aa42e612dd9d2df
Parents: 8693357 263740d
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Thu May 11 15:16:31 2017 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Thu May 11 15:16:31 2017 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org