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 a31082a0f [AMORO-2886] Optimize the naming of database/table methods
in catalog (#2887)
a31082a0f is described below
commit a31082a0f09afbd8f4d7a6c37a51aa298a593e20
Author: xleoken <[email protected]>
AuthorDate: Fri May 31 12:37:19 2024 +0800
[AMORO-2886] Optimize the naming of database/table methods in catalog
(#2887)
---
.../java/org/apache/amoro/server/RestCatalogService.java | 6 +++---
.../org/apache/amoro/server/catalog/ExternalCatalog.java | 8 ++++----
.../org/apache/amoro/server/catalog/InternalCatalog.java | 8 ++++----
.../amoro/server/catalog/InternalIcebergCatalogImpl.java | 2 +-
.../apache/amoro/server/catalog/MixedHiveCatalogImpl.java | 2 +-
.../org/apache/amoro/server/catalog/ServerCatalog.java | 4 ++--
.../amoro/server/dashboard/controller/TableController.java | 4 ++--
.../org/apache/amoro/server/table/DefaultTableService.java | 2 +-
.../amoro/server/TestInternalIcebergCatalogService.java | 2 +-
.../org/apache/amoro/server/catalog/TestServerCatalog.java | 4 ++--
.../server/optimizing/TestIcebergHadoopOptimizing.java | 4 ++--
.../src/main/java/org/apache/amoro/AmoroCatalog.java | 4 ++--
.../main/java/org/apache/amoro/CommonUnifiedCatalog.java | 14 +++++++-------
.../org/apache/amoro/formats/iceberg/IcebergCatalog.java | 4 ++--
.../java/org/apache/amoro/formats/mixed/MixedCatalog.java | 4 ++--
.../org/apache/amoro/formats/paimon/PaimonCatalog.java | 4 ++--
.../org/apache/amoro/formats/TestAmoroCatalogBase.java | 4 ++--
.../apache/amoro/flink/catalog/FlinkUnifiedCatalog.java | 4 ++--
.../java/org/apache/amoro/spark/SparkUnifiedCatalog.java | 6 +++---
.../java/org/apache/amoro/spark/test/SparkTestBase.java | 2 +-
.../amoro/spark/test/unified/UnifiedCatalogTestSuites.java | 4 ++--
21 files changed, 48 insertions(+), 48 deletions(-)
diff --git
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/RestCatalogService.java
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/RestCatalogService.java
index 015249105..67dff3625 100644
---
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/RestCatalogService.java
+++
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/RestCatalogService.java
@@ -209,7 +209,7 @@ public class RestCatalogService extends PersistentBase {
} else {
checkUnsupported(
!ns.contains("."), "multi-level namespace is not supported,
parent: " + ns);
- checkDatabaseExist(catalog.exist(ns), ns);
+ checkDatabaseExist(catalog.databaseExists(ns), ns);
}
return ListNamespacesResponse.builder().addAll(nsLists).build();
});
@@ -224,7 +224,7 @@ public class RestCatalogService extends PersistentBase {
Namespace ns = request.namespace();
checkUnsupported(ns.length() == 1, "multi-level namespace is not
supported now");
String database = ns.level(0);
- checkAlreadyExists(!catalog.exist(database), "Database", database);
+ checkAlreadyExists(!catalog.databaseExists(database), "Database",
database);
catalog.createDatabase(database);
return
CreateNamespaceResponse.builder().withNamespace(Namespace.of(database)).build();
});
@@ -410,7 +410,7 @@ public class RestCatalogService extends PersistentBase {
String ns = ctx.pathParam("namespace");
Preconditions.checkNotNull(ns, "namespace is null");
checkUnsupported(!ns.contains("."), "multi-level namespace is not
supported");
- checkDatabaseExist(catalog.exist(ns), ns);
+ checkDatabaseExist(catalog.databaseExists(ns), ns);
return handler.apply(catalog, ns);
});
}
diff --git
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ExternalCatalog.java
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ExternalCatalog.java
index 5fd6a1f18..6067929ef 100644
---
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ExternalCatalog.java
+++
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ExternalCatalog.java
@@ -83,13 +83,13 @@ public class ExternalCatalog extends ServerCatalog {
}
@Override
- public boolean exist(String database) {
- return doAs(() -> unifiedCatalog.exist(database));
+ public boolean databaseExists(String database) {
+ return doAs(() -> unifiedCatalog.databaseExists(database));
}
@Override
- public boolean exist(String database, String tableName) {
- return doAs(() -> unifiedCatalog.exist(database, tableName));
+ public boolean tableExists(String database, String tableName) {
+ return doAs(() -> unifiedCatalog.tableExists(database, tableName));
}
@Override
diff --git
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalCatalog.java
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalCatalog.java
index f8793ebe8..e540c699e 100644
---
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalCatalog.java
+++
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalCatalog.java
@@ -51,7 +51,7 @@ public abstract class InternalCatalog extends ServerCatalog {
}
public void createDatabase(String databaseName) {
- if (!exist(databaseName)) {
+ if (!databaseExists(databaseName)) {
doAsTransaction(
// make sure catalog existed in database
() ->
@@ -70,7 +70,7 @@ public abstract class InternalCatalog extends ServerCatalog {
}
public void dropDatabase(String databaseName) {
- if (exist(databaseName)) {
+ if (databaseExists(databaseName)) {
doAsTransaction(
() ->
doAsExisted(
@@ -177,7 +177,7 @@ public abstract class InternalCatalog extends ServerCatalog
{
}
@Override
- public boolean exist(String database) {
+ public boolean databaseExists(String database) {
return getAs(
TableMetaMapper.class,
mapper -> mapper.selectDatabase(getMetadata().getCatalogName(),
database))
@@ -185,7 +185,7 @@ public abstract class InternalCatalog extends ServerCatalog
{
}
@Override
- public boolean exist(String database, String tableName) {
+ public boolean tableExists(String database, String tableName) {
ServerTableIdentifier tableIdentifier =
getAs(
TableMetaMapper.class,
diff --git
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java
index a174076f9..43c42c204 100644
---
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java
+++
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java
@@ -118,7 +118,7 @@ public class InternalIcebergCatalogImpl extends
InternalCatalog {
Preconditions.checkArgument(
format == format(), "the catalog only support to create %s table",
format().name());
- if (exist(database, tableName)) {
+ if (tableExists(database, tableName)) {
throw new AlreadyExistsException(
"Table " + name() + "." + database + "." + tableName + " already " +
"exists.");
}
diff --git
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/MixedHiveCatalogImpl.java
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/MixedHiveCatalogImpl.java
index fd1c24ff7..917822498 100644
---
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/MixedHiveCatalogImpl.java
+++
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/MixedHiveCatalogImpl.java
@@ -103,7 +103,7 @@ public class MixedHiveCatalogImpl extends InternalCatalog {
}
@Override
- public boolean exist(String database) {
+ public boolean databaseExists(String database) {
try {
return hiveClientPool.run(
client -> {
diff --git
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ServerCatalog.java
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ServerCatalog.java
index a959b8ea8..48fe6b951 100644
---
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ServerCatalog.java
+++
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ServerCatalog.java
@@ -48,9 +48,9 @@ public abstract class ServerCatalog extends PersistentBase {
this.metadata = metadata;
}
- public abstract boolean exist(String database);
+ public abstract boolean databaseExists(String database);
- public abstract boolean exist(String database, String tableName);
+ public abstract boolean tableExists(String database, String tableName);
public abstract List<String> listDatabases();
diff --git
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
index e39edd781..db576d253 100644
---
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
+++
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
@@ -297,7 +297,7 @@ public class TableController {
ServerCatalog serverCatalog = tableService.getServerCatalog(catalog);
Preconditions.checkArgument(offset >= 0, "offset[%s] must >= 0", offset);
Preconditions.checkArgument(limit >= 0, "limit[%s] must >= 0", limit);
- Preconditions.checkState(serverCatalog.exist(db, table), "no such table");
+ Preconditions.checkState(serverCatalog.tableExists(db, table), "no such
table");
TableIdentifier tableIdentifier = TableIdentifier.of(catalog, db, table);
Pair<List<OptimizingProcessInfo>, Integer> optimizingProcessesInfo =
@@ -327,7 +327,7 @@ public class TableController {
ServerCatalog serverCatalog = tableService.getServerCatalog(catalog);
Preconditions.checkArgument(offset >= 0, "offset[%s] must >= 0", offset);
Preconditions.checkArgument(limit >= 0, "limit[%s] must >= 0", limit);
- Preconditions.checkState(serverCatalog.exist(db, table), "no such table");
+ Preconditions.checkState(serverCatalog.tableExists(db, table), "no such
table");
TableIdentifier tableIdentifier = TableIdentifier.of(catalog, db, table);
List<OptimizingTaskInfo> optimizingTaskInfos =
diff --git
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/DefaultTableService.java
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/DefaultTableService.java
index 19cc357b7..56a46edb4 100644
---
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/DefaultTableService.java
+++
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/DefaultTableService.java
@@ -278,7 +278,7 @@ public class DefaultTableService extends
StatedPersistentBase implements TableSe
public boolean tableExist(TableIdentifier tableIdentifier) {
checkStarted();
return getServerCatalog(tableIdentifier.getCatalog())
- .exist(tableIdentifier.getDatabase(), tableIdentifier.getTableName());
+ .tableExists(tableIdentifier.getDatabase(),
tableIdentifier.getTableName());
}
@Override
diff --git
a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestInternalIcebergCatalogService.java
b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestInternalIcebergCatalogService.java
index a3648a9ac..541cf88b9 100644
---
a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestInternalIcebergCatalogService.java
+++
b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestInternalIcebergCatalogService.java
@@ -125,7 +125,7 @@ public class TestInternalIcebergCatalogService extends
RestCatalogServiceTestBas
@AfterEach
public void clean() {
nsCatalog.dropTable(identifier);
- if (serverCatalog.exist(database, table)) {
+ if (serverCatalog.tableExists(database, table)) {
serverCatalog.dropTable(database, table);
}
serverCatalog.dropDatabase(database);
diff --git
a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/catalog/TestServerCatalog.java
b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/catalog/TestServerCatalog.java
index 1aff22ef5..76e1bbd14 100644
---
a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/catalog/TestServerCatalog.java
+++
b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/catalog/TestServerCatalog.java
@@ -70,12 +70,12 @@ public class TestServerCatalog extends TableCatalogTestBase
{
@Test
public void dataBaseExists() {
- Assert.assertTrue(getServerCatalog().exist(testDatabaseName));
+ Assert.assertTrue(getServerCatalog().databaseExists(testDatabaseName));
}
@Test
public void tableExists() {
- Assert.assertTrue(getServerCatalog().exist(testDatabaseName,
testTableName));
+ Assert.assertTrue(getServerCatalog().tableExists(testDatabaseName,
testTableName));
}
@Test
diff --git
a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestIcebergHadoopOptimizing.java
b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestIcebergHadoopOptimizing.java
index 5c565ecba..750327a5e 100644
---
a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestIcebergHadoopOptimizing.java
+++
b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestIcebergHadoopOptimizing.java
@@ -74,7 +74,7 @@ public class TestIcebergHadoopOptimizing extends
AbstractOptimizingTest {
if (icebergCatalog != null) {
icebergCatalog.dropTable(TableIdentifier.of(DATABASE, TABLE), true);
}
- if (serverCatalog != null && serverCatalog.exist(DATABASE, TABLE)) {
+ if (serverCatalog != null && serverCatalog.tableExists(DATABASE, TABLE)) {
serverCatalog.dropTable(DATABASE, TABLE);
}
}
@@ -410,7 +410,7 @@ public class TestIcebergHadoopOptimizing extends
AbstractOptimizingTest {
amsEnv.serviceContainer().getTableService().getServerCatalog(catalog);
if (serverCatalog instanceof InternalCatalog) {
this.serverCatalog = (InternalCatalog) serverCatalog;
- if (!this.serverCatalog.exist(DATABASE)) {
+ if (!this.serverCatalog.databaseExists(DATABASE)) {
this.serverCatalog.createDatabase(DATABASE);
}
}
diff --git a/amoro-core/src/main/java/org/apache/amoro/AmoroCatalog.java
b/amoro-core/src/main/java/org/apache/amoro/AmoroCatalog.java
index 736175e3a..8f51b066c 100644
--- a/amoro-core/src/main/java/org/apache/amoro/AmoroCatalog.java
+++ b/amoro-core/src/main/java/org/apache/amoro/AmoroCatalog.java
@@ -36,7 +36,7 @@ public interface AmoroCatalog {
* @param database a database name
* @return true if the database exists, false otherwise
*/
- boolean exist(String database);
+ boolean databaseExists(String database);
/**
* Check whether table exists.
@@ -45,7 +45,7 @@ public interface AmoroCatalog {
* @param table a table name
* @return true if the table exists, false otherwise
*/
- boolean exist(String database, String table);
+ boolean tableExists(String database, String table);
/**
* create database catalog.
diff --git
a/amoro-core/src/main/java/org/apache/amoro/CommonUnifiedCatalog.java
b/amoro-core/src/main/java/org/apache/amoro/CommonUnifiedCatalog.java
index 23edb5bd6..823f90d41 100644
--- a/amoro-core/src/main/java/org/apache/amoro/CommonUnifiedCatalog.java
+++ b/amoro-core/src/main/java/org/apache/amoro/CommonUnifiedCatalog.java
@@ -69,19 +69,19 @@ public class CommonUnifiedCatalog implements UnifiedCatalog
{
}
@Override
- public boolean exist(String database) {
+ public boolean databaseExists(String database) {
return listDatabases().contains(database);
}
@Override
- public boolean exist(String database, String table) {
+ public boolean tableExists(String database, String table) {
return formatCatalogAsOrder(TableFormat.values())
- .anyMatch(formatCatalog -> formatCatalog.exist(database, table));
+ .anyMatch(formatCatalog -> formatCatalog.tableExists(database, table));
}
@Override
public void createDatabase(String database) {
- if (exist(database)) {
+ if (databaseExists(database)) {
throw new AlreadyExistsException("Database: " + database + " already
exists.");
}
@@ -90,7 +90,7 @@ public class CommonUnifiedCatalog implements UnifiedCatalog {
@Override
public void dropDatabase(String database) {
- if (!exist(database)) {
+ if (!databaseExists(database)) {
throw new NoSuchDatabaseException("Database: " + database + " does not
exist.");
}
if (!listTables(database).isEmpty()) {
@@ -101,7 +101,7 @@ public class CommonUnifiedCatalog implements UnifiedCatalog
{
@Override
public AmoroTable<?> loadTable(String database, String table) {
- if (!exist(database)) {
+ if (!databaseExists(database)) {
throw new NoSuchDatabaseException("Database: " + database + " does not
exist.");
}
@@ -130,7 +130,7 @@ public class CommonUnifiedCatalog implements UnifiedCatalog
{
@Override
public List<TableIDWithFormat> listTables(String database) {
- if (!exist(database)) {
+ if (!databaseExists(database)) {
throw new NoSuchDatabaseException("Database: " + database + " does not
exist.");
}
TableFormat[] formats =
diff --git
a/amoro-core/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalog.java
b/amoro-core/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalog.java
index f4424240d..d99129ed7 100644
---
a/amoro-core/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalog.java
+++
b/amoro-core/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalog.java
@@ -59,12 +59,12 @@ public class IcebergCatalog implements FormatCatalog {
}
@Override
- public boolean exist(String database) {
+ public boolean databaseExists(String database) {
return listDatabases().contains(database);
}
@Override
- public boolean exist(String database, String table) {
+ public boolean tableExists(String database, String table) {
TableIdentifier identifier = TableIdentifier.of(database, table);
return metaStore.doAs(() -> icebergCatalog.tableExists(identifier));
}
diff --git
a/amoro-core/src/main/java/org/apache/amoro/formats/mixed/MixedCatalog.java
b/amoro-core/src/main/java/org/apache/amoro/formats/mixed/MixedCatalog.java
index 8e57d0446..4ed6a9ea6 100644
--- a/amoro-core/src/main/java/org/apache/amoro/formats/mixed/MixedCatalog.java
+++ b/amoro-core/src/main/java/org/apache/amoro/formats/mixed/MixedCatalog.java
@@ -44,12 +44,12 @@ public class MixedCatalog implements FormatCatalog {
}
@Override
- public boolean exist(String database) {
+ public boolean databaseExists(String database) {
return catalog.listDatabases().contains(database);
}
@Override
- public boolean exist(String database, String table) {
+ public boolean tableExists(String database, String table) {
return catalog.tableExists(TableIdentifier.of(catalog.name(), database,
table));
}
diff --git
a/amoro-core/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalog.java
b/amoro-core/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalog.java
index 0b879703c..b795f0332 100644
---
a/amoro-core/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalog.java
+++
b/amoro-core/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalog.java
@@ -47,12 +47,12 @@ public class PaimonCatalog implements FormatCatalog {
}
@Override
- public boolean exist(String database) {
+ public boolean databaseExists(String database) {
return catalog.databaseExists(database);
}
@Override
- public boolean exist(String database, String table) {
+ public boolean tableExists(String database, String table) {
return catalog.tableExists(Identifier.create(database, table));
}
diff --git
a/amoro-core/src/test/java/org/apache/amoro/formats/TestAmoroCatalogBase.java
b/amoro-core/src/test/java/org/apache/amoro/formats/TestAmoroCatalogBase.java
index 2e9f2a767..2e1613d55 100644
---
a/amoro-core/src/test/java/org/apache/amoro/formats/TestAmoroCatalogBase.java
+++
b/amoro-core/src/test/java/org/apache/amoro/formats/TestAmoroCatalogBase.java
@@ -76,14 +76,14 @@ public abstract class TestAmoroCatalogBase extends
AmoroCatalogTestBase {
@Test
public void testExistsDatabase() {
createDatabase(DB1);
- Assert.assertTrue(amoroCatalog.exist(DB1));
+ Assert.assertTrue(amoroCatalog.databaseExists(DB1));
}
@Test
public void testExistsTable() {
createDatabase(DB1);
createTable(DB1, TABLE, new HashMap<>());
- Assert.assertTrue(amoroCatalog.exist(DB1, TABLE));
+ Assert.assertTrue(amoroCatalog.tableExists(DB1, TABLE));
}
@Test
diff --git
a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java
b/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java
index 21cafc46f..c36e361a7 100644
---
a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java
+++
b/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java
@@ -125,7 +125,7 @@ public class FlinkUnifiedCatalog extends AbstractCatalog {
@Override
public boolean databaseExists(String databaseName) {
- return unifiedCatalog.exist(databaseName);
+ return unifiedCatalog.databaseExists(databaseName);
}
@Override
@@ -193,7 +193,7 @@ public class FlinkUnifiedCatalog extends AbstractCatalog {
@Override
public boolean tableExists(ObjectPath tablePath) {
try {
- return unifiedCatalog.exist(tablePath.getDatabaseName(),
tablePath.getObjectName());
+ return unifiedCatalog.tableExists(tablePath.getDatabaseName(),
tablePath.getObjectName());
} catch (NoSuchDatabaseException | NoSuchTableException e) {
return false;
}
diff --git
a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalog.java
b/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalog.java
index 1fc9cef74..2454811e5 100644
---
a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalog.java
+++
b/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalog.java
@@ -126,7 +126,7 @@ public class SparkUnifiedCatalog implements TableCatalog,
SupportsNamespaces, Pr
@Override
public boolean namespaceExists(String[] namespace) {
- return unifiedCatalog.exist(namespaceToDatabase(namespace));
+ return unifiedCatalog.databaseExists(namespaceToDatabase(namespace));
}
@Override
@@ -160,7 +160,7 @@ public class SparkUnifiedCatalog implements TableCatalog,
SupportsNamespaces, Pr
unifiedCatalog.dropTable(database, id.getIdentifier().getTableName(),
true);
}
unifiedCatalog.dropDatabase(database);
- return !unifiedCatalog.exist(database);
+ return !unifiedCatalog.databaseExists(database);
}
@Override
@@ -215,7 +215,7 @@ public class SparkUnifiedCatalog implements TableCatalog,
SupportsNamespaces, Pr
@Override
public boolean tableExists(Identifier ident) {
- return unifiedCatalog.exist(namespaceToDatabase(ident.namespace()),
ident.name());
+ return unifiedCatalog.tableExists(namespaceToDatabase(ident.namespace()),
ident.name());
}
@Override
diff --git
a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/SparkTestBase.java
b/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/SparkTestBase.java
index 51972568f..d0489bb5e 100644
---
a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/SparkTestBase.java
+++
b/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/SparkTestBase.java
@@ -96,7 +96,7 @@ public class SparkTestBase {
try {
LOG.debug("prepare database for table test: " + database());
UnifiedCatalog catalog = unifiedCatalog();
- if (!unifiedCatalog().exist(database())) {
+ if (!unifiedCatalog().databaseExists(database())) {
catalog.createDatabase(database());
}
} catch (AlreadyExistsException e) {
diff --git
a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/unified/UnifiedCatalogTestSuites.java
b/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/unified/UnifiedCatalogTestSuites.java
index e42f3e13a..6c2b6b286 100644
---
a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/unified/UnifiedCatalogTestSuites.java
+++
b/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/unified/UnifiedCatalogTestSuites.java
@@ -95,7 +95,7 @@ public class UnifiedCatalogTestSuites extends SparkTestBase {
testCallProcedure(format);
sql("DROP TABLE " + target() + " PURGE");
- Assertions.assertFalse(unifiedCatalog().exist(target().database,
target().table));
+ Assertions.assertFalse(unifiedCatalog().tableExists(target().database,
target().table));
}
private String pkDDL(TableFormat format) {
@@ -173,7 +173,7 @@ public class UnifiedCatalogTestSuites extends SparkTestBase
{
UnifiedCatalog unifiedCatalog =
UnifiedCatalogLoader.loadUnifiedCatalog(
CONTEXT.amsThriftUrl(), format.name().toLowerCase(),
Maps.newHashMap());
- if (!unifiedCatalog().exist(database())) {
+ if (!unifiedCatalog().databaseExists(database())) {
unifiedCatalog.createDatabase(database());
}
}
