Skip to content

Commit c8cd510

Browse files
committed
pgindent run
1 parent acc92b1 commit c8cd510

25 files changed

+207
-174
lines changed

.github/workflows/pgindent-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Check for formatting changes
4848
run: |
4949
if ! git diff --quiet; then
50-
echo "::error::Code formatting issues detected. Please run gen-typedefs.sh locally."
50+
echo "::error::Code formatting issues detected. Please run run-pgindent.sh locally."
5151
git diff
5252
exit 1
5353
fi

include/spock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ extern int restart_delay_default;
5252
extern int restart_delay_on_exception;
5353
extern int spock_replay_queue_size; /* Deprecated - no longer used */
5454
extern bool check_all_uc_indexes;
55-
extern bool spock_enable_quiet_mode;
55+
extern bool spock_enable_quiet_mode;
5656

5757
extern char *shorten_hash(const char *str, int maxlen);
5858

include/spock_conflict.h

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ typedef enum
3737
SPOCK_RESOLVE_KEEP_LOCAL,
3838
SPOCK_RESOLVE_LAST_UPDATE_WINS,
3939
SPOCK_RESOLVE_FIRST_UPDATE_WINS
40-
} SpockResolveOption;
40+
} SpockResolveOption;
4141

4242
extern int spock_conflict_resolver;
4343
extern int spock_conflict_log_level;
@@ -53,35 +53,35 @@ extern bool spock_save_resolutions;
5353
*/
5454
typedef enum
5555
{
56-
/* The row to be inserted violates unique constraint */
57-
CT_INSERT_EXISTS,
56+
/* The row to be inserted violates unique constraint */
57+
CT_INSERT_EXISTS,
5858

59-
/* The row to be updated was modified by a different origin */
60-
CT_UPDATE_ORIGIN_DIFFERS,
59+
/* The row to be updated was modified by a different origin */
60+
CT_UPDATE_ORIGIN_DIFFERS,
6161

62-
/* The updated row value violates unique constraint */
63-
CT_UPDATE_EXISTS,
62+
/* The updated row value violates unique constraint */
63+
CT_UPDATE_EXISTS,
6464

65-
/* The row to be updated is missing */
66-
CT_UPDATE_MISSING,
65+
/* The row to be updated is missing */
66+
CT_UPDATE_MISSING,
6767

68-
/* The row to be deleted was modified by a different origin */
69-
CT_DELETE_ORIGIN_DIFFERS,
68+
/* The row to be deleted was modified by a different origin */
69+
CT_DELETE_ORIGIN_DIFFERS,
7070

71-
/* The row to be deleted is missing */
72-
CT_DELETE_MISSING
71+
/* The row to be deleted is missing */
72+
CT_DELETE_MISSING
7373

74-
/*
75-
* Other conflicts, such as exclusion constraint violations, involve more
76-
* complex rules than simple equality checks. These conflicts are left for
77-
* future improvements.
78-
*/
74+
/*
75+
* Other conflicts, such as exclusion constraint violations, involve more
76+
* complex rules than simple equality checks. These conflicts are left for
77+
* future improvements.
78+
*/
7979
} ConflictType;
8080
#endif
8181

82-
extern int spock_conflict_resolver;
83-
extern int spock_conflict_log_level;
84-
extern bool spock_save_resolutions;
82+
extern int spock_conflict_resolver;
83+
extern int spock_conflict_log_level;
84+
extern bool spock_save_resolutions;
8585

8686
extern bool get_tuple_origin(SpockRelation *rel, HeapTuple local_tuple,
8787
ItemPointer tid, TransactionId *xmin,
@@ -125,4 +125,4 @@ extern bool spock_conflict_resolver_check_hook(int *newval, void **extra,
125125
extern void tuple_to_stringinfo(StringInfo s, TupleDesc tupdesc,
126126
HeapTuple tuple);
127127

128-
#endif /* SPOCK_CONFLICT_H */
128+
#endif /* SPOCK_CONFLICT_H */

include/spock_group.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ typedef enum
8181

8282
/* The last value */
8383
_GP_LAST_
84-
} GroupProgressTupDescColumns;
84+
} GroupProgressTupDescColumns;
8585

8686
/*
8787
* Logical Replication Progress has made by a group of apply workers.

include/spock_jsonb_utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ typedef enum /* type categories for datum_to_jsonb */
2020
JSONBTYPE_COMPOSITE, /* composite */
2121
JSONBTYPE_JSONCAST, /* something with an explicit cast to JSON */
2222
JSONBTYPE_OTHER /* all else */
23-
} JsonbTypeCategory;
23+
} JsonbTypeCategory;
2424

2525
typedef struct JsonbInState
2626
{

include/spock_proto_native.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,3 @@ extern void spock_apply_set_proto_version(uint32 version);
7676
extern uint32 spock_apply_get_proto_version(void);
7777

7878
#endif /* SPOCK_PROTO_NATIVE_H */
79-

include/spock_relcache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ extern void spock_relation_cache_reset(void);
6969

7070
extern Oid spock_lookup_delta_function(char *fname, Oid typeoid);
7171

72-
extern Oid get_replication_identity(Relation rel);
72+
extern Oid get_replication_identity(Relation rel);
7373

7474
struct SpockTupleData;
7575

include/spock_worker.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ typedef enum
2626
SPOCK_WORKER_APPLY, /* Apply. */
2727
SPOCK_WORKER_SYNC /* Special type of Apply that synchronizes one
2828
* table. */
29-
} SpockWorkerType;
29+
} SpockWorkerType;
3030

3131
typedef enum
3232
{
@@ -36,7 +36,7 @@ typedef enum
3636
SPOCK_WORKER_STATUS_STOPPING, /* Stopping. */
3737
SPOCK_WORKER_STATUS_STOPPED, /* Stopped. */
3838
SPOCK_WORKER_STATUS_FAILED, /* Failed. */
39-
} SpockWorkerStatus;
39+
} SpockWorkerStatus;
4040

4141
typedef struct SpockApplyWorker
4242
{

src/compat/18/spock_compat.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ check_simple_rowfilter_expr_walker(Node *node, ParseState *pstate)
130130
}
131131

132132
/*
133-
* Check if the row filter expression is a "simple expression".
134-
*
135-
* See check_simple_rowfilter_expr_walker for details.
136-
*/
133+
* Check if the row filter expression is a "simple expression".
134+
*
135+
* See check_simple_rowfilter_expr_walker for details.
136+
*/
137137
bool
138138
check_simple_rowfilter_expr(Node *node, ParseState *pstate)
139139
{

src/spock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ log_message_filter(ErrorData *edata)
910910
static void
911911
spock_object_relabel(const ObjectAddress *object, const char *seclabel)
912912
{
913-
Oid extoid;
913+
Oid extoid;
914914

915915
extoid = get_extension_oid(EXTENSION_NAME, true);
916916
if (!OidIsValid(extoid))

0 commit comments

Comments
 (0)