diff --git a/pig/src/main/java/com/twitter/elephantbird/pig/load/JsonLoader.java b/pig/src/main/java/com/twitter/elephantbird/pig/load/JsonLoader.java index 9a311052b..917f76856 100644 --- a/pig/src/main/java/com/twitter/elephantbird/pig/load/JsonLoader.java +++ b/pig/src/main/java/com/twitter/elephantbird/pig/load/JsonLoader.java @@ -1,6 +1,8 @@ package com.twitter.elephantbird.pig.load; -import com.google.common.collect.Maps; +import java.io.IOException; +import java.util.Arrays; +import java.util.Map; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; @@ -25,8 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.util.Map; +import com.google.common.collect.Maps; /** * Decodes each line as JSON passes the resulting map of values @@ -46,6 +47,7 @@ public class JsonLoader extends LzoBaseLoadFunc { private static final TupleFactory tupleFactory = TupleFactory.getInstance(); public static final String NESTED_LOAD_KEY = "elephantbird.jsonloader.nestedLoad"; + public static final String INCLUDE_STRING_KEY = "elephantbird.jsonloader.includeString"; private final static Options validOptions_ = new Options(); private final static CommandLineParser parser_ = new GnuParser(); @@ -62,12 +64,14 @@ private enum JsonLoaderCounters { private String inputFormatClassName; private boolean isNestedLoadEnabled = false; + private boolean isIncludeStringEnabled = false; private static void populateValidOptions() { validOptions_.addOption("nestedLoad", false, "Enables loading of " + "nested JSON structures"); validOptions_.addOption("inputFormat", true, "The input format class name" + " used by this loader instance"); + validOptions_.addOption("includeString", false, "Include the raw JSON string"); } public JsonLoader() { @@ -85,6 +89,8 @@ public JsonLoader() { * and JSON arrays are loaded as Bags. *