sync all inner code

This commit is contained in:
openGaussDev
2022-10-27 20:21:03 +08:00
committed by yanghao
parent a10741b11e
commit f7d23913d6
520 changed files with 63136 additions and 9761 deletions

View File

@ -462,7 +462,8 @@ void buildSubPlanHash(SubPlanState* node, ExprContext* econtext)
sizeof(TupleHashEntryData),
node->hashtablecxt,
node->hashtempcxt,
u_sess->attr.attr_memory.work_mem);
u_sess->attr.attr_memory.work_mem,
node->tab_collations);
if (!subplan->unknownEqFalse) {
if (ncols == 1) {
@ -481,7 +482,8 @@ void buildSubPlanHash(SubPlanState* node, ExprContext* econtext)
sizeof(TupleHashEntryData),
node->hashtablecxt,
node->hashtempcxt,
u_sess->attr.attr_memory.work_mem);
u_sess->attr.attr_memory.work_mem,
node->tab_collations);
}
/*
@ -577,7 +579,8 @@ bool findPartialMatch(TupleHashTable hashtable, TupleTableSlot* slot, FmgrInfo*
CHECK_FOR_INTERRUPTS();
ExecStoreMinimalTuple(entry->firstTuple, hashtable->tableslot, false);
if (!execTuplesUnequal(slot, hashtable->tableslot, num_cols, key_col_idx, eqfunctions, hashtable->tempcxt)) {
if (!execTuplesUnequal(slot, hashtable->tableslot, num_cols, key_col_idx, eqfunctions,
hashtable->tempcxt, hashtable->tab_collations)) {
TermTupleHashIterator(&hashiter);
return true;
}