You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@amoro.apache.org by ji...@apache.org on 2025/01/21 03:35:02 UTC
(amoro) branch master updated: [Hotfix] Fix checkstyle errors (#3411)
This is an automated email from the ASF dual-hosted git repository.
jinsongzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git
The following commit(s) were added to refs/heads/master by this push:
new aebd9e96a [Hotfix] Fix checkstyle errors (#3411)
aebd9e96a is described below
commit aebd9e96a745b4833b1f89aa3036cd2949cae67c
Author: ZhouJinsong <zh...@163.com>
AuthorDate: Tue Jan 21 11:34:58 2025 +0800
[Hotfix] Fix checkstyle errors (#3411)
* Fix checkstyle errors
* Fix core ci configuration file
* Fix a compile error
* Fix checkstyle errors
---
.github/workflows/core-hadoop2-ci.yml | 6 +++---
.github/workflows/core-hadoop3-ci.yml | 6 +++---
.../java/org/apache/amoro/spark/SessionCatalogBase.java | 16 ++++++++++++++--
.../amoro/spark/SparkUnifiedSessionCatalogBase.java | 6 +++++-
.../amoro/spark/mixed/MixedSessionCatalogBase.java | 6 +++++-
.../amoro/spark/MixedFormatSparkSessionCatalog.java | 8 --------
.../apache/amoro/spark/SparkUnifiedSessionCatalog.java | 1 -
7 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/core-hadoop2-ci.yml b/.github/workflows/core-hadoop2-ci.yml
index 52e9834cf..15eb710d7 100644
--- a/.github/workflows/core-hadoop2-ci.yml
+++ b/.github/workflows/core-hadoop2-ci.yml
@@ -26,9 +26,9 @@ on:
- "amoro-format-iceberg/**"
- "amoro-format-paimon/**"
- "amoro-format-hudi/**"
- - "amoro-format-mixed/amoro-format-mixed-flink/**"
- - "amoro-format-mixed/amoro-format-mixed-hive/**"
- - "amoro-format-mixed/amoro-format-mixed-spark/**"
+ - "amoro-format-mixed/amoro-mixed-flink/**"
+ - "amoro-format-mixed/amoro-mixed-hive/**"
+ - "amoro-format-mixed/amoro-mixed-spark/**"
- "pom.xml"
- "tools/maven/**"
diff --git a/.github/workflows/core-hadoop3-ci.yml b/.github/workflows/core-hadoop3-ci.yml
index 4ccd7d69f..742ae0092 100644
--- a/.github/workflows/core-hadoop3-ci.yml
+++ b/.github/workflows/core-hadoop3-ci.yml
@@ -26,9 +26,9 @@ on:
- "amoro-format-iceberg/**"
- "amoro-format-paimon/**"
- "amoro-format-hudi/**"
- - "amoro-format-mixed/amoro-format-mixed-flink/**"
- - "amoro-format-mixed/amoro-format-mixed-hive/**"
- - "amoro-format-mixed/amoro-format-mixed-spark/**"
+ - "amoro-format-mixed/amoro-mixed-flink/**"
+ - "amoro-format-mixed/amoro-mixed-hive/**"
+ - "amoro-format-mixed/amoro-mixed-spark/**"
- "pom.xml"
- "tools/maven/**"
diff --git a/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SessionCatalogBase.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SessionCatalogBase.java
index ee054c458..b78074099 100644
--- a/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SessionCatalogBase.java
+++ b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SessionCatalogBase.java
@@ -20,8 +20,20 @@ package org.apache.amoro.spark;
import org.apache.amoro.shade.guava32.com.google.common.base.Preconditions;
import org.apache.iceberg.spark.functions.SparkFunctions;
-import org.apache.spark.sql.catalyst.analysis.*;
-import org.apache.spark.sql.connector.catalog.*;
+import org.apache.spark.sql.catalyst.analysis.NamespaceAlreadyExistsException;
+import org.apache.spark.sql.catalyst.analysis.NoSuchFunctionException;
+import org.apache.spark.sql.catalyst.analysis.NoSuchNamespaceException;
+import org.apache.spark.sql.catalyst.analysis.NoSuchTableException;
+import org.apache.spark.sql.catalyst.analysis.TableAlreadyExistsException;
+import org.apache.spark.sql.connector.catalog.CatalogExtension;
+import org.apache.spark.sql.connector.catalog.CatalogPlugin;
+import org.apache.spark.sql.connector.catalog.FunctionCatalog;
+import org.apache.spark.sql.connector.catalog.Identifier;
+import org.apache.spark.sql.connector.catalog.NamespaceChange;
+import org.apache.spark.sql.connector.catalog.SupportsNamespaces;
+import org.apache.spark.sql.connector.catalog.Table;
+import org.apache.spark.sql.connector.catalog.TableCatalog;
+import org.apache.spark.sql.connector.catalog.TableChange;
import org.apache.spark.sql.connector.catalog.functions.UnboundFunction;
import org.apache.spark.sql.connector.expressions.Transform;
import org.apache.spark.sql.types.StructType;
diff --git a/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalogBase.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalogBase.java
index 50f0ed0cc..7d1c15e80 100644
--- a/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalogBase.java
+++ b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalogBase.java
@@ -21,7 +21,11 @@ package org.apache.amoro.spark;
import org.apache.amoro.TableFormat;
import org.apache.amoro.shade.guava32.com.google.common.collect.Maps;
import org.apache.spark.sql.catalyst.analysis.NoSuchProcedureException;
-import org.apache.spark.sql.connector.catalog.*;
+import org.apache.spark.sql.connector.catalog.FunctionCatalog;
+import org.apache.spark.sql.connector.catalog.Identifier;
+import org.apache.spark.sql.connector.catalog.SupportsNamespaces;
+import org.apache.spark.sql.connector.catalog.Table;
+import org.apache.spark.sql.connector.catalog.TableCatalog;
import org.apache.spark.sql.connector.iceberg.catalog.Procedure;
import org.apache.spark.sql.connector.iceberg.catalog.ProcedureCatalog;
import org.apache.spark.sql.util.CaseInsensitiveStringMap;
diff --git a/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedSessionCatalogBase.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedSessionCatalogBase.java
index b9b13ee27..84918a9ec 100644
--- a/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedSessionCatalogBase.java
+++ b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedSessionCatalogBase.java
@@ -21,7 +21,11 @@ package org.apache.amoro.spark.mixed;
import org.apache.amoro.shade.guava32.com.google.common.collect.ImmutableSet;
import org.apache.amoro.spark.SessionCatalogBase;
import org.apache.commons.lang3.StringUtils;
-import org.apache.spark.sql.connector.catalog.*;
+import org.apache.spark.sql.connector.catalog.FunctionCatalog;
+import org.apache.spark.sql.connector.catalog.Identifier;
+import org.apache.spark.sql.connector.catalog.SupportsNamespaces;
+import org.apache.spark.sql.connector.catalog.Table;
+import org.apache.spark.sql.connector.catalog.TableCatalog;
import org.apache.spark.sql.util.CaseInsensitiveStringMap;
import java.util.Set;
diff --git a/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/MixedFormatSparkSessionCatalog.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/MixedFormatSparkSessionCatalog.java
index 320b84574..889bf03c0 100644
--- a/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/MixedFormatSparkSessionCatalog.java
+++ b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/MixedFormatSparkSessionCatalog.java
@@ -20,12 +20,9 @@ package org.apache.amoro.spark;
import org.apache.amoro.spark.mixed.MixedSessionCatalogBase;
import org.apache.amoro.spark.mixed.MixedSparkCatalogBase;
-import org.apache.spark.sql.catalyst.analysis.NoSuchProcedureException;
import org.apache.spark.sql.connector.catalog.FunctionCatalog;
-import org.apache.spark.sql.connector.catalog.Identifier;
import org.apache.spark.sql.connector.catalog.SupportsNamespaces;
import org.apache.spark.sql.connector.catalog.TableCatalog;
-import org.apache.spark.sql.connector.iceberg.catalog.Procedure;
import org.apache.spark.sql.util.CaseInsensitiveStringMap;
/**
@@ -43,9 +40,4 @@ public class MixedFormatSparkSessionCatalog<
newCatalog.initialize(name, options);
return newCatalog;
}
-
- @Override
- public Procedure loadProcedure(Identifier ident) throws NoSuchProcedureException {
- throw new NoSuchProcedureException(ident);
- }
}
diff --git a/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
index 2fab4b9bf..baa2c0a23 100644
--- a/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
+++ b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
@@ -23,7 +23,6 @@ import org.apache.spark.sql.connector.catalog.SupportsNamespaces;
import org.apache.spark.sql.connector.catalog.TableCatalog;
import org.apache.spark.sql.util.CaseInsensitiveStringMap;
-/** @Auth: hzwangtao6 @Time: 2024/5/24 14:04 @Description: */
public class SparkUnifiedSessionCatalog<
T extends TableCatalog & SupportsNamespaces & FunctionCatalog>
extends SparkUnifiedSessionCatalogBase<T> {