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

service_name compat

Browse Source
This commit is contained in:
obdev 2024-09-18 06:31:47 +00:00 committed by ob-robot
parent b922b01372
commit d0837ae589
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deps/oblib/src/common/ob_version_def.h vendored
View File

@ -154,6 +154,7 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat
#define MOCK_DATA_VERSION_4_2_1_4 (oceanbase::common::cal_version(4, 2, 1, 4))
#define MOCK_DATA_VERSION_4_2_1_5 (oceanbase::common::cal_version(4, 2, 1, 5))
#define MOCK_DATA_VERSION_4_2_1_8 (oceanbase::common::cal_version(4, 2, 1, 8))
#define MOCK_DATA_VERSION_4_2_1_9 (oceanbase::common::cal_version(4, 2, 1, 9))
#define DATA_VERSION_4_2_2_0 (oceanbase::common::cal_version(4, 2, 2, 0))
#define MOCK_DATA_VERSION_4_2_2_1 (oceanbase::common::cal_version(4, 2, 2, 1))
#define MOCK_DATA_VERSION_4_2_3_0 (oceanbase::common::cal_version(4, 2, 3, 0))

12
src/share/ob_service_name_proxy.cpp
View File

@ -492,16 +492,20 @@ int ObServiceNameProxy::check_is_service_name_enabled(const uint64_t tenant_id)
LOG_WARN("not user tenant", KR(ret), K(tenant_id));
} else if (OB_FAIL(GET_MIN_DATA_VERSION(tenant_id, tenant_data_version))) {
LOG_WARN("fail to get the tenant's min data version", KR(ret), K(tenant_id));
} else if (!((tenant_data_version >= MOCK_DATA_VERSION_4_2_4_0 && tenant_data_version < DATA_VERSION_4_3_0_0)
} else if (!((tenant_data_version >= MOCK_DATA_VERSION_4_2_1_9 && tenant_data_version < DATA_VERSION_4_2_0_0)
|| (tenant_data_version >= MOCK_DATA_VERSION_4_2_4_0 && tenant_data_version < DATA_VERSION_4_3_0_0)
|| tenant_data_version >= DATA_VERSION_4_3_3_0)) {
ret = OB_NOT_SUPPORTED;
LOG_WARN("tenant_data_version should be [4.2.4.0, 4.3.0.0) or [4.3.3.0, +infinity)", KR(ret), K(tenant_data_version));
LOG_WARN("tenant_data_version should be [4.2.1.9, 4.2.0.0) or [4.2.4.0, 4.3.0.0) "
"or [4.3.3.0, +infinity)", KR(ret), K(tenant_data_version));
} else if (OB_FAIL(GET_MIN_DATA_VERSION(meta_tenant_id, meta_tenant_data_version))) {
LOG_WARN("fail to get the meta tenant's min data version", KR(ret), K(meta_tenant_id));
} else if (!((meta_tenant_data_version >= MOCK_DATA_VERSION_4_2_4_0 && meta_tenant_data_version < DATA_VERSION_4_3_0_0)
} else if (!((meta_tenant_data_version >= MOCK_DATA_VERSION_4_2_1_9 && meta_tenant_data_version < DATA_VERSION_4_2_0_0)
|| (meta_tenant_data_version >= MOCK_DATA_VERSION_4_2_4_0 && meta_tenant_data_version < DATA_VERSION_4_3_0_0)
|| meta_tenant_data_version >= DATA_VERSION_4_3_3_0)) {
ret = OB_NOT_SUPPORTED;
LOG_WARN("meta_tenant_data_version should be [4.2.4.0, 4.3.0.0) or [4.3.3.0, +infinity)", KR(ret), K(meta_tenant_data_version));
LOG_WARN("meta_tenant_data_version should be [4.2.1.9, 4.2.0.0) or [4.2.4.0, 4.3.0.0) "
"or [4.3.3.0, +infinity)", KR(ret), K(meta_tenant_data_version));
}
return ret;
}