Skip to content

optimize single input column multi-value expressions #8047

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
gianm merged 12 commits into from
Aug 2, 2019
Merged

optimize single input column multi-value expressions #8047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0b22a31
optimize single input column multi-value expressions
clintropolis Jul 9, 2019
102b23f
javadocs
clintropolis Jul 9, 2019
3c5a3bf
Merge remote-tracking branch 'upstream/master' into expr-array-output
clintropolis Jul 12, 2019
d310894
merge fixup
clintropolis Jul 12, 2019
9f95ca3
vectorization fixup
clintropolis Jul 13, 2019
e7605fc
more fixes
clintropolis Jul 15, 2019
cf9e095
more docs
clintropolis Aug 1, 2019
a49ad4f
more links
clintropolis Aug 1, 2019
b8cedc8
empty
clintropolis Aug 1, 2019
c4d03c4
javadocs are hard
clintropolis Aug 1, 2019
2fea2ec
suppress javadoc refs issue
clintropolis Aug 1, 2019
346fb33
fix it
clintropolis Aug 2, 2019
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
31 changes: 31 additions & 0 deletions core/src/main/java/org/apache/druid/math/expr/ApplyFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,18 @@ public interface ApplyFunction
*/
Set<Expr> getArrayInputs(List<Expr> args);

/**
* Returns true if apply function produces an array output. All {@link ApplyFunction} implementations are expected to
* exclusively produce either scalar or array values.
*/
default boolean hasArrayOutput(LambdaExpr lambdaExpr)
{
return false;
Copy link
Copy Markdown
Contributor

@gianm gianm Jul 31, 2019

Choose a reason for hiding this comment

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

What if a function might sometimes return an array and might sometimes return a scalar? Is that:

  • Not allowed (functions should not differ in their return types in this way)
  • Allowed, and hasArrayOutput should be true
  • Allowed, and hasArrayOutput should be false

Please adjust the javadocs appropriately.

Copy link
Copy Markdown
Member Author

@clintropolis clintropolis Aug 1, 2019

Choose a reason for hiding this comment

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

This should not be allowed imo, but I think we'll have to discuss this further when we get around to adding full type inference to the expression system. I will adjust the javadoc to state it should not be done currently.

}

/**
* Validate apply function arguments, throwing an exception if incorrect
*/
void validateArguments(LambdaExpr lambdaExpr, List<Expr> args);

/**
Expand All @@ -69,6 +81,12 @@ public interface ApplyFunction
*/
abstract class BaseMapFunction implements ApplyFunction
{
@Override
public boolean hasArrayOutput(LambdaExpr lambdaExpr)
{
return true;
}

/**
* Evaluate {@link LambdaExpr} against every index position of an {@link IndexableMapLambdaObjectBinding}
*/
Expand Down Expand Up @@ -260,6 +278,13 @@ ExprEval applyFold(LambdaExpr lambdaExpr, Object accumulator, IndexableFoldLambd
}
return ExprEval.bestEffortOf(accumulator);
}

@Override
public boolean hasArrayOutput(LambdaExpr lambdaExpr)
{
Expr.BindingDetails lambdaBindingDetails = lambdaExpr.analyzeInputs();
return lambdaBindingDetails.isOutputArray();
}
}

/**
Expand Down Expand Up @@ -397,6 +422,12 @@ public String name()
return NAME;
}

@Override
public boolean hasArrayOutput(LambdaExpr lambdaExpr)
{
return true;
}

@Override
public ExprEval apply(LambdaExpr lambdaExpr, List<Expr> argsExpr, Expr.ObjectBinding bindings)
{
Expand Down
Loading