Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit e62e73f

Browse files
committed
gist: fix typo "split(t)ed" -> "split"
Dagfinn Ilmari Mannsåker, reviewed by Shubham Khanna. Discussion: http://postgr.es/m/87le9fmi01.fsf@wibble.ilmari.org
1 parent 591cf62 commit e62e73f

File tree

7 files changed

+25
-25
lines changed

7 files changed

+25
-25
lines changed

src/backend/access/gist/gist.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static void gistprunepage(Relation rel, Page page, Buffer buffer,
4444

4545

4646
#define ROTATEDIST(d) do { \
47-
SplitedPageLayout *tmp=(SplitedPageLayout*)palloc0(sizeof(SplitedPageLayout)); \
47+
SplitPageLayout *tmp=(SplitPageLayout*)palloc0(sizeof(SplitPageLayout)); \
4848
tmp->block.blkno = InvalidBlockNumber; \
4949
tmp->buffer = InvalidBuffer; \
5050
tmp->next = (d); \
@@ -283,11 +283,11 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
283283
/* no space for insertion */
284284
IndexTuple *itvec;
285285
int tlen;
286-
SplitedPageLayout *dist = NULL,
286+
SplitPageLayout *dist = NULL,
287287
*ptr;
288288
BlockNumber oldrlink = InvalidBlockNumber;
289289
GistNSN oldnsn = 0;
290-
SplitedPageLayout rootpg;
290+
SplitPageLayout rootpg;
291291
bool is_rootsplit;
292292
int npage;
293293

@@ -1080,7 +1080,7 @@ gistFindCorrectParent(Relation r, GISTInsertStack *child, bool is_build)
10801080
{
10811081
/*
10821082
* End of chain and still didn't find parent. It's a very-very
1083-
* rare situation when root splitted.
1083+
* rare situation when the root was split.
10841084
*/
10851085
break;
10861086
}
@@ -1435,7 +1435,7 @@ gistfinishsplit(GISTInsertState *state, GISTInsertStack *stack,
14351435
* used for XLOG and real writes buffers. Function is recursive, ie
14361436
* it will split page until keys will fit in every page.
14371437
*/
1438-
SplitedPageLayout *
1438+
SplitPageLayout *
14391439
gistSplit(Relation r,
14401440
Page page,
14411441
IndexTuple *itup, /* contains compressed entry */
@@ -1446,7 +1446,7 @@ gistSplit(Relation r,
14461446
*rvectup;
14471447
GistSplitVector v;
14481448
int i;
1449-
SplitedPageLayout *res = NULL;
1449+
SplitPageLayout *res = NULL;
14501450

14511451
/* this should never recurse very deeply, but better safe than sorry */
14521452
check_stack_depth();
@@ -1496,7 +1496,7 @@ gistSplit(Relation r,
14961496

14971497
if (!gistfitpage(lvectup, v.splitVector.spl_nleft))
14981498
{
1499-
SplitedPageLayout *resptr,
1499+
SplitPageLayout *resptr,
15001500
*subres;
15011501

15021502
resptr = subres = gistSplit(r, page, lvectup, v.splitVector.spl_nleft, giststate);

src/backend/access/gist/gistbuild.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ gist_indexsortbuild_levelstate_flush(GISTBuildState *state,
527527
BlockNumber blkno;
528528
MemoryContext oldCtx;
529529
IndexTuple union_tuple;
530-
SplitedPageLayout *dist;
530+
SplitPageLayout *dist;
531531
IndexTuple *itvec;
532532
int vect_len;
533533
bool isleaf = GistPageIsLeaf(levelstate->pages[0]);
@@ -555,8 +555,8 @@ gist_indexsortbuild_levelstate_flush(GISTBuildState *state,
555555
}
556556
else
557557
{
558-
/* Create splitted layout from single page */
559-
dist = (SplitedPageLayout *) palloc0(sizeof(SplitedPageLayout));
558+
/* Create split layout from single page */
559+
dist = (SplitPageLayout *) palloc0(sizeof(SplitPageLayout));
560560
union_tuple = gistunion(state->indexrel, itvec, vect_len,
561561
state->giststate);
562562
dist->itup = union_tuple;

src/backend/access/gist/gistbuildbuffers.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ gistGetNodeBuffer(GISTBuildBuffers *gfbb, GISTSTATE *giststate,
163163
* not arbitrary that the new buffer is put to the beginning of the
164164
* list: in the final emptying phase we loop through all buffers at
165165
* each level, and flush them. If a page is split during the emptying,
166-
* it's more efficient to flush the new splitted pages first, before
166+
* it's more efficient to flush the new split pages first, before
167167
* moving on to pre-existing pages on the level. The buffers just
168168
* created during the page split are likely still in cache, so
169169
* flushing them immediately is more efficient than putting them to
@@ -518,7 +518,7 @@ gistFreeBuildBuffers(GISTBuildBuffers *gfbb)
518518

519519
/*
520520
* Data structure representing information about node buffer for index tuples
521-
* relocation from splitted node buffer.
521+
* relocation from split node buffer.
522522
*/
523523
typedef struct
524524
{
@@ -549,12 +549,12 @@ gistRelocateBuildBuffersOnSplit(GISTBuildBuffers *gfbb, GISTSTATE *giststate,
549549
GISTNodeBuffer oldBuf;
550550
ListCell *lc;
551551

552-
/* If the splitted page doesn't have buffers, we have nothing to do. */
552+
/* If the split page doesn't have buffers, we have nothing to do. */
553553
if (!LEVEL_HAS_BUFFERS(level, gfbb))
554554
return;
555555

556556
/*
557-
* Get the node buffer of the splitted page.
557+
* Get the node buffer of the split page.
558558
*/
559559
blocknum = BufferGetBlockNumber(buffer);
560560
nodeBuffer = hash_search(gfbb->nodeBuffersTab, &blocknum,

src/backend/access/gist/gistxlog.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -495,12 +495,12 @@ gist_mask(char *pagedata, BlockNumber blkno)
495495
*/
496496
XLogRecPtr
497497
gistXLogSplit(bool page_is_leaf,
498-
SplitedPageLayout *dist,
498+
SplitPageLayout *dist,
499499
BlockNumber origrlink, GistNSN orignsn,
500500
Buffer leftchildbuf, bool markfollowright)
501501
{
502502
gistxlogPageSplit xlrec;
503-
SplitedPageLayout *ptr;
503+
SplitPageLayout *ptr;
504504
int npage = 0;
505505
XLogRecPtr recptr;
506506
int i;

src/include/access/gist_private.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ typedef struct gistxlogPage
187187
int num; /* number of index tuples following */
188188
} gistxlogPage;
189189

190-
/* SplitedPageLayout - gistSplit function result */
191-
typedef struct SplitedPageLayout
190+
/* SplitPageLayout - gistSplit function result */
191+
typedef struct SplitPageLayout
192192
{
193193
gistxlogPage block;
194194
IndexTupleData *list;
@@ -197,8 +197,8 @@ typedef struct SplitedPageLayout
197197
Page page; /* to operate */
198198
Buffer buffer; /* to write after all proceed */
199199

200-
struct SplitedPageLayout *next;
201-
} SplitedPageLayout;
200+
struct SplitPageLayout *next;
201+
} SplitPageLayout;
202202

203203
/*
204204
* GISTInsertStack used for locking buffers and transfer arguments during
@@ -432,8 +432,8 @@ extern bool gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
432432
Relation heapRel,
433433
bool is_build);
434434

435-
extern SplitedPageLayout *gistSplit(Relation r, Page page, IndexTuple *itup,
436-
int len, GISTSTATE *giststate);
435+
extern SplitPageLayout *gistSplit(Relation r, Page page, IndexTuple *itup,
436+
int len, GISTSTATE *giststate);
437437

438438
/* gistxlog.c */
439439
extern XLogRecPtr gistXLogPageDelete(Buffer buffer,
@@ -453,7 +453,7 @@ extern XLogRecPtr gistXLogDelete(Buffer buffer, OffsetNumber *todelete,
453453
Relation heaprel);
454454

455455
extern XLogRecPtr gistXLogSplit(bool page_is_leaf,
456-
SplitedPageLayout *dist,
456+
SplitPageLayout *dist,
457457
BlockNumber origrlink, GistNSN orignsn,
458458
Buffer leftchildbuf, bool markfollowright);
459459

src/include/access/gistxlog.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ typedef struct gistxlogPageSplit
6969
{
7070
BlockNumber origrlink; /* rightlink of the page before split */
7171
GistNSN orignsn; /* NSN of the page before split */
72-
bool origleaf; /* was splitted page a leaf page? */
72+
bool origleaf; /* was split page a leaf page? */
7373

7474
uint16 npage; /* # of pages in the split */
7575
bool markfollowright; /* set F_FOLLOW_RIGHT flags */

src/tools/pgindent/typedefs.list

+1-1
Original file line numberDiff line numberDiff line change
@@ -2634,10 +2634,10 @@ SpecialJoinInfo
26342634
SpinDelayStatus
26352635
SplitInterval
26362636
SplitLR
2637+
SplitPageLayout
26372638
SplitPoint
26382639
SplitTextOutputData
26392640
SplitVar
2640-
SplitedPageLayout
26412641
StackElem
26422642
StartDataPtrType
26432643
StartLOPtrType

0 commit comments

Comments
 (0)