From ceab75db79e6b1234343c2f83d2f997b5ad5d13c Mon Sep 17 00:00:00 2001 From: xianyu-w <707512433@qq.com> Date: Sat, 28 Jan 2023 13:29:34 +0800 Subject: [PATCH] Fix failed mysqltest introduced by print cast udt Co-authored-by: obdev --- src/sql/resolver/ddl/ob_ddl_resolver.cpp | 4 ++++ src/sql/resolver/ob_resolver_utils.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/sql/resolver/ddl/ob_ddl_resolver.cpp b/src/sql/resolver/ddl/ob_ddl_resolver.cpp index 5f5da16816..de5bb592b7 100644 --- a/src/sql/resolver/ddl/ob_ddl_resolver.cpp +++ b/src/sql/resolver/ddl/ob_ddl_resolver.cpp @@ -6689,6 +6689,7 @@ int ObDDLResolver::check_uniq_allow(ObTableSchema &table_schema, uint64_t tenant_id = table_schema.get_tenant_id(); const ObTenantSchema *tenant_schema = NULL; ObSchemaGetterGuard guard; + ObSchemaChecker schema_checker; params.expr_factory_ = &expr_factory; params.allocator_ = &allocator; params.session_info_ = &empty_session; @@ -6705,7 +6706,10 @@ int ObDDLResolver::check_uniq_allow(ObTableSchema &table_schema, LOG_WARN("session load default system variable failed", K(ret)); } else if (OB_FAIL(empty_session.load_default_configs_in_pc())) { LOG_WARN("session load default configs failed", K(ret)); + } else if (OB_FAIL(schema_checker.init(guard))) { + LOG_WARN("failed to init schema checker", K(ret)); } else { + params.schema_checker_ = &schema_checker; const share::schema::ObPartitionFuncType part_func_type = table_schema.get_part_option().get_part_func_type(); const ParseNode *node = NULL; common::ObSEArray part_keys; diff --git a/src/sql/resolver/ob_resolver_utils.cpp b/src/sql/resolver/ob_resolver_utils.cpp index 921852eb94..f881d7ead8 100644 --- a/src/sql/resolver/ob_resolver_utils.cpp +++ b/src/sql/resolver/ob_resolver_utils.cpp @@ -4548,7 +4548,7 @@ int ObResolverUtils::resolve_check_constraint_expr( } if (OB_ISNULL(expr_factory) || OB_ISNULL(session_info) || OB_ISNULL(node) || OB_ISNULL(params.schema_checker_)) { ret = OB_NOT_INIT; - LOG_WARN("resolve status is invalid", K_(params.expr_factory), K(session_info), K(node)); + LOG_WARN("resolve status is invalid", K_(params.expr_factory), K(session_info), K(node), K(params.schema_checker_)); } else if (OB_FAIL(ObRawExprUtils::build_check_constraint_expr(*expr_factory, *session_info, *node, expr, columns))) { LOG_WARN("build generated column expr failed", K(ret)); }