cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 30 Oct 2014 00:10:29 GMT
Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a2c4caa0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2c4caa0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2c4caa0

Branch: refs/heads/trunk
Commit: a2c4caa0068c7b480ce6889c47a022d7482e21d7
Parents: 7c595cb b6c9c35
Author: Yuki Morishita <yukim@apache.org>
Authored: Wed Oct 29 19:09:16 2014 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Wed Oct 29 19:09:16 2014 -0500

----------------------------------------------------------------------
 .../cassandra/db/ColumnFamilyMetricTest.java     | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2c4caa0/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
index e3e81d8,c91ed27..f09eb93
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
@@@ -20,22 -20,22 +20,35 @@@ package org.apache.cassandra.db
  import java.nio.ByteBuffer;
  import java.util.Collection;
  
++import org.junit.BeforeClass;
  import org.junit.Test;
  
  import org.apache.cassandra.SchemaLoader;
- import org.apache.cassandra.io.sstable.SSTableReader;
++import org.apache.cassandra.config.KSMetaData;
+ import org.apache.cassandra.io.sstable.format.SSTableReader;
++import org.apache.cassandra.locator.SimpleStrategy;
  import org.apache.cassandra.utils.ByteBufferUtil;
  
  import static org.junit.Assert.assertEquals;
  import static org.apache.cassandra.Util.cellname;
  
--public class ColumnFamilyMetricTest extends SchemaLoader
++public class ColumnFamilyMetricTest
  {
++    @BeforeClass
++    public static void defineSchema() throws Exception
++    {
++        SchemaLoader.prepareServer();
++        SchemaLoader.createKeyspace("Keyspace1",
++                                    SimpleStrategy.class,
++                                    KSMetaData.optsWithRF(1),
++                                    SchemaLoader.standardCFMD("Keyspace1", "Standard2"));
++    }
++
      @Test
      public void testSizeMetric()
      {
          Keyspace keyspace = Keyspace.open("Keyspace1");
--        ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard1");
++        ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard2");
          store.disableAutoCompaction();
  
          store.truncateBlocking();


Mime
View raw message