@@ -157,6 +157,18 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
157157 </listitem>
158158 </varlistentry>
159159
160+ <varlistentry>
161+ <term><option>-F</option> <replaceable>fillfactor</></term>
162+ <listitem>
163+ <para>
164+ Create the <structname>pgbench_accounts</>,
165+ <structname>pgbench_tellers</> and
166+ <structname>pgbench_branches</> tables with the given fillfactor.
167+ Default is 100.
168+ </para>
169+ </listitem>
170+ </varlistentry>
171+
160172 <varlistentry>
161173 <term><option>-n</option></term>
162174 <listitem>
@@ -167,13 +179,12 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
167179 </varlistentry>
168180
169181 <varlistentry>
170- <term><option>-F </option> <replaceable>fillfactor</ ></term>
182+ <term><option>-q </option></term>
171183 <listitem>
172184 <para>
173- Create the <structname>pgbench_accounts</>,
174- <structname>pgbench_tellers</> and
175- <structname>pgbench_branches</> tables with the given fillfactor.
176- Default is 100.
185+ Switch logging to quiet mode, producing only one progress message per 5
186+ seconds. The default logging prints one message each 100000 rows, which
187+ often outputs many lines per second (especially on good hardware).
177188 </para>
178189 </listitem>
179190 </varlistentry>
@@ -194,17 +205,6 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
194205 </listitem>
195206 </varlistentry>
196207
197- <varlistentry>
198- <term><option>-q</option></term>
199- <listitem>
200- <para>
201- Switch logging to quiet mode, producing only one progress message per 5
202- seconds. The default logging prints one message each 100000 rows, which
203- often outputs many lines per second (especially on good hardware).
204- </para>
205- </listitem>
206- </varlistentry>
207-
208208 <varlistentry>
209209 <term><option>--foreign-keys</option></term>
210210 <listitem>
@@ -332,39 +332,6 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
332332 </listitem>
333333 </varlistentry>
334334
335- <varlistentry>
336- <term><option>--sampling-rate</option> <replaceable>rate</></term>
337- <listitem>
338- <para>
339- Sampling rate, used when writing data into the log, to reduce the
340- amount of log generated. If this option is given, only the specified
341- fraction of transactions are logged. 1.0 means all transactions will
342- be logged, 0.05 means only 5% of the transactions will be logged.
343- </para>
344- <para>
345- Remember to take the sampling rate into account when processing the
346- log file. For example, when computing tps values, you need to multiply
347- the numbers accordingly (e.g. with 0.01 sample rate, you'll only get
348- 1/100 of the actual tps).
349- </para>
350- </listitem>
351- </varlistentry>
352-
353- <varlistentry>
354- <term><option>--aggregate-interval</option> <replaceable>seconds</></term>
355- <listitem>
356- <para>
357- Length of aggregation interval (in seconds). May be used only together
358- with <application>-l</application> - with this option, the log contains
359- per-interval summary (number of transactions, min/max latency and two
360- additional fields useful for variance estimation).
361- </para>
362- <para>
363- This option is not currently supported on Windows.
364- </para>
365- </listitem>
366- </varlistentry>
367-
368335 <varlistentry>
369336 <term><option>-M</option> <replaceable>querymode</></term>
370337 <listitem>
@@ -479,6 +446,39 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
479446 </listitem>
480447 </varlistentry>
481448
449+ <varlistentry>
450+ <term><option>--aggregate-interval=<replaceable>seconds</></option></term>
451+ <listitem>
452+ <para>
453+ Length of aggregation interval (in seconds). May be used only together
454+ with <application>-l</application> - with this option, the log contains
455+ per-interval summary (number of transactions, min/max latency and two
456+ additional fields useful for variance estimation).
457+ </para>
458+ <para>
459+ This option is not currently supported on Windows.
460+ </para>
461+ </listitem>
462+ </varlistentry>
463+
464+ <varlistentry>
465+ <term><option>--sampling-rate=<replaceable>rate</></option></term>
466+ <listitem>
467+ <para>
468+ Sampling rate, used when writing data into the log, to reduce the
469+ amount of log generated. If this option is given, only the specified
470+ fraction of transactions are logged. 1.0 means all transactions will
471+ be logged, 0.05 means only 5% of the transactions will be logged.
472+ </para>
473+ <para>
474+ Remember to take the sampling rate into account when processing the
475+ log file. For example, when computing tps values, you need to multiply
476+ the numbers accordingly (e.g. with 0.01 sample rate, you'll only get
477+ 1/100 of the actual tps).
478+ </para>
479+ </listitem>
480+ </varlistentry>
481+
482482 </variablelist>
483483 </para>
484484