提交 e2eb969a 编写于 作者: R rolandqi 提交者: ob-robot

fix: query private table time zone bug.

上级 9cdc3091
......@@ -145,11 +145,19 @@ int ObAgentVirtualTable::do_open()
{
int ret = OB_SUCCESS;
ObSqlString sql;
ObSessionParam session_param;
ObTimeZoneInfoWrap tz_wrap;
if (OB_NOT_NULL(session_)) {
tz_wrap.deep_copy(session_->get_tz_info_wrap());
session_param.tz_info_wrap_ = &tz_wrap;
} else {
session_param.tz_info_wrap_ = nullptr;
}
if (OB_FAIL(ObAgentTableBase::do_open())) {
LOG_WARN("base agent table open failed", KR(ret));
} else if (OB_FAIL(construct_sql(base_tenant_id_, sql))) {
LOG_WARN("construct sql failed", KR(ret), K(base_tenant_id_));
} else if (OB_FAIL(GCTX.sql_proxy_->read(*sql_res_, base_tenant_id_, sql.ptr()))) {
} else if (OB_FAIL(GCTX.sql_proxy_->read(*sql_res_, base_tenant_id_, sql.ptr(), &session_param))) {
LOG_WARN("execute sql failed", KR(ret), K(base_tenant_id_), K(sql));
} else if (OB_ISNULL(sql_res_->get_result())) {
ret = OB_ERR_UNEXPECTED;
......
......@@ -278,6 +278,14 @@ int ObIteratePrivateVirtualTable::next_tenant_()
if (tenant_idx_ + 1 >= tenants_.count()) {
ret = OB_ITER_END;
} else {
ObSessionParam session_param;
ObTimeZoneInfoWrap tz_wrap;
if (OB_NOT_NULL(session_)) {
tz_wrap.deep_copy(session_->get_tz_info_wrap());
session_param.tz_info_wrap_ = &tz_wrap;
} else {
session_param.tz_info_wrap_ = nullptr;
}
tenant_idx_ += 1;
cur_tenant_id_ = tenants_.at(tenant_idx_);
const uint64_t exec_tenant_id = get_exec_tenant_id_(cur_tenant_id_);
......@@ -297,7 +305,7 @@ int ObIteratePrivateVirtualTable::next_tenant_()
sql_res_->~ReadResult();
inner_sql_res_ = NULL;
new (sql_res_) ObMySQLProxy::MySQLResult();
if (OB_FAIL(GCTX.sql_proxy_->read(*sql_res_, exec_tenant_id, sql_.ptr()))) {
if (OB_FAIL(GCTX.sql_proxy_->read(*sql_res_, exec_tenant_id, sql_.ptr(), &session_param))) {
LOG_WARN("execute sql failed", KR(ret), K(exec_tenant_id), K_(cur_tenant_id), K(sql_));
} else if (OB_ISNULL(sql_res_->get_result())) {
ret = OB_ERR_UNEXPECTED;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册