This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 73376670ba02644ca7514575ec2dc460e720240d
Author: Jibing-Li <64681310+jibing...@users.noreply.github.com>
AuthorDate: Mon Dec 19 14:29:13 2022 +0800
[Feature](multi catalog)Remove enable_multi_catalog config item, open this
function to public. (#15130)
The multi-catalog feature is ready to use, remove enable_multi_catalog
switch in FE config, open it to public.
---
docs/zh-CN/docs/admin-manual/config/fe-config.md | 2 --
.../main/java/org/apache/doris/analysis/ShowCatalogStmt.java | 2 --
.../org/apache/doris/analysis/ShowCreateCatalogStmt.java | 6 +-----
.../src/main/java/org/apache/doris/analysis/TableName.java | 4 ----
fe/fe-core/src/main/java/org/apache/doris/common/Config.java | 7 -------
.../src/main/java/org/apache/doris/common/util/Util.java | 12 ------------
.../org/apache/doris/analysis/AlterCatalogNameStmtTest.java | 2 --
.../org/apache/doris/analysis/AlterCatalogPropsStmtTest.java | 2 --
.../org/apache/doris/analysis/CreateCatalogStmtTest.java | 2 --
.../java/org/apache/doris/analysis/DropCatalogStmtTest.java | 2 --
.../java/org/apache/doris/analysis/ShowCatalogStmtTest.java | 2 --
.../java/org/apache/doris/datasource/CatalogMgrTest.java | 2 --
.../suites/external_catalog_p0/hive/test_hive_orc.groovy | 1 -
.../suites/external_catalog_p0/hive/test_hive_other.groovy | 1 -
.../suites/external_catalog_p0/hive/test_hive_parquet.groovy | 1 -
.../suites/jdbc_catalog_p0/test_mysql_jdbc_catalog.groovy | 2 --
.../tpch_sf1_p0/multi_catalog_query/hive_catalog_orc.groovy | 1 -
.../multi_catalog_query/hive_catalog_parquet.groovy | 1 -
18 files changed, 1 insertion(+), 51 deletions(-)
diff --git a/docs/zh-CN/docs/admin-manual/config/fe-config.md
b/docs/zh-CN/docs/admin-manual/config/fe-config.md
index bf211caa1d..b7cb03e9f8 100644
--- a/docs/zh-CN/docs/admin-manual/config/fe-config.md
+++ b/docs/zh-CN/docs/admin-manual/config/fe-config.md
@@ -2133,8 +2133,6 @@ load 标签清理器将每隔 `label_clean_interval_second` 运行一次以清
如果设置为true，将关闭副本修复和均衡逻辑。
-
-
### `enable_force_drop_redundant_replica`
默认值：false
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCatalogStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCatalogStmt.java
index 6060a64dc4..62fb146daa 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCatalogStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCatalogStmt.java
@@ -20,7 +20,6 @@ package org.apache.doris.analysis;
import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.ScalarType;
import org.apache.doris.common.UserException;
-import org.apache.doris.common.util.Util;
import org.apache.doris.qe.ShowResultSetMetaData;
/**
@@ -62,7 +61,6 @@ public class ShowCatalogStmt extends ShowStmt {
@Override
public void analyze(Analyzer analyzer) throws UserException {
- Util.checkCatalogEnabled();
super.analyze(analyzer);
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCreateCatalogStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCreateCatalogStmt.java
index 8e32289e10..8209dce6b1 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCreateCatalogStmt.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCreateCatalogStmt.java
@@ -20,11 +20,9 @@ package org.apache.doris.analysis;
import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.ScalarType;
-import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.ErrorCode;
import org.apache.doris.common.ErrorReport;
import org.apache.doris.common.UserException;
-import org.apache.doris.common.util.Util;
import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.ShowResultSetMetaData;
@@ -52,9 +50,7 @@ public class ShowCreateCatalogStmt extends ShowStmt {
}
@Override
- public void analyze(Analyzer analyzer) throws AnalysisException,
UserException {
- Util.checkCatalogEnabled();
-
+ public void analyze(Analyzer analyzer) throws UserException {
super.analyze(analyzer);
if (Strings.isNullOrEmpty(catalog)) {
ErrorReport.reportAnalysisException(ErrorCode.ERR_WRONG_CATALOG_NAME, catalog);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/TableName.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/TableName.java
index 71515de94b..d8360f981e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/TableName.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/TableName.java
@@ -28,7 +28,6 @@ import org.apache.doris.common.ErrorReport;
import org.apache.doris.common.FeMetaVersion;
import org.apache.doris.common.io.Text;
import org.apache.doris.common.io.Writable;
-import org.apache.doris.common.util.Util;
import org.apache.doris.datasource.InternalCatalog;
import org.apache.doris.persist.gson.GsonUtils;
@@ -70,9 +69,6 @@ public class TableName implements Writable {
ctl = InternalCatalog.INTERNAL_CATALOG_NAME;
}
}
- if (!ctl.equals(InternalCatalog.INTERNAL_CATALOG_NAME)) {
- Util.checkCatalogEnabled();
- }
if (Strings.isNullOrEmpty(db)) {
db = analyzer.getDefaultDb();
if (Strings.isNullOrEmpty(db)) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/Config.java
b/fe/fe-core/src/main/java/org/apache/doris/common/Config.java
index 2555d8efaa..ded23d8951 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/Config.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/Config.java
@@ -1686,13 +1686,6 @@ public class Config extends ConfigBase {
@ConfField(mutable = false, masterOnly = true)
public static int backend_rpc_timeout_ms = 60000; // 1 min
- /**
- * Temp config for multi catalog feature.
- * Should be removed when this feature is ready.
- */
- @ConfField(mutable = true, masterOnly = true)
- public static boolean enable_multi_catalog = false;
-
@ConfField(mutable = true, masterOnly = false)
public static long file_scan_node_split_size = 256 * 1024 * 1024; // 256mb
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/Util.java
b/fe/fe-core/src/main/java/org/apache/doris/common/util/Util.java
index 6d14fc6137..4dcb130087 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/util/Util.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/Util.java
@@ -471,22 +471,10 @@ public class Util {
return s;
}
- /**
- * Multi-catalog feature is in experiment, and should be enabled by user
manually.
- */
- public static void checkCatalogEnabled() throws AnalysisException {
- if (!Config.enable_multi_catalog) {
- throw new AnalysisException("The multi-catalog feature is still in
experiment, and you can enable it "
- + "manually by set fe configuration named
`enable_multi_catalog` to be true.");
- }
- }
-
/**
* Check all rules of catalog.
*/
public static void checkCatalogAllRules(String catalog) throws
AnalysisException {
- checkCatalogEnabled();
-
if (Strings.isNullOrEmpty(catalog)) {
throw new AnalysisException("Catalog name is empty.");
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterCatalogNameStmtTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterCatalogNameStmtTest.java
index 44188e2852..dd1099ad6e 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterCatalogNameStmtTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterCatalogNameStmtTest.java
@@ -18,7 +18,6 @@
package org.apache.doris.analysis;
import org.apache.doris.common.AnalysisException;
-import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.UserException;
import org.apache.doris.datasource.InternalCatalog;
@@ -40,7 +39,6 @@ public class AlterCatalogNameStmtTest {
@Before
public void setUp() throws DdlException {
- Config.enable_multi_catalog = true;
analyzer = AccessTestUtil.fetchAdminAnalyzer(false);
MockedAuth.mockedAuth(auth);
MockedAuth.mockedConnectContext(ctx, "root", "%");
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterCatalogPropsStmtTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterCatalogPropsStmtTest.java
index 08d123c771..ad4c394abb 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterCatalogPropsStmtTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterCatalogPropsStmtTest.java
@@ -18,7 +18,6 @@
package org.apache.doris.analysis;
import org.apache.doris.common.AnalysisException;
-import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.UserException;
import org.apache.doris.datasource.InternalCatalog;
@@ -43,7 +42,6 @@ public class AlterCatalogPropsStmtTest {
@Before
public void setUp() throws DdlException {
- Config.enable_multi_catalog = true;
analyzer = AccessTestUtil.fetchAdminAnalyzer(false);
MockedAuth.mockedAuth(auth);
MockedAuth.mockedConnectContext(ctx, "root", "%");
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateCatalogStmtTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateCatalogStmtTest.java
index cdc9443ae5..e468be1d3f 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateCatalogStmtTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateCatalogStmtTest.java
@@ -18,7 +18,6 @@
package org.apache.doris.analysis;
import org.apache.doris.common.AnalysisException;
-import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.UserException;
import org.apache.doris.datasource.InternalCatalog;
@@ -44,7 +43,6 @@ public class CreateCatalogStmtTest {
@Before()
public void setUp() throws DdlException {
- Config.enable_multi_catalog = true;
analyzer = AccessTestUtil.fetchAdminAnalyzer(true);
MockedAuth.mockedAuth(auth);
MockedAuth.mockedConnectContext(ctx, "root", "%");
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/analysis/DropCatalogStmtTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/DropCatalogStmtTest.java
index 0a7e16ce9b..749994963d 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/analysis/DropCatalogStmtTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/analysis/DropCatalogStmtTest.java
@@ -18,7 +18,6 @@
package org.apache.doris.analysis;
import org.apache.doris.common.AnalysisException;
-import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.UserException;
import org.apache.doris.datasource.InternalCatalog;
@@ -41,7 +40,6 @@ public class DropCatalogStmtTest {
@Before
public void setUp() throws DdlException {
- Config.enable_multi_catalog = true;
analyzer = AccessTestUtil.fetchAdminAnalyzer(true);
MockedAuth.mockedAuth(auth);
MockedAuth.mockedConnectContext(ctx, "root", "%");
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCatalogStmtTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCatalogStmtTest.java
index feec7f8d29..2f03b3174c 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCatalogStmtTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCatalogStmtTest.java
@@ -18,7 +18,6 @@
package org.apache.doris.analysis;
import org.apache.doris.common.AnalysisException;
-import org.apache.doris.common.Config;
import org.apache.doris.common.UserException;
import org.junit.Assert;
@@ -27,7 +26,6 @@ import org.junit.Test;
public class ShowCatalogStmtTest {
@Test
public void testNormal() throws UserException, AnalysisException {
- Config.enable_multi_catalog = true;
final Analyzer analyzer = AccessTestUtil.fetchBlockAnalyzer();
ShowCatalogStmt stmt = new ShowCatalogStmt();
stmt.analyze(analyzer);
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/datasource/CatalogMgrTest.java
b/fe/fe-core/src/test/java/org/apache/doris/datasource/CatalogMgrTest.java
index b6a7e870bc..03f17938e2 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/datasource/CatalogMgrTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/datasource/CatalogMgrTest.java
@@ -36,7 +36,6 @@ import org.apache.doris.catalog.external.EsExternalTable;
import org.apache.doris.catalog.external.HMSExternalDatabase;
import org.apache.doris.catalog.external.HMSExternalTable;
import org.apache.doris.common.AnalysisException;
-import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.FeConstants;
import org.apache.doris.mysql.privilege.PaloAuth;
@@ -69,7 +68,6 @@ public class CatalogMgrTest extends TestWithFeService {
@Override
protected void runBeforeAll() throws Exception {
- Config.enable_multi_catalog = true;
FeConstants.runningUnitTest = true;
mgr = Env.getCurrentEnv().getCatalogMgr();
diff --git
a/regression-test/suites/external_catalog_p0/hive/test_hive_orc.groovy
b/regression-test/suites/external_catalog_p0/hive/test_hive_orc.groovy
index 2f8d610200..331655cdad 100644
--- a/regression-test/suites/external_catalog_p0/hive/test_hive_orc.groovy
+++ b/regression-test/suites/external_catalog_p0/hive/test_hive_orc.groovy
@@ -71,7 +71,6 @@ suite("test_hive_orc", "all_types") {
try {
String hms_port = context.config.otherConfigs.get("hms_port")
String catalog_name = "hive_test_orc"
- sql """admin set frontend config ("enable_multi_catalog" =
"true")"""
sql """drop catalog if exists ${catalog_name}"""
sql """
create catalog if not exists ${catalog_name} properties (
diff --git
a/regression-test/suites/external_catalog_p0/hive/test_hive_other.groovy
b/regression-test/suites/external_catalog_p0/hive/test_hive_other.groovy
index 71c184b872..7f305b3714 100644
--- a/regression-test/suites/external_catalog_p0/hive/test_hive_other.groovy
+++ b/regression-test/suites/external_catalog_p0/hive/test_hive_other.groovy
@@ -56,7 +56,6 @@ suite("test_hive_other", "p0") {
String hdfs_port = context.config.otherConfigs.get("hdfs_port")
String catalog_name = "hive_test_other"
- sql """admin set frontend config ("enable_multi_catalog" = "true")"""
sql """drop catalog if exists ${catalog_name}"""
sql """
create catalog ${catalog_name} properties (
diff --git
a/regression-test/suites/external_catalog_p0/hive/test_hive_parquet.groovy
b/regression-test/suites/external_catalog_p0/hive/test_hive_parquet.groovy
index d644699f00..926d433b1b 100644
--- a/regression-test/suites/external_catalog_p0/hive/test_hive_parquet.groovy
+++ b/regression-test/suites/external_catalog_p0/hive/test_hive_parquet.groovy
@@ -144,7 +144,6 @@ suite("test_hive_parquet", "p0") {
try {
String hms_port = context.config.otherConfigs.get("hms_port")
String catalog_name = "hive_test_parquet"
- sql """admin set frontend config ("enable_multi_catalog" =
"true")"""
sql """drop catalog if exists ${catalog_name}"""
sql """
create catalog if not exists ${catalog_name} properties (
diff --git
a/regression-test/suites/jdbc_catalog_p0/test_mysql_jdbc_catalog.groovy
b/regression-test/suites/jdbc_catalog_p0/test_mysql_jdbc_catalog.groovy
index 627ecc7ffa..97922eee57 100644
--- a/regression-test/suites/jdbc_catalog_p0/test_mysql_jdbc_catalog.groovy
+++ b/regression-test/suites/jdbc_catalog_p0/test_mysql_jdbc_catalog.groovy
@@ -18,8 +18,6 @@
suite("test_mysql_jdbc_catalog", "p0") {
String enabled = context.config.otherConfigs.get("enableJdbcTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
- sql """admin set frontend config ("enable_multi_catalog" = "true")"""
-
String catalog_name = "mysql_jdbc_catalog";
String internal_db_name = "regression_test_jdbc_catalog_p0";
String ex_db_name = "doris_test";
diff --git
a/regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_orc.groovy
b/regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_orc.groovy
index e2c2cf8b1e..15cdd2eaaa 100644
---
a/regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_orc.groovy
+++
b/regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_orc.groovy
@@ -802,7 +802,6 @@ order by
String hms_port = context.config.otherConfigs.get("hms_port")
String catalog_name = "test_catalog_hive_orc"
- sql """admin set frontend config ("enable_multi_catalog" = "true")"""
sql """drop catalog if exists ${catalog_name}"""
sql """
create catalog ${catalog_name} properties (
diff --git
a/regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_parquet.groovy
b/regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_parquet.groovy
index 01530b738a..f9af37a75c 100644
---
a/regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_parquet.groovy
+++
b/regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_parquet.groovy
@@ -802,7 +802,6 @@ order by
String hms_port = context.config.otherConfigs.get("hms_port")
String catalog_name = "test_catalog_hive_parquet"
- sql """admin set frontend config ("enable_multi_catalog" = "true")"""
sql """drop catalog if exists ${catalog_name}"""
sql """
create catalog ${catalog_name} properties (
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
