Skip to content

Commit 484600c

Browse files
author
Ekaterina Sokolova
committed
[6693] Refactoring source code of pg_query_state.
Tags: pg_query_state.
1 parent 6fa1219 commit 484600c

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

pg_query_state.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ static List *GetRemoteBackendQueryStates(PGPROC *leader,
101101
ExplainFormat format);
102102

103103
/* Shared memory variables */
104-
shm_toc *toc = NULL;
104+
shm_toc *toc = NULL;
105105
RemoteUserIdResult *counterpart_userid = NULL;
106-
pg_qs_params *params = NULL;
107-
shm_mq *mq = NULL;
106+
pg_qs_params *params = NULL;
107+
shm_mq *mq = NULL;
108108

109109
/*
110110
* Estimate amount of shared memory needed.
@@ -208,7 +208,7 @@ _PG_init(void)
208208
|| UserIdPollReason == INVALID_PROCSIGNAL)
209209
{
210210
ereport(WARNING, (errcode(ERRCODE_INSUFFICIENT_RESOURCES),
211-
errmsg("pg_query_state isn't loaded: insufficient custom ProcSignal slots")));
211+
errmsg("pg_query_state isn't loaded: insufficient custom ProcSignal slots")));
212212
return;
213213
}
214214

@@ -435,7 +435,7 @@ deserialize_stack(char *src, int stack_depth)
435435
{
436436
List *result = NIL;
437437
char *curr_ptr = src;
438-
int i;
438+
int i;
439439

440440
for (i = 0; i < stack_depth; i++)
441441
{
@@ -599,10 +599,10 @@ pg_query_state(PG_FUNCTION_ARGS)
599599
/* print warnings if exist */
600600
if (msg->warnings & TIMINIG_OFF_WARNING)
601601
ereport(WARNING, (errcode(ERRCODE_WARNING),
602-
errmsg("timing statistics disabled")));
602+
errmsg("timing statistics disabled")));
603603
if (msg->warnings & BUFFERS_OFF_WARNING)
604604
ereport(WARNING, (errcode(ERRCODE_WARNING),
605-
errmsg("buffers statistics disabled")));
605+
errmsg("buffers statistics disabled")));
606606

607607
oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
608608

@@ -864,7 +864,7 @@ SendBgWorkerPids(void)
864864
int i;
865865
shm_mq_handle *mqh;
866866
LOCKTAG tag;
867-
shm_mq_result result;
867+
shm_mq_result result;
868868

869869
LockShmem(&tag, PG_QS_SND_KEY);
870870

@@ -959,10 +959,10 @@ GetRemoteBackendWorkers(PGPROC *proc)
959959

960960
signal_error:
961961
ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR),
962-
errmsg("invalid send signal")));
962+
errmsg("invalid send signal")));
963963
mq_error:
964964
ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR),
965-
errmsg("error in message queue data transmitting")));
965+
errmsg("error in message queue data transmitting")));
966966

967967
return NIL;
968968
}
@@ -980,12 +980,12 @@ static shm_mq_result
980980
receive_msg_by_parts(shm_mq_handle *mqh, Size *total, void **datap,
981981
int64 timeout, int *rc, bool nowait)
982982
{
983-
shm_mq_result mq_receive_result;
984-
shm_mq_msg *buff;
985-
int offset;
986-
Size *expected;
987-
Size expected_data;
988-
Size len;
983+
shm_mq_result mq_receive_result;
984+
shm_mq_msg *buff;
985+
int offset;
986+
Size *expected;
987+
Size expected_data;
988+
Size len;
989989

990990
/* Get the expected number of bytes in message */
991991
mq_receive_result = shm_mq_receive(mqh, &len, (void **) &expected, nowait);
@@ -1113,7 +1113,7 @@ GetRemoteBackendQueryStates(PGPROC *leader,
11131113
mqh = shm_mq_attach(mq, NULL, NULL);
11141114
elog(DEBUG1, "Wait response from leader %d", leader->pid);
11151115
mq_receive_result = receive_msg_by_parts(mqh, &len, (void **) &msg,
1116-
0, NULL, false);
1116+
0, NULL, false);
11171117
if (mq_receive_result != SHM_MQ_SUCCESS)
11181118
goto mq_error;
11191119
if (msg->reqid != reqid)
@@ -1132,7 +1132,7 @@ GetRemoteBackendQueryStates(PGPROC *leader,
11321132
*/
11331133
foreach(iter, alive_procs)
11341134
{
1135-
PGPROC *proc = (PGPROC *) lfirst(iter);
1135+
PGPROC *proc = (PGPROC *) lfirst(iter);
11361136

11371137
/* prepare message queue to transfer data */
11381138
elog(DEBUG1, "Wait response from worker %d", proc->pid);
@@ -1172,15 +1172,15 @@ GetRemoteBackendQueryStates(PGPROC *leader,
11721172

11731173
signal_error:
11741174
ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR),
1175-
errmsg("invalid send signal")));
1175+
errmsg("invalid send signal")));
11761176
mq_error:
11771177
#if PG_VERSION_NUM < 100000
11781178
shm_mq_detach(mq);
11791179
#else
11801180
shm_mq_detach(mqh);
11811181
#endif
11821182
ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR),
1183-
errmsg("error in message queue data transmitting")));
1183+
errmsg("error in message queue data transmitting")));
11841184

11851185
return NIL;
11861186
}

signal_handler.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,12 @@ send_msg_by_parts(shm_mq_handle *mqh, Size nbytes, const void *data)
224224
void
225225
SendQueryState(void)
226226
{
227-
shm_mq_handle *mqh;
228-
instr_time start_time;
229-
instr_time cur_time;
230-
int64 delay = MAX_SND_TIMEOUT;
231-
int reqid = params->reqid;
232-
LOCKTAG tag;
227+
shm_mq_handle *mqh;
228+
instr_time start_time;
229+
instr_time cur_time;
230+
int64 delay = MAX_SND_TIMEOUT;
231+
int reqid = params->reqid;
232+
LOCKTAG tag;
233233

234234
INSTR_TIME_SET_CURRENT(start_time);
235235

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy