Skip to content

[FLINK-12831][table-planner][table-api-java] Split FunctionCatalog into Flink & Calcite specific parts #8729

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

Jump to bottom
Closed
dawidwys wants to merge 2 commits into from
Closed

[FLINK-12831][table-planner][table-api-java] Split FunctionCatalog into Flink & Calcite specific parts #8729

dawidwys wants to merge 2 commits into from

Conversation

@dawidwys
Copy link
Contributor

@dawidwys dawidwys commented Jun 13, 2019

What is the purpose of the change

This PR splits FunctionCatalog into Flink and Calcite specific parts. This is a necessary step to move the TableEnvironment to api module.

Brief change log

  • ported functions to validate & extract types from user function (ported from UserDefinedFunctionUtils)
  • ported & moved FunctionCatalog to api-java module
  • Introduced org.apache.flink.table.catalog.CatalogOperatorTable as a thin adapter between FunctionCatalog & SqlOperatorTable

Verifying this change

This change is already covered by existing tests.

Does this pull request potentially affect one of the following parts:

  • Dependencies (does it add or upgrade a dependency): (yes / no)
  • The public API, i.e., is any changed class annotated with @Public(Evolving): (yes / no)
  • The serializers: (yes / no / don't know)
  • The runtime per-record code paths (performance sensitive): (yes / no / don't know)
  • Anything that affects deployment or recovery: JobManager (and its components), Checkpointing, Yarn/Mesos, ZooKeeper: (yes / no / don't know)
  • The S3 file system connector: (yes / no / don't know)

Documentation

  • Does this pull request introduce a new feature? (yes / no)
  • If yes, how is the feature documented? (not applicable / docs / JavaDocs / not documented)

@dawidwys dawidwys requested a review from aljoscha June 13, 2019 11:05
@flinkbot
Copy link
Collaborator

flinkbot commented Jun 13, 2019

Thanks a lot for your contribution to the Apache Flink project. I'm the @flinkbot. I help the community
to review your pull request. We will use this comment to track the progress of the review.

Review Progress

  • ❓ 1. The [description] looks good.
  • ❓ 2. There is [consensus] that the contribution should go into to Flink.
  • ❓ 3. Needs [attention] from.
  • ❓ 4. The change fits into the overall [architecture].
  • ❓ 5. Overall code [quality] is good.

Please see the Pull Request Review Guide for a full explanation of the review process.

Details
The Bot is tracking the review progress through labels. Labels are applied according to the order of the review items. For consensus, approval by a Flink committer of PMC member is required Bot commands
The @flinkbot bot supports the following commands:

  • @flinkbot approve description to approve one or more aspects (aspects: description, consensus, architecture and quality)
  • @flinkbot approve all to approve all aspects
  • @flinkbot approve-until architecture to approve everything until architecture
  • @flinkbot attention @username1 [@username2 ..] to require somebody's attention
  • @flinkbot disapprove architecture to remove an approval you gave earlier

@dawidwys dawidwys force-pushed the split-function-catalog branch from 3bfae35 to 2fec3d8 Compare June 13, 2019 11:18
@dawidwys dawidwys force-pushed the split-function-catalog branch 2 times, most recently from 2c87a9c to d0d7c5f Compare June 13, 2019 14:45
aljoscha
aljoscha approved these changes Jun 13, 2019
View reviewed changes
Copy link
Contributor

@aljoscha aljoscha left a comment

Choose a reason for hiding this comment

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

Looks good to merge! It's pretty neat now that the user-function catalog and the calcite catalog are separate. Makes me wonder why it wasn't like this before. 😅

...k-table-api-java/src/main/java/org/apache/flink/table/functions/UserFunctionsTypeHelper.java Outdated
if (Arrays.stream(clazz.getFields()).anyMatch(f -> f.getName().equals("MODULE$"))) {
throw new ValidationException(String.format(
"TableFunction implemented by class %s " +
"is a Scala object, it is forbidden since concurrent risks.", clazz.getCanonicalName()));
Copy link
Contributor

@aljoscha aljoscha Jun 13, 2019

Choose a reason for hiding this comment

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

I know it's not in the scope of the PR but this should be this is forbidden because of concurrency problems when using them. Or something like it.

...e/flink-table-planner/src/main/java/org/apache/flink/table/catalog/CatalogOperatorTable.java Outdated
* Thin adapter between {@link SqlOperatorTable} and {@link FunctionCatalog}.
*/
@Internal
public class CatalogOperatorTable implements SqlOperatorTable {
Copy link
Contributor

@aljoscha aljoscha Jun 13, 2019

Choose a reason for hiding this comment

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

I think I don't really have a better name but maybe making it obvious that this is a bridge or adapter would be useful.

Copy link
Contributor Author

@dawidwys dawidwys Jun 13, 2019

Choose a reason for hiding this comment

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

This sort of inline with naming of similar pattern for CatalogManagerCalciteSchema which bridges/adapts between CatalogManager & Calcite's Schema.

@dawidwys dawidwys force-pushed the split-function-catalog branch from d0d7c5f to e22c695 Compare June 13, 2019 15:31
@dawidwys dawidwys force-pushed the split-function-catalog branch from 9627db7 to 24bd894 Compare June 13, 2019 16:04
docete
docete reviewed Jun 14, 2019
View reviewed changes
...table-planner/src/main/java/org/apache/flink/table/catalog/FunctionCatalogOperatorTable.java
).ifPresent(operatorList::add);
}

private boolean isUserFunction(SqlFunctionCategory category) {
Copy link
Contributor

@docete docete Jun 14, 2019

Choose a reason for hiding this comment

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

Use 'isNotUserFunction' for more clear and less misleading

Copy link
Contributor Author

@dawidwys dawidwys Jun 14, 2019

Choose a reason for hiding this comment

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

Good catch! Thank you!

@dawidwys dawidwys closed this in 51724b7 Jun 14, 2019
sjwiesman pushed a commit to sjwiesman/flink that referenced this pull request Jun 26, 2019
@dawidwys @sjwiesman
[FLINK-12831][table-planner][table-api-java] Split FunctionCatalog in…
98a0147 
…to Flink & Calcite specific parts

This closes apache#8729
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@aljoscha aljoscha aljoscha approved these changes

+1 more reviewer

@docete docete docete left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

component=TableSQL/API component=TableSQL/LegacyPlanner review=description?

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@dawidwys @flinkbot @docete @aljoscha @rmetzger