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

feat: Implement complex expressions for table functions #3683

Merged
merged 3 commits into from
Oct 29, 2019
Merged

feat: Implement complex expressions for table functions #3683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3502eed
feat: Support complex expressions in table functions
Oct 26, 2019
cb00779
chore: a coupleof tweaks
Oct 26, 2019
8f182e3
chore: tweak
Oct 29, 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
19 changes: 9 additions & 10 deletions ksql-engine/src/main/java/io/confluent/ksql/structured/SchemaKStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import com.google.common.collect.ImmutableList;
import io.confluent.ksql.engine.rewrite.StatementRewriteForRowtime;
import io.confluent.ksql.execution.builder.KsqlQueryBuilder;
import io.confluent.ksql.execution.codegen.CodeGenRunner;
import io.confluent.ksql.execution.codegen.ExpressionMetadata;
import io.confluent.ksql.execution.context.QueryContext;
import io.confluent.ksql.execution.context.QueryLoggerUtil;
import io.confluent.ksql.execution.ddl.commands.KsqlTopic;
Expand Down Expand Up @@ -75,7 +77,6 @@
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.OptionalInt;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.kafka.connect.data.Struct;
Expand Down Expand Up @@ -690,22 +691,20 @@ public SchemaKStream<K> flatMap(
final List<FunctionCall> tableFunctions,
final QueryContext.Stacker contextStacker
) {
final List<TableFunctionApplier> tableFunctionAppliers = new ArrayList<>();
final List<TableFunctionApplier> tableFunctionAppliers = new ArrayList<>(tableFunctions.size());
final CodeGenRunner codeGenRunner =
new CodeGenRunner(getSchema(), ksqlConfig, functionRegistry);
for (FunctionCall functionCall: tableFunctions) {
final ColumnReferenceExp exp = (ColumnReferenceExp)functionCall.getArguments().get(0);
final ColumnName columnName = exp.getReference().name();
final ColumnRef ref = ColumnRef.withoutSource(columnName);
final OptionalInt indexInInput = getSchema().valueColumnIndex(ref);
if (!indexInInput.isPresent()) {
throw new IllegalArgumentException("Can't find input column " + columnName);
}
final Expression expression = functionCall.getArguments().get(0);
final ExpressionMetadata expressionMetadata =
Copy link
Contributor

@agavra agavra Oct 28, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

I feel like this doesn't belong here - instead, we should be resolving all complex expressions before running the KudtfFlatMapper. This has a few benefits, the first is the performance benefit that I had mentioned earlier (we want to evaluate complex expressions once, not per every output row) and the second is that we're not treating arguments to UDTFs any differently than any other expression.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure I follow - this code is before the FlatMapper is run.

Copy link
Contributor

Choose a reason for hiding this comment

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

Talked offline, because this PR is blocking lots of others I'm going to let it through as is and come up with a more detailed ticket describing what I mean by the comment.

Copy link
Contributor

Choose a reason for hiding this comment

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

#3697

codeGenRunner.buildCodeGenFromParseTree(expression, "Table function");
final KsqlTableFunction tableFunction = UdtfUtil.resolveTableFunction(
functionRegistry,
functionCall,
getSchema()
);
final TableFunctionApplier tableFunctionApplier =
new TableFunctionApplier(tableFunction, indexInInput.getAsInt());
new TableFunctionApplier(tableFunction, expressionMetadata);
tableFunctionAppliers.add(tableFunctionApplier);
}
final StreamFlatMap<K> step = ExecutionStepFactory.streamFlatMap(
Expand Down
2 changes: 1 addition & 1 deletion ksql-execution/src/main/java/io/confluent/ksql/execution/function/udtf/KudtfFlatMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public KudtfFlatMapper(final List<TableFunctionApplier> tableFunctionAppliers) {

/*
This function zips results from multiple table functions together as described in KLIP-9
in the design-proposals directory
in the design-proposals directory.
*/
@Override
public Iterable<GenericRow> apply(final GenericRow row) {
Expand Down
12 changes: 7 additions & 5 deletions ...ecution/src/main/java/io/confluent/ksql/execution/function/udtf/TableFunctionApplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import com.google.errorprone.annotations.Immutable;
import io.confluent.ksql.GenericRow;
import io.confluent.ksql.execution.codegen.ExpressionMetadata;
import io.confluent.ksql.function.KsqlTableFunction;
import java.util.List;
import java.util.Objects;
Expand All @@ -26,16 +27,17 @@
@Immutable
public class TableFunctionApplier {
private final KsqlTableFunction tableFunction;
private final int argColumnIndex;
private final ExpressionMetadata expressionMetadata;

public TableFunctionApplier(final KsqlTableFunction tableFunction, final int argColumnIndex) {
public TableFunctionApplier(final KsqlTableFunction tableFunction,
final ExpressionMetadata expressionMetadata) {
this.tableFunction = Objects.requireNonNull(tableFunction);
this.argColumnIndex = argColumnIndex;
this.expressionMetadata = Objects.requireNonNull(expressionMetadata);
}

@SuppressWarnings("unchecked")
List<Object> apply(final GenericRow row) {
final List<Object> unexplodedValue = row.getColumnValue(argColumnIndex);
return tableFunction.flatMap(unexplodedValue);
final Object unexplodedVal = expressionMetadata.evaluate(row);
return tableFunction.flatMap(unexplodedVal);
}
}
15 changes: 15 additions & 0 deletions ksql-functional-tests/src/test/resources/query-validation-tests/table-functions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,21 @@
{"topic": "OUTPUT", "key": "1", "value": {"KSQL_COL_0": 3, "KSQL_COL_1": 20}},
{"topic": "OUTPUT", "key": "1", "value": {"KSQL_COL_0": 4, "KSQL_COL_1": null}}
]
},
{
"name": "table functions with complex expressions",
"statements": [
"CREATE STREAM TEST (F0 INT, F1 INT, F2 INT, F3 INT) WITH (kafka_topic='test_topic', value_format='JSON');",
"CREATE STREAM OUTPUT AS SELECT F0, EXPLODE(AS_ARRAY(ABS(F1 + F2), ABS(F2 + F3), ABS(F3 + F1))) FROM TEST;"
],
"inputs": [
{"topic": "test_topic", "key": 0, "value": {"ID": 0, "F0": 1, "F1": 10, "F2": 11, "F3": 12}}
],
"outputs": [
{"topic": "OUTPUT", "key": "0", "value": {"F0": 1, "KSQL_COL_1": 21.0}},
{"topic": "OUTPUT", "key": "0", "value": {"F0": 1, "KSQL_COL_1": 23.0}},
{"topic": "OUTPUT", "key": "0", "value": {"F0": 1, "KSQL_COL_1": 22.0}}
]
}
]
}