Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitda84306

Browse files
author
Arthur Zakirov
committed
Rename RumKey to RumItem
1 parent0e21179 commitda84306

File tree

12 files changed

+271
-280
lines changed

12 files changed

+271
-280
lines changed

‎src/rum.h

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,12 @@ typedef struct RumMetaPageData
164164
(RumItemPointerGetOffsetNumber(p) == (OffsetNumber)0xffff && \
165165
RumItemPointerGetBlockNumber(p) != InvalidBlockNumber)
166166

167-
typedefstructRumKey
167+
typedefstructRumItem
168168
{
169169
ItemPointerDataiptr;
170170
booladdInfoIsNull;
171171
DatumaddInfo;
172-
}RumKey;
172+
}RumItem;
173173

174174
#defineRumItemSetMin(item) \
175175
do { \
@@ -185,7 +185,7 @@ typedef struct
185185
{
186186
/* We use BlockIdData not BlockNumber to avoid padding space wastage */
187187
BlockIdDatachild_blkno;
188-
RumKeykey;
188+
RumItemitem;
189189
}PostingItem;
190190

191191
#definePostingItemGetBlockNumber(pointer) \
@@ -262,21 +262,21 @@ typedef signed char RumNullCategory;
262262
/*
263263
* Data (posting tree) pages
264264
*/
265-
#defineRumDataPageGetRightBound(page)((RumKey*) PageGetContents(page))
265+
#defineRumDataPageGetRightBound(page)((RumItem*) PageGetContents(page))
266266
#defineRumDataPageGetData(page)\
267-
(PageGetContents(page) + MAXALIGN(sizeof(RumKey)))
267+
(PageGetContents(page) + MAXALIGN(sizeof(RumItem)))
268268
#defineRumDataPageGetItem(page,i)\
269269
(RumDataPageGetData(page) + ((i)-1) * sizeof(PostingItem))
270270

271271
#defineRumDataPageGetFreeSpace(page)\
272272
(BLCKSZ - MAXALIGN(SizeOfPageHeaderData) \
273-
- MAXALIGN(sizeof(RumKey))/* right bound */ \
273+
- MAXALIGN(sizeof(RumItem))/* right bound */ \
274274
-RumPageGetOpaque(page)->maxoff*sizeof(PostingItem) \
275275
-MAXALIGN(sizeof(RumPageOpaqueData)))
276276

277277
#defineRumMaxLeafDataItems \
278278
((BLCKSZ - MAXALIGN(SizeOfPageHeaderData) - \
279-
MAXALIGN(sizeof(RumKey))/* right bound */- \
279+
MAXALIGN(sizeof(RumItem))/* right bound */- \
280280
MAXALIGN(sizeof(RumPageOpaqueData))) \
281281
/sizeof(ItemPointerData))
282282

@@ -298,7 +298,7 @@ typedef struct
298298

299299
#defineRumDataPageSize \
300300
(BLCKSZ - MAXALIGN(SizeOfPageHeaderData) \
301-
- MAXALIGN(sizeof(RumKey))/* right bound */ \
301+
- MAXALIGN(sizeof(RumItem))/* right bound */ \
302302
-MAXALIGN(sizeof(RumPageOpaqueData)) \
303303
-MAXALIGN(sizeof(RumDataLeafItemIndex)*RumDataLeafIndexCount))
304304

@@ -433,7 +433,7 @@ extern bool ruminsert(Relation index, Datum *values, bool *isnull,
433433
);
434434
externvoidrumEntryInsert(RumState*rumstate,
435435
OffsetNumberattnum,Datumkey,RumNullCategorycategory,
436-
RumKey*items,uint32nitem,GinStatsData*buildStats);
436+
RumItem*items,uint32nitem,GinStatsData*buildStats);
437437

438438
/* rumbtree.c */
439439

@@ -483,7 +483,7 @@ typedef struct RumBtreeData
483483
boolisDelete;
484484

485485
/* Data (posting tree) options */
486-
RumKey*items;
486+
RumItem*items;
487487

488488
uint32nitem;
489489
uint32curitem;
@@ -509,25 +509,25 @@ extern void rumEntryFillRoot(RumBtree btree, Buffer root, Buffer lbuf, Buffer rb
509509
Pagepage,Pagelpage,Pagerpage);
510510
externIndexTuplerumPageGetLinkItup(RumBtreebtree,Bufferbuf,Pagepage);
511511
externvoidrumReadTuple(RumState*rumstate,OffsetNumberattnum,
512-
IndexTupleitup,RumKey*items);
512+
IndexTupleitup,RumItem*items);
513513
externvoidrumReadTuplePointers(RumState*rumstate,OffsetNumberattnum,
514514
IndexTupleitup,ItemPointerData*ipd);
515515
externvoidupdateItemIndexes(Pagepage,OffsetNumberattnum,RumState*rumstate);
516516
externvoidcheckLeafDataPage(RumState*rumstate,AttrNumberattrnum,Pagepage);
517517

518518
/* rumdatapage.c */
519519
externintrumCompareItemPointers(constItemPointerData*a,constItemPointerData*b);
520-
externintcompareRumKey(RumState*state,constAttrNumberattno,
521-
constRumKey*a,constRumKey*b);
522-
externvoidconvertIndexToKey(RumDataLeafItemIndex*src,RumKey*dst);
520+
externintcompareRumItem(RumState*state,constAttrNumberattno,
521+
constRumItem*a,constRumItem*b);
522+
externvoidconvertIndexToKey(RumDataLeafItemIndex*src,RumItem*dst);
523523
externPointerrumPlaceToDataPageLeaf(Pointerptr,OffsetNumberattnum,
524-
RumKey*item,ItemPointerprev,RumState*rumstate);
524+
RumItem*item,ItemPointerprev,RumState*rumstate);
525525
externSizerumCheckPlaceToDataPageLeaf(OffsetNumberattnum,
526-
RumKey*item,ItemPointerprev,RumState*rumstate,Sizesize);
527-
externuint32rumMergeItemPointers(RumState*rumstate,AttrNumberattno,
528-
RumKey*dst,
529-
RumKey*a,uint32na,
530-
RumKey*b,uint32nb);
526+
RumItem*item,ItemPointerprev,RumState*rumstate,Sizesize);
527+
externuint32rumMergeRumItems(RumState*rumstate,AttrNumberattno,
528+
RumItem*dst,
529+
RumItem*a,uint32na,
530+
RumItem*b,uint32nb);
531531
externvoidRumDataPageAddItem(Pagepage,void*data,OffsetNumberoffset);
532532
externvoidRumPageDeletePostingItem(Pagepage,OffsetNumberoffset);
533533

@@ -544,9 +544,9 @@ extern RumPostingTreeScan *rumPrepareScanPostingTree(Relation index,
544544
externvoidrumInsertItemPointers(RumState*rumstate,
545545
OffsetNumberattnum,
546546
RumPostingTreeScan*gdi,
547-
RumKey*items,uint32nitem,
547+
RumItem*items,uint32nitem,
548548
GinStatsData*buildStats);
549-
externBufferrumScanBeginPostingTree(RumPostingTreeScan*gdi,RumKey*key);
549+
externBufferrumScanBeginPostingTree(RumPostingTreeScan*gdi,RumItem*item);
550550
externvoidrumDataFillRoot(RumBtreebtree,Bufferroot,Bufferlbuf,Bufferrbuf,
551551
Pagepage,Pagelpage,Pagerpage);
552552
externvoidrumPrepareDataScan(RumBtreebtree,Relationindex,OffsetNumberattnum,RumState*rumstate);
@@ -608,7 +608,7 @@ typedef struct RumScanKeyData
608608
* isFinished means that all the input entry streams are finished, so this
609609
* key cannot succeed for any later TIDs.
610610
*/
611-
RumKeycurItem;
611+
RumItemcurItem;
612612
boolcurItemMatches;
613613
boolrecheckCurItem;
614614
boolisFinished;
@@ -636,20 +636,20 @@ typedef struct RumScanEntryData
636636
Bufferbuffer;
637637

638638
/* current ItemPointer to heap */
639-
RumKeycurRumKey;
639+
RumItemcurItem;
640640

641641
/* for a partial-match or full-scan query, we accumulate all TIDs here */
642642
boolforceUseBitmap;
643643
/* or here if we need to store addinfo */
644644
Tuplesortstate*matchSortstate;
645-
RumKeycollectRumKey;
645+
RumItemcollectRumItem;
646646

647647
/* for full-scan query with order-by */
648648
RumBtreeStack*stack;
649649
boolscanWithAddInfo;
650650

651651
/* used for Posting list and one page in Posting tree */
652-
RumKey*list;
652+
RumItem*list;
653653
MemoryContextcontext;
654654
int16nlist;
655655
int16offset;
@@ -663,7 +663,7 @@ typedef struct RumScanEntryData
663663

664664
/* Find by AddInfo */
665665
booluseMarkAddInfo;
666-
RumKeymarkAddInfo;
666+
RumItemmarkAddInfo;
667667
}RumScanEntryData;
668668

669669
typedefstruct
@@ -702,7 +702,7 @@ typedef struct RumScanOpaqueData
702702
intnorderbys;/* Number of columns in ordering.
703703
Will be assigned to sortstate->nKeys */
704704

705-
RumKeykey;
705+
RumItemitem;
706706
boolfirstCall;
707707
boolisVoidRes;/* true if query is unsatisfiable */
708708
boolwillSort;
@@ -746,7 +746,7 @@ typedef struct RumEntryAccumulator
746746
RumNullCategorycategory;
747747
OffsetNumberattnum;
748748
boolshouldSort;
749-
RumKey*list;
749+
RumItem*list;
750750
uint32maxcount;/* allocated size of list[] */
751751
uint32count;/* current number of list[] entries */
752752
}RumEntryAccumulator;
@@ -761,7 +761,7 @@ typedef struct
761761
#ifPG_VERSION_NUM >=100000
762762
RBTreeIteratortree_walk;
763763
#endif
764-
RumKey*sortSpace;
764+
RumItem*sortSpace;
765765
uint32sortSpaceN;
766766
}BuildAccumulator;
767767

@@ -771,7 +771,7 @@ extern void rumInsertBAEntries(BuildAccumulator *accum,
771771
Datum*entries,Datum*addInfo,bool*addInfoIsNull,
772772
RumNullCategory*categories,int32nentries);
773773
externvoidrumBeginBAScan(BuildAccumulator*accum);
774-
externRumKey*rumGetBAEntry(BuildAccumulator*accum,
774+
externRumItem*rumGetBAEntry(BuildAccumulator*accum,
775775
OffsetNumber*attnum,Datum*key,RumNullCategory*category,
776776
uint32*n);
777777

@@ -873,7 +873,7 @@ rumDataPageLeafReadItemPointer(char *ptr, ItemPointer iptr, bool *addInfoIsNull)
873873
* passed in order to read the first item pointer.
874874
*/
875875
staticinlinePointer
876-
rumDataPageLeafRead(Pointerptr,OffsetNumberattnum,RumKey*item,
876+
rumDataPageLeafRead(Pointerptr,OffsetNumberattnum,RumItem*item,
877877
RumState*rumstate)
878878
{
879879
Form_pg_attributeattr;
@@ -954,7 +954,7 @@ rumDataPageLeafRead(Pointer ptr, OffsetNumber attnum, RumKey * item,
954954
* passed in order to read the first item pointer.
955955
*/
956956
staticinlinePointer
957-
rumDataPageLeafReadPointer(Pointerptr,OffsetNumberattnum,RumKey*item,
957+
rumDataPageLeafReadPointer(Pointerptr,OffsetNumberattnum,RumItem*item,
958958
RumState*rumstate)
959959
{
960960
Form_pg_attributeattr;

‎src/rumbtree.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ rumReFindLeafPage(RumBtree btree, RumBtreeStack * stack)
100100
* that requested leaf page is in this subtree only when requested
101101
* item pointer is less than item pointer previous to rightmost.
102102
*/
103-
if (compareRumKey(btree->rumstate,btree->entryAttnum,
104-
&(((PostingItem*)RumDataPageGetItem(page,maxoff-1))->key),
103+
if (compareRumItem(btree->rumstate,btree->entryAttnum,
104+
&(((PostingItem*)RumDataPageGetItem(page,maxoff-1))->item),
105105
&btree->items[btree->curitem]) >=0)
106106
{
107107
break;

‎src/rumbulk.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ rumCombineData(RBNode *existing, const RBNode *newdata, void *arg)
3737
{
3838
accum->allocatedMemory-=GetMemoryChunkSpace(eo->list);
3939
eo->maxcount *=2;
40-
eo->list= (RumKey*)repalloc(eo->list,sizeof(RumKey)*eo->maxcount);
40+
eo->list= (RumItem*)repalloc(eo->list,sizeof(RumItem)*eo->maxcount);
4141
accum->allocatedMemory+=GetMemoryChunkSpace(eo->list);
4242
}
4343

@@ -148,7 +148,7 @@ rumInsertBAEntry(BuildAccumulator *accum,
148148
RumEntryAccumulatoreatmp;
149149
RumEntryAccumulator*ea;
150150
boolisNew;
151-
RumKeyitem;
151+
RumItemitem;
152152

153153
/*
154154
* For the moment, fill only the fields of eatmp that will be looked at by
@@ -184,7 +184,7 @@ rumInsertBAEntry(BuildAccumulator *accum,
184184
*/
185185
ea->shouldSort= (accum->rumstate->useAlternativeOrder&&
186186
attnum==accum->rumstate->attrnAddToColumn);
187-
ea->list= (RumKey*)palloc(sizeof(RumKey)*DEF_NPTR);
187+
ea->list= (RumItem*)palloc(sizeof(RumItem)*DEF_NPTR);
188188
ea->list[0].iptr=*heapptr;
189189
ea->list[0].addInfo=addInfo;
190190
ea->list[0].addInfoIsNull=addInfoIsNull;
@@ -263,9 +263,9 @@ qsortCompareItemPointers(const void *a, const void *b)
263263
staticAttrNumberAttrNumberQsort=0;
264264

265265
staticint
266-
qsortCompareRumKey(constvoid*a,constvoid*b,void*arg)
266+
qsortCompareRumItem(constvoid*a,constvoid*b,void*arg)
267267
{
268-
returncompareRumKey(arg,AttrNumberQsort,a,b);
268+
returncompareRumItem(arg,AttrNumberQsort,a,b);
269269
}
270270

271271
/* Prepare to read out the rbtree contents using rumGetBAEntry */
@@ -284,13 +284,13 @@ rumBeginBAScan(BuildAccumulator *accum)
284284
* This consists of a single key datum and a list (array) of one or more
285285
* heap TIDs in which that key is found. The list is guaranteed sorted.
286286
*/
287-
RumKey*
287+
RumItem*
288288
rumGetBAEntry(BuildAccumulator*accum,
289289
OffsetNumber*attnum,Datum*key,RumNullCategory*category,
290290
uint32*n)
291291
{
292292
RumEntryAccumulator*entry;
293-
RumKey*list;
293+
RumItem*list;
294294

295295
#ifPG_VERSION_NUM >=100000
296296
entry= (RumEntryAccumulator*)rb_iterate(&accum->tree_walk);
@@ -315,10 +315,10 @@ rumGetBAEntry(BuildAccumulator *accum,
315315

316316
if (accum->rumstate->useAlternativeOrder&&
317317
entry->attnum==accum->rumstate->attrnAddToColumn)
318-
qsort_arg(list,entry->count,sizeof(RumKey),
319-
qsortCompareRumKey,accum->rumstate);
318+
qsort_arg(list,entry->count,sizeof(RumItem),
319+
qsortCompareRumItem,accum->rumstate);
320320
elseif (entry->shouldSort)
321-
qsort(list,entry->count,sizeof(RumKey),qsortCompareItemPointers);
321+
qsort(list,entry->count,sizeof(RumItem),qsortCompareItemPointers);
322322
}
323323

324324
returnlist;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp