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

[FEAT MERGE] merge transfer

Browse Source 
Co-authored-by: wxhwang <wxhwang@126.com>
Co-authored-by: godyangfight <godyangfight@gmail.com>
Co-authored-by: Tyshawn <tuyunshan@gmail.com>
This commit is contained in:
xuhuleon
2023-06-21 11:42:26 +00:00
committed by ob-robot
parent d06678002e
commit 9dae112952
1280 changed files with 149724 additions and 48813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/storage/ob_i_store.cpp
View File

@ -137,6 +137,7 @@ void ObStoreRowLockState::reset()
lock_dml_flag_ = blocksstable::ObDmlFlag::DF_NOT_EXIST;
is_delayed_cleanout_ = false;
mvcc_row_ = NULL;
trans_scn_ = SCN::max_scn();
}
OB_DEF_SERIALIZE(ObStoreRow)
@ -321,7 +322,7 @@ int ObLockRowChecker::check_lock_row_valid(
int ObLockRowChecker::check_lock_row_valid(
const blocksstable::ObDatumRow &row,
const ObTableReadInfo &read_info)
const ObITableReadInfo &read_info)
{
int ret = OB_SUCCESS;
int64_t rowkey_read_cnt = MIN(read_info.get_seq_read_column_count(), read_info.get_rowkey_count());
@ -329,7 +330,7 @@ int ObLockRowChecker::check_lock_row_valid(
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", KR(ret), K(read_info), K(row));
} else if (row.is_uncommitted_row()) {
const common::ObIArray<int32_t> &col_index = read_info.get_columns_index();
const ObColumnIndexArray &col_index = read_info.get_columns_index();
for (int i = rowkey_read_cnt; i < row.get_column_count(); ++i) {
if (col_index.at(i) < read_info.get_rowkey_count()) {
// not checking rowkey col