summaryrefslogtreecommitdiff
path: root/vendor/github.com/jackc/pgx/v4/batch.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2022-03-07 11:08:26 +0100
committerLibravatar GitHub <noreply@github.com>2022-03-07 11:08:26 +0100
commit07727753b96d209406783e5e539725bcdafebdc7 (patch)
treeb32f11cbc304d633ed0acd8f84b4c11e909bb5f3 /vendor/github.com/jackc/pgx/v4/batch.go
parent[documentation] Creates Docker documentation and docker-compose.yaml (#416) (diff)
downloadgotosocial-07727753b96d209406783e5e539725bcdafebdc7.tar.xz
[feature] Clean up/uncache remote media (#407)
* Add whereNotEmptyAndNotNull * Add GetRemoteOlderThanDays * Add GetRemoteOlderThanDays * Add PruneRemote to Manager interface * Start implementing PruneRemote * add new attachment + status to tests * fix up and test GetRemoteOlderThan * fix bad import * PruneRemote: return number pruned * add Cached column to mediaattachment * update + test pruneRemote * update mediaTest * use Cached column * upstep bun to latest version * embed structs in mediaAttachment * migrate mediaAttachment to new format * don't default cached to true * select only remote media * update db dependencies * step bun back to last working version * update pruneRemote to use Cached field * fix storage path of test attachments * add recache logic to manager * fix trimmed aspect ratio * test prune and recache * return errwithcode * tidy up different paths for emoji vs attachment * fix incorrect thumbnail type being stored * expose TransportController to media processor * implement tee-ing recached content * add thoughts of dog to test fedi attachments * test get remote files * add comment on PruneRemote * add postData cleanup to recache * test thumbnail fetching * add incredible diagram * go mod tidy * buffer pipes for recache streaming * test for client stops reading after 1kb * add media-remote-cache-days to config * add cron package * wrap logrus so it's available to cron * start and stop cron jobs gracefully
Diffstat (limited to 'vendor/github.com/jackc/pgx/v4/batch.go')
-rw-r--r--vendor/github.com/jackc/pgx/v4/batch.go33
1 files changed, 26 insertions, 7 deletions
diff --git a/vendor/github.com/jackc/pgx/v4/batch.go b/vendor/github.com/jackc/pgx/v4/batch.go
index f0479ea63..7f86ad5c3 100644
--- a/vendor/github.com/jackc/pgx/v4/batch.go
+++ b/vendor/github.com/jackc/pgx/v4/batch.go
@@ -3,6 +3,7 @@ package pgx
import (
"context"
"errors"
+ "fmt"
"github.com/jackc/pgconn"
)
@@ -46,17 +47,18 @@ type BatchResults interface {
// Close closes the batch operation. This must be called before the underlying connection can be used again. Any error
// that occurred during a batch operation may have made it impossible to resyncronize the connection with the server.
- // In this case the underlying connection will have been closed.
+ // In this case the underlying connection will have been closed. Close is safe to call multiple times.
Close() error
}
type batchResults struct {
- ctx context.Context
- conn *Conn
- mrr *pgconn.MultiResultReader
- err error
- b *Batch
- ix int
+ ctx context.Context
+ conn *Conn
+ mrr *pgconn.MultiResultReader
+ err error
+ b *Batch
+ ix int
+ closed bool
}
// Exec reads the results from the next query in the batch as if the query has been sent with Exec.
@@ -64,6 +66,9 @@ func (br *batchResults) Exec() (pgconn.CommandTag, error) {
if br.err != nil {
return nil, br.err
}
+ if br.closed {
+ return nil, fmt.Errorf("batch already closed")
+ }
query, arguments, _ := br.nextQueryAndArgs()
@@ -114,6 +119,11 @@ func (br *batchResults) Query() (Rows, error) {
return &connRows{err: br.err, closed: true}, br.err
}
+ if br.closed {
+ alreadyClosedErr := fmt.Errorf("batch already closed")
+ return &connRows{err: alreadyClosedErr, closed: true}, alreadyClosedErr
+ }
+
rows := br.conn.getRows(br.ctx, query, arguments)
if !br.mrr.NextResult() {
@@ -140,6 +150,10 @@ func (br *batchResults) Query() (Rows, error) {
// QueryFunc reads the results from the next query in the batch as if the query has been sent with Conn.QueryFunc.
func (br *batchResults) QueryFunc(scans []interface{}, f func(QueryFuncRow) error) (pgconn.CommandTag, error) {
+ if br.closed {
+ return nil, fmt.Errorf("batch already closed")
+ }
+
rows, err := br.Query()
if err != nil {
return nil, err
@@ -179,6 +193,11 @@ func (br *batchResults) Close() error {
return br.err
}
+ if br.closed {
+ return nil
+ }
+ br.closed = true
+
// log any queries that haven't yet been logged by Exec or Query
for {
query, args, ok := br.nextQueryAndArgs()