diff options
| author | Alexander Korotkov <akorotkov@postgresql.org> | 2024-04-11 15:47:53 +0300 |
|---|---|---|
| committer | Alexander Korotkov <akorotkov@postgresql.org> | 2024-04-11 16:01:30 +0300 |
| commit | da841aa4dc279bb0053de56121c927ec943edff3 (patch) | |
| tree | efbd41861037fd9b4f91460309b6cccb527a9955 /src/backend/executor | |
| parent | bc1e2092ebb857802a9713d0d3588079e2f0216a (diff) | |
Revert: Let table AM insertion methods control index insertion
This commit reverts b1484a3f19 per review by Andres Freund.
Discussion: https://postgr.es/m/20240410165236.rwyrny7ihi4ddxw4%40awork3.anarazel.de
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/execReplication.c | 6 | ||||
| -rw-r--r-- | src/backend/executor/nodeModifyTable.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c index db685473fc0..0cad843fb69 100644 --- a/src/backend/executor/execReplication.c +++ b/src/backend/executor/execReplication.c @@ -509,7 +509,6 @@ ExecSimpleRelationInsert(ResultRelInfo *resultRelInfo, if (!skip_tuple) { List *recheckIndexes = NIL; - bool insertIndexes; /* Compute stored generated columns */ if (rel->rd_att->constr && @@ -524,10 +523,9 @@ ExecSimpleRelationInsert(ResultRelInfo *resultRelInfo, ExecPartitionCheck(resultRelInfo, slot, estate, true); /* OK, store the tuple and create index entries for it */ - simple_table_tuple_insert(resultRelInfo->ri_RelationDesc, slot, - &insertIndexes); + simple_table_tuple_insert(resultRelInfo->ri_RelationDesc, slot); - if (insertIndexes && resultRelInfo->ri_NumIndices > 0) + if (resultRelInfo->ri_NumIndices > 0) recheckIndexes = ExecInsertIndexTuples(resultRelInfo, slot, estate, false, false, NULL, NIL, false); diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c index df63844b350..325d380b0a9 100644 --- a/src/backend/executor/nodeModifyTable.c +++ b/src/backend/executor/nodeModifyTable.c @@ -1135,15 +1135,13 @@ ExecInsert(ModifyTableContext *context, } else { - bool insertIndexes; - /* insert the tuple normally */ slot = table_tuple_insert(resultRelationDesc, slot, estate->es_output_cid, - 0, NULL, &insertIndexes); + 0, NULL); /* insert index entries for tuple */ - if (insertIndexes && resultRelInfo->ri_NumIndices > 0) + if (resultRelInfo->ri_NumIndices > 0) recheckIndexes = ExecInsertIndexTuples(resultRelInfo, slot, estate, false, false, NULL, NIL, |