alex-ninja commented on a change in pull request #1117:
URL: https://github.com/apache/cassandra/pull/1117#discussion_r701452715
##########
File path:
test/unit/org/apache/cassandra/cql3/validation/entities/VirtualTableTest.java
##########
@@ -249,76 +344,188 @@ public void testQueriesOnTableWithMultiplePks() throws
Throwable
}
@Test
- public void testModifications() throws Throwable
+ public void testDMLOperationOnWritableTable() throws Throwable
{
// check for clean state
- assertRows(execute("SELECT * FROM test_virtual_ks.vt2"));
+ assertEmpty(execute("SELECT * FROM test_virtual_ks.vt2"));
// fill the table, test UNLOGGED batch
execute("BEGIN UNLOGGED BATCH " +
- "UPDATE test_virtual_ks.vt2 SET value = 1 WHERE key ='pk1';" +
- "UPDATE test_virtual_ks.vt2 SET value = 2 WHERE key ='pk2';" +
- "UPDATE test_virtual_ks.vt2 SET value = 3 WHERE key ='pk3';" +
+ "UPDATE test_virtual_ks.vt2 SET v1 = 1, v2 = 1 WHERE pk1 =
'pk1_1' AND pk2 = 'pk2_1' AND c1 = 'c1_1' AND c2 = 'c2_1';" +
+ "UPDATE test_virtual_ks.vt2 SET v1 = 2, v2 = 2 WHERE pk1 =
'pk1_1' AND pk2 = 'pk2_1' AND c1 = 'c1_1' AND c2 = 'c2_2';" +
+ "UPDATE test_virtual_ks.vt2 SET v1 = 3, v2 = 3 WHERE pk1 =
'pk1_2' AND pk2 = 'pk2_1' AND c1 = 'c1_1' AND c2 = 'c2_1';" +
+ "UPDATE test_virtual_ks.vt2 SET v1 = 4, v2 = 4 WHERE pk1 =
'pk1_2' AND pk2 = 'pk2_1' AND c1 = 'c1_1' AND c2 = 'c2_3';" +
+ "UPDATE test_virtual_ks.vt2 SET v1 = 5, v2 = 5 WHERE pk1 =
'pk1_2' AND pk2 = 'pk2_1' AND c1 = 'c1_1' AND c2 = 'c2_5';" +
+ "UPDATE test_virtual_ks.vt2 SET v1 = 6, v2 = 6 WHERE pk1 =
'pk1_2' AND pk2 = 'pk2_1' AND c1 = 'c1_1' AND c2 = 'c2_6';" +
+ "UPDATE test_virtual_ks.vt2 SET v1 = 7, v2 = 7 WHERE pk1 =
'pk1_2' AND pk2 = 'pk2_2' AND c1 = 'c1_1' AND c2 = 'c2_1';" +
+ "UPDATE test_virtual_ks.vt2 SET v1 = 8, v2 = 8 WHERE pk1 =
'pk1_2' AND pk2 = 'pk2_2' AND c1 = 'c1_2' AND c2 = 'c2_1';" +
"APPLY BATCH");
assertRows(execute("SELECT * FROM test_virtual_ks.vt2"),
- row("pk1", 1),
- row("pk2", 2),
- row("pk3", 3));
+ row("pk1_1", "pk2_1", "c1_1", "c2_1", 1, 1L),
+ row("pk1_1", "pk2_1", "c1_1", "c2_2", 2, 2L),
+ row("pk1_2", "pk2_1", "c1_1", "c2_1", 3, 3L),
+ row("pk1_2", "pk2_1", "c1_1", "c2_3", 4, 4L),
+ row("pk1_2", "pk2_1", "c1_1", "c2_5", 5, 5L),
+ row("pk1_2", "pk2_1", "c1_1", "c2_6", 6, 6L),
+ row("pk1_2", "pk2_2", "c1_1", "c2_1", 7, 7L),
+ row("pk1_2", "pk2_2", "c1_2", "c2_1", 8, 8L));
+
+ // update a single column with UPDATE
+ execute("UPDATE test_virtual_ks.vt2 SET v1 = 11 WHERE pk1 = 'pk1_1'
AND pk2 = 'pk2_1' AND c1 = 'c1_1' AND c2 = 'c2_1'");
+ assertRows(execute("SELECT * FROM test_virtual_ks.vt2 WHERE pk1 =
'pk1_1' AND pk2 = 'pk2_1' AND c1 = 'c1_1' AND c2 = 'c2_1'"),
+ row("pk1_1", "pk2_1", "c1_1", "c2_1", 11, 1L));
+
+ // update multiple columns with UPDATE
+ execute("UPDATE test_virtual_ks.vt2 SET v1 = 111, v2 = 111 WHERE pk1 =
'pk1_1' AND pk2 = 'pk2_1' AND c1 = 'c1_1' AND c2 = 'c2_1'");
+ assertRows(execute("SELECT * FROM test_virtual_ks.vt2 WHERE pk1 =
'pk1_1' AND pk2 = 'pk2_1' AND c1 = 'c1_1' AND c2 = 'c2_1'"),
+ row("pk1_1", "pk2_1", "c1_1", "c2_1", 111, 111L));
+
+ // update a single columns with INSERT
+ execute("INSERT INTO test_virtual_ks.vt2 (pk1, pk2, c1, c2, v2) VALUES
('pk1_1', 'pk2_1', 'c1_1', 'c2_2', 22)");
+ assertRows(execute("SELECT * FROM test_virtual_ks.vt2 WHERE pk1 =
'pk1_1' AND pk2 = 'pk2_1' AND c1 = 'c1_1' AND c2 = 'c2_2'"),
+ row("pk1_1", "pk2_1", "c1_1", "c2_2", 2, 22L));
+
+ // update multiple columns with INSERT
+ execute("INSERT INTO test_virtual_ks.vt2 (pk1, pk2, c1, c2, v1, v2)
VALUES ('pk1_1', 'pk2_1', 'c1_1', 'c2_2', 222, 222)");
+ assertRows(execute("SELECT * FROM test_virtual_ks.vt2 WHERE pk1 =
'pk1_1' AND pk2 = 'pk2_1' AND c1 = 'c1_1' AND c2 = 'c2_2'"),
+ row("pk1_1", "pk2_1", "c1_1", "c2_2", 222, 222L));
+
Review comment:
Good catch! I added a few test case with `IN` operator.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
