Skip to content

Commit 82a4eda

Browse files
committed
hio: Take number of prior relation extensions into account
The new relation extension logic, introduced in 00d1e02, could lead to slowdowns in some scenarios. E.g., when loading narrow rows into a table using COPY, the caller of RelationGetBufferForTuple() will only request a small number of pages. Without concurrency, we just extended using pwritev() in that case. However, if there is *some* concurrency, we switched between extending by a small number of pages and a larger number of pages, depending on the number of waiters for the relation extension logic. However, some filesystems, XFS in particular, do not perform well when switching between extending files using fallocate() and pwritev(). To avoid that issue, remember the number of prior relation extensions in BulkInsertState and extend more aggressively if there were prior relation extensions. That not just avoids the aforementioned slowdown, but also leads to noticeable performance gains in other situations, primarily due to extending more aggressively when there is no concurrency. I should have done it this way from the get go. Reported-by: Masahiko Sawada <sawada.mshk@gmail.com> Author: Andres Freund <andres@anarazel.de> Discussion: https://postgr.es/m/CAD21AoDvDmUQeJtZrau1ovnT_smN940=Kp6mszNGK3bq9yRN6g@mail.gmail.com Backpatch: 16-, where the new relation extension code was added
1 parent 94f9c08 commit 82a4eda

File tree

3 files changed

+30
-3
lines changed

3 files changed

+30
-3
lines changed

src/backend/access/heap/heapam.c

+1
Original file line numberDiff line numberDiff line change
@@ -1776,6 +1776,7 @@ GetBulkInsertState(void)
17761776
bistate->current_buf = InvalidBuffer;
17771777
bistate->next_free = InvalidBlockNumber;
17781778
bistate->last_free = InvalidBlockNumber;
1779+
bistate->already_extended_by = 0;
17791780
return bistate;
17801781
}
17811782

src/backend/access/heap/hio.c

+19
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,24 @@ RelationAddBlocks(Relation relation, BulkInsertState bistate,
283283
*/
284284
extend_by_pages += extend_by_pages * waitcount;
285285

286+
/* ---
287+
* If we previously extended using the same bistate, it's very likely
288+
* we'll extend some more. Try to extend by as many pages as
289+
* before. This can be important for performance for several reasons,
290+
* including:
291+
*
292+
* - It prevents mdzeroextend() switching between extending the
293+
* relation in different ways, which is inefficient for some
294+
* filesystems.
295+
*
296+
* - Contention is often intermittent. Even if we currently don't see
297+
* other waiters (see above), extending by larger amounts can
298+
* prevent future contention.
299+
* ---
300+
*/
301+
if (bistate)
302+
extend_by_pages = Max(extend_by_pages, bistate->already_extended_by);
303+
286304
/*
287305
* Can't extend by more than MAX_BUFFERS_TO_EXTEND_BY, we need to pin
288306
* them all concurrently.
@@ -409,6 +427,7 @@ RelationAddBlocks(Relation relation, BulkInsertState bistate,
409427
/* maintain bistate->current_buf */
410428
IncrBufferRefCount(buffer);
411429
bistate->current_buf = buffer;
430+
bistate->already_extended_by += extend_by_pages;
412431
}
413432

414433
return buffer;

src/include/access/hio.h

+10-3
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,22 @@ typedef struct BulkInsertStateData
3232
Buffer current_buf; /* current insertion target page */
3333

3434
/*
35-
* State for bulk extensions. Further pages that were unused at the time
36-
* of the extension. They might be in use by the time we use them though,
37-
* so rechecks are needed.
35+
* State for bulk extensions.
36+
*
37+
* last_free..next_free are further pages that were unused at the time of
38+
* the last extension. They might be in use by the time we use them
39+
* though, so rechecks are needed.
3840
*
3941
* XXX: Eventually these should probably live in RelationData instead,
4042
* alongside targetblock.
43+
*
44+
* already_extended_by is the number of pages that this bulk inserted
45+
* extended by. If we already extended by a significant number of pages,
46+
* we can be more aggressive about extending going forward.
4147
*/
4248
BlockNumber next_free;
4349
BlockNumber last_free;
50+
uint32 already_extended_by;
4451
} BulkInsertStateData;
4552

4653

0 commit comments

Comments
 (0)