From 22363678a1016cc8622daeef77d3f8e6976b7205 Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Mon, 18 Sep 2023 21:10:27 +0800 Subject: [PATCH 1/3] init --- .../apache/spark/sql/connect/client/CloseableIterator.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connector/connect/common/src/main/scala/org/apache/spark/sql/connect/client/CloseableIterator.scala b/connector/connect/common/src/main/scala/org/apache/spark/sql/connect/client/CloseableIterator.scala index d3fc9963edc7..810158b2ac8b 100644 --- a/connector/connect/common/src/main/scala/org/apache/spark/sql/connect/client/CloseableIterator.scala +++ b/connector/connect/common/src/main/scala/org/apache/spark/sql/connect/client/CloseableIterator.scala @@ -48,9 +48,9 @@ private[sql] object CloseableIterator { */ def apply[T](iterator: Iterator[T]): CloseableIterator[T] = iterator match { case closeable: CloseableIterator[T] => closeable - case _ => + case iter => new WrappedCloseableIterator[T] { - override def innerIterator = iterator + override def innerIterator: Iterator[T] = iter } } } From 9f4f75ba7a33b2f820e0df229d241de3f62fdf47 Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Mon, 18 Sep 2023 21:11:28 +0800 Subject: [PATCH 2/3] test Scala 2.13 --- .github/workflows/build_and_test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index ddc4fc6fd2c7..60e521bad7ea 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -207,6 +207,7 @@ jobs: GITHUB_PREV_SHA: ${{ github.event.before }} SPARK_LOCAL_IP: localhost SKIP_PACKAGING: true + SCALA_PROFILE: scala2.13 steps: - name: Checkout Spark repository uses: actions/checkout@v3 From 08cd561abac3aa2f2df71e2f62d8e87fbd8c4be8 Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Tue, 19 Sep 2023 11:19:03 +0800 Subject: [PATCH 3/3] test Scala 2.12 --- .github/workflows/build_and_test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index c87361bee0a2..39fd2796015d 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -207,7 +207,6 @@ jobs: GITHUB_PREV_SHA: ${{ github.event.before }} SPARK_LOCAL_IP: localhost SKIP_PACKAGING: true - SCALA_PROFILE: scala2.13 steps: - name: Checkout Spark repository uses: actions/checkout@v3