aljaz/breez-lnd
1
0
Fork 0
mirror of https://github.com/aljazceru/breez-lnd.git synced 2025-12-18 06:34:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

kvdb/postgres: fix context cancellation

Browse Source
This commit is contained in:
Joost Jager
2021-12-22 12:33:50 +01:00
parent 62a2f3c809
commit 0cae55c162
5 changed files with 69 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
kvdb/postgres/readwrite_bucket.go
View File

@@ -75,10 +75,12 @@ func (b *readWriteBucket) Get(key []byte) []byte {
}
var value *[]byte
err := b.tx.QueryRow(
row, cancel := b.tx.QueryRow(
"SELECT value FROM "+b.table+" WHERE "+parentSelector(b.id)+
" AND key=$1", key,
).Scan(&value)
)
defer cancel()
err := row.Scan(&value)
switch {
case err == sql.ErrNoRows:
@@ -106,10 +108,12 @@ func (b *readWriteBucket) NestedReadWriteBucket(
}
var id int64
err := b.tx.QueryRow(
row, cancel := b.tx.QueryRow(
"SELECT id FROM "+b.table+" WHERE "+parentSelector(b.id)+
" AND key=$1 AND value IS NULL", key,
).Scan(&id)
)
defer cancel()
err := row.Scan(&id)
switch {
case err == sql.ErrNoRows:
@@ -139,10 +143,12 @@ func (b *readWriteBucket) CreateBucket(key []byte) (
value *[]byte
id int64
)
err := b.tx.QueryRow(
row, cancel := b.tx.QueryRow(
"SELECT id,value FROM "+b.table+" WHERE "+parentSelector(b.id)+
" AND key=$1", key,
).Scan(&id, &value)
)
defer cancel()
err := row.Scan(&id, &value)
switch {
case err == sql.ErrNoRows:
@@ -159,10 +165,12 @@ func (b *readWriteBucket) CreateBucket(key []byte) (
// Bucket does not yet exist, so create it. Postgres will generate a
// bucket id for the new bucket.
err = b.tx.QueryRow(
row, cancel = b.tx.QueryRow(
"INSERT INTO "+b.table+" (parent_id, key) "+
"VALUES($1, $2) RETURNING id", b.id, key,
).Scan(&id)
)
defer cancel()
err = row.Scan(&id)
if err != nil {
return nil, err
}
@@ -187,19 +195,23 @@ func (b *readWriteBucket) CreateBucketIfNotExists(key []byte) (
value *[]byte
id int64
)
err := b.tx.QueryRow(
row, cancel := b.tx.QueryRow(
"SELECT id,value FROM "+b.table+" WHERE "+parentSelector(b.id)+
" AND key=$1", key,
).Scan(&id, &value)
)
defer cancel()
err := row.Scan(&id, &value)
switch {
// Bucket does not yet exist, so create it now. Postgres will generate a
// bucket id for the new bucket.
case err == sql.ErrNoRows:
err = b.tx.QueryRow(
row, cancel := b.tx.QueryRow(
"INSERT INTO "+b.table+" (parent_id, key) "+
"VALUES($1, $2) RETURNING id", b.id, key).
Scan(&id)
"VALUES($1, $2) RETURNING id", b.id, key,
)
defer cancel()
err := row.Scan(&id)
if err != nil {
return nil, err
}
@@ -315,10 +327,12 @@ func (b *readWriteBucket) Delete(key []byte) error {
// Check to see if a bucket with this key exists.
var dummy int
err := b.tx.QueryRow(
row, cancel := b.tx.QueryRow(
"SELECT 1 FROM "+b.table+" WHERE "+parentSelector(b.id)+
" AND key=$1 AND value IS NULL", key,
).Scan(&dummy)
)
defer cancel()
err := row.Scan(&dummy)
switch {
// No bucket exists, proceed to deletion of the key.
case err == sql.ErrNoRows:
@@ -395,11 +409,13 @@ func (b *readWriteBucket) Sequence() uint64 {
}
var seq int64
err := b.tx.QueryRow(
row, cancel := b.tx.QueryRow(
"SELECT sequence FROM "+b.table+" WHERE id=$1 "+
"AND sequence IS NOT NULL",
b.id,
).Scan(&seq)
)
defer cancel()
err := row.Scan(&seq)
switch {
case err == sql.ErrNoRows: