You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@flink.apache.org by GitBox <gi...@apache.org> on 2022/04/24 11:47:40 UTC
[GitHub] [flink] luoyuxia opened a new pull request, #19561: [FLINK-26366][hive] Hive dialect supports macro
luoyuxia opened a new pull request, #19561:
URL: https://github.com/apache/flink/pull/19561
<!--
*Thank you very much for contributing to Apache Flink - we are happy that you want to help us improve Flink. To help the community review your contribution in the best possible way, please go through the checklist below, which will get the contribution into a shape in which it can be best reviewed.*
*Please understand that we do not do this to make contributions to Flink a hassle. In order to uphold a high standard of quality for code contributions, while at the same time managing a large number of contributions, we need contributors to prepare the contributions well, and give reviewers enough contextual information for the review. Please also understand that contributions that do not follow this guide will take longer to review and thus typically be picked up with lower priority by the community.*
## Contribution Checklist
- Make sure that the pull request corresponds to a [JIRA issue](https://issues.apache.org/jira/projects/FLINK/issues). Exceptions are made for typos in JavaDoc or documentation files, which need no JIRA issue.
- Name the pull request in the form "[FLINK-XXXX] [component] Title of the pull request", where *FLINK-XXXX* should be replaced by the actual issue number. Skip *component* if you are unsure about which is the best component.
Typo fixes that have no associated JIRA issue should be named following this pattern: `[hotfix] [docs] Fix typo in event time introduction` or `[hotfix] [javadocs] Expand JavaDoc for PuncuatedWatermarkGenerator`.
- Fill out the template below to describe the changes contributed by the pull request. That will give reviewers the context they need to do the review.
- Make sure that the change passes the automated tests, i.e., `mvn clean verify` passes. You can set up Azure Pipelines CI to do that following [this guide](https://cwiki.apache.org/confluence/display/FLINK/Azure+Pipelines#AzurePipelines-Tutorial:SettingupAzurePipelinesforaforkoftheFlinkrepository).
- Each pull request should address only one issue, not mix up code from multiple issues.
- Each commit in the pull request has a meaningful commit message (including the JIRA id)
- Once all items of the checklist are addressed, remove the above text and this checklist, leaving only the filled out template below.
**(The sections below can be removed for hotfixes of typos)**
-->
## What is the purpose of the change
*(For example: This pull request makes task deployment go through the blob server, rather than through RPC. That way we avoid re-transferring them on each deployment (during recovery).)*
## Brief change log
*(for example:)*
- *The TaskInfo is stored in the blob store on job creation time as a persistent artifact*
- *Deployments RPC transmits only the blob storage reference*
- *TaskManagers retrieve the TaskInfo from the blob cache*
## Verifying this change
Please make sure both new and modified tests in this PR follows the conventions defined in our code quality guide: https://flink.apache.org/contributing/code-style-and-quality-common.html#testing
*(Please pick either of the following options)*
This change is a trivial rework / code cleanup without any test coverage.
*(or)*
This change is already covered by existing tests, such as *(please describe tests)*.
*(or)*
This change added tests and can be verified as follows:
*(example:)*
- *Added integration tests for end-to-end deployment with large payloads (100MB)*
- *Extended integration test for recovery after master (JobManager) failure*
- *Added test that validates that TaskInfo is transferred only once across recoveries*
- *Manually verified the change by running a 4 node cluster with 2 JobManagers and 4 TaskManagers, a stateful streaming program, and killing one JobManager and two TaskManagers during the execution, verifying that recovery happens correctly.*
## 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, Kubernetes/Yarn, 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)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] lsyldliu commented on a diff in pull request #19561: [FLINK-26414][hive] Hive dialect supports macro
Posted by GitBox <gi...@apache.org>.
lsyldliu commented on code in PR #19561:
URL: https://github.com/apache/flink/pull/19561#discussion_r890126279
##########
flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/table/planner/delegation/hive/HiveASTParserTest.java:
##########
@@ -139,6 +139,13 @@ public void testFunction() throws Exception {
assertDDLType(HiveASTParser.TOK_SHOWFUNCTIONS, "show functions");
}
+ @Test
+ public void testMacro() throws Exception {
Review Comment:
It will be better if we add a test that create a mcro with qualified name
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java:
##########
@@ -506,6 +532,106 @@ private Operation convertCreateFunction(HiveParserASTNode ast) {
}
}
+ private Operation convertCreateMacro(HiveParserASTNode ast) throws SemanticException {
+ String macroName = ast.getChild(0).getText();
+ if (FunctionUtils.isQualifiedFunctionName(macroName)) {
+ throw new SemanticException("Temporary macro cannot be created with a qualified name.");
Review Comment:
According to the method `FunctionUtils.isQualifiedFunctionName`, this error message may be not cleared for user? so I think we can improve it.
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/functions/hive/HiveFunctionWrapper.java:
##########
@@ -36,23 +38,48 @@
public static final long serialVersionUID = 393313529306818205L;
private final String className;
+ // a field to hold the string serialized for the UDF.
+ // we sometimes need to hold it in case of some serializable UDF will contain
+ // additional information such as Hive's GenericUDFMacro and if we construct the UDF directly by
+ // getUDFClass#newInstance, the information will be missed.
+ private String udfSerializedString;
private transient UDFType instance = null;
public HiveFunctionWrapper(String className) {
this.className = className;
}
+ /**
+ * Create a HiveFunctionWrapper with a UDF instance. In this constructor, the instance will be
+ * serialized to string and held on in the HiveFunctionWrapper.
+ */
+ public HiveFunctionWrapper(String className, UDFType serializableInstance) {
+ this.className = className;
Review Comment:
we can call it directly `this(className);`
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java:
##########
@@ -506,6 +532,106 @@ private Operation convertCreateFunction(HiveParserASTNode ast) {
}
}
+ private Operation convertCreateMacro(HiveParserASTNode ast) throws SemanticException {
+ String macroName = ast.getChild(0).getText();
+ if (FunctionUtils.isQualifiedFunctionName(macroName)) {
+ throw new SemanticException("Temporary macro cannot be created with a qualified name.");
+ }
+
+ List<FieldSchema> arguments = getColumns((HiveParserASTNode) ast.getChild(1), true);
Review Comment:
The `arguments ` readability is not good? IMO, it refers the all columns of the table? In other words, we should add an annotation about it.
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/functions/hive/HiveFunctionWrapper.java:
##########
@@ -88,4 +115,20 @@ public String getClassName() {
public Class<UDFType> getUDFClass() throws ClassNotFoundException {
return (Class<UDFType>) Thread.currentThread().getContextClassLoader().loadClass(className);
}
+
+ /**
+ * Deserialize UDF used the udfSerializedString held on.
+ *
+ * @return the UDF deserialized
+ */
+ private UDFType deserializeUDF() {
+ try {
+ return (UDFType)
+ SerializationUtilities.deserializeObject(
+ udfSerializedString, (Class<Serializable>) getUDFClass());
+ } catch (ClassNotFoundException e) {
+ throw new FlinkHiveUDFException(
+ String.format("Failed to deserialize function %s", className), e);
+ }
Review Comment:
"Failed to deserialize function %s."
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java:
##########
@@ -506,6 +532,106 @@ private Operation convertCreateFunction(HiveParserASTNode ast) {
}
}
+ private Operation convertCreateMacro(HiveParserASTNode ast) throws SemanticException {
+ String macroName = ast.getChild(0).getText();
+ if (FunctionUtils.isQualifiedFunctionName(macroName)) {
+ throw new SemanticException("Temporary macro cannot be created with a qualified name.");
+ }
+
+ List<FieldSchema> arguments = getColumns((HiveParserASTNode) ast.getChild(1), true);
+ Set<String> actualColumnNames = getActualColumnNames(ast, arguments);
+
+ HiveParserRowResolver rowResolver = new HiveParserRowResolver();
+ List<String> macroColumnNames = new ArrayList<>();
+ List<TypeInfo> macroColumnTypes = new ArrayList<>();
+ getMacroColumnData(
+ arguments, actualColumnNames, rowResolver, macroColumnNames, macroColumnTypes);
+ ExprNodeDesc body = getBody(ast, arguments, rowResolver);
+
+ GenericUDFMacro macro =
+ new GenericUDFMacro(macroName, body, macroColumnNames, macroColumnTypes);
+
+ FunctionDefinition macroDefinition =
+ new HiveGenericUDF(
+ new HiveFunctionWrapper<>(GenericUDFMacro.class.getName(), macro),
+ hiveShim);
+ // hive's marco is more like flink's temp system function
+ return new CreateTempSystemFunctionOperation(macroName, false, macroDefinition);
+ }
+
+ private Set<String> getActualColumnNames(HiveParserASTNode ast, List<FieldSchema> arguments)
+ throws SemanticException {
+ final Set<String> actualColumnNames = new HashSet<>();
+
+ if (!arguments.isEmpty()) {
+ // Walk down expression to see which arguments are actually used.
+ Node expression = (Node) ast.getChild(2);
+
+ PreOrderWalker walker =
+ new PreOrderWalker(
+ (nd, stack, nodeOutputs) -> {
+ if (nd instanceof HiveParserASTNode) {
+ HiveParserASTNode node = (HiveParserASTNode) nd;
+ if (node.getType() == HiveASTParser.TOK_TABLE_OR_COL) {
+ actualColumnNames.add(node.getChild(0).getText());
+ }
+ }
+ return null;
+ });
+ walker.startWalking(Collections.singleton(expression), null);
+ }
+ return actualColumnNames;
+ }
+
+ private void getMacroColumnData(
+ List<FieldSchema> arguments,
+ Set<String> actualColumnNames,
+ HiveParserRowResolver rowResolver,
+ List<String> macroColumnNames,
+ List<TypeInfo> macroColumnTypes)
+ throws SemanticException {
+ for (FieldSchema argument : arguments) {
+ TypeInfo columnType = TypeInfoUtils.getTypeInfoFromTypeString(argument.getType());
+ rowResolver.put(
+ "",
+ argument.getName(),
+ new ColumnInfo(argument.getName(), columnType, "", false));
+ macroColumnNames.add(argument.getName());
+ macroColumnTypes.add(columnType);
+ }
+ Set<String> expectedColumnNames = new LinkedHashSet<>(macroColumnNames);
+ if (!expectedColumnNames.equals(actualColumnNames)) {
+ throw new SemanticException(
+ "Expected columns " + expectedColumnNames + " but found " + actualColumnNames);
+ }
+ if (expectedColumnNames.size() != macroColumnNames.size()) {
Review Comment:
What about `expectedColumnNames.size() > macroColumnNames.size()` or `expectedColumnNames.size() < macroColumnNames.size()` case, whether the error message is the same?
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java:
##########
@@ -506,6 +532,106 @@ private Operation convertCreateFunction(HiveParserASTNode ast) {
}
}
+ private Operation convertCreateMacro(HiveParserASTNode ast) throws SemanticException {
+ String macroName = ast.getChild(0).getText();
+ if (FunctionUtils.isQualifiedFunctionName(macroName)) {
+ throw new SemanticException("Temporary macro cannot be created with a qualified name.");
+ }
+
+ List<FieldSchema> arguments = getColumns((HiveParserASTNode) ast.getChild(1), true);
+ Set<String> actualColumnNames = getActualColumnNames(ast, arguments);
+
+ HiveParserRowResolver rowResolver = new HiveParserRowResolver();
+ List<String> macroColumnNames = new ArrayList<>();
+ List<TypeInfo> macroColumnTypes = new ArrayList<>();
+ getMacroColumnData(
+ arguments, actualColumnNames, rowResolver, macroColumnNames, macroColumnTypes);
+ ExprNodeDesc body = getBody(ast, arguments, rowResolver);
+
+ GenericUDFMacro macro =
+ new GenericUDFMacro(macroName, body, macroColumnNames, macroColumnTypes);
+
+ FunctionDefinition macroDefinition =
+ new HiveGenericUDF(
+ new HiveFunctionWrapper<>(GenericUDFMacro.class.getName(), macro),
+ hiveShim);
+ // hive's marco is more like flink's temp system function
+ return new CreateTempSystemFunctionOperation(macroName, false, macroDefinition);
+ }
+
+ private Set<String> getActualColumnNames(HiveParserASTNode ast, List<FieldSchema> arguments)
+ throws SemanticException {
+ final Set<String> actualColumnNames = new HashSet<>();
+
+ if (!arguments.isEmpty()) {
+ // Walk down expression to see which arguments are actually used.
+ Node expression = (Node) ast.getChild(2);
+
+ PreOrderWalker walker =
+ new PreOrderWalker(
+ (nd, stack, nodeOutputs) -> {
+ if (nd instanceof HiveParserASTNode) {
+ HiveParserASTNode node = (HiveParserASTNode) nd;
+ if (node.getType() == HiveASTParser.TOK_TABLE_OR_COL) {
+ actualColumnNames.add(node.getChild(0).getText());
+ }
+ }
+ return null;
+ });
+ walker.startWalking(Collections.singleton(expression), null);
+ }
+ return actualColumnNames;
+ }
+
+ private void getMacroColumnData(
+ List<FieldSchema> arguments,
+ Set<String> actualColumnNames,
+ HiveParserRowResolver rowResolver,
+ List<String> macroColumnNames,
+ List<TypeInfo> macroColumnTypes)
+ throws SemanticException {
+ for (FieldSchema argument : arguments) {
+ TypeInfo columnType = TypeInfoUtils.getTypeInfoFromTypeString(argument.getType());
+ rowResolver.put(
+ "",
+ argument.getName(),
+ new ColumnInfo(argument.getName(), columnType, "", false));
Review Comment:
As above
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java:
##########
@@ -506,6 +532,106 @@ private Operation convertCreateFunction(HiveParserASTNode ast) {
}
}
+ private Operation convertCreateMacro(HiveParserASTNode ast) throws SemanticException {
+ String macroName = ast.getChild(0).getText();
+ if (FunctionUtils.isQualifiedFunctionName(macroName)) {
+ throw new SemanticException("Temporary macro cannot be created with a qualified name.");
+ }
+
+ List<FieldSchema> arguments = getColumns((HiveParserASTNode) ast.getChild(1), true);
+ Set<String> actualColumnNames = getActualColumnNames(ast, arguments);
+
+ HiveParserRowResolver rowResolver = new HiveParserRowResolver();
+ List<String> macroColumnNames = new ArrayList<>();
+ List<TypeInfo> macroColumnTypes = new ArrayList<>();
+ getMacroColumnData(
+ arguments, actualColumnNames, rowResolver, macroColumnNames, macroColumnTypes);
+ ExprNodeDesc body = getBody(ast, arguments, rowResolver);
+
+ GenericUDFMacro macro =
+ new GenericUDFMacro(macroName, body, macroColumnNames, macroColumnTypes);
+
+ FunctionDefinition macroDefinition =
+ new HiveGenericUDF(
+ new HiveFunctionWrapper<>(GenericUDFMacro.class.getName(), macro),
+ hiveShim);
+ // hive's marco is more like flink's temp system function
+ return new CreateTempSystemFunctionOperation(macroName, false, macroDefinition);
+ }
+
+ private Set<String> getActualColumnNames(HiveParserASTNode ast, List<FieldSchema> arguments)
+ throws SemanticException {
+ final Set<String> actualColumnNames = new HashSet<>();
+
+ if (!arguments.isEmpty()) {
+ // Walk down expression to see which arguments are actually used.
+ Node expression = (Node) ast.getChild(2);
+
+ PreOrderWalker walker =
+ new PreOrderWalker(
+ (nd, stack, nodeOutputs) -> {
+ if (nd instanceof HiveParserASTNode) {
+ HiveParserASTNode node = (HiveParserASTNode) nd;
+ if (node.getType() == HiveASTParser.TOK_TABLE_OR_COL) {
+ actualColumnNames.add(node.getChild(0).getText());
+ }
+ }
+ return null;
+ });
+ walker.startWalking(Collections.singleton(expression), null);
+ }
+ return actualColumnNames;
+ }
+
+ private void getMacroColumnData(
+ List<FieldSchema> arguments,
+ Set<String> actualColumnNames,
+ HiveParserRowResolver rowResolver,
+ List<String> macroColumnNames,
+ List<TypeInfo> macroColumnTypes)
+ throws SemanticException {
+ for (FieldSchema argument : arguments) {
+ TypeInfo columnType = TypeInfoUtils.getTypeInfoFromTypeString(argument.getType());
+ rowResolver.put(
+ "",
Review Comment:
org.apache.commons.lang3.StringUtils.EMPTY?
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java:
##########
@@ -506,6 +532,106 @@ private Operation convertCreateFunction(HiveParserASTNode ast) {
}
}
+ private Operation convertCreateMacro(HiveParserASTNode ast) throws SemanticException {
+ String macroName = ast.getChild(0).getText();
+ if (FunctionUtils.isQualifiedFunctionName(macroName)) {
+ throw new SemanticException("Temporary macro cannot be created with a qualified name.");
+ }
+
+ List<FieldSchema> arguments = getColumns((HiveParserASTNode) ast.getChild(1), true);
+ Set<String> actualColumnNames = getActualColumnNames(ast, arguments);
+
+ HiveParserRowResolver rowResolver = new HiveParserRowResolver();
+ List<String> macroColumnNames = new ArrayList<>();
+ List<TypeInfo> macroColumnTypes = new ArrayList<>();
+ getMacroColumnData(
+ arguments, actualColumnNames, rowResolver, macroColumnNames, macroColumnTypes);
+ ExprNodeDesc body = getBody(ast, arguments, rowResolver);
+
+ GenericUDFMacro macro =
+ new GenericUDFMacro(macroName, body, macroColumnNames, macroColumnTypes);
+
+ FunctionDefinition macroDefinition =
+ new HiveGenericUDF(
+ new HiveFunctionWrapper<>(GenericUDFMacro.class.getName(), macro),
+ hiveShim);
+ // hive's marco is more like flink's temp system function
+ return new CreateTempSystemFunctionOperation(macroName, false, macroDefinition);
+ }
+
+ private Set<String> getActualColumnNames(HiveParserASTNode ast, List<FieldSchema> arguments)
+ throws SemanticException {
+ final Set<String> actualColumnNames = new HashSet<>();
+
+ if (!arguments.isEmpty()) {
+ // Walk down expression to see which arguments are actually used.
+ Node expression = (Node) ast.getChild(2);
+
+ PreOrderWalker walker =
+ new PreOrderWalker(
+ (nd, stack, nodeOutputs) -> {
+ if (nd instanceof HiveParserASTNode) {
+ HiveParserASTNode node = (HiveParserASTNode) nd;
+ if (node.getType() == HiveASTParser.TOK_TABLE_OR_COL) {
+ actualColumnNames.add(node.getChild(0).getText());
+ }
+ }
+ return null;
+ });
+ walker.startWalking(Collections.singleton(expression), null);
+ }
+ return actualColumnNames;
+ }
+
+ private void getMacroColumnData(
Review Comment:
We can return a Tuple2 here directly? BTW, maybe we can merge the method `getMacroColumnData` and `getBody` into one, then return a Tuple3?
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java:
##########
@@ -506,6 +532,106 @@ private Operation convertCreateFunction(HiveParserASTNode ast) {
}
}
+ private Operation convertCreateMacro(HiveParserASTNode ast) throws SemanticException {
+ String macroName = ast.getChild(0).getText();
+ if (FunctionUtils.isQualifiedFunctionName(macroName)) {
+ throw new SemanticException("Temporary macro cannot be created with a qualified name.");
+ }
+
+ List<FieldSchema> arguments = getColumns((HiveParserASTNode) ast.getChild(1), true);
+ Set<String> actualColumnNames = getActualColumnNames(ast, arguments);
+
+ HiveParserRowResolver rowResolver = new HiveParserRowResolver();
+ List<String> macroColumnNames = new ArrayList<>();
+ List<TypeInfo> macroColumnTypes = new ArrayList<>();
+ getMacroColumnData(
+ arguments, actualColumnNames, rowResolver, macroColumnNames, macroColumnTypes);
+ ExprNodeDesc body = getBody(ast, arguments, rowResolver);
+
+ GenericUDFMacro macro =
+ new GenericUDFMacro(macroName, body, macroColumnNames, macroColumnTypes);
+
+ FunctionDefinition macroDefinition =
+ new HiveGenericUDF(
+ new HiveFunctionWrapper<>(GenericUDFMacro.class.getName(), macro),
+ hiveShim);
+ // hive's marco is more like flink's temp system function
+ return new CreateTempSystemFunctionOperation(macroName, false, macroDefinition);
+ }
+
+ private Set<String> getActualColumnNames(HiveParserASTNode ast, List<FieldSchema> arguments)
+ throws SemanticException {
+ final Set<String> actualColumnNames = new HashSet<>();
+
+ if (!arguments.isEmpty()) {
+ // Walk down expression to see which arguments are actually used.
+ Node expression = (Node) ast.getChild(2);
+
+ PreOrderWalker walker =
+ new PreOrderWalker(
+ (nd, stack, nodeOutputs) -> {
+ if (nd instanceof HiveParserASTNode) {
+ HiveParserASTNode node = (HiveParserASTNode) nd;
+ if (node.getType() == HiveASTParser.TOK_TABLE_OR_COL) {
+ actualColumnNames.add(node.getChild(0).getText());
+ }
+ }
+ return null;
+ });
+ walker.startWalking(Collections.singleton(expression), null);
+ }
+ return actualColumnNames;
+ }
+
+ private void getMacroColumnData(
+ List<FieldSchema> arguments,
+ Set<String> actualColumnNames,
+ HiveParserRowResolver rowResolver,
+ List<String> macroColumnNames,
+ List<TypeInfo> macroColumnTypes)
+ throws SemanticException {
+ for (FieldSchema argument : arguments) {
+ TypeInfo columnType = TypeInfoUtils.getTypeInfoFromTypeString(argument.getType());
+ rowResolver.put(
+ "",
+ argument.getName(),
+ new ColumnInfo(argument.getName(), columnType, "", false));
+ macroColumnNames.add(argument.getName());
+ macroColumnTypes.add(columnType);
+ }
+ Set<String> expectedColumnNames = new LinkedHashSet<>(macroColumnNames);
+ if (!expectedColumnNames.equals(actualColumnNames)) {
+ throw new SemanticException(
Review Comment:
String.format("Expected columns [%s], but found [%s].", expectedColumnNames, actualColumnNames) here ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] luoyuxia commented on a diff in pull request #19561: [FLINK-26414][hive] Hive dialect supports macro
Posted by GitBox <gi...@apache.org>.
luoyuxia commented on code in PR #19561:
URL: https://github.com/apache/flink/pull/19561#discussion_r914822644
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java:
##########
@@ -506,6 +533,109 @@ private Operation convertCreateFunction(HiveParserASTNode ast) {
}
}
+ private Operation convertCreateMacro(HiveParserASTNode ast) throws SemanticException {
+ String macroName = ast.getChild(0).getText();
+ if (FunctionUtils.isQualifiedFunctionName(macroName)) {
+ throw new SemanticException("The name of the temporary macro can't contain `.`.");
Review Comment:
I add the test for the exception in [HiveDialectITCase#testMacro](https://github.com/apache/flink/pull/19561/files#diff-748a9fa63f15b3bd3ea5426a5b42179cadee77ecf3359c83f846aedb27d96871R821) just now.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] wuchong merged pull request #19561: [FLINK-26414][hive] Hive dialect supports macro
Posted by GitBox <gi...@apache.org>.
wuchong merged PR #19561:
URL: https://github.com/apache/flink/pull/19561
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] flinkbot commented on pull request #19561: [FLINK-26414][hive] Hive dialect supports macro
Posted by GitBox <gi...@apache.org>.
flinkbot commented on PR #19561:
URL: https://github.com/apache/flink/pull/19561#issuecomment-1107825394
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "7985784d00c4447f241e7f9b1364ef0c76a91fd7",
"status" : "UNKNOWN",
"url" : "TBD",
"triggerID" : "7985784d00c4447f241e7f9b1364ef0c76a91fd7",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* 7985784d00c4447f241e7f9b1364ef0c76a91fd7 UNKNOWN
<details>
<summary>Bot commands</summary>
The @flinkbot bot supports the following commands:
- `@flinkbot run azure` re-run the last Azure build
</details>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] luoyuxia commented on pull request #19561: [FLINK-26414][hive] Hive dialect supports macro
Posted by GitBox <gi...@apache.org>.
luoyuxia commented on PR #19561:
URL: https://github.com/apache/flink/pull/19561#issuecomment-1158855773
@flinkbot run azure
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] luoyuxia commented on pull request #19561: [FLINK-26414][hive] Hive dialect supports macro
Posted by GitBox <gi...@apache.org>.
luoyuxia commented on PR #19561:
URL: https://github.com/apache/flink/pull/19561#issuecomment-1149673443
@lsyldliu Thanks for your review. I have adrressed your comments.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] wuchong commented on a diff in pull request #19561: [FLINK-26414][hive] Hive dialect supports macro
Posted by GitBox <gi...@apache.org>.
wuchong commented on code in PR #19561:
URL: https://github.com/apache/flink/pull/19561#discussion_r914397777
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/functions/hive/HiveFunctionWrapper.java:
##########
@@ -36,23 +38,48 @@
public static final long serialVersionUID = 393313529306818205L;
private final String className;
+ // a field to hold the string serialized for the UDF.
+ // we sometimes need to hold it in case of some serializable UDF will contain
+ // additional information such as Hive's GenericUDFMacro and if we construct the UDF directly by
+ // getUDFClass#newInstance, the information will be missed.
+ private String udfSerializedString;
private transient UDFType instance = null;
public HiveFunctionWrapper(String className) {
this.className = className;
}
+ /**
+ * Create a HiveFunctionWrapper with a UDF instance. In this constructor, the instance will be
+ * serialized to string and held on in the HiveFunctionWrapper.
+ */
+ public HiveFunctionWrapper(String className, UDFType serializableInstance) {
+ this(className);
+ Preconditions.checkArgument(
+ serializableInstance instanceof Serializable,
+ String.format(
+ "The UDF %s should be an instance of Serializable.",
+ serializableInstance.getClass().getName()));
Review Comment:
We should check the class name is equal to the class of `serializableInstance`.
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java:
##########
@@ -506,6 +533,109 @@ private Operation convertCreateFunction(HiveParserASTNode ast) {
}
}
+ private Operation convertCreateMacro(HiveParserASTNode ast) throws SemanticException {
+ String macroName = ast.getChild(0).getText();
+ if (FunctionUtils.isQualifiedFunctionName(macroName)) {
+ throw new SemanticException("The name of the temporary macro can't contain `.`.");
Review Comment:
Please also print the wrong function name. For example:
`CREATE TEMPORARY MACRO doesn't allow "." character in the macro name, but the name is "%s"`.
Besides, is there a test for the exception?
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/functions/hive/HiveFunctionWrapper.java:
##########
@@ -88,4 +115,20 @@ public String getClassName() {
public Class<UDFType> getUDFClass() throws ClassNotFoundException {
return (Class<UDFType>) Thread.currentThread().getContextClassLoader().loadClass(className);
}
+
+ /**
+ * Deserialize UDF used the udfSerializedString held on.
+ *
+ * @return the UDF deserialized
+ */
+ private UDFType deserializeUDF() {
+ try {
+ return (UDFType)
+ SerializationUtilities.deserializeObject(
+ udfSerializedString, (Class<Serializable>) getUDFClass());
Review Comment:
This is problematic in the case the hive connector is dynamically loaded, i.e. in the user classloader instead of the current class loader. We should use the user classloader to load classes. Could you create a JIRA issue for this?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] luoyuxia commented on a diff in pull request #19561: [FLINK-26414][hive] Hive dialect supports macro
Posted by GitBox <gi...@apache.org>.
luoyuxia commented on code in PR #19561:
URL: https://github.com/apache/flink/pull/19561#discussion_r892106448
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java:
##########
@@ -506,6 +532,106 @@ private Operation convertCreateFunction(HiveParserASTNode ast) {
}
}
+ private Operation convertCreateMacro(HiveParserASTNode ast) throws SemanticException {
+ String macroName = ast.getChild(0).getText();
+ if (FunctionUtils.isQualifiedFunctionName(macroName)) {
+ throw new SemanticException("Temporary macro cannot be created with a qualified name.");
+ }
+
+ List<FieldSchema> arguments = getColumns((HiveParserASTNode) ast.getChild(1), true);
+ Set<String> actualColumnNames = getActualColumnNames(ast, arguments);
+
+ HiveParserRowResolver rowResolver = new HiveParserRowResolver();
+ List<String> macroColumnNames = new ArrayList<>();
+ List<TypeInfo> macroColumnTypes = new ArrayList<>();
+ getMacroColumnData(
+ arguments, actualColumnNames, rowResolver, macroColumnNames, macroColumnTypes);
+ ExprNodeDesc body = getBody(ast, arguments, rowResolver);
+
+ GenericUDFMacro macro =
+ new GenericUDFMacro(macroName, body, macroColumnNames, macroColumnTypes);
+
+ FunctionDefinition macroDefinition =
+ new HiveGenericUDF(
+ new HiveFunctionWrapper<>(GenericUDFMacro.class.getName(), macro),
+ hiveShim);
+ // hive's marco is more like flink's temp system function
+ return new CreateTempSystemFunctionOperation(macroName, false, macroDefinition);
+ }
+
+ private Set<String> getActualColumnNames(HiveParserASTNode ast, List<FieldSchema> arguments)
+ throws SemanticException {
+ final Set<String> actualColumnNames = new HashSet<>();
+
+ if (!arguments.isEmpty()) {
+ // Walk down expression to see which arguments are actually used.
+ Node expression = (Node) ast.getChild(2);
+
+ PreOrderWalker walker =
+ new PreOrderWalker(
+ (nd, stack, nodeOutputs) -> {
+ if (nd instanceof HiveParserASTNode) {
+ HiveParserASTNode node = (HiveParserASTNode) nd;
+ if (node.getType() == HiveASTParser.TOK_TABLE_OR_COL) {
+ actualColumnNames.add(node.getChild(0).getText());
+ }
+ }
+ return null;
+ });
+ walker.startWalking(Collections.singleton(expression), null);
+ }
+ return actualColumnNames;
+ }
+
+ private void getMacroColumnData(
+ List<FieldSchema> arguments,
+ Set<String> actualColumnNames,
+ HiveParserRowResolver rowResolver,
+ List<String> macroColumnNames,
+ List<TypeInfo> macroColumnTypes)
+ throws SemanticException {
+ for (FieldSchema argument : arguments) {
+ TypeInfo columnType = TypeInfoUtils.getTypeInfoFromTypeString(argument.getType());
+ rowResolver.put(
+ "",
+ argument.getName(),
+ new ColumnInfo(argument.getName(), columnType, "", false));
+ macroColumnNames.add(argument.getName());
+ macroColumnTypes.add(columnType);
+ }
+ Set<String> expectedColumnNames = new LinkedHashSet<>(macroColumnNames);
+ if (!expectedColumnNames.equals(actualColumnNames)) {
+ throw new SemanticException(
+ "Expected columns " + expectedColumnNames + " but found " + actualColumnNames);
+ }
+ if (expectedColumnNames.size() != macroColumnNames.size()) {
Review Comment:
`expectedColumnNames.size() > macroColumnNames.size()` will nerver happen for `expectedColumnNames` is a set of `macroColumnNames`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] luoyuxia commented on a diff in pull request #19561: [FLINK-26414][hive] Hive dialect supports macro
Posted by GitBox <gi...@apache.org>.
luoyuxia commented on code in PR #19561:
URL: https://github.com/apache/flink/pull/19561#discussion_r892089973
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java:
##########
@@ -506,6 +532,106 @@ private Operation convertCreateFunction(HiveParserASTNode ast) {
}
}
+ private Operation convertCreateMacro(HiveParserASTNode ast) throws SemanticException {
+ String macroName = ast.getChild(0).getText();
+ if (FunctionUtils.isQualifiedFunctionName(macroName)) {
+ throw new SemanticException("Temporary macro cannot be created with a qualified name.");
Review Comment:
Agreed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] luoyuxia commented on a diff in pull request #19561: [FLINK-26414][hive] Hive dialect supports macro
Posted by GitBox <gi...@apache.org>.
luoyuxia commented on code in PR #19561:
URL: https://github.com/apache/flink/pull/19561#discussion_r899806204
##########
flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/table/planner/delegation/hive/HiveASTParserTest.java:
##########
@@ -139,6 +139,13 @@ public void testFunction() throws Exception {
assertDDLType(HiveASTParser.TOK_SHOWFUNCTIONS, "show functions");
}
+ @Test
+ public void testMacro() throws Exception {
Review Comment:
we may not need for macro with a qualified name will fail in parse phase.
The antrl segment is like follows:
` KW_CREATE KW_TEMPORARY KW_MACRO Identifier
LPAREN columnNameTypeList? RPAREN expression
-> ^(TOK_CREATEMACRO Identifier columnNameTypeList? expression)`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] luoyuxia commented on a diff in pull request #19561: [FLINK-26414][hive] Hive dialect supports macro
Posted by GitBox <gi...@apache.org>.
luoyuxia commented on code in PR #19561:
URL: https://github.com/apache/flink/pull/19561#discussion_r914819879
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/functions/hive/HiveFunctionWrapper.java:
##########
@@ -88,4 +115,20 @@ public String getClassName() {
public Class<UDFType> getUDFClass() throws ClassNotFoundException {
return (Class<UDFType>) Thread.currentThread().getContextClassLoader().loadClass(className);
}
+
+ /**
+ * Deserialize UDF used the udfSerializedString held on.
+ *
+ * @return the UDF deserialized
+ */
+ private UDFType deserializeUDF() {
+ try {
+ return (UDFType)
+ SerializationUtilities.deserializeObject(
+ udfSerializedString, (Class<Serializable>) getUDFClass());
Review Comment:
Of course, I have created [FLINK-28430](https://issues.apache.org/jira/browse/FLINK-28430) for it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] luoyuxia commented on a diff in pull request #19561: [FLINK-26414][hive] Hive dialect supports macro
Posted by GitBox <gi...@apache.org>.
luoyuxia commented on code in PR #19561:
URL: https://github.com/apache/flink/pull/19561#discussion_r892101497
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java:
##########
@@ -506,6 +532,106 @@ private Operation convertCreateFunction(HiveParserASTNode ast) {
}
}
+ private Operation convertCreateMacro(HiveParserASTNode ast) throws SemanticException {
+ String macroName = ast.getChild(0).getText();
+ if (FunctionUtils.isQualifiedFunctionName(macroName)) {
+ throw new SemanticException("Temporary macro cannot be created with a qualified name.");
+ }
+
+ List<FieldSchema> arguments = getColumns((HiveParserASTNode) ast.getChild(1), true);
+ Set<String> actualColumnNames = getActualColumnNames(ast, arguments);
+
+ HiveParserRowResolver rowResolver = new HiveParserRowResolver();
+ List<String> macroColumnNames = new ArrayList<>();
+ List<TypeInfo> macroColumnTypes = new ArrayList<>();
+ getMacroColumnData(
+ arguments, actualColumnNames, rowResolver, macroColumnNames, macroColumnTypes);
+ ExprNodeDesc body = getBody(ast, arguments, rowResolver);
+
+ GenericUDFMacro macro =
+ new GenericUDFMacro(macroName, body, macroColumnNames, macroColumnTypes);
+
+ FunctionDefinition macroDefinition =
+ new HiveGenericUDF(
+ new HiveFunctionWrapper<>(GenericUDFMacro.class.getName(), macro),
+ hiveShim);
+ // hive's marco is more like flink's temp system function
+ return new CreateTempSystemFunctionOperation(macroName, false, macroDefinition);
+ }
+
+ private Set<String> getActualColumnNames(HiveParserASTNode ast, List<FieldSchema> arguments)
+ throws SemanticException {
+ final Set<String> actualColumnNames = new HashSet<>();
+
+ if (!arguments.isEmpty()) {
+ // Walk down expression to see which arguments are actually used.
+ Node expression = (Node) ast.getChild(2);
+
+ PreOrderWalker walker =
+ new PreOrderWalker(
+ (nd, stack, nodeOutputs) -> {
+ if (nd instanceof HiveParserASTNode) {
+ HiveParserASTNode node = (HiveParserASTNode) nd;
+ if (node.getType() == HiveASTParser.TOK_TABLE_OR_COL) {
+ actualColumnNames.add(node.getChild(0).getText());
+ }
+ }
+ return null;
+ });
+ walker.startWalking(Collections.singleton(expression), null);
+ }
+ return actualColumnNames;
+ }
+
+ private void getMacroColumnData(
Review Comment:
Return a Tuple2 is good to me. But I would like separate the `getMacroColumnData` and `getBody`,
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org