hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[to #51258084] fix serval name resolve issues

Browse Source
This commit is contained in:
obdev
2023-08-07 11:18:15 +00:00
committed by ob-robot
parent 83f6c7e439
commit e6c7d6e585
8 changed files with 91 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/pl/ob_pl_resolver.cpp
View File

@ -1399,22 +1399,6 @@ int ObPLResolver::resolve_sp_composite_type(const ParseNode *sp_data_type_node,
ObArray<ObRawExpr*> params;
OZ (obj_access_idents.at(obj_access_idents.count() -1 ).extract_params(0, params));
} else {
// // 如果这个record是定义在package中，同时有默认值，那么需要把这个默认值表达式copy过来
// // 放到当前func的表达式列表中，后面进行default赋值的时候，可以使用。
// if (OB_SUCC(ret) && user_type->is_record_type()) {
// const ObRecordType *rec_type = static_cast<const ObRecordType *>(user_type);
// for (int64_t i = 0; OB_SUCC(ret) && i < rec_type->get_member_count(); ++i) {
// ObRecordMember *member = const_cast<ObRecordMember*>(rec_type->get_record_member(i));
// CK (OB_NOT_NULL(member));
// if (OB_SUCC(ret)) {
// if (OB_INVALID_INDEX != member->get_default()
// && OB_NOT_NULL(member->get_default_expr())) {
// OZ (func.add_expr(member->get_default_expr(), false));
// OX (member->set_default(func.get_expr_count() - 1));
// }
// }
// }
// }
OX (data_type = *user_type);
}
}
@ -1736,7 +1720,7 @@ int ObPLResolver::get_view_select_stmt(
}
int ObPLResolver::fill_record_type(
ObIAllocator &allocator, ObSelectStmt *select_stmt, ObRecordType *&record_type)
ObSchemaGetterGuard &schema_guard, ObIAllocator &allocator, ObSelectStmt *select_stmt, ObRecordType *&record_type)
{
int ret = OB_SUCCESS;
const SelectItem *select_item = NULL;
@ -1749,9 +1733,22 @@ int ObPLResolver::fill_record_type(
ObPLDataType pl_type;
CK (OB_NOT_NULL(select_item = &(select_stmt->get_select_item(i))));
CK (OB_NOT_NULL(expr = select_item->expr_));
OX (data_type.set_meta_type(expr->get_result_type()));
OX (data_type.set_accuracy(expr->get_result_type().get_accuracy()));
OX (pl_type.set_data_type(data_type));
if (OB_FAIL(ret)) {
} else if (expr->get_result_type().is_ext() || expr->get_result_type().is_user_defined_sql_type()) {
const ObUDTTypeInfo *udt_info = NULL;
const ObUserDefinedType *user_type = NULL;
ObArenaAllocator allocator;
uint64_t udt_id = expr->get_result_type().get_expr_udt_id();
uint64_t tenant_id = get_tenant_id_by_object_id(udt_id);
OZ (schema_guard.get_udt_info(tenant_id, udt_id, udt_info));
CK (OB_NOT_NULL(udt_info));
OZ (udt_info->transform_to_pl_type(allocator, user_type));
OX (pl_type = *user_type);
} else {
OX (data_type.set_meta_type(expr->get_result_type()));
OX (data_type.set_accuracy(expr->get_result_type().get_accuracy()));
OX (pl_type.set_data_type(data_type));
}
OZ (ob_write_string(allocator, select_item->alias_name_, copy_name));
OZ (record_type->add_record_member(copy_name, pl_type));
}
@ -1806,11 +1803,12 @@ int ObPLResolver::build_record_type_by_view_schema(const ObPLResolveCtx &ctx,
// OZ (get_view_select_stmt(resolve_ctx, view_schema, select_stmt));
CK (OB_NOT_NULL(real_stmt = select_stmt->get_real_stmt()));
CK (OB_NOT_NULL(record_type));
OZ (fill_record_type(ctx.allocator_, real_stmt, record_type));
OZ (fill_record_type(ctx.schema_guard_, ctx.allocator_, real_stmt, record_type));
return ret;
}
int ObPLResolver::build_record_type_by_table_schema(common::ObIAllocator &allocator,
int ObPLResolver::build_record_type_by_table_schema(ObSchemaGetterGuard &schema_guard,
common::ObIAllocator &allocator,
const ObTableSchema* table_schema,
ObRecordType *&record_type,
bool with_rowid)
@ -1824,20 +1822,32 @@ int ObPLResolver::build_record_type_by_table_schema(common::ObIAllocator &alloca
for (; OB_SUCC(ret) && cs_iter != cs_iter_end; cs_iter++) {
const ObColumnSchemaV2 &column_schema = **cs_iter;
if (!column_schema.is_hidden() && !(column_schema.is_invisible_column() && !with_rowid)) {
ObDataType data_type;
ObPLDataType pl_type;
data_type.set_meta_type(column_schema.get_meta_type());
data_type.set_accuracy(column_schema.get_accuracy());
if (data_type.get_meta_type().is_bit()) { // 对于bit类型, scale存储的是长度信息
data_type.meta_.set_scale(data_type.get_precision());
if (column_schema.get_meta_type().is_user_defined_sql_type()) {
const ObUDTTypeInfo *udt_info = NULL;
const ObUserDefinedType *user_type = NULL;
ObArenaAllocator allocator;
uint64_t tenant_id = get_tenant_id_by_object_id(column_schema.get_sub_data_type());
OZ (schema_guard.get_udt_info(tenant_id, column_schema.get_sub_data_type(), udt_info));
CK (OB_NOT_NULL(udt_info));
OZ (udt_info->transform_to_pl_type(allocator, user_type));
CK (OB_NOT_NULL(user_type));
OX (pl_type = *user_type);
} else {
data_type.meta_.set_scale(data_type.get_scale());
}
if (column_schema.is_enum_or_set()) {
OZ (pl_type.set_type_info(column_schema.get_extended_type_info()));
ObDataType data_type;
data_type.set_meta_type(column_schema.get_meta_type());
data_type.set_accuracy(column_schema.get_accuracy());
if (data_type.get_meta_type().is_bit()) { // 对于bit类型, scale存储的是长度信息
data_type.meta_.set_scale(data_type.get_precision());
} else {
data_type.meta_.set_scale(data_type.get_scale());
}
if (column_schema.is_enum_or_set()) {
OZ (pl_type.set_type_info(column_schema.get_extended_type_info()));
}
OX (pl_type.set_data_type(data_type));
}
if (OB_SUCC(ret)) {
pl_type.set_data_type(data_type);
char *name_buf = NULL;
ObString column_name = column_schema.get_column_name_str();
if (OB_ISNULL(name_buf =
@ -1905,7 +1915,7 @@ int ObPLResolver::build_record_type_by_schema(
resolve_ctx, table_schema, record_type));
} else {
OZ (build_record_type_by_table_schema(
resolve_ctx.allocator_, table_schema, record_type, with_rowid));
resolve_ctx.schema_guard_, resolve_ctx.allocator_, table_schema, record_type, with_rowid));
}
}
return ret;
@ -7207,7 +7217,7 @@ int ObPLResolver::resolve_fetch(
if (OB_SUCC(ret) && !is_compatible) {
ret = OB_ERR_TYPE_MISMATCH_IN_FETCH;
LOG_WARN("type not compatible", K(ret));
LOG_WARN("type not compatible", K(ret), KPC(left), KPC(right));
}
}
}
@ -8107,8 +8117,13 @@ int ObPLResolver::build_raw_expr(const ParseNode *node,
ret = OB_NOT_SUPPORTED;
LOG_WARN("agg expr in pl assign stmt not allowed", K(ret));
LOG_USER_ERROR(OB_NOT_SUPPORTED, "agg expr in pl assign stmt");
} else if (sub_query_info.count() > 0 && lib::is_mysql_mode()) {
OZ (transform_subquery_expr(node, expr, expected_type, unit_ast));
} else if (sub_query_info.count() > 0) {
if (lib::is_mysql_mode()) {
OZ (transform_subquery_expr(node, expr, expected_type, unit_ast));
} else {
ret = OB_NOT_SUPPORTED;
LOG_USER_ERROR(OB_NOT_SUPPORTED, "use subquery in pl/sql expression");
}
} else {
OZ (resolve_columns(expr, columns, unit_ast));
}
@ -8417,7 +8432,11 @@ int ObPLResolver::resolve_expr(const ParseNode *node,
// 放在step是有问题，因为类似T_SP_CPARAM是没有对应的expr执行实体，需要展开. 没展开deduce就会出问题。
bool pl_sql_format_convert = false;
if (OB_SUCC(ret) && OB_NOT_NULL(expected_type)) {
if (ObNullType == expr->get_result_type().get_obj_meta().get_type()) {
if (T_OP_ROW == expr->get_expr_type()) {
ret = OB_ERR_EXPRESSION_WRONG_TYPE;
LOG_WARN("PLS-00382: expression is of wrong type",
K(ret), K(expected_type->is_obj_type()), KPC(expr));
} else if (ObNullType == expr->get_result_type().get_obj_meta().get_type()) {
// do nothing
} else if (expected_type->is_opaque_type()
&& expected_type->get_user_type_id() == static_cast<uint64_t>(T_OBJ_XML)
@ -11778,7 +11797,7 @@ int ObPLMockSelfArg::mock()
mocked_ = true;
mark_only_ = true;
} else if (access_idxs_.at(access_idxs_.count() - 1).elem_type_.is_composite_type()
&& expr_params_.at(0)->get_result_type().get_expr_udt_id()
&& expr_params_.at(0)->get_result_type().get_expr_udt_id()
== access_idxs_.at(access_idxs_.count() - 1).elem_type_.get_user_type_id()) {
ObConstRawExpr *null_expr = NULL;
OZ (expr_factory_.create_raw_expr(T_NULL, null_expr));