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

[FEAT MERGE] patch 3A from 4_2_x_release to master

Browse Source 
Co-authored-by: rolandqi <qikai456@126.com>
Co-authored-by: WeiXinChan <chenwx6728@163.com>
This commit is contained in:
AntiTopQuark
2024-11-22 17:15:26 +00:00
committed by ob-robot
parent 93e26891a4
commit 6d3a8a8b76
431 changed files with 35830 additions and 5576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/engine/ob_operator.cpp
View File

@ -1319,7 +1319,7 @@ int ObOperator::get_next_row()
}
}
}
end_ash_line_id_reg();
end_ash_line_id_reg(ret);
end_cpu_time_counting();
return ret;
}
@ -1482,7 +1482,7 @@ int ObOperator::get_next_batch(const int64_t max_row_cnt, const ObBatchRows *&ba
brs_.set_all_rows_active(false);
}
end_ash_line_id_reg();
end_ash_line_id_reg(ret);
end_cpu_time_counting();
return ret;
}