You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2015/07/23 17:56:25 UTC

cassandra git commit: Upgrade CommitLogUpgradeTest post-8099

Repository: cassandra
Updated Branches:
  refs/heads/trunk 2d55c1e84 -> 15265689f


Upgrade CommitLogUpgradeTest post-8099


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

Branch: refs/heads/trunk
Commit: 15265689f529f05fd3f4065b3f098864de686edb
Parents: 2d55c1e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jul 23 17:55:37 2015 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jul 23 17:56:21 2015 +0200

----------------------------------------------------------------------
 .../cassandra/db/commitlog/CommitLogUpgradeTest.java   | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/15265689/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java
index d443b8c..ce4e605 100644
--- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java
+++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java
@@ -41,8 +41,11 @@ import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.db.Mutation;
 import org.apache.cassandra.db.rows.Cell;
 import org.apache.cassandra.db.rows.Row;
+import org.apache.cassandra.db.marshal.AsciiType;
 import org.apache.cassandra.db.marshal.UTF8Type;
+import org.apache.cassandra.db.marshal.BytesType;
 import org.apache.cassandra.db.partitions.PartitionUpdate;
+import org.apache.cassandra.schema.KeyspaceParams;
 
 public class CommitLogUpgradeTest
 {
@@ -70,8 +73,16 @@ public class CommitLogUpgradeTest
     @BeforeClass
     static public void initialize() throws FileNotFoundException, IOException, InterruptedException
     {
+        CFMetaData metadata = CFMetaData.Builder.createDense(KEYSPACE, TABLE, false, false)
+                                                .addPartitionKey("key", AsciiType.instance)
+                                                .addClusteringColumn("col", BytesType.instance)
+                                                .addRegularColumn("val", BytesType.instance)
+                                                .build()
+                                                .compressionParameters(SchemaLoader.getCompressionParameters());
         SchemaLoader.loadSchema();
-        SchemaLoader.schemaDefinition("");
+        SchemaLoader.createKeyspace(KEYSPACE,
+                                    KeyspaceParams.simple(1),
+                                    metadata);
     }
 
     public void testRestore(String location) throws IOException, InterruptedException