Merge remote-tracking branch 'origin/master' into it_kills_me_but_out_it_goes

pull/4759/head
Philip O'Toole 2015-11-11 16:03:06 -08:00
commit 898dac6f8e
1 changed files with 7 additions and 2 deletions

View File

@ -14,7 +14,6 @@ import (
"math/rand"
"reflect"
"sort"
"strings"
// "github.com/davecgh/go-spew/spew"
"github.com/influxdb/influxdb/influxql"
@ -1288,7 +1287,13 @@ func valueCompare(a, b interface{}) int {
d1, ok1 := a.(string)
d2, ok2 := b.(string)
if ok1 && ok2 {
return strings.Compare(d1, d2)
if d1 == d2 {
return 0
}
if d1 > d2 {
return 1
}
return -1
}
}
panic(fmt.Sprintf("unreachable code; types were %T, %T", a, b))