From de241b77e84463b6ec5b876639d55cc72e870340 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Thu, 3 Jul 2025 10:12:12 -0400 Subject: [PATCH] pgindent --- contrib/pg_plan_advice/pgpa_collector.c | 50 ++++++++++++------------- src/tools/pgindent/typedefs.list | 2 + 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/contrib/pg_plan_advice/pgpa_collector.c b/contrib/pg_plan_advice/pgpa_collector.c index 59d37a67a6..9cad190337 100644 --- a/contrib/pg_plan_advice/pgpa_collector.c +++ b/contrib/pg_plan_advice/pgpa_collector.c @@ -34,7 +34,7 @@ typedef struct pgpa_collected_advice Oid userid; /* user OID */ Oid dbid; /* database OID */ uint64 queryid; /* query identifier */ - TimestampTz timestamp; /* query timestamp */ + TimestampTz timestamp; /* query timestamp */ int advice_offset; /* start of advice in textual data */ char textual_data[FLEXIBLE_ARRAY_MEMBER]; } pgpa_collected_advice; @@ -88,14 +88,14 @@ void pgpa_collect_advice(uint64 queryId, const char *query_string, const char *advice_string) { - Oid userid = GetUserId(); - Oid dbid = MyDatabaseId; - TimestampTz now = GetCurrentTimestamp(); + Oid userid = GetUserId(); + Oid dbid = MyDatabaseId; + TimestampTz now = GetCurrentTimestamp(); if (pg_plan_advice_local_collection_limit > 0) { pgpa_collected_advice *ca; - MemoryContext oldcontext; + MemoryContext oldcontext; oldcontext = MemoryContextSwitchTo(pg_plan_advice_get_mcxt()); ca = pgpa_make_collected_advice(userid, dbid, queryId, now, @@ -108,8 +108,8 @@ pgpa_collect_advice(uint64 queryId, const char *query_string, if (pg_plan_advice_shared_collection_limit > 0) { - dsa_area *area = pg_plan_advice_dsa_area(); - dsa_pointer ca_pointer; + dsa_area *area = pg_plan_advice_dsa_area(); + dsa_pointer ca_pointer; pgpa_make_collected_advice(userid, dbid, queryId, now, query_string, advice_string, area, @@ -135,9 +135,9 @@ pgpa_make_collected_advice(Oid userid, Oid dbid, uint64 queryId, const char *advice_string, dsa_area *area, dsa_pointer *result) { - size_t query_string_length = strlen(query_string) + 1; - size_t advice_string_length = strlen(advice_string) + 1; - size_t total_length; + size_t query_string_length = strlen(query_string) + 1; + size_t advice_string_length = strlen(advice_string) + 1; + size_t total_length; pgpa_collected_advice *ca; total_length = offsetof(pgpa_collected_advice, textual_data) @@ -173,8 +173,8 @@ pgpa_make_collected_advice(Oid userid, Oid dbid, uint64 queryId, static void pgpa_store_local_advice(pgpa_collected_advice *ca) { - uint64 chunk_number; - uint64 chunk_offset; + uint64 chunk_number; + uint64 chunk_offset; pgpa_local_advice *la = local_advice; /* If the local advice collector isn't initialized yet, do that now. */ @@ -194,7 +194,7 @@ pgpa_store_local_advice(pgpa_collected_advice *ca) /* Extend chunk array, if needed. */ if (chunk_number > la->chunk_array_allocated_size) { - int new_size; + int new_size; new_size = la->chunk_array_allocated_size + ADVICE_CHUNK_ARRAY_SIZE; la->chunks = repalloc0_array(la->chunks, @@ -221,11 +221,11 @@ static void pgpa_trim_local_advice(void) { pgpa_local_advice *la = local_advice; - uint64 current_count; - uint64 trim_count; - uint64 total_chunk_count; - uint64 trim_chunk_count; - uint64 remaining_chunk_count; + uint64 current_count; + uint64 trim_count; + uint64 total_chunk_count; + uint64 trim_chunk_count; + uint64 remaining_chunk_count; /* If we haven't yet reached the limit, there's nothing to do. */ current_count = la->next_id - la->oldest_id; @@ -236,8 +236,8 @@ pgpa_trim_local_advice(void) trim_count = current_count - pg_plan_advice_local_collection_limit; while (trim_count > 0) { - uint64 chunk_number; - uint64 chunk_offset; + uint64 chunk_number; + uint64 chunk_offset; chunk_number = (la->oldest_id - la->base_id) / ADVICE_CHUNK_SIZE; chunk_offset = (la->oldest_id - la->base_id) % ADVICE_CHUNK_SIZE; @@ -256,7 +256,7 @@ pgpa_trim_local_advice(void) /* Slide remaining chunk pointers back toward the base of the array. */ total_chunk_count = (la->next_id - la->base_id + - ADVICE_CHUNK_SIZE - 1) / ADVICE_CHUNK_SIZE; + ADVICE_CHUNK_SIZE - 1) / ADVICE_CHUNK_SIZE; remaining_chunk_count = total_chunk_count - trim_chunk_count; if (remaining_chunk_count > 0) memmove(&la->chunks[0], &la->chunks[trim_chunk_count], @@ -291,11 +291,11 @@ pg_get_collected_local_advice(PG_FUNCTION_ARGS) for (uint64 id = la->oldest_id; id < la->next_id; ++id) { - uint64 chunk_number; - uint64 chunk_offset; + uint64 chunk_number; + uint64 chunk_offset; pgpa_collected_advice *ca; - Datum values[PG_GET_ADVICE_COLUMNS]; - bool nulls[PG_GET_ADVICE_COLUMNS] = {0}; + Datum values[PG_GET_ADVICE_COLUMNS]; + bool nulls[PG_GET_ADVICE_COLUMNS] = {0}; chunk_number = (id - la->base_id) / ADVICE_CHUNK_SIZE; chunk_offset = (id - la->base_id) % ADVICE_CHUNK_SIZE; diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index e6baa239e0..3c8b206b2a 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -4322,3 +4322,5 @@ pgpa_plan_walker_context pgpa_gathered_join pgpa_output_context pgpa_collected_advice +pgpa_local_advice_chunk +pgpa_local_advice -- 2.39.5