felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

cmd/uraggregate: Handle malformed data, dont abort on error (fixes #7639) (#7659)

Browse Source
This commit is contained in:
Audrius Butkevicius
2021-05-11 08:02:19 +02:00
committed by GitHub
parent aca1b45e93
commit a8e2fc6f61
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/uraggregate/main.go
+8 -7
View File
@@ -49,30 +49,30 @@ func runAggregation(db *sql.DB) {
log.Println("Aggregating VersionSummary data since", since) log.Println("Aggregating VersionSummary data since", since)
rows, err := aggregateVersionSummary(db, since) rows, err := aggregateVersionSummary(db, since)
if err != nil { if err != nil {
log.Fatalln("aggregate:", err) log.Println("aggregate:", err)
} }
log.Println("Inserted", rows, "rows") log.Println("Inserted", rows, "rows")
log.Println("Aggregating UserMovement data") log.Println("Aggregating UserMovement data")
rows, err = aggregateUserMovement(db) rows, err = aggregateUserMovement(db)
if err != nil { if err != nil {
log.Fatalln("aggregate:", err) log.Println("aggregate:", err)
} }
log.Println("Inserted", rows, "rows") log.Println("Inserted", rows, "rows")
log.Println("Aggregating Performance data")
since = maxIndexedDay(db, "Performance") since = maxIndexedDay(db, "Performance")
log.Println("Aggregating Performance data since", since)
rows, err = aggregatePerformance(db, since) rows, err = aggregatePerformance(db, since)
if err != nil { if err != nil {
log.Fatalln("aggregate:", err) log.Println("aggregate:", err)
} }
log.Println("Inserted", rows, "rows") log.Println("Inserted", rows, "rows")
log.Println("Aggregating BlockStats data")
since = maxIndexedDay(db, "BlockStats") since = maxIndexedDay(db, "BlockStats")
log.Println("Aggregating BlockStats data since", since)
rows, err = aggregateBlockStats(db, since) rows, err = aggregateBlockStats(db, since)
if err != nil { if err != nil {
log.Fatalln("aggregate:", err) log.Println("aggregate:", err)
} }
log.Println("Inserted", rows, "rows") log.Println("Inserted", rows, "rows")
} }
@@ -198,7 +198,8 @@ func aggregateUserMovement(db *sql.DB) (int64, error) {
Report->>'uniqueID' Report->>'uniqueID'
FROM ReportsJson FROM ReportsJson
WHERE WHERE
DATE_TRUNC('day', Received) < DATE_TRUNC('day', NOW()) Report->>'uniqueID' IS NOT NULL
AND DATE_TRUNC('day', Received) < DATE_TRUNC('day', NOW())
AND Report->>'version' like 'v_.%' AND Report->>'version' like 'v_.%'
ORDER BY Day ORDER BY Day
`) `)