diff --git a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
index 43a71e785d..754329fa7f 100644
--- a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
+++ b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
@@ -148,7 +148,7 @@ public void getTableDetail(Context ctx) {
             tableService.getServerTableIdentifier(
                 TableIdentifier.of(catalog, database, tableName).buildTableIdentifier()));
     if (serverTableIdentifier.isPresent()) {
-      TableRuntime tableRuntime = tableService.getRuntime(serverTableIdentifier.get());
+      TableRuntime tableRuntime = tableService.getRuntime(serverTableIdentifier.get().getId());
       tableSummary.setOptimizingStatus(tableRuntime.getOptimizingStatus().name());
       OptimizingEvaluator.PendingInput tableRuntimeSummary = tableRuntime.getTableSummary();
       if (tableRuntimeSummary != null) {
@@ -656,7 +656,9 @@ public void cancelOptimizingProcess(Context ctx) {
         tableService.getServerTableIdentifier(
             TableIdentifier.of(catalog, db, table).buildTableIdentifier());
     TableRuntime tableRuntime =
-        serverTableIdentifier != null ? tableService.getRuntime(serverTableIdentifier) : null;
+        serverTableIdentifier != null
+            ? tableService.getRuntime(serverTableIdentifier.getId())
+            : null;
 
     Preconditions.checkArgument(
         tableRuntime != null
diff --git a/amoro-ams/src/main/java/org/apache/amoro/server/table/DefaultTableService.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/DefaultTableService.java
index d872f3ce3c..d513c8c9a2 100644
--- a/amoro-ams/src/main/java/org/apache/amoro/server/table/DefaultTableService.java
+++ b/amoro-ams/src/main/java/org/apache/amoro/server/table/DefaultTableService.java
@@ -85,8 +85,7 @@ public class DefaultTableService extends StatedPersistentBase implements TableSe
   private final Map<String, InternalCatalog> internalCatalogMap = new ConcurrentHashMap<>();
   private final Map<String, ExternalCatalog> externalCatalogMap = new ConcurrentHashMap<>();
 
-  private final Map<ServerTableIdentifier, TableRuntime> tableRuntimeMap =
-      new ConcurrentHashMap<>();
+  private final Map<Long, TableRuntime> tableRuntimeMap = new ConcurrentHashMap<>();
 
   private final ScheduledExecutorService tableExplorerScheduler =
       Executors.newSingleThreadScheduledExecutor(
@@ -213,7 +212,7 @@ public void dropTableMetadata(TableIdentifier tableIdentifier, boolean deleteDat
     }
 
     ServerTableIdentifier serverTableIdentifier = internalCatalog.dropTable(database, table);
-    Optional.ofNullable(tableRuntimeMap.remove(serverTableIdentifier))
+    Optional.ofNullable(tableRuntimeMap.remove(serverTableIdentifier.getId()))
         .ifPresent(
             tableRuntime -> {
               if (headHandler != null) {
@@ -411,7 +410,7 @@ public void initialize() {
 
   private TableRuntime getAndCheckExist(ServerTableIdentifier tableIdentifier) {
     Preconditions.checkArgument(tableIdentifier != null, "tableIdentifier cannot be null");
-    TableRuntime tableRuntime = getRuntime(tableIdentifier);
+    TableRuntime tableRuntime = getRuntime(tableIdentifier.getId());
     if (tableRuntime == null) {
       throw new ObjectNotExistsException(tableIdentifier);
     }
@@ -447,15 +446,15 @@ private ServerTableIdentifier getOrSyncServerTableIdentifier(TableIdentifier id)
   }
 
   @Override
-  public TableRuntime getRuntime(ServerTableIdentifier tableIdentifier) {
+  public TableRuntime getRuntime(Long tableId) {
     checkStarted();
-    return tableRuntimeMap.get(tableIdentifier);
+    return tableRuntimeMap.get(tableId);
   }
 
   @Override
-  public boolean contains(ServerTableIdentifier tableIdentifier) {
+  public boolean contains(Long tableId) {
     checkStarted();
-    return tableRuntimeMap.containsKey(tableIdentifier);
+    return tableRuntimeMap.containsKey(tableId);
   }
 
   public void dispose() {
@@ -645,7 +644,7 @@ private boolean triggerTableAdded(
       }
     }
     TableRuntime tableRuntime = new TableRuntime(serverTableIdentifier, this, table.properties());
-    tableRuntimeMap.put(serverTableIdentifier, tableRuntime);
+    tableRuntimeMap.put(serverTableIdentifier.getId(), tableRuntime);
     tableRuntime.registerMetric(MetricManager.getInstance().getGlobalRegistry());
     if (headHandler != null) {
       headHandler.fireTableAdded(table, tableRuntime);
@@ -659,7 +658,7 @@ private void revertTableRuntimeAdded(
         externalCatalog.getServerTableIdentifier(
             tableIdentity.getDatabase(), tableIdentity.getTableName());
     if (tableIdentifier != null) {
-      tableRuntimeMap.remove(tableIdentifier);
+      tableRuntimeMap.remove(tableIdentifier.getId());
     }
   }
 
@@ -671,7 +670,7 @@ private void disposeTable(ServerTableIdentifier tableIdentifier) {
                 tableIdentifier.getCatalog(),
                 tableIdentifier.getDatabase(),
                 tableIdentifier.getTableName()));
-    Optional.ofNullable(tableRuntimeMap.remove(tableIdentifier))
+    Optional.ofNullable(tableRuntimeMap.remove(tableIdentifier.getId()))
         .ifPresent(
             tableRuntime -> {
               if (headHandler != null) {
diff --git a/amoro-ams/src/main/java/org/apache/amoro/server/table/TableManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableManager.java
index 4c8c3a8d01..4735bca2d7 100644
--- a/amoro-ams/src/main/java/org/apache/amoro/server/table/TableManager.java
+++ b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableManager.java
@@ -31,9 +31,9 @@ public interface TableManager extends TableRuntimeHandler {
    */
   AmoroTable<?> loadTable(ServerTableIdentifier tableIdentifier);
 
-  TableRuntime getRuntime(ServerTableIdentifier tableIdentifier);
+  TableRuntime getRuntime(Long tableId);
 
-  default boolean contains(ServerTableIdentifier tableIdentifier) {
-    return getRuntime(tableIdentifier) != null;
+  default boolean contains(Long tableId) {
+    return getRuntime(tableId) != null;
   }
 }
diff --git a/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/BaseTableExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/BaseTableExecutor.java
index e2125fbfb4..1d9002c357 100644
--- a/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/BaseTableExecutor.java
+++ b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/BaseTableExecutor.java
@@ -25,7 +25,6 @@
 import org.apache.amoro.server.table.RuntimeHandlerChain;
 import org.apache.amoro.server.table.TableManager;
 import org.apache.amoro.server.table.TableRuntime;
-import org.apache.amoro.server.table.TableRuntimeMeta;
 import org.apache.amoro.shade.guava32.com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -63,10 +62,9 @@ protected BaseTableExecutor(TableManager tableManager, int poolSize) {
   }
 
   @Override
-  protected void initHandler(List<TableRuntimeMeta> tableRuntimeMetaList) {
+  protected void initHandler(List<TableRuntime> tableRuntimeMetaList) {
     tableRuntimeMetaList.stream()
-        .map(tableRuntimeMeta -> tableRuntimeMeta.getTableRuntime())
-        .filter(tableRuntime -> enabled(tableRuntime))
+        .filter(this::enabled)
         .forEach(
             tableRuntime -> {
               if (scheduledTables.add(tableRuntime.getTableIdentifier())) {
@@ -109,7 +107,8 @@ protected String getThreadName() {
   }
 
   private boolean isExecutable(TableRuntime tableRuntime) {
-    return tableManager.contains(tableRuntime.getTableIdentifier()) && enabled(tableRuntime);
+    return tableManager.contains(tableRuntime.getTableIdentifier().getId())
+        && enabled(tableRuntime);
   }
 
   @Override
diff --git a/amoro-ams/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java
index 63b2073aaf..99b1853fa7 100644
--- a/amoro-ams/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java
+++ b/amoro-ams/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java
@@ -120,7 +120,7 @@ protected TableMetadata getTableMetadata(TableIdentifier identifier) {
 
   protected TableRuntime getTableRuntime(TableIdentifier identifier) {
     ServerTableIdentifier serverTableIdentifier = getServerTableIdentifier(identifier);
-    return tableService.getRuntime(serverTableIdentifier);
+    return tableService.getRuntime(serverTableIdentifier.getId());
   }
 
   protected void assertTableRuntime(TableIdentifier identifier, TableFormat format) {
diff --git a/amoro-ams/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java b/amoro-ams/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java
index 776a7a72cb..5a237700d7 100644
--- a/amoro-ams/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java
+++ b/amoro-ams/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java
@@ -114,7 +114,7 @@ private void initTableWithFiles() {
         (MixedTable) tableService().loadTable(serverTableIdentifier()).originalTable();
     appendData(mixedTable.asUnkeyedTable(), 1);
     appendData(mixedTable.asUnkeyedTable(), 2);
-    TableRuntime runtime = tableService().getRuntime(serverTableIdentifier());
+    TableRuntime runtime = tableService().getRuntime(serverTableIdentifier().getId());
 
     runtime.refresh(tableService().loadTable(serverTableIdentifier()));
   }
@@ -387,10 +387,13 @@ private void assertTaskCompleted(TaskRuntime taskRuntime) {
         0, optimizingService().listTasks(defaultResourceGroup().getName()).size());
     Assertions.assertEquals(
         OptimizingProcess.Status.RUNNING,
-        tableService().getRuntime(serverTableIdentifier()).getOptimizingProcess().getStatus());
+        tableService()
+            .getRuntime(serverTableIdentifier().getId())
+            .getOptimizingProcess()
+            .getStatus());
     Assertions.assertEquals(
         OptimizingStatus.COMMITTING,
-        tableService().getRuntime(serverTableIdentifier()).getOptimizingStatus());
+        tableService().getRuntime(serverTableIdentifier().getId()).getOptimizingStatus());
   }
 
   protected void reload() {
@@ -415,7 +418,7 @@ public TableRuntimeRefresher() {
     }
 
     void refreshPending() {
-      execute(tableService().getRuntime(serverTableIdentifier()));
+      execute(tableService().getRuntime(serverTableIdentifier().getId()));
     }
   }
 
diff --git a/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableRuntimeHandler.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableRuntimeHandler.java
index f629012981..30aea4055d 100644
--- a/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableRuntimeHandler.java
+++ b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableRuntimeHandler.java
@@ -92,14 +92,15 @@ public void testInitialize() throws Exception {
     tableService.initialize();
     Assert.assertEquals(1, handler.getInitTables().size());
     Assert.assertEquals(
-        createTableId.getId().longValue(), handler.getInitTables().get(0).getTableId());
+        (Long) createTableId.getId().longValue(),
+        handler.getInitTables().get(0).getTableIdentifier().getId());
 
     // test change properties
     MixedTable mixedTable = (MixedTable) tableService().loadTable(createTableId).originalTable();
 
     mixedTable.updateProperties().set(TableProperties.ENABLE_ORPHAN_CLEAN, "true").commit();
     tableService()
-        .getRuntime(createTableId)
+        .getRuntime(createTableId.getId())
         .refresh(tableService.loadTable(serverTableIdentifier()));
     Assert.assertEquals(1, handler.getConfigChangedTables().size());
     validateTableRuntime(handler.getConfigChangedTables().get(0).first());
diff --git a/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableRuntimeManager.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableRuntimeManager.java
index 277e8e0e34..4549c676f9 100644
--- a/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableRuntimeManager.java
+++ b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableRuntimeManager.java
@@ -71,7 +71,7 @@ public void testLoadTable() {
 
   @Test
   public void testTableContains() {
-    Assert.assertTrue(tableService().contains(serverTableIdentifier()));
+    Assert.assertTrue(tableService().contains(serverTableIdentifier().getId()));
     ServerTableIdentifier copyId =
         ServerTableIdentifier.of(
             null,
@@ -79,7 +79,7 @@ public void testTableContains() {
             serverTableIdentifier().getDatabase(),
             serverTableIdentifier().getTableName(),
             serverTableIdentifier().getFormat());
-    Assert.assertFalse(tableService().contains(copyId));
+    Assert.assertFalse(tableService().contains(copyId.getId()));
     copyId =
         ServerTableIdentifier.of(
             serverTableIdentifier().getId(),
@@ -87,12 +87,12 @@ public void testTableContains() {
             serverTableIdentifier().getDatabase(),
             "unknown",
             serverTableIdentifier().getFormat());
-    Assert.assertFalse(tableService().contains(copyId));
+    Assert.assertFalse(tableService().contains(copyId.getId()));
   }
 
   @Test
   public void testTableRuntime() {
-    TableRuntime tableRuntime = tableService().getRuntime(serverTableIdentifier());
+    TableRuntime tableRuntime = tableService().getRuntime(serverTableIdentifier().getId());
     validateTableRuntime(tableRuntime);
   }
 }
diff --git a/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableService.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableService.java
index dea85f1a73..cbf8010c6e 100644
--- a/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableService.java
+++ b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableService.java
@@ -341,7 +341,7 @@ private boolean isBlocked(BlockableOperation operation) {
   }
 
   private boolean isTableRuntimeBlocked(BlockableOperation operation) {
-    return tableService().getRuntime(serverTableIdentifier()).isBlocked(operation);
+    return tableService().getRuntime(serverTableIdentifier().getId()).isBlocked(operation);
   }
 
   private void assertBlockerCnt(int i) {