Skip to content

fix array_agg to work with complex types and bugs with expression aggregator complex array handling #13781

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
clintropolis merged 8 commits into from
Feb 13, 2023
Merged

fix array_agg to work with complex types and bugs with expression aggregator complex array handling #13781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fea7cd6
fix array_agg to work with complex types and bugs with expression agg…
clintropolis Feb 9, 2023
cdd19c6
missed a few
clintropolis Feb 9, 2023
96c56c1
update test
clintropolis Feb 9, 2023
b985c9a
fix test
clintropolis Feb 9, 2023
96d4084
more consistent handling of array expressions, numeric arrays more co…
clintropolis Feb 9, 2023
236d9f5
more tests
clintropolis Feb 10, 2023
fcba37a
cleanup
clintropolis Feb 11, 2023
c8ab921
Merge remote-tracking branch 'upstream/master' into array-agg-and-com…
clintropolis Feb 11, 2023
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
53 changes: 38 additions & 15 deletions core/src/main/java/org/apache/druid/math/expr/ExprEval.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public static NonnullPair<ExpressionType, Object[]> coerceListToArray(@Nullable
Object[] array = new Object[val.size()];
int i = 0;
for (Object o : val) {
array[i++] = o == null ? null : ExprEval.ofType(ExpressionType.DOUBLE, o).value();
array[i++] = ExprEval.ofType(ExpressionType.DOUBLE, o).value();
}
return new NonnullPair<>(ExpressionType.DOUBLE_ARRAY, array);
} else if (coercedType == Object.class) {
Expand All @@ -193,7 +193,7 @@ public static NonnullPair<ExpressionType, Object[]> coerceListToArray(@Nullable
if (eval != null) {
array[i++] = eval.castTo(elementType).value();
} else {
array[i++] = null;
array[i++] = ExprEval.ofType(elementType, null).value();
}
}
ExpressionType arrayType = elementType == null
Expand Down Expand Up @@ -329,7 +329,7 @@ public static ExprEval ofStringArray(@Nullable Object[] stringValue)
}


public static ExprEval ofArray(ExpressionType outputType, Object[] value)
public static ExprEval ofArray(ExpressionType outputType, @Nullable Object[] value)
{
Preconditions.checkArgument(outputType.isArray(), "Output type %s is not an array", outputType);
return new ArrayExprEval(outputType, value);
Expand Down Expand Up @@ -398,7 +398,7 @@ public static ExprEval bestEffortOf(@Nullable Object val)
final Long[] inputArray = (Long[]) val;
final Object[] array = new Object[inputArray.length];
for (int i = 0; i < inputArray.length; i++) {
array[i] = inputArray[i];
array[i] = inputArray[i] != null ? inputArray[i] : NullHandling.defaultLongValue();
}
return new ArrayExprEval(ExpressionType.LONG_ARRAY, array);
}
Expand All @@ -414,7 +414,7 @@ public static ExprEval bestEffortOf(@Nullable Object val)
final Integer[] inputArray = (Integer[]) val;
final Object[] array = new Object[inputArray.length];
for (int i = 0; i < inputArray.length; i++) {
array[i] = inputArray[i] == null ? null : inputArray[i].longValue();
array[i] = inputArray[i] != null ? inputArray[i].longValue() : NullHandling.defaultLongValue();
}
return new ArrayExprEval(ExpressionType.LONG_ARRAY, array);
}
Expand All @@ -430,7 +430,7 @@ public static ExprEval bestEffortOf(@Nullable Object val)
final Double[] inputArray = (Double[]) val;
final Object[] array = new Object[inputArray.length];
for (int i = 0; i < inputArray.length; i++) {
array[i] = inputArray[i];
array[i] = inputArray[i] != null ? inputArray[i] : NullHandling.defaultDoubleValue();
}
return new ArrayExprEval(ExpressionType.DOUBLE_ARRAY, array);
}
Expand All @@ -446,7 +446,7 @@ public static ExprEval bestEffortOf(@Nullable Object val)
final Float[] inputArray = (Float[]) val;
final Object[] array = new Object[inputArray.length];
for (int i = 0; i < inputArray.length; i++) {
array[i] = inputArray[i] != null ? inputArray[i].doubleValue() : null;
array[i] = inputArray[i] != null ? inputArray[i].doubleValue() : NullHandling.defaultDoubleValue();
}
return new ArrayExprEval(ExpressionType.DOUBLE_ARRAY, array);
}
Expand Down Expand Up @@ -568,9 +568,28 @@ public static ExprEval ofType(@Nullable ExpressionType type, @Nullable Object va

return ofComplex(type, value);
case ARRAY:
// nested arrays, here be dragons... don't do any fancy coercion, assume everything is already sane types...
if (type.getElementType().isArray()) {
return ofArray(type, (Object[]) value);
ExpressionType elementType = (ExpressionType) type.getElementType();
if (value == null) {
return ofArray(type, null);
}
if (value instanceof List) {
List<?> theList = (List<?>) value;
Object[] array = new Object[theList.size()];
int i = 0;
for (Object o : theList) {
array[i++] = ExprEval.ofType(elementType, o).value();
}
return ofArray(type, array);
}

if (value instanceof Object[]) {
Object[] inputArray = (Object[]) value;
Object[] array = new Object[inputArray.length];
int i = 0;
for (Object o : inputArray) {
array[i++] = ExprEval.ofType(elementType, o).value();
}
return ofArray(type, array);
}
// in a better world, we might get an object that matches the type signature for arrays and could do a switch
// statement here, but this is not that world yet, and things that are array typed might also be non-arrays,
Expand Down Expand Up @@ -798,7 +817,7 @@ public final ExprEval castTo(ExpressionType castTo)
return ExprEval.ofStringArray(value == null ? null : new Object[] {value.toString()});
}
}
throw new IAE("invalid type " + castTo);
throw new IAE("invalid type cannot cast " + type() + " to " + castTo);
}

@Override
Expand Down Expand Up @@ -863,7 +882,7 @@ public final ExprEval castTo(ExpressionType castTo)
return ExprEval.ofStringArray(value == null ? null : new Object[] {value.toString()});
}
}
throw new IAE("invalid type " + castTo);
throw new IAE("invalid type cannot cast " + type() + " to " + castTo);
}

@Override
Expand Down Expand Up @@ -1032,7 +1051,7 @@ public final ExprEval castTo(ExpressionType castTo)
return ExprEval.ofStringArray(value == null ? null : new Object[] {value});
}
}
throw new IAE("invalid type " + castTo);
throw new IAE("invalid type cannot cast " + type() + " to " + castTo);
}

@Override
Expand Down Expand Up @@ -1221,7 +1240,7 @@ public ExprEval castTo(ExpressionType castTo)
return ExprEval.ofArray(castTo, cast);
}

throw new IAE("invalid type " + castTo);
throw new IAE("invalid type cannot cast " + type() + " to " + castTo);
}

@Override
Expand Down Expand Up @@ -1308,7 +1327,11 @@ public ExprEval castTo(ExpressionType castTo)
if (expressionType.equals(castTo)) {
return this;
}
throw new IAE("invalid type " + castTo);
// allow cast of unknown complex to some other complex type
if (expressionType.getComplexTypeName() == null) {
return new ComplexExprEval(castTo, value);
}
throw new IAE("invalid type cannot cast " + expressionType + " to " + castTo);
}

@Override
Expand Down
Loading