p75086429
/
openGauss-server
forked from openGauss-Ecosystem/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!2304 解决之前PR产生的编译冲突 

Merge pull request !2304 from wanghao19920907/dev
This commit is contained in:
opengauss-bot 2022-10-17 01:59:12 +00:00 committed by Gitee
parent 3b36e1dc68 26a00db02d
commit 709e1dadf5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gausskernel/runtime/executor/execExprInterp.cpp
View File

@ -679,7 +679,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
* directly out of the slot's decomposed-data arrays. But let's
* have an Assert to check that that did happen.
*/
Assert((innerslot->tts_tupslotTableAm == TAM_HEAP) ? (attnum >= 0 && attnum < innerslot->tts_nvalid) : (attnum >= 0));
Assert((innerslot->tts_tam_ops == TableAmHeap) ? (attnum >= 0 && attnum < innerslot->tts_nvalid) : (attnum >= 0));
*op->resvalue = innerslot->tts_values[attnum];
*op->resnull = innerslot->tts_isnull[attnum];
@ -692,7 +692,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
/* See EEOP_INNER_VAR comments */
Assert((outerslot->tts_tupslotTableAm == TAM_HEAP) ? (attnum >= 0 && attnum < outerslot->tts_nvalid) : (attnum >= 0));
Assert((outerslot->tts_tam_ops == TableAmHeap) ? (attnum >= 0 && attnum < outerslot->tts_nvalid) : (attnum >= 0));
*op->resvalue = outerslot->tts_values[attnum];
*op->resnull = outerslot->tts_isnull[attnum];
@ -705,7 +705,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
/* See EEOP_INNER_VAR comments */
Assert((scanslot->tts_tupslotTableAm == TAM_HEAP) ? (attnum >= 0 && attnum < scanslot->tts_nvalid) : (attnum >= 0));
Assert((scanslot->tts_tam_ops == TableAmHeap) ? (attnum >= 0 && attnum < scanslot->tts_nvalid) : (attnum >= 0));
*op->resvalue = scanslot->tts_values[attnum];
*op->resnull = scanslot->tts_isnull[attnum];
@ -778,7 +778,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
* We do not need CheckVarSlotCompatibility here; that was taken
* care of at compilation time. But see EEOP_INNER_VAR comments.
*/
Assert((innerslot->tts_tupslotTableAm == TAM_HEAP) ? (attnum >= 0 && attnum < innerslot->tts_nvalid) : (attnum >= 0));
Assert((innerslot->tts_tam_ops == TableAmHeap) ? (attnum >= 0 && attnum < innerslot->tts_nvalid) : (attnum >= 0));
Assert(resultnum >= 0 && resultnum < resultslot->tts_tupleDescriptor->natts);
resultslot->tts_values[resultnum] = innerslot->tts_values[attnum];
resultslot->tts_isnull[resultnum] = innerslot->tts_isnull[attnum];
@ -795,7 +795,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
* We do not need CheckVarSlotCompatibility here; that was taken
* care of at compilation time. But see EEOP_INNER_VAR comments.
*/
Assert((outerslot->tts_tupslotTableAm == TAM_HEAP) ? (attnum >= 0 && attnum < outerslot->tts_nvalid) : (attnum >= 0));
Assert((outerslot->tts_tam_ops == TableAmHeap) ? (attnum >= 0 && attnum < outerslot->tts_nvalid) : (attnum >= 0));
Assert(resultnum >= 0 && resultnum < resultslot->tts_tupleDescriptor->natts);
resultslot->tts_values[resultnum] = outerslot->tts_values[attnum];
resultslot->tts_isnull[resultnum] = outerslot->tts_isnull[attnum];
@ -812,7 +812,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
* We do not need CheckVarSlotCompatibility here; that was taken
* care of at compilation time. But see EEOP_INNER_VAR comments.
*/
Assert((scanslot->tts_tupslotTableAm == TAM_HEAP) ? (attnum >= 0 && attnum < scanslot->tts_nvalid) : (attnum >= 0));
Assert((scanslot->tts_tam_ops == TableAmHeap) ? (attnum >= 0 && attnum < scanslot->tts_nvalid) : (attnum >= 0));
Assert(resultnum >= 0 && resultnum < resultslot->tts_tupleDescriptor->natts);
resultslot->tts_values[resultnum] = scanslot->tts_values[attnum];
resultslot->tts_isnull[resultnum] = scanslot->tts_isnull[attnum];