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/3ebeef6d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3ebeef6d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3ebeef6d Branch: refs/heads/trunk Commit: 3ebeef6d21d5feeb5305335b8ec9a7a3b3ef6311 Parents: 51c8387 4b2692f Author: Blake Eggleston <bdeggles...@gmail.com> Authored: Tue Nov 6 15:50:05 2018 -0800 Committer: Blake Eggleston <bdeggles...@gmail.com> Committed: Tue Nov 6 15:50:33 2018 -0800 ---------------------------------------------------------------------- .../org/apache/cassandra/db/KeyspaceTest.java | 34 -------------- .../apache/cassandra/db/filter/SliceTest.java | 42 ----------------- .../cassandra/io/sstable/LegacySSTableTest.java | 2 +- .../io/sstable/SSTableMetadataTest.java | 49 -------------------- 4 files changed, 1 insertion(+), 126 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ebeef6d/test/unit/org/apache/cassandra/db/KeyspaceTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ebeef6d/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java index 7c98e7e,bd51c0f..de5ac52 --- a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java @@@ -265,7 -293,7 +265,7 @@@ public class LegacySSTableTes public void testInaccurateSSTableMinMax() throws Exception { QueryProcessor.executeInternal("CREATE TABLE legacy_tables.legacy_mc_inaccurate_min_max (k int, c1 int, c2 int, c3 int, v int, primary key (k, c1, c2, c3))"); - loadLegacyTable("legacy_%s_inaccurate_min_max%s", "mc"); - loadLegacyTable("legacy_%s_inaccurate_min_max%s", "mc", ""); ++ loadLegacyTable("legacy_%s_inaccurate_min_max", "mc"); /* sstable has the following mutations: http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ebeef6d/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org