add Pig support for JSON + integration tests

relates to #9
elastic · Jan 17, 2014 · d05788c · d05788c
1 parent 978deda
commit d05788c
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/src/main/java/org/elasticsearch/hadoop/pig/EsStorage.java b/src/main/java/org/elasticsearch/hadoop/pig/EsStorage.java
@@ -150,6 +150,7 @@ private void init(String location, Job job) {
 
         changed |= InitializationUtils.setValueWriterIfNotSet(settings, PigValueWriter.class, log);
         changed |= InitializationUtils.setValueReaderIfNotSet(settings, PigValueReader.class, log);
+        changed |= InitializationUtils.setBytesWriterIfNeeded(settings, PigBytesWritable.class, log);
         changed |= InitializationUtils.setFieldExtractorIfNotSet(settings, PigFieldExtractor.class, log);
         settings.save();
     }

diff --git a/src/test/java/org/elasticsearch/hadoop/integration/QueryTestParams.java b/src/test/java/org/elasticsearch/hadoop/integration/QueryTestParams.java
@@ -28,7 +28,7 @@
 
 public class QueryTestParams {
 
-    public static Collection<Object[]> params() {
+    public static Collection<Object[]> jsonParams() {
         return Arrays.asList(new Object[][] {
                 // standard
                 { "", "" }, // empty
@@ -46,7 +46,7 @@ public static Collection<Object[]> params() {
         });
     }
 
-    public static Collection<Object[]> localParams() {
+    public static Collection<Object[]> jsonLocalParams() {
         return Arrays.asList(new Object[][] {
                 { "", "" }, // empty
                 { "", "?q=m*" }, // uri
@@ -62,6 +62,26 @@ public static Collection<Object[]> localParams() {
                 });
     }
 
+    public static Collection<Object[]> params() {
+        return Arrays.asList(new Object[][] {
+                { "" }, // empty
+                { "?q=m*" }, // uri
+                { "{ \"query\" : { \"query_string\" : { \"query\":\"m*\"} } }" }, // query dsl
+                { "src/test/resources/org/elasticsearch/hadoop/integration/query.uri" }, // nested uri
+                { "src/test/resources/org/elasticsearch/hadoop/integration/query.dsl" } // nested dsl
+        });
+    }
+
+    public static Collection<Object[]> localParams() {
+        return Arrays.asList(new Object[][] {
+                { "" }, // empty
+                { "?q=m*" }, // uri
+                { "{ \"query\" : { \"query_string\" : { \"query\":\"m*\"} } }" }, // query dsl
+                { "org/elasticsearch/hadoop/integration/query.uri" }, // nested uri
+                { "org/elasticsearch/hadoop/integration/query.dsl" } // nested dsl
+                });
+    }
+
     public static <T extends Configuration> T provisionQueries(T cfg) {
         try {
             DistributedCache.addFileToClassPath(new Path("src/test/resources/org/elasticsearch/hadoop/integration/query.dsl"), cfg);

diff --git a/src/test/java/org/elasticsearch/hadoop/integration/pig/PigSaveTest.java b/src/test/java/org/elasticsearch/hadoop/integration/pig/PigSaveTest.java
@@ -46,7 +46,7 @@ public static void startup() throws Exception {
         // initialize Pig in local mode
         RestClient client = new RestClient(new TestSettings());
         try {
-            client.deleteIndex("radio");
+            client.deleteIndex("pig");
         } catch (Exception ex) {
             // ignore
         }

diff --git a/src/test/java/org/elasticsearch/hadoop/integration/pig/PigSearchTest.java b/src/test/java/org/elasticsearch/hadoop/integration/pig/PigSearchTest.java
@@ -39,7 +39,7 @@ public static Collection<Object[]> queries() {
         return QueryTestParams.params();
     }
 
-    private String query;
+    private final String query;
 
     public PigSearchTest(String query) {
         this.query = query;

diff --git a/src/test/java/org/elasticsearch/hadoop/integration/pig/PigSuite.java b/src/test/java/org/elasticsearch/hadoop/integration/pig/PigSuite.java
@@ -28,8 +28,8 @@
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({ PigSaveTest.class, PigSearchTest.class })
-//@Suite.SuiteClasses({ PigSearchTest.class })
+//@Suite.SuiteClasses({ PigSaveTest.class, PigSaveJsonTest.class, PigSearchTest.class })
+@Suite.SuiteClasses({ PigSaveJsonTest.class, PigSearchJsonTest.class })
 public class PigSuite {
 
     @ClassRule