cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jji...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Date Thu, 02 Mar 2017 17:45:26 GMT
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/a7c9fa0f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7c9fa0f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7c9fa0f

Branch: refs/heads/trunk
Commit: a7c9fa0f17518482c3ca691e542ed2c0f41af84a
Parents: 14c3edc 6f9610d
Author: Jeff Jirsa <jeff@jeffjirsa.net>
Authored: Thu Mar 2 09:43:57 2017 -0800
Committer: Jeff Jirsa <jeff@jeffjirsa.net>
Committed: Thu Mar 2 09:44:23 2017 -0800

----------------------------------------------------------------------
 src/java/org/apache/cassandra/utils/StreamingHistogram.java      | 3 +--
 .../unit/org/apache/cassandra/db/compaction/CompactionsTest.java | 3 ++-
 .../db/compaction/DateTieredCompactionStrategyTest.java          | 4 ++--
 .../cassandra/db/compaction/LeveledCompactionStrategyTest.java   | 4 ++--
 .../db/compaction/SizeTieredCompactionStrategyTest.java          | 4 ++--
 test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java  | 4 ++--
 .../db/compaction/TimeWindowCompactionStrategyTest.java          | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7c9fa0f/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7c9fa0f/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7c9fa0f/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7c9fa0f/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7c9fa0f/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
index 615b206,e340ee3..0a970e1
--- a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
@@@ -60,21 -59,21 +60,21 @@@ public class TTLExpiryTes
          // Disable tombstone histogram rounding for tests
          System.setProperty("cassandra.streaminghistogram.roundseconds", "1");
  
+         SchemaLoader.prepareServer();
+ 
          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/a7c9fa0f/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java
----------------------------------------------------------------------


Mime
View raw message