(spark) branch master updated: [SPARK-45971][CORE][SQL] Correct the package name of `SparkCollectionUtils` to `org.apache.spark.util`

[do...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/master by this push:
     new 8263c7fe0812 [SPARK-45971][CORE][SQL] Correct the package name of `SparkCollectionUtils` to `org.apache.spark.util`
8263c7fe0812 is described below

commit 8263c7fe0812581a7be826a62ad6cc60582c034d
Author: yangjie01 <ya...@baidu.com>
AuthorDate: Fri Nov 17 13:38:46 2023 -0800

    [SPARK-45971][CORE][SQL] Correct the package name of `SparkCollectionUtils` to `org.apache.spark.util`
    
    ### What changes were proposed in this pull request?
    This pr correct the package name of `SparkCollectionUtils` from `org.apache.spark.sql.catalyst.util`  to `org.apache.spark.util`.
    
    ### Why are the changes needed?
    `SparkCollectionUtils` is in `common-utils` module, not in `catalyst` module, so it should not use the package name related
     to `catalyst` module.
    
    ### 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 #43864 from LuciferYang/SPARK-45971.
    
    Lead-authored-by: yangjie01 <ya...@baidu.com>
    Co-authored-by: YangJie <ya...@baidu.com>
    Signed-off-by: Dongjoon Hyun <dh...@apple.com>
---
 .../src/main/scala/org/apache/spark/util/SparkCollectionUtils.scala    | 2 +-
 core/src/main/scala/org/apache/spark/util/collection/Utils.scala       | 2 +-
 sql/api/src/main/scala/org/apache/spark/sql/types/StructType.scala     | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/utils/src/main/scala/org/apache/spark/util/SparkCollectionUtils.scala b/common/utils/src/main/scala/org/apache/spark/util/SparkCollectionUtils.scala
index be8282db31be..eaab50117abd 100644
--- a/common/utils/src/main/scala/org/apache/spark/util/SparkCollectionUtils.scala
+++ b/common/utils/src/main/scala/org/apache/spark/util/SparkCollectionUtils.scala
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.sql.catalyst.util
+package org.apache.spark.util
 
 import scala.collection.immutable
 
diff --git a/core/src/main/scala/org/apache/spark/util/collection/Utils.scala b/core/src/main/scala/org/apache/spark/util/collection/Utils.scala
index 1695f06c35be..04acb88d512a 100644
--- a/core/src/main/scala/org/apache/spark/util/collection/Utils.scala
+++ b/core/src/main/scala/org/apache/spark/util/collection/Utils.scala
@@ -24,7 +24,7 @@ import scala.jdk.CollectionConverters._
 
 import com.google.common.collect.{Iterators => GuavaIterators, Ordering => GuavaOrdering}
 
-import org.apache.spark.sql.catalyst.util.SparkCollectionUtils
+import org.apache.spark.util.SparkCollectionUtils
 
 /**
  * Utility functions for collections.
diff --git a/sql/api/src/main/scala/org/apache/spark/sql/types/StructType.scala b/sql/api/src/main/scala/org/apache/spark/sql/types/StructType.scala
index 5fe6b0a5f005..d6f59bd09c3c 100644
--- a/sql/api/src/main/scala/org/apache/spark/sql/types/StructType.scala
+++ b/sql/api/src/main/scala/org/apache/spark/sql/types/StructType.scala
@@ -29,9 +29,10 @@ import org.apache.spark.annotation.Stable
 import org.apache.spark.sql.catalyst.analysis.SqlApiAnalysis
 import org.apache.spark.sql.catalyst.parser.{DataTypeParser, LegacyTypeStringParser}
 import org.apache.spark.sql.catalyst.trees.Origin
-import org.apache.spark.sql.catalyst.util.{SparkCollectionUtils, SparkStringUtils, StringConcat}
+import org.apache.spark.sql.catalyst.util.{SparkStringUtils, StringConcat}
 import org.apache.spark.sql.errors.DataTypeErrors
 import org.apache.spark.sql.internal.SqlApiConf
+import org.apache.spark.util.SparkCollectionUtils
 
 /**
  * A [[StructType]] object can be constructed by


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org