Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion dev/kyuubi-codecov/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,11 @@
<artifactId>kyuubi-spark-connector-hive_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
<!-- TODO: support authz -->
<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-spark-authz_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-spark-lineage_${scala.binary.version}</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import org.apache.kyuubi.util.AssertionUtils._
class PaimonCatalogRangerSparkExtensionSuite extends RangerSparkExtensionSuite {
override protected val catalogImpl: String = "hive"
override protected val supportPurge: Boolean = false
private def isSupportedVersion = isScalaV212
private def isSupportedVersion = isScalaV212 || isSparkV40OrGreater
override protected val sqlExtensions: String =
if (isSupportedVersion) "org.apache.paimon.spark.extensions.PaimonSparkSessionExtensions"
else ""
Expand Down Expand Up @@ -446,7 +446,7 @@ class PaimonCatalogRangerSparkExtensionSuite extends RangerSparkExtensionSuite {
doAs(
admin,
sql(s"SELECT commit_time FROM $catalogV2.$namespace1.`$table1$$snapshots`" +
s" ORDER BY commit_time ASC LIMIT 1").collect()(0).getTimestamp(0))
s" ORDER BY commit_time ASC LIMIT 1").collect()(0).get(0))

val queryWithTimestamp =
s"""
Expand Down Expand Up @@ -556,7 +556,7 @@ class PaimonCatalogRangerSparkExtensionSuite extends RangerSparkExtensionSuite {
val changingColumnTypeSql =
s"""
|ALTER TABLE $catalogV2.$namespace1.$table1
|ALTER COLUMN id TYPE DOUBLE
|ALTER COLUMN name TYPE STRING
|""".stripMargin

interceptEndsWith[AccessControlException] {
Expand Down
10 changes: 4 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
<netty.version>4.2.7.Final</netty.version>
<openai.java.version>0.12.0</openai.java.version>
<retrofit.version>2.9.0</retrofit.version>
<paimon.version>0.8.2</paimon.version>
<paimon.version>1.3.1</paimon.version>
<paimon.artifact>paimon-spark-${spark.binary.version}</paimon.artifact>
<phoenix.version>6.0.0</phoenix.version>
<postgresql.version>42.7.2</postgresql.version>
Expand Down Expand Up @@ -2001,7 +2001,8 @@
here we choose 1.6.1 to ensure that tests happy when activate both -Pjava-8 and -Pspark-3.3.
-->
<iceberg.version>1.6.1</iceberg.version>
<maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow</maven.plugin.scalatest.exclude.tags>
<!-- Exclude Paimon test due to paimon-common has runtime linkage issue which refers to Spark 3.4 classes -->
<maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow,org.apache.kyuubi.tags.PaimonTest</maven.plugin.scalatest.exclude.tags>
</properties>
</profile>

Expand Down Expand Up @@ -2050,11 +2051,8 @@
<delta.artifact>delta-spark_${scala.binary.version}</delta.artifact>
<!-- TODO: update once Hudi support Spark 4.0 -->
<hudi.artifact>hudi-spark3.5-bundle_${scala.binary.version}</hudi.artifact>
<!-- TODO: update once Paimon support Spark 4.0.
paimon-spark-3.5 contains Scala 2.12 classes cause conflicts with Scala 2.13 -->
<paimon.artifact>paimon-common</paimon.artifact>
<!-- Exclude SparkLocalClusterTest due to Scala 2.13.17 changes serialVersionUID of scala.collection.immutable.ArraySeq -->
<maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow,org.apache.kyuubi.tags.PaimonTest,org.apache.kyuubi.tags.HudiTest,org.apache.kyuubi.tags.SparkLocalClusterTest</maven.plugin.scalatest.exclude.tags>
<maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow,org.apache.kyuubi.tags.HudiTest,org.apache.kyuubi.tags.SparkLocalClusterTest</maven.plugin.scalatest.exclude.tags>
<spark.archive.name>spark-${spark.version}-bin-hadoop3.tgz</spark.archive.name>
</properties>
</profile>
Expand Down
Loading