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 2013/11/12 19:25:49 UTC
[1/2] git commit: Fix build
Updated Branches:
refs/heads/trunk bfd0144a1 -> ed1fabb39
Fix build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7fb2d24f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fb2d24f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fb2d24f
Branch: refs/heads/trunk
Commit: 7fb2d24fa35d01eab2ff6e5ebaa6885c795a80b8
Parents: acea716
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Nov 12 19:25:26 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Nov 12 19:25:26 2013 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/SSTableImport.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fb2d24f/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 0e8172b..7b65d26 100644
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@ -44,9 +44,9 @@ import org.apache.cassandra.config.Schema;
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;
@@ -158,8 +158,7 @@ public class SSTableImport
}
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
{
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed1fabb3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed1fabb3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed1fabb3
Branch: refs/heads/trunk
Commit: ed1fabb395d02849e06e7b54713e9d099571b4df
Parents: bfd0144 7fb2d24
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Nov 12 19:25:38 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Nov 12 19:25:38 2013 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------