NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitdd097b2

Artur Zakirov

committed

Rename RumEntryAccumulatorItem to RumKey

1 parenta3d4e5a commitdd097b2Copy full SHA for dd097b2

File tree

2 files changed

+11

-16

lines changed

2 files changed

+11

-16

lines changed

`‎rum.h`

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -303,14 +303,12 @@ typedef struct RumOptions`
`303`	`303`	`#defineRUM_SHAREBUFFER_LOCK_SHARE`
`304`	`304`	`#defineRUM_EXCLUSIVE BUFFER_LOCK_EXCLUSIVE`
`305`	`305`
`306`		`-typedefstructRumEntryAccumulatorItem`
	`306`	`+typedefstructRumKey`
`307`	`307`	`{`
`308`	`308`	`ItemPointerDataiptr;`
`309`	`309`	`booladdInfoIsNull;`
`310`	`310`	`DatumaddInfo;`
`311`		`-}RumEntryAccumulatorItem;`
`312`		`-`
`313`		`-typedefstructRumEntryAccumulatorItemRumKey;`
	`311`	`+}RumKey;`
`314`	`312`
`315`	`313`	`#defineRumItemSetMin(item) \`
`316`	`314`	`do { \`
`@@ -693,7 +691,7 @@ typedef struct RumEntryAccumulator`
`693`	`691`	`RumNullCategorycategory;`
`694`	`692`	`OffsetNumberattnum;`
`695`	`693`	`boolshouldSort;`
`696`		`-RumEntryAccumulatorItem*list;`
	`694`	`+RumKey*list;`
`697`	`695`	`uint32maxcount;/* allocated size of list[] */`
`698`	`696`	`uint32count;/* current number of list[] entries */`
`699`	`697`	`}RumEntryAccumulator;`
`@@ -715,7 +713,7 @@ extern void rumInsertBAEntries(BuildAccumulator *accum,`
`715`	`713`	`Datumentries,DatumaddInfo,bool*addInfoIsNull,`
`716`	`714`	`RumNullCategory*categories,int32nentries);`
`717`	`715`	`externvoidrumBeginBAScan(BuildAccumulator*accum);`
`718`		`-externRumEntryAccumulatorItemrumGetBAEntry(BuildAccumulatoraccum,`
	`716`	`+externRumKeyrumGetBAEntry(BuildAccumulatoraccum,`
`719`	`717`	`OffsetNumberattnum,Datumkey,RumNullCategory*category,`
`720`	`718`	`uint32*n);`
`721`	`719`

`‎rumbulk.c`

Lines changed: 7 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,7 @@ rumCombineData(RBNode existing, const RBNode newdata, void *arg)`
`37`	`37`	`{`
`38`	`38`	`accum->allocatedMemory-=GetMemoryChunkSpace(eo->list);`
`39`	`39`	`eo->maxcount *=2;`
`40`		`-eo->list= (RumEntryAccumulatorItem*)`
`41`		`-repalloc(eo->list,sizeof(RumEntryAccumulatorItem)*eo->maxcount);`
	`40`	`+eo->list= (RumKey)repalloc(eo->list,sizeof(RumKey)eo->maxcount);`
`42`	`41`	`accum->allocatedMemory+=GetMemoryChunkSpace(eo->list);`
`43`	`42`	`}`
`44`	`43`
`@@ -150,7 +149,7 @@ rumInsertBAEntry(BuildAccumulator *accum,`
`150`	`149`	`RumEntryAccumulatoreatmp;`
`151`	`150`	`RumEntryAccumulator*ea;`
`152`	`151`	`boolisNew;`
`153`		`-RumEntryAccumulatorItemitem;`
	`152`	`+RumKeyitem;`
`154`	`153`
`155`	`154`	`/*`
`156`	`155`	`* For the moment, fill only the fields of eatmp that will be looked at by`
`@@ -185,8 +184,7 @@ rumInsertBAEntry(BuildAccumulator *accum,`
`185`	`184`	`* rumCombineData()`
`186`	`185`	`*/`
`187`	`186`	`ea->shouldSort=accum->rumstate->useAlternativeOrder;`
`188`		`-ea->list=`
`189`		`-(RumEntryAccumulatorItem)palloc(sizeof(RumEntryAccumulatorItem)DEF_NPTR);`
	`187`	`+ea->list= (RumKey)palloc(sizeof(RumKey)DEF_NPTR);`
`190`	`188`	`ea->list[0].iptr=*heapptr;`
`191`	`189`	`ea->list[0].addInfo=addInfo;`
`192`	`190`	`ea->list[0].addInfoIsNull=addInfoIsNull;`
`@@ -280,13 +278,13 @@ rumBeginBAScan(BuildAccumulator *accum)`
`280`	`278`	`* This consists of a single key datum and a list (array) of one or more`
`281`	`279`	`* heap TIDs in which that key is found. The list is guaranteed sorted.`
`282`	`280`	`*/`
`283`		`-RumEntryAccumulatorItem*`
	`281`	`+RumKey*`
`284`	`282`	`rumGetBAEntry(BuildAccumulator*accum,`
`285`	`283`	`OffsetNumberattnum,Datumkey,RumNullCategory*category,`
`286`	`284`	`uint32*n)`
`287`	`285`	`{`
`288`	`286`	`RumEntryAccumulator*entry;`
`289`		`-RumEntryAccumulatorItem*list;`
	`287`	`+RumKey*list;`
`290`	`288`
`291`	`289`	`entry= (RumEntryAccumulator*)rb_iterate(accum->tree);`
`292`	`290`
`@@ -304,11 +302,10 @@ rumGetBAEntry(BuildAccumulator *accum,`
`304`	`302`	`if (entry->count>1)`
`305`	`303`	`{`
`306`	`304`	`if (accum->rumstate->useAlternativeOrder)`
`307`		`-qsort_arg(list,entry->count,sizeof(RumEntryAccumulatorItem),`
	`305`	`+qsort_arg(list,entry->count,sizeof(RumKey),`
`308`	`306`	`qsortCompareRumKey,accum->rumstate);`
`309`	`307`	`elseif (entry->shouldSort)`
`310`		`-qsort(list,entry->count,sizeof(RumEntryAccumulatorItem),`
`311`		`-qsortCompareItemPointers);`
	`308`	`+qsort(list,entry->count,sizeof(RumKey),qsortCompareItemPointers);`
`312`	`309`	`}`
`313`	`310`
`314`	`311`	`returnlist;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitdd097b2

File tree

2 files changed

2 files changed

`‎rum.h`

`‎rumbulk.c`

0 commit comments