forked from apache/kyuubi
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[KYUUBI apache#4517] [FLINK] Fix multiple executions lead to abnormal…
… results on Flink 1.14 Fix bug in flink 1.14 version, multiple executions lead to abnormal results ### _Why are the changes needed?_ Fix bug in flink 1.14 version, multiple executions lead to abnormal results ### _How was this patch tested?_ - [X] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [X] Add screenshots for manual tests if appropriate - [X] [Run test](https://kyuubi.readthedocs.io/en/master/develop_tools/testing.html#running-tests) locally before make a pull request Closes apache#4517 from waywtdcc/flink1.14_result_ok_error. Closes apache#4517 96ce612 [Cheng Pan] ut 1bd9d1e [Cheng Pan] nit 5e5bccc [Cheng Pan] Migrate Flink engine Java code to Scala 4afb020 [chenchao4] Fix bug in flink 1.14 version, multiple executions lead to abnormal results 3d5dc64 [chenchao4] Fix bug in flink 1.14 version, multiple executions lead to abnormal results c084864 [chenchao4] Fix bug in flink 1.14 version, multiple executions lead to abnormal results 954d760 [chenchao4] Fix bug in flink 1.14 version, multiple executions lead to abnormal results d63ec55 [chenchao4] Fix bug in flink 1.14 version, multiple executions lead to abnormal results Lead-authored-by: Chao Chen <chenchao4@grgbanking.com> Co-authored-by: chenchao4 <Chenchao123> Co-authored-by: Cheng Pan <chengpan@apache.org> Signed-off-by: Cheng Pan <chengpan@apache.org>
- Loading branch information
Showing
5 changed files
with
170 additions
and
218 deletions.
There are no files selected for viewing
28 changes: 0 additions & 28 deletions
28
...yuubi-flink-sql-engine/src/main/java/org/apache/kyuubi/engine/flink/result/Constants.java
This file was deleted.
Oops, something went wrong.
178 changes: 0 additions & 178 deletions
178
...yuubi-flink-sql-engine/src/main/java/org/apache/kyuubi/engine/flink/result/ResultSet.java
This file was deleted.
Oops, something went wrong.
24 changes: 24 additions & 0 deletions
24
...ubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/result/Constants.scala
This file contains 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,24 @@ | ||
/* | ||
* 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.kyuubi.engine.flink.result | ||
|
||
object Constants { | ||
val TABLE_TYPE: String = "TABLE" | ||
val VIEW_TYPE: String = "VIEW" | ||
val SUPPORTED_TABLE_TYPES: Array[String] = Array[String](TABLE_TYPE, VIEW_TYPE) | ||
} |
139 changes: 139 additions & 0 deletions
139
...ubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/result/ResultSet.scala
This file contains 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,139 @@ | ||
/* | ||
* 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.kyuubi.engine.flink.result | ||
|
||
import java.util | ||
import java.util.Collections | ||
|
||
import scala.collection.JavaConverters._ | ||
|
||
import com.google.common.collect.Iterators | ||
import org.apache.flink.table.api.{DataTypes, ResultKind, TableResult} | ||
import org.apache.flink.table.api.internal.TableResultImpl | ||
import org.apache.flink.table.catalog.{Column, ResolvedSchema} | ||
import org.apache.flink.types.Row | ||
|
||
import org.apache.kyuubi.engine.flink.FlinkEngineUtils._ | ||
import org.apache.kyuubi.operation.{ArrayFetchIterator, FetchIterator} | ||
import org.apache.kyuubi.reflection.{DynFields, DynMethods} | ||
|
||
case class ResultSet( | ||
resultKind: ResultKind, | ||
columns: util.List[Column], | ||
data: FetchIterator[Row], | ||
// null in batch mode | ||
// list of boolean in streaming mode, | ||
// true if the corresponding row is an append row, false if its a retract row | ||
changeFlags: Option[util.List[Boolean]]) { | ||
|
||
require(resultKind != null, "resultKind must not be null") | ||
require(columns != null, "columns must not be null") | ||
require(data != null, "data must not be null") | ||
changeFlags.foreach { flags => | ||
require( | ||
Iterators.size(data.asInstanceOf[util.Iterator[_]]) == flags.size, | ||
"the size of data and the size of changeFlags should be equal") | ||
} | ||
|
||
def getColumns: util.List[Column] = columns | ||
|
||
def getData: FetchIterator[Row] = data | ||
} | ||
|
||
/** | ||
* A set of one statement execution result containing result kind, columns, rows of data and change | ||
* flags for streaming mode. | ||
*/ | ||
object ResultSet { | ||
|
||
private lazy val TABLE_RESULT_OK = DynFields.builder() | ||
.hiddenImpl(classOf[TableResultImpl], "TABLE_RESULT_OK") // for Flink 1.14 | ||
.buildStatic[TableResult] | ||
.get | ||
|
||
def fromTableResult(tableResult: TableResult): ResultSet = { | ||
// FLINK-25558, if execute multiple SQLs that return OK, the second and latter results | ||
// would be empty, which affects Flink 1.14 | ||
val fixedTableResult: TableResult = | ||
if (isFlinkVersionAtMost("1.14") && tableResult == TABLE_RESULT_OK) { | ||
// FLINK-24461 executeOperation method changes the return type | ||
// from TableResult to TableResultInternal | ||
val builder = TableResultImpl.builder | ||
.resultKind(ResultKind.SUCCESS) | ||
.schema(ResolvedSchema.of(Column.physical("result", DataTypes.STRING))) | ||
.data(Collections.singletonList(Row.of("OK"))) | ||
// FLINK-24461 the return type of TableResultImpl.Builder#build changed | ||
// from TableResult to TableResultInternal | ||
DynMethods.builder("build") | ||
.impl(classOf[TableResultImpl.Builder]) | ||
.build(builder) | ||
.invoke[TableResult]() | ||
} else { | ||
tableResult | ||
} | ||
val schema = fixedTableResult.getResolvedSchema | ||
// collect all rows from table result as list | ||
// this is ok as TableResult contains limited rows | ||
val rows = fixedTableResult.collect.asScala.toArray | ||
builder.resultKind(fixedTableResult.getResultKind) | ||
.columns(schema.getColumns) | ||
.data(rows) | ||
.build | ||
} | ||
|
||
def builder: Builder = new ResultSet.Builder | ||
|
||
class Builder { | ||
private var resultKind: ResultKind = _ | ||
private var columns: util.List[Column] = _ | ||
private var data: FetchIterator[Row] = _ | ||
private var changeFlags: Option[util.List[Boolean]] = None | ||
|
||
def resultKind(resultKind: ResultKind): ResultSet.Builder = { | ||
this.resultKind = resultKind | ||
this | ||
} | ||
|
||
def columns(columns: Column*): ResultSet.Builder = { | ||
this.columns = columns.asJava | ||
this | ||
} | ||
|
||
def columns(columns: util.List[Column]): ResultSet.Builder = { | ||
this.columns = columns | ||
this | ||
} | ||
|
||
def data(data: FetchIterator[Row]): ResultSet.Builder = { | ||
this.data = data | ||
this | ||
} | ||
|
||
def data(data: Array[Row]): ResultSet.Builder = { | ||
this.data = new ArrayFetchIterator[Row](data) | ||
this | ||
} | ||
|
||
def changeFlags(changeFlags: util.List[Boolean]): ResultSet.Builder = { | ||
this.changeFlags = Some(changeFlags) | ||
this | ||
} | ||
|
||
def build: ResultSet = new ResultSet(resultKind, columns, data, changeFlags) | ||
} | ||
} |
Oops, something went wrong.