[FEAT MERGE] Phase one of 3A project

Co-authored-by: rolandqi <qikai456@126.com>
Co-authored-by: yangzhifeng <yangzhifeng83@gmail.com>
This commit is contained in:
AntiTopQuark
2023-08-25 08:44:14 +00:00
committed by ob-robot
parent 56ee77a670
commit e0b1dda713
142 changed files with 15224 additions and 1314 deletions

View File

@ -470,6 +470,7 @@ int ObTableScanIterator::init_and_open_scan_merge_iter_()
int ObTableScanIterator::get_next_row(ObNewRow *&row)
{
ACTIVE_SESSION_FLAG_SETTER_GUARD(in_storage_read);
int ret = OB_SUCCESS;
ObDatumRow *store_row = NULL;
@ -506,6 +507,7 @@ int ObTableScanIterator::get_next_row(ObNewRow *&row)
int ObTableScanIterator::get_next_rows(int64_t &count, int64_t capacity)
{
ACTIVE_SESSION_FLAG_SETTER_GUARD(in_storage_read);
int ret = OB_SUCCESS;
if (IS_NOT_INIT) {
ret = OB_NOT_INIT;