This is an automated email from the ASF dual-hosted git repository.
gian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new f4e0909e92 fix bug with json_object expression not fully unwrapping
inputs (#12893)
f4e0909e92 is described below
commit f4e0909e924dc24539857ada817cbd0cfdacd729
Author: Clint Wylie <[email protected]>
AuthorDate: Sat Aug 13 21:15:19 2022 -0700
fix bug with json_object expression not fully unwrapping inputs (#12893)
---
.../druid/query/expression/NestedDataExpressions.java | 18 ++++++++++++++----
.../query/expression/NestedDataExpressionsTest.java | 10 ++++++++++
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git
a/processing/src/main/java/org/apache/druid/query/expression/NestedDataExpressions.java
b/processing/src/main/java/org/apache/druid/query/expression/NestedDataExpressions.java
index b2fbc35511..4cc561a149 100644
---
a/processing/src/main/java/org/apache/druid/query/expression/NestedDataExpressions.java
+++
b/processing/src/main/java/org/apache/druid/query/expression/NestedDataExpressions.java
@@ -38,6 +38,7 @@ import org.apache.druid.segment.nested.StructuredData;
import org.apache.druid.segment.nested.StructuredDataProcessor;
import javax.annotation.Nullable;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -80,7 +81,7 @@ public class NestedDataExpressions
ExprEval value = args.get(i + 1).eval(bindings);
Preconditions.checkArgument(field.type().is(ExprType.STRING),
"field name must be a STRING");
- theMap.put(field.asString(), value.value());
+ theMap.put(field.asString(),
maybeUnwrapStructuredData(value.value()));
}
return ExprEval.ofComplex(TYPE, theMap);
@@ -612,13 +613,22 @@ public class NestedDataExpressions
@Nullable
static Object maybeUnwrapStructuredData(ExprEval input)
{
- if (input.value() instanceof StructuredData) {
- StructuredData data = (StructuredData) input.value();
+ return maybeUnwrapStructuredData(input.value());
+ }
+
+ static Object maybeUnwrapStructuredData(Object input)
+ {
+ if (input instanceof StructuredData) {
+ StructuredData data = (StructuredData) input;
return data.getValue();
}
- return input.value();
+ if (input instanceof Object[]) {
+ return Arrays.stream((Object[]) input).map(x ->
maybeUnwrapStructuredData(x)).toArray();
+ }
+ return input;
}
+
static List<NestedPathPart> getArg1PathPartsFromLiteral(String fnName,
List<Expr> args)
{
if (!(args.get(1).isLiteral() && args.get(1).getLiteralValue() instanceof
String)) {
diff --git
a/processing/src/test/java/org/apache/druid/query/expression/NestedDataExpressionsTest.java
b/processing/src/test/java/org/apache/druid/query/expression/NestedDataExpressionsTest.java
index 3bf16b55c8..98f2e9c1f3 100644
---
a/processing/src/test/java/org/apache/druid/query/expression/NestedDataExpressionsTest.java
+++
b/processing/src/test/java/org/apache/druid/query/expression/NestedDataExpressionsTest.java
@@ -29,6 +29,7 @@ import org.apache.druid.math.expr.ExprMacroTable;
import org.apache.druid.math.expr.ExpressionType;
import org.apache.druid.math.expr.InputBindings;
import org.apache.druid.math.expr.Parser;
+import org.apache.druid.segment.nested.StructuredData;
import org.apache.druid.testing.InitializedNullHandlingTest;
import org.junit.Assert;
import org.junit.Test;
@@ -67,6 +68,7 @@ public class NestedDataExpressionsTest extends
InitializedNullHandlingTest
Expr.ObjectBinding inputBindings = InputBindings.withTypedSuppliers(
new ImmutableMap.Builder<String, Pair<ExpressionType,
Supplier<Object>>>()
.put("nest", new Pair<>(NestedDataExpressions.TYPE, () -> NEST))
+ .put("nestWrapped", new Pair<>(NestedDataExpressions.TYPE, () -> new
StructuredData(NEST)))
.put("nester", new Pair<>(NestedDataExpressions.TYPE, () -> NESTER))
.put("string", new Pair<>(ExpressionType.STRING, () -> "abcdef"))
.put("long", new Pair<>(ExpressionType.LONG, () -> 1234L))
@@ -345,5 +347,13 @@ public class NestedDataExpressionsTest extends
InitializedNullHandlingTest
eval = expr.eval(inputBindings);
Assert.assertEquals(100L, eval.value());
Assert.assertEquals(ExpressionType.LONG, eval.type());
+
+ expr = Parser.parse("to_json_string(json_object('x', nestWrapped))",
MACRO_TABLE);
+ eval = expr.eval(inputBindings);
+ Assert.assertEquals("{\"x\":{\"x\":100,\"y\":200,\"z\":300}}",
eval.value());
+
+ expr = Parser.parse("to_json_string(json_object('xs', array(nest,
nestWrapped)))", MACRO_TABLE);
+ eval = expr.eval(inputBindings);
+
Assert.assertEquals("{\"xs\":[{\"x\":100,\"y\":200,\"z\":300},{\"x\":100,\"y\":200,\"z\":300}]}",
eval.value());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
