upstream/icingadb
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb.git synced 2026-06-09 00:42:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

cmd/ido2icingadb: remove unnecessary transactions

Browse source 
for the sake of speed.
This commit is contained in:
Alexander A. Klimov 2022-08-11 13:48:38 +02:00
parent 690fcfa190
commit 23130d7be8
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cmd/ido2icingadb/main.go
View file

@ -356,11 +356,6 @@ func migrateOneType[IdoRow any](
// ... and insert them:
tx, err := idb.Beginx()
if err != nil {
log.With("backend", "Icinga DB").Fatalf("%+v", errors.Wrap(err, "can't begin transaction"))
}
for _, op := range []struct {
data [][]any
stmtBuilder func(any) (string, int)
@ -383,7 +378,7 @@ func migrateOneType[IdoRow any](
context.Background(), ch, idb.BatchSizeByPlaceholders(placeholders), com.NeverSplit[any],
)
for rows := range bulk {
if _, err := tx.NamedExec(query, rows); err != nil {
if _, err := idb.NamedExec(query, rows); err != nil {
log.With("backend", "Icinga DB", "dml", query, "args", rows).
Fatalf("%+v", errors.Wrap(err, "can't perform DML"))
}
@ -394,7 +389,7 @@ func migrateOneType[IdoRow any](
if lastIdoId != nil {
args := map[string]interface{}{"history_type": ht.name, "last_ido_id": lastIdoId}
_, err := tx.NamedExec(upsertProgress, &IdoMigrationProgress{
_, err := idb.NamedExec(upsertProgress, &IdoMigrationProgress{
IdoMigrationProgressUpserter{lastIdoId}, envIdHex, ht.name,
})
if err != nil {
@ -403,10 +398,6 @@ func migrateOneType[IdoRow any](
}
}
if err := tx.Commit(); err != nil {
log.With("backend", "Icinga DB").Fatalf("%+v", errors.Wrap(err, "can't commit transaction"))
}
ht.bar.IncrBy(len(idoRows))
return lastIdoId
},

2
cmd/ido2icingadb/misc.go
View file

@ -151,7 +151,7 @@ func sliceIdoHistory[Row any](
}
args["checkpoint"] = checkpoint
args["bulk"] = 100
args["bulk"] = 10000
if snapshot.DriverName() != driver.MySQL {
query = strings.ReplaceAll(query, " USE INDEX (PRIMARY)", "")