-
Notifications
You must be signed in to change notification settings - Fork 28.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-45742][CORE][CONNECT][MLLIB][PYTHON] Introduce an implicit fun…
…ction for Scala Array to wrap into `immutable.ArraySeq` ### What changes were proposed in this pull request? Currently, we need to use `immutable.ArraySeq.unsafeWrapArray(array)` to wrap an Array into an `immutable.ArraySeq`, which makes the code look bloated. So this PR introduces an implicit function `toImmutableArraySeq` to make it easier for Scala Array to be wrapped into `immutable.ArraySeq`. After this pr, we can use the following way to wrap an array into an `immutable.ArraySeq`: ```scala import org.apache.spark.util.ArrayImplicits._ val dataArray = ... val immutableArraySeq = dataArray.toImmutableArraySeq ``` At the same time, this pr replaces the existing use of `immutable.ArraySeq.unsafeWrapArray(array)` with the new method. On the other hand, this implicit function will be conducive to the progress of work SPARK-45686 and SPARK-45687. ### Why are the changes needed? Makes the code for wrapping a Scala Array into an `immutable.ArraySeq` look less bloated. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Pass GitHub Actions ### Was this patch authored or co-authored using generative AI tooling? No Closes #43607 from LuciferYang/SPARK-45742. Authored-by: yangjie01 <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
- Loading branch information
1 parent
a04d4e2
commit 30ec6e3
Showing
8 changed files
with
126 additions
and
39 deletions.
There are no files selected for viewing
36 changes: 36 additions & 0 deletions
36
common/utils/src/main/scala/org/apache/spark/util/ArrayImplicits.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,36 @@ | ||
| /* | ||
| * 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.spark.util | ||
|
|
||
| import scala.collection.immutable | ||
|
|
||
| /** | ||
| * Implicit methods related to Scala Array. | ||
| */ | ||
| private[spark] object ArrayImplicits { | ||
|
|
||
| implicit class SparkArrayOps[T](xs: Array[T]) { | ||
|
|
||
| /** | ||
| * Wraps an Array[T] as an immutable.ArraySeq[T] without copying. | ||
| */ | ||
| def toImmutableArraySeq: immutable.ArraySeq[T] = | ||
| if (xs eq null) null | ||
| else immutable.ArraySeq.unsafeWrapArray(xs) | ||
| } | ||
| } |
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
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
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
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
50 changes: 50 additions & 0 deletions
50
core/src/test/scala/org/apache/spark/util/ArrayImplicitsSuite.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,50 @@ | ||
| /* | ||
| * 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.spark.util | ||
|
|
||
| import scala.collection.immutable | ||
|
|
||
| import org.apache.spark.SparkFunSuite | ||
| import org.apache.spark.util.ArrayImplicits._ | ||
|
|
||
| class ArrayImplicitsSuite extends SparkFunSuite { | ||
|
|
||
| test("Int Array") { | ||
| val data = Array(1, 2, 3) | ||
| val arraySeq = data.toImmutableArraySeq | ||
| assert(arraySeq.getClass === classOf[immutable.ArraySeq.ofInt]) | ||
| assert(arraySeq.length === 3) | ||
| assert(arraySeq.unsafeArray.sameElements(data)) | ||
| } | ||
|
|
||
| test("TestClass Array") { | ||
| val data = Array(TestClass(1), TestClass(2), TestClass(3)) | ||
| val arraySeq = data.toImmutableArraySeq | ||
| assert(arraySeq.getClass === classOf[immutable.ArraySeq.ofRef[TestClass]]) | ||
| assert(arraySeq.length === 3) | ||
| assert(arraySeq.unsafeArray.sameElements(data)) | ||
| } | ||
|
|
||
| test("Null Array") { | ||
| val data: Array[Int] = null | ||
| val arraySeq = data.toImmutableArraySeq | ||
| assert(arraySeq == null) | ||
| } | ||
|
|
||
| case class TestClass(i: Int) | ||
| } |
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
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