-
Notifications
You must be signed in to change notification settings - Fork 13.8k
[FLINK-2946] Add orderBy() to Table API #1926
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.
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
Closed
Closed
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
b69338d
[FLINK-2946] Add orderBy() to Table API
dawidwys b84677f
Removed tests ending in same execution plan
dawidwys 445e110
Added test with SQL query
dawidwys e9cf634
Conversion to expected type. Tests upgraded.
dawidwys 7dfc90f
Shortened lines beneath 100 signs
dawidwys 7f67b42
Code style refactoring
dawidwys 445450b
Changes after rebase
dawidwys File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
...ibraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/ordering.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| * 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.api.table.expressions | ||
| import org.apache.calcite.rex.RexNode | ||
| import org.apache.calcite.tools.RelBuilder | ||
|
|
||
| abstract class Ordering extends UnaryExpression { self: Product => | ||
| } | ||
|
|
||
| case class Asc(child: Expression) extends Ordering { | ||
| override def toString: String = s"($child).asc" | ||
|
|
||
| override def name: String = child.name + "-asc" | ||
|
|
||
| override def toRexNode(implicit relBuilder: RelBuilder): RexNode = { | ||
| child.toRexNode | ||
| } | ||
| } | ||
|
|
||
| case class Desc(child: Expression) extends Ordering { | ||
| override def toString: String = s"($child).desc" | ||
|
|
||
| override def name: String = child.name + "-desc" | ||
|
|
||
| override def toRexNode(implicit relBuilder: RelBuilder): RexNode = { | ||
| relBuilder.desc(child.toRexNode) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
127 changes: 127 additions & 0 deletions
127
...link-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetSort.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| /* | ||
| * 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.api.table.plan.nodes.dataset | ||
|
|
||
| import java.util | ||
|
|
||
| import org.apache.calcite.plan.{RelOptCluster, RelTraitSet} | ||
| import org.apache.calcite.rel.RelFieldCollation.Direction | ||
| import org.apache.calcite.rel.`type`.RelDataType | ||
| import org.apache.calcite.rel.{RelCollation, RelNode, RelWriter, SingleRel} | ||
| import org.apache.flink.api.common.operators.Order | ||
| import org.apache.flink.api.common.typeinfo.TypeInformation | ||
| import org.apache.flink.api.java.DataSet | ||
| import org.apache.flink.api.java.typeutils.PojoTypeInfo | ||
| import org.apache.flink.api.table.BatchTableEnvironment | ||
| import org.apache.flink.api.table.typeutils.TypeConverter._ | ||
|
|
||
| import scala.collection.JavaConverters._ | ||
|
|
||
| class DataSetSort( | ||
| cluster: RelOptCluster, | ||
| traitSet: RelTraitSet, | ||
| inp: RelNode, | ||
| collations: RelCollation, | ||
| rowType2: RelDataType) | ||
| extends SingleRel(cluster, traitSet, inp) | ||
| with DataSetRel{ | ||
|
|
||
| override def copy(traitSet: RelTraitSet, inputs: util.List[RelNode]): RelNode ={ | ||
| new DataSetSort( | ||
| cluster, | ||
| traitSet, | ||
| inputs.get(0), | ||
| collations, | ||
| rowType2 | ||
| ) | ||
| } | ||
|
|
||
| override def translateToPlan( | ||
| tableEnv: BatchTableEnvironment, | ||
| expectedType: Option[TypeInformation[Any]] = None): DataSet[Any] = { | ||
|
|
||
| val config = tableEnv.getConfig | ||
|
|
||
| val inputDS = inp.asInstanceOf[DataSetRel].translateToPlan(tableEnv) | ||
|
|
||
| val currentParallelism = inputDS.getExecutionEnvironment.getParallelism | ||
| var partitionedDs = if (currentParallelism == 1) { | ||
| inputDS | ||
| } else { | ||
| inputDS.partitionByRange(fieldCollations.map(_._1): _*) | ||
| .withOrders(fieldCollations.map(_._2): _*) | ||
| } | ||
|
|
||
| fieldCollations.foreach { fieldCollation => | ||
| partitionedDs = partitionedDs.sortPartition(fieldCollation._1, fieldCollation._2) | ||
| } | ||
|
|
||
| val inputType = partitionedDs.getType | ||
| expectedType match { | ||
|
|
||
| case None if config.getEfficientTypeUsage => | ||
| partitionedDs | ||
|
|
||
| case _ => | ||
| val determinedType = determineReturnType( | ||
| getRowType, | ||
| expectedType, | ||
| config.getNullCheck, | ||
| config.getEfficientTypeUsage) | ||
|
|
||
| // conversion | ||
| if (determinedType != inputType) { | ||
|
|
||
| val mapFunc = getConversionMapper(config, | ||
| partitionedDs.getType, | ||
| determinedType, | ||
| "DataSetSortConversion", | ||
| getRowType.getFieldNames.asScala | ||
| ) | ||
|
|
||
| partitionedDs.map(mapFunc) | ||
| } | ||
| // no conversion necessary, forward | ||
| else { | ||
| partitionedDs | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private def directionToOrder(direction: Direction) = { | ||
| direction match { | ||
| case Direction.ASCENDING | Direction.STRICTLY_ASCENDING => Order.ASCENDING | ||
| case Direction.DESCENDING | Direction.STRICTLY_DESCENDING => Order.DESCENDING | ||
| } | ||
|
|
||
| } | ||
|
|
||
| private val fieldCollations = collations.getFieldCollations.asScala | ||
| .map(c => (c.getFieldIndex, directionToOrder(c.getDirection))) | ||
|
|
||
| private val sortFieldsToString = fieldCollations | ||
| .map(col => s"${rowType2.getFieldNames.get(col._1)} ${col._2.getShortName}" ).mkString(", ") | ||
|
|
||
| override def toString: String = s"Sort(by: $sortFieldsToString)" | ||
|
|
||
| override def explainTerms(pw: RelWriter) : RelWriter = { | ||
| super.explainTerms(pw) | ||
| .item("orderBy", sortFieldsToString) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We are ignoring the
expectedType. The convention here is to return aDataSetof that type.If the input type (
inputDS.getType()) is not equal to the expected type, we need to add a Map function after the sort, which translates the records into the expected type. SeeDataSetSourcefor an example of how to do that.