Merge branch 'master' into pqlCleanup

This commit is contained in:
Travis Turner 2020-10-19 15:45:04 -05:00 committed by GitHub
commit f37a63e5cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View file

@ -53,7 +53,7 @@ jobs:
name: golang
steps:
- checkout-plus
- run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/local/bin v1.23.8
- run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/local/bin v1.31.0
- run: make golangci-lint
go-mod-tidy:
executor:

View file

@ -96,7 +96,8 @@ func (tx *Tx) Commit() error {
for _, path := range tx.updatedSegmentPaths {
segment := walSegmentByPath(tx.segments, path)
assert(segment != nil)
tx.db.updateWALSegment(*segment)
//lint:ignore SA5011 the assert above prevents this from being nil
tx.db.updateWALSegment(*segment) //nolint:staticcheck
}
tx.db.mu.Unlock()
}