Fix brain fade in cost estimation for index-only scans.

tglsfdc · tglsfdc · commit b324384f6bd5 · 2011-10-08T10:41:17.000-04:00
visibility_fraction should not be applied to regular indexscans.
Noted by Cédric Villemain.
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
@@ -264,6 +264,7 @@ cost_index(IndexPath *path, PlannerInfo *root,
 
 	if (!enable_indexscan)
 		startup_cost += disable_cost;
+	/* we don't need to check enable_indexonlyscan; indxpath.c does that */
 
 	/*
 	 * Call index-access-method-specific code to estimate the processing cost
@@ -345,7 +346,8 @@ cost_index(IndexPath *path, PlannerInfo *root,
 											(double) index->pages,
 											root);
 
-		pages_fetched = ceil(pages_fetched * visibility_fraction);
+		if (indexonly)
+			pages_fetched = ceil(pages_fetched * visibility_fraction);
 
 		max_IO_cost = (pages_fetched * spc_random_page_cost) / num_scans;
 
@@ -366,7 +368,8 @@ cost_index(IndexPath *path, PlannerInfo *root,
 											(double) index->pages,
 											root);
 
-		pages_fetched = ceil(pages_fetched * visibility_fraction);
+		if (indexonly)
+			pages_fetched = ceil(pages_fetched * visibility_fraction);
 
 		min_IO_cost = (pages_fetched * spc_random_page_cost) / num_scans;
 	}
@@ -381,15 +384,17 @@ cost_index(IndexPath *path, PlannerInfo *root,
 											(double) index->pages,
 											root);
 
-		pages_fetched = ceil(pages_fetched * visibility_fraction);
+		if (indexonly)
+			pages_fetched = ceil(pages_fetched * visibility_fraction);
 
 		/* max_IO_cost is for the perfectly uncorrelated case (csquared=0) */
 		max_IO_cost = pages_fetched * spc_random_page_cost;
 
 		/* min_IO_cost is for the perfectly correlated case (csquared=1) */
 		pages_fetched = ceil(indexSelectivity * (double) baserel->pages);
 
-		pages_fetched = ceil(pages_fetched * visibility_fraction);
+		if (indexonly)
+			pages_fetched = ceil(pages_fetched * visibility_fraction);
 
 		min_IO_cost = spc_random_page_cost;
 		if (pages_fetched > 1)
