diff --git a/encoding/proto/proto.go b/encoding/proto/proto.go index eca95de2f..1f6e0cce5 100644 --- a/encoding/proto/proto.go +++ b/encoding/proto/proto.go @@ -1381,9 +1381,20 @@ func decodePairField(pb *internal.Pair) pilosa.PairField { func decodeValCount(pb *internal.ValCount) pilosa.ValCount { return pilosa.ValCount{ - Val: pb.Val, - FloatVal: pb.FloatVal, - Count: pb.Count, + Val: pb.Val, + FloatVal: pb.FloatVal, + DecimalVal: decodeDecimalStruct(pb.DecimalVal), + Count: pb.Count, + } +} + +func decodeDecimalStruct(pb *internal.Decimal) *pql.Decimal { + if pb == nil { + return nil + } + return &pql.Decimal{ + Value: pb.Value, + Scale: pb.Scale, } } @@ -1507,9 +1518,20 @@ func encodePairField(p pilosa.PairField) *internal.Pair { func encodeValCount(vc pilosa.ValCount) *internal.ValCount { return &internal.ValCount{ - Val: vc.Val, - FloatVal: vc.FloatVal, - Count: vc.Count, + Val: vc.Val, + FloatVal: vc.FloatVal, + DecimalVal: encodeDecimal(vc.DecimalVal), + Count: vc.Count, + } +} + +func encodeDecimal(p *pql.Decimal) *internal.Decimal { + if p == nil { + return nil + } + return &internal.Decimal{ + Value: p.Value, + Scale: p.Scale, } } diff --git a/executor.go b/executor.go index ef200b5fd..7e74421e7 100644 --- a/executor.go +++ b/executor.go @@ -804,7 +804,7 @@ func (e *executor) executeSum(ctx context.Context, index string, c *pql.Call, sh return ValCount{}, nil } - // scale summed response into float if decimal field and this is + // scale summed response if it's a decimal field and this is // not a remote query (we're about to return to original client). if !opt.Remote { field := e.Holder.Field(index, fieldName) @@ -812,12 +812,14 @@ func (e *executor) executeSum(ctx context.Context, index string, c *pql.Call, sh return ValCount{}, ErrFieldNotFound } if field.Type() == FieldTypeDecimal { - if scale := field.Options().Scale; scale != 0 { - other.FloatVal = float64(other.Val) / math.Pow10(int(scale)) - other.Val = 0 - } + other.DecimalVal = &pql.Decimal{ + Value: other.Val, + Scale: field.Options().Scale} + other.FloatVal = 0 + other.Val = 0 } } + return other, nil } @@ -4079,9 +4081,10 @@ func (sr *SignedRow) union(other SignedRow) SignedRow { // ValCount represents a grouping of sum & count for Sum() and Average() calls. Also Min, Max.... type ValCount struct { - Val int64 `json:"value"` - FloatVal float64 `json:"floatValue"` - Count int64 `json:"count"` + Val int64 `json:"value"` + FloatVal float64 `json:"floatValue"` + DecimalVal *pql.Decimal `json:"decimalValue"` + Count int64 `json:"count"` } func (vc *ValCount) add(other ValCount) ValCount { @@ -4093,7 +4096,9 @@ func (vc *ValCount) add(other ValCount) ValCount { // smaller returns the smaller of the two ValCounts. func (vc *ValCount) smaller(other ValCount) ValCount { - if vc.FloatVal != 0 || other.FloatVal != 0 { + if vc.DecimalVal != nil { + return vc.decimalSmaller(other) + } else if vc.FloatVal != 0 || other.FloatVal != 0 { return vc.floatSmaller(other) } if vc.Count == 0 || (other.Val < vc.Val && other.Count > 0) { @@ -4109,6 +4114,20 @@ func (vc *ValCount) smaller(other ValCount) ValCount { } } +func (vc *ValCount) decimalSmaller(other ValCount) ValCount { + if vc.Count == 0 || (other.DecimalVal.LessThan(*vc.DecimalVal) && other.Count > 0) { + return other + } + extra := int64(0) + if vc.DecimalVal.EqualTo(*other.DecimalVal) { + extra += other.Count + } + return ValCount{ + DecimalVal: vc.DecimalVal, + Count: vc.Count + extra, + } +} + func (vc *ValCount) floatSmaller(other ValCount) ValCount { if vc.Count == 0 || (other.FloatVal < vc.FloatVal && other.Count > 0) { return other @@ -4121,12 +4140,13 @@ func (vc *ValCount) floatSmaller(other ValCount) ValCount { FloatVal: vc.FloatVal, Count: vc.Count + extra, } - } // larger returns the larger of the two ValCounts. func (vc *ValCount) larger(other ValCount) ValCount { - if vc.FloatVal != 0 || other.FloatVal != 0 { + if vc.DecimalVal != nil { + return vc.decimalLarger(other) + } else if vc.FloatVal != 0 || other.FloatVal != 0 { return vc.floatLarger(other) } if vc.Count == 0 || (other.Val > vc.Val && other.Count > 0) { @@ -4142,6 +4162,20 @@ func (vc *ValCount) larger(other ValCount) ValCount { } } +func (vc *ValCount) decimalLarger(other ValCount) ValCount { + if vc.Count == 0 || (other.DecimalVal.GreaterThan(*vc.DecimalVal) && other.Count > 0) { + return other + } + extra := int64(0) + if vc.DecimalVal.EqualTo(*other.DecimalVal) { + extra += other.Count + } + return ValCount{ + DecimalVal: vc.DecimalVal, + Count: vc.Count + extra, + } +} + func (vc *ValCount) floatLarger(other ValCount) ValCount { if vc.Count == 0 || (other.FloatVal > vc.FloatVal && other.Count > 0) { return other diff --git a/executor_test.go b/executor_test.go index 3a09c678b..236b94662 100644 --- a/executor_test.go +++ b/executor_test.go @@ -1481,11 +1481,36 @@ func TestExecutor_Execute_MinMax(t *testing.T) { min pql.Decimal max pql.Decimal set pql.Decimal + exp pql.Decimal }{ - {2, pql.Decimal{Value: 1, Scale: -1}, pql.Decimal{Value: 2, Scale: -1}, pql.Decimal{Value: 115, Scale: 1}}, - {2, pql.Decimal{Value: -1, Scale: -1}, pql.Decimal{Value: 2, Scale: -1}, pql.Decimal{Value: 115, Scale: 1}}, - {2, pql.Decimal{Value: -1, Scale: -1}, pql.Decimal{Value: 2, Scale: -1}, pql.Decimal{Value: -95, Scale: 1}}, - {2, pql.Decimal{Value: -2, Scale: -1}, pql.Decimal{Value: -1, Scale: -1}, pql.Decimal{Value: -115, Scale: 1}}, + { + 2, + pql.Decimal{Value: 1, Scale: -1}, + pql.Decimal{Value: 2, Scale: -1}, + pql.Decimal{Value: 115, Scale: 1}, + pql.Decimal{Value: 1150, Scale: 2}, + }, + { + 2, + pql.Decimal{Value: -1, Scale: -1}, + pql.Decimal{Value: 2, Scale: -1}, + pql.Decimal{Value: 115, Scale: 1}, + pql.Decimal{Value: 1150, Scale: 2}, + }, + { + 2, + pql.Decimal{Value: -1, Scale: -1}, + pql.Decimal{Value: 2, Scale: -1}, + pql.Decimal{Value: -95, Scale: 1}, + pql.Decimal{Value: -950, Scale: 2}, + }, + { + 2, + pql.Decimal{Value: -2, Scale: -1}, + pql.Decimal{Value: -1, Scale: -1}, + pql.Decimal{Value: -115, Scale: 1}, + pql.Decimal{Value: -1150, Scale: 2}, + }, } for i, test := range tests { fld := fmt.Sprintf("f%d", i) @@ -1506,7 +1531,7 @@ func TestExecutor_Execute_MinMax(t *testing.T) { pql = fmt.Sprintf(`Min(field=%s)`, fld) if result, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: pql}); err != nil { t.Fatal(err) - } else if !reflect.DeepEqual(result.Results[0], pilosa.ValCount{FloatVal: test.set.Float64(), Count: 1}) { + } else if !reflect.DeepEqual(result.Results[0], pilosa.ValCount{DecimalVal: &test.exp, Count: 1}) { t.Fatalf("unexpected min result, test %d: %s", i, spew.Sdump(result)) } }) @@ -1515,7 +1540,7 @@ func TestExecutor_Execute_MinMax(t *testing.T) { pql = fmt.Sprintf(`Max(field=%s)`, fld) if result, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: pql}); err != nil { t.Fatal(err) - } else if !reflect.DeepEqual(result.Results[0], pilosa.ValCount{FloatVal: test.set.Float64(), Count: 1}) { + } else if !reflect.DeepEqual(result.Results[0], pilosa.ValCount{DecimalVal: &test.exp, Count: 1}) { t.Fatalf("unexpected max result, test %d: %s", i, spew.Sdump(result)) } }) @@ -1816,6 +1841,10 @@ func TestExecutor_Execute_Sum(t *testing.T) { t.Fatal(err) } + if _, err := idx.CreateField("dec", pilosa.OptFieldTypeDecimal(3)); err != nil { + t.Fatal(err) + } + if _, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: ` Set(0, x=0) Set(` + strconv.Itoa(ShardWidth+1) + `, x=0) @@ -1827,24 +1856,48 @@ func TestExecutor_Execute_Sum(t *testing.T) { Set(` + strconv.Itoa((5*ShardWidth)+100) + `, foo=50) Set(` + strconv.Itoa(ShardWidth+1) + `, foo=60) Set(0, other=1000) + + Set(0, dec=100.001) + Set(` + strconv.Itoa(ShardWidth) + `, dec=200.002) + Set(` + strconv.Itoa(ShardWidth+1) + `, dec=400.004) `}); err != nil { t.Fatal(err) } - t.Run("NoFilter", func(t *testing.T) { - if result, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: `Sum(field=foo)`}); err != nil { - t.Fatal(err) - } else if !reflect.DeepEqual(result.Results[0], pilosa.ValCount{Val: 200, Count: 5}) { - t.Fatalf("unexpected result: %s", spew.Sdump(result)) - } + t.Run("Integer", func(t *testing.T) { + t.Run("NoFilter", func(t *testing.T) { + if result, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: `Sum(field=foo)`}); err != nil { + t.Fatal(err) + } else if !reflect.DeepEqual(result.Results[0], pilosa.ValCount{Val: 200, Count: 5}) { + t.Fatalf("unexpected result: %s", spew.Sdump(result)) + } + }) + + t.Run("WithFilter", func(t *testing.T) { + if result, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: `Sum(Row(x=0), field=foo)`}); err != nil { + t.Fatal(err) + } else if !reflect.DeepEqual(result.Results[0], pilosa.ValCount{Val: 80, Count: 2}) { + t.Fatalf("unexpected result: %s", spew.Sdump(result)) + } + }) }) - t.Run("WithFilter", func(t *testing.T) { - if result, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: `Sum(Row(x=0), field=foo)`}); err != nil { - t.Fatal(err) - } else if !reflect.DeepEqual(result.Results[0], pilosa.ValCount{Val: 80, Count: 2}) { - t.Fatalf("unexpected result: %s", spew.Sdump(result)) - } + t.Run("Decimal", func(t *testing.T) { + t.Run("NoFilter", func(t *testing.T) { + if result, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: `Sum(field=dec)`}); err != nil { + t.Fatal(err) + } else if !reflect.DeepEqual(result.Results[0], pilosa.ValCount{DecimalVal: &pql.Decimal{Value: 700007, Scale: 3}, Count: 3}) { + t.Fatalf("unexpected result: %s", spew.Sdump(result)) + } + }) + + t.Run("WithFilter", func(t *testing.T) { + if result, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: `Sum(Row(x=0), field=dec)`}); err != nil { + t.Fatal(err) + } else if !reflect.DeepEqual(result.Results[0], pilosa.ValCount{DecimalVal: &pql.Decimal{Value: 500005, Scale: 3}, Count: 2}) { + t.Fatalf("unexpected result: %s", spew.Sdump(result)) + } + }) }) }) @@ -4893,11 +4946,11 @@ func TestExecutor_Execute_MinMaxCountEqual(t *testing.T) { t.Run("MinDec", func(t *testing.T) { tests := []struct { filter string - exp float64 + exp pql.Decimal cnt int64 }{ - {filter: ``, exp: 4.234, cnt: 1}, - {filter: `Row(x=3)`, exp: 5.122, cnt: 1}, + {filter: ``, exp: pql.NewDecimal(4234, 3), cnt: 1}, + {filter: `Row(x=3)`, exp: pql.NewDecimal(5122, 3), cnt: 1}, } for i, tt := range tests { var pql string @@ -4908,7 +4961,7 @@ func TestExecutor_Execute_MinMaxCountEqual(t *testing.T) { } if result, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: pql}); err != nil { t.Fatal(err) - } else if !reflect.DeepEqual(result.Results[0], pilosa.ValCount{FloatVal: tt.exp, Count: tt.cnt}) { + } else if !reflect.DeepEqual(result.Results[0], pilosa.ValCount{DecimalVal: &tt.exp, Count: tt.cnt}) { t.Fatalf("unexpected result, test %d: %s", i, spew.Sdump(result.Results[0])) } } @@ -4940,11 +4993,11 @@ func TestExecutor_Execute_MinMaxCountEqual(t *testing.T) { t.Run("MaxDec", func(t *testing.T) { tests := []struct { filter string - exp float64 + exp pql.Decimal cnt int64 }{ - {filter: ``, exp: 12.985, cnt: 2}, - {filter: `Row(x=3)`, exp: 12.985, cnt: 1}, + {filter: ``, exp: pql.NewDecimal(12985, 3), cnt: 2}, + {filter: `Row(x=3)`, exp: pql.NewDecimal(12985, 3), cnt: 1}, } for i, tt := range tests { var pql string @@ -4955,7 +5008,7 @@ func TestExecutor_Execute_MinMaxCountEqual(t *testing.T) { } if result, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: pql}); err != nil { t.Fatal(err) - } else if !reflect.DeepEqual(result.Results[0], pilosa.ValCount{FloatVal: tt.exp, Count: tt.cnt}) { + } else if !reflect.DeepEqual(result.Results[0], pilosa.ValCount{DecimalVal: &tt.exp, Count: tt.cnt}) { t.Fatalf("unexpected result, test %d: %s", i, spew.Sdump(result.Results[0])) } } diff --git a/field.go b/field.go index a98d1360f..7c3de18ad 100644 --- a/field.go +++ b/field.go @@ -1284,6 +1284,22 @@ func (f *Field) FloatValue(columnID uint64) (value float64, exists bool, err err return value, exists, err } +// DecimalValue reads a decimal field value for a column, and converts +// it to a pql.Decimal based on the configured scale. +func (f *Field) DecimalValue(columnID uint64) (value pql.Decimal, exists bool, err error) { + bsig := f.bsiGroup(f.name) + if bsig == nil { + return value, false, ErrBSIGroupNotFound + } + + val, exists, err := f.Value(columnID) + if exists { + value.Value = val + value.Scale = bsig.Scale + } + return value, exists, err +} + // Value reads a field value for a column. func (f *Field) Value(columnID uint64) (value int64, exists bool, err error) { bsig := f.bsiGroup(f.name) @@ -1499,7 +1515,8 @@ func (f *Field) MaxForShard(shard uint64, filter *Row) (ValCount, error) { valCount := ValCount{Count: int64(cnt)} if f.Options().Type == FieldTypeDecimal { - valCount.FloatVal = float64(max+bsig.Base) / math.Pow10(int(bsig.Scale)) + dec := pql.NewDecimal(max+bsig.Base, bsig.Scale) + valCount.DecimalVal = &dec } else { valCount.Val = max + bsig.Base } @@ -1534,7 +1551,8 @@ func (f *Field) MinForShard(shard uint64, filter *Row) (ValCount, error) { valCount := ValCount{Count: int64(cnt)} if f.Options().Type == FieldTypeDecimal { - valCount.FloatVal = float64(min+bsig.Base) / math.Pow10(int(bsig.Scale)) + dec := pql.NewDecimal(min+bsig.Base, bsig.Scale) + valCount.DecimalVal = &dec } else { valCount.Val = min + bsig.Base } diff --git a/field_internal_test.go b/field_internal_test.go index 2b7be19f5..507feac8b 100644 --- a/field_internal_test.go +++ b/field_internal_test.go @@ -753,36 +753,36 @@ func TestDecimalField_MinMaxForShard(t *testing.T) { name: "single", columnIDs: []uint64{1}, values: []float64{10.1}, - expMax: ValCount{FloatVal: 10.1, Count: 1}, - expMin: ValCount{FloatVal: 10.1, Count: 1}, + expMax: ValCount{DecimalVal: &pql.Decimal{Value: 10100, Scale: 3}, Count: 1}, + expMin: ValCount{DecimalVal: &pql.Decimal{Value: 10100, Scale: 3}, Count: 1}, }, { name: "twovals", columnIDs: []uint64{1, 2}, values: []float64{10.1, 20.2}, - expMax: ValCount{FloatVal: 20.2, Count: 1}, - expMin: ValCount{FloatVal: 10.1, Count: 1}, + expMax: ValCount{DecimalVal: &pql.Decimal{Value: 20200, Scale: 3}, Count: 1}, + expMin: ValCount{DecimalVal: &pql.Decimal{Value: 10100, Scale: 3}, Count: 1}, }, { name: "multiplecounts", columnIDs: []uint64{1, 2, 3, 4, 5}, values: []float64{10.1, 20.2, 10.1, 10.1, 20.2}, - expMax: ValCount{FloatVal: 20.2, Count: 2}, - expMin: ValCount{FloatVal: 10.1, Count: 3}, + expMax: ValCount{DecimalVal: &pql.Decimal{Value: 20200, Scale: 3}, Count: 2}, + expMin: ValCount{DecimalVal: &pql.Decimal{Value: 10100, Scale: 3}, Count: 3}, }, { name: "middlevals", columnIDs: []uint64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, values: []float64{10.1, 20.2, 10.1, 10.1, 20.2, 11, 12, 11, 13, 11}, - expMax: ValCount{FloatVal: 20.2, Count: 2}, - expMin: ValCount{FloatVal: 10.1, Count: 3}, + expMax: ValCount{DecimalVal: &pql.Decimal{Value: 20200, Scale: 3}, Count: 2}, + expMin: ValCount{DecimalVal: &pql.Decimal{Value: 10100, Scale: 3}, Count: 3}, }, { name: "another shard", columnIDs: []uint64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 100000000, 100000001}, values: []float64{10.1, 20.2, 10.1, 10.1, 20.2, 11, 12, 11, 13, 11, 44.39, 0.23}, - expMax: ValCount{FloatVal: 20.2, Count: 2}, - expMin: ValCount{FloatVal: 10.1, Count: 3}, + expMax: ValCount{DecimalVal: &pql.Decimal{Value: 20200, Scale: 3}, Count: 2}, + expMin: ValCount{DecimalVal: &pql.Decimal{Value: 10100, Scale: 3}, Count: 3}, }, } { t.Run(test.name+strconv.Itoa(i), func(t *testing.T) { @@ -794,7 +794,7 @@ func TestDecimalField_MinMaxForShard(t *testing.T) { if err != nil { t.Fatalf("getting max for shard: %v", err) } - if maxvc != test.expMax { + if !reflect.DeepEqual(maxvc, test.expMax) { t.Fatalf("max expected:\n%+v\ngot:\n%+v", test.expMax, maxvc) } @@ -802,7 +802,7 @@ func TestDecimalField_MinMaxForShard(t *testing.T) { if err != nil { t.Fatalf("getting min for shard: %v", err) } - if minvc != test.expMin { + if !reflect.DeepEqual(minvc, test.expMin) { t.Fatalf("min expected:\n%+v\ngot:\n%+v", test.expMin, minvc) } }) diff --git a/go.mod b/go.mod index 1676bf805..9d9ecd366 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/go-ole/go-ole v1.2.4 // indirect github.com/gogo/protobuf v1.2.0 - github.com/golang/protobuf v1.3.2 + github.com/golang/protobuf v1.3.3 github.com/google/go-cmp v0.2.0 github.com/gorilla/handlers v1.3.0 github.com/gorilla/mux v1.7.0 @@ -24,7 +24,7 @@ require ( github.com/pelletier/go-toml v1.2.0 github.com/pkg/errors v0.8.1 github.com/prometheus/client_golang v0.9.3 - github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 + github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237 // indirect github.com/satori/go.uuid v1.2.0 github.com/shirou/gopsutil v2.18.12+incompatible @@ -41,7 +41,7 @@ require ( golang.org/x/sync v0.0.0-20190423024810-112230192c58 golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872 // indirect golang.org/x/text v0.3.2 // indirect - google.golang.org/grpc v1.24.0 + google.golang.org/grpc v1.28.0 modernc.org/mathutil v1.0.0 modernc.org/strutil v1.0.0 ) diff --git a/go.sum b/go.sum index 85e0347f6..3fb61bcc5 100644 --- a/go.sum +++ b/go.sum @@ -19,9 +19,11 @@ github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -30,6 +32,9 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -50,6 +55,8 @@ github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= @@ -116,6 +123,8 @@ github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDf github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0 h1:7etb9YClo3a6HjLzfl6rIQaU+FDfi0VSX39io3aQ+DM= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -168,21 +177,29 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519 h1:x6rhz8Y9CjbgQkccRGmELH6K+LJj7tOoh3XWeC1yaQM= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a h1:gOpx8G595UYyvj8UK4+OFyY4rx037g3fmfhe5SasG3U= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6 h1:FP8hkuE6yUEaJnK7O2eTuejKWwW+Rhfj80dQ2JcKxCU= golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -198,19 +215,30 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.24.0 h1:vb/1TCsVn3DcJlQ0Gs1yB1pKI6Do2/QNwxdKqmc/b0s= google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= modernc.org/mathutil v1.0.0 h1:93vKjrJopTPrtTNpZ8XIovER7iCIH1QU7wNbOQXC60I= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= diff --git a/internal/private.pb.go b/internal/private.pb.go index 4ca901b58..e0ad9ea0c 100644 --- a/internal/private.pb.go +++ b/internal/private.pb.go @@ -212,61 +212,6 @@ func (m *FieldOptions) GetMax() *Decimal { return nil } -type Decimal struct { - Value int64 `protobuf:"varint,1,opt,name=Value,proto3" json:"Value,omitempty"` - Scale int64 `protobuf:"varint,2,opt,name=Scale,proto3" json:"Scale,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Decimal) Reset() { *m = Decimal{} } -func (m *Decimal) String() string { return proto.CompactTextString(m) } -func (*Decimal) ProtoMessage() {} -func (*Decimal) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{2} -} -func (m *Decimal) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Decimal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Decimal.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Decimal) XXX_Merge(src proto.Message) { - xxx_messageInfo_Decimal.Merge(m, src) -} -func (m *Decimal) XXX_Size() int { - return m.Size() -} -func (m *Decimal) XXX_DiscardUnknown() { - xxx_messageInfo_Decimal.DiscardUnknown(m) -} - -var xxx_messageInfo_Decimal proto.InternalMessageInfo - -func (m *Decimal) GetValue() int64 { - if m != nil { - return m.Value - } - return 0 -} - -func (m *Decimal) GetScale() int64 { - if m != nil { - return m.Scale - } - return 0 -} - type ImportResponse struct { Err string `protobuf:"bytes,1,opt,name=Err,proto3" json:"Err,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -278,7 +223,7 @@ func (m *ImportResponse) Reset() { *m = ImportResponse{} } func (m *ImportResponse) String() string { return proto.CompactTextString(m) } func (*ImportResponse) ProtoMessage() {} func (*ImportResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{3} + return fileDescriptor_d2a91b51c7bdc125, []int{2} } func (m *ImportResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -329,7 +274,7 @@ func (m *BlockDataRequest) Reset() { *m = BlockDataRequest{} } func (m *BlockDataRequest) String() string { return proto.CompactTextString(m) } func (*BlockDataRequest) ProtoMessage() {} func (*BlockDataRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{4} + return fileDescriptor_d2a91b51c7bdc125, []int{3} } func (m *BlockDataRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -405,7 +350,7 @@ func (m *BlockDataResponse) Reset() { *m = BlockDataResponse{} } func (m *BlockDataResponse) String() string { return proto.CompactTextString(m) } func (*BlockDataResponse) ProtoMessage() {} func (*BlockDataResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{5} + return fileDescriptor_d2a91b51c7bdc125, []int{4} } func (m *BlockDataResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -459,7 +404,7 @@ func (m *Cache) Reset() { *m = Cache{} } func (m *Cache) String() string { return proto.CompactTextString(m) } func (*Cache) ProtoMessage() {} func (*Cache) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{6} + return fileDescriptor_d2a91b51c7bdc125, []int{5} } func (m *Cache) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -506,7 +451,7 @@ func (m *MaxShards) Reset() { *m = MaxShards{} } func (m *MaxShards) String() string { return proto.CompactTextString(m) } func (*MaxShards) ProtoMessage() {} func (*MaxShards) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{7} + return fileDescriptor_d2a91b51c7bdc125, []int{6} } func (m *MaxShards) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -555,7 +500,7 @@ func (m *CreateShardMessage) Reset() { *m = CreateShardMessage{} } func (m *CreateShardMessage) String() string { return proto.CompactTextString(m) } func (*CreateShardMessage) ProtoMessage() {} func (*CreateShardMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{8} + return fileDescriptor_d2a91b51c7bdc125, []int{7} } func (m *CreateShardMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -616,7 +561,7 @@ func (m *DeleteIndexMessage) Reset() { *m = DeleteIndexMessage{} } func (m *DeleteIndexMessage) String() string { return proto.CompactTextString(m) } func (*DeleteIndexMessage) ProtoMessage() {} func (*DeleteIndexMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{9} + return fileDescriptor_d2a91b51c7bdc125, []int{8} } func (m *DeleteIndexMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -664,7 +609,7 @@ func (m *CreateIndexMessage) Reset() { *m = CreateIndexMessage{} } func (m *CreateIndexMessage) String() string { return proto.CompactTextString(m) } func (*CreateIndexMessage) ProtoMessage() {} func (*CreateIndexMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{10} + return fileDescriptor_d2a91b51c7bdc125, []int{9} } func (m *CreateIndexMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -720,7 +665,7 @@ func (m *CreateFieldMessage) Reset() { *m = CreateFieldMessage{} } func (m *CreateFieldMessage) String() string { return proto.CompactTextString(m) } func (*CreateFieldMessage) ProtoMessage() {} func (*CreateFieldMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{11} + return fileDescriptor_d2a91b51c7bdc125, []int{10} } func (m *CreateFieldMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -782,7 +727,7 @@ func (m *DeleteFieldMessage) Reset() { *m = DeleteFieldMessage{} } func (m *DeleteFieldMessage) String() string { return proto.CompactTextString(m) } func (*DeleteFieldMessage) ProtoMessage() {} func (*DeleteFieldMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{12} + return fileDescriptor_d2a91b51c7bdc125, []int{11} } func (m *DeleteFieldMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -838,7 +783,7 @@ func (m *DeleteAvailableShardMessage) Reset() { *m = DeleteAvailableShar func (m *DeleteAvailableShardMessage) String() string { return proto.CompactTextString(m) } func (*DeleteAvailableShardMessage) ProtoMessage() {} func (*DeleteAvailableShardMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{13} + return fileDescriptor_d2a91b51c7bdc125, []int{12} } func (m *DeleteAvailableShardMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -901,7 +846,7 @@ func (m *Field) Reset() { *m = Field{} } func (m *Field) String() string { return proto.CompactTextString(m) } func (*Field) ProtoMessage() {} func (*Field) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{14} + return fileDescriptor_d2a91b51c7bdc125, []int{13} } func (m *Field) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -962,7 +907,7 @@ func (m *Schema) Reset() { *m = Schema{} } func (m *Schema) String() string { return proto.CompactTextString(m) } func (*Schema) ProtoMessage() {} func (*Schema) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{15} + return fileDescriptor_d2a91b51c7bdc125, []int{14} } func (m *Schema) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1011,7 +956,7 @@ func (m *Index) Reset() { *m = Index{} } func (m *Index) String() string { return proto.CompactTextString(m) } func (*Index) ProtoMessage() {} func (*Index) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{16} + return fileDescriptor_d2a91b51c7bdc125, []int{15} } func (m *Index) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1074,7 +1019,7 @@ func (m *URI) Reset() { *m = URI{} } func (m *URI) String() string { return proto.CompactTextString(m) } func (*URI) ProtoMessage() {} func (*URI) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{17} + return fileDescriptor_d2a91b51c7bdc125, []int{16} } func (m *URI) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1138,7 +1083,7 @@ func (m *Node) Reset() { *m = Node{} } func (m *Node) String() string { return proto.CompactTextString(m) } func (*Node) ProtoMessage() {} func (*Node) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{18} + return fileDescriptor_d2a91b51c7bdc125, []int{17} } func (m *Node) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1207,7 +1152,7 @@ func (m *NodeStateMessage) Reset() { *m = NodeStateMessage{} } func (m *NodeStateMessage) String() string { return proto.CompactTextString(m) } func (*NodeStateMessage) ProtoMessage() {} func (*NodeStateMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{19} + return fileDescriptor_d2a91b51c7bdc125, []int{18} } func (m *NodeStateMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1262,7 +1207,7 @@ func (m *NodeEventMessage) Reset() { *m = NodeEventMessage{} } func (m *NodeEventMessage) String() string { return proto.CompactTextString(m) } func (*NodeEventMessage) ProtoMessage() {} func (*NodeEventMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{20} + return fileDescriptor_d2a91b51c7bdc125, []int{19} } func (m *NodeEventMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1318,7 +1263,7 @@ func (m *NodeStatus) Reset() { *m = NodeStatus{} } func (m *NodeStatus) String() string { return proto.CompactTextString(m) } func (*NodeStatus) ProtoMessage() {} func (*NodeStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{21} + return fileDescriptor_d2a91b51c7bdc125, []int{20} } func (m *NodeStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1380,7 +1325,7 @@ func (m *IndexStatus) Reset() { *m = IndexStatus{} } func (m *IndexStatus) String() string { return proto.CompactTextString(m) } func (*IndexStatus) ProtoMessage() {} func (*IndexStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{22} + return fileDescriptor_d2a91b51c7bdc125, []int{21} } func (m *IndexStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1435,7 +1380,7 @@ func (m *FieldStatus) Reset() { *m = FieldStatus{} } func (m *FieldStatus) String() string { return proto.CompactTextString(m) } func (*FieldStatus) ProtoMessage() {} func (*FieldStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{23} + return fileDescriptor_d2a91b51c7bdc125, []int{22} } func (m *FieldStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1491,7 +1436,7 @@ func (m *ClusterStatus) Reset() { *m = ClusterStatus{} } func (m *ClusterStatus) String() string { return proto.CompactTextString(m) } func (*ClusterStatus) ProtoMessage() {} func (*ClusterStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{24} + return fileDescriptor_d2a91b51c7bdc125, []int{23} } func (m *ClusterStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1555,7 +1500,7 @@ func (m *BSIGroup) Reset() { *m = BSIGroup{} } func (m *BSIGroup) String() string { return proto.CompactTextString(m) } func (*BSIGroup) ProtoMessage() {} func (*BSIGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{25} + return fileDescriptor_d2a91b51c7bdc125, []int{24} } func (m *BSIGroup) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1625,7 +1570,7 @@ func (m *CreateViewMessage) Reset() { *m = CreateViewMessage{} } func (m *CreateViewMessage) String() string { return proto.CompactTextString(m) } func (*CreateViewMessage) ProtoMessage() {} func (*CreateViewMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{26} + return fileDescriptor_d2a91b51c7bdc125, []int{25} } func (m *CreateViewMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1688,7 +1633,7 @@ func (m *DeleteViewMessage) Reset() { *m = DeleteViewMessage{} } func (m *DeleteViewMessage) String() string { return proto.CompactTextString(m) } func (*DeleteViewMessage) ProtoMessage() {} func (*DeleteViewMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{27} + return fileDescriptor_d2a91b51c7bdc125, []int{26} } func (m *DeleteViewMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1755,7 +1700,7 @@ func (m *ResizeInstruction) Reset() { *m = ResizeInstruction{} } func (m *ResizeInstruction) String() string { return proto.CompactTextString(m) } func (*ResizeInstruction) ProtoMessage() {} func (*ResizeInstruction) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{28} + return fileDescriptor_d2a91b51c7bdc125, []int{27} } func (m *ResizeInstruction) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1848,7 +1793,7 @@ func (m *ResizeSource) Reset() { *m = ResizeSource{} } func (m *ResizeSource) String() string { return proto.CompactTextString(m) } func (*ResizeSource) ProtoMessage() {} func (*ResizeSource) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{29} + return fileDescriptor_d2a91b51c7bdc125, []int{28} } func (m *ResizeSource) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1925,7 +1870,7 @@ func (m *TranslationResizeSource) Reset() { *m = TranslationResizeSource func (m *TranslationResizeSource) String() string { return proto.CompactTextString(m) } func (*TranslationResizeSource) ProtoMessage() {} func (*TranslationResizeSource) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{30} + return fileDescriptor_d2a91b51c7bdc125, []int{29} } func (m *TranslationResizeSource) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1988,7 +1933,7 @@ func (m *ResizeInstructionComplete) Reset() { *m = ResizeInstructionComp func (m *ResizeInstructionComplete) String() string { return proto.CompactTextString(m) } func (*ResizeInstructionComplete) ProtoMessage() {} func (*ResizeInstructionComplete) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{31} + return fileDescriptor_d2a91b51c7bdc125, []int{30} } func (m *ResizeInstructionComplete) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2049,7 +1994,7 @@ func (m *SetCoordinatorMessage) Reset() { *m = SetCoordinatorMessage{} } func (m *SetCoordinatorMessage) String() string { return proto.CompactTextString(m) } func (*SetCoordinatorMessage) ProtoMessage() {} func (*SetCoordinatorMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{32} + return fileDescriptor_d2a91b51c7bdc125, []int{31} } func (m *SetCoordinatorMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2096,7 +2041,7 @@ func (m *UpdateCoordinatorMessage) Reset() { *m = UpdateCoordinatorMessa func (m *UpdateCoordinatorMessage) String() string { return proto.CompactTextString(m) } func (*UpdateCoordinatorMessage) ProtoMessage() {} func (*UpdateCoordinatorMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{33} + return fileDescriptor_d2a91b51c7bdc125, []int{32} } func (m *UpdateCoordinatorMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2144,7 +2089,7 @@ func (m *Topology) Reset() { *m = Topology{} } func (m *Topology) String() string { return proto.CompactTextString(m) } func (*Topology) ProtoMessage() {} func (*Topology) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{34} + return fileDescriptor_d2a91b51c7bdc125, []int{33} } func (m *Topology) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2197,7 +2142,7 @@ func (m *RecalculateCaches) Reset() { *m = RecalculateCaches{} } func (m *RecalculateCaches) String() string { return proto.CompactTextString(m) } func (*RecalculateCaches) ProtoMessage() {} func (*RecalculateCaches) Descriptor() ([]byte, []int) { - return fileDescriptor_d2a91b51c7bdc125, []int{35} + return fileDescriptor_d2a91b51c7bdc125, []int{34} } func (m *RecalculateCaches) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2229,7 +2174,6 @@ var xxx_messageInfo_RecalculateCaches proto.InternalMessageInfo func init() { proto.RegisterType((*IndexMeta)(nil), "internal.IndexMeta") proto.RegisterType((*FieldOptions)(nil), "internal.FieldOptions") - proto.RegisterType((*Decimal)(nil), "internal.Decimal") proto.RegisterType((*ImportResponse)(nil), "internal.ImportResponse") proto.RegisterType((*BlockDataRequest)(nil), "internal.BlockDataRequest") proto.RegisterType((*BlockDataResponse)(nil), "internal.BlockDataResponse") @@ -2269,88 +2213,87 @@ func init() { func init() { proto.RegisterFile("private.proto", fileDescriptor_d2a91b51c7bdc125) } var fileDescriptor_d2a91b51c7bdc125 = []byte{ - // 1287 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdb, 0x72, 0xdb, 0xc4, - 0x1b, 0xff, 0x4b, 0x72, 0x62, 0xfb, 0x73, 0x9c, 0x3a, 0xdb, 0x93, 0xda, 0x3f, 0x13, 0xcc, 0xd2, - 0xa1, 0xa6, 0x33, 0x84, 0x4e, 0x0b, 0x33, 0x9c, 0x3a, 0x53, 0x12, 0xa7, 0xc5, 0x94, 0x84, 0x76, - 0x9d, 0xe6, 0x8e, 0x8b, 0xad, 0xbc, 0xd3, 0x68, 0x22, 0x4b, 0x46, 0x5a, 0xe5, 0xd0, 0x0b, 0x6e, - 0x61, 0x86, 0x17, 0xe0, 0x91, 0xb8, 0xe4, 0x11, 0x98, 0xf2, 0x02, 0xdc, 0x72, 0xc7, 0xec, 0xb7, - 0xbb, 0x3a, 0xb8, 0x09, 0x29, 0x29, 0x77, 0xfa, 0xce, 0xbf, 0xfd, 0x4e, 0xbb, 0x82, 0xee, 0x2c, - 0x0d, 0x0f, 0xb8, 0x14, 0x6b, 0xb3, 0x34, 0x91, 0x09, 0x69, 0x85, 0xb1, 0x14, 0x69, 0xcc, 0x23, - 0xfa, 0x10, 0xda, 0xa3, 0x78, 0x22, 0x8e, 0xb6, 0x84, 0xe4, 0x84, 0x40, 0xe3, 0x91, 0x38, 0xce, - 0x7c, 0xaf, 0xef, 0x0c, 0x5a, 0x0c, 0xbf, 0xc9, 0x7b, 0xb0, 0xbc, 0x93, 0xf2, 0x60, 0x7f, 0xf3, - 0x28, 0xcc, 0xa4, 0x88, 0x03, 0xe1, 0x37, 0x50, 0x3a, 0xc7, 0xa5, 0x7f, 0xba, 0xb0, 0xf4, 0x20, - 0x14, 0xd1, 0xe4, 0xdb, 0x99, 0x0c, 0x93, 0x38, 0x53, 0xce, 0x76, 0x8e, 0x67, 0xc2, 0x6f, 0xf5, - 0x9d, 0x41, 0x9b, 0xe1, 0x37, 0x79, 0x0b, 0xda, 0x1b, 0x3c, 0xd8, 0x13, 0x28, 0xf0, 0x50, 0x50, - 0x32, 0x0a, 0xe9, 0x38, 0x7c, 0xa1, 0xa3, 0x74, 0x59, 0xc9, 0x20, 0x7d, 0xe8, 0xec, 0x84, 0x53, - 0xf1, 0x24, 0xe7, 0xb1, 0xcc, 0xa7, 0xfe, 0x02, 0x5a, 0x57, 0x59, 0x05, 0xfc, 0x4e, 0x1d, 0xfe, - 0x76, 0x32, 0x96, 0x3c, 0x9e, 0xf0, 0x74, 0xb2, 0x1b, 0x8a, 0x43, 0x7f, 0x49, 0xc3, 0xaf, 0x73, - 0x95, 0xed, 0x3a, 0xcf, 0x84, 0xdf, 0xed, 0x3b, 0x03, 0x8f, 0xe1, 0x37, 0xb9, 0x0e, 0xad, 0xf5, - 0x50, 0x0e, 0xc5, 0x4c, 0xee, 0xf9, 0xcb, 0x7d, 0x67, 0xd0, 0x60, 0x05, 0x4d, 0x2e, 0xc1, 0xc2, - 0x38, 0xe0, 0x91, 0xf0, 0x2f, 0xa0, 0x81, 0x26, 0x08, 0x85, 0xa5, 0x07, 0x49, 0x2a, 0xc2, 0xe7, - 0x31, 0x26, 0xd5, 0xef, 0x21, 0xc8, 0x1a, 0x8f, 0xbc, 0x0b, 0xde, 0x56, 0x18, 0xfb, 0x2b, 0x7d, - 0x67, 0xd0, 0xb9, 0xb3, 0xb2, 0x66, 0x2b, 0xb1, 0x36, 0x14, 0x41, 0x38, 0xe5, 0x11, 0x53, 0x52, - 0x54, 0xe2, 0x47, 0x3e, 0x39, 0x5d, 0x89, 0x1f, 0xd1, 0x8f, 0xa1, 0x69, 0x68, 0x05, 0x67, 0x97, - 0x47, 0xb9, 0xf0, 0x1d, 0x0d, 0x07, 0x89, 0x12, 0xa4, 0x5b, 0x01, 0x49, 0x29, 0x2c, 0x8f, 0xa6, - 0xb3, 0x24, 0x95, 0x4c, 0x64, 0xb3, 0x24, 0xce, 0x04, 0xe9, 0x81, 0xb7, 0x99, 0xa6, 0x68, 0xdb, - 0x66, 0xea, 0x93, 0xfe, 0x00, 0xbd, 0xf5, 0x28, 0x09, 0xf6, 0x87, 0x5c, 0x72, 0x26, 0xbe, 0xcf, - 0x45, 0x26, 0x95, 0x37, 0x7d, 0x2a, 0xad, 0xa7, 0x09, 0xc5, 0xc5, 0xb2, 0x63, 0x8c, 0x36, 0xd3, - 0x84, 0x4a, 0x27, 0x26, 0x5b, 0x57, 0x09, 0xbf, 0x11, 0xcd, 0x1e, 0x4f, 0x27, 0x58, 0xda, 0x06, - 0xd3, 0x84, 0xe2, 0x62, 0x24, 0x6c, 0x87, 0x06, 0xd3, 0x04, 0x1d, 0xc1, 0x4a, 0x25, 0xbe, 0x81, - 0x79, 0x05, 0x16, 0x59, 0x72, 0x38, 0x1a, 0x66, 0xbe, 0xd3, 0xf7, 0x06, 0x0d, 0x66, 0x28, 0xec, - 0x9b, 0x24, 0xca, 0xa7, 0xb1, 0x12, 0xb9, 0x28, 0x2a, 0x19, 0xf4, 0x1a, 0x2c, 0x60, 0x13, 0xa9, - 0x53, 0x96, 0xb6, 0xea, 0x93, 0xfe, 0xe8, 0x40, 0x7b, 0x8b, 0x1f, 0x21, 0x90, 0x8c, 0xdc, 0x83, - 0x96, 0x6d, 0x09, 0x54, 0xea, 0xdc, 0x79, 0xa7, 0x4c, 0x7c, 0xa1, 0xb6, 0x66, 0x75, 0x36, 0x63, - 0x99, 0x1e, 0xb3, 0xc2, 0xe4, 0xfa, 0xe7, 0xd0, 0xad, 0x89, 0x54, 0xbc, 0x7d, 0x71, 0x6c, 0xb3, - 0xba, 0x2f, 0x8e, 0xd5, 0x59, 0x0f, 0xb0, 0x4a, 0xae, 0x3e, 0x2b, 0x12, 0x9f, 0xb9, 0x9f, 0x38, - 0x74, 0x17, 0xc8, 0x46, 0x2a, 0xb8, 0x14, 0x18, 0x64, 0x4b, 0x64, 0x19, 0x7f, 0x2e, 0xce, 0xca, - 0xb8, 0x57, 0xcd, 0x78, 0x91, 0x5d, 0xb7, 0x92, 0x5d, 0x7a, 0x0b, 0xc8, 0x50, 0x44, 0x42, 0x0a, - 0x33, 0xe4, 0xff, 0xe0, 0x97, 0x8e, 0x2d, 0x86, 0xb3, 0x75, 0xc9, 0x4d, 0x68, 0xa8, 0x8d, 0x81, - 0xc1, 0x3a, 0x77, 0x2e, 0x96, 0x79, 0x2a, 0x96, 0x09, 0x43, 0x05, 0x1a, 0x59, 0xa7, 0x88, 0xf2, - 0x35, 0x0f, 0x56, 0x6b, 0xa5, 0x5b, 0x26, 0x94, 0x87, 0xa1, 0xae, 0x94, 0xa1, 0xaa, 0xdb, 0xc6, - 0x44, 0xbb, 0x6f, 0x8f, 0x7b, 0xde, 0x68, 0x34, 0x80, 0xff, 0x6b, 0x0f, 0x5f, 0x1e, 0xf0, 0x30, - 0xe2, 0xcf, 0xa2, 0x7f, 0x55, 0x91, 0x1a, 0x70, 0x1f, 0x9a, 0x68, 0x3b, 0x1a, 0x9a, 0xde, 0xb6, - 0x24, 0xfd, 0x0e, 0xca, 0x31, 0xd9, 0xe6, 0x53, 0x61, 0xbc, 0xe1, 0x77, 0x71, 0x5e, 0xf7, 0xec, - 0xf3, 0xe2, 0xd8, 0x87, 0xe2, 0x50, 0x6d, 0x6c, 0x4f, 0x05, 0x46, 0x82, 0xde, 0x85, 0xc5, 0x71, - 0xb0, 0x27, 0xa6, 0x9c, 0xbc, 0x0f, 0x4d, 0x44, 0x28, 0x32, 0xd3, 0xd1, 0x17, 0xe6, 0x2a, 0xc5, - 0xac, 0x9c, 0x66, 0xe6, 0x64, 0x27, 0x62, 0xfa, 0x00, 0x9a, 0x26, 0x30, 0x4e, 0xf4, 0x29, 0x15, - 0xb7, 0x3a, 0xe4, 0x26, 0x2c, 0x22, 0xd8, 0xcc, 0x6f, 0xcc, 0x47, 0x45, 0x3e, 0x33, 0x62, 0xba, - 0x09, 0xde, 0x53, 0x36, 0x52, 0x83, 0x8d, 0x80, 0x6d, 0x50, 0x43, 0x29, 0x28, 0x5f, 0x25, 0x99, - 0x34, 0x69, 0xc5, 0x6f, 0xc5, 0x7b, 0x9c, 0xa4, 0x12, 0x53, 0xda, 0x65, 0xf8, 0x4d, 0x33, 0x68, - 0x6c, 0x27, 0x13, 0x41, 0x96, 0xc1, 0x1d, 0x0d, 0x8d, 0x0f, 0x77, 0x34, 0x24, 0x6f, 0xa3, 0x7b, - 0x93, 0xc9, 0x6e, 0x09, 0xe2, 0x29, 0x1b, 0x31, 0x0c, 0x7c, 0x03, 0xba, 0xa3, 0x6c, 0x23, 0x49, - 0xd2, 0x49, 0x18, 0x73, 0x99, 0xa4, 0xe6, 0xe6, 0xab, 0x33, 0x71, 0xb4, 0x24, 0x97, 0xfa, 0x4e, - 0x6a, 0x33, 0x4d, 0xd0, 0xfb, 0xd0, 0x53, 0x41, 0x91, 0xb0, 0xed, 0x71, 0x05, 0x16, 0x15, 0xaf, - 0x00, 0x61, 0xa8, 0xd2, 0x83, 0x5b, 0xf5, 0xf0, 0x8d, 0xf6, 0xb0, 0x79, 0x20, 0x62, 0x59, 0x69, - 0x30, 0xa4, 0xd1, 0x41, 0x97, 0x69, 0x82, 0x50, 0x7d, 0x40, 0x73, 0x92, 0xe5, 0xf2, 0x24, 0x8a, - 0xcb, 0x50, 0x46, 0x7f, 0x76, 0x00, 0x2c, 0xa0, 0x3c, 0x2b, 0x4c, 0x9c, 0xd3, 0x4d, 0xc8, 0xc0, - 0x36, 0x8a, 0x19, 0xae, 0x5e, 0xa9, 0xa5, 0xf9, 0xcc, 0x36, 0xd2, 0x87, 0x65, 0x23, 0xe9, 0x92, - 0x5e, 0x9e, 0x6b, 0x00, 0x1d, 0xb5, 0x6c, 0xa7, 0xc7, 0xd0, 0xa9, 0xf0, 0x4f, 0x69, 0x2a, 0xdb, - 0x25, 0xee, 0xbc, 0x4b, 0xe4, 0x1b, 0x97, 0xb6, 0x57, 0x1e, 0x41, 0xa7, 0xc2, 0x3e, 0xd1, 0xe3, - 0x00, 0x2e, 0xd4, 0xc7, 0xd6, 0x5e, 0x07, 0xf3, 0x6c, 0x1a, 0x42, 0x77, 0x23, 0xca, 0x33, 0x29, - 0x52, 0xe3, 0x4e, 0xdd, 0x21, 0x9a, 0x51, 0x14, 0xaf, 0x64, 0x9c, 0x5c, 0x3f, 0x72, 0x03, 0x16, - 0x54, 0x1a, 0xf5, 0xf4, 0xbd, 0x9a, 0x63, 0x2d, 0xa4, 0xbb, 0xd0, 0x5a, 0x1f, 0x8f, 0x1e, 0xa6, - 0x49, 0x3e, 0x3b, 0x11, 0xb4, 0x7d, 0x27, 0xb9, 0x95, 0x77, 0x52, 0x4f, 0xbf, 0x11, 0x3c, 0xbc, - 0xb6, 0xf1, 0x41, 0xd0, 0xd3, 0x0f, 0x82, 0x86, 0xe1, 0x70, 0xb5, 0xae, 0x57, 0xf4, 0x66, 0x55, - 0x43, 0x7f, 0x9e, 0xfd, 0x64, 0xef, 0x68, 0xaf, 0xbc, 0xa3, 0x95, 0x53, 0xbd, 0xfe, 0xfe, 0x4b, - 0xa7, 0x7f, 0xb9, 0xb0, 0xc2, 0x44, 0x16, 0xbe, 0x10, 0xa3, 0x38, 0x93, 0x69, 0x1e, 0xa8, 0x2d, - 0xa1, 0xec, 0xbf, 0x4e, 0x9e, 0x99, 0x6c, 0x7b, 0x4c, 0x13, 0xaf, 0xd3, 0xe9, 0xe4, 0x36, 0x74, - 0xe6, 0x67, 0xf6, 0x55, 0xd5, 0xaa, 0x0a, 0xb9, 0x0d, 0xcd, 0x71, 0x92, 0xa7, 0x41, 0xd1, 0xbe, - 0x95, 0xb5, 0xaa, 0x91, 0x69, 0x31, 0xb3, 0x6a, 0xe4, 0x09, 0x90, 0x9d, 0x94, 0xc7, 0x59, 0xc4, - 0x15, 0x58, 0x6b, 0xdc, 0x9a, 0x7f, 0x16, 0x54, 0x74, 0x6a, 0x7e, 0x4e, 0x30, 0x26, 0x1f, 0x55, - 0xe7, 0xd3, 0x6f, 0x22, 0xea, 0x4b, 0x75, 0xd4, 0xa6, 0xe5, 0xab, 0x73, 0x7c, 0x6f, 0xae, 0x53, - 0xfd, 0x45, 0x34, 0xbc, 0x5a, 0x1a, 0xd6, 0xc4, 0xac, 0xae, 0x4d, 0x7f, 0x72, 0x60, 0xa9, 0x8a, - 0xec, 0xb5, 0xf6, 0x42, 0x51, 0x70, 0xf7, 0xec, 0x77, 0x87, 0x2d, 0x78, 0xe3, 0xa4, 0x97, 0xde, - 0x42, 0xf5, 0x2d, 0x92, 0xc3, 0xd5, 0x53, 0xd2, 0xf5, 0x06, 0xa0, 0xfa, 0xd0, 0x79, 0xcc, 0x53, - 0x19, 0x2a, 0x97, 0xe6, 0xa2, 0x5d, 0x60, 0x55, 0x16, 0xdd, 0x87, 0x6b, 0xaf, 0x34, 0xdf, 0x46, - 0x32, 0x9d, 0xa9, 0x2e, 0x7f, 0x83, 0x26, 0x54, 0x8b, 0x3a, 0x4d, 0x4d, 0xfb, 0xb5, 0x99, 0x26, - 0xe8, 0xa7, 0x70, 0x79, 0x2c, 0x64, 0xa5, 0xf5, 0xec, 0x0c, 0xf5, 0xc1, 0xdb, 0x16, 0x87, 0xa7, - 0x1c, 0x50, 0x89, 0xe8, 0x17, 0xe0, 0x3f, 0x9d, 0x4d, 0xb8, 0x14, 0xe7, 0xb2, 0x5e, 0x87, 0xd6, - 0x4e, 0x32, 0x4b, 0xa2, 0xe4, 0xf9, 0xf1, 0x19, 0xbb, 0xcc, 0x87, 0xa6, 0xbe, 0x95, 0xf4, 0x72, - 0x6c, 0x33, 0x4b, 0xd2, 0x8b, 0x6a, 0x4c, 0x03, 0x1e, 0x05, 0x79, 0xa4, 0x60, 0xa8, 0x47, 0x73, - 0xb6, 0xde, 0xfb, 0xf5, 0xe5, 0xaa, 0xf3, 0xdb, 0xcb, 0x55, 0xe7, 0xf7, 0x97, 0xab, 0xce, 0x2f, - 0x7f, 0xac, 0xfe, 0xef, 0xd9, 0x22, 0xfe, 0x43, 0xde, 0xfd, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xa0, - 0x67, 0xe6, 0x48, 0x54, 0x0e, 0x00, 0x00, + // 1275 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4b, 0x73, 0xdb, 0x44, + 0x1c, 0x47, 0x92, 0x93, 0xd8, 0x7f, 0xc7, 0xa9, 0xb3, 0x7d, 0xa9, 0x85, 0x09, 0x66, 0xe9, 0x50, + 0xd3, 0x19, 0x42, 0xa7, 0xe5, 0xc0, 0xab, 0x33, 0x25, 0x71, 0x5a, 0x4c, 0x49, 0x68, 0xd7, 0x69, + 0x6f, 0x1c, 0x36, 0xf2, 0x4e, 0xa3, 0x89, 0x2c, 0x09, 0x69, 0x95, 0x26, 0x3d, 0x70, 0x85, 0x19, + 0xbe, 0x00, 0x1f, 0x89, 0x23, 0x1f, 0x81, 0x29, 0x5f, 0x80, 0x2b, 0x37, 0x66, 0xff, 0xbb, 0xab, + 0x87, 0x9b, 0x90, 0xd2, 0x72, 0xdb, 0xff, 0xfb, 0xb7, 0xff, 0xd7, 0x4a, 0xd0, 0x4b, 0xb3, 0xf0, + 0x90, 0x4b, 0xb1, 0x9e, 0x66, 0x89, 0x4c, 0x48, 0x3b, 0x8c, 0xa5, 0xc8, 0x62, 0x1e, 0x5d, 0x5d, + 0x4e, 0x8b, 0xbd, 0x28, 0x0c, 0x34, 0x9f, 0xde, 0x87, 0xce, 0x38, 0x9e, 0x8a, 0xa3, 0x6d, 0x21, + 0x39, 0x21, 0xd0, 0x7a, 0x20, 0x8e, 0x73, 0xdf, 0x1b, 0x38, 0xc3, 0x36, 0xc3, 0x33, 0xf9, 0x00, + 0x56, 0x76, 0x33, 0x1e, 0x1c, 0x6c, 0x1d, 0x85, 0xb9, 0x14, 0x71, 0x20, 0xfc, 0x16, 0x4a, 0xe7, + 0xb8, 0xf4, 0x2f, 0x17, 0x96, 0xef, 0x85, 0x22, 0x9a, 0x7e, 0x97, 0xca, 0x30, 0x89, 0x73, 0xe5, + 0x6c, 0xf7, 0x38, 0x15, 0x7e, 0x7b, 0xe0, 0x0c, 0x3b, 0x0c, 0xcf, 0xe4, 0x1d, 0xe8, 0x6c, 0xf2, + 0x60, 0x5f, 0xa0, 0xc0, 0x43, 0x41, 0xc5, 0x28, 0xa5, 0x93, 0xf0, 0xb9, 0x8e, 0xd2, 0x63, 0x15, + 0x83, 0x0c, 0xa0, 0xbb, 0x1b, 0xce, 0xc4, 0xa3, 0x82, 0xc7, 0xb2, 0x98, 0xf9, 0x0b, 0x68, 0x5d, + 0x67, 0x95, 0xf0, 0xbb, 0x4d, 0xf8, 0x3b, 0xc9, 0x44, 0xf2, 0x78, 0xca, 0xb3, 0xe9, 0x93, 0x50, + 0x3c, 0xf3, 0x97, 0x35, 0xfc, 0x26, 0x57, 0xd9, 0x6e, 0xf0, 0x5c, 0xf8, 0xbd, 0x81, 0x33, 0xf4, + 0x18, 0x9e, 0xc9, 0x55, 0x68, 0x6f, 0x84, 0x72, 0x24, 0x52, 0xb9, 0xef, 0xaf, 0x0c, 0x9c, 0x61, + 0x8b, 0x95, 0x34, 0xb9, 0x00, 0x0b, 0x93, 0x80, 0x47, 0xc2, 0x3f, 0x87, 0x06, 0x9a, 0x20, 0x14, + 0x96, 0xef, 0x25, 0x99, 0x08, 0x9f, 0xc6, 0x98, 0x54, 0xbf, 0x8f, 0x20, 0x1b, 0x3c, 0xf2, 0x3e, + 0x78, 0xdb, 0x61, 0xec, 0xaf, 0x0e, 0x9c, 0x61, 0xf7, 0xd6, 0xea, 0xba, 0xad, 0xcb, 0xfa, 0x48, + 0x04, 0xe1, 0x8c, 0x47, 0x4c, 0x49, 0x51, 0x89, 0x1f, 0xf9, 0xe4, 0x74, 0x25, 0x7e, 0x44, 0x29, + 0xac, 0x8c, 0x67, 0x69, 0x92, 0x49, 0x26, 0xf2, 0x34, 0x89, 0x73, 0x41, 0xfa, 0xe0, 0x6d, 0x65, + 0x99, 0xef, 0x60, 0x58, 0x75, 0xa4, 0x3f, 0x42, 0x7f, 0x23, 0x4a, 0x82, 0x83, 0x11, 0x97, 0x9c, + 0x89, 0x1f, 0x0a, 0x91, 0x4b, 0x85, 0x5d, 0xc3, 0xd3, 0x7a, 0x9a, 0x50, 0x5c, 0xac, 0x9f, 0xef, + 0x6a, 0x2e, 0x12, 0x2a, 0x2f, 0x98, 0x35, 0x9d, 0x6e, 0x3c, 0xe3, 0xdd, 0xf7, 0x79, 0x36, 0xc5, + 0x1a, 0xb5, 0x98, 0x26, 0x14, 0x17, 0x23, 0x61, 0x5d, 0x5b, 0x4c, 0x13, 0x74, 0x0c, 0xab, 0xb5, + 0xf8, 0x06, 0xe6, 0x25, 0x58, 0x64, 0xc9, 0xb3, 0xf1, 0x28, 0xf7, 0x9d, 0x81, 0x37, 0x6c, 0x31, + 0x43, 0x61, 0x03, 0x24, 0x51, 0x31, 0x8b, 0x95, 0xc8, 0x45, 0x51, 0xc5, 0xa0, 0x57, 0x60, 0x01, + 0xbb, 0x41, 0xdd, 0xb2, 0xb2, 0x55, 0x47, 0xfa, 0x93, 0x03, 0x9d, 0x6d, 0x7e, 0x84, 0x40, 0x72, + 0x72, 0x07, 0xda, 0xb6, 0xb6, 0xa8, 0xd4, 0xbd, 0xf5, 0x5e, 0x95, 0xc1, 0x52, 0x6d, 0xdd, 0xea, + 0x6c, 0xc5, 0x32, 0x3b, 0x66, 0xa5, 0xc9, 0xd5, 0x2f, 0xa0, 0xd7, 0x10, 0xa9, 0x78, 0x07, 0xe2, + 0xd8, 0x66, 0xf5, 0x40, 0x1c, 0xab, 0xbb, 0x1e, 0xf2, 0xa8, 0x10, 0x98, 0xab, 0x16, 0xd3, 0xc4, + 0xe7, 0xee, 0xa7, 0x0e, 0x7d, 0x02, 0x64, 0x33, 0x13, 0x5c, 0x0a, 0x0c, 0xb2, 0x2d, 0xf2, 0x9c, + 0x3f, 0x15, 0x67, 0x65, 0xdc, 0xab, 0x67, 0xbc, 0xcc, 0xae, 0x5b, 0xcb, 0x2e, 0xbd, 0x01, 0x64, + 0x24, 0x22, 0x21, 0x85, 0x99, 0xd6, 0x7f, 0xf1, 0x4b, 0x27, 0x16, 0xc3, 0xd9, 0xba, 0xe4, 0x3a, + 0xb4, 0xd4, 0xe8, 0x63, 0xb0, 0xee, 0xad, 0xf3, 0x55, 0x9e, 0xca, 0xad, 0xc0, 0x50, 0x81, 0x46, + 0xd6, 0x29, 0xa2, 0x7c, 0xc5, 0x8b, 0x35, 0x5a, 0xe9, 0x86, 0x09, 0xe5, 0x61, 0xa8, 0x4b, 0x55, + 0xa8, 0xfa, 0xda, 0x30, 0xd1, 0xee, 0xda, 0xeb, 0xbe, 0x6e, 0x34, 0x1a, 0xc0, 0xdb, 0xda, 0xc3, + 0x57, 0x87, 0x3c, 0x8c, 0xf8, 0x5e, 0xf4, 0x9f, 0x2a, 0xd2, 0x00, 0xee, 0xc3, 0x12, 0xda, 0x8e, + 0x47, 0xa6, 0xb7, 0x2d, 0x49, 0xbf, 0x87, 0x6a, 0x4c, 0x76, 0xf8, 0x4c, 0x18, 0x6f, 0x78, 0x2e, + 0xef, 0xeb, 0x9e, 0x7d, 0x5f, 0x15, 0x58, 0x8d, 0x96, 0x5a, 0xbd, 0x9e, 0x0a, 0x8c, 0x04, 0xbd, + 0x0d, 0x8b, 0x93, 0x60, 0x5f, 0xcc, 0x38, 0xf9, 0x10, 0x96, 0x10, 0xa1, 0xc8, 0x4d, 0x47, 0x9f, + 0x9b, 0xab, 0x14, 0xb3, 0x72, 0x9a, 0x9b, 0x9b, 0x9d, 0x88, 0xe9, 0x23, 0x58, 0x32, 0x81, 0x71, + 0xa2, 0x4f, 0xa9, 0xb8, 0xd5, 0x21, 0xd7, 0x61, 0x11, 0xc1, 0xe6, 0x7e, 0x6b, 0x3e, 0x2a, 0xf2, + 0x99, 0x11, 0xd3, 0x2d, 0xf0, 0x1e, 0xb3, 0xb1, 0x1a, 0x6c, 0x04, 0x6c, 0x83, 0x1a, 0x4a, 0x41, + 0xf9, 0x3a, 0xc9, 0xa5, 0x49, 0x2b, 0x9e, 0x15, 0xef, 0x61, 0x92, 0x49, 0x4c, 0x69, 0x8f, 0xe1, + 0x99, 0xe6, 0xd0, 0xda, 0x49, 0xa6, 0x82, 0xac, 0x80, 0x3b, 0x1e, 0x19, 0x1f, 0xee, 0x78, 0x44, + 0xde, 0x45, 0xf7, 0x26, 0x93, 0xbd, 0x0a, 0xc4, 0x63, 0x36, 0x66, 0x18, 0xf8, 0x1a, 0xf4, 0xc6, + 0xf9, 0x66, 0x92, 0x64, 0xd3, 0x30, 0xe6, 0x32, 0xc9, 0xcc, 0x13, 0xd6, 0x64, 0xe2, 0x68, 0x49, + 0x2e, 0xf5, 0xe3, 0xd2, 0x61, 0x9a, 0xa0, 0x77, 0xa1, 0xaf, 0x82, 0x22, 0x61, 0xdb, 0xe3, 0x12, + 0x2c, 0x2a, 0x5e, 0x09, 0xc2, 0x50, 0x95, 0x07, 0xb7, 0xee, 0xe1, 0x5b, 0xed, 0x61, 0xeb, 0x50, + 0xc4, 0xb2, 0xd6, 0x60, 0x48, 0xa3, 0x83, 0x1e, 0xd3, 0x04, 0xa1, 0xfa, 0x82, 0xe6, 0x26, 0x2b, + 0xd5, 0x4d, 0x14, 0x97, 0xa1, 0x8c, 0xfe, 0xe2, 0x00, 0x58, 0x40, 0x45, 0x5e, 0x9a, 0x38, 0xa7, + 0x9b, 0x90, 0xa1, 0x6d, 0x14, 0x33, 0x5c, 0xfd, 0x4a, 0x4b, 0xf3, 0x99, 0x6d, 0xa4, 0x8f, 0xab, + 0x46, 0xd2, 0x25, 0xbd, 0x38, 0xd7, 0x00, 0x3a, 0x6a, 0xd5, 0x4e, 0x0f, 0xa1, 0x5b, 0xe3, 0x9f, + 0xd2, 0x54, 0xb6, 0x4b, 0xdc, 0x79, 0x97, 0xc8, 0x37, 0x2e, 0x6d, 0xaf, 0x3c, 0x80, 0x6e, 0x8d, + 0x7d, 0xa2, 0xc7, 0x21, 0x9c, 0x6b, 0x8e, 0xad, 0x7d, 0x0e, 0xe6, 0xd9, 0x34, 0x84, 0xde, 0x66, + 0x54, 0xe4, 0x52, 0x64, 0xc6, 0x9d, 0x7a, 0x43, 0x34, 0xa3, 0x2c, 0x5e, 0xc5, 0x38, 0xb9, 0x7e, + 0xe4, 0x1a, 0x2c, 0xa8, 0x34, 0xea, 0xe9, 0x7b, 0x39, 0xc7, 0x5a, 0x48, 0x9f, 0x40, 0x7b, 0x63, + 0x32, 0xbe, 0x9f, 0x25, 0x45, 0x7a, 0x22, 0x68, 0xfb, 0xc1, 0xe3, 0xd6, 0x3e, 0x78, 0xfa, 0xfa, + 0xb1, 0xf7, 0xf0, 0x23, 0x01, 0x5f, 0xf6, 0xbe, 0x7e, 0xd9, 0x5b, 0x86, 0xc3, 0xd5, 0xba, 0x5e, + 0xd5, 0x9b, 0x55, 0x0d, 0xfd, 0xeb, 0xec, 0x27, 0xfb, 0x46, 0x7b, 0xd5, 0x1b, 0xad, 0x9c, 0xea, + 0xf5, 0xf7, 0x7f, 0x3a, 0xfd, 0xdb, 0x85, 0x55, 0x26, 0xf2, 0xf0, 0xb9, 0x18, 0xc7, 0xb9, 0xcc, + 0x8a, 0x40, 0x6d, 0x09, 0x65, 0xff, 0x4d, 0xb2, 0x67, 0xb2, 0xed, 0x31, 0x4d, 0xbc, 0x4a, 0xa7, + 0x93, 0x9b, 0xd0, 0x9d, 0x9f, 0xd9, 0x97, 0x55, 0xeb, 0x2a, 0xe4, 0x26, 0x2c, 0x4d, 0x92, 0x22, + 0x0b, 0xca, 0xf6, 0xad, 0xad, 0x55, 0x8d, 0x4c, 0x8b, 0x99, 0x55, 0x23, 0x8f, 0x80, 0xec, 0x66, + 0x3c, 0xce, 0x23, 0xae, 0xc0, 0x5a, 0xe3, 0xf6, 0xfc, 0x67, 0x41, 0x4d, 0xa7, 0xe1, 0xe7, 0x04, + 0x63, 0xf2, 0x49, 0x7d, 0x3e, 0xfd, 0x25, 0x44, 0x7d, 0xa1, 0x89, 0xda, 0xb4, 0x7c, 0x7d, 0x8e, + 0xef, 0xcc, 0x75, 0xaa, 0xbf, 0x88, 0x86, 0x97, 0x2b, 0xc3, 0x86, 0x98, 0x35, 0xb5, 0xe9, 0xcf, + 0x0e, 0x2c, 0xd7, 0x91, 0xbd, 0xd2, 0x5e, 0x28, 0x0b, 0xee, 0x9e, 0xfd, 0xdd, 0x61, 0x0b, 0xde, + 0x3a, 0xe9, 0x4b, 0x6f, 0xa1, 0xfe, 0x2d, 0x52, 0xc0, 0xe5, 0x53, 0xd2, 0xf5, 0x06, 0xa0, 0x06, + 0xd0, 0x7d, 0xc8, 0x33, 0x19, 0x2a, 0x97, 0xe6, 0xa1, 0x5d, 0x60, 0x75, 0x16, 0x3d, 0x80, 0x2b, + 0x2f, 0x35, 0xdf, 0x66, 0x32, 0x4b, 0x55, 0x97, 0xbf, 0x41, 0x13, 0xaa, 0x45, 0x9d, 0x65, 0xa6, + 0xfd, 0x3a, 0x4c, 0x13, 0xf4, 0x33, 0xb8, 0x38, 0x11, 0xb2, 0xd6, 0x7a, 0x76, 0x86, 0x06, 0xe0, + 0xed, 0x88, 0x67, 0xa7, 0x5c, 0x50, 0x89, 0xe8, 0x97, 0xe0, 0x3f, 0x4e, 0xa7, 0x5c, 0x8a, 0xd7, + 0xb2, 0xde, 0x80, 0xf6, 0x6e, 0x92, 0x26, 0x51, 0xf2, 0xf4, 0xf8, 0x8c, 0x5d, 0xe6, 0xc3, 0x92, + 0x7e, 0x95, 0xf4, 0x72, 0xec, 0x30, 0x4b, 0xd2, 0xf3, 0x6a, 0x4c, 0x03, 0x1e, 0x05, 0x45, 0xa4, + 0x60, 0xa8, 0x8f, 0xe6, 0x7c, 0xa3, 0xff, 0xdb, 0x8b, 0x35, 0xe7, 0xf7, 0x17, 0x6b, 0xce, 0x1f, + 0x2f, 0xd6, 0x9c, 0x5f, 0xff, 0x5c, 0x7b, 0x6b, 0x6f, 0x11, 0x7f, 0x01, 0x6f, 0xff, 0x13, 0x00, + 0x00, 0xff, 0xff, 0x60, 0x9d, 0x52, 0x8c, 0x2b, 0x0e, 0x00, 0x00, } func (m *IndexMeta) Marshal() (dAtA []byte, err error) { @@ -2525,43 +2468,6 @@ func (m *FieldOptions) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *Decimal) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Decimal) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Decimal) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if m.Scale != 0 { - i = encodeVarintPrivate(dAtA, i, uint64(m.Scale)) - i-- - dAtA[i] = 0x10 - } - if m.Value != 0 { - i = encodeVarintPrivate(dAtA, i, uint64(m.Value)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - func (m *ImportResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4295,24 +4201,6 @@ func (m *FieldOptions) Size() (n int) { return n } -func (m *Decimal) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Value != 0 { - n += 1 + sovPrivate(uint64(m.Value)) - } - if m.Scale != 0 { - n += 1 + sovPrivate(uint64(m.Scale)) - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - func (m *ImportResponse) Size() (n int) { if m == nil { return 0 @@ -5536,98 +5424,6 @@ func (m *FieldOptions) Unmarshal(dAtA []byte) error { } return nil } -func (m *Decimal) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPrivate - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Decimal: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Decimal: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) - } - m.Value = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPrivate - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Value |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Scale", wireType) - } - m.Scale = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPrivate - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Scale |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipPrivate(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthPrivate - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthPrivate - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *ImportResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/internal/private.proto b/internal/private.proto index df4365c06..81c72dde6 100644 --- a/internal/private.proto +++ b/internal/private.proto @@ -2,6 +2,8 @@ syntax = "proto3"; package internal; +import "public.proto"; + message IndexMeta { bool Keys = 3; bool TrackExistence = 4; @@ -22,11 +24,6 @@ message FieldOptions { Decimal Max = 18; } -message Decimal { - int64 Value = 1; - int64 Scale = 2; -} - message ImportResponse { string Err = 1; } diff --git a/internal/public.pb.go b/internal/public.pb.go index d4d99e51c..57a26c826 100644 --- a/internal/public.pb.go +++ b/internal/public.pb.go @@ -507,6 +507,7 @@ type ValCount struct { Val int64 `protobuf:"varint,1,opt,name=Val,proto3" json:"Val,omitempty"` Count int64 `protobuf:"varint,2,opt,name=Count,proto3" json:"Count,omitempty"` FloatVal float64 `protobuf:"fixed64,3,opt,name=FloatVal,proto3" json:"FloatVal,omitempty"` + DecimalVal *Decimal `protobuf:"bytes,4,opt,name=DecimalVal,proto3" json:"DecimalVal,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -566,6 +567,68 @@ func (m *ValCount) GetFloatVal() float64 { return 0 } +func (m *ValCount) GetDecimalVal() *Decimal { + if m != nil { + return m.DecimalVal + } + return nil +} + +type Decimal struct { + Value int64 `protobuf:"varint,1,opt,name=Value,proto3" json:"Value,omitempty"` + Scale int64 `protobuf:"varint,2,opt,name=Scale,proto3" json:"Scale,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Decimal) Reset() { *m = Decimal{} } +func (m *Decimal) String() string { return proto.CompactTextString(m) } +func (*Decimal) ProtoMessage() {} +func (*Decimal) Descriptor() ([]byte, []int) { + return fileDescriptor_413a91106d7bcce8, []int{9} +} +func (m *Decimal) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Decimal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Decimal.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Decimal) XXX_Merge(src proto.Message) { + xxx_messageInfo_Decimal.Merge(m, src) +} +func (m *Decimal) XXX_Size() int { + return m.Size() +} +func (m *Decimal) XXX_DiscardUnknown() { + xxx_messageInfo_Decimal.DiscardUnknown(m) +} + +var xxx_messageInfo_Decimal proto.InternalMessageInfo + +func (m *Decimal) GetValue() int64 { + if m != nil { + return m.Value + } + return 0 +} + +func (m *Decimal) GetScale() int64 { + if m != nil { + return m.Scale + } + return 0 +} + type ColumnAttrSet struct { ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` Key string `protobuf:"bytes,3,opt,name=Key,proto3" json:"Key,omitempty"` @@ -579,7 +642,7 @@ func (m *ColumnAttrSet) Reset() { *m = ColumnAttrSet{} } func (m *ColumnAttrSet) String() string { return proto.CompactTextString(m) } func (*ColumnAttrSet) ProtoMessage() {} func (*ColumnAttrSet) Descriptor() ([]byte, []int) { - return fileDescriptor_413a91106d7bcce8, []int{9} + return fileDescriptor_413a91106d7bcce8, []int{10} } func (m *ColumnAttrSet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -645,7 +708,7 @@ func (m *Attr) Reset() { *m = Attr{} } func (m *Attr) String() string { return proto.CompactTextString(m) } func (*Attr) ProtoMessage() {} func (*Attr) Descriptor() ([]byte, []int) { - return fileDescriptor_413a91106d7bcce8, []int{10} + return fileDescriptor_413a91106d7bcce8, []int{11} } func (m *Attr) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -727,7 +790,7 @@ func (m *AttrMap) Reset() { *m = AttrMap{} } func (m *AttrMap) String() string { return proto.CompactTextString(m) } func (*AttrMap) ProtoMessage() {} func (*AttrMap) Descriptor() ([]byte, []int) { - return fileDescriptor_413a91106d7bcce8, []int{11} + return fileDescriptor_413a91106d7bcce8, []int{12} } func (m *AttrMap) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -780,7 +843,7 @@ func (m *QueryRequest) Reset() { *m = QueryRequest{} } func (m *QueryRequest) String() string { return proto.CompactTextString(m) } func (*QueryRequest) ProtoMessage() {} func (*QueryRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_413a91106d7bcce8, []int{12} + return fileDescriptor_413a91106d7bcce8, []int{13} } func (m *QueryRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -871,7 +934,7 @@ func (m *QueryResponse) Reset() { *m = QueryResponse{} } func (m *QueryResponse) String() string { return proto.CompactTextString(m) } func (*QueryResponse) ProtoMessage() {} func (*QueryResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_413a91106d7bcce8, []int{13} + return fileDescriptor_413a91106d7bcce8, []int{14} } func (m *QueryResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -942,7 +1005,7 @@ func (m *QueryResult) Reset() { *m = QueryResult{} } func (m *QueryResult) String() string { return proto.CompactTextString(m) } func (*QueryResult) ProtoMessage() {} func (*QueryResult) Descriptor() ([]byte, []int) { - return fileDescriptor_413a91106d7bcce8, []int{14} + return fileDescriptor_413a91106d7bcce8, []int{15} } func (m *QueryResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1066,7 +1129,7 @@ func (m *ImportRequest) Reset() { *m = ImportRequest{} } func (m *ImportRequest) String() string { return proto.CompactTextString(m) } func (*ImportRequest) ProtoMessage() {} func (*ImportRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_413a91106d7bcce8, []int{15} + return fileDescriptor_413a91106d7bcce8, []int{16} } func (m *ImportRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1169,7 +1232,7 @@ func (m *ImportValueRequest) Reset() { *m = ImportValueRequest{} } func (m *ImportValueRequest) String() string { return proto.CompactTextString(m) } func (*ImportValueRequest) ProtoMessage() {} func (*ImportValueRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_413a91106d7bcce8, []int{16} + return fileDescriptor_413a91106d7bcce8, []int{17} } func (m *ImportValueRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1267,7 +1330,7 @@ func (m *TranslateKeysRequest) Reset() { *m = TranslateKeysRequest{} } func (m *TranslateKeysRequest) String() string { return proto.CompactTextString(m) } func (*TranslateKeysRequest) ProtoMessage() {} func (*TranslateKeysRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_413a91106d7bcce8, []int{17} + return fileDescriptor_413a91106d7bcce8, []int{18} } func (m *TranslateKeysRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1328,7 +1391,7 @@ func (m *TranslateKeysResponse) Reset() { *m = TranslateKeysResponse{} } func (m *TranslateKeysResponse) String() string { return proto.CompactTextString(m) } func (*TranslateKeysResponse) ProtoMessage() {} func (*TranslateKeysResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_413a91106d7bcce8, []int{18} + return fileDescriptor_413a91106d7bcce8, []int{19} } func (m *TranslateKeysResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1377,7 +1440,7 @@ func (m *TranslateIDsRequest) Reset() { *m = TranslateIDsRequest{} } func (m *TranslateIDsRequest) String() string { return proto.CompactTextString(m) } func (*TranslateIDsRequest) ProtoMessage() {} func (*TranslateIDsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_413a91106d7bcce8, []int{19} + return fileDescriptor_413a91106d7bcce8, []int{20} } func (m *TranslateIDsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1438,7 +1501,7 @@ func (m *TranslateIDsResponse) Reset() { *m = TranslateIDsResponse{} } func (m *TranslateIDsResponse) String() string { return proto.CompactTextString(m) } func (*TranslateIDsResponse) ProtoMessage() {} func (*TranslateIDsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_413a91106d7bcce8, []int{20} + return fileDescriptor_413a91106d7bcce8, []int{21} } func (m *TranslateIDsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1486,7 +1549,7 @@ func (m *ImportRoaringRequestView) Reset() { *m = ImportRoaringRequestVi func (m *ImportRoaringRequestView) String() string { return proto.CompactTextString(m) } func (*ImportRoaringRequestView) ProtoMessage() {} func (*ImportRoaringRequestView) Descriptor() ([]byte, []int) { - return fileDescriptor_413a91106d7bcce8, []int{21} + return fileDescriptor_413a91106d7bcce8, []int{22} } func (m *ImportRoaringRequestView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1543,7 +1606,7 @@ func (m *ImportRoaringRequest) Reset() { *m = ImportRoaringRequest{} } func (m *ImportRoaringRequest) String() string { return proto.CompactTextString(m) } func (*ImportRoaringRequest) ProtoMessage() {} func (*ImportRoaringRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_413a91106d7bcce8, []int{22} + return fileDescriptor_413a91106d7bcce8, []int{23} } func (m *ImportRoaringRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1615,7 +1678,7 @@ func (m *ImportColumnAttrsRequest) Reset() { *m = ImportColumnAttrsReque func (m *ImportColumnAttrsRequest) String() string { return proto.CompactTextString(m) } func (*ImportColumnAttrsRequest) ProtoMessage() {} func (*ImportColumnAttrsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_413a91106d7bcce8, []int{23} + return fileDescriptor_413a91106d7bcce8, []int{24} } func (m *ImportColumnAttrsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1689,6 +1752,7 @@ func init() { proto.RegisterType((*FieldRow)(nil), "internal.FieldRow") proto.RegisterType((*GroupCount)(nil), "internal.GroupCount") proto.RegisterType((*ValCount)(nil), "internal.ValCount") + proto.RegisterType((*Decimal)(nil), "internal.Decimal") proto.RegisterType((*ColumnAttrSet)(nil), "internal.ColumnAttrSet") proto.RegisterType((*Attr)(nil), "internal.Attr") proto.RegisterType((*AttrMap)(nil), "internal.AttrMap") @@ -1709,78 +1773,81 @@ func init() { func init() { proto.RegisterFile("public.proto", fileDescriptor_413a91106d7bcce8) } var fileDescriptor_413a91106d7bcce8 = []byte{ - // 1127 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x8e, 0x1b, 0x45, - 0x10, 0xa6, 0x3d, 0xe3, 0xb5, 0x5d, 0xf6, 0x2e, 0x51, 0xc7, 0x09, 0x23, 0x14, 0x6d, 0xac, 0x56, - 0x84, 0x0c, 0x87, 0x8d, 0x12, 0x10, 0xca, 0x09, 0xc8, 0xc6, 0x1b, 0xb0, 0xa2, 0x58, 0xa1, 0xbd, - 0x32, 0x37, 0xa4, 0xd9, 0x75, 0xb3, 0x19, 0x31, 0x9e, 0x36, 0xf3, 0x83, 0xb3, 0xcf, 0x01, 0x07, - 0xc4, 0x13, 0xf0, 0x0e, 0xbc, 0x00, 0x47, 0x1e, 0x01, 0x96, 0x37, 0xe0, 0xca, 0x05, 0x55, 0xf5, - 0xb4, 0x7b, 0xc6, 0xeb, 0x5d, 0xa2, 0x88, 0x5b, 0x7d, 0x55, 0xd5, 0xd5, 0xf5, 0x55, 0x57, 0x57, - 0x37, 0xf4, 0x96, 0xc5, 0x49, 0x1c, 0x9d, 0x1e, 0x2c, 0x53, 0x9d, 0x6b, 0xde, 0x8e, 0x92, 0x5c, - 0xa5, 0x49, 0x18, 0x8b, 0x0c, 0x3c, 0xa9, 0x57, 0x3c, 0x80, 0xd6, 0x13, 0x1d, 0x17, 0x8b, 0x24, - 0x0b, 0xd8, 0xc0, 0x1b, 0xfa, 0xd2, 0x42, 0xce, 0xc1, 0x7f, 0xa6, 0xce, 0xb3, 0xc0, 0x1b, 0x78, - 0xc3, 0x8e, 0x24, 0x99, 0xdf, 0x83, 0xe6, 0xe3, 0x3c, 0x4f, 0xb3, 0xa0, 0x31, 0xf0, 0x86, 0xdd, - 0x87, 0x7b, 0x07, 0x36, 0xdc, 0x01, 0xaa, 0xa5, 0x31, 0x62, 0x4c, 0xa9, 0xc3, 0x34, 0x4a, 0xce, - 0x02, 0x7f, 0xc0, 0x86, 0x3d, 0x69, 0xa1, 0x78, 0x0e, 0x9d, 0x69, 0x74, 0x96, 0xa8, 0x39, 0x6e, - 0x7d, 0x17, 0xbc, 0x17, 0x1a, 0xb7, 0x65, 0xc3, 0xee, 0xc3, 0x5d, 0x17, 0x4a, 0xea, 0x95, 0x44, - 0x0b, 0x3a, 0x4c, 0xd4, 0x59, 0xd0, 0xd8, 0xea, 0x30, 0x51, 0x67, 0xe2, 0x11, 0xec, 0x49, 0xbd, - 0x1a, 0xcf, 0x55, 0x92, 0x47, 0xdf, 0x44, 0x2a, 0xa5, 0xa4, 0xa5, 0x5e, 0x59, 0x2e, 0x24, 0xaf, - 0x89, 0x34, 0x1c, 0x11, 0xf1, 0x09, 0xf8, 0x2f, 0xc2, 0x28, 0xe5, 0x7b, 0xd0, 0x18, 0x8f, 0x28, - 0x05, 0x5f, 0x36, 0xc6, 0x23, 0x7e, 0x03, 0xbc, 0x67, 0xea, 0x3c, 0xf0, 0x06, 0x6c, 0xd8, 0x91, - 0x28, 0xf2, 0x3e, 0x34, 0x9f, 0xe8, 0x22, 0xc9, 0x29, 0x0d, 0x5f, 0x1a, 0x20, 0x8e, 0xa0, 0x83, - 0xeb, 0x9f, 0x46, 0x2a, 0x9e, 0x73, 0x61, 0x82, 0x95, 0x4c, 0x2a, 0x45, 0x41, 0xad, 0x34, 0x1b, - 0xf5, 0xa1, 0x49, 0xce, 0x14, 0xa6, 0x23, 0x0d, 0x10, 0x5f, 0x00, 0xa0, 0x35, 0x33, 0x71, 0xee, - 0x41, 0x93, 0x10, 0x65, 0x7f, 0x39, 0x90, 0x31, 0x5e, 0x11, 0x69, 0x02, 0x6d, 0x12, 0xb0, 0xb0, - 0x6b, 0x0f, 0x56, 0xf1, 0x40, 0x2d, 0x16, 0x6b, 0x64, 0x89, 0x10, 0xe0, 0xb7, 0x61, 0x47, 0xea, - 0x95, 0xe3, 0x5c, 0x22, 0xf1, 0x35, 0xc0, 0xe7, 0xa9, 0x2e, 0x96, 0x44, 0x97, 0x0f, 0xa1, 0x49, - 0xa8, 0xcc, 0x8c, 0xbb, 0xcc, 0xec, 0xa6, 0xd2, 0x38, 0x6c, 0x2f, 0x17, 0x96, 0x75, 0x5a, 0x2c, - 0x68, 0x0b, 0x4f, 0xa2, 0x88, 0xf9, 0xce, 0xc2, 0x78, 0x6d, 0x9d, 0x85, 0x31, 0x65, 0xeb, 0x49, - 0x14, 0xeb, 0x51, 0x3c, 0x1b, 0xe5, 0x5d, 0x68, 0x3f, 0x8d, 0x75, 0x98, 0xa3, 0x33, 0x86, 0x62, - 0x72, 0x8d, 0xc5, 0x57, 0xb0, 0x6b, 0x1a, 0x17, 0x5b, 0x70, 0xaa, 0xf2, 0xd7, 0x38, 0xd9, 0xd7, - 0x6a, 0x66, 0xf1, 0x0b, 0x03, 0x1f, 0x25, 0x1b, 0x80, 0xb9, 0x00, 0x1c, 0xfc, 0xe3, 0xf3, 0xa5, - 0x2a, 0xa9, 0x92, 0xcc, 0x07, 0xd0, 0x9d, 0xe6, 0xd8, 0xeb, 0xb3, 0x30, 0x2e, 0x54, 0xb9, 0x5d, - 0x55, 0x85, 0x2c, 0xc6, 0x49, 0x6e, 0xcc, 0x3e, 0xd1, 0x5b, 0x63, 0x7e, 0x07, 0x3a, 0x87, 0x5a, - 0xc7, 0xc6, 0xd8, 0x1c, 0xb0, 0x61, 0x5b, 0x3a, 0x05, 0xdf, 0x07, 0xb0, 0x7c, 0x0b, 0x15, 0xec, - 0x50, 0x05, 0x2a, 0x1a, 0x71, 0x1f, 0x5a, 0x98, 0xe9, 0xf3, 0x70, 0xe9, 0xb8, 0xb1, 0xeb, 0xb8, - 0xfd, 0xc3, 0xa0, 0xf7, 0x65, 0xa1, 0xd2, 0x73, 0xa9, 0xbe, 0x2b, 0x54, 0x96, 0x63, 0xdd, 0x09, - 0xdb, 0xce, 0x21, 0x80, 0x3d, 0x32, 0x7d, 0x19, 0xa6, 0x73, 0x53, 0x29, 0x5f, 0x96, 0x08, 0xb9, - 0xba, 0x9a, 0x67, 0xc4, 0xb5, 0x2d, 0xab, 0x2a, 0xea, 0x2e, 0xb5, 0xd0, 0xb9, 0x25, 0x53, 0x22, - 0x3e, 0x84, 0xb7, 0x8f, 0x5e, 0x9d, 0xc6, 0xc5, 0x5c, 0x49, 0xbd, 0x32, 0xab, 0x77, 0xc8, 0x61, - 0x53, 0xcd, 0xdf, 0x83, 0xbd, 0x52, 0x65, 0xc7, 0x54, 0x8b, 0x1c, 0x37, 0xb4, 0xfc, 0x01, 0xf4, - 0x8e, 0x16, 0x27, 0x6a, 0x3e, 0x57, 0xf3, 0x51, 0x98, 0x87, 0x41, 0x9b, 0x78, 0x6f, 0x0c, 0x8d, - 0x9a, 0x8b, 0xf8, 0x81, 0xc1, 0x6e, 0xc9, 0x3e, 0x5b, 0xea, 0x24, 0x53, 0x78, 0xc4, 0x47, 0x69, - 0x6a, 0x8f, 0xf8, 0x28, 0x4d, 0xf9, 0x7d, 0x68, 0x49, 0x95, 0x15, 0x71, 0x6e, 0xbb, 0xe4, 0x96, - 0x8b, 0x68, 0xd7, 0x16, 0x71, 0x2e, 0xad, 0x17, 0xff, 0x14, 0xf6, 0x6a, 0x7d, 0x68, 0xe6, 0x67, - 0xf7, 0xe1, 0x3b, 0x6e, 0x5d, 0xcd, 0x2e, 0x37, 0xdc, 0xc5, 0xaf, 0x1e, 0x74, 0x2b, 0x91, 0xd7, - 0x4d, 0x86, 0xf5, 0xd9, 0x2d, 0x9b, 0xec, 0x2e, 0xcd, 0xee, 0x2b, 0x26, 0x27, 0x4e, 0x80, 0x1e, - 0xb0, 0x49, 0xd9, 0x96, 0x6c, 0xe2, 0xe6, 0x8a, 0x77, 0xdd, 0x5c, 0xc1, 0x97, 0xe0, 0x65, 0x98, - 0x9c, 0xa9, 0x39, 0xb5, 0x65, 0x5b, 0x5a, 0xc8, 0x0f, 0xdc, 0x5d, 0xa5, 0x73, 0xac, 0x0d, 0x00, - 0x6b, 0x91, 0xee, 0x3e, 0x9b, 0x99, 0x32, 0x1e, 0xe1, 0x59, 0x51, 0xbf, 0x18, 0xc4, 0x3f, 0x86, - 0xae, 0x9b, 0x29, 0x59, 0x79, 0x44, 0x7d, 0x17, 0xca, 0x19, 0x65, 0xd5, 0x91, 0x7f, 0xb6, 0x39, - 0xe6, 0x83, 0x0e, 0x65, 0x11, 0xd4, 0x98, 0x57, 0xec, 0x72, 0xf3, 0x59, 0x78, 0x50, 0x79, 0x77, - 0x02, 0xa0, 0xc5, 0x37, 0xdd, 0xe2, 0xb5, 0x49, 0x56, 0x5e, 0xa7, 0x8f, 0xaa, 0xa3, 0x39, 0xe8, - 0xd2, 0x9a, 0x7e, 0xbd, 0x72, 0xc6, 0x26, 0x2b, 0x7e, 0xe2, 0x4f, 0x06, 0xbb, 0xe3, 0xc5, 0x52, - 0xa7, 0x79, 0xe5, 0x4a, 0x8d, 0x93, 0xb9, 0x7a, 0x65, 0xaf, 0x14, 0x81, 0xed, 0x43, 0x1c, 0xb5, - 0x74, 0xb5, 0xe8, 0x2a, 0xf9, 0xd2, 0x80, 0x4a, 0x39, 0xfd, 0x5a, 0x39, 0xef, 0x40, 0xc7, 0xf4, - 0x0e, 0x9a, 0x9a, 0x64, 0x72, 0x0a, 0xf3, 0x08, 0xaf, 0xe8, 0xe1, 0x6b, 0xd1, 0xc3, 0x67, 0x21, - 0x8e, 0x11, 0xe3, 0x46, 0xc6, 0x36, 0x19, 0x2b, 0x1a, 0xb4, 0x1f, 0x47, 0x0b, 0x95, 0xe5, 0xe1, - 0x62, 0x89, 0xf7, 0xd2, 0x1b, 0x7a, 0xb2, 0xa2, 0x11, 0x7f, 0x33, 0xe0, 0x86, 0x23, 0x8d, 0x9d, - 0xff, 0x8f, 0xe8, 0xf5, 0x84, 0xea, 0x69, 0xb7, 0x2e, 0xa5, 0x7d, 0x1b, 0x76, 0x28, 0x1f, 0x9b, - 0x72, 0x89, 0x70, 0x4a, 0xb9, 0x19, 0x69, 0xf8, 0x32, 0x59, 0x55, 0x71, 0x01, 0xbd, 0xca, 0x80, - 0xc6, 0xee, 0xc2, 0xd8, 0x35, 0x9d, 0x98, 0x41, 0xff, 0x38, 0x0d, 0x93, 0x2c, 0x0e, 0x73, 0x85, - 0xdb, 0xbd, 0x09, 0xeb, 0x2d, 0x3f, 0x2a, 0xf1, 0x3e, 0xdc, 0xda, 0x88, 0xeb, 0x66, 0x11, 0x96, - 0xc1, 0xa3, 0x32, 0xa0, 0x28, 0xa6, 0x70, 0x73, 0xed, 0x3a, 0x1e, 0xbd, 0x51, 0x06, 0x97, 0x83, - 0x7e, 0x50, 0xe1, 0x45, 0x41, 0xcb, 0xed, 0xb7, 0xe5, 0x7a, 0x08, 0x41, 0xd9, 0xdb, 0xe6, 0x3b, - 0x57, 0x66, 0x30, 0x8b, 0xd4, 0x0a, 0xfd, 0x27, 0xe1, 0x42, 0x95, 0x49, 0x90, 0x8c, 0x3a, 0x9a, - 0xc5, 0x0d, 0xfa, 0x04, 0x92, 0x2c, 0x7e, 0x64, 0xd0, 0xdf, 0x16, 0x84, 0x9e, 0xfc, 0x58, 0x85, - 0x66, 0xfa, 0xb6, 0xa5, 0x01, 0xfc, 0x11, 0x34, 0xbf, 0x8f, 0xd4, 0xca, 0x4e, 0x5f, 0xe1, 0x2e, - 0xe0, 0x55, 0x99, 0x48, 0xb3, 0x00, 0xdb, 0xe1, 0xf1, 0x69, 0x1e, 0xe9, 0xc4, 0x7e, 0x6c, 0x0c, - 0xc2, 0x7d, 0x0e, 0x63, 0x7d, 0xfa, 0x2d, 0x0d, 0x39, 0x5f, 0x1a, 0x20, 0x7e, 0x66, 0x96, 0x5b, - 0xe5, 0xf9, 0xfa, 0xcf, 0x0a, 0x9b, 0x1e, 0x2e, 0xff, 0x28, 0xa6, 0x87, 0x03, 0xf3, 0x06, 0xbb, - 0xaf, 0x86, 0x85, 0xf8, 0xee, 0xa3, 0x38, 0x0b, 0x63, 0x73, 0x91, 0x3b, 0x72, 0x8d, 0xaf, 0xef, - 0xfc, 0xc3, 0x1b, 0xbf, 0x5d, 0xec, 0xb3, 0xdf, 0x2f, 0xf6, 0xd9, 0x1f, 0x17, 0xfb, 0xec, 0xa7, - 0xbf, 0xf6, 0xdf, 0x3a, 0xd9, 0xa1, 0xdf, 0xfc, 0x87, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xa3, - 0x51, 0x0d, 0x2e, 0xdd, 0x0b, 0x00, 0x00, + // 1175 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcd, 0x8e, 0x1b, 0xc5, + 0x13, 0xff, 0xb7, 0x67, 0xbc, 0xb6, 0xcb, 0xde, 0xfd, 0x87, 0x8e, 0x13, 0x46, 0x28, 0xda, 0x58, + 0xad, 0x08, 0x19, 0x0e, 0x1b, 0x65, 0xf9, 0x50, 0x4e, 0x40, 0x36, 0xde, 0x80, 0x15, 0xc5, 0x0a, + 0xed, 0x95, 0xb9, 0x21, 0xcd, 0xda, 0xcd, 0x66, 0xc4, 0x78, 0xc6, 0xcc, 0x07, 0xce, 0x1e, 0x79, + 0x06, 0x38, 0x20, 0x9e, 0x80, 0x77, 0xe0, 0x05, 0x38, 0xf2, 0x08, 0xb0, 0xbc, 0x01, 0x57, 0x2e, + 0xa8, 0xaa, 0xa7, 0xdd, 0x6d, 0xaf, 0x77, 0x89, 0x22, 0x6e, 0xfd, 0xab, 0xaa, 0xae, 0xae, 0xaa, + 0xa9, 0xfe, 0x55, 0x0f, 0x74, 0x16, 0xe5, 0x69, 0x1c, 0x4d, 0x0f, 0x16, 0x59, 0x5a, 0xa4, 0xbc, + 0x19, 0x25, 0x85, 0xca, 0x92, 0x30, 0x16, 0x39, 0x78, 0x32, 0x5d, 0xf2, 0x00, 0x1a, 0x8f, 0xd3, + 0xb8, 0x9c, 0x27, 0x79, 0xc0, 0x7a, 0x5e, 0xdf, 0x97, 0x06, 0x72, 0x0e, 0xfe, 0x53, 0x75, 0x9e, + 0x07, 0x5e, 0xcf, 0xeb, 0xb7, 0x24, 0xad, 0xf9, 0x3d, 0xa8, 0x3f, 0x2a, 0x8a, 0x2c, 0x0f, 0x6a, + 0x3d, 0xaf, 0xdf, 0x3e, 0xdc, 0x3b, 0x30, 0xee, 0x0e, 0x50, 0x2c, 0xb5, 0x12, 0x7d, 0xca, 0x34, + 0xcc, 0xa2, 0xe4, 0x2c, 0xf0, 0x7b, 0xac, 0xdf, 0x91, 0x06, 0x8a, 0x67, 0xd0, 0x1a, 0x47, 0x67, + 0x89, 0x9a, 0xe1, 0xd1, 0x77, 0xc1, 0x7b, 0x9e, 0xe2, 0xb1, 0xac, 0xdf, 0x3e, 0xdc, 0xb5, 0xae, + 0x64, 0xba, 0x94, 0xa8, 0x41, 0x83, 0x91, 0x3a, 0x0b, 0x6a, 0x5b, 0x0d, 0x46, 0xea, 0x4c, 0x3c, + 0x84, 0x3d, 0x99, 0x2e, 0x87, 0x33, 0x95, 0x14, 0xd1, 0x57, 0x91, 0xca, 0x28, 0x68, 0x99, 0x2e, + 0x4d, 0x2e, 0xb4, 0x5e, 0x25, 0x52, 0xb3, 0x89, 0x88, 0x8f, 0xc0, 0x7f, 0x1e, 0x46, 0x19, 0xdf, + 0x83, 0xda, 0x70, 0x40, 0x21, 0xf8, 0xb2, 0x36, 0x1c, 0xf0, 0x1b, 0xe0, 0x3d, 0x55, 0xe7, 0x81, + 0xd7, 0x63, 0xfd, 0x96, 0xc4, 0x25, 0xef, 0x42, 0xfd, 0x71, 0x5a, 0x26, 0x05, 0x85, 0xe1, 0x4b, + 0x0d, 0xc4, 0x31, 0xb4, 0x70, 0xff, 0x93, 0x48, 0xc5, 0x33, 0x2e, 0xb4, 0xb3, 0x2a, 0x13, 0xa7, + 0x28, 0x28, 0x95, 0xfa, 0xa0, 0x2e, 0xd4, 0xc9, 0x98, 0xdc, 0xb4, 0xa4, 0x06, 0xe2, 0x33, 0x00, + 0xd4, 0xe6, 0xda, 0xcf, 0x3d, 0xa8, 0x13, 0xa2, 0xe8, 0x2f, 0x3b, 0xd2, 0xca, 0x2b, 0x3c, 0x8d, + 0xa0, 0x49, 0x0b, 0x2c, 0xec, 0xca, 0x82, 0x39, 0x16, 0x28, 0xc5, 0x62, 0x0d, 0x4c, 0x22, 0x04, + 0xf8, 0x6d, 0xd8, 0x91, 0xe9, 0xd2, 0xe6, 0x5c, 0x21, 0xf1, 0x25, 0xc0, 0xa7, 0x59, 0x5a, 0x2e, + 0x28, 0x5d, 0xde, 0x87, 0x3a, 0xa1, 0x2a, 0x32, 0x6e, 0x23, 0x33, 0x87, 0x4a, 0x6d, 0xb0, 0xbd, + 0x5c, 0x58, 0xd6, 0x71, 0x39, 0xa7, 0x23, 0x3c, 0x89, 0x4b, 0xf1, 0x1d, 0x83, 0xe6, 0x24, 0x8c, + 0x57, 0xea, 0x49, 0x18, 0x53, 0xb8, 0x9e, 0xc4, 0xe5, 0xba, 0x1b, 0xcf, 0xb8, 0x79, 0x0b, 0x9a, + 0x4f, 0xe2, 0x34, 0x2c, 0xd0, 0x18, 0x7d, 0x31, 0xb9, 0xc2, 0xfc, 0x01, 0xc0, 0x40, 0x4d, 0xa3, + 0x79, 0x18, 0xa3, 0xd6, 0xa7, 0x4f, 0xf1, 0x86, 0x8d, 0xb3, 0xd2, 0x49, 0xc7, 0x48, 0x7c, 0x00, + 0x8d, 0x0a, 0xe1, 0x79, 0x93, 0x30, 0x2e, 0x55, 0x15, 0x83, 0x06, 0x28, 0x1d, 0x4f, 0xc3, 0x58, + 0x99, 0x28, 0x08, 0x88, 0x2f, 0x60, 0x57, 0xdf, 0x11, 0xec, 0xf6, 0xb1, 0x2a, 0x5e, 0xa1, 0x89, + 0x5e, 0xe9, 0xde, 0x88, 0x9f, 0x19, 0xf8, 0xb8, 0x32, 0x0e, 0x98, 0x75, 0xc0, 0xc1, 0x3f, 0x39, + 0x5f, 0xa8, 0xaa, 0xaa, 0xb4, 0xe6, 0x3d, 0x68, 0x8f, 0x0b, 0xbc, 0x56, 0x3a, 0x72, 0x7d, 0x9c, + 0x2b, 0xc2, 0x7a, 0x0d, 0x93, 0x42, 0xab, 0x7d, 0x4a, 0x61, 0x85, 0xf9, 0x1d, 0x68, 0x1d, 0xa5, + 0x69, 0xac, 0x95, 0xf5, 0x1e, 0xeb, 0x37, 0xa5, 0x15, 0xf0, 0x7d, 0x00, 0x53, 0xd9, 0x52, 0x05, + 0x3b, 0x54, 0x6b, 0x47, 0x22, 0xee, 0x43, 0x03, 0x23, 0x7d, 0x16, 0x2e, 0x6c, 0x6e, 0xec, 0xba, + 0xdc, 0xfe, 0x66, 0xd0, 0xf9, 0xbc, 0x54, 0xd9, 0xb9, 0x54, 0xdf, 0x94, 0x2a, 0x2f, 0xb0, 0xb6, + 0x84, 0x4d, 0x93, 0x12, 0xc0, 0x76, 0x1c, 0xbf, 0x08, 0xb3, 0x99, 0xae, 0x94, 0x2f, 0x2b, 0x84, + 0xb9, 0xda, 0x9a, 0xe7, 0x94, 0x6b, 0x53, 0xba, 0x22, 0x6a, 0x64, 0x35, 0x4f, 0x0b, 0x93, 0x4c, + 0x85, 0x78, 0x1f, 0xfe, 0x7f, 0xfc, 0x72, 0x1a, 0x97, 0x33, 0x25, 0xd3, 0xa5, 0xde, 0xbd, 0x43, + 0x06, 0x9b, 0x62, 0xfe, 0x36, 0xec, 0x55, 0x22, 0xc3, 0x88, 0x0d, 0x32, 0xdc, 0x90, 0xf2, 0x07, + 0xd0, 0x39, 0x9e, 0x9f, 0xaa, 0xd9, 0x4c, 0xcd, 0x06, 0x61, 0x11, 0x06, 0x4d, 0xca, 0x7b, 0x83, + 0x9f, 0xd6, 0x4c, 0xc4, 0xf7, 0x0c, 0x76, 0xab, 0xec, 0xf3, 0x45, 0x9a, 0xe4, 0x0a, 0x3f, 0xf1, + 0x71, 0x96, 0x99, 0x4f, 0x7c, 0x9c, 0x65, 0xfc, 0x3e, 0x34, 0xa4, 0xca, 0xcb, 0xb8, 0x30, 0x5d, + 0x72, 0xcb, 0x7a, 0x34, 0x7b, 0xcb, 0xb8, 0x90, 0xc6, 0x8a, 0x7f, 0x0c, 0x7b, 0x6b, 0x7d, 0xa8, + 0xa9, 0xba, 0x7d, 0xf8, 0xa6, 0xdd, 0xb7, 0xa6, 0x97, 0x1b, 0xe6, 0xe2, 0x17, 0x0f, 0xda, 0x8e, + 0xe7, 0x55, 0x93, 0x61, 0x7d, 0x76, 0xab, 0x26, 0xbb, 0x4b, 0x63, 0xe2, 0x0a, 0x92, 0x46, 0xb2, + 0xe9, 0x00, 0x1b, 0x55, 0x6d, 0xc9, 0x46, 0x96, 0xc2, 0xbc, 0xeb, 0x28, 0x0c, 0x87, 0xce, 0x8b, + 0x30, 0x39, 0x53, 0x33, 0x6a, 0xcb, 0xa6, 0x34, 0x90, 0x1f, 0x58, 0x56, 0xa0, 0xef, 0xb8, 0xc6, + 0x35, 0x46, 0x23, 0x2d, 0x73, 0x68, 0xfa, 0x1a, 0x0e, 0xf0, 0x5b, 0x51, 0xbf, 0x68, 0xc4, 0x3f, + 0x84, 0xb6, 0xa5, 0xaf, 0xbc, 0xfa, 0x44, 0x5d, 0xeb, 0xca, 0x2a, 0xa5, 0x6b, 0xc8, 0x3f, 0xd9, + 0x9c, 0x28, 0x41, 0x8b, 0xa2, 0x08, 0xd6, 0x32, 0x77, 0xf4, 0x72, 0x73, 0x02, 0x3d, 0x70, 0x46, + 0x5c, 0x00, 0xb4, 0xf9, 0xa6, 0xdd, 0xbc, 0x52, 0x49, 0x67, 0x10, 0xbe, 0xef, 0x4e, 0x81, 0xa0, + 0x4d, 0x7b, 0xba, 0xeb, 0x95, 0xd3, 0x3a, 0xe9, 0xd8, 0x89, 0x3f, 0x18, 0xec, 0x0e, 0xe7, 0x8b, + 0x34, 0x2b, 0x9c, 0x2b, 0x35, 0x4c, 0x66, 0xea, 0xa5, 0xb9, 0x52, 0x04, 0xb6, 0xcf, 0x0b, 0xa2, + 0x36, 0xbc, 0x5a, 0x74, 0x95, 0x7c, 0xa9, 0x81, 0x53, 0x4e, 0x7f, 0xad, 0x9c, 0x77, 0xa0, 0xa5, + 0x7b, 0x07, 0x55, 0x75, 0x52, 0x59, 0x81, 0x9e, 0xf7, 0x4b, 0x9a, 0xb1, 0x0d, 0x9a, 0xb1, 0x06, + 0x22, 0x8d, 0x68, 0x33, 0x52, 0x36, 0x49, 0xe9, 0x48, 0x50, 0x7f, 0x12, 0xcd, 0x55, 0x5e, 0x84, + 0xf3, 0x05, 0xde, 0x4b, 0xaf, 0xef, 0x49, 0x47, 0x22, 0xfe, 0x62, 0xc0, 0x75, 0x8e, 0x44, 0x3b, + 0xff, 0x5d, 0xa2, 0xd7, 0x27, 0xb4, 0x1e, 0x76, 0xe3, 0x52, 0xd8, 0xb7, 0x61, 0x87, 0xe2, 0x31, + 0x21, 0x57, 0x08, 0x59, 0xca, 0x72, 0xa4, 0xce, 0x97, 0x49, 0x57, 0xc4, 0x05, 0x74, 0x1c, 0x82, + 0xc6, 0xee, 0x42, 0xdf, 0x6b, 0x32, 0x31, 0x81, 0xee, 0x49, 0x16, 0x26, 0x79, 0x1c, 0x16, 0x0a, + 0x8f, 0x7b, 0x9d, 0xac, 0xb7, 0x3c, 0xde, 0xc4, 0x3b, 0x70, 0x6b, 0xc3, 0xaf, 0xe5, 0x22, 0x2c, + 0x83, 0x47, 0x65, 0xc0, 0xa5, 0x18, 0xc3, 0xcd, 0x95, 0xe9, 0x70, 0xf0, 0x5a, 0x11, 0x5c, 0x76, + 0xfa, 0xae, 0x93, 0x17, 0x39, 0xad, 0x8e, 0xdf, 0x16, 0xeb, 0x11, 0x04, 0x55, 0x6f, 0xeb, 0x97, + 0x63, 0x15, 0xc1, 0x24, 0x52, 0x4b, 0xb4, 0x1f, 0x85, 0x73, 0x55, 0x05, 0x41, 0x6b, 0x94, 0x11, + 0x17, 0xd7, 0xe8, 0xbd, 0x49, 0x6b, 0xf1, 0x03, 0x83, 0xee, 0x36, 0x27, 0xf4, 0xb8, 0x88, 0x55, + 0xa8, 0xd9, 0xb7, 0x29, 0x35, 0xe0, 0x0f, 0xa1, 0xfe, 0x6d, 0xa4, 0x96, 0x86, 0x7d, 0x85, 0xbd, + 0x80, 0x57, 0x45, 0x22, 0xf5, 0x06, 0x6c, 0x87, 0x47, 0xd3, 0x22, 0x4a, 0x13, 0xf3, 0x86, 0xd2, + 0x08, 0xcf, 0x39, 0x8a, 0xd3, 0xe9, 0xd7, 0x44, 0x72, 0xbe, 0xd4, 0x40, 0xfc, 0xc4, 0x4c, 0x6e, + 0xce, 0xf8, 0xfa, 0xd7, 0x0a, 0xeb, 0x1e, 0x36, 0xef, 0x10, 0xea, 0xe1, 0x40, 0xcf, 0x60, 0xfb, + 0xd4, 0x30, 0x10, 0xe7, 0x3e, 0x2e, 0x27, 0x61, 0xac, 0x2f, 0x72, 0x4b, 0xae, 0xf0, 0xf5, 0x9d, + 0x7f, 0x74, 0xe3, 0xd7, 0x8b, 0x7d, 0xf6, 0xdb, 0xc5, 0x3e, 0xfb, 0xfd, 0x62, 0x9f, 0xfd, 0xf8, + 0xe7, 0xfe, 0xff, 0x4e, 0x77, 0xe8, 0xc7, 0xe1, 0xbd, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd1, + 0xe5, 0x55, 0xc9, 0x48, 0x0c, 0x00, 0x00, } func (m *Row) Marshal() (dAtA []byte, err error) { @@ -2222,6 +2289,18 @@ func (m *ValCount) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if m.DecimalVal != nil { + { + size, err := m.DecimalVal.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintPublic(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } if m.FloatVal != 0 { i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.FloatVal)))) @@ -2241,6 +2320,43 @@ func (m *ValCount) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *Decimal) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Decimal) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Decimal) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.Scale != 0 { + i = encodeVarintPublic(dAtA, i, uint64(m.Scale)) + i-- + dAtA[i] = 0x10 + } + if m.Value != 0 { + i = encodeVarintPublic(dAtA, i, uint64(m.Value)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + func (m *ColumnAttrSet) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2481,20 +2597,20 @@ func (m *QueryRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x18 } if len(m.Shards) > 0 { - dAtA9 := make([]byte, len(m.Shards)*10) - var j8 int + dAtA10 := make([]byte, len(m.Shards)*10) + var j9 int for _, num := range m.Shards { for num >= 1<<7 { - dAtA9[j8] = uint8(uint64(num)&0x7f | 0x80) + dAtA10[j9] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j8++ + j9++ } - dAtA9[j8] = uint8(num) - j8++ + dAtA10[j9] = uint8(num) + j9++ } - i -= j8 - copy(dAtA[i:], dAtA9[:j8]) - i = encodeVarintPublic(dAtA, i, uint64(j8)) + i -= j9 + copy(dAtA[i:], dAtA10[:j9]) + i = encodeVarintPublic(dAtA, i, uint64(j9)) i-- dAtA[i] = 0x12 } @@ -2645,20 +2761,20 @@ func (m *QueryResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { } } if len(m.RowIDs) > 0 { - dAtA14 := make([]byte, len(m.RowIDs)*10) - var j13 int + dAtA15 := make([]byte, len(m.RowIDs)*10) + var j14 int for _, num := range m.RowIDs { for num >= 1<<7 { - dAtA14[j13] = uint8(uint64(num)&0x7f | 0x80) + dAtA15[j14] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j13++ + j14++ } - dAtA14[j13] = uint8(num) - j13++ + dAtA15[j14] = uint8(num) + j14++ } - i -= j13 - copy(dAtA[i:], dAtA14[:j13]) - i = encodeVarintPublic(dAtA, i, uint64(j13)) + i -= j14 + copy(dAtA[i:], dAtA15[:j14]) + i = encodeVarintPublic(dAtA, i, uint64(j14)) i-- dAtA[i] = 0x3a } @@ -2766,57 +2882,57 @@ func (m *ImportRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { } } if len(m.Timestamps) > 0 { - dAtA18 := make([]byte, len(m.Timestamps)*10) - var j17 int + dAtA19 := make([]byte, len(m.Timestamps)*10) + var j18 int for _, num1 := range m.Timestamps { num := uint64(num1) for num >= 1<<7 { - dAtA18[j17] = uint8(uint64(num)&0x7f | 0x80) + dAtA19[j18] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j17++ + j18++ } - dAtA18[j17] = uint8(num) - j17++ + dAtA19[j18] = uint8(num) + j18++ } - i -= j17 - copy(dAtA[i:], dAtA18[:j17]) - i = encodeVarintPublic(dAtA, i, uint64(j17)) + i -= j18 + copy(dAtA[i:], dAtA19[:j18]) + i = encodeVarintPublic(dAtA, i, uint64(j18)) i-- dAtA[i] = 0x32 } if len(m.ColumnIDs) > 0 { - dAtA20 := make([]byte, len(m.ColumnIDs)*10) - var j19 int + dAtA21 := make([]byte, len(m.ColumnIDs)*10) + var j20 int for _, num := range m.ColumnIDs { for num >= 1<<7 { - dAtA20[j19] = uint8(uint64(num)&0x7f | 0x80) + dAtA21[j20] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j19++ + j20++ } - dAtA20[j19] = uint8(num) - j19++ + dAtA21[j20] = uint8(num) + j20++ } - i -= j19 - copy(dAtA[i:], dAtA20[:j19]) - i = encodeVarintPublic(dAtA, i, uint64(j19)) + i -= j20 + copy(dAtA[i:], dAtA21[:j20]) + i = encodeVarintPublic(dAtA, i, uint64(j20)) i-- dAtA[i] = 0x2a } if len(m.RowIDs) > 0 { - dAtA22 := make([]byte, len(m.RowIDs)*10) - var j21 int + dAtA23 := make([]byte, len(m.RowIDs)*10) + var j22 int for _, num := range m.RowIDs { for num >= 1<<7 { - dAtA22[j21] = uint8(uint64(num)&0x7f | 0x80) + dAtA23[j22] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j21++ + j22++ } - dAtA22[j21] = uint8(num) - j21++ + dAtA23[j22] = uint8(num) + j22++ } - i -= j21 - copy(dAtA[i:], dAtA22[:j21]) - i = encodeVarintPublic(dAtA, i, uint64(j21)) + i -= j22 + copy(dAtA[i:], dAtA23[:j22]) + i = encodeVarintPublic(dAtA, i, uint64(j22)) i-- dAtA[i] = 0x22 } @@ -2877,9 +2993,9 @@ func (m *ImportValueRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { } if len(m.FloatValues) > 0 { for iNdEx := len(m.FloatValues) - 1; iNdEx >= 0; iNdEx-- { - f23 := math.Float64bits(float64(m.FloatValues[iNdEx])) + f24 := math.Float64bits(float64(m.FloatValues[iNdEx])) i -= 8 - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f23)) + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f24)) } i = encodeVarintPublic(dAtA, i, uint64(len(m.FloatValues)*8)) i-- @@ -2895,39 +3011,39 @@ func (m *ImportValueRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { } } if len(m.Values) > 0 { - dAtA25 := make([]byte, len(m.Values)*10) - var j24 int + dAtA26 := make([]byte, len(m.Values)*10) + var j25 int for _, num1 := range m.Values { num := uint64(num1) for num >= 1<<7 { - dAtA25[j24] = uint8(uint64(num)&0x7f | 0x80) + dAtA26[j25] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j24++ + j25++ } - dAtA25[j24] = uint8(num) - j24++ + dAtA26[j25] = uint8(num) + j25++ } - i -= j24 - copy(dAtA[i:], dAtA25[:j24]) - i = encodeVarintPublic(dAtA, i, uint64(j24)) + i -= j25 + copy(dAtA[i:], dAtA26[:j25]) + i = encodeVarintPublic(dAtA, i, uint64(j25)) i-- dAtA[i] = 0x32 } if len(m.ColumnIDs) > 0 { - dAtA27 := make([]byte, len(m.ColumnIDs)*10) - var j26 int + dAtA28 := make([]byte, len(m.ColumnIDs)*10) + var j27 int for _, num := range m.ColumnIDs { for num >= 1<<7 { - dAtA27[j26] = uint8(uint64(num)&0x7f | 0x80) + dAtA28[j27] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j26++ + j27++ } - dAtA27[j26] = uint8(num) - j26++ + dAtA28[j27] = uint8(num) + j27++ } - i -= j26 - copy(dAtA[i:], dAtA27[:j26]) - i = encodeVarintPublic(dAtA, i, uint64(j26)) + i -= j27 + copy(dAtA[i:], dAtA28[:j27]) + i = encodeVarintPublic(dAtA, i, uint64(j27)) i-- dAtA[i] = 0x2a } @@ -3028,20 +3144,20 @@ func (m *TranslateKeysResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.XXX_unrecognized) } if len(m.IDs) > 0 { - dAtA29 := make([]byte, len(m.IDs)*10) - var j28 int + dAtA30 := make([]byte, len(m.IDs)*10) + var j29 int for _, num := range m.IDs { for num >= 1<<7 { - dAtA29[j28] = uint8(uint64(num)&0x7f | 0x80) + dAtA30[j29] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j28++ + j29++ } - dAtA29[j28] = uint8(num) - j28++ + dAtA30[j29] = uint8(num) + j29++ } - i -= j28 - copy(dAtA[i:], dAtA29[:j28]) - i = encodeVarintPublic(dAtA, i, uint64(j28)) + i -= j29 + copy(dAtA[i:], dAtA30[:j29]) + i = encodeVarintPublic(dAtA, i, uint64(j29)) i-- dAtA[i] = 0x1a } @@ -3073,20 +3189,20 @@ func (m *TranslateIDsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.XXX_unrecognized) } if len(m.IDs) > 0 { - dAtA31 := make([]byte, len(m.IDs)*10) - var j30 int + dAtA32 := make([]byte, len(m.IDs)*10) + var j31 int for _, num := range m.IDs { for num >= 1<<7 { - dAtA31[j30] = uint8(uint64(num)&0x7f | 0x80) + dAtA32[j31] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j30++ + j31++ } - dAtA31[j30] = uint8(num) - j30++ + dAtA32[j31] = uint8(num) + j31++ } - i -= j30 - copy(dAtA[i:], dAtA31[:j30]) - i = encodeVarintPublic(dAtA, i, uint64(j30)) + i -= j31 + copy(dAtA[i:], dAtA32[:j31]) + i = encodeVarintPublic(dAtA, i, uint64(j31)) i-- dAtA[i] = 0x1a } @@ -3272,20 +3388,20 @@ func (m *ImportColumnAttrsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error copy(dAtA[i:], m.XXX_unrecognized) } if len(m.ColumnIDs) > 0 { - dAtA33 := make([]byte, len(m.ColumnIDs)*10) - var j32 int + dAtA34 := make([]byte, len(m.ColumnIDs)*10) + var j33 int for _, num := range m.ColumnIDs { for num >= 1<<7 { - dAtA33[j32] = uint8(uint64(num)&0x7f | 0x80) + dAtA34[j33] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j32++ + j33++ } - dAtA33[j32] = uint8(num) - j32++ + dAtA34[j33] = uint8(num) + j33++ } - i -= j32 - copy(dAtA[i:], dAtA33[:j32]) - i = encodeVarintPublic(dAtA, i, uint64(j32)) + i -= j33 + copy(dAtA[i:], dAtA34[:j33]) + i = encodeVarintPublic(dAtA, i, uint64(j33)) i-- dAtA[i] = 0x2a } @@ -3537,6 +3653,28 @@ func (m *ValCount) Size() (n int) { if m.FloatVal != 0 { n += 9 } + if m.DecimalVal != nil { + l = m.DecimalVal.Size() + n += 1 + l + sovPublic(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func (m *Decimal) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Value != 0 { + n += 1 + sovPublic(uint64(m.Value)) + } + if m.Scale != 0 { + n += 1 + sovPublic(uint64(m.Scale)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -5260,6 +5398,134 @@ func (m *ValCount) Unmarshal(dAtA []byte) error { v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) iNdEx += 8 m.FloatVal = float64(math.Float64frombits(v)) + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DecimalVal", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPublic + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthPublic + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPublic + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.DecimalVal == nil { + m.DecimalVal = &Decimal{} + } + if err := m.DecimalVal.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipPublic(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *Decimal) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPublic + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Decimal: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Decimal: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) + } + m.Value = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPublic + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Value |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Scale", wireType) + } + m.Scale = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPublic + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Scale |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipPublic(dAtA[iNdEx:]) diff --git a/internal/public.proto b/internal/public.proto index 872eadaf2..9ff1eae68 100644 --- a/internal/public.proto +++ b/internal/public.proto @@ -51,6 +51,12 @@ message ValCount { int64 Val = 1; int64 Count = 2; double FloatVal = 3; + Decimal DecimalVal = 4; +} + +message Decimal { + int64 Value = 1; + int64 Scale = 2; } message ColumnAttrSet { diff --git a/proto/pilosa.pb.go b/proto/pilosa.pb.go index e7adb4609..c04b9805e 100644 --- a/proto/pilosa.pb.go +++ b/proto/pilosa.pb.go @@ -324,6 +324,7 @@ type ColumnResponse struct { // *ColumnResponse_Uint64ArrayVal // *ColumnResponse_StringArrayVal // *ColumnResponse_Float64Val + // *ColumnResponse_DecimalVal ColumnVal isColumnResponse_ColumnVal `protobuf_oneof:"columnVal"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -391,6 +392,10 @@ type ColumnResponse_Float64Val struct { Float64Val float64 `protobuf:"fixed64,8,opt,name=float64Val,proto3,oneof"` } +type ColumnResponse_DecimalVal struct { + DecimalVal *Decimal `protobuf:"bytes,9,opt,name=decimalVal,proto3,oneof"` +} + func (*ColumnResponse_StringVal) isColumnResponse_ColumnVal() {} func (*ColumnResponse_Uint64Val) isColumnResponse_ColumnVal() {} @@ -407,6 +412,8 @@ func (*ColumnResponse_StringArrayVal) isColumnResponse_ColumnVal() {} func (*ColumnResponse_Float64Val) isColumnResponse_ColumnVal() {} +func (*ColumnResponse_DecimalVal) isColumnResponse_ColumnVal() {} + func (m *ColumnResponse) GetColumnVal() isColumnResponse_ColumnVal { if m != nil { return m.ColumnVal @@ -470,6 +477,13 @@ func (m *ColumnResponse) GetFloat64Val() float64 { return 0 } +func (m *ColumnResponse) GetDecimalVal() *Decimal { + if x, ok := m.GetColumnVal().(*ColumnResponse_DecimalVal); ok { + return x.DecimalVal + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*ColumnResponse) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -481,9 +495,57 @@ func (*ColumnResponse) XXX_OneofWrappers() []interface{} { (*ColumnResponse_Uint64ArrayVal)(nil), (*ColumnResponse_StringArrayVal)(nil), (*ColumnResponse_Float64Val)(nil), + (*ColumnResponse_DecimalVal)(nil), } } +type Decimal struct { + Value int64 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"` + Scale int64 `protobuf:"varint,2,opt,name=scale,proto3" json:"scale,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Decimal) Reset() { *m = Decimal{} } +func (m *Decimal) String() string { return proto.CompactTextString(m) } +func (*Decimal) ProtoMessage() {} +func (*Decimal) Descriptor() ([]byte, []int) { + return fileDescriptor_ef0691a44d1e275c, []int{7} +} + +func (m *Decimal) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Decimal.Unmarshal(m, b) +} +func (m *Decimal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Decimal.Marshal(b, m, deterministic) +} +func (m *Decimal) XXX_Merge(src proto.Message) { + xxx_messageInfo_Decimal.Merge(m, src) +} +func (m *Decimal) XXX_Size() int { + return xxx_messageInfo_Decimal.Size(m) +} +func (m *Decimal) XXX_DiscardUnknown() { + xxx_messageInfo_Decimal.DiscardUnknown(m) +} + +var xxx_messageInfo_Decimal proto.InternalMessageInfo + +func (m *Decimal) GetValue() int64 { + if m != nil { + return m.Value + } + return 0 +} + +func (m *Decimal) GetScale() int64 { + if m != nil { + return m.Scale + } + return 0 +} + type InspectRequest struct { Index string `protobuf:"bytes,1,opt,name=index,proto3" json:"index,omitempty"` Columns *IdsOrKeys `protobuf:"bytes,2,opt,name=columns,proto3" json:"columns,omitempty"` @@ -499,7 +561,7 @@ func (m *InspectRequest) Reset() { *m = InspectRequest{} } func (m *InspectRequest) String() string { return proto.CompactTextString(m) } func (*InspectRequest) ProtoMessage() {} func (*InspectRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{7} + return fileDescriptor_ef0691a44d1e275c, []int{8} } func (m *InspectRequest) XXX_Unmarshal(b []byte) error { @@ -566,7 +628,7 @@ func (m *Uint64Array) Reset() { *m = Uint64Array{} } func (m *Uint64Array) String() string { return proto.CompactTextString(m) } func (*Uint64Array) ProtoMessage() {} func (*Uint64Array) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{8} + return fileDescriptor_ef0691a44d1e275c, []int{9} } func (m *Uint64Array) XXX_Unmarshal(b []byte) error { @@ -605,7 +667,7 @@ func (m *StringArray) Reset() { *m = StringArray{} } func (m *StringArray) String() string { return proto.CompactTextString(m) } func (*StringArray) ProtoMessage() {} func (*StringArray) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{9} + return fileDescriptor_ef0691a44d1e275c, []int{10} } func (m *StringArray) XXX_Unmarshal(b []byte) error { @@ -647,7 +709,7 @@ func (m *IdsOrKeys) Reset() { *m = IdsOrKeys{} } func (m *IdsOrKeys) String() string { return proto.CompactTextString(m) } func (*IdsOrKeys) ProtoMessage() {} func (*IdsOrKeys) Descriptor() ([]byte, []int) { - return fileDescriptor_ef0691a44d1e275c, []int{10} + return fileDescriptor_ef0691a44d1e275c, []int{11} } func (m *IdsOrKeys) XXX_Unmarshal(b []byte) error { @@ -721,6 +783,7 @@ func init() { proto.RegisterType((*TableResponse)(nil), "pilosa.TableResponse") proto.RegisterType((*ColumnInfo)(nil), "pilosa.ColumnInfo") proto.RegisterType((*ColumnResponse)(nil), "pilosa.ColumnResponse") + proto.RegisterType((*Decimal)(nil), "pilosa.Decimal") proto.RegisterType((*InspectRequest)(nil), "pilosa.InspectRequest") proto.RegisterType((*Uint64Array)(nil), "pilosa.Uint64Array") proto.RegisterType((*StringArray)(nil), "pilosa.StringArray") @@ -730,56 +793,59 @@ func init() { func init() { proto.RegisterFile("pilosa.proto", fileDescriptor_ef0691a44d1e275c) } var fileDescriptor_ef0691a44d1e275c = []byte{ - // 631 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xdd, 0x6e, 0xd4, 0x3c, - 0x10, 0x8d, 0x9b, 0x74, 0x7f, 0x26, 0x6d, 0xbf, 0x0f, 0x17, 0x4a, 0x54, 0x21, 0x08, 0xb9, 0x21, - 0x08, 0x54, 0x55, 0xe5, 0x4f, 0x40, 0xb9, 0x68, 0x2b, 0xd0, 0x56, 0x80, 0x68, 0x0d, 0xed, 0xbd, - 0xb7, 0xf1, 0x96, 0x08, 0x37, 0xde, 0xda, 0x5e, 0xca, 0x3e, 0x08, 0x6f, 0x00, 0x8f, 0xc2, 0x13, - 0xf0, 0x42, 0xc8, 0x4e, 0x9c, 0x4d, 0x2a, 0x2d, 0x42, 0xbd, 0xf3, 0xcc, 0x39, 0xe3, 0x99, 0x33, - 0x33, 0x36, 0x2c, 0x8d, 0x73, 0x2e, 0x14, 0xdd, 0x18, 0x4b, 0xa1, 0x05, 0xee, 0x94, 0x56, 0xf2, - 0x1c, 0xfe, 0x3b, 0x9c, 0x30, 0x39, 0x3d, 0x38, 0x7c, 0x47, 0xd8, 0xf9, 0x84, 0x29, 0x8d, 0xaf, - 0xc3, 0x62, 0x5e, 0x64, 0xec, 0x5b, 0x84, 0x62, 0x94, 0xf6, 0x49, 0x69, 0xe0, 0xff, 0xc1, 0x1f, - 0x9f, 0xf3, 0x68, 0xc1, 0xfa, 0xcc, 0x31, 0x79, 0x09, 0xe1, 0x47, 0x4d, 0xf5, 0x44, 0xbd, 0x96, - 0x52, 0x48, 0x8c, 0x21, 0xd8, 0x13, 0x19, 0xb3, 0x51, 0xcb, 0xc4, 0x9e, 0x71, 0x04, 0xdd, 0xf7, - 0x4c, 0x29, 0x7a, 0xca, 0xaa, 0x40, 0x67, 0x26, 0x3f, 0x10, 0x84, 0x44, 0x5c, 0x10, 0xa6, 0xc6, - 0xa2, 0x50, 0x0c, 0x3f, 0x84, 0xee, 0x67, 0x46, 0x33, 0x26, 0x55, 0x84, 0x62, 0x3f, 0x0d, 0xb7, - 0xf0, 0x46, 0x55, 0xef, 0x9e, 0xe0, 0x93, 0xb3, 0x62, 0xbf, 0x18, 0x09, 0xe2, 0x28, 0x78, 0x13, - 0xba, 0x27, 0xd6, 0xad, 0xa2, 0x05, 0xcb, 0x5e, 0x6b, 0xb3, 0xdd, 0xb5, 0xc4, 0xd1, 0xf0, 0x93, - 0x56, 0xb1, 0x91, 0x1f, 0xa3, 0x34, 0xdc, 0x5a, 0x75, 0x51, 0x0d, 0x88, 0x34, 0x79, 0xc9, 0x33, - 0xf0, 0x89, 0xb8, 0x68, 0xe6, 0x43, 0xff, 0x94, 0x2f, 0xf9, 0x8e, 0x60, 0xf9, 0x13, 0x1d, 0x72, - 0x76, 0x45, 0x85, 0x77, 0x20, 0x90, 0xe2, 0xc2, 0xc9, 0x0b, 0x1d, 0xd5, 0xb4, 0xcc, 0x02, 0x57, - 0x15, 0xb4, 0x0d, 0x30, 0x4b, 0x67, 0x66, 0x56, 0xd0, 0x33, 0x56, 0x4d, 0xda, 0x9e, 0xf1, 0x3a, - 0xf4, 0x32, 0xaa, 0xa9, 0x9e, 0x8e, 0xdd, 0xd0, 0x6a, 0x3b, 0xf9, 0xbd, 0x00, 0x2b, 0x6d, 0xc5, - 0xf8, 0x36, 0xf4, 0x95, 0x96, 0x79, 0x71, 0x7a, 0x4c, 0x79, 0x79, 0xcf, 0xc0, 0x23, 0x33, 0x97, - 0xc1, 0x27, 0x79, 0xa1, 0x9f, 0x3e, 0x36, 0xb8, 0xb9, 0x2f, 0x30, 0x78, 0xed, 0xc2, 0xb7, 0xa0, - 0x57, 0xc3, 0x46, 0x84, 0x3f, 0xf0, 0x48, 0xed, 0xc1, 0xeb, 0xd0, 0x1d, 0x0a, 0xc1, 0x0d, 0x18, - 0xc4, 0x28, 0xed, 0x0d, 0x3c, 0xe2, 0x1c, 0x16, 0xe3, 0x62, 0x68, 0xb0, 0xc5, 0x18, 0xa5, 0x4b, - 0x16, 0x2b, 0x1d, 0xf8, 0x15, 0xac, 0x94, 0x29, 0x76, 0xa4, 0xa4, 0x53, 0x43, 0xe9, 0xb4, 0x1b, - 0x74, 0x34, 0x43, 0x07, 0x1e, 0xb9, 0x44, 0x36, 0xe1, 0xa5, 0x82, 0x3a, 0xbc, 0x7b, 0xb9, 0xbf, - 0x35, 0x6a, 0xc2, 0xdb, 0x64, 0x1c, 0x03, 0x8c, 0xb8, 0xa0, 0x95, 0xaa, 0x5e, 0x8c, 0x52, 0x34, - 0xf0, 0x48, 0xc3, 0xb7, 0x1b, 0x42, 0xbf, 0xdc, 0x94, 0x63, 0xca, 0x93, 0x9f, 0x08, 0x56, 0xf6, - 0x0b, 0x35, 0x66, 0x27, 0xfa, 0xef, 0x6f, 0xf0, 0x41, 0x73, 0xed, 0x4d, 0x3d, 0xd7, 0x5c, 0x3d, - 0xfb, 0x99, 0xfa, 0x20, 0xdf, 0xb2, 0xa9, 0x9a, 0x6d, 0x7c, 0x02, 0x4b, 0xa3, 0x9c, 0x6b, 0x26, - 0xdf, 0xe4, 0x8c, 0x67, 0x2a, 0xf2, 0x63, 0x3f, 0xed, 0x93, 0x96, 0xcf, 0xa4, 0xe1, 0xf9, 0x59, - 0xae, 0x6d, 0x73, 0x03, 0x52, 0x1a, 0x78, 0x0d, 0x3a, 0x62, 0x34, 0x52, 0x4c, 0xdb, 0xbe, 0x06, - 0xa4, 0xb2, 0x92, 0xbb, 0x10, 0x36, 0xda, 0x66, 0x96, 0xe7, 0x2b, 0xe5, 0xe5, 0x36, 0x07, 0xc4, - 0x9e, 0x0d, 0xa5, 0xd1, 0x9a, 0x16, 0xa5, 0x5f, 0x51, 0x4e, 0xa1, 0x5f, 0x57, 0x8b, 0xef, 0x81, - 0x9f, 0x67, 0xca, 0xaa, 0x9c, 0x3b, 0x1c, 0xc3, 0xc0, 0xf7, 0x21, 0xf8, 0xc2, 0xa6, 0x4e, 0xf7, - 0x9c, 0x39, 0x58, 0xca, 0x6e, 0x07, 0x02, 0xb3, 0xac, 0x5b, 0xbf, 0x10, 0x74, 0x0e, 0x2c, 0x0d, - 0x6f, 0x43, 0xcf, 0xfd, 0x72, 0xf8, 0xa6, 0x8b, 0xbd, 0xf4, 0xef, 0xad, 0xaf, 0x36, 0x1f, 0x59, - 0xb5, 0xde, 0x89, 0xb7, 0x89, 0xf0, 0x0e, 0x2c, 0x3b, 0xee, 0x51, 0x41, 0xe5, 0x74, 0xfe, 0x15, - 0x37, 0x1c, 0xd0, 0x7a, 0xfa, 0x89, 0x87, 0x5f, 0x40, 0xb7, 0x9a, 0x30, 0xae, 0xbf, 0x8e, 0xf6, - 0xc8, 0xe7, 0xa6, 0x1f, 0x76, 0xec, 0x8f, 0xfd, 0xe8, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb8, - 0x55, 0x8e, 0x9b, 0xc1, 0x05, 0x00, 0x00, + // 677 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xed, 0x6e, 0xd3, 0x3c, + 0x14, 0xae, 0x97, 0xac, 0x6d, 0x4e, 0xf6, 0xf1, 0xbe, 0xde, 0xfb, 0x8e, 0x68, 0x42, 0x10, 0xf2, + 0x87, 0x20, 0xd0, 0x34, 0x06, 0x03, 0x01, 0xe3, 0xc7, 0x36, 0x40, 0x9d, 0x00, 0xb1, 0x19, 0xb6, + 0xff, 0x6e, 0xe3, 0x8e, 0x08, 0x37, 0xee, 0xe2, 0x74, 0xa3, 0x37, 0xc0, 0x1d, 0x70, 0x07, 0x70, + 0x29, 0xdc, 0x17, 0xb2, 0x1d, 0xa7, 0xc9, 0xa4, 0x22, 0xb4, 0x7f, 0x3e, 0xe7, 0x79, 0xce, 0x57, + 0x1e, 0x1f, 0x07, 0x96, 0xc6, 0x29, 0x17, 0x92, 0x6e, 0x8e, 0x73, 0x51, 0x08, 0xdc, 0x36, 0x56, + 0xf4, 0x0c, 0x56, 0x8f, 0x27, 0x2c, 0x9f, 0x1e, 0x1d, 0xbf, 0x23, 0xec, 0x7c, 0xc2, 0x64, 0x81, + 0xff, 0x83, 0xc5, 0x34, 0x4b, 0xd8, 0xd7, 0x00, 0x85, 0x28, 0xf6, 0x88, 0x31, 0xf0, 0x3f, 0xe0, + 0x8c, 0xcf, 0x79, 0xb0, 0xa0, 0x7d, 0xea, 0x18, 0xbd, 0x00, 0xff, 0x63, 0x41, 0x8b, 0x89, 0x7c, + 0x9d, 0xe7, 0x22, 0xc7, 0x18, 0xdc, 0x03, 0x91, 0x30, 0x1d, 0xb5, 0x4c, 0xf4, 0x19, 0x07, 0xd0, + 0x79, 0xcf, 0xa4, 0xa4, 0x67, 0xac, 0x0c, 0xb4, 0x66, 0xf4, 0x03, 0x81, 0x4f, 0xc4, 0x25, 0x61, + 0x72, 0x2c, 0x32, 0xc9, 0xf0, 0x03, 0xe8, 0x7c, 0x66, 0x34, 0x61, 0xb9, 0x0c, 0x50, 0xe8, 0xc4, + 0xfe, 0x36, 0xde, 0x2c, 0xfb, 0x3d, 0x10, 0x7c, 0x32, 0xca, 0x0e, 0xb3, 0xa1, 0x20, 0x96, 0x82, + 0xb7, 0xa0, 0x33, 0xd0, 0x6e, 0x19, 0x2c, 0x68, 0xf6, 0x7a, 0x93, 0x6d, 0xd3, 0x12, 0x4b, 0xc3, + 0x3b, 0x8d, 0x66, 0x03, 0x27, 0x44, 0xb1, 0xbf, 0xbd, 0x66, 0xa3, 0x6a, 0x10, 0xa9, 0xf3, 0xa2, + 0xa7, 0xe0, 0x10, 0x71, 0x59, 0xaf, 0x87, 0xfe, 0xaa, 0x5e, 0xf4, 0x1d, 0xc1, 0xf2, 0x27, 0xda, + 0xe7, 0xec, 0x9a, 0x13, 0xde, 0x06, 0x37, 0x17, 0x97, 0x76, 0x3c, 0xdf, 0x52, 0xd5, 0x27, 0xd3, + 0xc0, 0x75, 0x07, 0xda, 0x05, 0x98, 0x95, 0x53, 0x9a, 0x65, 0x74, 0xc4, 0x4a, 0xa5, 0xf5, 0x19, + 0x6f, 0x40, 0x37, 0xa1, 0x05, 0x2d, 0xa6, 0x63, 0x2b, 0x5a, 0x65, 0x47, 0xdf, 0x1c, 0x58, 0x69, + 0x4e, 0x8c, 0x6f, 0x81, 0x27, 0x8b, 0x3c, 0xcd, 0xce, 0x4e, 0x29, 0x37, 0x79, 0x7a, 0x2d, 0x32, + 0x73, 0x29, 0x7c, 0x92, 0x66, 0xc5, 0x93, 0xc7, 0x0a, 0x57, 0xf9, 0x5c, 0x85, 0x57, 0x2e, 0x7c, + 0x13, 0xba, 0x15, 0xac, 0x86, 0x70, 0x7a, 0x2d, 0x52, 0x79, 0xf0, 0x06, 0x74, 0xfa, 0x42, 0x70, + 0x05, 0xba, 0x21, 0x8a, 0xbb, 0xbd, 0x16, 0xb1, 0x0e, 0x8d, 0x71, 0xd1, 0x57, 0xd8, 0x62, 0x88, + 0xe2, 0x25, 0x8d, 0x19, 0x07, 0x7e, 0x09, 0x2b, 0xa6, 0xc4, 0x5e, 0x9e, 0xd3, 0xa9, 0xa2, 0xb4, + 0x9b, 0x1f, 0xe8, 0x64, 0x86, 0xf6, 0x5a, 0xe4, 0x0a, 0x59, 0x85, 0x9b, 0x09, 0xaa, 0xf0, 0xce, + 0xd5, 0xef, 0x5b, 0xa1, 0x2a, 0xbc, 0x49, 0xc6, 0x21, 0xc0, 0x90, 0x0b, 0x5a, 0x4e, 0xd5, 0x0d, + 0x51, 0x8c, 0x7a, 0x2d, 0x52, 0xf3, 0xe1, 0x87, 0x00, 0x09, 0x1b, 0xa4, 0x23, 0xaa, 0x47, 0xf3, + 0x74, 0xf2, 0x55, 0x9b, 0xfc, 0x95, 0x41, 0x54, 0xc8, 0x8c, 0xb4, 0xef, 0x83, 0x67, 0x2e, 0xd7, + 0x29, 0xe5, 0xd1, 0x0e, 0x74, 0x4a, 0x96, 0x5a, 0xd7, 0x0b, 0xca, 0x27, 0x46, 0x44, 0x87, 0x18, + 0x43, 0x79, 0xe5, 0x80, 0x72, 0x23, 0xa1, 0x43, 0x8c, 0x11, 0xfd, 0x44, 0xb0, 0x72, 0x98, 0xc9, + 0x31, 0x1b, 0x14, 0x7f, 0xde, 0xf6, 0xfb, 0xf5, 0x05, 0x53, 0xcd, 0xfd, 0x6b, 0x9b, 0x3b, 0x4c, + 0xe4, 0x87, 0xfc, 0x2d, 0x9b, 0xca, 0xd9, 0x6e, 0x45, 0xb0, 0x34, 0x4c, 0x79, 0xc1, 0xf2, 0x37, + 0x29, 0xe3, 0x89, 0x0c, 0x9c, 0xd0, 0x89, 0x3d, 0xd2, 0xf0, 0xa9, 0x32, 0x3c, 0x1d, 0xa5, 0x85, + 0x96, 0xd1, 0x25, 0xc6, 0xc0, 0xeb, 0xd0, 0x16, 0xc3, 0xa1, 0x64, 0x85, 0x56, 0xd0, 0x25, 0xa5, + 0x15, 0xdd, 0x01, 0xbf, 0x26, 0x90, 0xba, 0xa6, 0x17, 0x94, 0x9b, 0xbd, 0x71, 0x89, 0x3e, 0x2b, + 0x4a, 0x4d, 0x84, 0x06, 0xc5, 0x2b, 0x29, 0x67, 0xe0, 0x55, 0xdd, 0xe2, 0xbb, 0xe0, 0xa4, 0x89, + 0xd4, 0x53, 0xce, 0xbd, 0x06, 0x8a, 0x81, 0xef, 0x81, 0xfb, 0x85, 0x4d, 0xed, 0xdc, 0x73, 0x14, + 0xd7, 0x94, 0xfd, 0x36, 0xb8, 0x6a, 0x2d, 0xb6, 0x7f, 0x21, 0x68, 0x1f, 0x69, 0x1a, 0xde, 0x85, + 0xae, 0x7d, 0x4f, 0xf1, 0x0d, 0x1b, 0x7b, 0xe5, 0x85, 0xdd, 0x58, 0xab, 0xaf, 0x73, 0xb9, 0x48, + 0x51, 0x6b, 0x0b, 0xe1, 0x3d, 0x58, 0xb6, 0xdc, 0x93, 0x8c, 0xe6, 0xd3, 0xf9, 0x29, 0xfe, 0xb7, + 0x40, 0xe3, 0x91, 0x89, 0x5a, 0xf8, 0x39, 0x74, 0x4a, 0x85, 0x71, 0xf5, 0x48, 0x35, 0x25, 0x9f, + 0x5b, 0xbe, 0xdf, 0xd6, 0xff, 0x86, 0x47, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xce, 0xa2, 0x01, + 0xb8, 0x2b, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc.ClientConnInterface // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc.SupportPackageIsVersion6 // PilosaClient is the client API for Pilosa service. // @@ -791,10 +857,10 @@ type PilosaClient interface { } type pilosaClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewPilosaClient(cc *grpc.ClientConn) PilosaClient { +func NewPilosaClient(cc grpc.ClientConnInterface) PilosaClient { return &pilosaClient{cc} } diff --git a/proto/pilosa.proto b/proto/pilosa.proto index 144e9e480..ff25a5fb9 100644 --- a/proto/pilosa.proto +++ b/proto/pilosa.proto @@ -42,9 +42,15 @@ message ColumnResponse{ Uint64Array uint64ArrayVal = 6; StringArray stringArrayVal = 7; double float64Val = 8; + Decimal decimalVal = 9; } } +message Decimal { + int64 value = 1; + int64 scale = 2; +} + message InspectRequest { string index = 1; IdsOrKeys columns = 2; diff --git a/server/grpc.go b/server/grpc.go index b1d382f79..045753f06 100644 --- a/server/grpc.go +++ b/server/grpc.go @@ -119,7 +119,7 @@ func fieldDataType(f *pilosa.Field) string { } return "int64" case "decimal": - return "float64" + return "decimal" case "bool": return "bool" case "time": @@ -324,12 +324,12 @@ func (h grpcHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSer } case "decimal": - value, exists, err := field.FloatValue(col) + dec, exists, err := field.DecimalValue(col) if err != nil { return errors.Wrap(err, "getting decimal field value for column") } else if exists { rowResp.Columns = append(rowResp.Columns, - &pb.ColumnResponse{ColumnVal: &pb.ColumnResponse_Float64Val{Float64Val: value}}) + &pb.ColumnResponse{ColumnVal: &pb.ColumnResponse_DecimalVal{DecimalVal: &pb.Decimal{Value: dec.Value, Scale: dec.Scale}}}) } else { rowResp.Columns = append(rowResp.Columns, &pb.ColumnResponse{ColumnVal: nil}) @@ -555,12 +555,12 @@ func (h grpcHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSer return errors.Wrap(err, "translating column key") } - value, exists, err := field.FloatValue(id) + dec, exists, err := field.DecimalValue(id) if err != nil { return errors.Wrap(err, "getting decimal field value for column") } else if exists { rowResp.Columns = append(rowResp.Columns, - &pb.ColumnResponse{ColumnVal: &pb.ColumnResponse_Float64Val{Float64Val: value}}) + &pb.ColumnResponse{ColumnVal: &pb.ColumnResponse_DecimalVal{DecimalVal: &pb.Decimal{Value: dec.Value, Scale: dec.Scale}}}) } else { rowResp.Columns = append(rowResp.Columns, &pb.ColumnResponse{ColumnVal: nil}) @@ -801,9 +801,20 @@ func makeRows(resp pilosa.QueryResponse, logger logger.Logger) chan *pb.RowRespo }} case pilosa.ValCount: var ci []*pb.ColumnInfo - // ValCount can have a float or integeger value, but - // not both (as of this writing). - if r.FloatVal != 0 { + // ValCount can have a decimal, float, or integer value, but + // not more than one (as of this writing). + if r.DecimalVal != nil { + ci = []*pb.ColumnInfo{ + {Name: "value", Datatype: "decimal"}, + {Name: "count", Datatype: "int64"}, + } + results <- &pb.RowResponse{ + Headers: ci, + Columns: []*pb.ColumnResponse{ + &pb.ColumnResponse{ColumnVal: &pb.ColumnResponse_DecimalVal{DecimalVal: &pb.Decimal{Value: r.DecimalVal.Value, Scale: r.DecimalVal.Scale}}}, + &pb.ColumnResponse{ColumnVal: &pb.ColumnResponse_Int64Val{Int64Val: r.Count}}, + }} + } else if r.FloatVal != 0 { ci = []*pb.ColumnInfo{ {Name: "value", Datatype: "float64"}, {Name: "count", Datatype: "int64"}, diff --git a/server/server_test.go b/server/server_test.go index 03f7ab703..7809ee466 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -323,14 +323,12 @@ func TestMain_MinMaxFloat(t *testing.T) { } // Query row. - exp0 := pilosa.ValCount{FloatVal: 4.44, Count: 1} - exp1 := pilosa.ValCount{FloatVal: 1.32, Count: 1} + exp0 := pilosa.ValCount{DecimalVal: &pql.Decimal{Value: 4440, Scale: 3}, Count: 1} + exp1 := pilosa.ValCount{DecimalVal: &pql.Decimal{Value: 1320, Scale: 3}, Count: 1} if res, err := m.QueryProtobuf("i", `Max(field=dec) Min(field=dec)`); err != nil { t.Fatal(err) - } else if res.Results[0] != exp0 || - res.Results[1] != exp1 { + } else if !reflect.DeepEqual(res.Results[0], exp0) || !reflect.DeepEqual(res.Results[1], exp1) { t.Fatalf("unexpected results: %+v", res.Results) - } } @@ -1041,24 +1039,23 @@ Set("h", adec=100.22) `) result := test.Do(t, "POST", cluster[0].URL()+"/index/testdec/query", "Sum(field=adec)") - if !strings.Contains(result.Body, `"floatValue":305.59`) { - t.Fatalf("expected float sum of 305.59, but got: '%s'", result.Body) + if !strings.Contains(result.Body, `"decimalValue":305.59`) { + t.Fatalf("expected decimal sum of 305.59, but got: '%s'", result.Body) } else if !strings.Contains(result.Body, `"count":8`) { t.Fatalf("expected count 8, but got: '%s'", result.Body) } result = test.Do(t, "POST", cluster[0].URL()+"/index/testdec/query", "Max(field=adec)") - if !strings.Contains(result.Body, `"floatValue":100.22`) { - t.Fatalf("expected float max of 100.22, but got: '%s'", result.Body) + if !strings.Contains(result.Body, `"decimalValue":100.22`) { + t.Fatalf("expected decimal max of 100.22, but got: '%s'", result.Body) } else if !strings.Contains(result.Body, `"count":1`) { t.Fatalf("expected count 1, but got: '%s'", result.Body) } result = test.Do(t, "POST", cluster[0].URL()+"/index/testdec/query", "Min(field=adec)") - if !strings.Contains(result.Body, `"floatValue":11.12`) { - t.Fatalf("expected float min of 11.12, but got: '%s'", result.Body) + if !strings.Contains(result.Body, `"decimalValue":11.12`) { + t.Fatalf("expected decimal min of 11.12, but got: '%s'", result.Body) } else if !strings.Contains(result.Body, `"count":1`) { t.Fatalf("expected count 1, but got: '%s'", result.Body) } - }