This is an automated email from the ASF dual-hosted git repository.
yuzelin 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 9c2e86def [spark] Change SQLConfUtils to scala (#3242)
9c2e86def is described below
commit 9c2e86defc1db093253649960525d956253ffe57
Author: Zouxxyy <[email protected]>
AuthorDate: Fri Apr 19 18:58:41 2024 +0800
[spark] Change SQLConfUtils to scala (#3242)
---
.../scala/org/apache/paimon/spark/util/SQLConfUtils.scala} | 12 ++++++------
.../scala/org/apache/paimon/spark/util/SQLConfUtils.scala} | 13 ++++++-------
.../scala/org/apache/paimon/spark/util/SQLConfUtils.scala} | 13 ++++++-------
.../java/org/apache/paimon/spark/SparkGenericCatalog.java | 2 +-
.../scala/org/apache/paimon/spark/util/SQLConfUtils.scala} | 11 ++++-------
5 files changed, 23 insertions(+), 28 deletions(-)
diff --git
a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/utils/SQLConfUtils.java
b/paimon-spark/paimon-spark-3.1/src/main/scala/org/apache/paimon/spark/util/SQLConfUtils.scala
similarity index 79%
rename from
paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/utils/SQLConfUtils.java
rename to
paimon-spark/paimon-spark-3.1/src/main/scala/org/apache/paimon/spark/util/SQLConfUtils.scala
index c7055ab7a..ca402d794 100644
---
a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/utils/SQLConfUtils.java
+++
b/paimon-spark/paimon-spark-3.1/src/main/scala/org/apache/paimon/spark/util/SQLConfUtils.scala
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package org.apache.paimon.spark.utils;
+package org.apache.paimon.spark.util
-import org.apache.spark.sql.internal.SQLConf;
+import org.apache.paimon.catalog.Catalog
+
+import org.apache.spark.sql.internal.SQLConf
/** SQLConf utils. */
-public class SQLConfUtils {
- public static String defaultDatabase(SQLConf sqlConf) {
- return sqlConf.defaultDatabase();
- }
+object SQLConfUtils {
+ def defaultDatabase(sqlConf: SQLConf): String = Catalog.DEFAULT_DATABASE
}
diff --git
a/paimon-spark/paimon-spark-3.1/src/main/scala/org/apache/paimon/spark/utils/SQLConfUtils.java
b/paimon-spark/paimon-spark-3.2/src/main/scala/org/apache/paimon/spark/util/SQLConfUtils.scala
similarity index 76%
rename from
paimon-spark/paimon-spark-3.1/src/main/scala/org/apache/paimon/spark/utils/SQLConfUtils.java
rename to
paimon-spark/paimon-spark-3.2/src/main/scala/org/apache/paimon/spark/util/SQLConfUtils.scala
index 38a4b4fcc..ca402d794 100644
---
a/paimon-spark/paimon-spark-3.1/src/main/scala/org/apache/paimon/spark/utils/SQLConfUtils.java
+++
b/paimon-spark/paimon-spark-3.2/src/main/scala/org/apache/paimon/spark/util/SQLConfUtils.scala
@@ -16,14 +16,13 @@
* limitations under the License.
*/
-package org.apache.paimon.spark.utils;
+package org.apache.paimon.spark.util
-import org.apache.paimon.catalog.Catalog;
-import org.apache.spark.sql.internal.SQLConf;
+import org.apache.paimon.catalog.Catalog
+
+import org.apache.spark.sql.internal.SQLConf
/** SQLConf utils. */
-public class SQLConfUtils {
- public static String defaultDatabase(SQLConf sqlConf) {
- return Catalog.DEFAULT_DATABASE;
- }
+object SQLConfUtils {
+ def defaultDatabase(sqlConf: SQLConf): String = Catalog.DEFAULT_DATABASE
}
diff --git
a/paimon-spark/paimon-spark-3.2/src/main/scala/org/apache/paimon/spark/utils/SQLConfUtils.java
b/paimon-spark/paimon-spark-3.3/src/main/scala/org/apache/paimon/spark/util/SQLConfUtils.scala
similarity index 76%
rename from
paimon-spark/paimon-spark-3.2/src/main/scala/org/apache/paimon/spark/utils/SQLConfUtils.java
rename to
paimon-spark/paimon-spark-3.3/src/main/scala/org/apache/paimon/spark/util/SQLConfUtils.scala
index 38a4b4fcc..ca402d794 100644
---
a/paimon-spark/paimon-spark-3.2/src/main/scala/org/apache/paimon/spark/utils/SQLConfUtils.java
+++
b/paimon-spark/paimon-spark-3.3/src/main/scala/org/apache/paimon/spark/util/SQLConfUtils.scala
@@ -16,14 +16,13 @@
* limitations under the License.
*/
-package org.apache.paimon.spark.utils;
+package org.apache.paimon.spark.util
-import org.apache.paimon.catalog.Catalog;
-import org.apache.spark.sql.internal.SQLConf;
+import org.apache.paimon.catalog.Catalog
+
+import org.apache.spark.sql.internal.SQLConf
/** SQLConf utils. */
-public class SQLConfUtils {
- public static String defaultDatabase(SQLConf sqlConf) {
- return Catalog.DEFAULT_DATABASE;
- }
+object SQLConfUtils {
+ def defaultDatabase(sqlConf: SQLConf): String = Catalog.DEFAULT_DATABASE
}
diff --git
a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkGenericCatalog.java
b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkGenericCatalog.java
index 5b947302c..cf8ee38ab 100644
---
a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkGenericCatalog.java
+++
b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkGenericCatalog.java
@@ -22,7 +22,7 @@ import org.apache.paimon.catalog.Catalog;
import org.apache.paimon.hive.HiveCatalogOptions;
import org.apache.paimon.options.CatalogOptions;
import org.apache.paimon.spark.catalog.SparkBaseCatalog;
-import org.apache.paimon.spark.utils.SQLConfUtils;
+import org.apache.paimon.spark.util.SQLConfUtils;
import org.apache.paimon.utils.Preconditions;
import org.apache.hadoop.conf.Configuration;
diff --git
a/paimon-spark/paimon-spark-3.3/src/main/scala/org/apache/paimon/spark/utils/SQLConfUtils.java
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/util/SQLConfUtils.scala
similarity index 76%
rename from
paimon-spark/paimon-spark-3.3/src/main/scala/org/apache/paimon/spark/utils/SQLConfUtils.java
rename to
paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/util/SQLConfUtils.scala
index 38a4b4fcc..cacf034b8 100644
---
a/paimon-spark/paimon-spark-3.3/src/main/scala/org/apache/paimon/spark/utils/SQLConfUtils.java
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/util/SQLConfUtils.scala
@@ -16,14 +16,11 @@
* limitations under the License.
*/
-package org.apache.paimon.spark.utils;
+package org.apache.paimon.spark.util
-import org.apache.paimon.catalog.Catalog;
-import org.apache.spark.sql.internal.SQLConf;
+import org.apache.spark.sql.internal.SQLConf
/** SQLConf utils. */
-public class SQLConfUtils {
- public static String defaultDatabase(SQLConf sqlConf) {
- return Catalog.DEFAULT_DATABASE;
- }
+object SQLConfUtils {
+ def defaultDatabase(sqlConf: SQLConf): String = sqlConf.defaultDatabase
}
