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

[FEAT MERGE] Phase one of 3A project

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

1
src/sql/engine/cmd/ob_xa_executor.cpp
View File

@ -395,6 +395,7 @@ int ObPlXaEndTransExecutor::execute_(const ObString &gtrid_str,
int ObPlXaCommitExecutor::execute(ObExecContext &ctx, ObXaCommitStmt &stmt)
{
ACTIVE_SESSION_FLAG_SETTER_GUARD(in_committing);
int ret = OB_SUCCESS;
ObSQLSessionInfo *my_session = GET_MY_SESSION(ctx);
ObTxDesc *tx_desc = my_session->get_tx_desc();

3
src/sql/engine/px/ob_px_task_process.cpp
View File

@ -124,7 +124,7 @@ void ObPxTaskProcess::run()
int ObPxTaskProcess::process()
{
ObActiveSessionGuard::get_stat().in_px_execution_ = true;
ACTIVE_SESSION_FLAG_SETTER_GUARD(in_px_execution);
int ret = OB_SUCCESS;
common::ob_setup_default_tsi_warning_buffer();
common::ob_reset_tsi_warning_buffer();
@ -230,7 +230,6 @@ int ObPxTaskProcess::process()
ObSQLUtils::handle_audit_record(false, EXECUTE_DIST, *session);
}
release();
ObActiveSessionGuard::get_stat().in_px_execution_ = false;
return ret;
}

4
src/sql/engine/table/ob_external_table_access_service.cpp
View File

@ -231,6 +231,7 @@ int ObExternalTableAccessService::table_scan(
ObVTableScanParam &param,
ObNewRowIterator *&result)
{
ACTIVE_SESSION_FLAG_SETTER_GUARD(in_storage_read);
int ret = OB_SUCCESS;
ObExternalTableRowIterator* row_iter = NULL;
@ -263,6 +264,7 @@ int ObExternalTableAccessService::table_scan(
int ObExternalTableAccessService::table_rescan(ObVTableScanParam &param, ObNewRowIterator *result)
{
ACTIVE_SESSION_FLAG_SETTER_GUARD(in_storage_read);
int ret = OB_SUCCESS;
if (OB_ISNULL(result)) {
ret = OB_ERR_UNEXPECTED;
@ -283,6 +285,7 @@ int ObExternalTableAccessService::table_rescan(ObVTableScanParam &param, ObNewRo
int ObExternalTableAccessService::reuse_scan_iter(const bool switch_param, ObNewRowIterator *iter)
{
ACTIVE_SESSION_FLAG_SETTER_GUARD(in_storage_read);
UNUSED(switch_param);
iter->reset();
return OB_SUCCESS;
@ -290,6 +293,7 @@ int ObExternalTableAccessService::reuse_scan_iter(const bool switch_param, ObNew
int ObExternalTableAccessService::revert_scan_iter(ObNewRowIterator *iter)
{
ACTIVE_SESSION_FLAG_SETTER_GUARD(in_storage_read);
int ret = OB_SUCCESS;
if (OB_ISNULL(iter)) {
ret = OB_ERR_UNEXPECTED;