Remove argument isprimary from index_build()

michaelpq · michaelpq · commit 289198c0d93a · 2019-01-24T07:57:09.000+09:00
The flag was introduced in 3fdeb18, but f66e8bf actually forgot to finish the cleanup as index_update_stats() has simplified its interface. Author: Michael Paquier Discussion: https://postgr.es/m/20190122080852.GB3873@paquier.xyz
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
@@ -1130,7 +1130,7 @@ build_indices(void)
 		heap = table_open(ILHead->il_heap, NoLock);
 		ind = index_open(ILHead->il_ind, NoLock);
 
-		index_build(heap, ind, ILHead->il_info, false, false, false);
+		index_build(heap, ind, ILHead->il_info, false, false);
 
 		index_close(ind, NoLock);
 		table_close(heap, NoLock);
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
@@ -3063,7 +3063,7 @@ RelationTruncateIndexes(Relation heapRelation)
 
 		/* Initialize the index and rebuild */
 		/* Note: we do not need to re-establish pkey setting */
-		index_build(heapRelation, currentIndex, indexInfo, false, true, false);
+		index_build(heapRelation, currentIndex, indexInfo, true, false);
 
 		/* We're done with this index */
 		index_close(currentIndex, NoLock);
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
@@ -1189,8 +1189,7 @@ index_create(Relation heapRelation,
 	}
 	else
 	{
-		index_build(heapRelation, indexRelation, indexInfo, isprimary, false,
-					true);
+		index_build(heapRelation, indexRelation, indexInfo, false, true);
 	}
 
 	/*
@@ -2220,13 +2219,9 @@ index_update_stats(Relation rel,
  * entries of the index and heap relation as needed, using statistics
  * returned by ambuild as well as data passed by the caller.
  *
- * isprimary tells whether to mark the index as a primary-key index.
  * isreindex indicates we are recreating a previously-existing index.
  * parallel indicates if parallelism may be useful.
  *
- * Note: when reindexing an existing index, isprimary can be false even if
- * the index is a PK; it's already properly marked and need not be re-marked.
- *
  * Note: before Postgres 8.2, the passed-in heap and index Relations
  * were automatically closed by this routine.  This is no longer the case.
  * The caller opened 'em, and the caller should close 'em.
@@ -2235,7 +2230,6 @@ void
 index_build(Relation heapRelation,
 			Relation indexRelation,
 			IndexInfo *indexInfo,
-			bool isprimary,
 			bool isreindex,
 			bool parallel)
 {
@@ -3702,7 +3696,7 @@ reindex_index(Oid indexId, bool skip_constraint_checks, char persistence,
 
 		/* Initialize the index and rebuild */
 		/* Note: we do not need to re-establish pkey setting */
-		index_build(heapRelation, iRel, indexInfo, false, true, true);
+		index_build(heapRelation, iRel, indexInfo, true, true);
 	}
 	PG_CATCH();
 	{
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
@@ -1168,7 +1168,7 @@ DefineIndex(Oid relationId,
 	indexInfo->ii_BrokenHotChain = false;
 
 	/* Now build the index */
-	index_build(rel, indexRelation, indexInfo, stmt->primary, false, true);
+	index_build(rel, indexRelation, indexInfo, false, true);
 
 	/* Close both the relations, but keep the locks */
 	table_close(rel, NoLock);
diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h
@@ -107,7 +107,6 @@ extern void FormIndexDatum(IndexInfo *indexInfo,
 extern void index_build(Relation heapRelation,
 			Relation indexRelation,
 			IndexInfo *indexInfo,
-			bool isprimary,
 			bool isreindex,
 			bool parallel);
 

Original file line number	Diff line number	Diff line change
`@@ -1189,8 +1189,7 @@ index_create(Relation heapRelation,`
`1189`	`1189`	`}`
`1190`	`1190`	`else`
`1191`	`1191`	`{`
`1192`		`- index_build(heapRelation, indexRelation, indexInfo, isprimary, false,`
`1193`		`- true);`
	`1192`	`+ index_build(heapRelation, indexRelation, indexInfo, false, true);`
`1194`	`1193`	`}`
`1195`	`1194`
`1196`	`1195`	`/*`
`@@ -2220,13 +2219,9 @@ index_update_stats(Relation rel,`
`2220`	`2219`	`* entries of the index and heap relation as needed, using statistics`
`2221`	`2220`	`* returned by ambuild as well as data passed by the caller.`
`2222`	`2221`	`*`
`2223`		`- * isprimary tells whether to mark the index as a primary-key index.`
`2224`	`2222`	`* isreindex indicates we are recreating a previously-existing index.`
`2225`	`2223`	`* parallel indicates if parallelism may be useful.`
`2226`	`2224`	`*`
`2227`		`- * Note: when reindexing an existing index, isprimary can be false even if`
`2228`		`- * the index is a PK; it's already properly marked and need not be re-marked.`
`2229`		`- *`
`2230`	`2225`	`* Note: before Postgres 8.2, the passed-in heap and index Relations`
`2231`	`2226`	`* were automatically closed by this routine. This is no longer the case.`
`2232`	`2227`	`* The caller opened 'em, and the caller should close 'em.`
`@@ -2235,7 +2230,6 @@ void`
`2235`	`2230`	`index_build(Relation heapRelation,`
`2236`	`2231`	`Relation indexRelation,`
`2237`	`2232`	`IndexInfo *indexInfo,`
`2238`		`- bool isprimary,`
`2239`	`2233`	`bool isreindex,`
`2240`	`2234`	`bool parallel)`
`2241`	`2235`	`{`
`@@ -3702,7 +3696,7 @@ reindex_index(Oid indexId, bool skip_constraint_checks, char persistence,`
`3702`	`3696`
`3703`	`3697`	`/* Initialize the index and rebuild */`
`3704`	`3698`	`/* Note: we do not need to re-establish pkey setting */`
`3705`		`- index_build(heapRelation, iRel, indexInfo, false, true, true);`
	`3699`	`+ index_build(heapRelation, iRel, indexInfo, true, true);`
`3706`	`3700`	`}`
`3707`	`3701`	`PG_CATCH();`
`3708`	`3702`	`{`