cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/2] git commit: Fix tests post-merge
Date Wed, 02 Apr 2014 15:03:22 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 386ed8fa6 -> 3e0dac5a4


Fix tests post-merge


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

Branch: refs/heads/trunk
Commit: 486cc4cc0a1aae49ef8d09fd884d7e4095c05f1b
Parents: ef08e62
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Apr 2 17:02:49 2014 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Apr 2 17:02:49 2014 +0200

----------------------------------------------------------------------
 src/java/org/apache/cassandra/tools/SSTableImport.java          | 2 +-
 test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/486cc4cc/src/java/org/apache/cassandra/tools/SSTableImport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/SSTableImport.java b/src/java/org/apache/cassandra/tools/SSTableImport.java
index c0d8e00..6bd2119 100644
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@ -162,7 +162,7 @@ public class SSTableImport
                 }
                 else
                 {
-                    value = stringAsType((String) fields.get(1), meta.getValueValidator(meta.comparator.cellFromByteBuffer(name)));
+                    value = stringAsType((String) fields.get(1), meta.getValueValidator(comparator.cellFromByteBuffer(name)));
                 }
             }
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/486cc4cc/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java b/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
index 1d47c18..df0f98c 100644
--- a/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
+++ b/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
@@ -101,7 +101,7 @@ public class ThriftValidationTest extends SchemaLoader
         CFMetaData metaData = Schema.instance.getCFMetaData("Keyspace1", "UUIDKeys");
         ColumnDefinition definition = metaData.getColumnDefinition(ByteBufferUtil.bytes(CFMetaData.DEFAULT_KEY_ALIAS));
         assertNotNull(definition);
-        assertEquals(ColumnDefinition.Kind.PARTITION_KEY, definition.type);
+        assertEquals(ColumnDefinition.Kind.PARTITION_KEY, definition.kind);
 
         // make sure the key alias does not affect validation of columns with the same name
(CASSANDRA-6892)
         Column column = new Column(ByteBufferUtil.bytes(CFMetaData.DEFAULT_KEY_ALIAS));


Mime
View raw message