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

fix drop column bug

Browse Source
This commit is contained in:
Charles0429
2022-12-05 16:38:14 +00:00
committed by ob-robot
parent 5c94279a4b
commit 2459d3127f
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/storage/ddl/ob_complement_data_task.cpp
View File

@ -918,9 +918,11 @@ int ObComplementWriteTask::do_local_scan()
}
const int64_t timeout_ts = ObTimeUtility::current_time() + 3000000; // 3s
if (OB_SUCCESS != (end_trans_ret = ObInsertLobColumnHelper::end_trans(read_tx_desc, OB_SUCCESS != ret, timeout_ts))) {
LOG_WARN("fail to end read trans", K(ret), K(end_trans_ret));
ret = end_trans_ret;
if (nullptr != read_tx_desc) {
if (OB_SUCCESS != (end_trans_ret = ObInsertLobColumnHelper::end_trans(read_tx_desc, OB_SUCCESS != ret, timeout_ts))) {
LOG_WARN("fail to end read trans", K(ret), K(end_trans_ret));
ret = end_trans_ret;
}
}
}
@ -1259,12 +1261,11 @@ ObLocalScan::ObLocalScan() : is_inited_(false), extended_gc_(), data_table_schem
hidden_table_schema_(nullptr), snapshot_version_(common::OB_INVALID_VERSION), txs_(nullptr),
default_row_(), tmp_row_(), row_iter_(nullptr), scan_merge_(nullptr), ctx_(), access_param_(),
access_ctx_(), get_table_param_(), allocator_("ObLocalScan"), calc_buf_(ObModIds::OB_SQL_EXPR_CALC),
expr_ctx_(), col_params_(), read_info_(), exist_column_mapping_(allocator_), checksum_calculator_()
col_params_(), read_info_(), exist_column_mapping_(allocator_), checksum_calculator_()
{}
ObLocalScan::~ObLocalScan()
{
sql::ObSQLUtils::destruct_default_expr_context(expr_ctx_);
if (OB_NOT_NULL(scan_merge_)) {
scan_merge_->~ObMultipleScanMerge();
scan_merge_ = NULL;
@ -1327,9 +1328,7 @@ int ObLocalScan::init(
default_row_.row_flag_.set_flag(ObDmlFlag::DF_INSERT);
tmp_row_.row_flag_.set_flag(ObDmlFlag::DF_INSERT);
uint64_t tenant_id = hidden_table_schema->get_tenant_id();
if (OB_FAIL(sql::ObSQLUtils::make_default_expr_context(tenant_id, allocator_, expr_ctx_))) {
LOG_WARN("fail to make default expr context ", K(ret));
} else if (OB_FAIL(hidden_table_schema->get_orig_default_row(org_col_ids, default_row_))) {
if (OB_FAIL(hidden_table_schema->get_orig_default_row(org_col_ids, default_row_))) {
LOG_WARN("fail to get default row from table schema", K(ret));
} else {
is_inited_ = true;
@ -1639,9 +1638,9 @@ int ObLocalScan::get_next_row(const ObDatumRow *&tmp_row)
if (OB_UNLIKELY(OB_ITER_END != ret)) {
LOG_WARN("fail to get next row", K(ret));
}
} else if (OB_ISNULL(row) || !row->is_valid() || OB_ISNULL(expr_ctx_.exec_ctx_)) {
} else if (OB_ISNULL(row) || !row->is_valid()) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid arguments", K(ret), KP(row), KP(expr_ctx_.exec_ctx_));
LOG_WARN("invalid arguments", K(ret), KP(row));
} else {
for (int64_t i = 0, j = 0; OB_SUCC(ret) && i < exist_column_mapping_.size(); i++) {
if (exist_column_mapping_.test(i)) {