This is an automated email from the ASF dual-hosted git repository.
jakevin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 5bd03fdc669 [minor](Nereids): remove useless method
isMysqlCompatibleDatabase (#30064)
5bd03fdc669 is described below
commit 5bd03fdc6696fff811b88c094e566ae6ef7dfecb
Author: jakevin <[email protected]>
AuthorDate: Wed Jan 17 19:20:19 2024 +0800
[minor](Nereids): remove useless method isMysqlCompatibleDatabase (#30064)
---
.../src/main/java/org/apache/doris/analysis/DropDbStmt.java | 4 ++--
.../src/main/java/org/apache/doris/catalog/Database.java | 13 +++----------
.../src/main/java/org/apache/doris/catalog/DatabaseIf.java | 2 +-
.../org/apache/doris/catalog/MysqlCompatibleDatabase.java | 5 -----
.../src/main/java/org/apache/doris/clone/TabletChecker.java | 3 ++-
.../main/java/org/apache/doris/datasource/CatalogIf.java | 6 +++---
.../java/org/apache/doris/datasource/InternalCatalog.java | 10 +++++-----
.../main/java/org/apache/doris/httpv2/rest/ShowAction.java | 5 +++--
.../apache/doris/master/PartitionInMemoryInfoCollector.java | 3 ++-
.../doris/transaction/DbUsedDataQuotaInfoCollector.java | 3 ++-
.../java/org/apache/doris/clone/RebalancerTestUtil.java | 3 ++-
11 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropDbStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropDbStmt.java
index 9b4f58efbf0..08a1e630eb5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropDbStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropDbStmt.java
@@ -17,9 +17,9 @@
package org.apache.doris.analysis;
-import org.apache.doris.catalog.Database;
import org.apache.doris.catalog.DatabaseIf;
import org.apache.doris.catalog.Env;
+import org.apache.doris.catalog.MysqlCompatibleDatabase;
import org.apache.doris.common.ErrorCode;
import org.apache.doris.common.ErrorReport;
import org.apache.doris.common.UserException;
@@ -62,7 +62,7 @@ public class DropDbStmt extends DdlStmt {
InternalDatabaseUtil.checkDatabase(dbName, ConnectContext.get());
// Don't allow to drop mysql compatible databases
DatabaseIf db = Env.getCurrentInternalCatalog().getDbNullable(dbName);
- if (db != null && (db instanceof Database) && ((Database)
db).isMysqlCompatibleDatabase()) {
+ if (db != null && db instanceof MysqlCompatibleDatabase) {
ErrorReport.reportAnalysisException(ErrorCode.ERR_DBACCESS_DENIED_ERROR,
analyzer.getQualifiedUser(), dbName);
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java
index 71e61d5791c..96db31af430 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java
@@ -84,14 +84,14 @@ public class Database extends MetaObject implements
Writable, DatabaseIf<Table>
private long id;
@SerializedName(value = "fullQualifiedName")
private volatile String fullQualifiedName;
- private ReentrantReadWriteLock rwLock;
+ private final ReentrantReadWriteLock rwLock;
// table family group map
- private Map<Long, Table> idToTable;
+ private final Map<Long, Table> idToTable;
@SerializedName(value = "nameToTable")
private Map<String, Table> nameToTable;
// table name lower cast -> table name
- private Map<String, String> lowerCaseToTableName;
+ private final Map<String, String> lowerCaseToTableName;
// user define function
@SerializedName(value = "name2Function")
@@ -893,11 +893,4 @@ public class Database extends MetaObject implements
Writable, DatabaseIf<Table>
public String toString() {
return toJson();
}
-
- // Return ture if database is created for mysql compatibility.
- // Currently, we have two dbs that are created for this purpose,
InformationSchemaDb and MysqlDb,
- public boolean isMysqlCompatibleDatabase() {
- return false;
- }
-
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/DatabaseIf.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/DatabaseIf.java
index 3ba29573374..e80f335be17 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/DatabaseIf.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/DatabaseIf.java
@@ -273,5 +273,5 @@ public interface DatabaseIf<T extends TableIf> {
return -1L;
}
- public Map<Long, TableIf> getIdToTable();
+ Map<Long, TableIf> getIdToTable();
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/MysqlCompatibleDatabase.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/MysqlCompatibleDatabase.java
index 1d4aa62dc9d..12d915321ed 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/catalog/MysqlCompatibleDatabase.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/catalog/MysqlCompatibleDatabase.java
@@ -77,11 +77,6 @@ public abstract class MysqlCompatibleDatabase extends
Database {
throw new IOException("Not support.");
}
- @Override
- public boolean isMysqlCompatibleDatabase() {
- return true;
- }
-
/**
* This method must be re-implemented since {@link
Env#createView(CreateViewStmt)}
* will call this method. And create view should not succeed under this
database.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/TabletChecker.java
b/fe/fe-core/src/main/java/org/apache/doris/clone/TabletChecker.java
index c6f6be3d460..66497e7d18e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/clone/TabletChecker.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/clone/TabletChecker.java
@@ -23,6 +23,7 @@ import org.apache.doris.catalog.Database;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.MaterializedIndex;
import org.apache.doris.catalog.MaterializedIndex.IndexExtState;
+import org.apache.doris.catalog.MysqlCompatibleDatabase;
import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.Partition;
import org.apache.doris.catalog.Partition.PartitionState;
@@ -280,7 +281,7 @@ public class TabletChecker extends MasterDaemon {
continue;
}
- if (db.isMysqlCompatibleDatabase()) {
+ if (db instanceof MysqlCompatibleDatabase) {
continue;
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogIf.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogIf.java
index c8f3033c668..7fd240aa8d0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogIf.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogIf.java
@@ -172,9 +172,9 @@ public interface CatalogIf<T extends DatabaseIf> {
}
// Return a copy of all db collection.
- public Collection<DatabaseIf<? extends TableIf>> getAllDbs();
+ Collection<DatabaseIf<? extends TableIf>> getAllDbs();
- public boolean enableAutoAnalyze();
+ boolean enableAutoAnalyze();
- public ConcurrentHashMap<Long, DatabaseIf> getIdToDb();
+ ConcurrentHashMap<Long, DatabaseIf> getIdToDb();
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
index 791fcd007d8..ae32e45aa81 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
@@ -841,8 +841,8 @@ public class InternalCatalog implements CatalogIf<Database>
{
LOG.info("begin to drop table: {} from db: {}, is force: {}",
tableName, dbName, stmt.isForceDrop());
// check database
- Database db = (Database) getDbOrDdlException(dbName);
- if (db.isMysqlCompatibleDatabase()) {
+ Database db = getDbOrDdlException(dbName);
+ if (db instanceof MysqlCompatibleDatabase) {
throw new DdlException("Drop table from this database is not
allowed.");
}
@@ -1100,7 +1100,7 @@ public class InternalCatalog implements
CatalogIf<Database> {
// check if db exists
Database db = getDbOrDdlException(dbName);
// InfoSchemaDb and MysqlDb can not create table manually
- if (db.isMysqlCompatibleDatabase()) {
+ if (db instanceof MysqlCompatibleDatabase) {
ErrorReport.reportDdlException(ErrorCode.ERR_CANT_CREATE_TABLE,
tableName,
ErrorCode.ERR_CANT_CREATE_TABLE.getCode(), "not supported
create table in this database");
}
@@ -3326,7 +3326,7 @@ public class InternalCatalog implements
CatalogIf<Database> {
for (Map.Entry<Long, Database> entry : idToDb.entrySet()) {
Database db = entry.getValue();
// Don't write internal database meta.
- if (!db.isMysqlCompatibleDatabase()) {
+ if (!(db instanceof MysqlCompatibleDatabase)) {
checksum ^= entry.getKey();
db.write(dos);
}
@@ -3345,7 +3345,7 @@ public class InternalCatalog implements
CatalogIf<Database> {
Database dbPrev = fullNameToDb.get(db.getFullName());
if (dbPrev != null) {
String errMsg;
- if (dbPrev.isMysqlCompatibleDatabase() ||
db.isMysqlCompatibleDatabase()) {
+ if (dbPrev instanceof MysqlCompatibleDatabase || db instanceof
MysqlCompatibleDatabase) {
errMsg = String.format(
"Mysql compatibility problem, previous checkpoint
already has a database with full name "
+ "%s. If its name is mysql, try to add
mysqldb_replace_name=\"mysql_comp\" in fe.conf.",
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ShowAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ShowAction.java
index 6db2a7e7b51..0aa5dd54d78 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ShowAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ShowAction.java
@@ -20,6 +20,7 @@ package org.apache.doris.httpv2.rest;
import org.apache.doris.catalog.Database;
import org.apache.doris.catalog.DatabaseIf;
import org.apache.doris.catalog.Env;
+import org.apache.doris.catalog.MysqlCompatibleDatabase;
import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.Table;
import org.apache.doris.catalog.TableIf.TableType;
@@ -199,7 +200,7 @@ public class ShowAction extends RestBaseController {
} else {
for (long dbId : Env.getCurrentInternalCatalog().getDbIds()) {
DatabaseIf db =
Env.getCurrentInternalCatalog().getDbNullable(dbId);
- if (db == null || !(db instanceof Database) || ((Database)
db).isMysqlCompatibleDatabase()) {
+ if (db == null || !(db instanceof Database) || db instanceof
MysqlCompatibleDatabase) {
continue;
}
totalSize += getDataSizeOfDatabase(db);
@@ -232,7 +233,7 @@ public class ShowAction extends RestBaseController {
} else {
for (long dbId : Env.getCurrentInternalCatalog().getDbIds()) {
DatabaseIf db =
Env.getCurrentInternalCatalog().getDbNullable(dbId);
- if (db == null || !(db instanceof Database) || ((Database)
db).isMysqlCompatibleDatabase()) {
+ if (db == null || !(db instanceof Database) || ((Database) db)
instanceof MysqlCompatibleDatabase) {
continue;
}
Map<String, Long> tablesEntry = getDataSizeOfTables(db,
tableName, singleReplicaBool);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/master/PartitionInMemoryInfoCollector.java
b/fe/fe-core/src/main/java/org/apache/doris/master/PartitionInMemoryInfoCollector.java
index 22f2d41cfad..77ed5829799 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/master/PartitionInMemoryInfoCollector.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/master/PartitionInMemoryInfoCollector.java
@@ -19,6 +19,7 @@ package org.apache.doris.master;
import org.apache.doris.catalog.Database;
import org.apache.doris.catalog.Env;
+import org.apache.doris.catalog.MysqlCompatibleDatabase;
import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.Partition;
import org.apache.doris.catalog.Table;
@@ -56,7 +57,7 @@ public class PartitionInMemoryInfoCollector extends
MasterDaemon {
LOG.warn("Database [" + dbId + "] does not exist, skip to
update database used data quota");
continue;
}
- if (db.isMysqlCompatibleDatabase()) {
+ if (db instanceof MysqlCompatibleDatabase) {
continue;
}
try {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/transaction/DbUsedDataQuotaInfoCollector.java
b/fe/fe-core/src/main/java/org/apache/doris/transaction/DbUsedDataQuotaInfoCollector.java
index 87d509bbb4d..3a713bdc63f 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/transaction/DbUsedDataQuotaInfoCollector.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/transaction/DbUsedDataQuotaInfoCollector.java
@@ -19,6 +19,7 @@ package org.apache.doris.transaction;
import org.apache.doris.catalog.Database;
import org.apache.doris.catalog.Env;
+import org.apache.doris.catalog.MysqlCompatibleDatabase;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.Config;
import org.apache.doris.common.util.MasterDaemon;
@@ -50,7 +51,7 @@ public class DbUsedDataQuotaInfoCollector extends
MasterDaemon {
LOG.warn("Database [" + dbId + "] does not exist, skip to
update database used data quota");
continue;
}
- if (db.isMysqlCompatibleDatabase()) {
+ if (db instanceof MysqlCompatibleDatabase) {
continue;
}
try {
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/clone/RebalancerTestUtil.java
b/fe/fe-core/src/test/java/org/apache/doris/clone/RebalancerTestUtil.java
index da03d42a644..063faf2d3b2 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/clone/RebalancerTestUtil.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/clone/RebalancerTestUtil.java
@@ -21,6 +21,7 @@ import org.apache.doris.catalog.Database;
import org.apache.doris.catalog.DiskInfo;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.MaterializedIndex;
+import org.apache.doris.catalog.MysqlCompatibleDatabase;
import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.Partition;
import org.apache.doris.catalog.Replica;
@@ -145,7 +146,7 @@ public class RebalancerTestUtil {
continue;
}
- if (db.isMysqlCompatibleDatabase()) {
+ if (db instanceof MysqlCompatibleDatabase) {
continue;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
