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/d24f4c68 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d24f4c68 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d24f4c68 Branch: refs/heads/trunk Commit: d24f4c68d0889e0934f30c4590657bda5dc063c4 Parents: 57f5e36 942b83c Author: Jeff Jirsa <[email protected]> Authored: Mon Feb 27 17:23:28 2017 -0800 Committer: Jeff Jirsa <[email protected]> Committed: Mon Feb 27 17:24:15 2017 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/SSTable.java | 2 + .../io/sstable/metadata/MetadataCollector.java | 2 +- .../cassandra/utils/StreamingHistogram.java | 133 ++++-- .../microbench/StreamingHistogramBench.java | 405 +++++++++++++++++++ .../db/compaction/CompactionsTest.java | 3 + .../DateTieredCompactionStrategyTest.java | 4 + .../LeveledCompactionStrategyTest.java | 4 + .../SizeTieredCompactionStrategyTest.java | 4 + .../cassandra/db/compaction/TTLExpiryTest.java | 4 + .../TimeWindowCompactionStrategyTest.java | 4 + .../cassandra/utils/StreamingHistogramTest.java | 40 +- 12 files changed, 569 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d24f4c68/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d24f4c68/src/java/org/apache/cassandra/io/sstable/SSTable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d24f4c68/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d24f4c68/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d24f4c68/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d24f4c68/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d24f4c68/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d24f4c68/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java index 6e4ba0b,78ba707..615b206 --- a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java @@@ -58,19 -57,23 +58,23 @@@ public class TTLExpiryTes public static void defineSchema() throws ConfigurationException { SchemaLoader.prepareServer(); + + // Disable tombstone histogram rounding for tests + System.setProperty("cassandra.streaminghistogram.roundseconds", "1"); + SchemaLoader.createKeyspace(KEYSPACE1, KeyspaceParams.simple(1), - CFMetaData.Builder.create(KEYSPACE1, CF_STANDARD1) - .addPartitionKey("pKey", AsciiType.instance) - .addRegularColumn("col1", AsciiType.instance) - .addRegularColumn("col", AsciiType.instance) - .addRegularColumn("col311", AsciiType.instance) - .addRegularColumn("col2", AsciiType.instance) - .addRegularColumn("col3", AsciiType.instance) - .addRegularColumn("col7", AsciiType.instance) - .addRegularColumn("col8", MapType.getInstance(AsciiType.instance, AsciiType.instance, true)) - .addRegularColumn("shadow", AsciiType.instance) - .build().gcGraceSeconds(0)); + TableMetadata.builder(KEYSPACE1, CF_STANDARD1) + .addPartitionKeyColumn("pKey", AsciiType.instance) + .addRegularColumn("col1", AsciiType.instance) + .addRegularColumn("col", AsciiType.instance) + .addRegularColumn("col311", AsciiType.instance) + .addRegularColumn("col2", AsciiType.instance) + .addRegularColumn("col3", AsciiType.instance) + .addRegularColumn("col7", AsciiType.instance) + .addRegularColumn("col8", MapType.getInstance(AsciiType.instance, AsciiType.instance, true)) + .addRegularColumn("shadow", AsciiType.instance) + .gcGraceSeconds(0)); } @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/d24f4c68/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java ----------------------------------------------------------------------
