diff options
| author | Tomas Vondra | 2017-06-03 14:04:12 +0000 |
|---|---|---|
| committer | Tomas Vondra | 2017-06-03 14:04:12 +0000 |
| commit | 32d57848458595a487d251b37c2872d86de439ef (patch) | |
| tree | c65f843fd89009548e39d791beffd82daffe5900 /src | |
| parent | 8a36babf462c87acb7b704b40e71c0994edefe9c (diff) | |
Fix built-in pgbench scripts to use 9.6 commands
PostgreSQL 9.6 changed some of the pgbench internal commands, e.g.
\setrandom VARIABLE FROM TO
changed to
\set VARIABLE random(FROM, TO)
and there are also some related changes. The merge only accepted changes
to the upstream scripts, not the two XL-specific ones (tpcb-like-bid and
simple-update-bid). Those are fixed by this commit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pgbench/pgbench.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index 28af19e20c..ab72c7be63 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -360,12 +360,9 @@ static const BuiltinScript builtin_script[] = { "tpcb-like-bid", "<builtin: TPC-B (sort of)>", - "\\set nbranches " CppAsString2(nbranches) " * :scale\n" - "\\set ntellers " CppAsString2(ntellers) " * :scale\n" - "\\set naccounts " CppAsString2(naccounts) " * :scale\n" - "\\setrandom aid 1 :naccounts\n" - "\\setrandom bid 1 :nbranches\n" - "\\setrandom tid 1 :ntellers\n" + "\\set aid random(1, " CppAsString2(naccounts) " * :scale)\n" + "\\set bid random(1, " CppAsString2(nbranches) " * :scale)\n" + "\\set tid random(1, " CppAsString2(ntellers) " * :scale)\n" "\\setrandom delta -5000 5000\n" "BEGIN;\n" "UPDATE pgbench_accounts SET abalance = abalance + :delta WHERE aid = :aid AND bid = :bid;\n" @@ -393,13 +390,10 @@ static const BuiltinScript builtin_script[] = { "simple-update-bid", "<builtin: simple update bid>", - "\\set nbranches " CppAsString2(nbranches) " * :scale\n" - "\\set ntellers " CppAsString2(ntellers) " * :scale\n" - "\\set naccounts " CppAsString2(naccounts) " * :scale\n" - "\\setrandom aid 1 :naccounts\n" - "\\setrandom bid 1 :nbranches\n" - "\\setrandom tid 1 :ntellers\n" - "\\setrandom delta -5000 5000\n" + "\\set aid random(1, " CppAsString2(naccounts) " * :scale)\n" + "\\set bid random(1, " CppAsString2(nbranches) " * :scale)\n" + "\\set tid random(1, " CppAsString2(ntellers) " * :scale)\n" + "\\set delta random(-5000, 5000)\n" "BEGIN;\n" "UPDATE pgbench_accounts SET abalance = abalance + :delta WHERE aid = :aid AND bid = :bid;\n" "SELECT abalance FROM pgbench_accounts WHERE aid = :aid AND bid = :bid;\n" |