Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: several minor quality issues (#23667) 

* fix: invalid assign to nil pointer

* fix: close some files that were being left open

* fix: lint
pull/23669/head
Jeffrey Smith II 2022-08-23 15:54:46 -04:00 committed by GitHub
parent 785a465e9a
commit daaf8665bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
http/notification_rule.go
View File

@ -404,7 +404,7 @@ func decodeNotificationRuleFilter(ctx context.Context, r *http.Request) (*influx
} }
f.OrgID = orgID f.OrgID = orgID
} else if orgNameStr := q.Get("org"); orgNameStr != "" { } else if orgNameStr := q.Get("org"); orgNameStr != "" {
*f.Organization = orgNameStr f.Organization = &orgNameStr
} }
for _, tag := range q["tag"] { for _, tag := range q["tag"] {

14
sqlite/sqlite.go
View File

@ -9,6 +9,8 @@ import (
"path/filepath" "path/filepath"
"sync" "sync"
errors2 "github.com/influxdata/influxdb/v2/pkg/errors"
"github.com/influxdata/influxdb/v2/kit/tracing" "github.com/influxdata/influxdb/v2/kit/tracing"
"github.com/influxdata/influxdb/v2/pkg/fs" "github.com/influxdata/influxdb/v2/pkg/fs"
sqliteMigrations "github.com/influxdata/influxdb/v2/sqlite/migrations" sqliteMigrations "github.com/influxdata/influxdb/v2/sqlite/migrations"
@ -120,7 +122,7 @@ func (s *SqlStore) Flush(ctx context.Context) {
// is the resulting backup. The underlying sqlite connection is needed for both // is the resulting backup. The underlying sqlite connection is needed for both
// SOURCE and DESTINATION databases to use the sqlite backup API made available by the // SOURCE and DESTINATION databases to use the sqlite backup API made available by the
// go-sqlite3 driver. // go-sqlite3 driver.
func (s *SqlStore) BackupSqlStore(ctx context.Context, w io.Writer) error { func (s *SqlStore) BackupSqlStore(ctx context.Context, w io.Writer) (rErr error) {
span, _ := tracing.StartSpanFromContext(ctx) span, _ := tracing.StartSpanFromContext(ctx)
defer span.Finish() defer span.Finish()
@ -136,6 +138,7 @@ func (s *SqlStore) BackupSqlStore(ctx context.Context, w io.Writer) error {
if err != nil { if err != nil {
return err return err
} }
defer errors2.Capture(&rErr, dest.Close)
if err := backup(ctx, dest, s); err != nil { if err := backup(ctx, dest, s); err != nil {
return err return err
@ -211,7 +214,7 @@ func sqliteFromSqlConn(c *sql.Conn) (*sqlite3.SQLiteConn, error) {
} }
// RestoreSqlStore replaces the underlying database with the data from r. // RestoreSqlStore replaces the underlying database with the data from r.
func (s *SqlStore) RestoreSqlStore(ctx context.Context, r io.Reader) error { func (s *SqlStore) RestoreSqlStore(ctx context.Context, r io.Reader) (rErr error) {
tempDir, err := os.MkdirTemp("", "") tempDir, err := os.MkdirTemp("", "")
if err != nil { if err != nil {
return err return err
@ -224,13 +227,16 @@ func (s *SqlStore) RestoreSqlStore(ctx context.Context, r io.Reader) error {
if err != nil { if err != nil {
return err return err
} }
defer errors2.Capture(&rErr, f.Close)
// Copy the contents of r to the temporary file // Copy the contents of r to the temporary file
if _, err := io.Copy(f, r); err != nil { if _, err := io.Copy(f, r); err != nil {
return err return err
} else if err := f.Sync(); err != nil { }
if err := f.Sync(); err != nil {
return err return err
} else if err := f.Close(); err != nil { }
if err := f.Close(); err != nil {
return err return err
} }