cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stefa...@apache.org
Subject [3/6] cassandra git commit: Backport of "Fix test broken after second pass of CASSANDRA-11803 changes" from 3.X to 3.0
Date Thu, 20 Oct 2016 01:22:38 GMT
Backport of "Fix test broken after second pass of CASSANDRA-11803 changes" from 3.X to 3.0

Patch by Alex Petrov; reviewed by Carl Yeksigian for CASSANDRA-11803


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

Branch: refs/heads/trunk
Commit: 55568c17d6100cedc77747dfe1ad05a40191216b
Parents: 250b5c1
Author: Alex Petrov <oleksandr.petrov@gmail.com>
Authored: Wed Oct 19 08:32:49 2016 +0200
Committer: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Committed: Thu Oct 20 09:20:11 2016 +0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/55568c17/test/unit/org/apache/cassandra/db/ColumnFamilyStoreCQLHelperTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreCQLHelperTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreCQLHelperTest.java
index fdcc99c..c2e5cb7 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreCQLHelperTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreCQLHelperTest.java
@@ -635,10 +635,10 @@ public class ColumnFamilyStoreCQLHelperTest extends CQLTester
 
         assertTrue(ColumnFamilyStoreCQLHelper.getCFMetadataAsCQL(cfs.metadata, true).startsWith(
         "CREATE TABLE IF NOT EXISTS " + DYNAMIC_COMPOSITE + "." + DYNAMIC_COMPOSITE + " (\n"
+
-        "\t\"key\" ascii,\n" +
+        "\tkey ascii,\n" +
         "\tcols 'org.apache.cassandra.db.marshal.DynamicCompositeType(a=>org.apache.cassandra.db.marshal.BytesType,b=>org.apache.cassandra.db.marshal.BytesType,c=>org.apache.cassandra.db.marshal.BytesType)',\n"
+
         "\tval ascii,\n" +
-        "\tPRIMARY KEY (\"key\", cols))\n" +
+        "\tPRIMARY KEY (key, cols))\n" +
         "\tWITH ID = " + cfs.metadata.cfId + "\n" +
         "\tAND COMPACT STORAGE"));
     }


Mime
View raw message