Call PL also waits for sys package ready

Author: obdev

src/observer/embed/python/ob_embed_impl.cpp

@@ -341,6 +341,9 @@ std::shared_ptr<ObLiteEmbedConn> ObLiteEmbed::connect(const char* db_name, const
     OX (session->set_priv_user_id(user_info->get_user_id()));
     OX (session->set_user_priv_set(user_info->get_priv_set()));
     OX (session->init_use_rich_format());
+    ObObj param_val;
+    param_val.set_int(60 * 1000 * 1000);
+    OZ(session->update_sys_variable(SYS_VAR_OB_QUERY_TIMEOUT, param_val));
     if (OB_NOT_NULL(db_name) && STRLEN(db_name) > 0) {
       OZ (schema_guard.get_db_priv_set(OB_SYS_TENANT_ID, user_info->get_user_id(), db_name, db_priv_set));
       OX (session->set_db_priv_set(db_priv_set));

src/sql/resolver/cmd/ob_call_procedure_resolver.cpp

@@ -358,6 +358,8 @@ int ObCallProcedureResolver::resolve(const ParseNode &parse_tree)
                                   session_info_->get_effective_tenant_id()));
     OX (call_proc_info = static_cast<ObCallProcedureInfo*>(stmt->get_cacheobj_guard().get_cache_obj()));
     CK (OB_NOT_NULL(call_proc_info));
+    // Wait for sys package to be loaded if not ready yet
+    OZ (ObResolverUtils::wait_for_sys_package_ready(*session_info_));
     // Parsing process name
     if (OB_SUCC(ret)) {
       if (T_SP_ACCESS_NAME != name_node->type_) {

src/sql/resolver/ob_resolver_utils.cpp

@@ -6799,6 +6799,37 @@ int ObResolverUtils::set_parallel_info(sql::ObSQLSessionInfo &session_info,
   return ret;
 }
 
+int ObResolverUtils::wait_for_sys_package_ready(ObSQLSessionInfo &session_info)
+{
+  int ret = OB_SUCCESS;
+  if (GCONF._enable_async_load_sys_package && !GCTX.sys_package_ready_ && session_info.is_user_session()) {
+    const int64_t retry_interval_us = 100L * 1000L; // 100ms
+    bool waited = false;
+    while (!GCTX.sys_package_ready_ && OB_SUCC(ret)) {
+      if (NULL != session_info.get_cur_exec_ctx() && OB_FAIL(session_info.get_cur_exec_ctx()->check_status())) {
+        LOG_WARN("check status failed", K(ret));
+      } else {
+        if (!waited) {
+          LOG_INFO("sys package not ready yet, waiting for loading completion");
+          waited = true;
+        }
+        ob_usleep(retry_interval_us);
+      }
+    }
+    if (OB_FAIL(ret)) {
+      LOG_WARN("sys package waiting interrupted", K(ret));
+    } else if (!GCTX.sys_package_ready_) {
+      LOG_WARN("sys package not ready after waiting");
+    } else {
+      if (waited) {
+        LOG_INFO("sys package ready after waiting");
+      }
+      // Return OB_SCHEMA_EAGAIN to retry acquiring schema
+      ret = OB_SCHEMA_EAGAIN;
+    }
+  }
+  return ret;
+}
 
 int ObResolverUtils::resolve_external_symbol(common::ObIAllocator &allocator,
                                              sql::ObRawExprFactory &expr_factory,
@@ -6839,32 +6870,8 @@ int ObResolverUtils::resolve_external_symbol(common::ObIAllocator &allocator,
 
   if (OB_SUCC(ret)) {
     // Wait for sys package to be loaded if not ready yet
-    if (GCONF._enable_async_load_sys_package && !GCTX.sys_package_ready_ && session_info.is_user_session()) {
-      const int64_t retry_interval_us = 100L * 1000L; // 100ms
-      bool waited = false;
-      while (!GCTX.sys_package_ready_ && OB_SUCC(ret)) {
-        if (NULL != session_info.get_cur_exec_ctx() && OB_FAIL(session_info.get_cur_exec_ctx()->check_status())) {
-          LOG_WARN("check status failed", K(ret));
-        } else {
-          if (!waited) {
-            LOG_INFO("sys package not ready yet, waiting for loading completion", K(q_name));
-            waited = true;
-          }
-          ob_usleep(retry_interval_us);
-        }
-      }
-      if (OB_FAIL(ret)) {
-        LOG_WARN("sys package waiting interrupted", K(ret), K(q_name));
-      } else if (!GCTX.sys_package_ready_) {
-        LOG_WARN("sys package not ready after waiting", K(q_name));
-      } else {
-        if (waited) {
-          LOG_INFO("sys package ready after waiting", K(q_name));
-        }
-        // Return OB_SCHEMA_EAGAIN to retry acquiring schema
-        ret = OB_SCHEMA_EAGAIN;
-      }
-    } else {
+    OZ (wait_for_sys_package_ready(session_info));
+    if (OB_SUCC(ret)) {
       pl::ObPLResolver pl_resolver(allocator,
                                   session_info,
                                   schema_guard,

src/sql/resolver/ob_resolver_utils.h

@@ -302,6 +302,10 @@ struct ObResolverUtils
                                ObRawExpr &expr,
                                ObQueryCtx &ctx);
 
+  // Wait for sys package to be loaded if not ready yet
+  // Returns OB_SCHEMA_EAGAIN if waiting succeeded and retry is needed, OB_SUCCESS if no waiting needed or already ready
+  static int wait_for_sys_package_ready(ObSQLSessionInfo &session_info);
+
   static int resolve_external_symbol(common::ObIAllocator &allocator,
                                      sql::ObRawExprFactory &expr_factory,
                                      sql::ObSQLSessionInfo &session_info,