resolve comments

Author: PetarVasiljevic-DB

connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/join/OracleJoinPushdownIntegrationSuite.scala

@@ -20,8 +20,6 @@ package org.apache.spark.sql.jdbc.v2.join
 import java.sql.Connection
 import java.util.Locale
 
-import org.apache.spark.SparkConf
-import org.apache.spark.sql.execution.datasources.v2.jdbc.JDBCTableCatalog
 import org.apache.spark.sql.jdbc.{DockerJDBCIntegrationSuite, JdbcDialect, OracleDatabaseOnDocker, OracleDialect}
 import org.apache.spark.sql.jdbc.v2.JDBCV2JoinPushdownIntegrationSuiteBase
 import org.apache.spark.tags.DockerTest
@@ -57,22 +55,12 @@ import org.apache.spark.tags.DockerTest
 class OracleJoinPushdownIntegrationSuite
   extends DockerJDBCIntegrationSuite
   with JDBCV2JoinPushdownIntegrationSuiteBase {
-  override val catalogName: String = "oracle"
-
   override val namespaceOpt: Option[String] = Some("SYSTEM")
 
   override val db = new OracleDatabaseOnDocker
 
   override val url = db.getJdbcUrl(dockerIp, externalPort)
 
-  override def sparkConf: SparkConf = super.sparkConf
-    .set(s"spark.sql.catalog.$catalogName", classOf[JDBCTableCatalog].getName)
-    .set(s"spark.sql.catalog.$catalogName.url", url)
-    .set(s"spark.sql.catalog.$catalogName.pushDownJoin", "true")
-    .set(s"spark.sql.catalog.$catalogName.pushDownAggregate", "true")
-    .set(s"spark.sql.catalog.$catalogName.pushDownLimit", "true")
-    .set(s"spark.sql.catalog.$catalogName.pushDownOffset", "true")
-
   override val jdbcDialect: JdbcDialect = OracleDialect()
 
   override def caseConvert(tableName: String): String = tableName.toUpperCase(Locale.ROOT)

sql/core/src/test/scala/org/apache/spark/sql/jdbc/v2/JDBCV2JoinPushdownIntegrationSuiteBase.scala

@@ -20,9 +20,11 @@ package org.apache.spark.sql.jdbc.v2
 import java.sql.{Connection, DriverManager}
 import java.util.Properties
 
+import org.apache.spark.SparkConf
 import org.apache.spark.sql.QueryTest
 import org.apache.spark.sql.connector.DataSourcePushdownTestUtils
 import org.apache.spark.sql.execution.datasources.jdbc.JdbcUtils
+import org.apache.spark.sql.execution.datasources.v2.jdbc.JDBCTableCatalog
 import org.apache.spark.sql.internal.SQLConf
 import org.apache.spark.sql.jdbc.JdbcDialect
 import org.apache.spark.sql.test.SharedSparkSession
@@ -32,7 +34,7 @@ trait JDBCV2JoinPushdownIntegrationSuiteBase
   extends QueryTest
   with SharedSparkSession
   with DataSourcePushdownTestUtils {
-  val catalogName: String
+  val catalogName: String = "join_pushdown_catalog"
   val namespaceOpt: Option[String] = None
   val url: String
 
@@ -41,6 +43,14 @@ trait JDBCV2JoinPushdownIntegrationSuiteBase
 
   val jdbcDialect: JdbcDialect
 
+  override def sparkConf: SparkConf = super.sparkConf
+    .set(s"spark.sql.catalog.$catalogName", classOf[JDBCTableCatalog].getName)
+    .set(s"spark.sql.catalog.$catalogName.url", url)
+    .set(s"spark.sql.catalog.$catalogName.pushDownJoin", "true")
+    .set(s"spark.sql.catalog.$catalogName.pushDownAggregate", "true")
+    .set(s"spark.sql.catalog.$catalogName.pushDownLimit", "true")
+    .set(s"spark.sql.catalog.$catalogName.pushDownOffset", "true")
+
   private def catalogAndNamespace =
     namespaceOpt.map(namespace => s"$catalogName.$namespace").getOrElse(catalogName)
 

sql/core/src/test/scala/org/apache/spark/sql/jdbc/v2/JDBCV2JoinPushdownSuite.scala

@@ -22,7 +22,6 @@ import java.sql.Connection
 import org.apache.spark.SparkConf
 import org.apache.spark.sql.{ExplainSuiteHelper, QueryTest}
 import org.apache.spark.sql.connector.DataSourcePushdownTestUtils
-import org.apache.spark.sql.execution.datasources.v2.jdbc.JDBCTableCatalog
 import org.apache.spark.sql.jdbc.{H2Dialect, JdbcDialect}
 import org.apache.spark.sql.test.SharedSparkSession
 import org.apache.spark.util.Utils
@@ -36,19 +35,12 @@ class JDBCV2JoinPushdownSuite
   val tempDir = Utils.createTempDir()
   override val url = s"jdbc:h2:${tempDir.getCanonicalPath};user=testUser;password=testPass"
 
-  override val catalogName: String = "h2"
   override val namespaceOpt: Option[String] = Some("test")
 
   override val jdbcDialect: JdbcDialect = H2Dialect()
 
   override def sparkConf: SparkConf = super.sparkConf
-    .set("spark.sql.catalog.h2", classOf[JDBCTableCatalog].getName)
-    .set("spark.sql.catalog.h2.url", url)
     .set("spark.sql.catalog.h2.driver", "org.h2.Driver")
-    .set("spark.sql.catalog.h2.pushDownAggregate", "true")
-    .set("spark.sql.catalog.h2.pushDownLimit", "true")
-    .set("spark.sql.catalog.h2.pushDownOffset", "true")
-    .set("spark.sql.catalog.h2.pushDownJoin", "true")
 
   override def qualifyTableName(tableName: String): String = namespaceOpt
     .map(namespace => s""""$namespace"."$tableName"""").getOrElse(s""""$tableName"""")