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

cmd/ido2icingadb: simplify unnecessarily complex datatype

Browse source
This commit is contained in:
Alexander A. Klimov 2021-10-11 18:12:12 +02:00
parent 4fe3134bdd
commit 77fa207eb5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmd/ido2icingadb/cache.go
View file

@ -152,15 +152,15 @@ func buildPreviousHardStateCache(ht *historyType, idoColumns []string) {
}
cacheGet(*tx, &nextIds, "SELECT COUNT(*) cnt, MIN(history_id) min_id FROM next_ids")
var previousHardState struct{ Cnt int64 }
cacheGet(*tx, &previousHardState, "SELECT COUNT(*) cnt FROM previous_hard_state")
var previousHardStateCnt int64
cacheGet(*tx, &previousHardStateCnt, "SELECT COUNT(*) FROM previous_hard_state")
var checkpoint int64
if nextIds.MinId.Valid { // there are next_ids
checkpoint = nextIds.MinId.Int64 // this kind of caches is filled descending
} else { // there aren't any next_ids
// next_ids contains the most recently processed IDs and is only empty if...
if previousHardState.Cnt == 0 {
if previousHardStateCnt == 0 {
// ... we didn't actually start yet...
checkpoint = math.MaxInt64 // start from the largest (possible) ID
} else {
@ -169,7 +169,7 @@ func buildPreviousHardStateCache(ht *historyType, idoColumns []string) {
}
}
ht.bar.SetCurrent(previousHardState.Cnt + nextIds.Cnt)
ht.bar.SetCurrent(previousHardStateCnt + nextIds.Cnt)
inc := barIncrementer{ht.bar, time.Now()}
// We continue where we finished before. As we build the cache in reverse chronological order: