You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/11/28 03:16:33 UTC
[1/2] git commit: Backport json2sstable range tombstone fix from 2.0
Updated Branches:
refs/heads/cassandra-2.0 4fae76c14 -> 8ec971b89
Backport json2sstable range tombstone fix from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/69c1ee96
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69c1ee96
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69c1ee96
Branch: refs/heads/cassandra-2.0
Commit: 69c1ee96025dd35ed37bce2a2ccc0c2ca5a3dfed
Parents: a16fa77
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Nov 28 05:10:04 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Nov 28 05:10:04 2013 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/SSTableImport.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/69c1ee96/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 80d1aad..abe692e 100644
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@ -22,7 +22,6 @@ import static org.apache.cassandra.utils.ByteBufferUtil.hexToBytes;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.SortedMap;
@@ -51,7 +50,6 @@ import org.apache.cassandra.db.SuperColumn;
import org.apache.cassandra.db.filter.QueryPath;
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;
@@ -163,8 +161,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-1.2' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
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/8ec971b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ec971b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ec971b8
Branch: refs/heads/cassandra-2.0
Commit: 8ec971b89a256dc33cde366229f2bfbe67fd4109
Parents: 4fae76c 69c1ee9
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Nov 28 05:16:06 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Nov 28 05:16:06 2013 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/SSTableImport.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ec971b8/src/java/org/apache/cassandra/tools/SSTableImport.java
----------------------------------------------------------------------