JingsongLi commented on a change in pull request #16163:
URL: https://github.com/apache/flink/pull/16163#discussion_r655092182
##########
File path:
flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/codegen/calls/BridgingFunctionGenUtil.scala
##########
@@ -147,7 +146,21 @@ object BridgingFunctionGenUtil {
externalOperands,
returnType)
} else {
- generateScalarFunctionCall(ctx, functionTerm, externalOperands,
outputDataType)
+ val targetOperands = externalOperands.zip(operands).map{
+ case(targetOperand, sourceOperand) => {
+ if (sourceOperand.isInstanceOf[ExternalGeneratedExpression]) {
Review comment:
use scala match case
##########
File path:
flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/codegen/calls/BridgingFunctionGenUtil.scala
##########
@@ -288,16 +302,38 @@ object BridgingFunctionGenUtil {
s"($externalResultTypeTerm) (${typeTerm(externalResultClassBoxed)})"
}
val externalResultTerm =
ctx.addReusableLocalVariable(externalResultTypeTerm, "externalResult")
+ val externalCode =
+ s"""
+ |${externalOperands.zip(argumentDataTypes)
+ .map{case (element, dataType) => {
+ if ( isInternal(dataType) ||
!element.isInstanceOf[ExternalGeneratedExpression]) {
Review comment:
Use match case to gen code and result term.
##########
File path:
flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/codegen/calls/BridgingFunctionGenUtil.scala
##########
@@ -288,16 +302,38 @@ object BridgingFunctionGenUtil {
s"($externalResultTypeTerm) (${typeTerm(externalResultClassBoxed)})"
}
val externalResultTerm =
ctx.addReusableLocalVariable(externalResultTypeTerm, "externalResult")
+ val externalCode =
+ s"""
+ |${externalOperands.zip(argumentDataTypes)
+ .map{case (element, dataType) => {
+ if ( isInternal(dataType) ||
!element.isInstanceOf[ExternalGeneratedExpression]) {
+ element.code
+ } else {
+
element.asInstanceOf[ExternalGeneratedExpression].getExternalCode
+ }
+ }}.mkString("\n")}
+ |$externalResultTerm = $externalResultCasting $functionTerm
+ | .$SCALAR_EVAL(${externalOperands.zip(argumentDataTypes)
+ .map{case (element, dataType) => {
+ if ( isInternal(dataType) ||
!element.isInstanceOf[ExternalGeneratedExpression]) {
Review comment:
Please all have `|`
##########
File path:
flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/codegen/calls/BridgingFunctionGenUtil.scala
##########
@@ -147,7 +146,21 @@ object BridgingFunctionGenUtil {
externalOperands,
returnType)
} else {
- generateScalarFunctionCall(ctx, functionTerm, externalOperands,
outputDataType)
+ val targetOperands = externalOperands.zip(operands).map{
+ case(targetOperand, sourceOperand) => {
+ if (sourceOperand.isInstanceOf[ExternalGeneratedExpression]) {
+ val expression =
sourceOperand.asInstanceOf[ExternalGeneratedExpression]
+ ExternalGeneratedExpression.fromGeneratedExpression(
Review comment:
Why do this?
##########
File path:
flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/codegen/calls/BridgingFunctionGenUtil.scala
##########
@@ -288,16 +302,38 @@ object BridgingFunctionGenUtil {
s"($externalResultTypeTerm) (${typeTerm(externalResultClassBoxed)})"
}
val externalResultTerm =
ctx.addReusableLocalVariable(externalResultTypeTerm, "externalResult")
+ val externalCode =
+ s"""
+ |${externalOperands.zip(argumentDataTypes)
+ .map{case (element, dataType) => {
+ if ( isInternal(dataType) ||
!element.isInstanceOf[ExternalGeneratedExpression]) {
Review comment:
checkstyle `if ( isInternal `
##########
File path:
flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/codegen/ExternalGeneratedExpression.scala
##########
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.table.planner.codegen
+
+import org.apache.flink.table.types.DataType
+
+/**
+ * Describes a external generated expression.
+ *
+ * @param dataType type of the resultTerm
+ * @param internalTerm term to access the internal result of the expression
+ * @param externalTerm term to access the external result of the expression
+ * @param nullTerm boolean term that indicates if expression is null
+ * @param internalCode code necessary to produce internalTerm and nullTerm
+ * @param externalCode code necessary to produce externalTerm
+ * @param literalValue None if the expression is not literal. Otherwise it
represent the
+ * original object of the literal.
+ *
+ */
+class ExternalGeneratedExpression(
Review comment:
Can be a case class?
--
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
