You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2010/10/21 21:31:16 UTC
svn commit: r1026112 - in /cassandra/trunk/contrib:
bmt_example/CassandraBulkLoader.java client_only/ClientOnlyExample.java
Author: jbellis
Date: Thu Oct 21 19:31:15 2010
New Revision: 1026112
URL: http://svn.apache.org/viewvc?rev=1026112&view=rev
Log:
remove Clocks from contrib/bmt_example and client_only. patch by jbellis
Modified:
cassandra/trunk/contrib/bmt_example/CassandraBulkLoader.java
cassandra/trunk/contrib/client_only/ClientOnlyExample.java
Modified: cassandra/trunk/contrib/bmt_example/CassandraBulkLoader.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/bmt_example/CassandraBulkLoader.java?rev=1026112&r1=1026111&r2=1026112&view=diff
==============================================================================
--- cassandra/trunk/contrib/bmt_example/CassandraBulkLoader.java (original)
+++ cassandra/trunk/contrib/bmt_example/CassandraBulkLoader.java Thu Oct 21 19:31:15 2010
@@ -48,27 +48,24 @@
package org.apache.cassandra.bulkloader;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.math.BigInteger;
+import java.net.InetAddress;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.db.clock.TimestampReconciler;
-import org.apache.cassandra.db.*;
+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.filter.QueryPath;
-import org.apache.cassandra.dht.BigIntegerToken;
import org.apache.cassandra.io.util.DataOutputBuffer;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
import org.apache.cassandra.net.IAsyncResult;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
@@ -81,8 +78,6 @@ import org.apache.hadoop.mapred.*;
public class CassandraBulkLoader {
public static class Map extends MapReduceBase implements Mapper<Text, Text, Text, Text> {
- private Text word = new Text();
-
public void map(Text key, Text value, OutputCollector<Text, Text> output, Reporter reporter) throws IOException {
// This is a simple key/value mapper.
output.collect(key, value);
@@ -91,7 +86,6 @@ public class CassandraBulkLoader {
public static class Reduce extends MapReduceBase implements Reducer<Text, Text, Text, Text> {
private Path[] localFiles;
- private ArrayList<String> tokens = new ArrayList<String>();
private JobConf jobconf;
public void configure(JobConf job) {
@@ -176,7 +170,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(), new TimestampClock(timestamp));
+ columnFamily.addColumn(new QueryPath(cfName, SuperColumnName.getBytes("UTF-8"), ColumnName.getBytes("UTF-8")), ColumnValue.getBytes(), timestamp);
}
columnFamilies.add(columnFamily);
@@ -255,10 +249,8 @@ 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),
- TimestampReconciler.instance,
CFMetaData.getId(Keyspace, CFName));
for(ColumnFamily cf : ColumnFamiles) {
@@ -267,7 +259,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, new TimestampClock(0));
+ column = new Column(FBUtilities.toByteArray(cf.id()), data, 0);
baseColumnFamily.addColumn(column);
}
rm = new RowMutation(Keyspace, Key);
Modified: cassandra/trunk/contrib/client_only/ClientOnlyExample.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/client_only/ClientOnlyExample.java?rev=1026112&r1=1026111&r2=1026112&view=diff
==============================================================================
--- cassandra/trunk/contrib/client_only/ClientOnlyExample.java (original)
+++ cassandra/trunk/contrib/client_only/ClientOnlyExample.java Thu Oct 21 19:31:15 2010
@@ -54,7 +54,7 @@ public class ClientOnlyExample
{
RowMutation change = new RowMutation("Keyspace1", ("key" + i).getBytes());
ColumnPath cp = new ColumnPath("Standard1").setColumn(("colb").getBytes());
- change.add(new QueryPath(cp), ("value" + i).getBytes(), new TimestampClock(0));
+ change.add(new QueryPath(cp), ("value" + i).getBytes(), 0);
// don't call change.apply(). The reason is that is makes a static call into Table, which will perform
// local storage initialization, which creates local directories.