Skip to content
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.

Sign up for GitHub

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

[SPARK-45211][CONNECT] Eliminated ambiguous references in CloseableIterator#apply to fix Scala 2.13 daily test #42981

Closed
wants to merge 4 commits into from
Closed

[SPARK-45211][CONNECT] Eliminated ambiguous references in CloseableIterator#apply to fix Scala 2.13 daily test #42981

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2236367
init
LuciferYang Sep 18, 2023
9f4f75b
test Scala 2.13
LuciferYang Sep 18, 2023
9b224b9
Merge branch 'upmaster' into CloseableIterator-apply
LuciferYang Sep 19, 2023
08cd561
test Scala 2.12
LuciferYang Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ jobs:
GITHUB_PREV_SHA: ${{ github.event.before }}
SPARK_LOCAL_IP: localhost
SKIP_PACKAGING: true
SCALA_PROFILE: scala2.13
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will revert after test

steps:
- name: Checkout Spark repository
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions ...connect/common/src/main/scala/org/apache/spark/sql/connect/client/CloseableIterator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}