svn commit: r949031 - /cassandra/trunk/contrib/bmt_example/CassandraBulkLoader.java

[jbellis]

Author: jbellis
Date: Thu May 27 22:44:21 2010
New Revision: 949031

URL: http://svn.apache.org/viewvc?rev=949031&view=rev
Log:
update contrib/CassandraBulkLoader to work with Clocks.  patch by jbellis

Modified:
    cassandra/trunk/contrib/bmt_example/CassandraBulkLoader.java

Modified: cassandra/trunk/contrib/bmt_example/CassandraBulkLoader.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/contrib/bmt_example/CassandraBulkLoader.java?rev=949031&r1=949030&r2=949031&view=diff
==============================================================================
--- cassandra/trunk/contrib/bmt_example/CassandraBulkLoader.java (original)
+++ cassandra/trunk/contrib/bmt_example/CassandraBulkLoader.java Thu May 27 
22:44:21 2010
@@ -53,10 +53,7 @@ import java.util.List;
 
 import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.db.Column;
-import org.apache.cassandra.db.ColumnFamily;
-import org.apache.cassandra.db.ColumnFamilyType;
-import org.apache.cassandra.db.RowMutation;
+import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.filter.QueryPath;
 import org.apache.cassandra.dht.BigIntegerToken;
 import org.apache.cassandra.io.util.DataOutputBuffer;
@@ -169,7 +166,7 @@ public class CassandraBulkLoader {
                 String ColumnName = fields[2];
                 String ColumnValue = fields[3];
                 int timestamp = 0;
-                columnFamily.addColumn(new QueryPath(cfName, 
SuperColumnName.getBytes("UTF-8"), ColumnName.getBytes("UTF-8")), 
ColumnValue.getBytes(), timestamp);
+                columnFamily.addColumn(new QueryPath(cfName, 
SuperColumnName.getBytes("UTF-8"), ColumnName.getBytes("UTF-8")), 
ColumnValue.getBytes(), new TimestampClock(timestamp));
             }
 
             columnFamilies.add(columnFamily);
@@ -234,6 +231,7 @@ public class CassandraBulkLoader {
 
         /* Get the first column family from list, this is just to get past 
validation */
         baseColumnFamily = new ColumnFamily(ColumnFamilyType.Standard,
+                                            ClockType.Timestamp,
                                             
DatabaseDescriptor.getComparator(Keyspace, CFName),
                                             
DatabaseDescriptor.getSubComparator(Keyspace, CFName),
                                             CFMetaData.getId(Keyspace, 
CFName));
@@ -244,7 +242,7 @@ public class CassandraBulkLoader {
             byte[] data = new byte[bufOut.getLength()];
             System.arraycopy(bufOut.getData(), 0, data, 0, bufOut.getLength());
 
-            column = new Column(FBUtilities.toByteArray(cf.id()), data, 0);
+            column = new Column(FBUtilities.toByteArray(cf.id()), data, new 
TimestampClock(0));
             baseColumnFamily.addColumn(column);
         }
         rm = new RowMutation(Keyspace, Key);