- Fix typedef enum declarations to follow PostgreSQL convention

- Run pgindent to standardize code formatting

Author: rasifr

.github/workflows/pgindent-check.yml

@@ -29,14 +29,13 @@ jobs:
 
       - name: Clone and build pg_bsd_indent
         run: |
-          git clone https://git.postgresql.org/git/postgresql.git --depth 1 --branch master /tmp/postgresql
+          git clone https://git.postgresql.org/git/postgresql.git --depth 1 --branch REL_17_STABLE /tmp/postgresql
           cd /tmp/postgresql
           ./configure --prefix=/tmp/pg-build > /dev/null
           cd src/tools/pg_bsd_indent
           make > /dev/null
-          echo "$GITHUB_WORKSPACE/pg-install/bin" >> $GITHUB_PATH
-          echo "/tmp/postgresql/src/tools/pgindent" >> $GITHUB_PATH
-          echo "/tmp/postgresql/src/tools/pg_bsd_indent" >> $GITHUB_PATH
+          echo "/tmp/postgresql/src/tools/pgindent" >> "$GITHUB_PATH"
+          echo "/tmp/postgresql/src/tools/pg_bsd_indent" >> "$GITHUB_PATH"
 
       - name: Run pgindent and check formatting
         working-directory: utils/pgindent
@@ -47,7 +46,7 @@ jobs:
       - name: Check for formatting changes
         run: |
           if ! git diff --quiet; then
-            echo "::error::Code formatting issues detected. Please run gen-typedefs.sh locally."
+            echo "::error::Code formatting issues detected. Please run utils/pgindent/run-pgindent.sh locally."
             git diff
             exit 1
           fi

include/spock.h

@@ -52,7 +52,7 @@ extern int	restart_delay_default;
 extern int	restart_delay_on_exception;
 extern int	spock_replay_queue_size;	/* Deprecated - no longer used */
 extern bool check_all_uc_indexes;
-extern bool	spock_enable_quiet_mode;
+extern bool spock_enable_quiet_mode;
 
 extern char *shorten_hash(const char *str, int maxlen);
 extern void gen_slot_name(Name slot_name, char *dbname,

include/spock_conflict.h

@@ -30,7 +30,7 @@ typedef enum SpockConflictResolution
 	SpockResolution_Skip
 } SpockConflictResolution;
 
-typedef enum
+typedef enum SpockResolveOption
 {
 	SPOCK_RESOLVE_ERROR,
 	SPOCK_RESOLVE_APPLY_REMOTE,
@@ -48,7 +48,7 @@ extern bool spock_save_resolutions;
  * so use same ordering and similar naming.
  * We add one additional conflict type, CT_DELETE_LATE.
  */
-typedef enum
+typedef enum SpockConflictType
 {
 	/* The row to be inserted violates unique constraint */
 	SPOCK_CT_INSERT_EXISTS,
@@ -69,17 +69,13 @@ typedef enum
 	SPOCK_CT_DELETE_MISSING,
 
 	/*
-	 * Unique to Spock, delete timestamp is earlier than an existing row.
-	 * Use a higher number so we don't conflict with PostgreSQL in the future.
+	 * Unique to Spock, delete timestamp is earlier than an existing row. Use
+	 * a higher number so we don't conflict with PostgreSQL in the future.
 	 */
 	SPOCK_CT_DELETE_LATE = 101
 
 } SpockConflictType;
 
-extern int spock_conflict_resolver;
-extern int spock_conflict_log_level;
-extern bool	spock_save_resolutions;
-
 extern bool get_tuple_origin(SpockRelation *rel, HeapTuple local_tuple,
 							 ItemPointer tid, TransactionId *xmin,
 							 RepOriginId *local_origin, TimestampTz *local_ts);
@@ -122,4 +118,4 @@ extern bool spock_conflict_resolver_check_hook(int *newval, void **extra,
 extern void tuple_to_stringinfo(StringInfo s, TupleDesc tupdesc,
 								HeapTuple tuple);
 
-#endif /* SPOCK_CONFLICT_H */
+#endif							/* SPOCK_CONFLICT_H */

include/spock_group.h

@@ -66,7 +66,7 @@ typedef struct SpockGroupKey
 /*
  * Columns for the UI routine get_apply_group_progress.
  */
-typedef enum
+typedef enum GroupProgressTupDescColumns
 {
 	GP_DBOID = 0,
 	GP_NODE_ID,
@@ -115,35 +115,35 @@ typedef enum
  */
 typedef struct SpockApplyProgress
 {
-	SpockGroupKey	key;			/* MUST be first field */
+	SpockGroupKey key;			/* MUST be first field */
 
-	TimestampTz			remote_commit_ts;	/* committed remote txn ts */
+	TimestampTz remote_commit_ts;	/* committed remote txn ts */
 
 	/*
 	 * Bit of duplication of remote_commit_ts. Serves the same purpose, except
 	 * keep the last updated value
 	 */
-	TimestampTz			prev_remote_ts;
-	XLogRecPtr			remote_commit_lsn;	/* LSN of remote commit on origin */
-	XLogRecPtr			remote_insert_lsn;	/* origin insert/end LSN reported */
+	TimestampTz prev_remote_ts;
+	XLogRecPtr	remote_commit_lsn;	/* LSN of remote commit on origin */
+	XLogRecPtr	remote_insert_lsn;	/* origin insert/end LSN reported */
 
 	/*
 	 * The largest received LSN by the group. It is more or equal to the
 	 * remote_commit_lsn.
 	 */
-	XLogRecPtr			received_lsn;
+	XLogRecPtr	received_lsn;
 
-	TimestampTz			last_updated_ts;	/* when we set this */
-	bool				updated_by_decode;	/* set by decode or apply. OBSOLETE. Used
+	TimestampTz last_updated_ts;	/* when we set this */
+	bool		updated_by_decode;	/* set by decode or apply. OBSOLETE. Used
 									 * in versions <=5.x.x only */
 } SpockApplyProgress;
 
 /* Hash entry: one per group (stable pointer; not moved by dynahash) */
 typedef struct SpockGroupEntry
 {
-	SpockApplyProgress	progress;
-	pg_atomic_uint32	nattached;
-	ConditionVariable	prev_processed_cv;
+	SpockApplyProgress progress;
+	pg_atomic_uint32 nattached;
+	ConditionVariable prev_processed_cv;
 } SpockGroupEntry;
 
 /* shmem setup */

include/spock_jsonb_utils.h

@@ -20,7 +20,7 @@ typedef enum					/* type categories for datum_to_jsonb */
 	JSONBTYPE_COMPOSITE,		/* composite */
 	JSONBTYPE_JSONCAST,			/* something with an explicit cast to JSON */
 	JSONBTYPE_OTHER				/* all else */
-} JsonbTypeCategory;
+}			JsonbTypeCategory;
 
 typedef struct JsonbInState
 {

include/spock_output_plugin.h

@@ -100,7 +100,7 @@ extern bool spock_replication_repair_mode;
 #define SPOCK_SYNC_EVENT_MSG		3	/* Sync event message */
 #define SPOCK_SLOT_GROUPS_TRANCHE_NAME   "spock_slot_groups"
 
-extern int spock_output_delay;
+extern int	spock_output_delay;
 
 /*
  * Custom WAL messages

include/spock_proto_native.h

@@ -80,4 +80,3 @@ extern void spock_apply_set_proto_version(uint32 version);
 extern uint32 spock_apply_get_proto_version(void);
 
 #endif							/* SPOCK_PROTO_NATIVE_H */
-

include/spock_relcache.h

@@ -69,7 +69,7 @@ extern void spock_relation_cache_reset(void);
 
 extern Oid	spock_lookup_delta_function(char *fname, Oid typeoid);
 
-extern Oid get_replication_identity(Relation rel);
+extern Oid	get_replication_identity(Relation rel);
 
 struct SpockTupleData;
 

include/spock_worker.h

@@ -19,7 +19,7 @@
 #include "spock_output_plugin.h"	/* for SpockOutputSlotGroup */
 #include "spock_proto_native.h"
 
-typedef enum
+typedef enum SpockWorkerType
 {
 	SPOCK_WORKER_NONE,			/* Unused slot. */
 	SPOCK_WORKER_MANAGER,		/* Manager. */
@@ -28,7 +28,7 @@ typedef enum
 								 * table. */
 } SpockWorkerType;
 
-typedef enum
+typedef enum SpockWorkerStatus
 {
 	SPOCK_WORKER_STATUS_NONE,	/* Unused slot. */
 	SPOCK_WORKER_STATUS_IDLE,	/* Idle. */

src/compat/18/spock_compat.c

@@ -129,7 +129,7 @@ check_simple_rowfilter_expr_walker(Node *node, ParseState *pstate)
 								  pstate);
 }
 
- /*
+/*
  * Check if the row filter expression is a "simple expression".
  *
  * See check_simple_rowfilter_expr_walker for details.