iSignal
diff --git a/‎src/postgres/src/backend/utils/cache/catcache.c‎
Lines changed: 8 additions & 0 deletions b/‎src/postgres/src/backend/utils/cache/catcache.c‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/postgres/src/backend/utils/cache/syscache.c‎
Lines changed: 178 additions & 0 deletions b/‎src/postgres/src/backend/utils/cache/syscache.c‎
Lines changed: 178 additions & 0 deletions
diff --git a/‎src/postgres/src/include/utils/catcache.h‎
Lines changed: 1 addition & 0 deletions b/‎src/postgres/src/include/utils/catcache.h‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/postgres/src/include/utils/syscache.h‎
Lines changed: 56 additions & 0 deletions b/‎src/postgres/src/include/utils/syscache.h‎
Lines changed: 56 additions & 0 deletions
@@ -85,6 +85,7 @@
 static CatCacheHeader *CacheHdr = NULL;
 static long YbNumCatalogCacheMisses;
 static long YbNumCatalogCacheIdMisses[SysCacheSize] = {0};
+static long YbNumCatalogCacheTableMisses[YbNumCatalogCacheTables] = {0};
 
 static inline HeapTuple SearchCatCacheInternal(CatCache *cache,
 					   int nkeys,
@@ -1825,6 +1826,7 @@ SearchCatCacheMiss(CatCache *cache,
 		{
 			YbNumCatalogCacheMisses++;
 			YbNumCatalogCacheIdMisses[cache->id]++;
+			YbNumCatalogCacheTableMisses[YbGetCatalogCacheTableIdFromCacheId(cache->id)]++;
 		}
 
 		if (yb_debug_log_catcache_events)
@@ -2686,6 +2688,12 @@ YbGetCatCacheIdMisses()
 	return YbNumCatalogCacheIdMisses;
 }
 
+long *
+YbGetCatCacheTableMisses()
+{
+	return YbNumCatalogCacheTableMisses;
+}
+
 YbCatCListIterator
 YbCatCListIteratorBegin(CatCList *list)
 {
 
@@ -1089,6 +1089,149 @@ static const char *yb_cache_index_name_table[] = {
 static_assert(SysCacheSize == sizeof(yb_cache_index_name_table) /
 			  sizeof(const char *), "Wrong catalog cache number");
 
+/* List of all the tables that have caches on them */
+static const char *yb_cache_table_name_table[] = {
+	"pg_aggregate",
+	"pg_am",
+	"pg_amop",
+	"pg_amproc",
+	"pg_attribute",
+	"pg_auth_members",
+	"pg_authid",
+	"pg_cast",
+	"pg_class",
+	"pg_collation",
+	"pg_constraint",
+	"pg_conversion",
+	"pg_database",
+	"pg_default_acl",
+	"pg_enum",
+	"pg_event_trigger",
+	"pg_foreign_data_wrapper",
+	"pg_foreign_server",
+	"pg_foreign_table",
+	"pg_index",
+	"pg_language",
+	"pg_namespace",
+	"pg_opclass",
+	"pg_operator",
+	"pg_opfamily",
+	"pg_partitioned_table",
+	"pg_proc",
+	"pg_publication",
+	"pg_publication_rel",
+	"pg_range",
+	"pg_replication_origin",
+	"pg_rewrite",
+	"pg_sequence",
+	"pg_statistic",
+	"pg_statistic_ext",
+	"pg_subscription",
+	"pg_subscription_rel",
+	"pg_tablespace",
+	"pg_transform",
+	"pg_ts_config",
+	"pg_ts_config_map",
+	"pg_ts_dict",
+	"pg_ts_parser",
+	"pg_ts_template",
+	"pg_type",
+	"pg_user_mapping",
+	"pg_yb_tablegroup",
+};
+
+static_assert(YbNumCatalogCacheTables ==
+				  sizeof(yb_cache_table_name_table) / sizeof(const char *),
+			  "yb_catalog_cache_table_name_table size mismatch");
+
+
+/* Maps cache id to the table id in yb_cache_table_name_table */
+static YbCatalogCacheTable yb_catalog_cache_tables[] = {
+	YbCatalogCacheTable_pg_aggregate,
+	YbCatalogCacheTable_pg_am,
+	YbCatalogCacheTable_pg_am,
+	YbCatalogCacheTable_pg_amop,
+	YbCatalogCacheTable_pg_amop,
+	YbCatalogCacheTable_pg_amproc,
+	YbCatalogCacheTable_pg_attribute,
+	YbCatalogCacheTable_pg_attribute,
+	YbCatalogCacheTable_pg_auth_members,
+	YbCatalogCacheTable_pg_auth_members,
+	YbCatalogCacheTable_pg_authid,
+	YbCatalogCacheTable_pg_authid,
+	YbCatalogCacheTable_pg_cast,
+	YbCatalogCacheTable_pg_opclass,
+	YbCatalogCacheTable_pg_opclass,
+	YbCatalogCacheTable_pg_collation,
+	YbCatalogCacheTable_pg_collation,
+	YbCatalogCacheTable_pg_conversion,
+	YbCatalogCacheTable_pg_conversion,
+	YbCatalogCacheTable_pg_constraint,
+	YbCatalogCacheTable_pg_conversion,
+	YbCatalogCacheTable_pg_database,
+	YbCatalogCacheTable_pg_default_acl,
+	YbCatalogCacheTable_pg_enum,
+	YbCatalogCacheTable_pg_enum,
+	YbCatalogCacheTable_pg_event_trigger,
+	YbCatalogCacheTable_pg_event_trigger,
+	YbCatalogCacheTable_pg_foreign_data_wrapper,
+	YbCatalogCacheTable_pg_foreign_data_wrapper,
+	YbCatalogCacheTable_pg_foreign_server,
+	YbCatalogCacheTable_pg_foreign_server,
+	YbCatalogCacheTable_pg_foreign_table,
+	YbCatalogCacheTable_pg_index,
+	YbCatalogCacheTable_pg_language,
+	YbCatalogCacheTable_pg_language,
+	YbCatalogCacheTable_pg_namespace,
+	YbCatalogCacheTable_pg_namespace,
+	YbCatalogCacheTable_pg_operator,
+	YbCatalogCacheTable_pg_operator,
+	YbCatalogCacheTable_pg_opfamily,
+	YbCatalogCacheTable_pg_opfamily,
+	YbCatalogCacheTable_pg_partitioned_table,
+	YbCatalogCacheTable_pg_proc,
+	YbCatalogCacheTable_pg_proc,
+	YbCatalogCacheTable_pg_publication,
+	YbCatalogCacheTable_pg_publication,
+	YbCatalogCacheTable_pg_publication_rel,
+	YbCatalogCacheTable_pg_publication_rel,
+	YbCatalogCacheTable_pg_range,
+	YbCatalogCacheTable_pg_class,
+	YbCatalogCacheTable_pg_class,
+	YbCatalogCacheTable_pg_replication_origin,
+	YbCatalogCacheTable_pg_replication_origin,
+	YbCatalogCacheTable_pg_rewrite,
+	YbCatalogCacheTable_pg_sequence,
+	YbCatalogCacheTable_pg_statistic_ext,
+	YbCatalogCacheTable_pg_statistic_ext,
+	YbCatalogCacheTable_pg_statistic,
+	YbCatalogCacheTable_pg_subscription,
+	YbCatalogCacheTable_pg_subscription,
+	YbCatalogCacheTable_pg_subscription_rel,
+	YbCatalogCacheTable_pg_tablespace,
+	YbCatalogCacheTable_pg_transform,
+	YbCatalogCacheTable_pg_transform,
+	YbCatalogCacheTable_pg_ts_config_map,
+	YbCatalogCacheTable_pg_ts_config,
+	YbCatalogCacheTable_pg_ts_config,
+	YbCatalogCacheTable_pg_ts_dict,
+	YbCatalogCacheTable_pg_ts_dict,
+	YbCatalogCacheTable_pg_ts_parser,
+	YbCatalogCacheTable_pg_ts_parser,
+	YbCatalogCacheTable_pg_ts_template,
+	YbCatalogCacheTable_pg_ts_template,
+	YbCatalogCacheTable_pg_type,
+	YbCatalogCacheTable_pg_type,
+	YbCatalogCacheTable_pg_user_mapping,
+	YbCatalogCacheTable_pg_user_mapping,
+	YbCatalogCacheTable_pg_yb_tablegroup,
+	YbCatalogCacheTable_pg_constraint,
+};
+
+static_assert(SysCacheSize ==
+				  sizeof(yb_catalog_cache_tables) / sizeof(YbCatalogCacheTable),
+			  "yb_catalog_cache_tables size mismatch");
+
 typedef struct YbPinnedObjectKey
 {
 	Oid classid;
@@ -2046,6 +2189,20 @@ YbCheckCatalogCacheIndexNameTable()
 			return false;
 		}
 		ReleaseSysCache(tuple);
+
+		const char *table_name = YbGetCatalogCacheTableNameFromCacheId(cache_id);
+		Oid reloid = cacheinfo[cache_id].reloid;
+		tuple = SearchSysCache1(RELOID, reloid);
+		Assert(HeapTupleIsValid(tuple));
+		classForm = (Form_pg_class) GETSTRUCT(tuple);
+		if (strcmp(NameStr(classForm->relname), table_name))
+		{
+			ReleaseSysCache(tuple);
+			YBC_LOG_WARNING("Cache id %u has name mismatch: %s vs %s", cache_id,
+							NameStr(classForm->relname), table_name);
+			return false;
+		}
+		ReleaseSysCache(tuple);
 	}
 	return true;
 }
@@ -2055,3 +2212,24 @@ const char* YbGetCatalogCacheIndexName(int cache_id)
 {
 	return yb_cache_index_name_table[cache_id];
 }
+
+const char *
+YbGetCatalogCacheTableNameFromTableId(int table_id)
+{
+	Assert(table_id >= 0 && table_id < YbNumCatalogCacheTables);
+	return yb_cache_table_name_table[table_id];
+}
+
+int
+YbGetCatalogCacheTableIdFromCacheId(int cache_id)
+{
+	int table_id = yb_catalog_cache_tables[cache_id];
+	Assert(table_id >= 0 && table_id < YbNumCatalogCacheTables);
+	return table_id;
+}
+
+const char *
+YbGetCatalogCacheTableNameFromCacheId(int cache_id)
+{
+	return YbGetCatalogCacheTableNameFromTableId(YbGetCatalogCacheTableIdFromCacheId(cache_id));
+}
@@ -243,6 +243,7 @@ extern void PrintCatCacheListLeakWarning(CatCList *list);
 
 extern long YbGetCatCacheMisses();
 extern long* YbGetCatCacheIdMisses();
+extern long *YbGetCatCacheTableMisses();
 
 extern YbCatCListIterator YbCatCListIteratorBegin(CatCList *list);
 extern HeapTuple YbCatCListIteratorGetNext(YbCatCListIterator *iterator);
 
@@ -116,6 +116,59 @@ enum SysCacheIdentifier
 #define SysCacheSize (YBCONSTRAINTRELIDTYPIDNAME + 1)
 };
 
+typedef enum YbCatalogCacheTable
+{
+	YbCatalogCacheTable_pg_aggregate,
+	YbCatalogCacheTable_pg_am,
+	YbCatalogCacheTable_pg_amop,
+	YbCatalogCacheTable_pg_amproc,
+	YbCatalogCacheTable_pg_attribute,
+	YbCatalogCacheTable_pg_auth_members,
+	YbCatalogCacheTable_pg_authid,
+	YbCatalogCacheTable_pg_cast,
+	YbCatalogCacheTable_pg_class,
+	YbCatalogCacheTable_pg_collation,
+	YbCatalogCacheTable_pg_constraint,
+	YbCatalogCacheTable_pg_conversion,
+	YbCatalogCacheTable_pg_database,
+	YbCatalogCacheTable_pg_default_acl,
+	YbCatalogCacheTable_pg_enum,
+	YbCatalogCacheTable_pg_event_trigger,
+	YbCatalogCacheTable_pg_foreign_data_wrapper,
+	YbCatalogCacheTable_pg_foreign_server,
+	YbCatalogCacheTable_pg_foreign_table,
+	YbCatalogCacheTable_pg_index,
+	YbCatalogCacheTable_pg_language,
+	YbCatalogCacheTable_pg_namespace,
+	YbCatalogCacheTable_pg_opclass,
+	YbCatalogCacheTable_pg_operator,
+	YbCatalogCacheTable_pg_opfamily,
+	YbCatalogCacheTable_pg_partitioned_table,
+	YbCatalogCacheTable_pg_proc,
+	YbCatalogCacheTable_pg_publication,
+	YbCatalogCacheTable_pg_publication_rel,
+	YbCatalogCacheTable_pg_range,
+	YbCatalogCacheTable_pg_replication_origin,
+	YbCatalogCacheTable_pg_rewrite,
+	YbCatalogCacheTable_pg_sequence,
+	YbCatalogCacheTable_pg_statistic,
+	YbCatalogCacheTable_pg_statistic_ext,
+	YbCatalogCacheTable_pg_subscription,
+	YbCatalogCacheTable_pg_subscription_rel,
+	YbCatalogCacheTable_pg_tablespace,
+	YbCatalogCacheTable_pg_transform,
+	YbCatalogCacheTable_pg_ts_config,
+	YbCatalogCacheTable_pg_ts_config_map,
+	YbCatalogCacheTable_pg_ts_dict,
+	YbCatalogCacheTable_pg_ts_parser,
+	YbCatalogCacheTable_pg_ts_template,
+	YbCatalogCacheTable_pg_type,
+	YbCatalogCacheTable_pg_user_mapping,
+	YbCatalogCacheTable_pg_yb_tablegroup
+
+#define YbNumCatalogCacheTables (YbCatalogCacheTable_pg_yb_tablegroup + 1)
+} YbCatalogCacheTable;
+
 /* Used in IsYugaByteEnabled() mode only */
 extern void YbSetSysCacheTuple(Relation rel, HeapTuple tup);
 extern void YbPreloadCatalogCache(int cache_id, int idx_cache_id);
@@ -127,6 +180,9 @@ extern void YbPinObjectIfNeeded(Oid classId, Oid objectId, bool shared_dependenc
 extern bool YbCheckCatalogCacheIndexNameTable();
 #endif
 extern const char* YbGetCatalogCacheIndexName(int cache_id);
+extern const char *YbGetCatalogCacheTableNameFromTableId(int table_id);
+extern const char *YbGetCatalogCacheTableNameFromCacheId(int cache_id);
+extern int YbGetCatalogCacheTableIdFromCacheId(int cache_id);
 
 extern void InitCatalogCache(void);
 extern void InitCatalogCachePhase2(void);
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@`
`85`	`85`	`static CatCacheHeader *CacheHdr = NULL;`
`86`	`86`	`static long YbNumCatalogCacheMisses;`
`87`	`87`	`static long YbNumCatalogCacheIdMisses[SysCacheSize] = {0};`
	`88`	`+static long YbNumCatalogCacheTableMisses[YbNumCatalogCacheTables] = {0};`
`88`	`89`
`89`	`90`	`static inline HeapTuple SearchCatCacheInternal(CatCache *cache,`
`90`	`91`	`int nkeys,`
`@@ -1825,6 +1826,7 @@ SearchCatCacheMiss(CatCache *cache,`
`1825`	`1826`	`{`
`1826`	`1827`	`YbNumCatalogCacheMisses++;`
`1827`	`1828`	`YbNumCatalogCacheIdMisses[cache->id]++;`
	`1829`	`+ YbNumCatalogCacheTableMisses[YbGetCatalogCacheTableIdFromCacheId(cache->id)]++;`
`1828`	`1830`	`}`
`1829`	`1831`
`1830`	`1832`	`if (yb_debug_log_catcache_events)`
`@@ -2686,6 +2688,12 @@ YbGetCatCacheIdMisses()`
`2686`	`2688`	`return YbNumCatalogCacheIdMisses;`
`2687`	`2689`	`}`
`2688`	`2690`
	`2691`	`+long *`
	`2692`	`+YbGetCatCacheTableMisses()`
	`2693`	`+{`
	`2694`	`+ return YbNumCatalogCacheTableMisses;`
	`2695`	`+}`
	`2696`	`+`
`2689`	`2697`	`YbCatCListIterator`
`2690`	`2698`	`YbCatCListIteratorBegin(CatCList *list)`
`2691`	`2699`	`{`