Enable pg_statistic cache use.

bmomjian · bmomjian · commit 922e53e6ea6b · 1999-11-25T00:15:57.000Z
diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.52 1999/11/24 16:52:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.53 1999/11/25 00:15:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -63,6 +63,8 @@ char	   *Name_pg_rewrite_indices[Num_pg_rewrite_indices] =
 		 	{RewriteOidIndex, RewriteRulenameIndex};
 char	   *Name_pg_shadow_indices[Num_pg_shadow_indices] =
 		 	{ShadowNameIndex, ShadowSysidIndex};
+char	   *Name_pg_statistic_indices[Num_pg_statistic_indices] =
+		 	{StatisticRelidAttnumOpIndex};
 char	   *Name_pg_trigger_indices[Num_pg_trigger_indices] =
 		 	{TriggerRelidIndex,	TriggerConstrNameIndex, TriggerConstrRelidIndex};
 char	   *Name_pg_type_indices[Num_pg_type_indices] =
diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.36 1999/11/24 00:44:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.37 1999/11/25 00:15:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -56,7 +56,6 @@ renameatt(char *relname,
 	HeapTuple	reltup,
 				oldatttup,
 				newatttup;
-	Relation	irelations[Num_pg_attr_indices];
 	Oid			relid;
 
 	/*
@@ -159,10 +158,13 @@ renameatt(char *relname,
 	heap_update(attrelation, &oldatttup->t_self, oldatttup, NULL);
 
 	/* keep system catalog indices current */
-	CatalogOpenIndices(Num_pg_attr_indices, Name_pg_attr_indices, irelations);
-	CatalogIndexInsert(irelations, Num_pg_attr_indices, attrelation, oldatttup);
-	CatalogCloseIndices(Num_pg_attr_indices, irelations);
-
+	{
+		Relation	irelations[Num_pg_attr_indices];
+		CatalogOpenIndices(Num_pg_attr_indices, Name_pg_attr_indices, irelations);
+		CatalogIndexInsert(irelations, Num_pg_attr_indices, attrelation, oldatttup);
+		CatalogCloseIndices(Num_pg_attr_indices, irelations);
+	}
+	
 	pfree(oldatttup);
 	heap_close(attrelation, RowExclusiveLock);
 }
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.125 1999/11/22 17:56:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.126 1999/11/25 00:15:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,6 +24,7 @@
 #include "catalog/catalog.h"
 #include "catalog/catname.h"
 #include "catalog/index.h"
+#include "catalog/indexing.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_statistic.h"
 #include "catalog/pg_type.h"
@@ -2446,6 +2447,13 @@ vc_updstats(Oid relid, int num_pages, int num_tuples, bool hasindex, VRelStats *
 					 */
 					heap_insert(sd, stup);
 
+					{
+						Relation	irelations[Num_pg_statistic_indices];
+						CatalogOpenIndices(Num_pg_statistic_indices, Name_pg_statistic_indices, irelations);
+						CatalogIndexInsert(irelations, Num_pg_statistic_indices, sd, stup);
+						CatalogCloseIndices(Num_pg_statistic_indices, irelations);
+					}
+					
 					/* release allocated space */
 					pfree(DatumGetPointer(values[Anum_pg_statistic_stacommonval-1]));
 					pfree(DatumGetPointer(values[Anum_pg_statistic_staloval-1]));
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.42 1999/11/22 17:56:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.43 1999/11/25 00:15:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -588,27 +588,20 @@ getattstatistics(Oid relid, AttrNumber attnum, Oid typid, int32 typmod,
 				 Datum *hival)
 {
 	Relation	rel;
-	HeapScanDesc scan;
-	static ScanKeyData key[2] = {
-		{0, Anum_pg_statistic_starelid, F_OIDEQ, {0, 0, F_OIDEQ}},
-		{0, Anum_pg_statistic_staattnum, F_INT2EQ, {0, 0, F_INT2EQ}}
-	};
 	bool		isnull;
 	HeapTuple	tuple;
 	HeapTuple	typeTuple;
 	FmgrInfo	inputproc;
 
 	rel = heap_openr(StatisticRelationName, AccessShareLock);
 
-	key[0].sk_argument = ObjectIdGetDatum(relid);
-	key[1].sk_argument = Int16GetDatum((int16) attnum);
-
-	scan = heap_beginscan(rel, 0, SnapshotNow, 2, key);
-	tuple = heap_getnext(scan, 0);
+	tuple = SearchSysCacheTuple(STATRELID,
+									ObjectIdGetDatum(relid),
+									Int16GetDatum((int16) attnum),
+									0, 0); /* staop is currently 0 */
 	if (!HeapTupleIsValid(tuple))
 	{
 		/* no such stats entry */
-		heap_endscan(scan);
 		heap_close(rel, AccessShareLock);
 		return false;
 	}
@@ -693,7 +686,6 @@ getattstatistics(Oid relid, AttrNumber attnum, Oid typid, int32 typmod,
 		}
 	}
 
-	heap_endscan(scan);
 	heap_close(rel, AccessShareLock);
 	return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.52 1999/11/24 16:52:31 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.53 1999/11/25 00:15:56 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -63,6 +63,8 @@ char *Name_pg_rewrite_indices[Num_pg_rewrite_indices] =`
`63`	`63`	`{RewriteOidIndex, RewriteRulenameIndex};`
`64`	`64`	`char *Name_pg_shadow_indices[Num_pg_shadow_indices] =`
`65`	`65`	`{ShadowNameIndex, ShadowSysidIndex};`
	`66`	`+char *Name_pg_statistic_indices[Num_pg_statistic_indices] =`
	`67`	`+ {StatisticRelidAttnumOpIndex};`
`66`	`68`	`char *Name_pg_trigger_indices[Num_pg_trigger_indices] =`
`67`	`69`	`{TriggerRelidIndex, TriggerConstrNameIndex, TriggerConstrRelidIndex};`
`68`	`70`	`char *Name_pg_type_indices[Num_pg_type_indices] =`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.42 1999/11/22 17:56:30 momjian Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.43 1999/11/25 00:15:57 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -588,27 +588,20 @@ getattstatistics(Oid relid, AttrNumber attnum, Oid typid, int32 typmod,`
`588`	`588`	`Datum *hival)`
`589`	`589`	`{`
`590`	`590`	`Relation rel;`
`591`		`- HeapScanDesc scan;`
`592`		`- static ScanKeyData key[2] = {`
`593`		`- {0, Anum_pg_statistic_starelid, F_OIDEQ, {0, 0, F_OIDEQ}},`
`594`		`- {0, Anum_pg_statistic_staattnum, F_INT2EQ, {0, 0, F_INT2EQ}}`
`595`		`- };`
`596`	`591`	`bool isnull;`
`597`	`592`	`HeapTuple tuple;`
`598`	`593`	`HeapTuple typeTuple;`
`599`	`594`	`FmgrInfo inputproc;`
`600`	`595`
`601`	`596`	`rel = heap_openr(StatisticRelationName, AccessShareLock);`
`602`	`597`
`603`		`- key[0].sk_argument = ObjectIdGetDatum(relid);`
`604`		`- key[1].sk_argument = Int16GetDatum((int16) attnum);`
`605`		`-`
`606`		`- scan = heap_beginscan(rel, 0, SnapshotNow, 2, key);`
`607`		`- tuple = heap_getnext(scan, 0);`
	`598`	`+ tuple = SearchSysCacheTuple(STATRELID,`
	`599`	`+ ObjectIdGetDatum(relid),`
	`600`	`+ Int16GetDatum((int16) attnum),`
	`601`	`+ 0, 0); /* staop is currently 0 */`
`608`	`602`	`if (!HeapTupleIsValid(tuple))`
`609`	`603`	`{`
`610`	`604`	`/* no such stats entry */`
`611`		`- heap_endscan(scan);`
`612`	`605`	`heap_close(rel, AccessShareLock);`
`613`	`606`	`return false;`
`614`	`607`	`}`
`@@ -693,7 +686,6 @@ getattstatistics(Oid relid, AttrNumber attnum, Oid typid, int32 typmod,`
`693`	`686`	`}`
`694`	`687`	`}`
`695`	`688`
`696`		`- heap_endscan(scan);`
`697`	`689`	`heap_close(rel, AccessShareLock);`
`698`	`690`	`return true;`
`699`	`691`	`}`