Support read and write lock in table level to reduce lock competition

.gitignore

@@ -10,6 +10,7 @@ docs/.temp
 docs/.vuepress/dist
 docs/node_modules
 docs/build
+docs/contents
 gensrc/build
 fe/fe-core/target
 thirdparty/src

fe/fe-core/src/main/java/org/apache/doris/alter/AlterHandler.java

@@ -271,35 +271,18 @@ public void handleFinishedReplica(AgentTask task, TTabletInfo finishTabletInfo,
         alterJob.handleFinishedReplica(task, finishTabletInfo, reportVersion);
     }
 
-    /*
-     * cancel alter job when drop table
-     * olapTable: 
-     *      table which is being dropped
-     */
-    public void cancelWithTable(OlapTable olapTable) {
-        // make sure to hold to db write lock before calling this
-        AlterJob alterJob = getAlterJob(olapTable.getId());
-        if (alterJob == null) {
-            return;
+    protected void cancelInternal(AlterJob alterJob, OlapTable olapTable, String msg) {
+        // cancel
+        if (olapTable != null) {
+            olapTable.writeLock();
         }
-        alterJob.cancel(olapTable, "table is dropped");
-
-        // remove from alterJobs and add to finishedOrCancelledAlterJobs operation should be perform atomically
-        lock();
         try {
-            alterJob = alterJobs.remove(olapTable.getId());
-            if (alterJob != null) {
-                alterJob.clear();
-                finishedOrCancelledAlterJobs.add(alterJob);
-            }
+            alterJob.cancel(olapTable, msg);
         } finally {
-            unlock();
+            if (olapTable != null) {
+                olapTable.writeUnlock();
+            }
         }
-    }
-
-    protected void cancelInternal(AlterJob alterJob, OlapTable olapTable, String msg) {
-        // cancel
-        alterJob.cancel(olapTable, msg);
         jobDone(alterJob);
     }
 
@@ -427,12 +410,9 @@ public void handleFinishAlterTask(AlterReplicaTask task) throws MetaNotFoundExce
             throw new MetaNotFoundException("database " + task.getDbId() + " does not exist");
         }
 
-        db.writeLock();
+        OlapTable tbl = (OlapTable) db.getTableOrThrowException(task.getTableId(), Table.TableType.OLAP);
+        tbl.writeLock();
         try {
-            OlapTable tbl = (OlapTable) db.getTable(task.getTableId());
-            if (tbl == null) {
-                throw new MetaNotFoundException("tbl " + task.getTableId() + " does not exist");
-            }
             Partition partition = tbl.getPartition(task.getPartitionId());
             if (partition == null) {
                 throw new MetaNotFoundException("partition " + task.getPartitionId() + " does not exist");
@@ -478,7 +458,7 @@ public void handleFinishAlterTask(AlterReplicaTask task) throws MetaNotFoundExce
 
             LOG.info("after handle alter task tablet: {}, replica: {}", task.getSignature(), replica);
         } finally {
-            db.writeUnlock();
+            tbl.writeUnlock();
         }
     }
 

fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java

@@ -21,8 +21,10 @@
 import org.apache.doris.catalog.Database;
 import org.apache.doris.catalog.OlapTable;
 import org.apache.doris.catalog.OlapTable.OlapTableState;
+import org.apache.doris.catalog.Table;
 import org.apache.doris.common.Config;
 import org.apache.doris.common.FeMetaVersion;
+import org.apache.doris.common.MetaNotFoundException;
 import org.apache.doris.common.io.Text;
 import org.apache.doris.common.io.Writable;
 import org.apache.doris.persist.gson.GsonUtils;
@@ -176,10 +178,8 @@ public synchronized void run() {
         }
     }
 
-    public final boolean cancel(String errMsg) {
-        synchronized (this) {
-            return cancelImpl(errMsg);
-        }
+    public synchronized final boolean cancel(String errMsg) {
+        return cancelImpl(errMsg);
     }
 
     /**
@@ -188,21 +188,16 @@ public final boolean cancel(String errMsg) {
     */
     protected boolean checkTableStable(Database db) throws AlterCancelException {
         OlapTable tbl = null;
-        boolean isStable = false;
-        db.readLock();
         try {
-            tbl = (OlapTable) db.getTable(tableId);
-            if (tbl == null) {
-                throw new AlterCancelException("Table " + tableId + " does not exist");
-            }
+            tbl = (OlapTable) db.getTableOrThrowException(tableId, Table.TableType.OLAP);
+        } catch (MetaNotFoundException e) {
+            throw new AlterCancelException(e.getMessage());
+        }
 
-            isStable = tbl.isStable(Catalog.getCurrentSystemInfo(),
+        boolean isStable = tbl.isStable(Catalog.getCurrentSystemInfo(),
                     Catalog.getCurrentCatalog().getTabletScheduler(), db.getClusterName());
-        } finally {
-            db.readUnlock();
-        }
 
-        db.writeLock();
+        tbl.writeLock();
         try {
             if (!isStable) {
                 errMsg = "table is unstable";
@@ -216,7 +211,7 @@ protected boolean checkTableStable(Database db) throws AlterCancelException {
                 return true;
             }
         } finally {
-            db.writeUnlock();
+            tbl.writeUnlock();
         }
     }