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

Jump to bottom

Fix json field extraction with mix of nested objects. #456

Closed
wants to merge 1 commit into from
Closed

Fix json field extraction with mix of nested objects. #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
57 changes: 23 additions & 34 deletions mr/src/main/java/org/elasticsearch/hadoop/serialization/ParsingUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,38 +158,18 @@ public static List<Object> values(Parser parser, String... paths) {
}

private static void doFind(Parser parser, List<Matcher> currentMatchers, int level, int maxNesting) {
String currentName;
Token token = parser.currentToken();

if (token == null) {
token = parser.nextToken();
// advance to the initial START_OBJECT token
parser.nextToken();
}
List<Matcher> nextLevel = null;

while ((token = parser.nextToken()) != null) {
if (token == Token.START_OBJECT) {
if (level < maxNesting) {
if (nextLevel != null) {
doFind(parser, nextLevel, level + 1, maxNesting);
}
// first round - a bit exceptional
else if (level == -1) {
doFind(parser, currentMatchers, level + 1, maxNesting);
}
// no need to go deeper, there are no matchers
else {
parser.skipChildren();
}
}
else {
parser.skipChildren();
}
}
else if (token == Token.FIELD_NAME) {
currentName = parser.currentName();

while ((token = parser.nextToken()) != null && token != Token.END_OBJECT) {
if (token == Token.FIELD_NAME) {
String currentName = parser.currentName();
Object value = null;
boolean valueRead = false;
List<Matcher> nextLevel = null;

for (Matcher matcher : currentMatchers) {
if (matcher.matches(currentName, level)) {
Expand Down Expand Up @@ -225,15 +205,24 @@ else if (token == Token.FIELD_NAME) {
}
}
}

if (!valueRead) {
// must parse or skip the value
switch (parser.nextToken()) {
case START_OBJECT:
if (level < maxNesting && nextLevel != null) {
doFind(parser, nextLevel, level + 1, maxNesting);
} else {
parser.skipChildren();
}
break;
case START_ARRAY:
// arrays are not handled; simply ignore
parser.skipChildren();
break;
}
}
}
else if (token == Token.END_OBJECT) {
// end current block
}
// arrays are not handled; simply ignore
else if (token == Token.START_ARRAY) {
parser.skipChildren();
}
// ignore other tokens
}
}

Expand Down
10 changes: 10 additions & 0 deletions mr/src/test/java/org/elasticsearch/hadoop/serialization/JsonValuePathTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,14 @@ public void testCorrectLevelMatched() throws Exception {
assertEquals(1, vals.size());
assertThat(vals.get(0).toString(), containsString("CA"));
}

@Test
public void testMixedLevels() throws Exception {
List<Object> vals = ParsingUtils.values(parser, "firstName", "address.building.floors", "address.decor.walls", "zzz");
assertEquals(4, vals.size());
assertEquals("John", vals.get(0));
assertEquals(10, vals.get(1));
assertEquals("white", vals.get(2));
assertEquals("end", vals.get(3));
}
}
11 changes: 8 additions & 3 deletions mr/src/test/resources/org/elasticsearch/hadoop/serialization/parser-test-nested.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"bogus":true,
"state":"bogus",
"building": {
"hight":"bogus",
"height":"bogus",
"floors": 0,
"flats": 0
}
Expand All @@ -17,10 +17,14 @@
"state": "NY",
"postalCode": 10021,
"building": {
"hight":"tall",
"height":"tall",
"floors": 10,
"flats": 40
},
"decor": {
"walls": "white",
"floors": "parquet"
},
"firstName":"should-not-be-picked"
},
"phoneNumbers": [
Expand All @@ -44,5 +48,6 @@
},
"small-array": [
"foo", "bar"
]
],
"zzz": "end"
}