This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 18c0fe8da90b7f561c1c8f30ddd76df3c66b15e8 Merge: 1381c87 577a9e3 Author: Mick Semb Wever <[email protected]> AuthorDate: Thu Jan 2 12:21:21 2020 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + .../cassandra/db/partitions/PartitionUpdate.java | 18 ++++++++++++ test/unit/org/apache/cassandra/SchemaLoader.java | 10 +++++++ .../apache/cassandra/db/RecoveryManagerTest.java | 32 +++++++++++++++++++++- 4 files changed, 60 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 8c30d4c,44719b4..95fecc0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -3.0.20 +3.11.6 + * Fix nodetool compactionstats showing extra pending task for TWCS - patch implemented (CASSANDRA-15409) + * Fix SELECT JSON formatting for the "duration" type (CASSANDRA-15075) + * Fix LegacyLayout to have same behavior as 2.x when handling unknown column names (CASSANDRA-15081) +Merged from 3.0: + * Fix point-in-time recoevery ignoring timestamp of updates to static columns (CASSANDRA-15292) * GC logs are also put under $CASSANDRA_LOG_DIR (CASSANDRA-14306) * Fix sstabledump's position key value when partitions have multiple rows (CASSANDRA-14721) * Avoid over-scanning data directories in LogFile.verify() (CASSANDRA-15364) diff --cc test/unit/org/apache/cassandra/db/RecoveryManagerTest.java index f5bda4f,57bd044..cc9c667 --- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java +++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java @@@ -274,10 -187,38 +276,38 @@@ public class RecoveryManagerTes } @Test + public void testRecoverPITStatic() throws Exception + { + CommitLog.instance.resetUnsafe(true); + Keyspace keyspace1 = Keyspace.open(KEYSPACE1); + ColumnFamilyStore cfs = keyspace1.getColumnFamilyStore(CF_STATIC1); + Date date = CommitLogArchiver.format.parse("2112:12:12 12:12:12"); + long timeMS = date.getTime() - 5000; + + + for (int i = 0; i < 10; ++i) + { + long ts = TimeUnit.MILLISECONDS.toMicros(timeMS + (i * 1000)); + new RowUpdateBuilder(cfs.metadata, ts, "name-" + i) + .add("val", Integer.toString(i)) + .build() + .apply(); + } + + // Sanity check row count prior to clear and replay + assertEquals(10, Util.getAll(Util.cmd(cfs).build()).size()); + + keyspace1.getColumnFamilyStore(CF_STATIC1).clearUnsafe(); + CommitLog.instance.resetUnsafe(false); + + assertEquals(6, Util.getAll(Util.cmd(cfs).build()).size()); + } + + @Test public void testRecoverPITUnordered() throws Exception { - ColumnFamilyStore cfs = Keyspace.open(KEYSPACE1).getColumnFamilyStore(CF_STANDARD1); CommitLog.instance.resetUnsafe(true); + ColumnFamilyStore cfs = Keyspace.open(KEYSPACE1).getColumnFamilyStore(CF_STANDARD1); Date date = CommitLogArchiver.format.parse("2112:12:12 12:12:12"); long timeMS = date.getTime(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
