natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.0' into cassandra-3.11

This commit is contained in:
Jeff Jirsa 2017-07-31 15:29:21 -07:00
parent d47d87cd56 9dc896f4ea
commit 99196cb72c
4 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -4,7 +4,7 @@
* Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512)
* Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
Merged from 3.0:
3.0.15
* Fix invalid writetime for null cells (CASSANDRA-13711)
* Fix ALTER TABLE statement to atomically propagate changes to the table and its MVs (CASSANDRA-12952)
* Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722)
* Fix Digest mismatch Exception if hints file has UnknownColumnFamily (CASSANDRA-13696)

6
src/java/org/apache/cassandra/cql3/selection/Selection.java
View File

@ -404,6 +404,12 @@ public abstract class Selection
}
}
current = new ArrayList<>(columns.size());
// Timestamps and TTLs are arrays per row, we must null them out between rows
if (timestamps != null)
Arrays.fill(timestamps, Long.MIN_VALUE);
if (ttls != null)
Arrays.fill(ttls, -1);
}
/**

29
test/unit/org/apache/cassandra/cql3/validation/entities/TimestampTest.java
View File

@ -152,4 +152,33 @@ public class TimestampTest extends CQLTester
execute("INSERT INTO %s (k, i) VALUES (1, 1) USING TIMESTAMP ?", unset()); // treat as 'now'
}
@Test
public void testTimestampsOnUnsetColumns() throws Throwable
{
createTable("CREATE TABLE %s (k int PRIMARY KEY, i int)");
execute("INSERT INTO %s (k, i) VALUES (1, 1) USING TIMESTAMP 1;");
execute("INSERT INTO %s (k) VALUES (2) USING TIMESTAMP 2;");
execute("INSERT INTO %s (k, i) VALUES (3, 3) USING TIMESTAMP 1;");
assertRows(execute("SELECT k, i, writetime(i) FROM %s "),
row(1, 1, 1L),
row(2, null, null),
row(3, 3, 1L));
}
@Test
public void testTimestampsOnUnsetColumnsWide() throws Throwable
{
createTable("CREATE TABLE %s (k int , c int, i int, PRIMARY KEY (k, c))");
execute("INSERT INTO %s (k, c, i) VALUES (1, 1, 1) USING TIMESTAMP 1;");
execute("INSERT INTO %s (k, c) VALUES (1, 2) USING TIMESTAMP 1;");
execute("INSERT INTO %s (k, c, i) VALUES (1, 3, 1) USING TIMESTAMP 1;");
execute("INSERT INTO %s (k, c) VALUES (2, 2) USING TIMESTAMP 2;");
execute("INSERT INTO %s (k, c, i) VALUES (3, 3, 3) USING TIMESTAMP 1;");
assertRows(execute("SELECT k, c, i, writetime(i) FROM %s "),
row(1, 1, 1, 1L),
row(1, 2, null, null),
row(1, 3, 1, 1L),
row(2, 2, null, null),
row(3, 3, 3, 1L));
}
}

28
test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
View File

@ -4738,4 +4738,32 @@ public class SelectTest extends CQLTester
assertRows(execute("SELECT k, v FROM %s WHERE k = 0 AND m CONTAINS KEY 'c' ALLOW FILTERING"), row(0, 2));
});
}
@Test
public void testMixedTTLOnColumns() throws Throwable
{
createTable("CREATE TABLE %s (k int PRIMARY KEY, i int)");
execute("INSERT INTO %s (k) VALUES (2);");
execute("INSERT INTO %s (k, i) VALUES (1, 1) USING TTL 100;");
execute("INSERT INTO %s (k, i) VALUES (3, 3) USING TTL 100;");
assertRows(execute("SELECT k, i, TTL(i) FROM %s "),
row(1, 1, 100), row(2, null, null), row(3, 3, 100));
}
@Test
public void testMixedTTLOnColumnsWide() throws Throwable
{
createTable("CREATE TABLE %s (k int, c int, i int, PRIMARY KEY (k, c))");
execute("INSERT INTO %s (k, c) VALUES (2, 2);");
execute("INSERT INTO %s (k, c, i) VALUES (1, 1, 1) USING TTL 100;");
execute("INSERT INTO %s (k, c) VALUES (1, 2) ;");
execute("INSERT INTO %s (k, c, i) VALUES (1, 3, 3) USING TTL 100;");
execute("INSERT INTO %s (k, c, i) VALUES (3, 3, 3) USING TTL 100;");
assertRows(execute("SELECT k, c, i, TTL(i) FROM %s "),
row(1, 1, 1, 100),
row(1, 2, null, null),
row(1, 3, 3, 100),
row(2, 2, null, null),
row(3, 3, 3, 100));
}
}