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

fix mysqltest

Browse Source
This commit is contained in:
obdev
2023-01-05 04:08:12 +00:00
committed by ob-robot
parent 003bed9ba0
commit 656ce35cce
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/observer/omt/ob_tenant_srs.cpp
View File

@ -157,7 +157,7 @@ int ObTenantSrs::refresh_srs(bool is_sys)
LOG_INFO("srs exist min version 4.1", K(tenant_data_version));
} else if (OB_FAIL(fetch_all_srs(srs, is_sys))) {
if (ret == OB_ERR_EMPTY_QUERY ) {
LOG_INFO("srs table is empty", K(is_sys));
LOG_DEBUG("srs table is empty", K(is_sys));
} else {
LOG_WARN("failed to fetch ObSrsCacheSnapShot", K(ret), K(is_sys));
}
@ -257,8 +257,10 @@ void ObTenantSrs::TenantSrsUpdateTask::runTimerTask()
if (OB_ISNULL(tenant_srs_)) {
LOG_WARN("failed to do srs update task. tenant_srs is null");
} else if (OB_FAIL(tenant_srs_->refresh_sys_srs())) {
LOG_WARN("failed to refresh sys srs", K(ret), K(tenant_srs_->remote_sys_srs_version_),
K(tenant_srs_->local_sys_srs_version_));
if (ret != OB_ERR_EMPTY_QUERY) {
LOG_WARN("failed to refresh sys srs", K(ret), K(tenant_srs_->remote_sys_srs_version_),
K(tenant_srs_->local_sys_srs_version_));
}
}
}

3
src/share/datum/ob_datum_cmp_func_def.h
View File

@ -323,7 +323,8 @@ struct ObDatumTypeCmp<ObGeometryType, ObGeometryType> : public ObDefined<>
{
inline static int cmp(const ObDatum &l, const ObDatum &r)
{
return ObCharset::strcmpsp(CS_TYPE_BINARY, l.ptr_, l.len_, r.ptr_, r.len_, false);
int res = ObCharset::strcmpsp(CS_TYPE_BINARY, l.ptr_, l.len_, r.ptr_, r.len_, false);
return res > 0 ? 1 : (res < 0 ? -1 : 0);
}
};

25
src/sql/rewrite/ob_query_range.cpp
View File

@ -6260,20 +6260,23 @@ OB_NOINLINE int ObQueryRange::deep_copy(const ObQueryRange &other,
}
const ColumnIdInfoMap& input_srid = other.get_columnId_map();
ColumnIdInfoMap::const_iterator iter = input_srid.begin();
if (!columnId_map_.created()) {
if (OB_FAIL(columnId_map_.create(OB_DEFAULT_SRID_BUKER, &map_alloc_, &bucket_allocator_wrapper_))) {
LOG_WARN("Init columnId_map_ failed", K(ret));
if (input_srid.created()) {
ColumnIdInfoMap::const_iterator iter = input_srid.begin();
if (!columnId_map_.created()) {
if (OB_FAIL(columnId_map_.create(OB_DEFAULT_SRID_BUKER, &map_alloc_, &bucket_allocator_wrapper_))) {
LOG_WARN("Init columnId_map_ failed", K(ret));
}
} else if (OB_FAIL(columnId_map_.reuse())) {
LOG_WARN("reuse columnId_map_ failed", K(ret));
}
} else if (OB_FAIL(columnId_map_.reuse())) {
LOG_WARN("reuse columnId_map_ failed", K(ret));
}
while (OB_SUCC(ret) && iter != input_srid.end()) {
if (OB_FAIL(columnId_map_.set_refactored(iter->first, iter->second))) {
LOG_WARN("set srid map failed", K(ret), K(iter->first));
while (OB_SUCC(ret) && iter != input_srid.end()) {
if (OB_FAIL(columnId_map_.set_refactored(iter->first, iter->second))) {
LOG_WARN("set srid map failed", K(ret), K(iter->first));
}
iter++;
}
iter++;
}
FOREACH_X(it, other.mbr_filters_, OB_SUCC(ret) && it != other.mbr_filters_.end()) {
if (OB_FAIL(mbr_filters_.push_back(*it))) {
LOG_WARN("store mbr_filters_ failed", K(ret));