8000 Fix "pg_bench -C -M prepared". · prmdeveloper/postgres@c02aae4 · GitHub
[go: up one dir, main page]

Skip to content

Commit c02aae4

Browse files
committed
Fix "pg_bench -C -M prepared".
This didn't work because when we dropped and re-established a database connection, we did not bother to reset session-specific state such as the statements-are-prepared flags. The st->prepared[] array certainly needs to be flushed, and I cleared a couple of other fields as well that couldn't possibly retain meaningful state for a new connection. In passing, fix some bogus comments and strange field order choices. Per report from Robins Tharakan.
1 parent cfc5357 commit c02aae4

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

contrib/pgbench/pgbench.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ typedef struct
201201
int state; /* state No. */
202202
int cnt; /* xacts count */
203203
int ecnt; /* error count */
204-
int listen; /* 0 indicates that an async query has been
204+
int listen; /* 1 indicates that an async query has been
205205
* sent */
206206
int sleeping; /* 1 indicates that the client is napping */
207207
int64 until; /* napping until (usec) */
@@ -1115,6 +1115,11 @@ doCustom(TState *thread, CState *st, instr_time *conn_time, FILE *logfile, AggVa
11151115
}
11161116
INSTR_TIME_SET_CURRENT(end);
11171117
INSTR_TIME_ACCUM_DIFF(*conn_time, end, start);
1118+
1119+
/* Reset session-local state */
1120+
st->listen = 0;
1121+
st->sleeping = 0;
1122+
memset(st->prepared, 0, sizeof(st->prepared));
11181123
}
11191124

11201125
/* Record transaction start time if logging is enabled */

0 commit comments

Comments
 (0)
0