Author: jbellis
Date: Thu Nov 18 10:12:38 2010
New Revision: 1036384
URL: http://svn.apache.org/viewvc?rev=1036384&view=rev
Log:
fix sstableimport regression
patch by Bryan Tower; reviewed by Sylvain Lebresne for CASSANDRA-1753
Modified:
cassandra/branches/cassandra-0.7/CHANGES.txt
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SSTableImport.java
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1036384&r1=1036383&r2=1036384&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Thu Nov 18 10:12:38 2010
@@ -38,6 +38,7 @@ dev
* fix wrapping-range queries on non-minimum token (CASSANDRA-1700)
* truncate includes secondary indexes (CASSANDRA-1747)
* retain reference to PendingFile sstables (CASSANDRA-1749)
+ * fix sstableimport regression (CASSANDRA-1753)
0.7.0-beta3
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SSTableImport.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SSTableImport.java?rev=1036384&r1=1036383&r2=1036384&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SSTableImport.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SSTableImport.java
Thu Nov 18 10:12:38 2010
@@ -95,9 +95,9 @@ public class SSTableImport
JsonColumn col = new JsonColumn(c);
QueryPath path = new QueryPath(cfm.cfName, null,
ByteBuffer.wrap(hexToBytes(col.name)));
if (col.isDeleted) {
- cfamily.addColumn(path,
ByteBuffer.wrap(hexToBytes(col.value)), col.timestamp);
- } else {
cfamily.addTombstone(path,
ByteBuffer.wrap(hexToBytes(col.value)), col.timestamp);
+ } else {
+ cfamily.addColumn(path,
ByteBuffer.wrap(hexToBytes(col.value)), col.timestamp);
}
}
}
@@ -125,9 +125,9 @@ public class SSTableImport
JsonColumn col = new JsonColumn(c);
QueryPath path = new QueryPath(cfm.cfName, superName,
ByteBuffer.wrap(hexToBytes(col.name)));
if (col.isDeleted) {
- cfamily.addColumn(path,
ByteBuffer.wrap(hexToBytes(col.value)), col.timestamp);
- } else {
cfamily.addTombstone(path,
ByteBuffer.wrap(hexToBytes(col.value)), col.timestamp);
+ } else {
+ cfamily.addColumn(path,
ByteBuffer.wrap(hexToBytes(col.value)), col.timestamp);
}
}
Modified:
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/tools/SSTableImportTest.java?rev=1036384&r1=1036383&r2=1036384&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
(original)
+++
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
Thu Nov 18 10:12:38 2010
@@ -26,6 +26,7 @@ import java.util.Arrays;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ColumnFamily;
+import org.apache.cassandra.db.DeletedColumn;
import org.apache.cassandra.db.IColumn;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.db.filter.QueryPath;
@@ -55,6 +56,7 @@ public class SSTableImportTest extends S
QueryFilter qf = QueryFilter.getNamesFilter(Util.dk("rowA"), new
QueryPath("Standard1", null, null), ByteBufferUtil.bytes("colAA"));
ColumnFamily cf =
qf.getSSTableColumnIterator(reader).getColumnFamily();
assert
cf.getColumn(ByteBufferUtil.bytes("colAA")).value().equals(ByteBuffer.wrap(hexToBytes("76616c4141")));
+ assert !(cf.getColumn(ByteBufferUtil.bytes("colAA")) instanceof
DeletedColumn);
}
@Test
