This is an automated email from the ASF dual-hosted git repository.
jshao pushed a commit to branch branch-1.2
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/branch-1.2 by this push:
new 868205015e [Cherry-pick to branch-1.2] [#10281] refactor: Revert
unnecessary change (#10288) (#10438)
868205015e is described below
commit 868205015e1ba2acaeea9f1d202f2eb5af29bbef
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Mar 16 19:34:57 2026 +0800
[Cherry-pick to branch-1.2] [#10281] refactor: Revert unnecessary change
(#10288) (#10438)
**Cherry-pick Information:**
- Original commit: 891ab2d655692a8169b507cdee16598f3fdb6aa3
- Target branch: `branch-1.2`
- Status: ✅ Clean cherry-pick (no conflicts)
---------
Co-authored-by: roryqi <[email protected]>
---
.../integration/test/CatalogClickHouseIT.java | 2 +-
.../catalog-jdbc-hologres/build.gradle.kts | 110 ---------------------
.../integration/test/CatalogOceanBaseIT.java | 2 +-
.../mysql/integration/test/CatalogMysqlIT.java | 2 +-
.../integration/test/CatalogPostgreSqlIT.java | 3 +-
.../integration/test/CatalogIcebergBaseIT.java | 3 +-
.../gravitino/server/web/rest/TableOperations.java | 9 --
.../gravitino/server/web/rest/TopicOperations.java | 9 --
.../server/web/rest/TestTableOperations.java | 1 -
.../server/web/rest/TestTopicOperations.java | 1 -
10 files changed, 5 insertions(+), 137 deletions(-)
diff --git
a/catalogs-contrib/catalog-jdbc-clickhouse/src/test/java/org/apache/gravitino/catalog/clickhouse/integration/test/CatalogClickHouseIT.java
b/catalogs-contrib/catalog-jdbc-clickhouse/src/test/java/org/apache/gravitino/catalog/clickhouse/integration/test/CatalogClickHouseIT.java
index 6afda5c453..aeb2ed6c07 100644
---
a/catalogs-contrib/catalog-jdbc-clickhouse/src/test/java/org/apache/gravitino/catalog/clickhouse/integration/test/CatalogClickHouseIT.java
+++
b/catalogs-contrib/catalog-jdbc-clickhouse/src/test/java/org/apache/gravitino/catalog/clickhouse/integration/test/CatalogClickHouseIT.java
@@ -317,7 +317,7 @@ public class CatalogClickHouseIT extends BaseIT {
// create failed check.
NameIdentifier table = NameIdentifier.of(testSchemaName, "test_table");
Assertions.assertThrows(
- NotFoundException.class,
+ NoSuchSchemaException.class,
() ->
tableCatalog.createTable(
table,
diff --git a/catalogs-contrib/catalog-jdbc-hologres/build.gradle.kts
b/catalogs-contrib/catalog-jdbc-hologres/build.gradle.kts
deleted file mode 100644
index 37eda346f7..0000000000
--- a/catalogs-contrib/catalog-jdbc-hologres/build.gradle.kts
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-description = "catalog-jdbc-hologres"
-
-plugins {
- `maven-publish`
- id("java")
- id("idea")
-}
-
-dependencies {
- compileOnly(project(":api"))
- compileOnly(project(":common"))
- compileOnly(project(":core"))
-
- implementation(project(":catalogs:catalog-common")) {
- exclude(group = "*")
- }
- implementation(project(":catalogs:catalog-jdbc-common")) {
- exclude(group = "*")
- }
-
- implementation(libs.bundles.log4j)
- implementation(libs.commons.collections4)
- implementation(libs.commons.lang3)
- implementation(libs.guava)
-
- testImplementation(project(":api"))
- testImplementation(project(":catalogs:catalog-jdbc-common", "testArtifacts"))
- testImplementation(project(":clients:client-java"))
- testImplementation(project(":common"))
- testImplementation(project(":core"))
- testImplementation(project(":integration-test-common", "testArtifacts"))
- testImplementation(project(":server"))
- testImplementation(project(":server-common"))
-
- testImplementation(libs.awaitility)
- testImplementation(libs.junit.jupiter.api)
- testImplementation(libs.junit.jupiter.params)
- testImplementation(libs.postgresql.driver)
- testImplementation(libs.testcontainers)
- testImplementation(libs.testcontainers.postgresql)
-
- testRuntimeOnly(libs.junit.jupiter.engine)
-}
-
-tasks {
- register("runtimeJars", Copy::class) {
- from(configurations.runtimeClasspath)
- into("build/libs")
- }
-
- val copyCatalogLibs by registering(Copy::class) {
- dependsOn("jar", "runtimeJars")
- from("build/libs") {
- exclude("guava-*.jar")
- exclude("log4j-*.jar")
- exclude("slf4j-*.jar")
- exclude("error_prone_annotations-*.jar")
- }
- into("$rootDir/distribution/package/catalogs/jdbc-hologres/libs")
- }
-
- val copyCatalogConfig by registering(Copy::class) {
- from("src/main/resources")
- into("$rootDir/distribution/package/catalogs/jdbc-hologres/conf")
-
- include("jdbc-hologres.conf")
-
- exclude { details ->
- details.file.isDirectory()
- }
-
- fileMode = 0b111101101
- }
-
- register("copyLibAndConfig", Copy::class) {
- dependsOn(copyCatalogLibs, copyCatalogConfig)
- }
-}
-
-tasks.test {
- val skipITs = project.hasProperty("skipITs")
- if (skipITs) {
- // Exclude integration tests
- exclude("**/integration/test/**")
- } else {
- dependsOn(tasks.jar)
- }
-}
-
-tasks.getByName("generateMetadataFileForMavenJavaPublication") {
- dependsOn("runtimeJars")
-}
diff --git
a/catalogs-contrib/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/integration/test/CatalogOceanBaseIT.java
b/catalogs-contrib/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/integration/test/CatalogOceanBaseIT.java
index c7adcbfb8d..260d851ac7 100644
---
a/catalogs-contrib/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/integration/test/CatalogOceanBaseIT.java
+++
b/catalogs-contrib/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/integration/test/CatalogOceanBaseIT.java
@@ -304,7 +304,7 @@ public class CatalogOceanBaseIT extends BaseIT {
// create failed check.
NameIdentifier table = NameIdentifier.of(testSchemaName, "test_table");
Assertions.assertThrows(
- NotFoundException.class,
+ NoSuchSchemaException.class,
() ->
tableCatalog.createTable(
table,
diff --git
a/catalogs/catalog-jdbc-mysql/src/test/java/org/apache/gravitino/catalog/mysql/integration/test/CatalogMysqlIT.java
b/catalogs/catalog-jdbc-mysql/src/test/java/org/apache/gravitino/catalog/mysql/integration/test/CatalogMysqlIT.java
index 82717dd599..6193bef454 100644
---
a/catalogs/catalog-jdbc-mysql/src/test/java/org/apache/gravitino/catalog/mysql/integration/test/CatalogMysqlIT.java
+++
b/catalogs/catalog-jdbc-mysql/src/test/java/org/apache/gravitino/catalog/mysql/integration/test/CatalogMysqlIT.java
@@ -356,7 +356,7 @@ public class CatalogMysqlIT extends BaseIT {
// create failed check.
NameIdentifier table = NameIdentifier.of(testSchemaName, "test_table");
Assertions.assertThrows(
- NotFoundException.class,
+ NoSuchSchemaException.class,
() ->
tableCatalog.createTable(
table,
diff --git
a/catalogs/catalog-jdbc-postgresql/src/test/java/org/apache/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlIT.java
b/catalogs/catalog-jdbc-postgresql/src/test/java/org/apache/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlIT.java
index b637ca7a69..59f405102c 100644
---
a/catalogs/catalog-jdbc-postgresql/src/test/java/org/apache/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlIT.java
+++
b/catalogs/catalog-jdbc-postgresql/src/test/java/org/apache/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlIT.java
@@ -50,7 +50,6 @@ import
org.apache.gravitino.catalog.postgresql.integration.test.service.PostgreS
import org.apache.gravitino.client.GravitinoMetalake;
import org.apache.gravitino.exceptions.ConnectionFailedException;
import org.apache.gravitino.exceptions.NoSuchSchemaException;
-import org.apache.gravitino.exceptions.NotFoundException;
import org.apache.gravitino.exceptions.SchemaAlreadyExistsException;
import org.apache.gravitino.integration.test.container.ContainerSuite;
import org.apache.gravitino.integration.test.container.PGImageName;
@@ -424,7 +423,7 @@ public class CatalogPostgreSqlIT extends BaseIT {
// create failed check.
NameIdentifier table = NameIdentifier.of(testSchemaName, "test_table");
Assertions.assertThrows(
- NotFoundException.class,
+ NoSuchSchemaException.class,
() ->
tableCatalog.createTable(
table,
diff --git
a/catalogs/catalog-lakehouse-iceberg/src/test/java/org/apache/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergBaseIT.java
b/catalogs/catalog-lakehouse-iceberg/src/test/java/org/apache/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergBaseIT.java
index 61f7f03bbb..82aedaff7d 100644
---
a/catalogs/catalog-lakehouse-iceberg/src/test/java/org/apache/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergBaseIT.java
+++
b/catalogs/catalog-lakehouse-iceberg/src/test/java/org/apache/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergBaseIT.java
@@ -54,7 +54,6 @@ import
org.apache.gravitino.catalog.lakehouse.iceberg.IcebergTable;
import
org.apache.gravitino.catalog.lakehouse.iceberg.ops.IcebergCatalogWrapperHelper;
import org.apache.gravitino.client.GravitinoMetalake;
import org.apache.gravitino.exceptions.NoSuchSchemaException;
-import org.apache.gravitino.exceptions.NotFoundException;
import org.apache.gravitino.exceptions.SchemaAlreadyExistsException;
import org.apache.gravitino.exceptions.TableAlreadyExistsException;
import org.apache.gravitino.iceberg.common.IcebergConfig;
@@ -345,7 +344,7 @@ public abstract class CatalogIcebergBaseIT extends BaseIT {
// create failed check.
NameIdentifier table = NameIdentifier.of(testSchemaName, "test_table");
Assertions.assertThrows(
- NotFoundException.class,
+ NoSuchSchemaException.class,
() ->
tableCatalog.createTable(
table,
diff --git
a/server/src/main/java/org/apache/gravitino/server/web/rest/TableOperations.java
b/server/src/main/java/org/apache/gravitino/server/web/rest/TableOperations.java
index 6b5aef7193..e0c807bd52 100644
---
a/server/src/main/java/org/apache/gravitino/server/web/rest/TableOperations.java
+++
b/server/src/main/java/org/apache/gravitino/server/web/rest/TableOperations.java
@@ -23,7 +23,6 @@ import static
org.apache.gravitino.dto.util.DTOConverters.fromDTOs;
import com.codahale.metrics.annotation.ResponseMetered;
import com.codahale.metrics.annotation.Timed;
-import com.google.common.collect.Lists;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.DELETE;
@@ -39,7 +38,6 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import org.apache.gravitino.Entity;
import org.apache.gravitino.MetadataObject;
-import org.apache.gravitino.MetadataObjects;
import org.apache.gravitino.NameIdentifier;
import org.apache.gravitino.Namespace;
import org.apache.gravitino.catalog.TableDispatcher;
@@ -59,7 +57,6 @@ import
org.apache.gravitino.server.authorization.annotations.AuthorizationMetada
import
org.apache.gravitino.server.authorization.annotations.AuthorizationRequest;
import
org.apache.gravitino.server.authorization.expression.AuthorizationExpressionConstants;
import org.apache.gravitino.server.web.Utils;
-import org.apache.gravitino.utils.MetadataObjectUtil;
import org.apache.gravitino.utils.NameIdentifierUtil;
import org.apache.gravitino.utils.NamespaceUtil;
import org.slf4j.Logger;
@@ -141,12 +138,6 @@ public class TableOperations {
NameIdentifier ident =
NameIdentifierUtil.ofTable(metalake, catalog, schema,
request.getName());
- // Make sure schema is imported, otherwise set owner for the table
may fail.
- MetadataObjectUtil.checkMetadataObject(
- metalake,
- MetadataObjects.of(
- Lists.newArrayList(catalog, schema),
MetadataObject.Type.SCHEMA));
-
Table table =
dispatcher.createTable(
ident,
diff --git
a/server/src/main/java/org/apache/gravitino/server/web/rest/TopicOperations.java
b/server/src/main/java/org/apache/gravitino/server/web/rest/TopicOperations.java
index 1f54d91fd6..dfa8f322e2 100644
---
a/server/src/main/java/org/apache/gravitino/server/web/rest/TopicOperations.java
+++
b/server/src/main/java/org/apache/gravitino/server/web/rest/TopicOperations.java
@@ -20,7 +20,6 @@ package org.apache.gravitino.server.web.rest;
import com.codahale.metrics.annotation.ResponseMetered;
import com.codahale.metrics.annotation.Timed;
-import com.google.common.collect.Lists;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.DELETE;
@@ -34,7 +33,6 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import org.apache.gravitino.Entity;
import org.apache.gravitino.MetadataObject;
-import org.apache.gravitino.MetadataObjects;
import org.apache.gravitino.NameIdentifier;
import org.apache.gravitino.Namespace;
import org.apache.gravitino.catalog.TopicDispatcher;
@@ -53,7 +51,6 @@ import
org.apache.gravitino.server.authorization.annotations.AuthorizationExpres
import
org.apache.gravitino.server.authorization.annotations.AuthorizationMetadata;
import
org.apache.gravitino.server.authorization.expression.AuthorizationExpressionConstants;
import org.apache.gravitino.server.web.Utils;
-import org.apache.gravitino.utils.MetadataObjectUtil;
import org.apache.gravitino.utils.NameIdentifierUtil;
import org.apache.gravitino.utils.NamespaceUtil;
import org.slf4j.Logger;
@@ -142,12 +139,6 @@ public class TopicOperations {
NameIdentifier ident =
NameIdentifierUtil.ofTopic(metalake, catalog, schema,
request.getName());
- // Make sure schema is imported, otherwise set owner for the topic
may fail.
- MetadataObjectUtil.checkMetadataObject(
- metalake,
- MetadataObjects.of(
- Lists.newArrayList(catalog, schema),
MetadataObject.Type.SCHEMA));
-
Topic topic =
dispatcher.createTopic(
ident,
diff --git
a/server/src/test/java/org/apache/gravitino/server/web/rest/TestTableOperations.java
b/server/src/test/java/org/apache/gravitino/server/web/rest/TestTableOperations.java
index 4e2da1e8cb..e2b12910a8 100644
---
a/server/src/test/java/org/apache/gravitino/server/web/rest/TestTableOperations.java
+++
b/server/src/test/java/org/apache/gravitino/server/web/rest/TestTableOperations.java
@@ -127,7 +127,6 @@ public class TestTableOperations extends BaseOperationsTest
{
Mockito.doReturn(false).when(config).get(ENABLE_AUTHORIZATION);
FieldUtils.writeField(GravitinoEnv.getInstance(), "config", config, true);
FieldUtils.writeField(GravitinoEnv.getInstance(), "lockManager", new
LockManager(config), true);
- FieldUtils.writeField(GravitinoEnv.getInstance(), "schemaDispatcher",
schemaDispatcher, true);
Mockito.doReturn(true).when(schemaDispatcher).schemaExists(any());
}
diff --git
a/server/src/test/java/org/apache/gravitino/server/web/rest/TestTopicOperations.java
b/server/src/test/java/org/apache/gravitino/server/web/rest/TestTopicOperations.java
index ab39638c56..f74e49feb4 100644
---
a/server/src/test/java/org/apache/gravitino/server/web/rest/TestTopicOperations.java
+++
b/server/src/test/java/org/apache/gravitino/server/web/rest/TestTopicOperations.java
@@ -96,7 +96,6 @@ public class TestTopicOperations extends BaseOperationsTest {
Mockito.doReturn(false).when(config).get(ENABLE_AUTHORIZATION);
FieldUtils.writeField(GravitinoEnv.getInstance(), "config", config, true);
FieldUtils.writeField(GravitinoEnv.getInstance(), "lockManager", new
LockManager(config), true);
- FieldUtils.writeField(GravitinoEnv.getInstance(), "schemaDispatcher",
schemaDispatcher, true);
Mockito.doReturn(true).when(schemaDispatcher).schemaExists(any());
}
