Skip to content

Fix generation of JSON path keyvalue() IDs #16482

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

Merged
electrum merged 1 commit into from
Mar 11, 2023
Merged

Fix generation of JSON path keyvalue() IDs #16482

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
3 changes: 2 additions & 1 deletion core/trino-main/src/main/java/io/trino/json/PathEvaluationVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,8 @@ protected List<Object> visitIrKeyValueMethod(IrKeyValueMethod node, PathEvaluati
ImmutableMap.of(
"name", TextNode.valueOf(field.getKey()),
"value", field.getValue(),
"id", IntNode.valueOf(objectId++)))));
"id", IntNode.valueOf(objectId)))));
objectId++;
}

return outputSequence.build();
Expand Down
49 changes: 49 additions & 0 deletions core/trino-main/src/test/java/io/trino/json/TestJsonPathEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,55 @@ public void testKeyValueMethod()
"value", NullNode.instance,
"id", IntNode.valueOf(1)))));

// nested methods
assertThat(pathResult(
new ArrayNode(
JsonNodeFactory.instance,
ImmutableList.of(
new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of("key1", TextNode.valueOf("first"), "key2", BooleanNode.TRUE)),
new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of("key3", IntNode.valueOf(42))))),
path(true, keyValue(keyValue(wildcardArrayAccessor(contextVariable()))))))
.isEqualTo(sequence(
// key1
new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of(
"name", TextNode.valueOf("name"),
"value", TextNode.valueOf("key1"),
"id", IntNode.valueOf(2))),
new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of(
"name", TextNode.valueOf("value"),
"value", TextNode.valueOf("first"),
"id", IntNode.valueOf(2))),
new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of(
"name", TextNode.valueOf("id"),
"value", IntNode.valueOf(0),
"id", IntNode.valueOf(2))),
// key2
new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of(
"name", TextNode.valueOf("name"),
"value", TextNode.valueOf("key2"),
"id", IntNode.valueOf(3))),
new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of(
"name", TextNode.valueOf("value"),
"value", BooleanNode.TRUE,
"id", IntNode.valueOf(3))),
new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of(
"name", TextNode.valueOf("id"),
"value", IntNode.valueOf(0),
"id", IntNode.valueOf(3))),
// key3
new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of(
"name", TextNode.valueOf("name"),
"value", TextNode.valueOf("key3"),
"id", IntNode.valueOf(4))),
new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of(
"name", TextNode.valueOf("value"),
"value", IntNode.valueOf(42),
"id", IntNode.valueOf(4))),
new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of(
"name", TextNode.valueOf("id"),
"value", IntNode.valueOf(1),
"id", IntNode.valueOf(4)))));

// type mismatch
assertThatThrownBy(() -> evaluate(
IntNode.valueOf(-5),
Expand Down