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

Repair skip const error in ObPxFifoReceiveOp

Browse Source
This commit is contained in:
obdev
2023-02-08 15:02:52 +08:00
committed by ob-robot
parent 0557bcad7b
commit 5b942b3ea4
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/sql/engine/px/ob_px_row_store.cpp
View File

@ -329,7 +329,14 @@ int ObReceiveRowReader::get_next_row(const ObIArray<ObExpr*> &exprs, ObEvalCtx &
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (NULL != datum_iter_) { if (NULL != datum_iter_) {
ret = datum_iter_->get_next_row(exprs, eval_ctx); const ObChunkDatumStore::StoredRow *srow = NULL;
if (OB_FAIL(datum_iter_->get_next_row(srow))) {
if (OB_ITER_END != ret) {
LOG_WARN("get next stored row failed", K(ret));
}
} else {
ret = to_expr(srow, exprs, eval_ctx);
}
} else { } else {
free_iterated_buffers(); free_iterated_buffers();
const ObChunkDatumStore::StoredRow *srow const ObChunkDatumStore::StoredRow *srow
@ -381,7 +388,18 @@ int ObReceiveRowReader::get_next_batch(const ObIArray<ObExpr*> &exprs,
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("NULL store rows", K(ret)); LOG_WARN("NULL store rows", K(ret));
} else if (NULL != datum_iter_) { } else if (NULL != datum_iter_) {
ret = datum_iter_->get_next_batch(exprs, eval_ctx, max_rows, read_rows, srows); if (max_rows > eval_ctx.max_batch_size_) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", K(max_rows), K(eval_ctx.max_batch_size_));
} else if (OB_FAIL(datum_iter_->get_next_batch(srows, max_rows, read_rows))) {
if (OB_ITER_END != ret) {
LOG_WARN("get next batch failed", K(ret), K(max_rows));
} else {
read_rows = 0;
}
} else {
attach_rows(exprs, eval_ctx, srows, read_rows);
}
} else { } else {
free_iterated_buffers(); free_iterated_buffers();
read_rows = 0; read_rows = 0;