Skip to content
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

Draft
wants to merge 20 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 17 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ This repo is a monorepo which contains the core [pg](https://github.com/brianc/n
- [pg-query-stream](https://github.com/brianc/node-postgres/tree/master/packages/pg-query-stream)
- [pg-connection-string](https://github.com/brianc/node-postgres/tree/master/packages/pg-connection-string)
- [pg-protocol](https://github.com/brianc/node-postgres/tree/master/packages/pg-protocol)
- [pg-batch-query](https://github.com/brianc/node-postgres/tree/master/packages/pg-batch-query)

## Documentation

Expand Down
9 changes: 9 additions & 0 deletions packages/pg-batch-query/LICENSE
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.
65 changes: 65 additions & 0 deletions packages/pg-batch-query/README.md
Copy link
Contributor

@abenhamdine abenhamdine May 16, 2023

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 :

  • the benefits of batched queries vs non-batched
  • the difference with pipelining (which is not implemented yet)
  • perhaps also some hints on the underlying mechanism (multiple BIND etc) for future contributors

I also wonder if any advice about the number of parameters is needed ? is there a hard limit ?

Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# pg-batch-query



## 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) {
consolel.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
Copy link
Author

Choose a reason for hiding this comment

The 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

Copy link
Owner

Choose a reason for hiding this comment

The 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.
79 changes: 79 additions & 0 deletions packages/pg-batch-query/bench.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
import pg from 'pg'
import BatchQuery from './src'

const insert = (value) => ({
text: 'INSERT INTO foobar(name, age) VALUES ($1, $2)',
values: ['brian', value],
})

const seq = {
text: 'SELECT * FROM generate_series(1, 1000)',
}

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: [
['brian1', '1'],
['brian2', '1'],
['brian3', '1'],
['brian4', '1'],
['brian5', '1']
]
})
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 12467 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 28796 qps')
}

await client.end()
await client.end()
}

run().catch((e) => Boolean(console.error(e)) || process.exit(-1))
45 changes: 45 additions & 0 deletions packages/pg-batch-query/package.json
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": "^7.14.5",
"eslint-plugin-promise": "^6.0.1",
"mocha": "^7.1.2",
"pg": "^8.10.0",
"ts-node": "^8.5.4",
iamkhush marked this conversation as resolved.
Show resolved Hide resolved
"typescript": "^4.0.3"
iamkhush marked this conversation as resolved.
Show resolved Hide resolved
},
"peerDependencies": {
"pg": "^8"
}
}
122 changes: 122 additions & 0 deletions packages/pg-batch-query/src/index.ts
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
Copy link
Owner

@brianc brianc Mar 31, 2023

Choose a reason for hiding this comment

The 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
Loading