GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-14 21:45:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(query-service): remove redundant nil check (#3614)

Browse Source 
From the Go specification [1]:

  "1. For a nil slice, the number of iterations is 0."
  "3. If the map is nil, the number of iterations is 0."

Therefore, an additional nil check for before the loop is unnecessary.

[1]: https://go.dev/ref/spec#For_range

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
This commit is contained in:
Eng Zer Jun 2023-09-24 17:12:17 +08:00 committed by GitHub
parent 043e5ca880
commit dc4acc0730
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/query-service/dao/sqlite/rbac.go
View File

@ -563,7 +563,6 @@ func (mds *ModelDaoSqlite) UpdateUserFlags(ctx context.Context, userId string, f
return nil, apiError return nil, apiError
} }
if userPayload.Flags != nil {
for k, v := range userPayload.Flags { for k, v := range userPayload.Flags {
if _, ok := flags[k]; !ok { if _, ok := flags[k]; !ok {
// insert only missing keys as we want to retain the // insert only missing keys as we want to retain the
@ -571,7 +570,6 @@ func (mds *ModelDaoSqlite) UpdateUserFlags(ctx context.Context, userId string, f
flags[k] = v flags[k] = v
} }
} }
}
// append existing flags with new ones // append existing flags with new ones

8
pkg/query-service/model/v3/v3.go
View File

@ -410,29 +410,23 @@ func (c *CompositeQuery) Validate() error {
return fmt.Errorf("composite query must contain at least one query") return fmt.Errorf("composite query must contain at least one query")
} }
if c.BuilderQueries != nil {
for name, query := range c.BuilderQueries { for name, query := range c.BuilderQueries {
if err := query.Validate(); err != nil { if err := query.Validate(); err != nil {
return fmt.Errorf("builder query %s is invalid: %w", name, err) return fmt.Errorf("builder query %s is invalid: %w", name, err)
} }
} }
}
if c.ClickHouseQueries != nil {
for name, query := range c.ClickHouseQueries { for name, query := range c.ClickHouseQueries {
if err := query.Validate(); err != nil { if err := query.Validate(); err != nil {
return fmt.Errorf("clickhouse query %s is invalid: %w", name, err) return fmt.Errorf("clickhouse query %s is invalid: %w", name, err)
} }
} }
}
if c.PromQueries != nil {
for name, query := range c.PromQueries { for name, query := range c.PromQueries {
if err := query.Validate(); err != nil { if err := query.Validate(); err != nil {
return fmt.Errorf("prom query %s is invalid: %w", name, err) return fmt.Errorf("prom query %s is invalid: %w", name, err)
} }
} }
}
if err := c.PanelType.Validate(); err != nil { if err := c.PanelType.Validate(); err != nil {
return fmt.Errorf("panel type is invalid: %w", err) return fmt.Errorf("panel type is invalid: %w", err)
@ -515,13 +509,11 @@ func (b *BuilderQuery) Validate() error {
} }
} }
if b.SelectColumns != nil {
for _, selectColumn := range b.SelectColumns { for _, selectColumn := range b.SelectColumns {
if err := selectColumn.Validate(); err != nil { if err := selectColumn.Validate(); err != nil {
return fmt.Errorf("select column is invalid %w", err) return fmt.Errorf("select column is invalid %w", err)
} }
} }
}
if b.Expression == "" { if b.Expression == "" {
return fmt.Errorf("expression is required") return fmt.Errorf("expression is required")