Fix extract_typedefs.sh to capture typedef aliases like CachedExtensionIds

sfc-gh-npuka · sfc-gh-npuka · commit 8d12962bc922 · 2026-04-21T21:41:55.000+02:00
The previous grep -v 'struct' filter discarded lines like
"typedef struct CachedExtensionIdsData CachedExtensionIds;" before the
alias pattern could extract CachedExtensionIds. Reformat affected files.

Signed-off-by: sfc-gh-npuka &lt;naisila.puka@snowflake.com&gt;
diff --git a/pg_extension_base/include/pg_extension_base/extension_ids.h b/pg_extension_base/include/pg_extension_base/extension_ids.h
@@ -56,11 +56,11 @@ typedef void (*ClearFunction) (void *clearContext);
 struct CachedExtensionIdsData;
 typedef struct CachedExtensionIdsData CachedExtensionIds;
 
-extern PGDLLEXPORT CachedExtensionIds * CreateExtensionIdsCache(char *extensionName,
-																ClearFunction clearFn,
-																void *clearContext);
-extern PGDLLEXPORT bool IsExtensionCreated(CachedExtensionIds * extension);
-extern PGDLLEXPORT Oid ExtensionId(CachedExtensionIds * extension);
-extern PGDLLEXPORT Oid ExtensionSchemaId(CachedExtensionIds * extension);
-extern PGDLLEXPORT Oid ExtensionOwnerId(CachedExtensionIds * extension);
-extern PGDLLEXPORT void EnsureExtensionExists(CachedExtensionIds * extension);
+extern PGDLLEXPORT CachedExtensionIds *CreateExtensionIdsCache(char *extensionName,
+															   ClearFunction clearFn,
+															   void *clearContext);
+extern PGDLLEXPORT bool IsExtensionCreated(CachedExtensionIds *extension);
+extern PGDLLEXPORT Oid ExtensionId(CachedExtensionIds *extension);
+extern PGDLLEXPORT Oid ExtensionSchemaId(CachedExtensionIds *extension);
+extern PGDLLEXPORT Oid ExtensionOwnerId(CachedExtensionIds *extension);
+extern PGDLLEXPORT void EnsureExtensionExists(CachedExtensionIds *extension);
diff --git a/pg_extension_base/include/pg_extension_base/pg_extension_base_ids.h b/pg_extension_base/include/pg_extension_base/pg_extension_base_ids.h
@@ -22,6 +22,6 @@
 #define PG_EXTENSION_BASE_NAME "pg_extension_base"
 
 /* cached extension IDs for pg_extension_base */
-extern PGDLLEXPORT CachedExtensionIds * PgExtensionBase;
+extern PGDLLEXPORT CachedExtensionIds *PgExtensionBase;
 
 extern PGDLLEXPORT void InitializePgExtensionBaseCache(void);
diff --git a/pg_extension_base/src/extension_ids.c b/pg_extension_base/src/extension_ids.c
@@ -208,7 +208,7 @@ InvalidateExtensionIdCache(Datum argument, Oid relationId)
  * IsExtensionCreated returns whether exists.
  */
 bool
-IsExtensionCreated(CachedExtensionIds * extension)
+IsExtensionCreated(CachedExtensionIds *extension)
 {
 	if (extension->existsStatus == EXTENSION_STATUS_EXISTS)
 		return true;
@@ -235,7 +235,7 @@ IsExtensionCreated(CachedExtensionIds * extension)
  * ExtensionId returns the OID of the extension.
  */
 Oid
-ExtensionId(CachedExtensionIds * extension)
+ExtensionId(CachedExtensionIds *extension)
 {
 	if (extension->extensionId == InvalidOid)
 	{
@@ -250,7 +250,7 @@ ExtensionId(CachedExtensionIds * extension)
  * ExtensionSchemaId returns the OID of the extension schema.
  */
 Oid
-ExtensionSchemaId(CachedExtensionIds * extension)
+ExtensionSchemaId(CachedExtensionIds *extension)
 {
 	if (extension->schemaId == InvalidOid)
 		extension->schemaId = get_extension_schema(ExtensionId(extension));
@@ -263,7 +263,7 @@ ExtensionSchemaId(CachedExtensionIds * extension)
  * ExtensionOwnerId returns the OID of the extension owner.
  */
 Oid
-ExtensionOwnerId(CachedExtensionIds * extension)
+ExtensionOwnerId(CachedExtensionIds *extension)
 {
 	if (extension->ownerId == InvalidOid)
 	{
@@ -300,7 +300,7 @@ ExtensionOwnerId(CachedExtensionIds * extension)
  * in the current database.
  */
 void
-EnsureExtensionExists(CachedExtensionIds * extension)
+EnsureExtensionExists(CachedExtensionIds *extension)
 {
 	if (IsExtensionCreated(extension))
 		return;
diff --git a/pg_lake_engine/include/pg_lake/extensions/btree_gist.h b/pg_lake_engine/include/pg_lake/extensions/btree_gist.h
@@ -22,6 +22,6 @@
 #define BTREE_GIST "btree_gist"
 
 /* cached extension IDs for btree_gist */
-extern PGDLLEXPORT CachedExtensionIds * BtreeGist;
+extern PGDLLEXPORT CachedExtensionIds *BtreeGist;
 
 void		InitializeBtreeGistIdCache(void);
diff --git a/pg_lake_engine/include/pg_lake/extensions/pg_lake.h b/pg_lake_engine/include/pg_lake/extensions/pg_lake.h
@@ -22,6 +22,6 @@
 #define PG_LAKE "pg_lake"
 
 /* cached extension IDs for pg_lake */
-extern PGDLLEXPORT CachedExtensionIds * PgLake;
+extern PGDLLEXPORT CachedExtensionIds *PgLake;
 
 void		InitializePgLakeIdCache(void);
diff --git a/pg_lake_engine/include/pg_lake/extensions/pg_lake_benchmark.h b/pg_lake_engine/include/pg_lake/extensions/pg_lake_benchmark.h
@@ -22,6 +22,6 @@
 #define PG_LAKE_BENCHMARK "pg_lake_benchmark"
 
 /* cached extension IDs for pg_lake_benchmark */
-extern PGDLLEXPORT CachedExtensionIds * PgLakeBenchmark;
+extern PGDLLEXPORT CachedExtensionIds *PgLakeBenchmark;
 
 void		InitializePgLakeBenchmarkIdCache(void);
diff --git a/pg_lake_engine/include/pg_lake/extensions/pg_lake_copy.h b/pg_lake_engine/include/pg_lake/extensions/pg_lake_copy.h
@@ -22,6 +22,6 @@
 #define PG_LAKE_COPY "pg_lake_copy"
 
 /* cached extension IDs for pg_lake_copy */
-extern PGDLLEXPORT CachedExtensionIds * PgLakeCopy;
+extern PGDLLEXPORT CachedExtensionIds *PgLakeCopy;
 
 void		InitializePgLakeCopyIdCache(void);
diff --git a/pg_lake_engine/include/pg_lake/extensions/pg_lake_engine.h b/pg_lake_engine/include/pg_lake/extensions/pg_lake_engine.h
@@ -30,7 +30,7 @@ extern PGDLLEXPORT bool EnableHeavyAsserts;
 extern PGDLLEXPORT char *PgLakeStageLocation;
 
 /* cached extension IDs for pg_lake_engine */
-extern PGDLLEXPORT CachedExtensionIds * PgLakeEngine;
+extern PGDLLEXPORT CachedExtensionIds *PgLakeEngine;
 
 void		InitializePgLakeEngineIdCache(void);
 
diff --git a/pg_lake_engine/include/pg_lake/extensions/pg_lake_iceberg.h b/pg_lake_engine/include/pg_lake/extensions/pg_lake_iceberg.h
@@ -24,7 +24,7 @@
 #define ICEBERG_INTERNAL_CATALOG_TABLE_NAME "tables_internal"
 
 /* cached extension IDs for pg_lake_iceberg */
-extern PGDLLEXPORT CachedExtensionIds * PgLakeIceberg;
+extern PGDLLEXPORT CachedExtensionIds *PgLakeIceberg;
 
 extern PGDLLEXPORT void InitializePgLakeIcebergIdCache(void);
 extern PGDLLEXPORT Oid IcebergTablesInternalTableId(void);
diff --git a/pg_lake_engine/include/pg_lake/extensions/pg_lake_replication.h b/pg_lake_engine/include/pg_lake/extensions/pg_lake_replication.h
@@ -22,6 +22,6 @@
 #define PG_LAKE_REPLICATION "pg_lake_replication"
 
 /* cached extension IDs for pg_lake_replication */
-extern PGDLLEXPORT CachedExtensionIds * PgLakeReplication;
+extern PGDLLEXPORT CachedExtensionIds *PgLakeReplication;
 
 void		InitializePgLakeReplicationIdCache(void);
diff --git a/pg_lake_engine/include/pg_lake/extensions/pg_lake_spatial.h b/pg_lake_engine/include/pg_lake/extensions/pg_lake_spatial.h
@@ -19,7 +19,7 @@
 
 #include "pg_extension_base/extension_ids.h"
 
-extern PGDLLEXPORT CachedExtensionIds * PgLakeSpatial;
+extern PGDLLEXPORT CachedExtensionIds *PgLakeSpatial;
 
 void		InitializePgLakeSpatialIdCache(void);
 
diff --git a/pg_lake_engine/include/pg_lake/extensions/pg_lake_table.h b/pg_lake_engine/include/pg_lake/extensions/pg_lake_table.h
@@ -28,7 +28,7 @@
 #define PG_LAKE_TABLE_DATA_FILE_PARTITION_VALUES_TABLE_NAME "data_file_partition_values"
 #define REPLICATION_WRITES_SCHEMA "__pg_lake_table_writes"
 
-extern PGDLLEXPORT CachedExtensionIds * PgLakeTable;
+extern PGDLLEXPORT CachedExtensionIds *PgLakeTable;
 
 extern PGDLLEXPORT void InitializePgLakeTableIdCache(void);
 
diff --git a/pg_lake_engine/include/pg_lake/extensions/pg_map.h b/pg_lake_engine/include/pg_lake/extensions/pg_map.h
@@ -22,7 +22,7 @@
 #define MAP_TYPES_SCHEMA "map_type"
 
 /* cached extension IDs for pg_map */
-extern PGDLLEXPORT CachedExtensionIds * PgMap;
+extern PGDLLEXPORT CachedExtensionIds *PgMap;
 
 void		InitializePgMapIdCache(void);
 Oid			PgMapSchemaId(void);
diff --git a/pg_lake_engine/include/pg_lake/extensions/pg_parquet.h b/pg_lake_engine/include/pg_lake/extensions/pg_parquet.h
@@ -22,6 +22,6 @@
 #define PG_PARQUET "pg_parquet"
 
 /* cached extension IDs for pg_parquet */
-extern PGDLLEXPORT CachedExtensionIds * PgParquet;
+extern PGDLLEXPORT CachedExtensionIds *PgParquet;
 
 void		InitializePgParquetIdCache(void);
diff --git a/pg_lake_engine/include/pg_lake/extensions/postgis.h b/pg_lake_engine/include/pg_lake/extensions/postgis.h
@@ -34,7 +34,7 @@
 #define GEOMETRY_GET_TYPE(typmod) ((typmod & 0x000000FC)>>2)
 #define GEOMETRY_GET_SRID(typmod) ((((typmod) & 0x0FFFFF00) - ((typmod) & 0x10000000)) >> 8)
 
-extern PGDLLEXPORT CachedExtensionIds * Postgis;
+extern PGDLLEXPORT CachedExtensionIds *Postgis;
 
 void		InitializePostgisIdCache(void);
 
diff --git a/tools/extract_typedefs.sh b/tools/extract_typedefs.sh
@@ -1,11 +1,9 @@
 #!/bin/bash
 #
 # Extracts typedef names from C source files in the given directories.
-# Handles named structs/enums/unions, anonymous structs/enums/unions,
-# function pointers, and simple type aliases.
+# Output: sorted unique type names, one per line (pgindent typedefs format)
 #
 # Usage: tools/extract_typedefs.sh dir1 dir2 ...
-# Output: sorted unique type names, one per line (pgindent typedefs format)
 
 set -euo pipefail
 
@@ -14,26 +12,23 @@ if [ $# -eq 0 ]; then
 	exit 1
 fi
 
-FILES=$(find "$@" \( -name '*.c' -o -name '*.h' \) \
+# Single grep pass: collect all typedef and closing-brace lines
+LINES=$(find "$@" \( -name '*.c' -o -name '*.h' \) \
 	-not -path '*/duckdb/*' \
-	-not -path '*/avro/*')
+	-not -path '*/avro/*' \
+	-print0 | \
+	xargs -0 grep -hE '^(typedef|})')
 
 {
-	# Named structs/enums/unions: typedef struct FooBar
-	echo "$FILES" | xargs grep -h '^typedef' | \
-		sed -En 's/^typedef[[:space:]]+(struct|enum|union)[[:space:]]+([A-Za-z_][A-Za-z0-9_]*).*/\2/p'
+	# typedef struct/enum/union Name ...
+	echo "$LINES" | sed -En 's/^typedef[[:space:]]+(struct|enum|union)[[:space:]]+([A-Za-z_][A-Za-z0-9_]*).*/\2/p'
 
-	# Anonymous structs/enums/unions: } FooBar;
-	echo "$FILES" | xargs grep -h '^}' | \
-		sed -En 's/^\}[[:space:]]+([A-Za-z_][A-Za-z0-9_]*)[[:space:]]*;.*/\1/p'
+	# } Name; (anonymous struct/enum/union)
+	echo "$LINES" | sed -En 's/^\}[[:space:]]+([A-Za-z_][A-Za-z0-9_]*)[[:space:]]*;.*/\1/p'
 
-	# Function pointers: typedef ... (*FuncName)(...)
-	echo "$FILES" | xargs grep -h '^typedef' | \
-		sed -En 's/^typedef[[:space:]].*\(\*[[:space:]]*([A-Za-z_][A-Za-z0-9_]*)[[:space:]]*\).*/\1/p'
+	# typedef ... (*Name)(...) (function pointers)
+	echo "$LINES" | sed -En 's/^typedef.*\(\*[[:space:]]*([A-Za-z_][A-Za-z0-9_]*)[[:space:]]*\).*/\1/p'
 
-	# Simple type aliases: typedef ExistingType NewName;
-	# Excludes struct/enum/union and function pointers already handled above
-	echo "$FILES" | xargs grep -h '^typedef' | \
-		grep -v 'struct\|enum\|union' | grep -v '(\*' | \
-		sed -En 's/^typedef[[:space:]]+.+[[:space:]]+([A-Za-z_][A-Za-z0-9_]*)[[:space:]]*;.*/\1/p'
+	# typedef ... Name; (simple aliases, also catches typedef struct X Y;)
+	echo "$LINES" | sed -En 's/^typedef.*[[:space:]]([A-Za-z_][A-Za-z0-9_]*)[[:space:]]*;[[:space:]]*$/\1/p'
 } | sort -u
