This is an automated email from the ASF dual-hosted git repository.
j1wonpark 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 6a55a5f5d [AMORO-4435] Fix typos and grammar in error messages and
comments (#4436)
6a55a5f5d is described below
commit 6a55a5f5d9dbd4ffe34b9d0ade37859ebd379133
Author: yaolei <[email protected]>
AuthorDate: Tue Oct 13 21:04:10 2026 +0800
[AMORO-4435] Fix typos and grammar in error messages and comments (#4436)
Co-authored-by: yaolei <[email protected]>
---
.../test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java | 2 +-
.../main/java/org/apache/amoro/formats/hudi/HudiHadoopCatalog.java | 4 ++--
.../main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java | 2 +-
.../src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogBase.java | 2 +-
.../main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java | 2 +-
.../org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java | 2 +-
.../main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java | 2 +-
.../org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java | 2 +-
.../main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java | 2 +-
.../org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/amoro-ams/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java
b/amoro-ams/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java
index 5a3c4aa82..e830e6f69 100644
---
a/amoro-ams/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java
+++
b/amoro-ams/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java
@@ -125,7 +125,7 @@ public abstract class RestCatalogServiceTestBase {
protected void assertTableRuntime(TableIdentifier identifier, TableFormat
format) {
TableRuntime runtime = getTableRuntime(identifier);
- Assertions.assertNotNull(runtime, "table runtime is not exists after
created");
+ Assertions.assertNotNull(runtime, "table runtime does not exist after
created");
Assertions.assertEquals(format, runtime.getFormat());
}
}
diff --git
a/amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiHadoopCatalog.java
b/amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiHadoopCatalog.java
index eae599a9f..6dbcff008 100644
---
a/amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiHadoopCatalog.java
+++
b/amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiHadoopCatalog.java
@@ -160,7 +160,7 @@ public class HudiHadoopCatalog implements FormatCatalog {
try {
items = fs.listStatus(databasePath);
} catch (FileNotFoundException e) {
- throw new NoSuchDatabaseException("Database: " + database + " is
not exists", e);
+ throw new NoSuchDatabaseException("Database: " + database + " does
not exist", e);
}
if (items == null || items.length == 0) {
return Lists.newArrayList();
@@ -205,7 +205,7 @@ public class HudiHadoopCatalog implements FormatCatalog {
if (isHoodieTableBase(fs, tablePath)) {
return tablePath.toString();
}
- throw new NoSuchTableException(database + "." + table + " is not
exists");
+ throw new NoSuchTableException(database + "." + table + " does not
exist");
});
}
diff --git
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java
index c56bb6c94..548c95a29 100644
---
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java
+++
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java
@@ -465,7 +465,7 @@ public class FlinkUnifiedCatalog extends AbstractCatalog {
}
/**
- * Get the original flink catalog for the given table, if the flink catalog
is not exists in the
+ * Get the original flink catalog for the given table, if the flink catalog
does not exist in the
* cache, would create a new original flink catalog for this table format.
*
* @param amoroTable amoroTable
diff --git
a/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogBase.java
b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogBase.java
index 5dc912a2c..5eb5d1722 100644
---
a/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogBase.java
+++
b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogBase.java
@@ -96,7 +96,7 @@ public class SparkUnifiedCatalogBase implements TableCatalog,
SupportsNamespaces
registerCatalogName = name;
if
(CatalogManager.SESSION_CATALOG_NAME().equalsIgnoreCase(registerCatalogName)) {
LOG.warn(
- "Catalog name is not exists in catalog uri, using spark catalog
as register catalog name, but "
+ "Catalog name does not exist in catalog uri, using spark catalog
as registered catalog name, but "
+ "current name "
+ registerCatalogName
+ " is spark session catalog name.");
diff --git
a/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
index 014177b50..481166b1b 100644
---
a/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
+++
b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
@@ -30,7 +30,7 @@ import
org.apache.spark.sql.connector.catalog.functions.UnboundFunction;
import org.apache.spark.sql.util.CaseInsensitiveStringMap;
/**
- * For TableCatalog in spark 3.3 is different with spark 3.2。 so we define it
seperately 1、 we
+ * For TableCatalog in spark 3.3 is different with spark 3.2。 so we define it
separately 1、 we
* support the grammar feature of time travel. 2、 support FunctionCatalog
*/
public class SparkUnifiedSessionCatalog<
diff --git
a/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
index a18f1a04c..690734704 100644
---
a/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
+++
b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
@@ -45,7 +45,7 @@ public class TestDropPartitionSQL extends MixedTableTestBase {
Arguments.of(TableFormat.MIXED_ICEBERG, ""));
}
- @DisplayName("Test `test drop partiton`")
+ @DisplayName("Test `test drop partition`")
@ParameterizedTest
@MethodSource
public void testDropPartition(TableFormat format, String primaryKeyDDL) {
diff --git
a/amoro-format-mixed/amoro-mixed-spark/v3.4/amoro-mixed-spark-3.4/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
b/amoro-format-mixed/amoro-mixed-spark/v3.4/amoro-mixed-spark-3.4/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
index 96213a63f..fe8b960b4 100644
---
a/amoro-format-mixed/amoro-mixed-spark/v3.4/amoro-mixed-spark-3.4/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
+++
b/amoro-format-mixed/amoro-mixed-spark/v3.4/amoro-mixed-spark-3.4/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
@@ -33,7 +33,7 @@ import
org.apache.spark.sql.connector.catalog.functions.UnboundFunction;
import org.apache.spark.sql.util.CaseInsensitiveStringMap;
/**
- * For TableCatalog in spark 3.3 is different with spark 3.2。 so we define it
seperately 1、 we
+ * For TableCatalog in spark 3.3 is different with spark 3.2。 so we define it
separately 1、 we
* support the grammar feature of time travel. 2、 support FunctionCatalog
*/
public class SparkUnifiedSessionCatalog<
diff --git
a/amoro-format-mixed/amoro-mixed-spark/v3.4/amoro-mixed-spark-3.4/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
b/amoro-format-mixed/amoro-mixed-spark/v3.4/amoro-mixed-spark-3.4/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
index a18f1a04c..690734704 100644
---
a/amoro-format-mixed/amoro-mixed-spark/v3.4/amoro-mixed-spark-3.4/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
+++
b/amoro-format-mixed/amoro-mixed-spark/v3.4/amoro-mixed-spark-3.4/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
@@ -45,7 +45,7 @@ public class TestDropPartitionSQL extends MixedTableTestBase {
Arguments.of(TableFormat.MIXED_ICEBERG, ""));
}
- @DisplayName("Test `test drop partiton`")
+ @DisplayName("Test `test drop partition`")
@ParameterizedTest
@MethodSource
public void testDropPartition(TableFormat format, String primaryKeyDDL) {
diff --git
a/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
b/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
index 96213a63f..fe8b960b4 100644
---
a/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
+++
b/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
@@ -33,7 +33,7 @@ import
org.apache.spark.sql.connector.catalog.functions.UnboundFunction;
import org.apache.spark.sql.util.CaseInsensitiveStringMap;
/**
- * For TableCatalog in spark 3.3 is different with spark 3.2。 so we define it
seperately 1、 we
+ * For TableCatalog in spark 3.3 is different with spark 3.2。 so we define it
separately 1、 we
* support the grammar feature of time travel. 2、 support FunctionCatalog
*/
public class SparkUnifiedSessionCatalog<
diff --git
a/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
b/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
index a18f1a04c..690734704 100644
---
a/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
+++
b/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
@@ -45,7 +45,7 @@ public class TestDropPartitionSQL extends MixedTableTestBase {
Arguments.of(TableFormat.MIXED_ICEBERG, ""));
}
- @DisplayName("Test `test drop partiton`")
+ @DisplayName("Test `test drop partition`")
@ParameterizedTest
@MethodSource
public void testDropPartition(TableFormat format, String primaryKeyDDL) {
