[Enhance](multi-catalog) Use MetaIdMappingsLog

to replace InitCatalogLog/InitDatabaseLog.
dutyu · Feb 20, 2024 · 78c83d2 · 78c83d2
1 parent 751679e
commit 78c83d2
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 14 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalDatabase.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalDatabase.java
@@ -62,7 +62,7 @@ public abstract class ExternalDatabase<T extends ExternalTable> implements Datab
  protected volatile boolean initialized = false;
 
  protected volatile long lastUpdateTime;
- protected final ExternalCatalog.Type ctlType;
+ protected final ExternalCatalog.Type dbType;
 
  protected ExternalCatalog extCatalog;
 
@@ -82,7 +82,7 @@ public ExternalDatabase(ExternalCatalog extCatalog, long id, String name, Extern
  this.extCatalog = extCatalog;
  this.id = id;
  this.name = name;
- this.ctlType = type;
+ this.dbType = type;
  }
 
  public void setUnInitialized(boolean invalidCache) {

diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/es/EsExternalDatabase.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/es/EsExternalDatabase.java
@@ -19,7 +19,6 @@
 
 import org.apache.doris.datasource.ExternalCatalog;
 import org.apache.doris.datasource.ExternalDatabase;
-import org.apache.doris.datasource.InitDatabaseLog;
 
 /**
  * Elasticsearch metastore external database.
@@ -34,7 +33,7 @@ public class EsExternalDatabase extends ExternalDatabase<EsExternalTable> {
  * @param name database name.
  */
  public EsExternalDatabase(ExternalCatalog extCatalog, long id, String name) {
- super(extCatalog, id, name, InitDatabaseLog.Type.ES);
+ super(extCatalog, id, name, ExternalCatalog.Type.ES);
  }
 
  @Override

diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalDatabase.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalDatabase.java
@@ -19,7 +19,6 @@
 
 import org.apache.doris.datasource.ExternalCatalog;
 import org.apache.doris.datasource.ExternalDatabase;
-import org.apache.doris.datasource.InitDatabaseLog;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -29,7 +28,7 @@ public class IcebergExternalDatabase extends ExternalDatabase<IcebergExternalTab
  private static final Logger LOG = LogManager.getLogger(IcebergExternalDatabase.class);
 
  public IcebergExternalDatabase(ExternalCatalog extCatalog, Long id, String name) {
- super(extCatalog, id, name, InitDatabaseLog.Type.ICEBERG);
+ super(extCatalog, id, name, ExternalCatalog.Type.ICEBERG);
  }
 
  @Override

diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalDatabase.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalDatabase.java
@@ -19,7 +19,6 @@
 
 import org.apache.doris.datasource.ExternalCatalog;
 import org.apache.doris.datasource.ExternalDatabase;
-import org.apache.doris.datasource.InitDatabaseLog;
 
 public class JdbcExternalDatabase extends ExternalDatabase<JdbcExternalTable> {
 
@@ -31,7 +30,7 @@ public class JdbcExternalDatabase extends ExternalDatabase<JdbcExternalTable> {
  * @param name database name.
  */
  public JdbcExternalDatabase(ExternalCatalog extCatalog, long id, String name) {
- super(extCatalog, id, name, InitDatabaseLog.Type.JDBC);
+ super(extCatalog, id, name, ExternalCatalog.Type.JDBC);
  }
 
  @Override

diff --git a/...core/src/main/java/org/apache/doris/datasource/maxcompute/MaxComputeExternalDatabase.java b/...core/src/main/java/org/apache/doris/datasource/maxcompute/MaxComputeExternalDatabase.java
@@ -19,7 +19,6 @@
 
 import org.apache.doris.datasource.ExternalCatalog;
 import org.apache.doris.datasource.ExternalDatabase;
-import org.apache.doris.datasource.InitDatabaseLog;
 
 /**
  * MaxCompute external database.
@@ -33,7 +32,7 @@ public class MaxComputeExternalDatabase extends ExternalDatabase<MaxComputeExter
  * @param name database name.
  */
  public MaxComputeExternalDatabase(ExternalCatalog extCatalog, long id, String name) {
- super(extCatalog, id, name, InitDatabaseLog.Type.MAX_COMPUTE);
+ super(extCatalog, id, name, ExternalCatalog.Type.MAX_COMPUTE);
  }
 
  @Override

diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/PaimonExternalDatabase.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/PaimonExternalDatabase.java
@@ -19,7 +19,6 @@
 
 import org.apache.doris.datasource.ExternalCatalog;
 import org.apache.doris.datasource.ExternalDatabase;
-import org.apache.doris.datasource.InitDatabaseLog;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -29,7 +28,7 @@ public class PaimonExternalDatabase extends ExternalDatabase<PaimonExternalTable
  private static final Logger LOG = LogManager.getLogger(PaimonExternalDatabase.class);
 
  public PaimonExternalDatabase(ExternalCatalog extCatalog, Long id, String name) {
- super(extCatalog, id, name, InitDatabaseLog.Type.PAIMON);
+ super(extCatalog, id, name, ExternalCatalog.Type.PAIMON);
  }
 
  @Override

diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/test/TestExternalDatabase.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/test/TestExternalDatabase.java
@@ -19,12 +19,11 @@
 
 import org.apache.doris.datasource.ExternalCatalog;
 import org.apache.doris.datasource.ExternalDatabase;
-import org.apache.doris.datasource.InitDatabaseLog;
 
 public class TestExternalDatabase extends ExternalDatabase<TestExternalTable> {
 
  public TestExternalDatabase(ExternalCatalog extCatalog, long id, String name) {
- super(extCatalog, id, name, InitDatabaseLog.Type.TEST);
+ super(extCatalog, id, name, ExternalCatalog.Type.TEST);
  }
 
  @Override