-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implement Batch query package #2942
base: master
Are you sure you want to change the base?
Changes from all commits
dd3221a
330b0ee
b0f7a43
f10c230
5ef3546
424ac42
49885b2
5b08fba
c014b72
9545859
2890c05
c9d6d11
758890b
b2ea290
fb83255
194e1fa
4fab6b7
e244f03
7573a20
7f4ef4c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
The MIT License (MIT) | ||
|
||
Copyright (c) 2013 Ankush Chadda | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
# pg-batch-query | ||
|
||
Batches queries by using the [Extended query protocol](https://www.postgresql.org/docs/current/protocol-flow.html#PROTOCOL-FLOW-EXT-QUERY). | ||
Essentially we do the following | ||
- send a single PARSE command to create a named statement. | ||
- send a pair of BIND and EXECUTE commands | ||
- Finally send a SYNC to close the current transaction. | ||
|
||
As [per benchmark tests](./bench.ts), number of queries per seconds gets tripled using batched queries. | ||
|
||
## installation | ||
|
||
```bash | ||
$ npm install pg --save | ||
$ npm install pg-batch-query --save | ||
``` | ||
|
||
## use | ||
|
||
```js | ||
const pg = require('pg') | ||
var pool = new pg.Pool() | ||
const BatchQuery = require('pg-batch-query') | ||
|
||
const batch = new BatchQuery({ | ||
name: 'optional', | ||
text: 'SELECT from foo where bar = $1', | ||
values: [ | ||
['first'], | ||
['second'] | ||
] | ||
}) | ||
|
||
pool.connect((err, client, done) => { | ||
if (err) throw err | ||
const result = client.query(batch).execute() | ||
for (const res of result) { | ||
for (const row of res) { | ||
console.log(row) | ||
} | ||
} | ||
}) | ||
``` | ||
|
||
## contribution | ||
|
||
I'm very open to contribution! Open a pull request with your code or idea and we'll talk about it. If it's not way insane we'll merge it in too: isn't open source awesome? | ||
|
||
## license | ||
|
||
The MIT License (MIT) | ||
|
||
Copyright (c) 2013-2020 Ankush Chadda | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is it okay to have my name in the copyright ? I am not aware if this is the correct thing or not There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yea absolutely okay. you can get boilerplate MIT license text from github or other places 👍 |
||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy | ||
of this software and associated documentation files (the "Software"), to deal | ||
in the Software without restriction, including without limitation the rights | ||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
copies of the Software, and to permit persons to whom the Software is | ||
furnished to do so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in | ||
all copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
THE SOFTWARE. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
import pg from 'pg' | ||
import BatchQuery from './src' | ||
|
||
const insert = (value) => ({ | ||
text: 'INSERT INTO foobar(name, age) VALUES ($1, $2)', | ||
values: ['joe' + value, value], | ||
}) | ||
|
||
const select = (value) => ({ | ||
text: 'SELECT FROM foobar where name = $1 and age = $2', | ||
values: ['joe' + value, value], | ||
}) | ||
|
||
let counter = 0 | ||
|
||
const simpleExec = async (client, getQuery, count) => { | ||
const query = getQuery(count) | ||
await client.query({ | ||
text: query.text, | ||
values: query.values, | ||
rowMode: 'array', | ||
}) | ||
} | ||
|
||
const batchExec = async (client, getQuery, count) => { | ||
const query = getQuery(count) | ||
|
||
const batchQuery = new BatchQuery({ | ||
name: 'optional'+ counter++, | ||
text: query.text, | ||
values: [ | ||
['joe1', count], | ||
['joe2', count], | ||
['joe3', count], | ||
['joe4', count], | ||
['joe5', count] | ||
] | ||
}) | ||
await client.query(batchQuery).execute() | ||
} | ||
|
||
const bench = async (client, mainMethod, q, time) => { | ||
let start = Date.now() | ||
let count = 0 | ||
while (true) { | ||
await mainMethod(client, q, count) | ||
count++ | ||
if (Date.now() - start > time) { | ||
return count | ||
} | ||
} | ||
} | ||
|
||
const run = async () => { | ||
const client = new pg.Client() | ||
await client.connect() | ||
console.log('start') | ||
await client.query('CREATE TEMP TABLE foobar(name TEXT, age NUMERIC)') | ||
console.log('warmup done') | ||
const seconds = 5 | ||
|
||
for (let i = 0; i < 4; i++) { | ||
let queries = await bench(client, simpleExec, insert, 5 * 1000) | ||
console.log('') | ||
console.log('insert queries:', queries) | ||
console.log('qps', queries / seconds) | ||
console.log('on my laptop best so far seen 16115.4 qps') | ||
|
||
queries = await bench(client, batchExec, insert, 5 * 1000) | ||
console.log('') | ||
console.log('insert batch queries:', queries * 5) | ||
console.log('qps', queries * 5 / seconds) | ||
console.log('on my laptop best so far seen 42646 qps') | ||
|
||
queries = await bench(client, simpleExec, select, 5 * 1000) | ||
console.log('') | ||
console.log('select queries:', queries) | ||
console.log('qps', queries / seconds) | ||
console.log('on my laptop best so far seen 18579.8 qps') | ||
|
||
queries = await bench(client, batchExec, select, 5 * 1000) | ||
console.log('') | ||
console.log('select batch queries:', queries * 5) | ||
console.log('qps', queries * 5 / seconds) | ||
console.log('on my laptop best so far seen 44887 qps') | ||
} | ||
|
||
await client.end() | ||
await client.end() | ||
} | ||
|
||
run().catch((e) => Boolean(console.error(e)) || process.exit(-1)) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
{ | ||
"name": "pg-batch-query", | ||
"version": "1.0.0", | ||
"description": "Postgres Batch Query for performant response time.", | ||
"main": "./dist/index.js", | ||
"types": "./dist/index.d.ts", | ||
"scripts": { | ||
"build": "rimraf dist && tsc", | ||
"test": "mocha -r ts-node/register test/**/*.ts" | ||
}, | ||
"repository": { | ||
"type": "git", | ||
"url": "git://github.com/brianc/node-postgres.git", | ||
"directory": "packages/pg-batch-query" | ||
}, | ||
"keywords": [ | ||
"postgres", | ||
"batch-query", | ||
"pg", | ||
"query" | ||
], | ||
"files": [ | ||
"/dist/*{js,ts,map}", | ||
"/src" | ||
], | ||
"author": "Ankush Chadda", | ||
"license": "MIT", | ||
"bugs": { | ||
"url": "https://github.com/brianc/node-postgres/issues" | ||
}, | ||
"devDependencies": { | ||
"@types/chai": "^4.2.13", | ||
"@types/mocha": "^8.0.3", | ||
"@types/node": "^14.0.0", | ||
"@types/pg": "^8.10.2", | ||
"eslint-plugin-promise": "^6.0.1", | ||
"mocha": "^7.1.2", | ||
"pg": "^8.10.0", | ||
"ts-node": "^10.9.1", | ||
"typescript": "^5.0.4" | ||
}, | ||
"peerDependencies": { | ||
"pg": "^8" | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
import { Submittable, Connection, QueryResult } from 'pg' | ||
const Result = require('pg/lib/result.js') | ||
const utils = require('pg/lib/utils.js') | ||
let nextUniqueID = 1 // concept borrowed from org.postgresql.core.v3.QueryExecutorImpl | ||
|
||
interface BatchQueryConfig { | ||
name?: string | ||
text: string | ||
values?: any[][] | ||
} | ||
|
||
class BatchQuery implements Submittable { | ||
|
||
name: string | null | ||
text: string | ||
values: string[][] | ||
connection: Connection | null | ||
_portal: string | null | ||
_result: typeof Result | null | ||
_results: typeof Result[] | ||
callback: Function | null | ||
|
||
public constructor(batchQuery: BatchQueryConfig) { | ||
const { name, values, text } = batchQuery | ||
|
||
this.name = name | ||
this.values = values | ||
this.text = text | ||
this.connection = null | ||
this._portal = null | ||
this._result = new Result() | ||
this._results = [] | ||
this.callback = null | ||
|
||
for (const row of values) { | ||
if (!Array.isArray(values)) { | ||
throw new Error('Batch commands require each set of values to be an array. e.g. values: any[][]') | ||
} | ||
} | ||
} | ||
|
||
public submit(connection: Connection): void { | ||
this.connection = connection | ||
|
||
// creates a named prepared statement | ||
this.connection.parse( | ||
{ | ||
text: this.text, | ||
name: this.name, | ||
types: [] | ||
}, | ||
true | ||
) | ||
|
||
this.values.map(val => { | ||
this._portal = 'C_' + nextUniqueID++ | ||
this.connection.bind({ | ||
statement: this.name, | ||
values: val, | ||
portal: this._portal, | ||
valueMapper: utils.prepareValue, | ||
}, true) | ||
|
||
// maybe we could avoid this for non-select queries | ||
this.connection.describe({ | ||
type: 'P', | ||
name: this._portal, | ||
}, true) | ||
|
||
this.connection.execute({portal: this._portal}, true) | ||
}) | ||
|
||
this.connection.sync() | ||
} | ||
|
||
execute(): Promise<QueryResult[]> { | ||
return new Promise((resolve, reject) => { | ||
this.callback = (err, rows) => (err ? reject(err) : resolve(rows)) | ||
}) | ||
} | ||
|
||
handleError(err, connection) { | ||
this.connection.flush() | ||
if (this.callback) { | ||
this.callback(err) | ||
} | ||
} | ||
|
||
handleReadyForQuery(con) { | ||
if (this.callback) { | ||
try { | ||
this.callback(null, this._results) | ||
} | ||
catch(err) { | ||
throw err | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why catch & throw on next tick? Doesn't this create an uncatchable error which will crash a node process? |
||
} | ||
} | ||
} | ||
|
||
handleRowDescription(msg) { | ||
this._result.addFields(msg.fields) | ||
} | ||
|
||
handleDataRow(msg) { | ||
const row = this._result.parseRow(msg.fields) | ||
this._result.addRow(row) | ||
} | ||
|
||
handleCommandComplete(msg) { | ||
this._result.addCommandComplete(msg) | ||
this._results.push(this._result) | ||
this._result = new Result() | ||
this.connection.close({ type: 'P', name: this._portal }, true) | ||
} | ||
|
||
|
||
handleEmptyQuery() { | ||
this.connection.sync() | ||
} | ||
} | ||
|
||
export = BatchQuery |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IMHO, it would be great to add explanations about :
I also wonder if any advice about the number of parameters is needed ? is there a hard limit ?