From c3e49c6d81d7825785c536b0b4ab8699d77a042e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= Date: Fri, 22 Dec 2023 00:43:55 +0000 Subject: [PATCH v2 03/12] gist: fix typo "split(t)ed" -> "split" --- src/backend/access/gist/gist.c | 14 +++++++------- src/backend/access/gist/gistbuild.c | 6 +++--- src/backend/access/gist/gistbuildbuffers.c | 8 ++++---- src/backend/access/gist/gistxlog.c | 4 ++-- src/include/access/gist_private.h | 14 +++++++------- src/include/access/gistxlog.h | 2 +- src/tools/pgindent/typedefs.list | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index e052ba8bda..133676892e 100644 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@ -44,7 +44,7 @@ static void gistprunepage(Relation rel, Page page, Buffer buffer, #define ROTATEDIST(d) do { \ - SplitedPageLayout *tmp=(SplitedPageLayout*)palloc0(sizeof(SplitedPageLayout)); \ + SplitPageLayout *tmp=(SplitPageLayout*)palloc0(sizeof(SplitPageLayout)); \ tmp->block.blkno = InvalidBlockNumber; \ tmp->buffer = InvalidBuffer; \ tmp->next = (d); \ @@ -283,11 +283,11 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate, /* no space for insertion */ IndexTuple *itvec; int tlen; - SplitedPageLayout *dist = NULL, + SplitPageLayout *dist = NULL, *ptr; BlockNumber oldrlink = InvalidBlockNumber; GistNSN oldnsn = 0; - SplitedPageLayout rootpg; + SplitPageLayout rootpg; bool is_rootsplit; int npage; @@ -1080,7 +1080,7 @@ gistFindCorrectParent(Relation r, GISTInsertStack *child, bool is_build) { /* * End of chain and still didn't find parent. It's a very-very - * rare situation when root splitted. + * rare situation when the root was split. */ break; } @@ -1435,7 +1435,7 @@ gistfinishsplit(GISTInsertState *state, GISTInsertStack *stack, * used for XLOG and real writes buffers. Function is recursive, ie * it will split page until keys will fit in every page. */ -SplitedPageLayout * +SplitPageLayout * gistSplit(Relation r, Page page, IndexTuple *itup, /* contains compressed entry */ @@ -1446,7 +1446,7 @@ gistSplit(Relation r, *rvectup; GistSplitVector v; int i; - SplitedPageLayout *res = NULL; + SplitPageLayout *res = NULL; /* this should never recurse very deeply, but better safe than sorry */ check_stack_depth(); @@ -1496,7 +1496,7 @@ gistSplit(Relation r, if (!gistfitpage(lvectup, v.splitVector.spl_nleft)) { - SplitedPageLayout *resptr, + SplitPageLayout *resptr, *subres; resptr = subres = gistSplit(r, page, lvectup, v.splitVector.spl_nleft, giststate); diff --git a/src/backend/access/gist/gistbuild.c b/src/backend/access/gist/gistbuild.c index cacf50b269..a59a4570e1 100644 --- a/src/backend/access/gist/gistbuild.c +++ b/src/backend/access/gist/gistbuild.c @@ -527,7 +527,7 @@ gist_indexsortbuild_levelstate_flush(GISTBuildState *state, BlockNumber blkno; MemoryContext oldCtx; IndexTuple union_tuple; - SplitedPageLayout *dist; + SplitPageLayout *dist; IndexTuple *itvec; int vect_len; bool isleaf = GistPageIsLeaf(levelstate->pages[0]); @@ -555,8 +555,8 @@ gist_indexsortbuild_levelstate_flush(GISTBuildState *state, } else { - /* Create splitted layout from single page */ - dist = (SplitedPageLayout *) palloc0(sizeof(SplitedPageLayout)); + /* Create split layout from single page */ + dist = (SplitPageLayout *) palloc0(sizeof(SplitPageLayout)); union_tuple = gistunion(state->indexrel, itvec, vect_len, state->giststate); dist->itup = union_tuple; diff --git a/src/backend/access/gist/gistbuildbuffers.c b/src/backend/access/gist/gistbuildbuffers.c index 1423b4b047..fb5e2ffcb3 100644 --- a/src/backend/access/gist/gistbuildbuffers.c +++ b/src/backend/access/gist/gistbuildbuffers.c @@ -163,7 +163,7 @@ gistGetNodeBuffer(GISTBuildBuffers *gfbb, GISTSTATE *giststate, * not arbitrary that the new buffer is put to the beginning of the * list: in the final emptying phase we loop through all buffers at * each level, and flush them. If a page is split during the emptying, - * it's more efficient to flush the new splitted pages first, before + * it's more efficient to flush the new split pages first, before * moving on to pre-existing pages on the level. The buffers just * created during the page split are likely still in cache, so * flushing them immediately is more efficient than putting them to @@ -518,7 +518,7 @@ gistFreeBuildBuffers(GISTBuildBuffers *gfbb) /* * Data structure representing information about node buffer for index tuples - * relocation from splitted node buffer. + * relocation from split node buffer. */ typedef struct { @@ -549,12 +549,12 @@ gistRelocateBuildBuffersOnSplit(GISTBuildBuffers *gfbb, GISTSTATE *giststate, GISTNodeBuffer oldBuf; ListCell *lc; - /* If the splitted page doesn't have buffers, we have nothing to do. */ + /* If the split page doesn't have buffers, we have nothing to do. */ if (!LEVEL_HAS_BUFFERS(level, gfbb)) return; /* - * Get the node buffer of the splitted page. + * Get the node buffer of the split page. */ blocknum = BufferGetBlockNumber(buffer); nodeBuffer = hash_search(gfbb->nodeBuffersTab, &blocknum, diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c index 15249aa921..77e5954e7b 100644 --- a/src/backend/access/gist/gistxlog.c +++ b/src/backend/access/gist/gistxlog.c @@ -495,12 +495,12 @@ gist_mask(char *pagedata, BlockNumber blkno) */ XLogRecPtr gistXLogSplit(bool page_is_leaf, - SplitedPageLayout *dist, + SplitPageLayout *dist, BlockNumber origrlink, GistNSN orignsn, Buffer leftchildbuf, bool markfollowright) { gistxlogPageSplit xlrec; - SplitedPageLayout *ptr; + SplitPageLayout *ptr; int npage = 0; XLogRecPtr recptr; int i; diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h index 82eb7b4bd8..ed183d375d 100644 --- a/src/include/access/gist_private.h +++ b/src/include/access/gist_private.h @@ -187,8 +187,8 @@ typedef struct gistxlogPage int num; /* number of index tuples following */ } gistxlogPage; -/* SplitedPageLayout - gistSplit function result */ -typedef struct SplitedPageLayout +/* SplitPageLayout - gistSplit function result */ +typedef struct SplitPageLayout { gistxlogPage block; IndexTupleData *list; @@ -197,8 +197,8 @@ typedef struct SplitedPageLayout Page page; /* to operate */ Buffer buffer; /* to write after all proceed */ - struct SplitedPageLayout *next; -} SplitedPageLayout; + struct SplitPageLayout *next; +} SplitPageLayout; /* * GISTInsertStack used for locking buffers and transfer arguments during @@ -432,8 +432,8 @@ extern bool gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate, Relation heapRel, bool is_build); -extern SplitedPageLayout *gistSplit(Relation r, Page page, IndexTuple *itup, - int len, GISTSTATE *giststate); +extern SplitPageLayout *gistSplit(Relation r, Page page, IndexTuple *itup, + int len, GISTSTATE *giststate); /* gistxlog.c */ extern XLogRecPtr gistXLogPageDelete(Buffer buffer, @@ -453,7 +453,7 @@ extern XLogRecPtr gistXLogDelete(Buffer buffer, OffsetNumber *todelete, Relation heaprel); extern XLogRecPtr gistXLogSplit(bool page_is_leaf, - SplitedPageLayout *dist, + SplitPageLayout *dist, BlockNumber origrlink, GistNSN orignsn, Buffer leftchildbuf, bool markfollowright); diff --git a/src/include/access/gistxlog.h b/src/include/access/gistxlog.h index aff2ffbdcc..988db12e39 100644 --- a/src/include/access/gistxlog.h +++ b/src/include/access/gistxlog.h @@ -69,7 +69,7 @@ typedef struct gistxlogPageSplit { BlockNumber origrlink; /* rightlink of the page before split */ GistNSN orignsn; /* NSN of the page before split */ - bool origleaf; /* was splitted page a leaf page? */ + bool origleaf; /* was split page a leaf page? */ uint16 npage; /* # of pages in the split */ bool markfollowright; /* set F_FOLLOW_RIGHT flags */ diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index ee2ad7aa45..9f6e9bdc4c 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2634,10 +2634,10 @@ SpecialJoinInfo SpinDelayStatus SplitInterval SplitLR +SplitPageLayout SplitPoint SplitTextOutputData SplitVar -SplitedPageLayout StackElem StartDataPtrType StartLOPtrType -- 2.39.2