Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added option to include the raw JSON #464

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

added option to include the raw JSON #464

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5687b48
added option to include the raw JSON
rjoberon Mar 9, 2016
ed311bd
Merge remote-tracking branch 'upstream/master'
rjoberon Sep 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions pig/src/main/java/com/twitter/elephantbird/pig/load/JsonLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand All @@ -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();
Expand All @@ -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() {
Expand All @@ -85,6 +89,8 @@ public JsonLoader() {
* and JSON arrays are loaded as Bags.
* <li>-inputFormat=className The input format class name used
* by this loader instance.
* <li>-includeString==(true|false) Include the raw JSON string. When
* enabled, the string is included as the second element in the tuple.</li>
* </ul>
*/
public JsonLoader(String optString) {
Expand All @@ -95,10 +101,11 @@ public JsonLoader(String optString) {
configuredOptions_ = parser_.parse(validOptions_, optsArr);
} catch (org.apache.commons.cli.ParseException e) {
HelpFormatter formatter = new HelpFormatter();
formatter.printHelp( "[-nestedLoad] [-inputFormat]", validOptions_ );
formatter.printHelp( "[-nestedLoad] [-inputFormat] [-includeString]", validOptions_ );
throw new RuntimeException(e);
}
isNestedLoadEnabled = configuredOptions_.hasOption("nestedLoad");
isIncludeStringEnabled = configuredOptions_.hasOption("includeString");

if (configuredOptions_.getOptionValue("inputFormat") != null) {
this.inputFormatClassName = configuredOptions_.getOptionValue("inputFormat");
Expand All @@ -122,6 +129,8 @@ public Tuple getNext() throws IOException {
// nested load can be enabled through a pig property
if ("true".equals(jobConf.get(NESTED_LOAD_KEY)))
isNestedLoadEnabled = true;
if ("true".equals(jobConf.get(INCLUDE_STRING_KEY)))
isIncludeStringEnabled = true;
try {
while (reader.nextKeyValue()) {
Text value = (Text) reader.getCurrentValue();
Expand Down Expand Up @@ -157,7 +166,11 @@ protected Tuple parseStringToTuple(String line) {
try {
JSONObject jsonObj = (JSONObject) jsonParser.parse(line);
if (jsonObj != null) {
return tupleFactory.newTuple(walkJson(jsonObj));
final Map<String, Object> walkJson = walkJson(jsonObj);
if (isIncludeStringEnabled) {
return tupleFactory.newTuple(Arrays.<Object>asList(walkJson, line));
}
return tupleFactory.newTuple(walkJson);
} else {
// JSONParser#parse(String) may return a null reference, e.g. when
// the input parameter is the string "null". A single line with
Expand Down