Merge branch 'streamingquery' into updatemapred

krishna2020 · Apr 26, 2013 · efb3081 · efb3081
2 parents ee9574e + a4d99bc
commit efb3081
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 250 deletions.
diff --git a/streaming/src/main/java/com/mongodb/hadoop/streaming/MongoStreamJob.java b/streaming/src/main/java/com/mongodb/hadoop/streaming/MongoStreamJob.java
diff --git a/streaming/src/main/java/com/mongodb/hadoop/streaming/io/MongoIdentifierResolver.java b/streaming/src/main/java/com/mongodb/hadoop/streaming/io/MongoIdentifierResolver.java
@@ -8,6 +8,7 @@
 public class MongoIdentifierResolver extends IdentifierResolver {
     @Override
     public void resolve(String identifier) {
+        new Throwable().printStackTrace();
         log.info("Resolving: " + identifier);
         if (identifier.equalsIgnoreCase(MONGODB_ID) || 
             identifier.equalsIgnoreCase(MONGO_ID) || 

diff --git a/streaming/src/main/java/org/apache/hadoop/streaming/StreamJobPatch.java b/streaming/src/main/java/org/apache/hadoop/streaming/StreamJobPatch.java
diff --git a/testing/test_streaming_script.sh b/testing/test_streaming_script.sh
@@ -0,0 +1 @@
+/Users/mike/hadoop/hadoop-0.23.5/bin/hadoop jar /Users/mike/hadoop/hadoop-0.23.5/share/hadoop/tools/lib/hadoop-streaming-0.23.5.jar -libjars /Users/mike/Downloads/mongo-2.10.1.jar,../streaming/target/mongo-hadoop-streaming_cdh4b1-1.1.0-SNAPSHOT.jar -input mongodb://localhost:27017/test.test -inputformat com.mongodb.hadoop.MongoInputFormat -output mongodb://localhost:27017/test.testout
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/Users/mike/hadoop/hadoop-0.23.5/bin/hadoop jar /Users/mike/hadoop/hadoop-0.23.5/share/hadoop/tools/lib/hadoop-streaming-0.23.5.jar -libjars /Users/mike/Downloads/mongo-2.10.1.jar,../streaming/target/mongo-hadoop-streaming_cdh4b1-1.1.0-SNAPSHOT.jar -input mongodb://localhost:27017/test.test -inputformat com.mongodb.hadoop.MongoInputFormat -output mongodb://localhost:27017/test.testout