diff options
| author | Masahiko Sawada <msawada@postgresql.org> | 2024-04-11 17:18:05 +0900 |
|---|---|---|
| committer | Masahiko Sawada <msawada@postgresql.org> | 2024-04-11 17:18:05 +0900 |
| commit | 810f64a01567610af7b92b0de930f16f3e20064e (patch) | |
| tree | 1e91388aaa2c763a36eca5ebc3684b904b6477dc /src/backend | |
| parent | efb8acc0d05894e0c6c20dfc00513b53098780f0 (diff) | |
| download | postgresql-810f64a01567610af7b92b0de930f16f3e20064e.tar.gz postgresql-810f64a01567610af7b92b0de930f16f3e20064e.zip | |
Revert indexed and enlargable binary heap implementation.
This reverts commit b840508644 and bcb14f4abc. These commits were made
for commit 5bec1d6bc5 (Improve eviction algorithm in ReorderBuffer
using max-heap for many subtransactions). However, per discussion,
commit efb8acc0d0 replaced binary heap + index with pairing heap, and
made these commits unnecessary.
Reported-by: Jeff Davis
Discussion: https://postgr.es/m/12747c15811d94efcc5cda72d6b35c80d7bf3443.camel%40j-davis.com
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/executor/nodeGatherMerge.c | 1 | ||||
| -rw-r--r-- | src/backend/executor/nodeMergeAppend.c | 2 | ||||
| -rw-r--r-- | src/backend/postmaster/pgarch.c | 3 | ||||
| -rw-r--r-- | src/backend/replication/logical/reorderbuffer.c | 1 | ||||
| -rw-r--r-- | src/backend/storage/buffer/bufmgr.c | 1 |
5 files changed, 2 insertions, 6 deletions
diff --git a/src/backend/executor/nodeGatherMerge.c b/src/backend/executor/nodeGatherMerge.c index ce19e0837a7..45f6017c29e 100644 --- a/src/backend/executor/nodeGatherMerge.c +++ b/src/backend/executor/nodeGatherMerge.c @@ -422,7 +422,6 @@ gather_merge_setup(GatherMergeState *gm_state) /* Allocate the resources for the merge */ gm_state->gm_heap = binaryheap_allocate(nreaders + 1, heap_compare_slots, - false, gm_state); } diff --git a/src/backend/executor/nodeMergeAppend.c b/src/backend/executor/nodeMergeAppend.c index 3efebd537f4..e1b9b984a7a 100644 --- a/src/backend/executor/nodeMergeAppend.c +++ b/src/backend/executor/nodeMergeAppend.c @@ -125,7 +125,7 @@ ExecInitMergeAppend(MergeAppend *node, EState *estate, int eflags) mergestate->ms_nplans = nplans; mergestate->ms_slots = (TupleTableSlot **) palloc0(sizeof(TupleTableSlot *) * nplans); - mergestate->ms_heap = binaryheap_allocate(nplans, heap_compare_slots, false, + mergestate->ms_heap = binaryheap_allocate(nplans, heap_compare_slots, mergestate); /* diff --git a/src/backend/postmaster/pgarch.c b/src/backend/postmaster/pgarch.c index 251f75e91dd..d82bcc2cfd5 100644 --- a/src/backend/postmaster/pgarch.c +++ b/src/backend/postmaster/pgarch.c @@ -258,8 +258,7 @@ PgArchiverMain(char *startup_data, size_t startup_data_len) /* Initialize our max-heap for prioritizing files to archive. */ arch_files->arch_heap = binaryheap_allocate(NUM_FILES_PER_DIRECTORY_SCAN, - ready_file_comparator, false, - NULL); + ready_file_comparator, NULL); /* Initialize our memory context. */ archive_context = AllocSetContextCreate(TopMemoryContext, diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c index 98a827e0b69..00a8327e771 100644 --- a/src/backend/replication/logical/reorderbuffer.c +++ b/src/backend/replication/logical/reorderbuffer.c @@ -1303,7 +1303,6 @@ ReorderBufferIterTXNInit(ReorderBuffer *rb, ReorderBufferTXN *txn, /* allocate heap */ state->heap = binaryheap_allocate(state->nr_txns, ReorderBufferIterCompare, - false, state); /* Now that the state fields are initialized, it is safe to return it. */ diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 44836751b71..901b7230fb9 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -3014,7 +3014,6 @@ BufferSync(int flags) */ ts_heap = binaryheap_allocate(num_spaces, ts_ckpt_progress_comparator, - false, NULL); for (i = 0; i < num_spaces; i++) |