Merge branch 'master' into develop

2024-01-12 09:41:55 +08:00
parent 7b7c6de093 9091ffd7a1
commit 74eaf712da
523 changed files with 13835 additions and 4259 deletions
--- a/src/sql/resolver/ob_resolver_utils.cpp
+++ b/src/sql/resolver/ob_resolver_utils.cpp
@ -6909,7 +6909,8 @@ int ObResolverUtils::set_parallel_info(sql::ObSQLSessionInfo &session_info,
    }

    if (OB_SUCC(ret) && OB_NOT_NULL(routine_info)) {
-      if (routine_info->is_modifies_sql_data() ||
+      if (!routine_info->is_valid() ||
+          routine_info->is_modifies_sql_data() ||
          routine_info->is_wps() ||
          routine_info->is_rps() ||
          routine_info->is_has_sequence() ||