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 99fb84b7ad27 [SPARK-47534][SQL] Move `o.a.s.variant` to `o.a.s.types.variant` 99fb84b7ad27 is described below commit 99fb84b7ad276114b1ab97bd71704d4bdc163a40 Author: Dongjoon Hyun <dh...@apple.com> AuthorDate: Sun Mar 24 17:18:12 2024 -0700 [SPARK-47534][SQL] Move `o.a.s.variant` to `o.a.s.types.variant` ### What changes were proposed in this pull request? According to https://github.com/apache/spark/pull/45479#pullrequestreview-1946939461, this PR aims to rename `variant` package and the corresponding test suite like the following. ``` - package org.apache.spark.variant; + package org.apache.spark.types.variant; ``` ``` $ git diff master --stat common/variant/src/main/java/org/apache/spark/{ => types}/variant/Variant.java | 2 +- common/variant/src/main/java/org/apache/spark/{ => types}/variant/VariantBuilder.java | 4 ++-- common/variant/src/main/java/org/apache/spark/{ => types}/variant/VariantSizeLimitException.java | 2 +- common/variant/src/main/java/org/apache/spark/{ => types}/variant/VariantUtil.java | 2 +- sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/variant/variantExpressions.scala | 2 +- sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/{ => variant}/VariantExpressionSuite.scala | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) ``` ### Why are the changes needed? To make it clear that `variant` package is related to be a type. ### Does this PR introduce _any_ user-facing change? No. This package is new in Apache Spark 4.0.0. ### How was this patch tested? Pass the CIs. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #45685 from dongjoon-hyun/SPARK-47534. Authored-by: Dongjoon Hyun <dh...@apple.com> Signed-off-by: Dongjoon Hyun <dh...@apple.com> --- .../src/main/java/org/apache/spark/{ => types}/variant/Variant.java | 2 +- .../java/org/apache/spark/{ => types}/variant/VariantBuilder.java | 4 ++-- .../apache/spark/{ => types}/variant/VariantSizeLimitException.java | 2 +- .../main/java/org/apache/spark/{ => types}/variant/VariantUtil.java | 2 +- .../spark/sql/catalyst/expressions/variant/variantExpressions.scala | 2 +- .../catalyst/expressions/{ => variant}/VariantExpressionSuite.scala | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/variant/src/main/java/org/apache/spark/variant/Variant.java b/common/variant/src/main/java/org/apache/spark/types/variant/Variant.java similarity index 96% rename from common/variant/src/main/java/org/apache/spark/variant/Variant.java rename to common/variant/src/main/java/org/apache/spark/types/variant/Variant.java index 11c82d3fe1c0..e43b7ec8ac54 100644 --- a/common/variant/src/main/java/org/apache/spark/variant/Variant.java +++ b/common/variant/src/main/java/org/apache/spark/types/variant/Variant.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.spark.variant; +package org.apache.spark.types.variant; /** * This class is structurally equivalent to {@link org.apache.spark.unsafe.types.VariantVal}. We diff --git a/common/variant/src/main/java/org/apache/spark/variant/VariantBuilder.java b/common/variant/src/main/java/org/apache/spark/types/variant/VariantBuilder.java similarity index 99% rename from common/variant/src/main/java/org/apache/spark/variant/VariantBuilder.java rename to common/variant/src/main/java/org/apache/spark/types/variant/VariantBuilder.java index 70227d67746d..21a12cbe9d71 100644 --- a/common/variant/src/main/java/org/apache/spark/variant/VariantBuilder.java +++ b/common/variant/src/main/java/org/apache/spark/types/variant/VariantBuilder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.spark.variant; +package org.apache.spark.types.variant; import java.io.IOException; import java.math.BigDecimal; @@ -32,7 +32,7 @@ import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.core.exc.InputCoercionException; -import static org.apache.spark.variant.VariantUtil.*; +import static org.apache.spark.types.variant.VariantUtil.*; /** * Build variant value and metadata by parsing JSON values. diff --git a/common/variant/src/main/java/org/apache/spark/variant/VariantSizeLimitException.java b/common/variant/src/main/java/org/apache/spark/types/variant/VariantSizeLimitException.java similarity index 96% rename from common/variant/src/main/java/org/apache/spark/variant/VariantSizeLimitException.java rename to common/variant/src/main/java/org/apache/spark/types/variant/VariantSizeLimitException.java index 4ccbc789d2fc..9ae7f9189a36 100644 --- a/common/variant/src/main/java/org/apache/spark/variant/VariantSizeLimitException.java +++ b/common/variant/src/main/java/org/apache/spark/types/variant/VariantSizeLimitException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.spark.variant; +package org.apache.spark.types.variant; /** * An exception indicating that we are attempting to build a variant with it value or metadata diff --git a/common/variant/src/main/java/org/apache/spark/variant/VariantUtil.java b/common/variant/src/main/java/org/apache/spark/types/variant/VariantUtil.java similarity index 99% rename from common/variant/src/main/java/org/apache/spark/variant/VariantUtil.java rename to common/variant/src/main/java/org/apache/spark/types/variant/VariantUtil.java index b7aad8883fd1..d6e572f98901 100644 --- a/common/variant/src/main/java/org/apache/spark/variant/VariantUtil.java +++ b/common/variant/src/main/java/org/apache/spark/types/variant/VariantUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.spark.variant; +package org.apache.spark.types.variant; /** * This class defines constants related to the variant format and provides functions for diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/variant/variantExpressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/variant/variantExpressions.scala index 3771b95152a0..cab61d2b12c2 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/variant/variantExpressions.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/variant/variantExpressions.scala @@ -24,8 +24,8 @@ import org.apache.spark.sql.catalyst.expressions.codegen.CodegenFallback import org.apache.spark.sql.catalyst.util.BadRecordException import org.apache.spark.sql.errors.QueryExecutionErrors import org.apache.spark.sql.types._ +import org.apache.spark.types.variant.{VariantBuilder, VariantSizeLimitException, VariantUtil} import org.apache.spark.unsafe.types._ -import org.apache.spark.variant._ // scalastyle:off line.size.limit @ExpressionDescription( diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/VariantExpressionSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/variant/VariantExpressionSuite.scala similarity index 96% rename from sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/VariantExpressionSuite.scala rename to sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/variant/VariantExpressionSuite.scala index e5f8ed22050f..22155c927e37 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/VariantExpressionSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/variant/VariantExpressionSuite.scala @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.spark.sql.catalyst.expressions +package org.apache.spark.sql.catalyst.expressions.variant import org.apache.spark.{SparkException, SparkFunSuite, SparkRuntimeException} -import org.apache.spark.sql.catalyst.expressions.variant._ +import org.apache.spark.sql.catalyst.expressions.{ExpressionEvalHelper, Literal} +import org.apache.spark.types.variant.VariantUtil._ import org.apache.spark.unsafe.types.VariantVal -import org.apache.spark.variant.VariantUtil._ class VariantExpressionSuite extends SparkFunSuite with ExpressionEvalHelper { test("parse_json") { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org