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

[BUG] jsonNode array index access for EXTRACTJSONFIELD #610

Merged
merged 1 commit into from
Jan 31, 2018
Merged

[BUG] jsonNode array index access for EXTRACTJSONFIELD #610

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ksql-engine/src/main/java/io/confluent/ksql/function/udf/json/JsonExtractStringKudf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,12 @@ public Object evaluate(Object... args) {
if (currentNode == null) {
return null;
}
currentNode = currentNode.get(token);
try {
int index = Integer.parseInt(token);
currentNode = currentNode.get(index);
} catch (NumberFormatException e) {
currentNode = currentNode.get(token);
}
}
if (currentNode == null) {
return null;
Expand Down
30 changes: 28 additions & 2 deletions ksql-engine/src/test/java/io/confluent/ksql/integration/JsonFormatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ private void produceInitData() throws Exception {
Schema messageSchema = SchemaBuilder.struct().field("MESSAGE", SchemaBuilder.STRING_SCHEMA).build();

GenericRow messageRow = new GenericRow(Arrays.asList
("{\"log\":{\"@timestamp\":\"2017-05-30T16:44:22.175Z\",\"@version\":\"1\","
+ "\"caasVersion\":\"0.0.2\",\"cloud\":\"aws\",\"clusterId\":\"cp99\",\"clusterName\":\"kafka\",\"cpComponentId\":\"kafka\",\"host\":\"kafka-1-wwl0p\",\"k8sId\":\"k8s13\",\"k8sName\":\"perf\",\"level\":\"ERROR\",\"logger\":\"kafka.server.ReplicaFetcherThread\",\"message\":\"Found invalid messages during fetch for partition [foo512,172] offset 0 error Record is corrupt (stored crc = 1321230880, computed crc = 1139143803)\",\"networkId\":\"vpc-d8c7a9bf\",\"region\":\"us-west-2\",\"serverId\":\"1\",\"skuId\":\"sku5\",\"source\":\"kafka\",\"tenantId\":\"t47\",\"tenantName\":\"perf-test\",\"thread\":\"ReplicaFetcherThread-0-2\",\"zone\":\"us-west-2a\"},\"stream\":\"stdout\",\"time\":2017}"));
("{\"log\":{\"@timestamp\":\"2017-05-30T16:44:22.175Z\",\"@version\":\"1\","
+ "\"caasVersion\":\"0.0.2\",\"cloud\":\"aws\",\"logs\":[{\"entry\":\"first\"}],\"clusterId\":\"cp99\",\"clusterName\":\"kafka\",\"cpComponentId\":\"kafka\",\"host\":\"kafka-1-wwl0p\",\"k8sId\":\"k8s13\",\"k8sName\":\"perf\",\"level\":\"ERROR\",\"logger\":\"kafka.server.ReplicaFetcherThread\",\"message\":\"Found invalid messages during fetch for partition [foo512,172] offset 0 error Record is corrupt (stored crc = 1321230880, computed crc = 1139143803)\",\"networkId\":\"vpc-d8c7a9bf\",\"region\":\"us-west-2\",\"serverId\":\"1\",\"skuId\":\"sku5\",\"source\":\"kafka\",\"tenantId\":\"t47\",\"tenantName\":\"perf-test\",\"thread\":\"ReplicaFetcherThread-0-2\",\"zone\":\"us-west-2a\"},\"stream\":\"stdout\",\"time\":2017}"));

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you have both previous tests and this one? The UDF should work for both cases.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem I thought this might come up. Reason I modified the existing is that it essentially performs both tests when accessing the nested nodes anyway. But I'll add back in the original spec unmodified and duplicate it into a new one for array access now 😄

Map<String, GenericRow> records = new HashMap<>();
records.put("1", messageRow);
Expand Down Expand Up @@ -224,6 +224,32 @@ public void testJsonStreamExtractor() throws Exception {
ksqlEngine.terminateQuery(queryMetadata.getId(), true);
}

@Test
public void testJsonStreamExtractorNested() throws Exception {

final String streamName = "JSONSTREAM";
final String queryString = String.format("CREATE STREAM %s AS SELECT EXTRACTJSONFIELD"
+ "(message, '$.log.logs[0].entry') "
+ "FROM %s;",
streamName, messageLogStream);

PersistentQueryMetadata queryMetadata =
(PersistentQueryMetadata) ksqlEngine.buildMultipleQueries(queryString, Collections.emptyMap()).get(0);
queryMetadata.getKafkaStreams().start();

Schema resultSchema = SchemaUtil
.removeImplicitRowTimeRowKeyFromSchema(metaStore.getSource(streamName).getSchema());

Map<String, GenericRow> expectedResults = new HashMap<>();
expectedResults.put("1", new GenericRow(Arrays.asList("first")));

Map<String, GenericRow> results = readNormalResults(streamName, resultSchema, expectedResults.size());

assertThat(results, equalTo(expectedResults));

ksqlEngine.terminateQuery(queryMetadata.getId(), true);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably be done in a `try{...}finally{...}' otherwise it won't run when the test fails

}

//*********************************************************//

private Map<String, GenericRow> readNormalResults(String resultTopic, Schema resultSchema, int expectedNumMessages) {
Expand Down
11 changes: 6 additions & 5 deletions ksql-engine/src/test/java/io/confluent/ksql/util/json/JsonPathTokenizerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@ public class JsonPathTokenizerTest {

@Test
public void testJsonPathTokenizer() throws IOException {
JsonPathTokenizer jsonPathTokenizer = new JsonPathTokenizer("$.log.cloud.region");
JsonPathTokenizer jsonPathTokenizer = new JsonPathTokenizer("$.logs[0].cloud.region");
ImmutableList<String> tokens = ImmutableList.copyOf(jsonPathTokenizer);
List<String> tokenList = tokens.asList();
Assert.assertTrue(tokenList.size() == 3);
Assert.assertTrue(tokenList.get(0).equalsIgnoreCase("log"));
Assert.assertTrue(tokenList.get(1).equalsIgnoreCase("cloud"));
Assert.assertTrue(tokenList.get(2).equalsIgnoreCase("region"));
Assert.assertTrue(tokenList.size() == 4);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know these were previously assertTrue but it would be good to change this to use assertThat(..) instead

Assert.assertTrue(tokenList.get(0).equalsIgnoreCase("logs"));
Assert.assertTrue(tokenList.get(1).equalsIgnoreCase("0"));
Assert.assertTrue(tokenList.get(2).equalsIgnoreCase("cloud"));
Assert.assertTrue(tokenList.get(3).equalsIgnoreCase("region"));

}

Expand Down