snuyanzin commented on code in PR #25316:
URL: https://github.com/apache/flink/pull/25316#discussion_r1830063028
##########
flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/calcite/SqlRewriterUtils.scala:
##########
@@ -173,69 +207,73 @@ object SqlRewriterUtils {
// Expands the select list first in case there is a star(*).
// Validates the select first to register the where scope.
validator.validate(select)
- val sourceList = validator.expandStar(select.getSelectList, select,
false).getList
+ reorderAndValidateForSelect(validator, select, targetRowType,
assignedFields, targetPosition)
+ select
+ }
+ def rewriteSqlValues(
+ values: SqlCall,
+ targetRowType: RelDataType,
+ assignedFields: util.LinkedHashMap[Integer, SqlNode],
+ targetPosition: util.List[Int]): SqlCall = {
val fixedNodes = new util.ArrayList[SqlNode]
+ (0 until values.getOperandList.size()).foreach {
+ valueIdx =>
+ val value = values.getOperandList.get(valueIdx)
+ val valueAsList = if (value.getKind == SqlKind.ROW) {
+ value.asInstanceOf[SqlCall].getOperandList
+ } else {
+ Collections.singletonList(value)
+ }
+ val nodes = getReorderedNodes(targetRowType, assignedFields,
targetPosition, valueAsList)
+
fixedNodes.add(SqlStdOperatorTable.ROW.createCall(value.getParserPosition,
nodes))
+ }
+ SqlStdOperatorTable.VALUES.createCall(values.getParserPosition, fixedNodes)
+ }
+
+ private def getReorderedNodes(
Review Comment:
Here mostly extracting common logic in one place to reduce code duplication
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
