Commit084fc00

Artur Zakirov

committed

Move isBuild to RumState struct

1 parent04dadd7 commit084fc00Copy full SHA for 084fc00

File tree

-7

lines changed

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -327,6 +327,7 @@ typedef struct RumOptions`
`327`	`327`	`typedefstructRumState`
`328`	`328`	`{`
`329`	`329`	`Relationindex;`
	`330`	`+boolisBuild;`
`330`	`331`	`booloneCol;/* true if single-column index */`
`331`	`332`	`booluseAlternativeOrder;`
`332`	`333`	`AttrNumberattrnOrderByColumn;`
`@@ -458,7 +459,6 @@ typedef struct RumBtreeData`
`458`	`459`	`Relationindex;`
`459`	`460`	`RumStaterumstate;/ not valid in a data scan */`
`460`	`461`	`boolfullScan;`
`461`		`-boolisBuild;`
`462`	`462`
`463`	`463`	`BlockNumberrightblkno;`
`464`	`464`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1234,7 +1234,8 @@ dataSplitPageInternal(RumBtree btree, Buffer lbuf, Buffer rbuf,`
`1234`	`1234`	`* we suppose that during index creation table scaned from begin to end,`
`1235`	`1235`	`* so ItemPointers are monotonically increased..`
`1236`	`1236`	`*/`
`1237`		`-if (btree->isBuild&&RumPageRightMost(newlPage))`
	`1237`	`+if (btree->rumstate&&btree->rumstate->isBuild`
	`1238`	`+&&RumPageRightMost(newlPage))`
`1238`	`1239`	`separator=freeSpace /sizeofitem;`
`1239`	`1240`	`else`
`1240`	`1241`	`separator=maxoff /2;`
`@@ -1444,7 +1445,6 @@ rumPrepareDataScan(RumBtree btree, Relation index, OffsetNumber attnum, RumState`
`1444`	`1445`	`btree->searchMode= FALSE;`
`1445`	`1446`	`btree->isDelete= FALSE;`
`1446`	`1447`	`btree->fullScan= FALSE;`
`1447`		`-btree->isBuild= FALSE;`
`1448`	`1448`
`1449`	`1449`	`btree->entryAttnum=attnum;`
`1450`	`1450`	`}`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,6 @@ rumPrepareEntryScan(RumBtree btree, OffsetNumber attnum,`
`552`	`552`	`btree->isData= FALSE;`
`553`	`553`	`btree->searchMode= FALSE;`
`554`	`554`	`btree->fullScan= FALSE;`
`555`		`-btree->isBuild= FALSE;`
`556`	`555`
`557`	`556`	`btree->entryAttnum=attnum;`
`558`	`557`	`btree->entryKey=key;`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,6 @@ addItemPointersToLeafTuple(RumState * rumstate,`
`285`	`285`
`286`	`286`	`/* Now insert the TIDs-to-be-added into the posting tree */`
`287`	`287`	`gdi=rumPrepareScanPostingTree(rumstate->index,postingRoot, FALSE,attnum,rumstate);`
`288`		`-gdi->btree.isBuild= (buildStats!=NULL);`
`289`	`288`
`290`	`289`	`rumInsertItemPointers(rumstate,attnum,gdi,items,nitem,buildStats);`
`291`	`290`
`@@ -365,7 +364,6 @@ buildFreshLeafTuple(RumState * rumstate,`
`365`	`364`
`366`	`365`	`gdi=rumPrepareScanPostingTree(rumstate->index,postingRoot, FALSE,`
`367`	`366`	`attnum,rumstate);`
`368`		`-gdi->btree.isBuild= (buildStats!=NULL);`
`369`	`367`
`370`	`368`	`rumInsertItemPointers(rumstate,`
`371`	`369`	`attnum,`
`@@ -429,7 +427,6 @@ rumEntryInsert(RumState * rumstate,`
`429`	`427`	`/* insert into posting tree */`
`430`	`428`	`gdi=rumPrepareScanPostingTree(rumstate->index,rootPostingTree,`
`431`	`429`	`FALSE,attnum,rumstate);`
`432`		`-gdi->btree.isBuild= (buildStats!=NULL);`
`433`	`430`	`rumInsertItemPointers(rumstate,attnum,gdi,items,`
`434`	`431`	`nitem,buildStats);`
`435`	`432`	`pfree(gdi);`
`@@ -584,6 +581,7 @@ rumbuild(Relation heap, Relation index, struct IndexInfo *indexInfo)`
`584`	`581`	`RelationGetRelationName(index));`
`585`	`582`
`586`	`583`	`initRumState(&buildstate.rumstate,index);`
	`584`	`+buildstate.rumstate.isBuild= true;`
`587`	`585`	`buildstate.indtuples=0;`
`588`	`586`	`memset(&buildstate.buildStats,0,sizeof(GinStatsData));`
`589`	`587`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ initRumState(RumState * state, Relation index)`
`119`	`119`	`MemSet(state,0,sizeof(RumState));`
`120`	`120`
`121`	`121`	`state->index=index;`
	`122`	`+state->isBuild= false;`
`122`	`123`	`state->oneCol= (origTupdesc->natts==1) ? true : false;`
`123`	`124`	`state->origTupdesc=origTupdesc;`
`124`	`125`

Comments

(0)