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

[FEAT MERGE] Vector Index & Array Type

Browse Source 
Co-authored-by: helloamateur <magiccheery@163.com>
Co-authored-by: skylhd <dickylhd@gmail.com>
Co-authored-by: JLY2015 <1623359870@qq.com>
This commit is contained in:
wanghangQ
2024-08-29 07:52:21 +00:00
committed by ob-robot
parent 376ae13422
commit 5cbd86c9e6
443 changed files with 46822 additions and 2893 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/sql/ob_sql.cpp
View File

@ -832,7 +832,13 @@ int ObSql::fill_select_result_set(ObResultSet &result_set, ObSqlCtx *context, co
field.type_.meta_.set_ext();
field.accuracy_.set_accuracy(T_OBJ_SDO_GEOMETRY);
}
if (OB_FAIL(result_set.get_exec_context().get_subschema_id_by_udt_id(udt_id, tmp_subschema_id))) {
if (expr->get_result_type().is_collection_sql_type()
&& !ObObjUDTUtil::ob_is_supported_sql_udt(udt_id)) {
// array type
field.type_.set_subschema_id(subschema_id);
field.charsetnr_ = CS_TYPE_BINARY;
field.length_ = OB_MAX_LONGTEXT_LENGTH;
} else if (OB_FAIL(result_set.get_exec_context().get_subschema_id_by_udt_id(udt_id, tmp_subschema_id))) {
LOG_WARN("unsupported udt id", K(ret), K(subschema_id));
} else if (OB_FAIL(result_set.get_exec_context().get_sqludt_meta_by_subschema_id(tmp_subschema_id, udt_meta))) {
LOG_WARN("failed to get udt meta", K(ret), K(tmp_subschema_id));
@ -847,15 +853,15 @@ int ObSql::fill_select_result_set(ObResultSet &result_set, ObSqlCtx *context, co
field.type_.set_subschema_id(tmp_subschema_id);
field.charsetnr_ = CS_TYPE_BINARY;
field.length_ = OB_MAX_LONGTEXT_LENGTH;
if (OB_SUCC(ret)) {
if (OB_FAIL(ob_write_string(alloc, ObString(udt_meta.udt_name_len_, udt_meta.udt_name_), field.type_name_))) {
LOG_WARN("fail to alloc string", K(i), K(field), K(ret));
}
}
} else {
ret = OB_NOT_SUPPORTED;
LOG_WARN("udt type not supported", K(ret), K(tmp_subschema_id));
}
if (OB_SUCC(ret)) {
if (OB_FAIL(ob_write_string(alloc, ObString(udt_meta.udt_name_len_, udt_meta.udt_name_), field.type_name_))) {
LOG_WARN("fail to alloc string", K(i), K(field), K(ret));
}
}
} else if (expr->get_result_type().is_ext()
&& OB_INVALID_ID != expr->get_result_type().get_udt_id()
&& (PL_VARRAY_TYPE == expr->get_result_type().get_extend_type()