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.

Sign up for GitHub

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

Jump to bottom

Execute single multi writing query instead of multiple single queries #105

Merged
merged 5 commits into from
Jul 18, 2024
Merged

Execute single multi writing query instead of multiple single queries #105

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
272eeae
Execute single query to modify multiple rows instead of executing a s…
begmaroman Jul 18, 2024
c0168a0
Fixed tests
begmaroman Jul 18, 2024
981b9c7
Fixed linter
begmaroman Jul 18, 2024
275e5b1
Fixed linter
begmaroman Jul 18, 2024
9842e62
Fixed linter
begmaroman Jul 18, 2024
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
96 changes: 50 additions & 46 deletions db/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"database/sql"
"errors"
"fmt"
"strings"

"github.com/0xPolygon/cdk-data-availability/types"
"github.com/ethereum/go-ethereum/common"
Expand All @@ -23,7 +24,7 @@
getLastProcessedBlockSQL = `SELECT block FROM data_node.sync_tasks WHERE task = $1;`

// storeUnresolvedBatchesSQL is a query that stores unresolved batches in the database
storeUnresolvedBatchesSQL = `

Check failure on line 27 in db/db.go

View workflow job for this annotation

GitHub Actions / lint 

const `storeUnresolvedBatchesSQL` is unused (unused)
INSERT INTO data_node.unresolved_batches (num, hash)
VALUES ($1, $2)
ON CONFLICT (num, hash) DO NOTHING;
Expand All @@ -32,11 +33,8 @@
// getUnresolvedBatchKeysSQL is a query that returns the unresolved batch keys from the database
getUnresolvedBatchKeysSQL = `SELECT num, hash FROM data_node.unresolved_batches LIMIT $1;`

// deleteUnresolvedBatchKeysSQL is a query that deletes the unresolved batch keys from the database
deleteUnresolvedBatchKeysSQL = `DELETE FROM data_node.unresolved_batches WHERE num = $1 AND hash = $2;`

// storeOffChainDataSQL is a query that stores offchain data in the database
storeOffChainDataSQL = `

Check failure on line 37 in db/db.go

View workflow job for this annotation

GitHub Actions / lint 

const `storeOffChainDataSQL` is unused (unused)
INSERT INTO data_node.offchain_data (key, value, batch_num)
VALUES ($1, $2, $3)
ON CONFLICT (key) DO UPDATE
Expand Down Expand Up @@ -175,27 +173,29 @@

// StoreUnresolvedBatchKeys stores unresolved batch keys in the database
func (db *pgDB) StoreUnresolvedBatchKeys(ctx context.Context, bks []types.BatchKey) error {
tx, err := db.pg.BeginTxx(ctx, nil)
if err != nil {
return err
if len(bks) == 0 {
return nil
}

stmt, err := tx.PreparexContext(ctx, storeUnresolvedBatchesSQL)
if err != nil {
return err
args := make([]interface{}, len(bks)*2)

Check failure on line 180 in db/db.go

View workflow job for this annotation

GitHub Actions / lint 

Magic number: 2, in <argument> detected (gomnd)
values := make([]string, len(bks))
for i, _ := range bks {

Check failure on line 182 in db/db.go

View workflow job for this annotation

GitHub Actions / lint 

File is not `gofmt`-ed with `-s` (gofmt)
values[i] = fmt.Sprintf("($%d, $%d)", i*2+1, i*2+2)

Check failure on line 183 in db/db.go

View workflow job for this annotation

GitHub Actions / lint 

Magic number: 2, in <argument> detected (gomnd)
args[i*2] = bks[i].Number
args[i*2+1] = bks[i].Hash.Hex()
}

for _, bk := range bks {
if _, err = stmt.ExecContext(ctx, bk.Number, bk.Hash.Hex()); err != nil {
if txErr := tx.Rollback(); txErr != nil {
return fmt.Errorf("%v: rollback caused by %v", txErr, err)
}
query := fmt.Sprintf(`
INSERT INTO data_node.unresolved_batches (num, hash)
VALUES %s
ON CONFLICT (num, hash) DO NOTHING;
`, strings.Join(values, ","))

return err
}
if _, err := db.pg.ExecContext(ctx, query, args...); err != nil {
return fmt.Errorf("failed to store unresolved batches: %w", err)
}

return tx.Commit()
return nil
}

// GetUnresolvedBatchKeys returns the unresolved batch keys from the database
Expand Down Expand Up @@ -230,52 +230,56 @@

// DeleteUnresolvedBatchKeys deletes the unresolved batch keys from the database
func (db *pgDB) DeleteUnresolvedBatchKeys(ctx context.Context, bks []types.BatchKey) error {
tx, err := db.pg.BeginTxx(ctx, nil)
if err != nil {
return err
if len(bks) == 0 {
return nil
}

stmt, err := tx.PreparexContext(ctx, deleteUnresolvedBatchKeysSQL)
if err != nil {
return err
args := make([]interface{}, len(bks)*2)

Check failure on line 237 in db/db.go

View workflow job for this annotation

GitHub Actions / lint 

Magic number: 2, in <argument> detected (gomnd)
values := make([]string, len(bks))
for i, _ := range bks {
values[i] = fmt.Sprintf("($%d, $%d)", i*2+1, i*2+2)
args[i*2] = bks[i].Number
args[i*2+1] = bks[i].Hash.Hex()
}

for _, bk := range bks {
if _, err = stmt.ExecContext(ctx, bk.Number, bk.Hash.Hex()); err != nil {
if txErr := tx.Rollback(); txErr != nil {
return fmt.Errorf("%v: rollback caused by %v", txErr, err)
}
query := fmt.Sprintf(`
DELETE FROM data_node.unresolved_batches WHERE (num, hash) IN (%s);
`, strings.Join(values, ","))

return err
}
if _, err := db.pg.ExecContext(ctx, query, args...); err != nil {
return fmt.Errorf("failed to delete unresolved batches: %w", err)
}

return tx.Commit()
return nil
}

// StoreOffChainData stores and array of key values in the Db
func (db *pgDB) StoreOffChainData(ctx context.Context, od []types.OffChainData) error {
tx, err := db.pg.BeginTxx(ctx, nil)
if err != nil {
return err
func (db *pgDB) StoreOffChainData(ctx context.Context, ods []types.OffChainData) error {
if len(ods) == 0 {
return nil
}

stmt, err := tx.PreparexContext(ctx, storeOffChainDataSQL)
if err != nil {
return err
args := make([]interface{}, len(ods)*3)

Check failure on line 262 in db/db.go

View workflow job for this annotation

GitHub Actions / lint 

Magic number: 3, in <argument> detected (gomnd)
values := make([]string, len(ods))
for i, od := range ods {
values[i] = fmt.Sprintf("($%d, $%d, $%d)", i*3+1, i*3+2, i*3+3)
args[i*3] = od.Key.Hex()
args[i*3+1] = common.Bytes2Hex(od.Value)
args[i*3+2] = od.BatchNum
}

for _, d := range od {
if _, err = stmt.ExecContext(ctx, d.Key.Hex(), common.Bytes2Hex(d.Value), d.BatchNum); err != nil {
if txErr := tx.Rollback(); txErr != nil {
return fmt.Errorf("%v: rollback caused by %v", txErr, err)
}
query := fmt.Sprintf(`
INSERT INTO data_node.offchain_data (key, value, batch_num)
VALUES %s
ON CONFLICT (key) DO UPDATE
SET value = EXCLUDED.value, batch_num = EXCLUDED.batch_num;
`, strings.Join(values, ","))

return err
}
if _, err := db.pg.ExecContext(ctx, query, args...); err != nil {
return fmt.Errorf("failed to store offchain data: %w", err)
}

return tx.Commit()
return nil
}

// GetOffChainData returns the value identified by the key
Expand Down
Loading
Loading