You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/10/30 01:10:27 UTC

[1/3] git commit: Fix merge on test

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 391f1d3bb -> b6c9c35c3
  refs/heads/trunk 7c595cb80 -> a2c4caa00


Fix merge on test


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

Branch: refs/heads/cassandra-2.1
Commit: b6c9c35c33771f2664687fcead22905e6c786e37
Parents: 391f1d3
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Oct 29 19:07:12 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Oct 29 19:07:12 2014 -0500

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6c9c35c/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
index e3e81d8..c91ed27 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
@@ -23,7 +23,7 @@ import java.util.Collection;
 import org.junit.Test;
 
 import org.apache.cassandra.SchemaLoader;
-import org.apache.cassandra.io.sstable.SSTableReader;
+import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
 import static org.junit.Assert.assertEquals;
@@ -47,7 +47,7 @@ public class ColumnFamilyMetricTest extends SchemaLoader
         {
             ByteBuffer key = ByteBufferUtil.bytes(String.valueOf(j));
             Mutation rm = new Mutation("Keyspace1", key);
-            rm.add("Standard2", cellname("0"), ByteBufferUtil.EMPTY_BYTE_BUFFER, j);
+            rm.add("Standard1", cellname("0"), ByteBufferUtil.EMPTY_BYTE_BUFFER, j);
             rm.apply();
         }
         store.forceBlockingFlush();


[2/3] git commit: Fix merge on test

Posted by yu...@apache.org.
Fix merge on test


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

Branch: refs/heads/trunk
Commit: b6c9c35c33771f2664687fcead22905e6c786e37
Parents: 391f1d3
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Oct 29 19:07:12 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Oct 29 19:07:12 2014 -0500

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6c9c35c/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
index e3e81d8..c91ed27 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
@@ -23,7 +23,7 @@ import java.util.Collection;
 import org.junit.Test;
 
 import org.apache.cassandra.SchemaLoader;
-import org.apache.cassandra.io.sstable.SSTableReader;
+import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
 import static org.junit.Assert.assertEquals;
@@ -47,7 +47,7 @@ public class ColumnFamilyMetricTest extends SchemaLoader
         {
             ByteBuffer key = ByteBufferUtil.bytes(String.valueOf(j));
             Mutation rm = new Mutation("Keyspace1", key);
-            rm.add("Standard2", cellname("0"), ByteBufferUtil.EMPTY_BYTE_BUFFER, j);
+            rm.add("Standard1", cellname("0"), ByteBufferUtil.EMPTY_BYTE_BUFFER, j);
             rm.apply();
         }
         store.forceBlockingFlush();


[3/3] git commit: Merge branch 'cassandra-2.1' into trunk

Posted by yu...@apache.org.
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 <yu...@apache.org>
Authored: Wed Oct 29 19:09:16 2014 -0500
Committer: Yuki Morishita <yu...@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();