Commit f61e69ce by Karsten Weiss

Simplify comparison to bool constant (gosimple)

This fixes:
build.go:553:6: should omit comparison to bool constant, can be simplified to !strings.Contains(path, ".sha256") (S1002)
pkg/cmd/grafana-cli/commands/ls_command.go:27:5: should omit comparison to bool constant, can be simplified to !pluginDirInfo.IsDir() (S1002)
pkg/components/dynmap/dynmap_test.go:24:5: should omit comparison to bool constant, can be simplified to !value (S1002)
pkg/components/dynmap/dynmap_test.go:122:14: should omit comparison to bool constant, can be simplified to b (S1002)
pkg/components/dynmap/dynmap_test.go:125:14: should omit comparison to bool constant, can be simplified to !b (S1002)
pkg/components/dynmap/dynmap_test.go:128:14: should omit comparison to bool constant, can be simplified to !b (S1002)
pkg/models/org_user.go:51:5: should omit comparison to bool constant, can be simplified to !(*r).IsValid() (S1002)
pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go:77:12: should omit comparison to bool constant, can be simplified to !haveBool (S1002)
pkg/services/alerting/conditions/evaluator.go:23:9: should omit comparison to bool constant, can be simplified to !reducedValue.Valid (S1002)
pkg/services/alerting/conditions/evaluator.go:48:5: should omit comparison to bool constant, can be simplified to !reducedValue.Valid (S1002)
pkg/services/alerting/conditions/evaluator.go:91:5: should omit comparison to bool constant, can be simplified to !reducedValue.Valid (S1002)
pkg/services/alerting/conditions/query.go:56:6: should omit comparison to bool constant, can be simplified to !reducedValue.Valid (S1002)
pkg/services/alerting/extractor.go:107:20: should omit comparison to bool constant, can be simplified to !enabled.MustBool() (S1002)
pkg/services/alerting/notifiers/telegram.go:222:41: should omit comparison to bool constant, can be simplified to this.UploadImage (S1002)
pkg/services/sqlstore/apikey.go:58:12: should omit comparison to bool constant, can be simplified to !has (S1002)
pkg/services/sqlstore/apikey.go:72:12: should omit comparison to bool constant, can be simplified to !has (S1002)
pkg/services/sqlstore/dashboard.go:66:33: should omit comparison to bool constant, can be simplified to !cmd.Overwrite (S1002)
pkg/services/sqlstore/dashboard.go:175:12: should omit comparison to bool constant, can be simplified to !has (S1002)
pkg/services/sqlstore/dashboard.go:311:13: should omit comparison to bool constant, can be simplified to !has (S1002)
pkg/services/sqlstore/dashboard.go:444:12: should omit comparison to bool constant, can be simplified to !exists (S1002)
pkg/services/sqlstore/dashboard.go:472:12: should omit comparison to bool constant, can be simplified to !exists (S1002)
pkg/services/sqlstore/dashboard.go:554:32: should omit comparison to bool constant, can be simplified to !cmd.Overwrite (S1002)
pkg/services/sqlstore/dashboard_snapshot.go:83:12: should omit comparison to bool constant, can be simplified to !has (S1002)
pkg/services/sqlstore/plugin_setting.go:39:12: should omit comparison to bool constant, can be simplified to !has (S1002)
pkg/services/sqlstore/quota.go:34:12: should omit comparison to bool constant, can be simplified to !has (S1002)
pkg/services/sqlstore/quota.go:111:6: should omit comparison to bool constant, can be simplified to !has (S1002)
pkg/services/sqlstore/quota.go:136:12: should omit comparison to bool constant, can be simplified to !has (S1002)
pkg/services/sqlstore/quota.go:213:6: should omit comparison to bool constant, can be simplified to !has (S1002)
pkg/services/sqlstore/temp_user.go:129:12: should omit comparison to bool constant, can be simplified to !has (S1002)
pkg/services/sqlstore/user.go:157:12: should omit comparison to bool constant, can be simplified to !has (S1002)
pkg/services/sqlstore/user.go:182:5: should omit comparison to bool constant, can be simplified to !has (S1002)
pkg/services/sqlstore/user.go:191:12: should omit comparison to bool constant, can be simplified to !has (S1002)
pkg/services/sqlstore/user.go:212:12: should omit comparison to bool constant, can be simplified to !has (S1002)
pkg/services/sqlstore/user.go:307:12: should omit comparison to bool constant, can be simplified to !has (S1002)
pkg/social/generic_oauth.go:185:5: should omit comparison to bool constant, can be simplified to !s.extractToken(&data, token) (S1002)
pkg/tsdb/mssql/mssql.go:148:39: should omit comparison to bool constant, can be simplified to ok (S1002)
pkg/tsdb/mssql/mssql.go:212:6: should omit comparison to bool constant, can be simplified to !query.Model.Get("fillNull").MustBool(false) (S1002)
pkg/tsdb/mssql/mssql.go:247:56: should omit comparison to bool constant, can be simplified to ok (S1002)
pkg/tsdb/mssql/mssql.go:274:7: should omit comparison to bool constant, can be simplified to !exist (S1002)
pkg/tsdb/mssql/mssql.go:282:8: should omit comparison to bool constant, can be simplified to !exist (S1002)
pkg/tsdb/mysql/mysql.go:221:6: should omit comparison to bool constant, can be simplified to !query.Model.Get("fillNull").MustBool(false) (S1002)
pkg/tsdb/mysql/mysql.go:256:56: should omit comparison to bool constant, can be simplified to ok (S1002)
pkg/tsdb/mysql/mysql.go:283:7: should omit comparison to bool constant, can be simplified to !exist (S1002)
pkg/tsdb/mysql/mysql.go:291:8: should omit comparison to bool constant, can be simplified to !exist (S1002)
pkg/tsdb/postgres/postgres.go:134:39: should omit comparison to bool constant, can be simplified to ok (S1002)
pkg/tsdb/postgres/postgres.go:201:6: should omit comparison to bool constant, can be simplified to !query.Model.Get("fillNull").MustBool(false) (S1002)
pkg/tsdb/postgres/postgres.go:236:56: should omit comparison to bool constant, can be simplified to ok (S1002)
pkg/tsdb/postgres/postgres.go:263:7: should omit comparison to bool constant, can be simplified to !exist (S1002)
pkg/tsdb/postgres/postgres.go:271:8: should omit comparison to bool constant, can be simplified to !exist (S1002)
parent be2d6350
...@@ -550,7 +550,7 @@ func shaFilesInDist() { ...@@ -550,7 +550,7 @@ func shaFilesInDist() {
return nil return nil
} }
if strings.Contains(path, ".sha256") == false { if !strings.Contains(path, ".sha256") {
err := shaFile(path) err := shaFile(path)
if err != nil { if err != nil {
log.Printf("Failed to create sha file. error: %v\n", err) log.Printf("Failed to create sha file. error: %v\n", err)
......
...@@ -24,7 +24,7 @@ var validateLsCommand = func(pluginDir string) error { ...@@ -24,7 +24,7 @@ var validateLsCommand = func(pluginDir string) error {
return fmt.Errorf("error: %s", err) return fmt.Errorf("error: %s", err)
} }
if pluginDirInfo.IsDir() == false { if !pluginDirInfo.IsDir() {
return errors.New("plugin path is not a directory") return errors.New("plugin path is not a directory")
} }
......
...@@ -21,7 +21,7 @@ func NewAssert(t *testing.T) *Assert { ...@@ -21,7 +21,7 @@ func NewAssert(t *testing.T) *Assert {
} }
func (assert *Assert) True(value bool, message string) { func (assert *Assert) True(value bool, message string) {
if value == false { if !value {
log.Panicln("Assert: ", message) log.Panicln("Assert: ", message)
} }
} }
...@@ -119,13 +119,13 @@ func TestFirst(t *testing.T) { ...@@ -119,13 +119,13 @@ func TestFirst(t *testing.T) {
assert.True(s == "" && err != nil, "nonexistent string fail") assert.True(s == "" && err != nil, "nonexistent string fail")
b, err := j.GetBoolean("true") b, err := j.GetBoolean("true")
assert.True(b == true && err == nil, "bool true test") assert.True(b && err == nil, "bool true test")
b, err = j.GetBoolean("false") b, err = j.GetBoolean("false")
assert.True(b == false && err == nil, "bool false test") assert.True(!b && err == nil, "bool false test")
b, err = j.GetBoolean("invalid_field") b, err = j.GetBoolean("invalid_field")
assert.True(b == false && err != nil, "bool invalid test") assert.True(!b && err != nil, "bool invalid test")
list, err := j.GetValueArray("list") list, err := j.GetValueArray("list")
assert.True(list != nil && err == nil, "list should be an array") assert.True(list != nil && err == nil, "list should be an array")
......
...@@ -48,7 +48,7 @@ func (r *RoleType) UnmarshalJSON(data []byte) error { ...@@ -48,7 +48,7 @@ func (r *RoleType) UnmarshalJSON(data []byte) error {
*r = RoleType(str) *r = RoleType(str)
if (*r).IsValid() == false { if !(*r).IsValid() {
if (*r) != "" { if (*r) != "" {
return errors.New(fmt.Sprintf("JSON validation error: invalid role value: %s", *r)) return errors.New(fmt.Sprintf("JSON validation error: invalid role value: %s", *r))
} }
......
...@@ -74,7 +74,7 @@ func TestMappingRowValue(t *testing.T) { ...@@ -74,7 +74,7 @@ func TestMappingRowValue(t *testing.T) {
boolRowValue, _ := dpw.mapRowValue(&datasource.RowValue{Kind: datasource.RowValue_TYPE_BOOL, BoolValue: true}) boolRowValue, _ := dpw.mapRowValue(&datasource.RowValue{Kind: datasource.RowValue_TYPE_BOOL, BoolValue: true})
haveBool, ok := boolRowValue.(bool) haveBool, ok := boolRowValue.(bool)
if !ok || haveBool != true { if !ok || !haveBool {
t.Fatalf("Expected true, was %v", haveBool) t.Fatalf("Expected true, was %v", haveBool)
} }
......
...@@ -20,7 +20,7 @@ type AlertEvaluator interface { ...@@ -20,7 +20,7 @@ type AlertEvaluator interface {
type NoValueEvaluator struct{} type NoValueEvaluator struct{}
func (e *NoValueEvaluator) Eval(reducedValue null.Float) bool { func (e *NoValueEvaluator) Eval(reducedValue null.Float) bool {
return reducedValue.Valid == false return !reducedValue.Valid
} }
type ThresholdEvaluator struct { type ThresholdEvaluator struct {
...@@ -45,7 +45,7 @@ func newThresholdEvaluator(typ string, model *simplejson.Json) (*ThresholdEvalua ...@@ -45,7 +45,7 @@ func newThresholdEvaluator(typ string, model *simplejson.Json) (*ThresholdEvalua
} }
func (e *ThresholdEvaluator) Eval(reducedValue null.Float) bool { func (e *ThresholdEvaluator) Eval(reducedValue null.Float) bool {
if reducedValue.Valid == false { if !reducedValue.Valid {
return false return false
} }
...@@ -88,7 +88,7 @@ func newRangedEvaluator(typ string, model *simplejson.Json) (*RangedEvaluator, e ...@@ -88,7 +88,7 @@ func newRangedEvaluator(typ string, model *simplejson.Json) (*RangedEvaluator, e
} }
func (e *RangedEvaluator) Eval(reducedValue null.Float) bool { func (e *RangedEvaluator) Eval(reducedValue null.Float) bool {
if reducedValue.Valid == false { if !reducedValue.Valid {
return false return false
} }
......
...@@ -53,7 +53,7 @@ func (c *QueryCondition) Eval(context *alerting.EvalContext) (*alerting.Conditio ...@@ -53,7 +53,7 @@ func (c *QueryCondition) Eval(context *alerting.EvalContext) (*alerting.Conditio
reducedValue := c.Reducer.Reduce(series) reducedValue := c.Reducer.Reduce(series)
evalMatch := c.Evaluator.Eval(reducedValue) evalMatch := c.Evaluator.Eval(reducedValue)
if reducedValue.Valid == false { if !reducedValue.Valid {
emptySerieCount++ emptySerieCount++
} }
......
...@@ -104,7 +104,7 @@ func (e *DashAlertExtractor) getAlertFromPanels(jsonWithPanels *simplejson.Json, ...@@ -104,7 +104,7 @@ func (e *DashAlertExtractor) getAlertFromPanels(jsonWithPanels *simplejson.Json,
// backward compatibility check, can be removed later // backward compatibility check, can be removed later
enabled, hasEnabled := jsonAlert.CheckGet("enabled") enabled, hasEnabled := jsonAlert.CheckGet("enabled")
if hasEnabled && enabled.MustBool() == false { if hasEnabled && !enabled.MustBool() {
continue continue
} }
......
...@@ -219,7 +219,7 @@ func appendIfPossible(message string, extra string, sizeLimit int) string { ...@@ -219,7 +219,7 @@ func appendIfPossible(message string, extra string, sizeLimit int) string {
func (this *TelegramNotifier) Notify(evalContext *alerting.EvalContext) error { func (this *TelegramNotifier) Notify(evalContext *alerting.EvalContext) error {
var cmd *m.SendWebhookSync var cmd *m.SendWebhookSync
if evalContext.ImagePublicUrl == "" && this.UploadImage == true { if evalContext.ImagePublicUrl == "" && this.UploadImage {
cmd = this.buildMessage(evalContext, true) cmd = this.buildMessage(evalContext, true)
} else { } else {
cmd = this.buildMessage(evalContext, false) cmd = this.buildMessage(evalContext, false)
......
...@@ -55,7 +55,7 @@ func GetApiKeyById(query *m.GetApiKeyByIdQuery) error { ...@@ -55,7 +55,7 @@ func GetApiKeyById(query *m.GetApiKeyByIdQuery) error {
if err != nil { if err != nil {
return err return err
} else if has == false { } else if !has {
return m.ErrInvalidApiKey return m.ErrInvalidApiKey
} }
...@@ -69,7 +69,7 @@ func GetApiKeyByName(query *m.GetApiKeyByNameQuery) error { ...@@ -69,7 +69,7 @@ func GetApiKeyByName(query *m.GetApiKeyByNameQuery) error {
if err != nil { if err != nil {
return err return err
} else if has == false { } else if !has {
return m.ErrInvalidApiKey return m.ErrInvalidApiKey
} }
......
...@@ -63,7 +63,7 @@ func saveDashboard(sess *DBSession, cmd *m.SaveDashboardCommand) error { ...@@ -63,7 +63,7 @@ func saveDashboard(sess *DBSession, cmd *m.SaveDashboardCommand) error {
} }
// do not allow plugin dashboard updates without overwrite flag // do not allow plugin dashboard updates without overwrite flag
if existing.PluginId != "" && cmd.Overwrite == false { if existing.PluginId != "" && !cmd.Overwrite {
return m.UpdatePluginDashboardError{PluginId: existing.PluginId} return m.UpdatePluginDashboardError{PluginId: existing.PluginId}
} }
} }
...@@ -172,7 +172,7 @@ func GetDashboard(query *m.GetDashboardQuery) error { ...@@ -172,7 +172,7 @@ func GetDashboard(query *m.GetDashboardQuery) error {
if err != nil { if err != nil {
return err return err
} else if has == false { } else if !has {
return m.ErrDashboardNotFound return m.ErrDashboardNotFound
} }
...@@ -308,7 +308,7 @@ func DeleteDashboard(cmd *m.DeleteDashboardCommand) error { ...@@ -308,7 +308,7 @@ func DeleteDashboard(cmd *m.DeleteDashboardCommand) error {
has, err := sess.Get(&dashboard) has, err := sess.Get(&dashboard)
if err != nil { if err != nil {
return err return err
} else if has == false { } else if !has {
return m.ErrDashboardNotFound return m.ErrDashboardNotFound
} }
...@@ -441,7 +441,7 @@ func GetDashboardSlugById(query *m.GetDashboardSlugByIdQuery) error { ...@@ -441,7 +441,7 @@ func GetDashboardSlugById(query *m.GetDashboardSlugByIdQuery) error {
if err != nil { if err != nil {
return err return err
} else if exists == false { } else if !exists {
return m.ErrDashboardNotFound return m.ErrDashboardNotFound
} }
...@@ -469,7 +469,7 @@ func GetDashboardUIDById(query *m.GetDashboardRefByIdQuery) error { ...@@ -469,7 +469,7 @@ func GetDashboardUIDById(query *m.GetDashboardRefByIdQuery) error {
if err != nil { if err != nil {
return err return err
} else if exists == false { } else if !exists {
return m.ErrDashboardNotFound return m.ErrDashboardNotFound
} }
...@@ -551,7 +551,7 @@ func getExistingDashboardByIdOrUidForUpdate(sess *DBSession, cmd *m.ValidateDash ...@@ -551,7 +551,7 @@ func getExistingDashboardByIdOrUidForUpdate(sess *DBSession, cmd *m.ValidateDash
} }
// do not allow plugin dashboard updates without overwrite flag // do not allow plugin dashboard updates without overwrite flag
if existing.PluginId != "" && cmd.Overwrite == false { if existing.PluginId != "" && !cmd.Overwrite {
return m.UpdatePluginDashboardError{PluginId: existing.PluginId} return m.UpdatePluginDashboardError{PluginId: existing.PluginId}
} }
......
...@@ -80,7 +80,7 @@ func GetDashboardSnapshot(query *m.GetDashboardSnapshotQuery) error { ...@@ -80,7 +80,7 @@ func GetDashboardSnapshot(query *m.GetDashboardSnapshotQuery) error {
if err != nil { if err != nil {
return err return err
} else if has == false { } else if !has {
return m.ErrDashboardSnapshotNotFound return m.ErrDashboardSnapshotNotFound
} }
......
...@@ -36,7 +36,7 @@ func GetPluginSettingById(query *m.GetPluginSettingByIdQuery) error { ...@@ -36,7 +36,7 @@ func GetPluginSettingById(query *m.GetPluginSettingByIdQuery) error {
has, err := x.Get(&pluginSetting) has, err := x.Get(&pluginSetting)
if err != nil { if err != nil {
return err return err
} else if has == false { } else if !has {
return m.ErrPluginSettingNotFound return m.ErrPluginSettingNotFound
} }
query.Result = &pluginSetting query.Result = &pluginSetting
......
...@@ -31,7 +31,7 @@ func GetOrgQuotaByTarget(query *m.GetOrgQuotaByTargetQuery) error { ...@@ -31,7 +31,7 @@ func GetOrgQuotaByTarget(query *m.GetOrgQuotaByTargetQuery) error {
has, err := x.Get(&quota) has, err := x.Get(&quota)
if err != nil { if err != nil {
return err return err
} else if has == false { } else if !has {
quota.Limit = query.Default quota.Limit = query.Default
} }
...@@ -108,7 +108,7 @@ func UpdateOrgQuota(cmd *m.UpdateOrgQuotaCmd) error { ...@@ -108,7 +108,7 @@ func UpdateOrgQuota(cmd *m.UpdateOrgQuotaCmd) error {
return err return err
} }
quota.Limit = cmd.Limit quota.Limit = cmd.Limit
if has == false { if !has {
quota.Created = time.Now() quota.Created = time.Now()
//No quota in the DB for this target, so create a new one. //No quota in the DB for this target, so create a new one.
if _, err := sess.Insert(&quota); err != nil { if _, err := sess.Insert(&quota); err != nil {
...@@ -133,7 +133,7 @@ func GetUserQuotaByTarget(query *m.GetUserQuotaByTargetQuery) error { ...@@ -133,7 +133,7 @@ func GetUserQuotaByTarget(query *m.GetUserQuotaByTargetQuery) error {
has, err := x.Get(&quota) has, err := x.Get(&quota)
if err != nil { if err != nil {
return err return err
} else if has == false { } else if !has {
quota.Limit = query.Default quota.Limit = query.Default
} }
...@@ -210,7 +210,7 @@ func UpdateUserQuota(cmd *m.UpdateUserQuotaCmd) error { ...@@ -210,7 +210,7 @@ func UpdateUserQuota(cmd *m.UpdateUserQuotaCmd) error {
return err return err
} }
quota.Limit = cmd.Limit quota.Limit = cmd.Limit
if has == false { if !has {
quota.Created = time.Now() quota.Created = time.Now()
//No quota in the DB for this target, so create a new one. //No quota in the DB for this target, so create a new one.
if _, err := sess.Insert(&quota); err != nil { if _, err := sess.Insert(&quota); err != nil {
......
...@@ -126,7 +126,7 @@ func GetTempUserByCode(query *m.GetTempUserByCodeQuery) error { ...@@ -126,7 +126,7 @@ func GetTempUserByCode(query *m.GetTempUserByCodeQuery) error {
if err != nil { if err != nil {
return err return err
} else if has == false { } else if !has {
return m.ErrTempUserNotFound return m.ErrTempUserNotFound
} }
......
...@@ -154,7 +154,7 @@ func GetUserById(query *m.GetUserByIdQuery) error { ...@@ -154,7 +154,7 @@ func GetUserById(query *m.GetUserByIdQuery) error {
if err != nil { if err != nil {
return err return err
} else if has == false { } else if !has {
return m.ErrUserNotFound return m.ErrUserNotFound
} }
...@@ -179,7 +179,7 @@ func GetUserByLogin(query *m.GetUserByLoginQuery) error { ...@@ -179,7 +179,7 @@ func GetUserByLogin(query *m.GetUserByLoginQuery) error {
return err return err
} }
if has == false && strings.Contains(query.LoginOrEmail, "@") { if !has && strings.Contains(query.LoginOrEmail, "@") {
// If the user wasn't found, and it contains an "@" fallback to finding the // If the user wasn't found, and it contains an "@" fallback to finding the
// user by email. // user by email.
user = &m.User{Email: query.LoginOrEmail} user = &m.User{Email: query.LoginOrEmail}
...@@ -188,7 +188,7 @@ func GetUserByLogin(query *m.GetUserByLoginQuery) error { ...@@ -188,7 +188,7 @@ func GetUserByLogin(query *m.GetUserByLoginQuery) error {
if err != nil { if err != nil {
return err return err
} else if has == false { } else if !has {
return m.ErrUserNotFound return m.ErrUserNotFound
} }
...@@ -209,7 +209,7 @@ func GetUserByEmail(query *m.GetUserByEmailQuery) error { ...@@ -209,7 +209,7 @@ func GetUserByEmail(query *m.GetUserByEmailQuery) error {
if err != nil { if err != nil {
return err return err
} else if has == false { } else if !has {
return m.ErrUserNotFound return m.ErrUserNotFound
} }
...@@ -304,7 +304,7 @@ func GetUserProfile(query *m.GetUserProfileQuery) error { ...@@ -304,7 +304,7 @@ func GetUserProfile(query *m.GetUserProfileQuery) error {
if err != nil { if err != nil {
return err return err
} else if has == false { } else if !has {
return m.ErrUserNotFound return m.ErrUserNotFound
} }
......
...@@ -182,7 +182,7 @@ func (s *SocialGenericOAuth) UserInfo(client *http.Client, token *oauth2.Token) ...@@ -182,7 +182,7 @@ func (s *SocialGenericOAuth) UserInfo(client *http.Client, token *oauth2.Token)
var data UserInfoJson var data UserInfoJson
var err error var err error
if s.extractToken(&data, token) != true { if !s.extractToken(&data, token) {
response, err := HttpGet(client, s.apiUrl) response, err := HttpGet(client, s.apiUrl)
if err != nil { if err != nil {
return nil, fmt.Errorf("Error getting user info: %s", err) return nil, fmt.Errorf("Error getting user info: %s", err)
......
...@@ -145,7 +145,7 @@ func (e MssqlQueryEndpoint) getTypedRowData(types []*sql.ColumnType, rows *core. ...@@ -145,7 +145,7 @@ func (e MssqlQueryEndpoint) getTypedRowData(types []*sql.ColumnType, rows *core.
// convert types not handled by denisenkom/go-mssqldb // convert types not handled by denisenkom/go-mssqldb
// unhandled types are returned as []byte // unhandled types are returned as []byte
for i := 0; i < len(types); i++ { for i := 0; i < len(types); i++ {
if value, ok := values[i].([]byte); ok == true { if value, ok := values[i].([]byte); ok {
switch types[i].DatabaseTypeName() { switch types[i].DatabaseTypeName() {
case "MONEY", "SMALLMONEY", "DECIMAL": case "MONEY", "SMALLMONEY", "DECIMAL":
if v, err := strconv.ParseFloat(string(value), 64); err == nil { if v, err := strconv.ParseFloat(string(value), 64); err == nil {
...@@ -209,7 +209,7 @@ func (e MssqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core. ...@@ -209,7 +209,7 @@ func (e MssqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core.
fillValue := null.Float{} fillValue := null.Float{}
if fillMissing { if fillMissing {
fillInterval = query.Model.Get("fillInterval").MustFloat64() * 1000 fillInterval = query.Model.Get("fillInterval").MustFloat64() * 1000
if query.Model.Get("fillNull").MustBool(false) == false { if !query.Model.Get("fillNull").MustBool(false) {
fillValue.Float64 = query.Model.Get("fillValue").MustFloat64() fillValue.Float64 = query.Model.Get("fillValue").MustFloat64()
fillValue.Valid = true fillValue.Valid = true
} }
...@@ -244,7 +244,7 @@ func (e MssqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core. ...@@ -244,7 +244,7 @@ func (e MssqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core.
} }
if metricIndex >= 0 { if metricIndex >= 0 {
if columnValue, ok := values[metricIndex].(string); ok == true { if columnValue, ok := values[metricIndex].(string); ok {
metric = columnValue metric = columnValue
} else { } else {
return fmt.Errorf("Column metric must be of type CHAR, VARCHAR, NCHAR or NVARCHAR. metric column name: %s type: %s but datatype is %T", columnNames[metricIndex], columnTypes[metricIndex].DatabaseTypeName(), values[metricIndex]) return fmt.Errorf("Column metric must be of type CHAR, VARCHAR, NCHAR or NVARCHAR. metric column name: %s type: %s but datatype is %T", columnNames[metricIndex], columnTypes[metricIndex].DatabaseTypeName(), values[metricIndex])
...@@ -271,7 +271,7 @@ func (e MssqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core. ...@@ -271,7 +271,7 @@ func (e MssqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core.
} }
series, exist := pointsBySeries[metric] series, exist := pointsBySeries[metric]
if exist == false { if !exist {
series = &tsdb.TimeSeries{Name: metric} series = &tsdb.TimeSeries{Name: metric}
pointsBySeries[metric] = series pointsBySeries[metric] = series
seriesByQueryOrder.PushBack(metric) seriesByQueryOrder.PushBack(metric)
...@@ -279,7 +279,7 @@ func (e MssqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core. ...@@ -279,7 +279,7 @@ func (e MssqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core.
if fillMissing { if fillMissing {
var intervalStart float64 var intervalStart float64
if exist == false { if !exist {
intervalStart = float64(tsdbQuery.TimeRange.MustGetFrom().UnixNano() / 1e6) intervalStart = float64(tsdbQuery.TimeRange.MustGetFrom().UnixNano() / 1e6)
} else { } else {
intervalStart = series.Points[len(series.Points)-1][1].Float64 + fillInterval intervalStart = series.Points[len(series.Points)-1][1].Float64 + fillInterval
......
...@@ -218,7 +218,7 @@ func (e MysqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core. ...@@ -218,7 +218,7 @@ func (e MysqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core.
fillValue := null.Float{} fillValue := null.Float{}
if fillMissing { if fillMissing {
fillInterval = query.Model.Get("fillInterval").MustFloat64() * 1000 fillInterval = query.Model.Get("fillInterval").MustFloat64() * 1000
if query.Model.Get("fillNull").MustBool(false) == false { if !query.Model.Get("fillNull").MustBool(false) {
fillValue.Float64 = query.Model.Get("fillValue").MustFloat64() fillValue.Float64 = query.Model.Get("fillValue").MustFloat64()
fillValue.Valid = true fillValue.Valid = true
} }
...@@ -253,7 +253,7 @@ func (e MysqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core. ...@@ -253,7 +253,7 @@ func (e MysqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core.
} }
if metricIndex >= 0 { if metricIndex >= 0 {
if columnValue, ok := values[metricIndex].(string); ok == true { if columnValue, ok := values[metricIndex].(string); ok {
metric = columnValue metric = columnValue
} else { } else {
return fmt.Errorf("Column metric must be of type char,varchar or text, got: %T %v", values[metricIndex], values[metricIndex]) return fmt.Errorf("Column metric must be of type char,varchar or text, got: %T %v", values[metricIndex], values[metricIndex])
...@@ -280,7 +280,7 @@ func (e MysqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core. ...@@ -280,7 +280,7 @@ func (e MysqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core.
} }
series, exist := pointsBySeries[metric] series, exist := pointsBySeries[metric]
if exist == false { if !exist {
series = &tsdb.TimeSeries{Name: metric} series = &tsdb.TimeSeries{Name: metric}
pointsBySeries[metric] = series pointsBySeries[metric] = series
seriesByQueryOrder.PushBack(metric) seriesByQueryOrder.PushBack(metric)
...@@ -288,7 +288,7 @@ func (e MysqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core. ...@@ -288,7 +288,7 @@ func (e MysqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core.
if fillMissing { if fillMissing {
var intervalStart float64 var intervalStart float64
if exist == false { if !exist {
intervalStart = float64(tsdbQuery.TimeRange.MustGetFrom().UnixNano() / 1e6) intervalStart = float64(tsdbQuery.TimeRange.MustGetFrom().UnixNano() / 1e6)
} else { } else {
intervalStart = series.Points[len(series.Points)-1][1].Float64 + fillInterval intervalStart = series.Points[len(series.Points)-1][1].Float64 + fillInterval
......
...@@ -131,7 +131,7 @@ func (e PostgresQueryEndpoint) getTypedRowData(rows *core.Rows) (tsdb.RowValues, ...@@ -131,7 +131,7 @@ func (e PostgresQueryEndpoint) getTypedRowData(rows *core.Rows) (tsdb.RowValues,
// convert types not handled by lib/pq // convert types not handled by lib/pq
// unhandled types are returned as []byte // unhandled types are returned as []byte
for i := 0; i < len(types); i++ { for i := 0; i < len(types); i++ {
if value, ok := values[i].([]byte); ok == true { if value, ok := values[i].([]byte); ok {
switch types[i].DatabaseTypeName() { switch types[i].DatabaseTypeName() {
case "NUMERIC": case "NUMERIC":
if v, err := strconv.ParseFloat(string(value), 64); err == nil { if v, err := strconv.ParseFloat(string(value), 64); err == nil {
...@@ -198,7 +198,7 @@ func (e PostgresQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *co ...@@ -198,7 +198,7 @@ func (e PostgresQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *co
fillValue := null.Float{} fillValue := null.Float{}
if fillMissing { if fillMissing {
fillInterval = query.Model.Get("fillInterval").MustFloat64() * 1000 fillInterval = query.Model.Get("fillInterval").MustFloat64() * 1000
if query.Model.Get("fillNull").MustBool(false) == false { if !query.Model.Get("fillNull").MustBool(false) {
fillValue.Float64 = query.Model.Get("fillValue").MustFloat64() fillValue.Float64 = query.Model.Get("fillValue").MustFloat64()
fillValue.Valid = true fillValue.Valid = true
} }
...@@ -233,7 +233,7 @@ func (e PostgresQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *co ...@@ -233,7 +233,7 @@ func (e PostgresQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *co
} }
if metricIndex >= 0 { if metricIndex >= 0 {
if columnValue, ok := values[metricIndex].(string); ok == true { if columnValue, ok := values[metricIndex].(string); ok {
metric = columnValue metric = columnValue
} else { } else {
return fmt.Errorf("Column metric must be of type char,varchar or text, got: %T %v", values[metricIndex], values[metricIndex]) return fmt.Errorf("Column metric must be of type char,varchar or text, got: %T %v", values[metricIndex], values[metricIndex])
...@@ -260,7 +260,7 @@ func (e PostgresQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *co ...@@ -260,7 +260,7 @@ func (e PostgresQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *co
} }
series, exist := pointsBySeries[metric] series, exist := pointsBySeries[metric]
if exist == false { if !exist {
series = &tsdb.TimeSeries{Name: metric} series = &tsdb.TimeSeries{Name: metric}
pointsBySeries[metric] = series pointsBySeries[metric] = series
seriesByQueryOrder.PushBack(metric) seriesByQueryOrder.PushBack(metric)
...@@ -268,7 +268,7 @@ func (e PostgresQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *co ...@@ -268,7 +268,7 @@ func (e PostgresQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *co
if fillMissing { if fillMissing {
var intervalStart float64 var intervalStart float64
if exist == false { if !exist {
intervalStart = float64(tsdbQuery.TimeRange.MustGetFrom().UnixNano() / 1e6) intervalStart = float64(tsdbQuery.TimeRange.MustGetFrom().UnixNano() / 1e6)
} else { } else {
intervalStart = series.Points[len(series.Points)-1][1].Float64 + fillInterval intervalStart = series.Points[len(series.Points)-1][1].Float64 + fillInterval
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment