Skip to content

Commit 6045104

Browse files
yanghuapan3793
yanghua
authored and
pan3793
committed
[KYUUBI #1542] Move FetchIterator into kyuubi-common for multi-engine support
… <!-- Thanks for sending a pull request! Here are some tips for you: 1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html 2. If the PR is related to an issue in https://github.com/apache/incubator-kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'. 3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'. --> ### _Why are the changes needed?_ <!-- Please clarify why the changes are needed. For instance, 1. If you add a feature, you can talk about the use case of it. 2. If you fix a bug, you can clarify why it is a bug. --> ### _How was this patch tested?_ - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [ ] Add screenshots for manual tests if appropriate - [ ] [Run test](https://kyuubi.readthedocs.io/en/latest/develop_tools/testing.html#running-tests) locally before make a pull request Closes #1543 from yanghua/KYUUBI-1542. Closes #1542 1ca1c08 [yanghua] Move FetchIteratorSuite into kyuubi-common module 1307d88 [yanghua] [KYUUBI #1542] Move FetchIterator into kyuubi-common for multi-engine support Authored-by: yanghua <yanghua1127@gmail.com> Signed-off-by: Cheng Pan <chengpan@apache.org>
1 parent 3942cf3 commit 6045104

File tree

13 files changed

+17
-27
lines changed

13 files changed

+17
-27
lines changed

‎externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/ExecuteScala.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ import org.apache.spark.sql.Row
2323
import org.apache.spark.sql.types.StructType
2424

2525
import org.apache.kyuubi.KyuubiSQLException
26-
import org.apache.kyuubi.engine.spark.ArrayFetchIterator
2726
import org.apache.kyuubi.engine.spark.repl.KyuubiSparkILoop
28-
import org.apache.kyuubi.operation.OperationType
27+
import org.apache.kyuubi.operation.{ArrayFetchIterator, OperationType}
2928
import org.apache.kyuubi.operation.log.OperationLog
3029
import org.apache.kyuubi.session.Session
3130

‎externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/ExecuteStatement.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import org.apache.spark.sql.types._
2727

2828
import org.apache.kyuubi.{KyuubiSQLException, Logging}
2929
import org.apache.kyuubi.config.KyuubiConf
30-
import org.apache.kyuubi.engine.spark.{ArrayFetchIterator, IterableFetchIterator, KyuubiSparkUtil}
30+
import org.apache.kyuubi.engine.spark.KyuubiSparkUtil
3131
import org.apache.kyuubi.engine.spark.events.{EventLoggingService, SparkStatementEvent}
32-
import org.apache.kyuubi.operation.{OperationState, OperationType}
32+
import org.apache.kyuubi.operation.{ArrayFetchIterator, IterableFetchIterator, OperationState, OperationType}
3333
import org.apache.kyuubi.operation.OperationState.OperationState
3434
import org.apache.kyuubi.operation.log.OperationLog
3535
import org.apache.kyuubi.session.Session

‎externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/GetCatalogs.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ package org.apache.kyuubi.engine.spark.operation
1919

2020
import org.apache.spark.sql.types.StructType
2121

22-
import org.apache.kyuubi.engine.spark.IterableFetchIterator
2322
import org.apache.kyuubi.engine.spark.shim.SparkCatalogShim
24-
import org.apache.kyuubi.operation.OperationType
23+
import org.apache.kyuubi.operation.{IterableFetchIterator, OperationType}
2524
import org.apache.kyuubi.operation.meta.ResultSetSchemaConstant.TABLE_CAT
2625
import org.apache.kyuubi.session.Session
2726

‎externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/GetColumns.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ package org.apache.kyuubi.engine.spark.operation
1919

2020
import org.apache.spark.sql.types._
2121

22-
import org.apache.kyuubi.engine.spark.IterableFetchIterator
2322
import org.apache.kyuubi.engine.spark.shim.SparkCatalogShim
24-
import org.apache.kyuubi.operation.OperationType
23+
import org.apache.kyuubi.operation.{IterableFetchIterator, OperationType}
2524
import org.apache.kyuubi.operation.meta.ResultSetSchemaConstant._
2625
import org.apache.kyuubi.session.Session
2726

‎externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/GetFunctions.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ import java.sql.DatabaseMetaData
2222
import org.apache.spark.sql.Row
2323
import org.apache.spark.sql.types.StructType
2424

25-
import org.apache.kyuubi.engine.spark.IterableFetchIterator
26-
import org.apache.kyuubi.operation.OperationType
25+
import org.apache.kyuubi.operation.{IterableFetchIterator, OperationType}
2726
import org.apache.kyuubi.operation.meta.ResultSetSchemaConstant._
2827
import org.apache.kyuubi.session.Session
2928

‎externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/GetSchemas.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ package org.apache.kyuubi.engine.spark.operation
1919

2020
import org.apache.spark.sql.types.StructType
2121

22-
import org.apache.kyuubi.engine.spark.IterableFetchIterator
2322
import org.apache.kyuubi.engine.spark.shim.SparkCatalogShim
24-
import org.apache.kyuubi.operation.OperationType
23+
import org.apache.kyuubi.operation.{IterableFetchIterator, OperationType}
2524
import org.apache.kyuubi.operation.meta.ResultSetSchemaConstant._
2625
import org.apache.kyuubi.session.Session
2726

‎externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/GetTableTypes.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ package org.apache.kyuubi.engine.spark.operation
2020
import org.apache.spark.sql.Row
2121
import org.apache.spark.sql.types.StructType
2222

23-
import org.apache.kyuubi.engine.spark.IterableFetchIterator
2423
import org.apache.kyuubi.engine.spark.shim.SparkCatalogShim
25-
import org.apache.kyuubi.operation.OperationType
24+
import org.apache.kyuubi.operation.{IterableFetchIterator, OperationType}
2625
import org.apache.kyuubi.operation.meta.ResultSetSchemaConstant._
2726
import org.apache.kyuubi.session.Session
2827

‎externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/GetTables.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ package org.apache.kyuubi.engine.spark.operation
1919

2020
import org.apache.spark.sql.types.StructType
2121

22-
import org.apache.kyuubi.engine.spark.IterableFetchIterator
2322
import org.apache.kyuubi.engine.spark.shim.SparkCatalogShim
24-
import org.apache.kyuubi.operation.OperationType
23+
import org.apache.kyuubi.operation.{IterableFetchIterator, OperationType}
2524
import org.apache.kyuubi.operation.meta.ResultSetSchemaConstant._
2625
import org.apache.kyuubi.session.Session
2726

‎externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/GetTypeInfo.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ import java.sql.Types._
2222
import org.apache.spark.sql.Row
2323
import org.apache.spark.sql.types.StructType
2424

25-
import org.apache.kyuubi.engine.spark.IterableFetchIterator
26-
import org.apache.kyuubi.operation.OperationType
25+
import org.apache.kyuubi.operation.{IterableFetchIterator, OperationType}
2726
import org.apache.kyuubi.operation.meta.ResultSetSchemaConstant._
2827
import org.apache.kyuubi.session.Session
2928

‎externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/PlanOnlyStatement.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
2222
import org.apache.spark.sql.types.StructType
2323

2424
import org.apache.kyuubi.config.KyuubiConf.OperationModes.{ANALYZE, OperationMode, OPTIMIZE, PARSE}
25-
import org.apache.kyuubi.engine.spark.{ArrayFetchIterator, IterableFetchIterator}
26-
import org.apache.kyuubi.operation.OperationType
25+
import org.apache.kyuubi.operation.{ArrayFetchIterator, IterableFetchIterator, OperationType}
2726
import org.apache.kyuubi.operation.log.OperationLog
2827
import org.apache.kyuubi.session.Session
2928

0 commit comments

Comments
 (0)