[opt](Nereids) lock table in ascending order of table IDs

apache · Dec 5, 2024 · 32b4505 · 32b4505
1 parent 0f48cfd
commit 32b4505
Show file tree

Hide file tree

Showing 32 changed files with 622 additions and 621 deletions.
diff --git a/fe/fe-common/src/main/java/org/apache/doris/catalog/Type.java b/fe/fe-common/src/main/java/org/apache/doris/catalog/Type.java
@@ -2291,4 +2291,6 @@ public static boolean isSameDecimalTypeWithDifferentPrecision(int precision1, in
     public static Type getTypeFromTypeName(String typeName) {
         return typeMap.getOrDefault(typeName, Type.UNSUPPORTED);
     }
+
+
 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java
@@ -1054,10 +1054,7 @@ public boolean equals(Object obj) {
                 && isKey == other.isKey
                 && isAllowNull == other.isAllowNull
                 && isAutoInc == other.isAutoInc
-                && getDataType().equals(other.getDataType())
-                && getStrLen() == other.getStrLen()
-                && getPrecision() == other.getPrecision()
-                && getScale() == other.getScale()
+                && Objects.equals(type, other.type)
                 && Objects.equals(comment, other.comment)
                 && visible == other.visible
                 && Objects.equals(children, other.children)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/NereidsSqlCacheManager.java b/fe/fe-core/src/main/java/org/apache/doris/common/NereidsSqlCacheManager.java
@@ -225,6 +225,10 @@ private Optional<LogicalSqlCache> tryParseSqlWithoutCheckVariable(
             SqlCacheContext sqlCacheContext, UserIdentity currentUserIdentity) {
         Env env = connectContext.getEnv();
 
+        if (!tryLockTables(connectContext, env, sqlCacheContext)) {
+            return invalidateCache(key);
+        }
+
         // check table and view and their columns authority
         if (privilegeChanged(connectContext, env, sqlCacheContext)) {
             return invalidateCache(key);
@@ -378,16 +382,38 @@ private boolean dataMaskPoliciesChanged(
         return false;
     }
 
-    private boolean privilegeChanged(ConnectContext connectContext, Env env, SqlCacheContext sqlCacheContext) {
+    /**
+     * Execute table locking operations in ascending order of table IDs.
+     *
+     * @return true if obtain all tables lock.
+     */
+    private boolean tryLockTables(ConnectContext connectContext, Env env, SqlCacheContext sqlCacheContext) {
         StatementContext currentStatementContext = connectContext.getStatementContext();
+        for (FullTableName fullTableName : sqlCacheContext.getUsedTables()) {
+            TableIf tableIf = findTableIf(env, fullTableName);
+            if (tableIf == null) {
+                return false;
+            }
+            currentStatementContext.getTables().put(fullTableName.toList(), tableIf);
+        }
+        for (FullTableName fullTableName : sqlCacheContext.getUsedViews().keySet()) {
+            TableIf tableIf = findTableIf(env, fullTableName);
+            if (tableIf == null) {
+                return false;
+            }
+            currentStatementContext.getTables().put(fullTableName.toList(), tableIf);
+        }
+        currentStatementContext.lock();
+        return true;
+    }
+
+    private boolean privilegeChanged(ConnectContext connectContext, Env env, SqlCacheContext sqlCacheContext) {
         for (Entry<FullTableName, Set<String>> kv : sqlCacheContext.getCheckPrivilegeTablesOrViews().entrySet()) {
             Set<String> usedColumns = kv.getValue();
             TableIf tableIf = findTableIf(env, kv.getKey());
             if (tableIf == null) {
                 return true;
             }
-            // release when close statementContext
-            currentStatementContext.addTableReadLock(tableIf);
             try {
                 UserAuthentication.checkPermission(tableIf, connectContext, usedColumns);
             } catch (Throwable t) {

diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/profile/SummaryProfile.java b/fe/fe-core/src/main/java/org/apache/doris/common/profile/SummaryProfile.java
@@ -97,6 +97,7 @@ public class SummaryProfile {
     public static final String GET_TABLE_VERSION_COUNT = "Get Table Version Count";
 
     public static final String PARSE_SQL_TIME = "Parse SQL Time";
+    public static final String NEREIDS_LOCK_TABLE_TIME = "Nereids Lock Table Time";
     public static final String NEREIDS_ANALYSIS_TIME = "Nereids Analysis Time";
     public static final String NEREIDS_REWRITE_TIME = "Nereids Rewrite Time";
     public static final String NEREIDS_OPTIMIZE_TIME = "Nereids Optimize Time";
@@ -136,6 +137,7 @@ public class SummaryProfile {
     // The display order of execution summary items.
     public static final ImmutableList<String> EXECUTION_SUMMARY_KEYS = ImmutableList.of(
             PARSE_SQL_TIME,
+            NEREIDS_LOCK_TABLE_TIME,
             NEREIDS_ANALYSIS_TIME,
             NEREIDS_REWRITE_TIME,
             NEREIDS_OPTIMIZE_TIME,
@@ -224,6 +226,8 @@ public class SummaryProfile {
     private long parseSqlStartTime = -1;
     @SerializedName(value = "parseSqlFinishTime")
     private long parseSqlFinishTime = -1;
+    @SerializedName(value = "nereidsLockTableFinishTime")
+    private long nereidsLockTableFinishTime = -1;
     @SerializedName(value = "nereidsAnalysisFinishTime")
     private long nereidsAnalysisFinishTime = -1;
     @SerializedName(value = "nereidsRewriteFinishTime")
@@ -410,6 +414,7 @@ private void updateSummaryProfile(Map<String, String> infos) {
 
     private void updateExecutionSummaryProfile() {
         executionSummaryProfile.addInfoString(PARSE_SQL_TIME, getPrettyParseSqlTime());
+        executionSummaryProfile.addInfoString(NEREIDS_LOCK_TABLE_TIME, getPrettyNereidsLockTableTime());
         executionSummaryProfile.addInfoString(NEREIDS_ANALYSIS_TIME, getPrettyNereidsAnalysisTime());
         executionSummaryProfile.addInfoString(NEREIDS_REWRITE_TIME, getPrettyNereidsRewriteTime());
         executionSummaryProfile.addInfoString(NEREIDS_OPTIMIZE_TIME, getPrettyNereidsOptimizeTime());
@@ -506,6 +511,10 @@ public void setParseSqlFinishTime(long parseSqlFinishTime) {
         this.parseSqlFinishTime = parseSqlFinishTime;
     }
 
+    public void setNereidsLockTableFinishTime() {
+        this.nereidsLockTableFinishTime = TimeUtils.getStartTimeMs();
+    }
+
     public void setNereidsAnalysisTime() {
         this.nereidsAnalysisFinishTime = TimeUtils.getStartTimeMs();
     }
@@ -766,8 +775,12 @@ public String getPrettyParseSqlTime() {
         return getPrettyTime(parseSqlFinishTime, parseSqlStartTime, TUnit.TIME_MS);
     }
 
+    public String getPrettyNereidsLockTableTime() {
+        return getPrettyTime(nereidsLockTableFinishTime, parseSqlStartTime, TUnit.TIME_MS);
+    }
+
     public String getPrettyNereidsAnalysisTime() {
-        return getPrettyTime(nereidsAnalysisFinishTime, queryBeginTime, TUnit.TIME_MS);
+        return getPrettyTime(nereidsAnalysisFinishTime, nereidsLockTableFinishTime, TUnit.TIME_MS);
     }
 
     public String getPrettyNereidsRewriteTime() {
-Original file line number
+Diff line change
@@ Expand Up @@
         public static Type getTypeFromTypeName(String typeName) {
             return typeMap.getOrDefault(typeName, Type.UNSUPPORTED);
         }
     }