Skip to content

Commit f415bd5

Browse files
elpranselprans
committed
Dependency upgrades
1 parent b91511f commit f415bd5

File tree

11 files changed

+271
-154
lines changed

11 files changed

+271
-154
lines changed

‎_golang/Makefile‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@
22

33

44
pgbench_golang: main.go
5-
rm -rf "$(CURDIR)/_go" && mkdir "$(CURDIR)/_go"
6-
GOPATH="$(CURDIR)/_go" go get gopkg.in/alecthomas/kingpin.v2 \
7-
github.com/lib/pq \
8-
github.com/jackc/pgx
9-
mkdir -p "$(CURDIR)/_go/src/github.com/magicstack/pgbench/"
10-
ln -s "$(CURDIR)" "$(CURDIR)/_go/src/github.com/magicstack/pgbench/_golang"
11-
GOPATH="$(CURDIR)/_go" go build -o pgbench_golang github.com/magicstack/pgbench/_golang
12-
rm -rf "$(CURDIR)/_go"
5+
go build -o pgbench_golang ./main.go
136

147
clean:
158
rm -f "$(CURDIR)/pgbench_golang"
16-
rm -rf "$(CURDIR)/_go"

‎_golang/go.mod‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
module github.com/magicstack/pgbench/_golang
2+
3+
go 1.19
4+
5+
require (
6+
github.com/alecthomas/kingpin/v2 v2.3.2
7+
github.com/jackc/pgx/v5 v5.4.1
8+
github.com/lib/pq v1.10.9
9+
)
10+
11+
require (
12+
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
13+
github.com/jackc/pgpassfile v1.0.0 // indirect
14+
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
15+
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
16+
golang.org/x/crypto v0.10.0 // indirect
17+
golang.org/x/text v0.10.0 // indirect
18+
)

‎_golang/go.sum‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
github.com/alecthomas/kingpin/v2 v2.3.2 h1:H0aULhgmSzN8xQ3nX1uxtdlTHYoPLu5AhHxWrKI6ocU=
2+
github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=
3+
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
4+
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
5+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
7+
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
8+
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
9+
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
10+
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
11+
github.com/jackc/pgx/v5 v5.4.1 h1:oKfB/FhuVtit1bBM3zNRRsZ925ZkMN3HXL+LgLUM9lE=
12+
github.com/jackc/pgx/v5 v5.4.1/go.mod h1:q6iHT8uDNXWiFNOlRqJzBTaSH3+2xCXkokxHZC5qWFY=
13+
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
14+
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
15+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
16+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
17+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
18+
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
19+
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
20+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
21+
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
22+
github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=
23+
github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
24+
golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
25+
golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
26+
golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
27+
golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
28+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
29+
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
30+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
31+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

‎_golang/main.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ import (
55
sql "database/sql"
66
"encoding/json"
77
"fmt"
8-
"github.com/jackc/pgx"
9-
pq "github.com/lib/pq"
10-
"gopkg.in/alecthomas/kingpin.v2"
118
"io/ioutil"
129
"log"
1310
"math"
@@ -18,6 +15,10 @@ import (
1815
"strings"
1916
"sync"
2017
"time"
18+
19+
"github.com/alecthomas/kingpin/v2"
20+
"github.com/jackc/pgx/v5"
21+
pq "github.com/lib/pq"
2122
)
2223

2324
type ReportFunc func(int64, int64, int64, int64, []int64)
@@ -223,7 +224,6 @@ func lib_pq_worker(
223224
row := args["row"].([]interface{})
224225
count := int(args["count"].(float64))
225226

226-
227227
for time.Since(start) < duration || duration == 0 {
228228
req_start := time.Now()
229229

‎_nodejs/index.js‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -431,53 +431,53 @@ function runner(args, querydata) {
431431

432432
function main() {
433433
let parser = argparse.ArgumentParser({
434-
addHelp: true,
434+
add_help: true,
435435
description: 'async pg driver benchmark [concurrent]'
436436
})
437437

438-
parser.addArgument(
438+
parser.add_argument(
439439
'--concurrency',
440-
{type: Number, defaultValue: 10,
440+
{type: Number, default: 10,
441441
help: 'number of concurrent connections'})
442-
parser.addArgument(
442+
parser.add_argument(
443443
'--duration',
444-
{type: Number, defaultValue: 30,
444+
{type: Number, default: 30,
445445
help: 'duration of test in seconds'})
446-
parser.addArgument(
446+
parser.add_argument(
447447
'--timeout',
448-
{type: Number, defaultValue: 2,
448+
{type: Number, default: 2,
449449
help: 'server timeout in seconds'})
450-
parser.addArgument(
450+
parser.add_argument(
451451
'--warmup-time',
452-
{type: Number, defaultValue: 5,
452+
{type: Number, default: 5,
453453
help: 'duration of warmup period for each benchmark in seconds'})
454-
parser.addArgument(
454+
parser.add_argument(
455455
'--output-format',
456-
{type: String, defaultValue: 'text',
456+
{type: String, default: 'text',
457457
help: 'output format',
458458
choices: ['text', 'json']})
459-
parser.addArgument(
459+
parser.add_argument(
460460
'--pghost',
461-
{type: String, defaultValue: '127.0.0.1',
461+
{type: String, default: '127.0.0.1',
462462
help: 'PostgreSQL server host'})
463-
parser.addArgument(
463+
parser.add_argument(
464464
'--pgport',
465-
{type: Number, defaultValue: 5432,
465+
{type: Number, default: 5432,
466466
help: 'PostgreSQL server port'})
467-
parser.addArgument(
467+
parser.add_argument(
468468
'--pguser',
469-
{type: String, defaultValue: 'postgres',
469+
{type: String, default: 'postgres',
470470
help: 'PostgreSQL server user'})
471-
parser.addArgument(
471+
parser.add_argument(
472472
'driver',
473473
{type: String, help: 'driver implementation to use',
474474
choices: ['pg-js', 'pg-native', 'ts-postgres']})
475-
parser.addArgument(
475+
parser.add_argument(
476476
'queryfile',
477477
{type: String,
478478
help: 'file to read benchmark query information from'})
479479

480-
let args = parser.parseArgs();
480+
let args = parser.parse_args();
481481
let queryfile = null;
482482

483483
if (args.queryfile == '-') {

0 commit comments

Comments
 (0)