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

[BUGFIX] fix read lob locator after commit

Browse Source
This commit is contained in:
obdev
2023-04-07 03:00:01 +00:00
committed by ob-robot
parent d5c8bb9c3b
commit 71d19e2940
3 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/sql/engine/dml/ob_dml_service.cpp
View File

@ -292,6 +292,7 @@ int ObDMLService::check_lob_column_changed(ObEvalCtx &eval_ctx,
cmp_params.offset_right_ = 0;
cmp_params.compare_len_ = UINT64_MAX;
cmp_params.timeout_ = timeout;
cmp_params.tx_desc_ = eval_ctx.exec_ctx_.get_my_session()->get_tx_desc();
if(old_set_has_lob_header && new_set_has_lob_header) {
if(OB_FAIL(lob_mngr->compare(old_lob, new_lob, cmp_params, result))) {
LOG_WARN("fail to compare lob", K(ret), K(old_lob), K(new_lob));

31
src/storage/lob/ob_lob_manager.cpp
View File

@ -730,7 +730,8 @@ int ObLobManager::compare(ObLobLocatorV2& lob_left,
// get lob access param
ObLobAccessParam param_left;
ObLobAccessParam param_right;
param_left.tx_desc_ = cmp_params.tx_desc_;
param_right.tx_desc_ = cmp_params.tx_desc_;
if (OB_FAIL(build_lob_param(param_left, tmp_allocator, cmp_params.collation_left_,
cmp_params.offset_left_, cmp_params.compare_len_, cmp_params.timeout_, lob_left))) {
LOG_WARN("fail to build read param left", K(ret), K(lob_left), K(cmp_params));
@ -1179,6 +1180,7 @@ int ObLobManager::append(
ObString data;
data.assign_buffer(buf + cur_handle_size, append_lob_len);
SMART_VAR(ObLobAccessParam, read_param) {
read_param.tx_desc_ = param.tx_desc_;
if (OB_FAIL(build_lob_param(read_param, *param.allocator_, param.coll_type_,
0, UINT64_MAX, param.timeout_, lob))) {
LOG_WARN("fail to build read param", K(ret), K(lob));
@ -1302,6 +1304,7 @@ int ObLobManager::append(
// prepare read full lob
if (OB_SUCC(ret)) {
SMART_VAR(ObLobAccessParam, read_param) {
read_param.tx_desc_ = param.tx_desc_;
if (OB_FAIL(build_lob_param(read_param, *param.allocator_, param.coll_type_,
0, UINT64_MAX, param.timeout_, lob))) {
LOG_WARN("fail to build read param", K(ret), K(lob));
@ -2085,6 +2088,7 @@ int ObLobManager::write_inrow(ObLobAccessParam& param, ObLobLocatorV2& lob, uint
{
int ret = OB_SUCCESS;
SMART_VAR(ObLobAccessParam, read_param) {
read_param.tx_desc_ = param.tx_desc_;
if (OB_FAIL(build_lob_param(read_param, *param.allocator_, param.coll_type_,
offset, param.len_, param.timeout_, lob))) {
LOG_WARN("fail to build read param", K(ret), K(lob));
@ -2354,6 +2358,7 @@ int ObLobManager::write_outrow(ObLobAccessParam& param, ObLobLocatorV2& lob, uin
{
int ret = OB_SUCCESS;
SMART_VAR(ObLobAccessParam, read_param) {
read_param.tx_desc_ = param.tx_desc_;
if (OB_FAIL(build_lob_param(read_param, *param.allocator_, param.coll_type_,
offset, param.len_, param.timeout_, lob))) {
LOG_WARN("fail to build read param", K(ret), K(lob));
@ -3188,13 +3193,23 @@ int ObLobManager::build_lob_param(ObLobAccessParam& param,
} else if (OB_FAIL(lob.get_location_info(location_info))) {
LOG_WARN("failed to get location info", K(ret), K(lob));
} else {
param.snapshot_.core_.version_.convert_for_tx(tx_info->version_);
param.snapshot_.core_.tx_id_ = tx_info->tx_id_;
param.snapshot_.core_.scn_ = tx_info->scn_;
param.snapshot_.valid_ = true;
param.snapshot_.source_ = transaction::ObTxReadSnapshot::SRC::LS;
param.snapshot_.snapshot_lsid_ = share::ObLSID(location_info->ls_id_);
if (OB_ISNULL(param.tx_desc_) || param.tx_desc_->get_tx_id().get_id() == tx_info->tx_id_) {
param.snapshot_.core_.version_.convert_for_tx(tx_info->version_);
param.snapshot_.core_.tx_id_ = tx_info->tx_id_;
param.snapshot_.core_.scn_ = tx_info->scn_;
param.snapshot_.valid_ = true;
param.snapshot_.source_ = transaction::ObTxReadSnapshot::SRC::LS;
param.snapshot_.snapshot_lsid_ = share::ObLSID(location_info->ls_id_);
} else {
// When param for write, param.tx_desc_ should not be null
// If tx indfo from lob locator is old, produce new read snapshot directly
transaction::ObTransService* txs = MTL(transaction::ObTransService*);
transaction::ObTxIsolationLevel tx_level = transaction::ObTxIsolationLevel::RC;
if (OB_FAIL(txs->get_ls_read_snapshot(*param.tx_desc_, tx_level, share::ObLSID(location_info->ls_id_),
param.timeout_, param.snapshot_))) {
LOG_WARN("fail to get read snapshot", K(ret));
}
}
param.ls_id_ = share::ObLSID(location_info->ls_id_);
param.tablet_id_ = ObTabletID(location_info->tablet_id_);

7
src/storage/lob/ob_lob_manager.h
View File

@ -46,7 +46,8 @@ struct ObLobCompareParams {
offset_left_(0),
offset_right_(0),
compare_len_(0),
timeout_(0)
timeout_(0),
tx_desc_(nullptr)
{
}
@ -55,7 +56,8 @@ struct ObLobCompareParams {
K(offset_left_),
K(offset_right_),
K(compare_len_),
K(timeout_));
K(timeout_),
K(tx_desc_));
ObCollationType collation_left_;
ObCollationType collation_right_;
@ -65,6 +67,7 @@ struct ObLobCompareParams {
// compare length
uint64_t compare_len_;
int64_t timeout_;
transaction::ObTxDesc *tx_desc_;
};
class ObLobQueryRemoteReader