Author: eevans
Date: Sun Jan 16 04:06:14 2011
New Revision: 1059461
URL: http://svn.apache.org/viewvc?rev=1059461&view=rev
Log:
missed references caught in review
Patch by eevans for CASSANDRA-926
Modified:
cassandra/trunk/contrib/hadoop_streaming_output/bin/streaming
cassandra/trunk/contrib/word_count/src/WordCount.java
Modified: cassandra/trunk/contrib/hadoop_streaming_output/bin/streaming
URL:
http://svn.apache.org/viewvc/cassandra/trunk/contrib/hadoop_streaming_output/bin/streaming?rev=1059461&r1=1059460&r2=1059461&view=diff
==============================================================================
--- cassandra/trunk/contrib/hadoop_streaming_output/bin/streaming (original)
+++ cassandra/trunk/contrib/hadoop_streaming_output/bin/streaming Sun Jan 16
04:06:14 2011
@@ -32,7 +32,7 @@ hadoop jar $cwd/../../../build/lib/jars/
-D cassandra.thrift.address=127.0.0.1 \
-D cassandra.thrift.port=9160 \
-libjars $ARCHIVES \
- -file $cwd/../../../interface/avro/cassandra.avpr \
+ -file $cwd/../../../src/gen-java/org/apache/cassandra/hadoop/hadoop.avpr \
-outputformat org.apache.cassandra.hadoop.ColumnFamilyOutputFormat \
-output /tmp/ignored \
-mapper $cwd/mapper.py -reducer $cwd/reducer.py \
Modified: cassandra/trunk/contrib/word_count/src/WordCount.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/contrib/word_count/src/WordCount.java?rev=1059461&r1=1059460&r2=1059461&view=diff
==============================================================================
--- cassandra/trunk/contrib/word_count/src/WordCount.java (original)
+++ cassandra/trunk/contrib/word_count/src/WordCount.java Sun Jan 16 04:06:14
2011
@@ -20,9 +20,9 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.*;
-import org.apache.cassandra.avro.Column;
-import org.apache.cassandra.avro.ColumnOrSuperColumn;
-import org.apache.cassandra.avro.Mutation;
+import org.apache.cassandra.hadoop.avro.Column;
+import org.apache.cassandra.hadoop.avro.ColumnOrSuperColumn;
+import org.apache.cassandra.hadoop.avro.Mutation;
import org.apache.cassandra.hadoop.ColumnFamilyOutputFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;