Move isBuild to RumState struct

Artur Zakirov · Artur Zakirov · commit 084fc003b96b · 2016-07-04T18:29:29.000+03:00
diff --git a/rum.h b/rum.h
@@ -327,6 +327,7 @@ typedef struct RumOptions
 typedef struct RumState
 {
 	Relation	index;
+	bool		isBuild;
 	bool		oneCol;			/* true if single-column index */
 	bool		useAlternativeOrder;
 	AttrNumber	attrnOrderByColumn;
@@ -458,7 +459,6 @@ typedef struct RumBtreeData
 	Relation	index;
 	RumState   *rumstate;		/* not valid in a data scan */
 	bool		fullScan;
-	bool		isBuild;
 
 	BlockNumber rightblkno;
 
diff --git a/rumdatapage.c b/rumdatapage.c
@@ -1234,7 +1234,8 @@ dataSplitPageInternal(RumBtree btree, Buffer lbuf, Buffer rbuf,
 	 * we suppose that during index creation table scaned from begin to end,
 	 * so ItemPointers are monotonically increased..
 	 */
-	if (btree->isBuild && RumPageRightMost(newlPage))
+	if (btree->rumstate && btree->rumstate->isBuild
+		&& RumPageRightMost(newlPage))
 		separator = freeSpace / sizeofitem;
 	else
 		separator = maxoff / 2;
@@ -1444,7 +1445,6 @@ rumPrepareDataScan(RumBtree btree, Relation index, OffsetNumber attnum, RumState
 	btree->searchMode = FALSE;
 	btree->isDelete = FALSE;
 	btree->fullScan = FALSE;
-	btree->isBuild = FALSE;
 
 	btree->entryAttnum = attnum;
 }
diff --git a/rumentrypage.c b/rumentrypage.c
@@ -552,7 +552,6 @@ rumPrepareEntryScan(RumBtree btree, OffsetNumber attnum,
 	btree->isData = FALSE;
 	btree->searchMode = FALSE;
 	btree->fullScan = FALSE;
-	btree->isBuild = FALSE;
 
 	btree->entryAttnum = attnum;
 	btree->entryKey = key;
diff --git a/ruminsert.c b/ruminsert.c
@@ -285,7 +285,6 @@ addItemPointersToLeafTuple(RumState * rumstate,
 
 		/* Now insert the TIDs-to-be-added into the posting tree */
 		gdi = rumPrepareScanPostingTree(rumstate->index, postingRoot, FALSE, attnum, rumstate);
-		gdi->btree.isBuild = (buildStats != NULL);
 
 		rumInsertItemPointers(rumstate, attnum, gdi, items, nitem, buildStats);
 
@@ -365,7 +364,6 @@ buildFreshLeafTuple(RumState * rumstate,
 
 			gdi = rumPrepareScanPostingTree(rumstate->index, postingRoot, FALSE,
 											attnum, rumstate);
-			gdi->btree.isBuild = (buildStats != NULL);
 
 			rumInsertItemPointers(rumstate,
 								  attnum,
@@ -429,7 +427,6 @@ rumEntryInsert(RumState * rumstate,
 			/* insert into posting tree */
 			gdi = rumPrepareScanPostingTree(rumstate->index, rootPostingTree,
 											FALSE, attnum, rumstate);
-			gdi->btree.isBuild = (buildStats != NULL);
 			rumInsertItemPointers(rumstate, attnum, gdi, items,
 								  nitem, buildStats);
 			pfree(gdi);
@@ -584,6 +581,7 @@ rumbuild(Relation heap, Relation index, struct IndexInfo *indexInfo)
 			 RelationGetRelationName(index));
 
 	initRumState(&buildstate.rumstate, index);
+	buildstate.rumstate.isBuild = true;
 	buildstate.indtuples = 0;
 	memset(&buildstate.buildStats, 0, sizeof(GinStatsData));
 
diff --git a/rumutil.c b/rumutil.c
@@ -119,6 +119,7 @@ initRumState(RumState * state, Relation index)
 	MemSet(state, 0, sizeof(RumState));
 
 	state->index = index;
+	state->isBuild = false;
 	state->oneCol = (origTupdesc->natts == 1) ? true : false;
 	state->origTupdesc = origTupdesc;
 
