Skip to content

[SPARK-44097][SPARK-44229][SQL][TESTS] Reenable PandasUDF and o.a.s.sql.execution.arrow tests in Java 21 #42641

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

Closed
dongjoon-hyun wants to merge 1 commit into from
Closed

[SPARK-44097][SPARK-44229][SQL][TESTS] Reenable PandasUDF and o.a.s.sql.execution.arrow tests in Java 21 #42641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions sql/core/src/test/scala/org/apache/spark/sql/IntegratedUDFTestUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import org.apache.spark.sql.catalyst.plans.SQLHelper
import org.apache.spark.sql.execution.python.{UserDefinedPythonFunction, UserDefinedPythonTableFunction}
import org.apache.spark.sql.expressions.SparkUserDefinedFunction
import org.apache.spark.sql.types.{DataType, IntegerType, NullType, StringType, StructType}
import org.apache.spark.util.Utils

/**
* This object targets to integrate various UDF test cases so that Scalar UDF, Python UDF,
Expand Down Expand Up @@ -306,9 +305,8 @@ object IntegratedUDFTestUtils extends SQLHelper {

lazy val shouldTestPythonUDFs: Boolean = isPythonAvailable && isPySparkAvailable

// TODO(SPARK-44097) Renable PandasUDF Tests in Java 21
lazy val shouldTestPandasUDFs: Boolean =
isPythonAvailable && isPandasAvailable && isPyArrowAvailable && !Utils.isJavaVersionAtLeast21
isPythonAvailable && isPandasAvailable && isPyArrowAvailable

/**
* A base trait for various UDFs defined in this object.
Expand Down
59 changes: 0 additions & 59 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/arrow/ArrowConvertersSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import org.apache.arrow.memory.RootAllocator
import org.apache.arrow.vector.{VectorLoader, VectorSchemaRoot}
import org.apache.arrow.vector.ipc.JsonFileReader
import org.apache.arrow.vector.util.{ByteArrayReadableSeekableByteChannel, Validator}
import org.apache.commons.lang3.{JavaVersion, SystemUtils}

import org.apache.spark.{SparkException, SparkUnsupportedOperationException, TaskContext}
import org.apache.spark.sql.{DataFrame, Row}
Expand All @@ -53,8 +52,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("collect to arrow record batch") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val indexData = (1 to 6).toDF("i")
val arrowBatches = indexData.toArrowBatchRdd.collect()
assert(arrowBatches.nonEmpty)
Expand All @@ -69,8 +66,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("short conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -120,8 +115,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("int conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -171,8 +164,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("long conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -222,8 +213,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("float conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -271,8 +260,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("double conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -320,8 +307,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("decimal conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -386,8 +371,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("index conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val data = List[Int](1, 2, 3, 4, 5, 6)
val json =
s"""
Expand Down Expand Up @@ -421,8 +404,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("mixed numeric type conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -514,8 +495,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("string type conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -578,8 +557,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("boolean type conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -609,8 +586,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("byte type conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -643,8 +618,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("binary type conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -679,8 +652,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("date type conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -718,8 +689,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("timestamp type conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
withSQLConf(SQLConf.SESSION_LOCAL_TIMEZONE.key -> "America/Los_Angeles") {
val json =
s"""
Expand Down Expand Up @@ -762,8 +731,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("floating-point NaN") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -811,8 +778,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("array type conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -960,8 +925,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("struct type conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -1111,8 +1074,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("null type conversion") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -1168,8 +1129,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("partitioned DataFrame") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json1 =
s"""
|{
Expand Down Expand Up @@ -1266,8 +1225,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("empty frame collect") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val arrowBatches = spark.emptyDataFrame.toArrowBatchRdd.collect()
assert(arrowBatches.isEmpty)

Expand All @@ -1277,8 +1234,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("empty partition collect") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val emptyPart = spark.sparkContext.parallelize(Seq(1), 2).toDF("i")
val arrowBatches = emptyPart.toArrowBatchRdd.collect()
assert(arrowBatches.length === 1)
Expand All @@ -1290,8 +1245,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("max records in batch conf") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val totalRecords = 10
val maxRecordsPerBatch = 3
spark.conf.set(SQLConf.ARROW_EXECUTION_MAX_RECORDS_PER_BATCH.key, maxRecordsPerBatch)
Expand Down Expand Up @@ -1324,8 +1277,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("test Arrow Validator") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val json =
s"""
|{
Expand Down Expand Up @@ -1423,8 +1374,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("roundtrip arrow batches") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val inputRows = (0 until 9).map { i =>
InternalRow(i)
} :+ InternalRow(null)
Expand All @@ -1449,8 +1398,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("ArrowBatchStreamWriter roundtrip") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val inputRows = (0 until 9).map(InternalRow(_)) :+ InternalRow(null)

val schema = StructType(Seq(StructField("int", IntegerType, nullable = true)))
Expand Down Expand Up @@ -1484,8 +1431,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("roundtrip arrow batches with complex schema") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val rows = (0 until 9).map { i =>
InternalRow(i, UTF8String.fromString(s"str-$i"), InternalRow(i))
}
Expand Down Expand Up @@ -1517,8 +1462,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("roundtrip empty arrow batches") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val schema = StructType(Seq(StructField("int", IntegerType, nullable = true)))
val ctx = TaskContext.empty()
val batchIter =
Expand All @@ -1530,8 +1473,6 @@ class ArrowConvertersSuite extends SharedSparkSession {
}

test("two batches with different schema") {
// TODO(SPARK-44229) Renable 'o.a.s.sql.execution.arrow' tests in Java 21
assume(SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_17))
val schema1 = StructType(Seq(StructField("field1", IntegerType, nullable = true)))
val inputRows1 = Array(InternalRow(1)).map { row =>
val proj = UnsafeProjection.create(schema1)
Expand Down