Skip to content

Commit 43cfc3a

Browse files
alexandrosfiliosalexandrosfilios
committed
Pass context to db queries
Signed-off-by: Alexandros Filios <alexandros.filios@ibm.com>
1 parent 08cf501 commit 43cfc3a

File tree

7 files changed

+40
-40
lines changed

7 files changed

+40
-40
lines changed

‎token/services/db/sql/common/identity.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func (db *IdentityStore) AddConfiguration(ctx context.Context, wp driver.Identit
101101
Format()
102102
logger.Debug(query, args)
103103

104-
_, err := db.writeDB.Exec(query, args...)
104+
_, err := db.writeDB.ExecContext(ctx, query, args...)
105105
return err
106106
}
107107

@@ -112,7 +112,7 @@ func (db *IdentityStore) IteratorConfigurations(ctx context.Context, configurati
112112
Where(cond.Eq("type", configurationType)).
113113
Format(db.ci)
114114
logger.Debug(query, args)
115-
rows, err := db.readDB.Query(query, args...)
115+
rows, err := db.readDB.QueryContext(ctx, query, args...)
116116
if err != nil {
117117
return nil, err
118118
}
@@ -142,7 +142,7 @@ func (db *IdentityStore) StoreIdentityData(ctx context.Context, id []byte, ident
142142
Format()
143143
logger.Debug(query, args)
144144

145-
_, err := db.writeDB.Exec(query, args...)
145+
_, err := db.writeDB.ExecContext(ctx, query, args...)
146146
if err != nil {
147147
// does the record already exists?
148148
auditInfo, err2 := db.GetAuditInfo(ctx, id)
@@ -185,7 +185,7 @@ func (db *IdentityStore) GetTokenInfo(ctx context.Context, id []byte) ([]byte, [
185185
Format(db.ci)
186186
logger.Debug(query, args)
187187

188-
row := db.readDB.QueryRow(query, args...)
188+
row := db.readDB.QueryRowContext(ctx, query, args...)
189189
var tokenMetadata []byte
190190
var tokenMetadataAuditInfo []byte
191191
err := row.Scan(&tokenMetadata, &tokenMetadataAuditInfo)
@@ -209,7 +209,7 @@ func (db *IdentityStore) StoreSignerInfo(ctx context.Context, id, info []byte) e
209209
if logger.IsEnabledFor(zapcore.DebugLevel) {
210210
logger.Debugf("store signer info [%s]: [%s][%s]", query, h, hash.Hashable(info))
211211
}
212-
_, err := db.writeDB.Exec(query, args...)
212+
_, err := db.writeDB.ExecContext(ctx, query, args...)
213213
if err != nil {
214214
if exists, err2 := db.SignerInfoExists(ctx, id); err2 == nil && exists {
215215
logger.Debugf("signer info [%s] exists, no error to return", h)
@@ -271,7 +271,7 @@ func (db *IdentityStore) GetExistingSignerInfo(ctx context.Context, ids ...tdriv
271271
Format(db.ci)
272272

273273
logger.Debug(query, args)
274-
rows, err := db.readDB.Query(query, args...)
274+
rows, err := db.readDB.QueryContext(ctx, query, args...)
275275
if err != nil {
276276
return nil, errors.Wrapf(err, "error querying db")
277277
}

‎token/services/db/sql/common/tokenlock.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func (db *TokenLockStore) Lock(ctx context.Context, tokenID *token.ID, consumerT
6767
Row(consumerTxID, tokenID.TxId, tokenID.Index, time.Now().UTC()).
6868
Format()
6969
logger.Debug(query, tokenID, consumerTxID)
70-
_, err := db.WriteDB.Exec(query, args...)
70+
_, err := db.WriteDB.ExecContext(ctx, query, args...)
7171
return err
7272
}
7373

@@ -77,7 +77,7 @@ func (db *TokenLockStore) UnlockByTxID(ctx context.Context, consumerTxID transac
7777
Format(db.ci)
7878
logger.Debug(query, consumerTxID)
7979

80-
_, err := db.WriteDB.Exec(query, args...)
80+
_, err := db.WriteDB.ExecContext(ctx, query, args...)
8181
return err
8282
}
8383

‎token/services/db/sql/common/tokens.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func (db *TokenStore) DeleteTokens(ctx context.Context, deletedBy string, ids ..
100100
Where(HasTokens("tx_id", "idx", ids...)).
101101
Format(db.ci)
102102
logger.Debug(query, args)
103-
if _, err := db.writeDB.Exec(query, args...); err != nil {
103+
if _, err := db.writeDB.ExecContext(ctx, query, args...); err != nil {
104104
return errors.Wrapf(err, "error setting tokens to deleted [%v]", ids)
105105
}
106106
return nil
@@ -210,7 +210,7 @@ func (db *TokenStore) queryLedgerTokens(ctx context.Context, details driver.Quer
210210

211211
logger.Debug(query, args)
212212

213-
rows, err := db.readDB.Query(query, args...)
213+
rows, err := db.readDB.QueryContext(ctx, query, args...)
214214

215215
if err != nil {
216216
return nil, errors.Wrapf(err, "error querying db")
@@ -289,7 +289,7 @@ func (db *TokenStore) ListAuditTokens(ctx context.Context, ids ...*token.ID) ([]
289289
Format(db.ci)
290290

291291
logger.Debug(query, args)
292-
rows, err := db.readDB.Query(query, args...)
292+
rows, err := db.readDB.QueryContext(ctx, query, args...)
293293
if err != nil {
294294
return nil, err
295295
}
@@ -348,7 +348,7 @@ func (db *TokenStore) ListHistoryIssuedTokens(ctx context.Context) (*token.Issue
348348
Format(db.ci)
349349

350350
logger.Debug(query)
351-
rows, err := db.readDB.Query(query, args...)
351+
rows, err := db.readDB.QueryContext(ctx, query, args...)
352352
if err != nil {
353353
return nil, err
354354
}
@@ -364,7 +364,7 @@ func (db *TokenStore) ListHistoryIssuedTokens(ctx context.Context) (*token.Issue
364364
}
365365

366366
func (db *TokenStore) GetTokenOutputs(ctx context.Context, ids []*token.ID, callback tdriver.QueryCallbackFunc) error {
367-
tokens, err := db.getLedgerToken(ids)
367+
tokens, err := db.getLedgerToken(ctx, ids)
368368
if err != nil {
369369
return err
370370
}
@@ -400,7 +400,7 @@ func (db *TokenStore) GetAllTokenInfos(ctx context.Context, ids []*token.ID) ([]
400400
return metas, err
401401
}
402402

403-
func (db *TokenStore) getLedgerToken(ids []*token.ID) ([][]byte, error) {
403+
func (db *TokenStore) getLedgerToken(ctx context.Context, ids []*token.ID) ([][]byte, error) {
404404
logger.Debugf("retrieve ledger tokens for [%s]", ids)
405405
if len(ids) == 0 {
406406
return [][]byte{}, nil
@@ -413,7 +413,7 @@ func (db *TokenStore) getLedgerToken(ids []*token.ID) ([][]byte, error) {
413413
Format(db.ci)
414414

415415
logger.Debug(query, args)
416-
rows, err := db.readDB.Query(query, args...)
416+
rows, err := db.readDB.QueryContext(ctx, query, args...)
417417
if err != nil {
418418
return nil, err
419419
}
@@ -511,7 +511,7 @@ func (db *TokenStore) GetTokens(ctx context.Context, inputs ...*token.ID) ([]*to
511511
Format(db.ci)
512512

513513
logger.Debug(query, args)
514-
rows, err := db.readDB.Query(query, args...)
514+
rows, err := db.readDB.QueryContext(ctx, query, args...)
515515
if err != nil {
516516
return nil, err
517517
}
@@ -583,7 +583,7 @@ func (db *TokenStore) QueryTokenDetails(ctx context.Context, params driver.Query
583583
Format(db.ci)
584584

585585
logger.Debug(query, args)
586-
rows, err := db.readDB.Query(query, args...)
586+
rows, err := db.readDB.QueryContext(ctx, query, args...)
587587
if err != nil {
588588
return nil, err
589589
}
@@ -608,7 +608,7 @@ func (db *TokenStore) WhoDeletedTokens(ctx context.Context, inputs ...*token.ID)
608608
Format(db.ci)
609609

610610
logger.Debug(query, args)
611-
rows, err := db.readDB.Query(query, args...)
611+
rows, err := db.readDB.QueryContext(ctx, query, args...)
612612
if err != nil {
613613
return nil, nil, err
614614
}
@@ -683,7 +683,7 @@ func (db *TokenStore) StorePublicParams(ctx context.Context, raw []byte) error {
683683
Row(raw, rawHash, time.Now().UTC()).
684684
Format()
685685
logger.Debugf(query, fmt.Sprintf("store public parameters (%d bytes), hash [%s]", len(raw), logging.Base64(rawHash)))
686-
_, err := db.writeDB.Exec(query, args...)
686+
_, err := db.writeDB.ExecContext(ctx, query, args...)
687687
return err
688688
}
689689

@@ -725,7 +725,7 @@ func (db *TokenStore) StoreCertifications(ctx context.Context, certifications ma
725725
Fields("tx_id", "idx", "certification", "stored_at").
726726
Rows(rows).
727727
Format()
728-
if _, err := db.writeDB.Exec(query, args...); err != nil {
728+
if _, err := db.writeDB.ExecContext(ctx, query, args...); err != nil {
729729
return tokenDBError(err)
730730
}
731731
return nil
@@ -767,7 +767,7 @@ func (db *TokenStore) GetCertifications(ctx context.Context, ids []*token.ID) ([
767767
Format(db.ci)
768768

769769
logger.Debug(query, args)
770-
rows, err := db.readDB.Query(query, args...)
770+
rows, err := db.readDB.QueryContext(ctx, query, args...)
771771
if err != nil {
772772
return nil, errors.Wrapf(err, "failed to query")
773773
}
@@ -997,7 +997,7 @@ func (t *TokenTransaction) Delete(ctx context.Context, tokenID token.ID, deleted
997997
Format(t.ci)
998998

999999
logger.Debug(query, args)
1000-
if _, err := t.tx.Exec(query, args...); err != nil {
1000+
if _, err := t.tx.ExecContext(ctx, query, args...); err != nil {
10011001
return errors.Wrapf(err, "error setting token to deleted [%s]", tokenID.TxId)
10021002
}
10031003

@@ -1015,7 +1015,7 @@ func (t *TokenTransaction) StoreToken(ctx context.Context, tr driver.TokenRecord
10151015
Row(tr.TxID, tr.Index, tr.IssuerRaw, tr.OwnerRaw, tr.OwnerType, tr.OwnerIdentity, tr.OwnerWalletID, tr.Ledger, tr.LedgerFormat, tr.LedgerMetadata, tr.Type, tr.Quantity, tr.Amount, time.Now().UTC(), tr.Owner, tr.Auditor, tr.Issuer).
10161016
Format()
10171017
logger.Debug(query, args)
1018-
if _, err := t.tx.Exec(query, args...); err != nil {
1018+
if _, err := t.tx.ExecContext(ctx, query, args...); err != nil {
10191019
logger.Errorf("error storing token [%s] in table [%s] [%s]: [%s][%s]", tr.TxID, t.table.Tokens, query, err, string(debug.Stack()))
10201020
return errors.Wrapf(err, "error storing token [%s] in table [%s]", tr.TxID, t.table.Tokens)
10211021
}
@@ -1035,7 +1035,7 @@ func (t *TokenTransaction) StoreToken(ctx context.Context, tr driver.TokenRecord
10351035
Format()
10361036
logger.Debug(query, args)
10371037

1038-
if _, err := t.tx.Exec(query, args...); err != nil {
1038+
if _, err := t.tx.ExecContext(ctx, query, args...); err != nil {
10391039
logger.Errorf("error storing token ownerships [%s]: %s", query, err)
10401040
return errors.Wrapf(err, "error storing token ownership [%s]", tr.TxID)
10411041
}

‎token/services/db/sql/common/transactions.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func (db *TransactionStore) QueryMovements(ctx context.Context, params driver.Qu
108108
Format(db.ci)
109109

110110
logger.Debug(query, args)
111-
rows, err := db.readDB.Query(query, args...)
111+
rows, err := db.readDB.QueryContext(ctx, query, args...)
112112
if err != nil {
113113
return nil, err
114114
}
@@ -143,7 +143,7 @@ func (db *TransactionStore) QueryTransactions(ctx context.Context, params driver
143143
FormatPaginated(db.ci, db.pi)
144144

145145
logger.Debug(query, args)
146-
rows, err := db.readDB.Query(query, args...)
146+
rows, err := db.readDB.QueryContext(ctx, query, args...)
147147
if err != nil {
148148
return nil, err
149149
}
@@ -178,7 +178,7 @@ func (db *TransactionStore) GetStatus(ctx context.Context, txID string) (driver.
178178
Format(db.ci)
179179
logger.Debug(query, txID)
180180

181-
row := db.readDB.QueryRow(query, args...)
181+
row := db.readDB.QueryRowContext(ctx, query, args...)
182182
if err := row.Scan(&status, &statusMessage); err != nil {
183183
if err == sql.ErrNoRows {
184184
logger.Debugf("tried to get status for non-existent tx [%s], returning unknown", txID)
@@ -203,7 +203,7 @@ func (db *TransactionStore) QueryValidations(ctx context.Context, params driver.
203203
Format(db.ci)
204204

205205
logger.Debug(query, args)
206-
rows, err := db.readDB.Query(query, args...)
206+
rows, err := db.readDB.QueryContext(ctx, query, args...)
207207
if err != nil {
208208
return nil, err
209209
}
@@ -230,7 +230,7 @@ func (db *TransactionStore) QueryTokenRequests(ctx context.Context, params drive
230230
Format(db.ci)
231231

232232
logger.Debug(query, args)
233-
rows, err := db.readDB.Query(query, args...)
233+
rows, err := db.readDB.QueryContext(ctx, query, args...)
234234
if err != nil {
235235
return nil, err
236236
}
@@ -252,7 +252,7 @@ func (db *TransactionStore) AddTransactionEndorsementAck(ctx context.Context, tx
252252
Format()
253253

254254
logger.Debug(query, txID, fmt.Sprintf("(%d bytes)", len(endorser)), fmt.Sprintf("(%d bytes)", len(sigma)), now)
255-
if _, err = db.writeDB.Exec(query, args...); err != nil {
255+
if _, err = db.writeDB.ExecContext(ctx, query, args...); err != nil {
256256
return ttxDBError(err)
257257
}
258258
return
@@ -266,7 +266,7 @@ func (db *TransactionStore) GetTransactionEndorsementAcks(ctx context.Context, t
266266
Format(db.ci)
267267
logger.Debug(query, txID)
268268

269-
rows, err := db.readDB.Query(query, args...)
269+
rows, err := db.readDB.QueryContext(ctx, query, args...)
270270
if err != nil {
271271
return nil, errors.Wrapf(err, "failed to query")
272272
}
@@ -454,7 +454,7 @@ func (w *AtomicWrite) AddTransaction(ctx context.Context, r *driver.TransactionR
454454
Row(id, r.TxID, actionType, r.SenderEID, r.RecipientEID, r.TokenType, amount, r.Timestamp.UTC()).
455455
Format()
456456
logger.Debug(query, args)
457-
_, err = w.txn.Exec(query, args...)
457+
_, err = w.txn.ExecContext(ctx, query, args...)
458458

459459
return ttxDBError(err)
460460
}
@@ -484,7 +484,7 @@ func (w *AtomicWrite) AddTokenRequest(ctx context.Context, txID string, tr []byt
484484
Row(txID, tr, driver.Pending, "", ja, jp, ppHash).
485485
Format()
486486
logger.Debug(query, txID, fmt.Sprintf("(%d bytes)", len(tr)), len(applicationMetadata), len(publicMetadata), len(ppHash))
487-
_, err = w.txn.Exec(query, args...)
487+
_, err = w.txn.ExecContext(ctx, query, args...)
488488

489489
return ttxDBError(err)
490490
}
@@ -510,7 +510,7 @@ func (w *AtomicWrite) AddMovement(ctx context.Context, r *driver.MovementRecord)
510510
Row(id, r.TxID, r.EnrollmentID, r.TokenType, amount, now).
511511
Format()
512512
logger.Debug(query, args)
513-
_, err = w.txn.Exec(query, args...)
513+
_, err = w.txn.ExecContext(ctx, query, args...)
514514

515515
return ttxDBError(err)
516516
}
@@ -532,7 +532,7 @@ func (w *AtomicWrite) AddValidationRecord(ctx context.Context, txID string, meta
532532
Format()
533533
logger.Debug(query, txID, len(md), now)
534534

535-
_, err = w.txn.Exec(query, args...)
535+
_, err = w.txn.ExecContext(ctx, query, args...)
536536
return ttxDBError(err)
537537
}
538538

‎token/services/db/sql/common/wallet.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func (db *WalletStore) GetWalletIDs(ctx context.Context, roleID int) ([]driver.W
7474
Where(cond.Eq("role_id", roleID)).
7575
Format(db.ci)
7676
logger.Debug(query)
77-
rows, err := db.readDB.Query(query, args...)
77+
rows, err := db.readDB.QueryContext(ctx, query, args...)
7878
if err != nil {
7979
return nil, err
8080
}
@@ -95,7 +95,7 @@ func (db *WalletStore) StoreIdentity(ctx context.Context, identity token.Identit
9595
Format()
9696
logger.Debug(query)
9797

98-
_, err := db.writeDB.Exec(query, args...)
98+
_, err := db.writeDB.ExecContext(ctx, query, args...)
9999
if err != nil {
100100
return errors.Wrapf(err, "failed storing wallet [%v] for identity [%s]", wID, identity)
101101
}

‎token/services/db/sql/postgres/tokenlock.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (db *TokenLockStore) Cleanup(ctx context.Context, leaseExpiry time.Duration
5656
Build()
5757

5858
db.Logger.Debug(query)
59-
_, err := db.WriteDB.Exec(query, args...)
59+
_, err := db.WriteDB.ExecContext(ctx, query, args...)
6060
if err != nil {
6161
db.Logger.Errorf("query failed: %s", query)
6262
}
@@ -78,7 +78,7 @@ func (db *TokenLockStore) logStaleLocks(ctx context.Context, leaseExpiry time.Du
7878
Where(common.IsExpiredToken(tokenRequests, tokenLocks, leaseExpiry)).Format(db.ci)
7979
db.Logger.Debug(query, args)
8080

81-
rows, err := db.ReadDB.Query(query, args...)
81+
rows, err := db.ReadDB.QueryContext(ctx, query, args...)
8282
if err != nil {
8383
return err
8484
}

‎token/services/db/sql/sqlite/tokenlock.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func (db *TokenLockStore) Cleanup(ctx context.Context, leaseExpiry time.Duration
5151
Format(db.ci)
5252

5353
db.Logger.Info(query, args)
54-
_, err := db.WriteDB.Exec(query, args...)
54+
_, err := db.WriteDB.ExecContext(ctx, query, args...)
5555
if err != nil {
5656
db.Logger.Errorf("query failed: %s", query)
5757
}

0 commit comments

Comments
 (0)