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 2014/04/02 17:03:22 UTC
[1/2] git commit: Fix tests post-merge
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 <sy...@datastax.com>
Authored: Wed Apr 2 17:02:49 2014 +0200
Committer: Sylvain Lebresne <sy...@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));
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by sl...@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/3e0dac5a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e0dac5a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e0dac5a
Branch: refs/heads/trunk
Commit: 3e0dac5a443c6e8c089a832ddc05617241cdfb48
Parents: 386ed8f 486cc4c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Apr 2 17:03:15 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Apr 2 17:03:15 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(-)
----------------------------------------------------------------------