Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita386942

Browse files
committed
Add "G" (server-side data generation) as an initialization step in pgbench.
This commit allows --init-steps option in pgbench to accept "G" charactermeaning server-side data generation as an initialization step.With "G", only limited queries are sent from pgbench client andthen data is actually generated in the server. This might makethe initialization phase faster if the bandwidth between pgbench clientand the server is low.Author: Fabien CoelhoReviewed-by: Anna Endo, Ibrar Ahmed, Fujii MasaoDiscussion:https://postgr.es/m/alpine.DEB.2.21.1904061826420.3678@lancre
1 parent4b5e58b commita386942

File tree

4 files changed

+108
-26
lines changed

4 files changed

+108
-26
lines changed

‎doc/src/sgml/ref/pgbench.sgml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,34 @@ pgbench <optional> <replaceable>options</replaceable> </optional> <replaceable>d
193193
</listitem>
194194
</varlistentry>
195195
<varlistentry>
196-
<term><literal>g</literal> (Generate data)</term>
196+
<term><literal>g</literal>or <literal>G</literal>(Generate data, client-side or server-side)</term>
197197
<listitem>
198198
<para>
199199
Generate data and load it into the standard tables,
200200
replacing any data already present.
201201
</para>
202+
<para>
203+
With <literal>g</literal> (client-side data generation),
204+
data is generated in <command>pgbench</command> client and then
205+
sent to the server. This uses the client/server bandwidth
206+
extensively through a <command>COPY</command>.
207+
Using <literal>g</literal> causes logging to print one message
208+
every 100,000 rows when generating data into
209+
<structname>pgbench_accounts</structname> table.
210+
</para>
211+
<para>
212+
With <literal>G</literal> (server-side data generation),
213+
only limited queries are sent from <command>pgbench</command>
214+
client and then data is actually generated in the server.
215+
No significant bandwidth is required for this variant, but
216+
the server will do more work.
217+
Using <literal>G</literal> causes logging not to print any progress
218+
message when generating data into
219+
<structname>pgbench_accounts</structname> table.
220+
</para>
221+
<para>
222+
223+
</para>
202224
</listitem>
203225
</varlistentry>
204226
<varlistentry>
@@ -262,9 +284,13 @@ pgbench <optional> <replaceable>options</replaceable> </optional> <replaceable>d
262284
<listitem>
263285
<para>
264286
Switch logging to quiet mode, producing only one progress message per 5
265-
seconds. The default logging prints one message each100000 rows, which
287+
seconds. The default logging prints one message each100,000 rows, which
266288
often outputs many lines per second (especially on good hardware).
267289
</para>
290+
<para>
291+
This setting has no effect if <literal>G</literal> is specified
292+
in <option>-I</option>.
293+
</para>
268294
</listitem>
269295
</varlistentry>
270296

‎src/bin/pgbench/pgbench.c

Lines changed: 77 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ static intpthread_join(pthread_t th, void **thread_return);
132132
* some configurable parameters */
133133

134134
#defineDEFAULT_INIT_STEPS "dtgvp"/* default -I setting */
135+
#defineALL_INIT_STEPS "dtgGvpf"/* all possible steps */
135136

136137
#defineLOG_STEP_SECONDS5/* seconds between log messages */
137138
#defineDEFAULT_NXACTS10/* default nxacts */
@@ -627,7 +628,7 @@ usage(void)
627628
" %s [OPTION]... [DBNAME]\n"
628629
"\nInitialization options:\n"
629630
" -i, --initialize invokes initialization mode\n"
630-
" -I, --init-steps=[dtgvpf]+ (default \"dtgvp\")\n"
631+
" -I, --init-steps=["ALL_INIT_STEPS"]+ (default \""DEFAULT_INIT_STEPS"\")\n"
631632
" run selected initialization steps\n"
632633
" -F, --fillfactor=NUM set fill factor\n"
633634
" -n, --no-vacuum do not run VACUUM during initialization\n"
@@ -3803,10 +3804,23 @@ append_fillfactor(char *opts, int len)
38033804
}
38043805

38053806
/*
3806-
*Fill the standard tables with some data
3807+
*Truncate away any old data, in one command in case there are foreign keys
38073808
*/
38083809
staticvoid
3809-
initGenerateData(PGconn*con)
3810+
initTruncateTables(PGconn*con)
3811+
{
3812+
executeStatement(con,"truncate table "
3813+
"pgbench_accounts, "
3814+
"pgbench_branches, "
3815+
"pgbench_history, "
3816+
"pgbench_tellers");
3817+
}
3818+
3819+
/*
3820+
* Fill the standard tables with some data generated and sent from the client
3821+
*/
3822+
staticvoid
3823+
initGenerateDataClientSide(PGconn*con)
38103824
{
38113825
charsql[256];
38123826
PGresult*res;
@@ -3820,23 +3834,16 @@ initGenerateData(PGconn *con)
38203834
remaining_sec;
38213835
intlog_interval=1;
38223836

3823-
fprintf(stderr,"generating data...\n");
3837+
fprintf(stderr,"generating data (client-side)...\n");
38243838

38253839
/*
38263840
* we do all of this in one transaction to enable the backend's
38273841
* data-loading optimizations
38283842
*/
38293843
executeStatement(con,"begin");
38303844

3831-
/*
3832-
* truncate away any old data, in one command in case there are foreign
3833-
* keys
3834-
*/
3835-
executeStatement(con,"truncate table "
3836-
"pgbench_accounts, "
3837-
"pgbench_branches, "
3838-
"pgbench_history, "
3839-
"pgbench_tellers");
3845+
/* truncate away any old data */
3846+
initTruncateTables(con);
38403847

38413848
/*
38423849
* fill branches, tellers, accounts in that order in case foreign keys
@@ -3940,6 +3947,51 @@ initGenerateData(PGconn *con)
39403947
executeStatement(con,"commit");
39413948
}
39423949

3950+
/*
3951+
* Fill the standard tables with some data generated on the server
3952+
*
3953+
* As already the case with the client-side data generation, the filler
3954+
* column defaults to NULL in pgbench_branches and pgbench_tellers,
3955+
* and is a blank-padded string in pgbench_accounts.
3956+
*/
3957+
staticvoid
3958+
initGenerateDataServerSide(PGconn*con)
3959+
{
3960+
charsql[256];
3961+
3962+
fprintf(stderr,"generating data (server-side)...\n");
3963+
3964+
/*
3965+
* we do all of this in one transaction to enable the backend's
3966+
* data-loading optimizations
3967+
*/
3968+
executeStatement(con,"begin");
3969+
3970+
/* truncate away any old data */
3971+
initTruncateTables(con);
3972+
3973+
snprintf(sql,sizeof(sql),
3974+
"insert into pgbench_branches(bid,bbalance) "
3975+
"select bid, 0 "
3976+
"from generate_series(1, %d) as bid",nbranches*scale);
3977+
executeStatement(con,sql);
3978+
3979+
snprintf(sql,sizeof(sql),
3980+
"insert into pgbench_tellers(tid,bid,tbalance) "
3981+
"select tid, (tid - 1) / %d + 1, 0 "
3982+
"from generate_series(1, %d) as tid",ntellers,ntellers*scale);
3983+
executeStatement(con,sql);
3984+
3985+
snprintf(sql,sizeof(sql),
3986+
"insert into pgbench_accounts(aid,bid,abalance,filler) "
3987+
"select aid, (aid - 1) / %d + 1, 0, '' "
3988+
"from generate_series(1, "INT64_FORMAT") as aid",
3989+
naccounts, (int64)naccounts*scale);
3990+
executeStatement(con,sql);
3991+
3992+
executeStatement(con,"commit");
3993+
}
3994+
39433995
/*
39443996
* Invoke vacuum on the standard tables
39453997
*/
@@ -4020,21 +4072,21 @@ initCreateFKeys(PGconn *con)
40204072
staticvoid
40214073
checkInitSteps(constchar*initialize_steps)
40224074
{
4023-
constchar*step;
4024-
40254075
if (initialize_steps[0]=='\0')
40264076
{
40274077
fprintf(stderr,"no initialization steps specified\n");
40284078
exit(1);
40294079
}
40304080

4031-
for (step=initialize_steps;*step!='\0';step++)
4081+
for (constchar*step=initialize_steps;*step!='\0';step++)
40324082
{
4033-
if (strchr("dtgvpf ",*step)==NULL)
4083+
if (strchr(ALL_INIT_STEPS" ",*step)==NULL)
40344084
{
4035-
fprintf(stderr,"unrecognized initialization step \"%c\"\n",
4085+
fprintf(stderr,
4086+
"unrecognized initialization step \"%c\"\n",
40364087
*step);
4037-
fprintf(stderr,"allowed steps are: \"d\", \"t\", \"g\", \"v\", \"p\", \"f\"\n");
4088+
fprintf(stderr,
4089+
"Allowed step characters are: \""ALL_INIT_STEPS"\".\n");
40384090
exit(1);
40394091
}
40404092
}
@@ -4075,8 +4127,12 @@ runInitSteps(const char *initialize_steps)
40754127
initCreateTables(con);
40764128
break;
40774129
case'g':
4078-
op="generate";
4079-
initGenerateData(con);
4130+
op="client-side generate";
4131+
initGenerateDataClientSide(con);
4132+
break;
4133+
case'G':
4134+
op="server-side generate";
4135+
initGenerateDataServerSide(con);
40804136
break;
40814137
case'v':
40824138
op="vacuum";

‎src/bin/pgbench/t/001_pgbench_with_server.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,15 @@ sub pgbench
130130

131131
# Test interaction of --init-steps with legacy step-selection options
132132
pgbench(
133-
'--initialize --init-steps=dtpvgvv --no-vacuum --foreign-keys --unlogged-tables --partitions=3',
133+
'--initialize --init-steps=dtpvGvv --no-vacuum --foreign-keys --unlogged-tables --partitions=3',
134134
0,
135135
[qr{^$}],
136136
[
137137
qr{dropping old tables},
138138
qr{creating tables},
139139
qr{creating 3 partitions},
140140
qr{creating primary keys},
141-
qr{.* of .* tuples\(.*\) done},
141+
qr{generating data\(server-side\)},
142142
qr{creating foreign keys},
143143
qr{(?!vacuuming)},# no vacuum
144144
qr{done in\d+\.\d\d s}

‎src/bin/pgbench/t/002_pgbench_no_server.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ sub pgbench_scripts
147147
[
148148
'invalid init step',
149149
'-i -I dta',
150-
[qr{unrecognized initialization step},qr{allowed steps are} ]
150+
[qr{unrecognized initialization step},qr{Allowed step characters are} ]
151151
],
152152
[
153153
'bad random seed',

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp