This is an automated email from the ASF dual-hosted git repository.
zouxxyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 81597168b [test][spark] Spark UT use version check instead of
interfaces (#3573)
81597168b is described below
commit 81597168b95c9ab4b64acfcc70d69e9307eeda6c
Author: xuzifu666 <[email protected]>
AuthorDate: Fri Jun 21 19:14:09 2024 +0800
[test][spark] Spark UT use version check instead of interfaces (#3573)
---
.../test/scala/org/apache/paimon/spark/sql/AnalyzeTableTest.scala | 5 +----
.../org/apache/paimon/spark/sql/DDLWithHiveCatalogTest.scala | 4 +---
.../test/scala/org/apache/paimon/spark/sql/AnalyzeTableTest.scala | 5 +----
.../org/apache/paimon/spark/sql/DDLWithHiveCatalogTest.scala | 4 +---
.../scala/org/apache/paimon/spark/sql/AnalyzeTableTestBase.scala | 8 +++-----
.../org/apache/paimon/spark/sql/DDLWithHiveCatalogTestBase.scala | 4 +---
6 files changed, 8 insertions(+), 22 deletions(-)
diff --git
a/paimon-spark/paimon-spark-3.2/src/test/scala/org/apache/paimon/spark/sql/AnalyzeTableTest.scala
b/paimon-spark/paimon-spark-3.2/src/test/scala/org/apache/paimon/spark/sql/AnalyzeTableTest.scala
index 9a6721fc7..255906d04 100644
---
a/paimon-spark/paimon-spark-3.2/src/test/scala/org/apache/paimon/spark/sql/AnalyzeTableTest.scala
+++
b/paimon-spark/paimon-spark-3.2/src/test/scala/org/apache/paimon/spark/sql/AnalyzeTableTest.scala
@@ -18,7 +18,4 @@
package org.apache.paimon.spark.sql
-class AnalyzeTableTest extends AnalyzeTableTestBase {
-
- override protected def supportsColStats(): Boolean = false
-}
+class AnalyzeTableTest extends AnalyzeTableTestBase {}
diff --git
a/paimon-spark/paimon-spark-3.2/src/test/scala/org/apache/paimon/spark/sql/DDLWithHiveCatalogTest.scala
b/paimon-spark/paimon-spark-3.2/src/test/scala/org/apache/paimon/spark/sql/DDLWithHiveCatalogTest.scala
index 2a6d04e4d..a9ea3efc8 100644
---
a/paimon-spark/paimon-spark-3.2/src/test/scala/org/apache/paimon/spark/sql/DDLWithHiveCatalogTest.scala
+++
b/paimon-spark/paimon-spark-3.2/src/test/scala/org/apache/paimon/spark/sql/DDLWithHiveCatalogTest.scala
@@ -18,6 +18,4 @@
package org.apache.paimon.spark.sql
-class DDLWithHiveCatalogTest extends DDLWithHiveCatalogTestBase {
- override def supportDefaultDatabaseWithSessionCatalog = false
-}
+class DDLWithHiveCatalogTest extends DDLWithHiveCatalogTestBase {}
diff --git
a/paimon-spark/paimon-spark-3.3/src/test/scala/org/apache/paimon/spark/sql/AnalyzeTableTest.scala
b/paimon-spark/paimon-spark-3.3/src/test/scala/org/apache/paimon/spark/sql/AnalyzeTableTest.scala
index 9a6721fc7..255906d04 100644
---
a/paimon-spark/paimon-spark-3.3/src/test/scala/org/apache/paimon/spark/sql/AnalyzeTableTest.scala
+++
b/paimon-spark/paimon-spark-3.3/src/test/scala/org/apache/paimon/spark/sql/AnalyzeTableTest.scala
@@ -18,7 +18,4 @@
package org.apache.paimon.spark.sql
-class AnalyzeTableTest extends AnalyzeTableTestBase {
-
- override protected def supportsColStats(): Boolean = false
-}
+class AnalyzeTableTest extends AnalyzeTableTestBase {}
diff --git
a/paimon-spark/paimon-spark-3.3/src/test/scala/org/apache/paimon/spark/sql/DDLWithHiveCatalogTest.scala
b/paimon-spark/paimon-spark-3.3/src/test/scala/org/apache/paimon/spark/sql/DDLWithHiveCatalogTest.scala
index 2a6d04e4d..a9ea3efc8 100644
---
a/paimon-spark/paimon-spark-3.3/src/test/scala/org/apache/paimon/spark/sql/DDLWithHiveCatalogTest.scala
+++
b/paimon-spark/paimon-spark-3.3/src/test/scala/org/apache/paimon/spark/sql/DDLWithHiveCatalogTest.scala
@@ -18,6 +18,4 @@
package org.apache.paimon.spark.sql
-class DDLWithHiveCatalogTest extends DDLWithHiveCatalogTestBase {
- override def supportDefaultDatabaseWithSessionCatalog = false
-}
+class DDLWithHiveCatalogTest extends DDLWithHiveCatalogTestBase {}
diff --git
a/paimon-spark/paimon-spark-common/src/test/scala/org/apache/paimon/spark/sql/AnalyzeTableTestBase.scala
b/paimon-spark/paimon-spark-common/src/test/scala/org/apache/paimon/spark/sql/AnalyzeTableTestBase.scala
index 9ff252b52..86e9fc5b8 100644
---
a/paimon-spark/paimon-spark-common/src/test/scala/org/apache/paimon/spark/sql/AnalyzeTableTestBase.scala
+++
b/paimon-spark/paimon-spark-common/src/test/scala/org/apache/paimon/spark/sql/AnalyzeTableTestBase.scala
@@ -340,7 +340,7 @@ abstract class AnalyzeTableTestBase extends
PaimonSparkTestBase {
val stats = getScanStatistic("SELECT * FROM T")
Assertions.assertEquals(2L, stats.rowCount.get.longValue())
- Assertions.assertEquals(if (supportsColStats()) 4 else 0,
stats.attributeStats.size)
+ Assertions.assertEquals(if (gteqSpark3_4) 4 else 0,
stats.attributeStats.size)
}
test("Paimon analyze: partition filter push down hit") {
@@ -357,14 +357,14 @@ abstract class AnalyzeTableTestBase extends
PaimonSparkTestBase {
// partition push down hit
var sql = "SELECT * FROM T WHERE pt < 1"
Assertions.assertEquals(
- if (supportsColStats()) 0L else 4L,
+ if (gteqSpark3_4) 0L else 4L,
getScanStatistic(sql).rowCount.get.longValue())
checkAnswer(spark.sql(sql), Nil)
// partition push down hit and select without it
sql = "SELECT id FROM T WHERE pt < 1"
Assertions.assertEquals(
- if (supportsColStats()) 0L else 4L,
+ if (gteqSpark3_4) 0L else 4L,
getScanStatistic(sql).rowCount.get.longValue())
checkAnswer(spark.sql(sql), Nil)
@@ -388,6 +388,4 @@ abstract class AnalyzeTableTestBase extends
PaimonSparkTestBase {
relation.computeStats()
}
- /** Spark supports the use of col stats for v2 table since 3.4+. */
- protected def supportsColStats(): Boolean = true
}
diff --git
a/paimon-spark/paimon-spark-common/src/test/scala/org/apache/paimon/spark/sql/DDLWithHiveCatalogTestBase.scala
b/paimon-spark/paimon-spark-common/src/test/scala/org/apache/paimon/spark/sql/DDLWithHiveCatalogTestBase.scala
index c542633dc..6769d81c6 100644
---
a/paimon-spark/paimon-spark-common/src/test/scala/org/apache/paimon/spark/sql/DDLWithHiveCatalogTestBase.scala
+++
b/paimon-spark/paimon-spark-common/src/test/scala/org/apache/paimon/spark/sql/DDLWithHiveCatalogTestBase.scala
@@ -89,7 +89,7 @@ abstract class DDLWithHiveCatalogTestBase extends
PaimonHiveTestBase {
.config(s"spark.sql.catalog.$catalogName.defaultDatabase", dbName)
.getOrCreate()
- if (catalogName.equals(sparkCatalogName) &&
!supportDefaultDatabaseWithSessionCatalog) {
+ if (catalogName.equals(sparkCatalogName) && !gteqSpark3_4) {
checkAnswer(reusedSpark.sql("show tables").select("tableName"),
Nil)
reusedSpark.sql(s"use $dbName")
}
@@ -125,8 +125,6 @@ abstract class DDLWithHiveCatalogTestBase extends
PaimonHiveTestBase {
}
}
- def supportDefaultDatabaseWithSessionCatalog = true
-
def getDatabaseLocation(dbName: String): String = {
spark
.sql(s"DESC DATABASE $dbName")
