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

check gis type compatiablity by tenant data version

Browse Source
This commit is contained in:
obdev
2023-01-11 03:42:09 +00:00
committed by ob-robot
parent 0379d889a1
commit fe26d2c93f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sql/resolver/ob_resolver_utils.cpp
View File

@ -4932,6 +4932,7 @@ int ObResolverUtils::resolve_data_type(const ParseNode &type_node,
int32_t length = type_node.int32_values_[0]; int32_t length = type_node.int32_values_[0];
int16_t precision = type_node.int16_values_[0]; int16_t precision = type_node.int16_values_[0];
int16_t scale = type_node.int16_values_[1]; int16_t scale = type_node.int16_values_[1];
uint64_t tenant_id = MTL_ID();
const int16_t number_type = type_node.int16_values_[2]; const int16_t number_type = type_node.int16_values_[2];
const bool has_specify_scale = (1 == type_node.int16_values_[2]); const bool has_specify_scale = (1 == type_node.int16_values_[2]);
@ -5243,10 +5244,13 @@ int ObResolverUtils::resolve_data_type(const ParseNode &type_node,
data_type.set_charset_type(CHARSET_UTF8MB4); data_type.set_charset_type(CHARSET_UTF8MB4);
data_type.set_collation_type(CS_TYPE_UTF8MB4_BIN); // ToDo: oracle, allow utf16 data_type.set_collation_type(CS_TYPE_UTF8MB4_BIN); // ToDo: oracle, allow utf16
break; break;
case ObGeometryTC: case ObGeometryTC: {
if (GET_MIN_CLUSTER_VERSION() < CLUSTER_VERSION_4_1_0_0) { uint64_t tenant_data_version = 0;
if (OB_FAIL(GET_MIN_DATA_VERSION(tenant_id, tenant_data_version))) {
LOG_WARN("get tenant data version failed", K(ret));
} else if (tenant_data_version < DATA_VERSION_4_1_0_0) {
ret = OB_NOT_SUPPORTED; ret = OB_NOT_SUPPORTED;
LOG_USER_ERROR(OB_NOT_SUPPORTED, "create geometry column before cluster min version 4.1"); LOG_USER_ERROR(OB_NOT_SUPPORTED, "tenant version is less than 4.1, geometry type");
} else { } else {
data_type.set_length(length); data_type.set_length(length);
data_type.set_scale(default_accuracy.get_scale()); data_type.set_scale(default_accuracy.get_scale());
@ -5254,6 +5258,7 @@ int ObResolverUtils::resolve_data_type(const ParseNode &type_node,
data_type.set_collation_type(CS_TYPE_BINARY); data_type.set_collation_type(CS_TYPE_BINARY);
} }
break; break;
}
case ObBitTC: case ObBitTC:
if (precision < 0) { if (precision < 0) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;