scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-08 20:07:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ensure provided min/max are valid on int fields

Browse source
This commit is contained in:
Todd Gruben 2022-03-15 10:29:48 -05:00
parent 739fd9b04b
commit 8c3c774492
2 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
http_handler.go
View file

@ -1563,14 +1563,21 @@ func fieldOptionsToFunctionalOpts(opt fieldOptions) []FieldOption {
case FieldTypeSet:
fos = append(fos, OptFieldTypeSet(*opt.CacheType, *opt.CacheSize))
case FieldTypeInt:
if opt.Min == nil {
min := pql.NewDecimal(int64(math.MinInt64), 0)
opt.Min = &min
min, max := pql.MinMax(0)
// ensure the provided bounds are valid
if opt.Max != nil && max.LessThan(*opt.Max) {
opt.Max = &max
}
if opt.Max == nil {
max := pql.NewDecimal(int64(math.MaxInt64), 0)
opt.Max = &max
}
if opt.Min != nil && min.GreaterThan(*opt.Min) {
opt.Min = &min
}
if opt.Min == nil {
opt.Min = &min
}
fos = append(fos, OptFieldTypeInt(opt.Min.ToInt64(0), opt.Max.ToInt64(0)))
case FieldTypeDecimal:
scale := int64(0)

22
index.go
View file

@ -4,7 +4,6 @@ package pilosa
import (
"context"
"fmt"
"math"
"os"
"path/filepath"
"sort"
@ -618,14 +617,23 @@ func (i *Index) CreateFieldIfNotExistsWithOptions(name string, opt *FieldOptions
// added for backward compatablity with old schemas
if opt != nil && opt.Type == FieldTypeDecimal {
min, max := pql.MinMax(opt.Scale)
opt.Max = max
opt.Min = min
// ensure the provided bounds are valid
if max.LessThan(opt.Max) {
opt.Max = max
}
if min.GreaterThan(opt.Min) {
opt.Min = min
}
}
if opt != nil && opt.Type == FieldTypeDecimal {
min := pql.NewDecimal(int64(math.MinInt64), 0)
max := pql.NewDecimal(int64(math.MaxInt64), 0)
opt.Max = max
opt.Min = min
min, max := pql.MinMax(0)
// ensure the provided bounds are valid
if max.LessThan(opt.Max) {
opt.Max = max
}
if min.GreaterThan(opt.Min) {
opt.Min = min
}
}
cfm := &CreateFieldMessage{