Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/tools/SSTableImport.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bfd0144a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfd0144a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bfd0144a
Branch: refs/heads/trunk
Commit: bfd0144a189c4326c987d91cc20e66e47236dc1a
Parents: 9a59d25 acea716
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Tue Nov 12 19:23:12 2013 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Tue Nov 12 19:23:12 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 +++
.../cassandra/cql3/statements/SelectStatement.java | 2 +-
.../apache/cassandra/db/marshal/CompositeType.java | 6 +++---
.../org/apache/cassandra/tools/SSTableImport.java | 17 ++++++++++++++---
4 files changed, 21 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfd0144a/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfd0144a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfd0144a/src/java/org/apache/cassandra/db/marshal/CompositeType.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfd0144a/src/java/org/apache/cassandra/tools/SSTableImport.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/SSTableImport.java
index 2e9c4ed,0e8172b..3dcb851
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@@ -44,8 -44,9 +44,9 @@@ import org.apache.cassandra.config.Sche
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.BytesType;
import org.apache.cassandra.db.marshal.CompositeType;
-import org.apache.cassandra.db.marshal.MarshalException;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.io.sstable.SSTableWriter;
++import org.apache.cassandra.serializers.MarshalException;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.JsonParser;
@@@ -151,8 -152,19 +152,18 @@@ public class SSTableImpor
}
}
- value = isDeleted() ? ByteBufferUtil.hexToBytes((String)
fields.get(1))
- : stringAsType((String) fields.get(1),
meta.getValueValidator(meta.getColumnDefinitionFromCellName(name)));
+ if (isDeleted())
+ {
+ value = ByteBufferUtil.hexToBytes((String) fields.get(1));
+ }
+ else if (isRangeTombstone())
+ {
- AbstractType<?> type =
CompositeType.getInstance(Arrays.asList(new
AbstractType<?>[]{meta.getColumnDefinitionComparator(0)}));
- value = type.fromString((String)fields.get(1));
++ value = comparator.fromString((String)fields.get(1));
+ }
+ else
+ {
- value = stringAsType((String) fields.get(1),
meta.getValueValidator(meta.getColumnDefinitionFromColumnName(name)));
++ value = stringAsType((String) fields.get(1),
meta.getValueValidator(meta.getColumnDefinitionFromCellName(name)));
+ }
}
}
