diff --git a/mock/store_reader.go b/mock/reader.go similarity index 69% rename from mock/store_reader.go rename to mock/reader.go index d441d64ca11..370d452fb4f 100644 --- a/mock/store_reader.go +++ b/mock/reader.go @@ -7,7 +7,7 @@ import ( "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" ) -type StoreReader struct { +type StorageReader struct { ReadFilterFn func(ctx context.Context, spec influxdb.ReadFilterSpec, alloc *memory.Allocator) (influxdb.TableIterator, error) ReadGroupFn func(ctx context.Context, spec influxdb.ReadGroupSpec, alloc *memory.Allocator) (influxdb.TableIterator, error) ReadTagKeysFn func(ctx context.Context, spec influxdb.ReadTagKeysSpec, alloc *memory.Allocator) (influxdb.TableIterator, error) @@ -15,23 +15,23 @@ type StoreReader struct { CloseFn func() } -func (s *StoreReader) ReadFilter(ctx context.Context, spec influxdb.ReadFilterSpec, alloc *memory.Allocator) (influxdb.TableIterator, error) { +func (s *StorageReader) ReadFilter(ctx context.Context, spec influxdb.ReadFilterSpec, alloc *memory.Allocator) (influxdb.TableIterator, error) { return s.ReadFilterFn(ctx, spec, alloc) } -func (s *StoreReader) ReadGroup(ctx context.Context, spec influxdb.ReadGroupSpec, alloc *memory.Allocator) (influxdb.TableIterator, error) { +func (s *StorageReader) ReadGroup(ctx context.Context, spec influxdb.ReadGroupSpec, alloc *memory.Allocator) (influxdb.TableIterator, error) { return s.ReadGroupFn(ctx, spec, alloc) } -func (s *StoreReader) ReadTagKeys(ctx context.Context, spec influxdb.ReadTagKeysSpec, alloc *memory.Allocator) (influxdb.TableIterator, error) { +func (s *StorageReader) ReadTagKeys(ctx context.Context, spec influxdb.ReadTagKeysSpec, alloc *memory.Allocator) (influxdb.TableIterator, error) { return s.ReadTagKeysFn(ctx, spec, alloc) } -func (s *StoreReader) ReadTagValues(ctx context.Context, spec influxdb.ReadTagValuesSpec, alloc *memory.Allocator) (influxdb.TableIterator, error) { +func (s *StorageReader) ReadTagValues(ctx context.Context, spec influxdb.ReadTagValuesSpec, alloc *memory.Allocator) (influxdb.TableIterator, error) { return s.ReadTagValuesFn(ctx, spec, alloc) } -func (s *StoreReader) Close() { +func (s *StorageReader) Close() { // Only invoke the close function if it is set. // We want this to be a no-op and work without // explicitly setting up a close function. @@ -41,12 +41,12 @@ func (s *StoreReader) Close() { } type WindowAggregateStoreReader struct { - *StoreReader - HasWindowAggregateCapabilityFn func(ctx context.Context) bool + *StorageReader + HasWindowAggregateCapabilityFn func(ctx context.Context, capability ...*influxdb.WindowAggregateCapability) bool ReadWindowAggregateFn func(ctx context.Context, spec influxdb.ReadWindowAggregateSpec, alloc *memory.Allocator) (influxdb.TableIterator, error) } -func (s *WindowAggregateStoreReader) HasWindowAggregateCapability(ctx context.Context) bool { +func (s *WindowAggregateStoreReader) HasWindowAggregateCapability(ctx context.Context, capability ...*influxdb.WindowAggregateCapability) bool { // Use the function if it exists. if s.HasWindowAggregateCapabilityFn != nil { return s.HasWindowAggregateCapabilityFn(ctx) diff --git a/query/stdlib/influxdata/influxdb/operators.go b/query/stdlib/influxdata/influxdb/operators.go index ed3ac696b46..f66a892fe10 100644 --- a/query/stdlib/influxdata/influxdb/operators.go +++ b/query/stdlib/influxdata/influxdb/operators.go @@ -123,7 +123,7 @@ type ReadWindowAggregatePhysSpec struct { ReadRangePhysSpec WindowEvery int64 - Aggregates []plan.ProcedureKind + Aggregates []string } func (s *ReadWindowAggregatePhysSpec) Kind() plan.ProcedureKind { diff --git a/query/stdlib/influxdata/influxdb/source_test.go b/query/stdlib/influxdata/influxdb/source_test.go index 90b742182fa..473c9ab6530 100644 --- a/query/stdlib/influxdata/influxdb/source_test.go +++ b/query/stdlib/influxdata/influxdb/source_test.go @@ -201,7 +201,7 @@ func TestReadWindowAggregateSource(t *testing.T) { BucketID: bucketID.String(), }, WindowEvery: 10, - Aggregates: []plan.ProcedureKind{ + Aggregates: []string{ universe.SumKind, }, } diff --git a/query/stdlib/influxdata/influxdb/storage.go b/query/stdlib/influxdata/influxdb/storage.go index ca405ced1f4..34fdedd55ab 100644 --- a/query/stdlib/influxdata/influxdb/storage.go +++ b/query/stdlib/influxdata/influxdb/storage.go @@ -7,7 +7,6 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/execute" "github.com/influxdata/flux/memory" - "github.com/influxdata/flux/plan" "github.com/influxdata/flux/semantic" platform "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/kit/prom" @@ -148,7 +147,7 @@ type TableIterator interface { type ReadWindowAggregateSpec struct { ReadFilterSpec WindowEvery int64 - Aggregates []plan.ProcedureKind + Aggregates []string } // WindowAggregateCapability describes what is supported by WindowAggregateReader. diff --git a/storage/flux/reader.go b/storage/flux/reader.go index 0ccfb677c65..2cf653fb8a5 100644 --- a/storage/flux/reader.go +++ b/storage/flux/reader.go @@ -10,6 +10,7 @@ import ( "github.com/influxdata/flux/execute" "github.com/influxdata/flux/memory" "github.com/influxdata/flux/values" + "github.com/influxdata/influxdb/v2/kit/errors" "github.com/influxdata/influxdb/v2/models" "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" storage "github.com/influxdata/influxdb/v2/storage/reads" @@ -79,6 +80,23 @@ func (r *storeReader) ReadGroup(ctx context.Context, spec influxdb.ReadGroupSpec }, nil } +func (r *storeReader) HasWindowAggregateCapability(ctx context.Context, capability ...*influxdb.WindowAggregateCapability) bool { + if aggStore, ok := r.s.(storage.WindowAggregateStore); ok { + return aggStore.HasWindowAggregateCapability(ctx) + } + return false +} + +func (r *storeReader) ReadWindowAggregate(ctx context.Context, spec influxdb.ReadWindowAggregateSpec, alloc *memory.Allocator) (influxdb.TableIterator, error) { + return &windowAggregateIterator{ + ctx: ctx, + s: r.s, + spec: spec, + cache: newTagsCache(0), + alloc: alloc, + }, nil +} + func (r *storeReader) ReadTagKeys(ctx context.Context, spec influxdb.ReadTagKeysSpec, alloc *memory.Allocator) (influxdb.TableIterator, error) { var predicate *datatypes.Predicate if spec.Predicate != nil { @@ -527,6 +545,73 @@ func groupKeyForGroup(kv [][]byte, spec *influxdb.ReadGroupSpec, bnds execute.Bo return execute.NewGroupKey(cols, vs) } +type windowAggregateIterator struct { + ctx context.Context + s storage.Store + spec influxdb.ReadWindowAggregateSpec + stats cursors.CursorStats + cache *tagsCache + alloc *memory.Allocator +} + +func (wai *windowAggregateIterator) Statistics() cursors.CursorStats { return wai.stats } + +func (wai *windowAggregateIterator) Do(f func(flux.Table) error) error { + src := wai.s.GetSource( + uint64(wai.spec.OrganizationID), + uint64(wai.spec.BucketID), + ) + + // Setup read request + any, err := types.MarshalAny(src) + if err != nil { + return err + } + + var predicate *datatypes.Predicate + if wai.spec.Predicate != nil { + p, err := toStoragePredicate(wai.spec.Predicate) + if err != nil { + return err + } + predicate = p + } + + var req datatypes.ReadWindowAggregateRequest + req.ReadSource = any + req.Predicate = predicate + req.Range.Start = int64(wai.spec.Bounds.Start) + req.Range.End = int64(wai.spec.Bounds.Stop) + + req.WindowEvery = wai.spec.WindowEvery + req.Aggregate = make([]*datatypes.Aggregate, len(wai.spec.Aggregates)) + for i, aggKind := range wai.spec.Aggregates { + if agg, err := determineAggregateMethod(aggKind); err != nil { + return err + } else if agg != datatypes.AggregateTypeNone { + req.Aggregate[i] = &datatypes.Aggregate{Type: agg} + } + } + + if aggStore, ok := wai.s.(storage.WindowAggregateStore); !ok { + return errors.New("storage does not support window aggregate.") + } else { + rs, err := aggStore.WindowAggregate(wai.ctx, &req) + if err != nil { + return err + } + + if rs == nil { + return nil + } + return wai.handleRead(f, rs) + } +} + +func (wai *windowAggregateIterator) handleRead(f func(flux.Table) error, rs storage.ResultSet) error { + return nil +} + type tagKeysIterator struct { ctx context.Context bounds execute.Bounds diff --git a/storage/reads/datatypes/storage_common.pb.go b/storage/reads/datatypes/storage_common.pb.go index 78dbe1bbed9..baaf9766f1b 100644 --- a/storage/reads/datatypes/storage_common.pb.go +++ b/storage/reads/datatypes/storage_common.pb.go @@ -95,18 +95,24 @@ const ( AggregateTypeNone Aggregate_AggregateType = 0 AggregateTypeSum Aggregate_AggregateType = 1 AggregateTypeCount Aggregate_AggregateType = 2 + AggregateTypeMin Aggregate_AggregateType = 3 + AggregateTypeMax Aggregate_AggregateType = 4 ) var Aggregate_AggregateType_name = map[int32]string{ 0: "NONE", 1: "SUM", 2: "COUNT", + 3: "MIN", + 4: "MAX", } var Aggregate_AggregateType_value = map[string]int32{ "NONE": 0, "SUM": 1, "COUNT": 2, + "MIN": 3, + "MAX": 4, } func (x Aggregate_AggregateType) String() string { @@ -1390,115 +1396,117 @@ func init() { func init() { proto.RegisterFile("storage_common.proto", fileDescriptor_715e4bf4cdf1f73d) } var fileDescriptor_715e4bf4cdf1f73d = []byte{ - // 1726 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xcd, 0x8f, 0x1b, 0x49, - 0x15, 0x77, 0xfb, 0x6b, 0xa6, 0x9f, 0x3d, 0x4e, 0x4f, 0xad, 0xc9, 0x3a, 0x9d, 0x8d, 0xdd, 0x6b, - 0x60, 0x77, 0x24, 0x82, 0x47, 0x9a, 0x5d, 0xa4, 0x55, 0x60, 0x25, 0xc6, 0x13, 0xcf, 0xd8, 0x64, - 0xc6, 0x1e, 0x95, 0x3d, 0x8b, 0xe0, 0x62, 0x6a, 0xc6, 0xe5, 0xde, 0xd6, 0xda, 0xdd, 0xa6, 0xbb, - 0x1d, 0x62, 0x89, 0x0b, 0xb7, 0x95, 0x4f, 0x8b, 0x04, 0x17, 0x24, 0x9f, 0x38, 0x72, 0xe7, 0x6f, - 0x08, 0x12, 0x12, 0x7b, 0x44, 0x1c, 0x2c, 0x70, 0x24, 0x24, 0xfe, 0x04, 0x96, 0x0b, 0xaa, 0xaa, - 0xae, 0x76, 0x7b, 0x12, 0x26, 0x76, 0x94, 0x03, 0xca, 0xde, 0xaa, 0x5e, 0xbd, 0xfa, 0xbd, 0x8f, - 0x7e, 0x5f, 0xd5, 0x90, 0xf7, 0x7c, 0xc7, 0x25, 0x26, 0xed, 0x5e, 0x39, 0xc3, 0xa1, 0x63, 0x57, - 0x46, 0xae, 0xe3, 0x3b, 0xe8, 0xae, 0x65, 0xf7, 0x07, 0xe3, 0x27, 0x3d, 0xe2, 0x93, 0xca, 0x68, - 0x40, 0xfc, 0xbe, 0xe3, 0x0e, 0x2b, 0x01, 0xa7, 0x9e, 0x37, 0x1d, 0xd3, 0xe1, 0x7c, 0xfb, 0x6c, - 0x25, 0xae, 0xe8, 0x77, 0x4c, 0xc7, 0x31, 0x07, 0x74, 0x9f, 0xef, 0x2e, 0xc7, 0xfd, 0x7d, 0x62, - 0x4f, 0x82, 0xa3, 0x5b, 0x23, 0x97, 0xf6, 0xac, 0x2b, 0xe2, 0x53, 0x41, 0x28, 0xff, 0x4b, 0x81, - 0x5d, 0x4c, 0x49, 0xef, 0xd8, 0x1a, 0xf8, 0xd4, 0xc5, 0xf4, 0xe7, 0x63, 0xea, 0xf9, 0xa8, 0x06, - 0x19, 0x97, 0x92, 0x5e, 0xd7, 0x73, 0xc6, 0xee, 0x15, 0x2d, 0x28, 0x86, 0xb2, 0x97, 0x39, 0xc8, - 0x57, 0x04, 0x6e, 0x45, 0xe2, 0x56, 0x0e, 0xed, 0x49, 0x35, 0xb7, 0x98, 0x97, 0x80, 0x21, 0xb4, - 0x39, 0x2f, 0x06, 0x37, 0x5c, 0xa3, 0x13, 0x48, 0xb9, 0xc4, 0x36, 0x69, 0x21, 0xce, 0x01, 0xbe, - 0x53, 0xb9, 0xc1, 0x96, 0x4a, 0xc7, 0x1a, 0x52, 0xcf, 0x27, 0xc3, 0x11, 0x66, 0x57, 0xaa, 0xc9, - 0xa7, 0xf3, 0x52, 0x0c, 0x8b, 0xfb, 0xe8, 0x21, 0xa8, 0xa1, 0xe2, 0x85, 0x04, 0x07, 0x7b, 0xef, - 0x46, 0xb0, 0x73, 0xc9, 0x8d, 0x97, 0x17, 0xcb, 0x7f, 0x4e, 0x81, 0xc6, 0x34, 0x3d, 0x71, 0x9d, - 0xf1, 0xe8, 0x8d, 0x36, 0x15, 0xdd, 0x07, 0x30, 0x99, 0x95, 0xdd, 0xcf, 0xe8, 0xc4, 0x2b, 0x24, - 0x8d, 0xc4, 0x9e, 0x5a, 0xdd, 0x59, 0xcc, 0x4b, 0x2a, 0xb7, 0xfd, 0x11, 0x9d, 0x78, 0x58, 0x35, - 0xe5, 0x12, 0x35, 0x20, 0xc5, 0x37, 0x85, 0x94, 0xa1, 0xec, 0xe5, 0x0e, 0x3e, 0xb8, 0x51, 0xde, - 0x75, 0x0f, 0x56, 0xc4, 0x46, 0x20, 0x30, 0xf5, 0x89, 0x69, 0xba, 0xd4, 0x64, 0xea, 0xa7, 0xd7, - 0x50, 0xff, 0x50, 0x72, 0xe3, 0xe5, 0x45, 0x74, 0x1f, 0x52, 0x9f, 0x5a, 0xb6, 0xef, 0x15, 0xb6, - 0x0c, 0x65, 0x6f, 0xab, 0x7a, 0x7b, 0x31, 0x2f, 0xa5, 0xea, 0x8c, 0xf0, 0xd5, 0xbc, 0xa4, 0xb2, - 0xc5, 0xf1, 0x80, 0x98, 0x1e, 0x16, 0x4c, 0xe5, 0x13, 0x48, 0x71, 0x1d, 0xd0, 0x3d, 0x80, 0x13, - 0xdc, 0xba, 0x38, 0xef, 0x36, 0x5b, 0xcd, 0x9a, 0x16, 0xd3, 0x77, 0xa6, 0x33, 0x43, 0x58, 0xdc, - 0x74, 0x6c, 0x8a, 0xee, 0xc0, 0xb6, 0x38, 0xae, 0xfe, 0x44, 0x8b, 0xeb, 0x99, 0xe9, 0xcc, 0xd8, - 0xe2, 0x87, 0xd5, 0x89, 0x9e, 0xfc, 0xfc, 0xf7, 0xc5, 0x58, 0xf9, 0x0f, 0x0a, 0x2c, 0xd1, 0xd1, - 0x5d, 0x50, 0xeb, 0x8d, 0x66, 0x47, 0x82, 0x65, 0xa7, 0x33, 0x63, 0x9b, 0x9d, 0x72, 0xac, 0x6f, - 0x41, 0x2e, 0x38, 0xec, 0x9e, 0xb7, 0x1a, 0xcd, 0x4e, 0x5b, 0x53, 0x74, 0x6d, 0x3a, 0x33, 0xb2, - 0x82, 0xe3, 0xdc, 0x61, 0x9a, 0x45, 0xb9, 0xda, 0x35, 0xdc, 0xa8, 0xb5, 0xb5, 0x78, 0x94, 0xab, - 0x4d, 0x5d, 0x8b, 0x7a, 0x68, 0x1f, 0xf2, 0x9c, 0xab, 0x7d, 0x54, 0xaf, 0x9d, 0x1d, 0x76, 0x0f, - 0x4f, 0x4f, 0xbb, 0x9d, 0xc6, 0x59, 0x4d, 0x4b, 0xea, 0xdf, 0x98, 0xce, 0x8c, 0x5d, 0xc6, 0xdb, - 0xbe, 0xfa, 0x94, 0x0e, 0xc9, 0xe1, 0x60, 0xc0, 0x42, 0x27, 0xd0, 0xf6, 0x2f, 0x0a, 0xa8, 0xa1, - 0xf7, 0x50, 0x1d, 0x92, 0xfe, 0x64, 0x24, 0x02, 0x38, 0x77, 0xf0, 0xe1, 0x7a, 0x3e, 0x5f, 0xae, - 0x3a, 0x93, 0x11, 0xc5, 0x1c, 0xa1, 0xfc, 0x04, 0x76, 0x56, 0xc8, 0xa8, 0x04, 0xc9, 0xc0, 0x07, - 0x5c, 0x9f, 0x95, 0x43, 0xee, 0x8c, 0x7b, 0x90, 0x68, 0x5f, 0x9c, 0x69, 0x8a, 0x9e, 0x9f, 0xce, - 0x0c, 0x6d, 0xe5, 0xbc, 0x3d, 0x1e, 0xa2, 0x77, 0x21, 0x75, 0xd4, 0xba, 0x68, 0x76, 0xb4, 0xb8, - 0x7e, 0x7b, 0x3a, 0x33, 0xd0, 0x0a, 0xc3, 0x91, 0x33, 0xb6, 0xfd, 0xc0, 0xa2, 0xef, 0x42, 0xa2, - 0x43, 0x4c, 0xa4, 0x41, 0xe2, 0x33, 0x3a, 0xe1, 0x96, 0x64, 0x31, 0x5b, 0xa2, 0x3c, 0xa4, 0x1e, - 0x93, 0xc1, 0x58, 0x64, 0x57, 0x16, 0x8b, 0x4d, 0xf9, 0xd7, 0x39, 0xc8, 0xb2, 0x68, 0xc4, 0xd4, - 0x1b, 0x39, 0xb6, 0x47, 0xd1, 0x19, 0xa4, 0xfb, 0x2e, 0x19, 0x52, 0xaf, 0xa0, 0x18, 0x89, 0xbd, - 0xcc, 0xc1, 0xfe, 0x4b, 0x03, 0x59, 0x5e, 0xad, 0x1c, 0xb3, 0x7b, 0x41, 0x26, 0x06, 0x20, 0xfa, - 0xe7, 0x69, 0x48, 0x71, 0x3a, 0x3a, 0x95, 0x09, 0xb2, 0xc5, 0x23, 0xfa, 0xc3, 0xf5, 0x71, 0x79, - 0x80, 0x71, 0x90, 0x7a, 0x4c, 0xe6, 0x48, 0x0b, 0xd2, 0x1e, 0xff, 0xf2, 0x41, 0xb5, 0xf9, 0xde, - 0xfa, 0x70, 0x22, 0x62, 0x24, 0x5e, 0x00, 0x83, 0x46, 0x90, 0xed, 0x0f, 0x1c, 0xe2, 0x77, 0x47, - 0x3c, 0xec, 0x82, 0x1a, 0xf4, 0x60, 0x03, 0xeb, 0xd9, 0x6d, 0x11, 0xb3, 0xc2, 0x11, 0xb7, 0x16, - 0xf3, 0x52, 0x26, 0x42, 0xad, 0xc7, 0x70, 0xa6, 0xbf, 0xdc, 0xa2, 0x27, 0x90, 0xb3, 0x6c, 0x9f, - 0x9a, 0xd4, 0x95, 0x32, 0x45, 0xa9, 0xfa, 0xc1, 0xfa, 0x32, 0x1b, 0xe2, 0x7e, 0x54, 0xea, 0xee, - 0x62, 0x5e, 0xda, 0x59, 0xa1, 0xd7, 0x63, 0x78, 0xc7, 0x8a, 0x12, 0xd0, 0x2f, 0xe1, 0xd6, 0xd8, - 0xf6, 0x2c, 0xd3, 0xa6, 0x3d, 0x29, 0x3a, 0xc9, 0x45, 0x7f, 0xbc, 0xbe, 0xe8, 0x8b, 0x00, 0x20, - 0x2a, 0x1b, 0x2d, 0xe6, 0xa5, 0xdc, 0xea, 0x41, 0x3d, 0x86, 0x73, 0xe3, 0x15, 0x0a, 0xb3, 0xfb, - 0xd2, 0x71, 0x06, 0x94, 0xd8, 0x52, 0x78, 0x6a, 0x53, 0xbb, 0xab, 0xe2, 0xfe, 0x73, 0x76, 0xaf, - 0xd0, 0x99, 0xdd, 0x97, 0x51, 0x02, 0xf2, 0x61, 0xc7, 0xf3, 0x5d, 0xcb, 0x36, 0xa5, 0x60, 0x51, - 0x5c, 0xbf, 0xbf, 0x41, 0xec, 0xf0, 0xeb, 0x51, 0xb9, 0xda, 0x62, 0x5e, 0xca, 0x46, 0xc9, 0xf5, - 0x18, 0xce, 0x7a, 0x91, 0x7d, 0x35, 0x0d, 0x49, 0x86, 0xac, 0x3f, 0x01, 0x58, 0x46, 0x32, 0x7a, - 0x0f, 0xb6, 0x7d, 0x62, 0x8a, 0xde, 0xc2, 0x32, 0x2d, 0x5b, 0xcd, 0x2c, 0xe6, 0xa5, 0xad, 0x0e, - 0x31, 0x79, 0x67, 0xd9, 0xf2, 0xc5, 0x02, 0x55, 0x01, 0x8d, 0x88, 0xeb, 0x5b, 0xbe, 0xe5, 0xd8, - 0x8c, 0xbb, 0xfb, 0x98, 0x0c, 0x58, 0x74, 0xb2, 0x1b, 0xf9, 0xc5, 0xbc, 0xa4, 0x9d, 0xcb, 0xd3, - 0x47, 0x74, 0xf2, 0x09, 0x19, 0x78, 0x58, 0x1b, 0x5d, 0xa3, 0xe8, 0xbf, 0x53, 0x20, 0x13, 0x89, - 0x7a, 0xf4, 0x00, 0x92, 0x3e, 0x31, 0x65, 0x86, 0x1b, 0x37, 0xf7, 0x59, 0x62, 0x06, 0x29, 0xcd, - 0xef, 0xa0, 0x16, 0xa8, 0x8c, 0xb1, 0xcb, 0x0b, 0x65, 0x9c, 0x17, 0xca, 0x83, 0xf5, 0xfd, 0xf7, - 0x90, 0xf8, 0x84, 0x97, 0xc9, 0xed, 0x5e, 0xb0, 0xd2, 0x7f, 0x04, 0xda, 0xf5, 0xd4, 0x41, 0x45, - 0x00, 0x5f, 0xf6, 0x77, 0xa1, 0xa6, 0x86, 0x23, 0x14, 0x74, 0x1b, 0xd2, 0xbc, 0x7c, 0x09, 0x47, - 0x28, 0x38, 0xd8, 0xe9, 0xa7, 0x80, 0x9e, 0x4f, 0x89, 0x0d, 0xd1, 0x12, 0x21, 0xda, 0x19, 0xbc, - 0xf5, 0x82, 0x28, 0xdf, 0x10, 0x2e, 0x19, 0x55, 0xee, 0xf9, 0xb8, 0xdd, 0x10, 0x6d, 0x3b, 0x44, - 0x7b, 0x04, 0xbb, 0xcf, 0x05, 0xe3, 0x86, 0x60, 0xaa, 0x04, 0x2b, 0xb7, 0x41, 0xe5, 0x00, 0x41, - 0xab, 0x4a, 0x07, 0x8d, 0x36, 0xa6, 0xbf, 0x35, 0x9d, 0x19, 0xb7, 0xc2, 0xa3, 0xa0, 0xd7, 0x96, - 0x20, 0x1d, 0xf6, 0xeb, 0x55, 0x06, 0xa1, 0x4b, 0xd0, 0x89, 0xfe, 0xa8, 0xc0, 0xb6, 0xfc, 0xde, - 0xe8, 0x1d, 0x48, 0x1d, 0x9f, 0xb6, 0x0e, 0x3b, 0x5a, 0x4c, 0xdf, 0x9d, 0xce, 0x8c, 0x1d, 0x79, - 0xc0, 0x3f, 0x3d, 0x32, 0x60, 0xab, 0xd1, 0xec, 0xd4, 0x4e, 0x6a, 0x58, 0x42, 0xca, 0xf3, 0xe0, - 0x73, 0xa2, 0x32, 0x6c, 0x5f, 0x34, 0xdb, 0x8d, 0x93, 0x66, 0xed, 0xa1, 0x16, 0x17, 0x3d, 0x52, - 0xb2, 0xc8, 0x6f, 0xc4, 0x50, 0xaa, 0xad, 0xd6, 0x69, 0xed, 0xb0, 0xa9, 0x25, 0x56, 0x51, 0x02, - 0xbf, 0xa3, 0x22, 0xa4, 0xdb, 0x1d, 0xdc, 0x68, 0x9e, 0x68, 0x49, 0x1d, 0x4d, 0x67, 0x46, 0x4e, - 0x32, 0x08, 0x57, 0x06, 0x8a, 0xef, 0x01, 0x1c, 0x91, 0x11, 0xb9, 0xb4, 0x06, 0x96, 0x3f, 0x41, - 0x3a, 0x6c, 0xf7, 0x29, 0xf1, 0xc7, 0x6e, 0xd0, 0x12, 0x55, 0x1c, 0xee, 0xcb, 0x7f, 0x52, 0x20, - 0x1f, 0xb2, 0x5a, 0xd4, 0x0b, 0xbb, 0x68, 0x0b, 0x92, 0x57, 0x64, 0x24, 0x33, 0xec, 0xe6, 0x02, - 0xf3, 0x22, 0x00, 0x46, 0xf4, 0x6a, 0xb6, 0xef, 0x4e, 0x30, 0x07, 0xd2, 0x7f, 0x06, 0x6a, 0x48, - 0x8a, 0x36, 0x77, 0x55, 0x34, 0xf7, 0x8f, 0xa3, 0xcd, 0x3d, 0x73, 0xf0, 0xfe, 0x7a, 0x02, 0x27, - 0xc1, 0x14, 0xf0, 0x20, 0xfe, 0x91, 0x52, 0xfe, 0x08, 0x72, 0xab, 0x33, 0x35, 0x9b, 0x18, 0x3c, - 0x9f, 0xb8, 0x3e, 0x17, 0x94, 0xc0, 0x62, 0xc3, 0x84, 0x53, 0xbb, 0xc7, 0x05, 0x25, 0x30, 0x5b, - 0x96, 0xff, 0xa9, 0x40, 0x4e, 0xd6, 0xad, 0xe5, 0x8b, 0x80, 0x55, 0x8b, 0xb5, 0x5f, 0x04, 0x1d, - 0x62, 0x7a, 0xf2, 0x45, 0xe0, 0x87, 0xeb, 0xff, 0xb7, 0xc7, 0xcf, 0xaf, 0xe2, 0xa0, 0x75, 0x88, - 0xf9, 0x09, 0x4f, 0x9a, 0x37, 0xda, 0x54, 0xf4, 0x36, 0x6c, 0x05, 0xed, 0x89, 0x8f, 0x06, 0x2a, - 0x4e, 0x8b, 0x86, 0x54, 0xae, 0x40, 0x5e, 0x24, 0x8b, 0xf4, 0x42, 0x10, 0xf1, 0xcb, 0xd2, 0xc2, - 0xbb, 0x59, 0x58, 0x5a, 0xbe, 0x50, 0xe0, 0xed, 0x33, 0x4a, 0xbc, 0xb1, 0x4b, 0x87, 0xd4, 0xf6, - 0x9b, 0x6c, 0x2a, 0x94, 0xae, 0xbb, 0x0f, 0xe9, 0x97, 0x7b, 0x0d, 0x07, 0x3c, 0xaf, 0xcd, 0x43, - 0xe5, 0xaf, 0x14, 0xb8, 0x13, 0x51, 0xe9, 0x5a, 0xe8, 0x6e, 0xa6, 0x94, 0x01, 0x99, 0xe1, 0x12, - 0x8a, 0xab, 0xa6, 0xe2, 0x28, 0x69, 0xa9, 0x76, 0xe2, 0x75, 0x7e, 0xd8, 0xe4, 0xab, 0xc6, 0xf0, - 0x6f, 0xe3, 0x70, 0x77, 0xd5, 0xf8, 0xd5, 0x70, 0x7e, 0xdd, 0xe6, 0x47, 0x02, 0x29, 0x11, 0x0d, - 0xa4, 0xa5, 0x5f, 0x92, 0xaf, 0xd3, 0x2f, 0xa9, 0x57, 0xf5, 0xcb, 0xbf, 0x15, 0x28, 0x44, 0xfc, - 0x72, 0x6c, 0xd1, 0x41, 0xef, 0xeb, 0x12, 0x13, 0xff, 0x49, 0xac, 0x24, 0x84, 0xb4, 0x3d, 0xc8, - 0x6c, 0x02, 0xe9, 0x3e, 0xa7, 0x04, 0xdd, 0xec, 0xe8, 0x46, 0x01, 0xff, 0x13, 0xa7, 0x72, 0x46, - 0x3d, 0x8f, 0x98, 0x94, 0x53, 0xc3, 0x57, 0x22, 0x67, 0xd1, 0x7f, 0xa3, 0x40, 0x36, 0x7a, 0xfc, - 0x82, 0x0e, 0xd7, 0x09, 0xde, 0xe6, 0x62, 0xe4, 0xfc, 0xe1, 0x2b, 0xea, 0xc0, 0xb7, 0xcb, 0x77, - 0x3a, 0x7a, 0x07, 0xd4, 0x70, 0x3c, 0xe2, 0x1f, 0x43, 0xc3, 0x4b, 0x42, 0xf9, 0x99, 0x02, 0x6a, - 0x78, 0x03, 0xdd, 0x5b, 0x8e, 0x30, 0x7c, 0x76, 0x08, 0x4f, 0xc4, 0x0c, 0xf3, 0x6e, 0x74, 0x86, - 0xe1, 0x03, 0x4a, 0xc8, 0x20, 0x87, 0x98, 0x6f, 0xae, 0x0c, 0x31, 0xfc, 0x47, 0x40, 0xc8, 0x13, - 0x4e, 0x31, 0xa5, 0x70, 0x46, 0x09, 0x86, 0x98, 0x90, 0x45, 0xd4, 0x5d, 0x26, 0x48, 0x8e, 0x39, - 0xc9, 0x6b, 0x82, 0xe4, 0x9c, 0xf3, 0x6d, 0x50, 0x2f, 0x9a, 0x0f, 0x6b, 0xc7, 0x0d, 0x26, 0x29, - 0x25, 0xfe, 0x18, 0x44, 0x24, 0xf5, 0x68, 0xdf, 0xb2, 0x69, 0x2f, 0x18, 0x77, 0xfe, 0x16, 0x07, - 0x9d, 0x0d, 0xe9, 0x3f, 0xb6, 0xec, 0x9e, 0xf3, 0x8b, 0xe5, 0xbf, 0xa4, 0x37, 0xfa, 0xe7, 0x9e, - 0x01, 0x19, 0x61, 0x6f, 0xed, 0x31, 0x75, 0x45, 0x8f, 0x4b, 0xe0, 0x28, 0x69, 0xf5, 0x2f, 0x5c, - 0x8a, 0x47, 0xfe, 0xe6, 0x7f, 0xe1, 0xaa, 0xef, 0x3f, 0xfd, 0x47, 0x31, 0xf6, 0x74, 0x51, 0x54, - 0xbe, 0x5c, 0x14, 0x95, 0xbf, 0x2f, 0x8a, 0xca, 0x17, 0xcf, 0x8a, 0xb1, 0x2f, 0x9f, 0x15, 0x63, - 0x7f, 0x7d, 0x56, 0x8c, 0xfd, 0x94, 0x3f, 0xa5, 0x58, 0x20, 0x7a, 0x97, 0x69, 0xee, 0xc9, 0x0f, - 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x28, 0x7e, 0x19, 0x18, 0xc2, 0x16, 0x00, 0x00, + // 1750 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xcd, 0x8f, 0x23, 0x47, + 0x15, 0x77, 0xfb, 0x6b, 0xa6, 0x9f, 0x3d, 0xde, 0xde, 0x8a, 0xd9, 0xcc, 0xf6, 0x66, 0xed, 0x8e, + 0x81, 0x64, 0x24, 0x16, 0x8f, 0x34, 0x09, 0x52, 0xb4, 0x10, 0x89, 0xf1, 0xac, 0x67, 0x6c, 0x76, + 0x6c, 0x8f, 0xca, 0x9e, 0xf0, 0x71, 0x31, 0x35, 0xe3, 0x72, 0xa7, 0x15, 0xbb, 0xdb, 0x74, 0xb7, + 0x97, 0xb5, 0xc4, 0x85, 0x5b, 0xe4, 0x03, 0x0a, 0x12, 0x5c, 0x90, 0x7c, 0xe2, 0xc8, 0x3d, 0x7f, + 0xc3, 0x22, 0x71, 0xc8, 0x11, 0x71, 0xb0, 0xc0, 0x2b, 0x21, 0xf1, 0x27, 0x10, 0x2e, 0xa8, 0xaa, + 0xba, 0xda, 0xed, 0xd9, 0x61, 0x62, 0xaf, 0xf6, 0x80, 0x36, 0xb7, 0xaa, 0xf7, 0x5e, 0xfd, 0xde, + 0x47, 0xbf, 0x57, 0xef, 0x55, 0x43, 0xde, 0xf3, 0x1d, 0x97, 0x98, 0xb4, 0x7b, 0xe9, 0x0c, 0x87, + 0x8e, 0x5d, 0x1e, 0xb9, 0x8e, 0xef, 0xa0, 0x7b, 0x96, 0xdd, 0x1f, 0x8c, 0x9f, 0xf6, 0x88, 0x4f, + 0xca, 0xa3, 0x01, 0xf1, 0xfb, 0x8e, 0x3b, 0x2c, 0x07, 0x92, 0x7a, 0xde, 0x74, 0x4c, 0x87, 0xcb, + 0xed, 0xb3, 0x95, 0x38, 0xa2, 0xdf, 0x35, 0x1d, 0xc7, 0x1c, 0xd0, 0x7d, 0xbe, 0xbb, 0x18, 0xf7, + 0xf7, 0x89, 0x3d, 0x09, 0x58, 0xb7, 0x46, 0x2e, 0xed, 0x59, 0x97, 0xc4, 0xa7, 0x82, 0x50, 0xfa, + 0x97, 0x02, 0xb7, 0x31, 0x25, 0xbd, 0x63, 0x6b, 0xe0, 0x53, 0x17, 0xd3, 0x5f, 0x8c, 0xa9, 0xe7, + 0xa3, 0x2a, 0x64, 0x5c, 0x4a, 0x7a, 0x5d, 0xcf, 0x19, 0xbb, 0x97, 0x74, 0x57, 0x31, 0x94, 0xbd, + 0xcc, 0x41, 0xbe, 0x2c, 0x70, 0xcb, 0x12, 0xb7, 0x7c, 0x68, 0x4f, 0x2a, 0xb9, 0xc5, 0xbc, 0x08, + 0x0c, 0xa1, 0xcd, 0x65, 0x31, 0xb8, 0xe1, 0x1a, 0x9d, 0x40, 0xca, 0x25, 0xb6, 0x49, 0x77, 0xe3, + 0x1c, 0xe0, 0x3b, 0xe5, 0x1b, 0x7c, 0x29, 0x77, 0xac, 0x21, 0xf5, 0x7c, 0x32, 0x1c, 0x61, 0x76, + 0xa4, 0x92, 0x7c, 0x36, 0x2f, 0xc6, 0xb0, 0x38, 0x8f, 0x1e, 0x81, 0x1a, 0x1a, 0xbe, 0x9b, 0xe0, + 0x60, 0xef, 0xdc, 0x08, 0x76, 0x26, 0xa5, 0xf1, 0xf2, 0x60, 0xe9, 0x2f, 0x29, 0xd0, 0x98, 0xa5, + 0x27, 0xae, 0x33, 0x1e, 0xbd, 0xd6, 0xae, 0xa2, 0x07, 0x00, 0x26, 0xf3, 0xb2, 0xfb, 0x09, 0x9d, + 0x78, 0xbb, 0x49, 0x23, 0xb1, 0xa7, 0x56, 0x76, 0x16, 0xf3, 0xa2, 0xca, 0x7d, 0x7f, 0x4c, 0x27, + 0x1e, 0x56, 0x4d, 0xb9, 0x44, 0x75, 0x48, 0xf1, 0xcd, 0x6e, 0xca, 0x50, 0xf6, 0x72, 0x07, 0xef, + 0xdd, 0xa8, 0xef, 0x6a, 0x04, 0xcb, 0x62, 0x23, 0x10, 0x98, 0xf9, 0xc4, 0x34, 0x5d, 0x6a, 0x32, + 0xf3, 0xd3, 0x6b, 0x98, 0x7f, 0x28, 0xa5, 0xf1, 0xf2, 0x20, 0x7a, 0x00, 0xa9, 0x8f, 0x2d, 0xdb, + 0xf7, 0x76, 0xb7, 0x0c, 0x65, 0x6f, 0xab, 0x72, 0x67, 0x31, 0x2f, 0xa6, 0x6a, 0x8c, 0xf0, 0xe5, + 0xbc, 0xa8, 0xb2, 0xc5, 0xf1, 0x80, 0x98, 0x1e, 0x16, 0x42, 0xa5, 0x13, 0x48, 0x71, 0x1b, 0xd0, + 0x7d, 0x80, 0x13, 0xdc, 0x3a, 0x3f, 0xeb, 0x36, 0x5b, 0xcd, 0xaa, 0x16, 0xd3, 0x77, 0xa6, 0x33, + 0x43, 0x78, 0xdc, 0x74, 0x6c, 0x8a, 0xee, 0xc2, 0xb6, 0x60, 0x57, 0x7e, 0xaa, 0xc5, 0xf5, 0xcc, + 0x74, 0x66, 0x6c, 0x71, 0x66, 0x65, 0xa2, 0x27, 0x3f, 0xfd, 0x63, 0x21, 0x56, 0xfa, 0x93, 0x02, + 0x4b, 0x74, 0x74, 0x0f, 0xd4, 0x5a, 0xbd, 0xd9, 0x91, 0x60, 0xd9, 0xe9, 0xcc, 0xd8, 0x66, 0x5c, + 0x8e, 0xf5, 0x2d, 0xc8, 0x05, 0xcc, 0xee, 0x59, 0xab, 0xde, 0xec, 0xb4, 0x35, 0x45, 0xd7, 0xa6, + 0x33, 0x23, 0x2b, 0x24, 0xce, 0x1c, 0x66, 0x59, 0x54, 0xaa, 0x5d, 0xc5, 0xf5, 0x6a, 0x5b, 0x8b, + 0x47, 0xa5, 0xda, 0xd4, 0xb5, 0xa8, 0x87, 0xf6, 0x21, 0xcf, 0xa5, 0xda, 0x47, 0xb5, 0x6a, 0xe3, + 0xb0, 0x7b, 0x78, 0x7a, 0xda, 0xed, 0xd4, 0x1b, 0x55, 0x2d, 0xa9, 0x7f, 0x63, 0x3a, 0x33, 0x6e, + 0x33, 0xd9, 0xf6, 0xe5, 0xc7, 0x74, 0x48, 0x0e, 0x07, 0x03, 0x96, 0x3a, 0x81, 0xb5, 0xbf, 0x89, + 0x83, 0x1a, 0x46, 0x0f, 0xd5, 0x20, 0xe9, 0x4f, 0x46, 0x22, 0x81, 0x73, 0x07, 0xef, 0xaf, 0x17, + 0xf3, 0xe5, 0xaa, 0x33, 0x19, 0x51, 0xcc, 0x11, 0x4a, 0x9f, 0x2b, 0xb0, 0xb3, 0x42, 0x47, 0x45, + 0x48, 0x06, 0x41, 0xe0, 0x06, 0xad, 0x30, 0x79, 0x34, 0xee, 0x43, 0xa2, 0x7d, 0xde, 0xd0, 0x14, + 0x3d, 0x3f, 0x9d, 0x19, 0xda, 0x0a, 0xbf, 0x3d, 0x1e, 0xa2, 0xb7, 0x21, 0x75, 0xd4, 0x3a, 0x6f, + 0x76, 0xb4, 0xb8, 0x7e, 0x67, 0x3a, 0x33, 0xd0, 0x8a, 0xc0, 0x91, 0x33, 0xb6, 0x7d, 0x86, 0xd0, + 0xa8, 0x37, 0xb5, 0xc4, 0x35, 0x08, 0x0d, 0xcb, 0xe6, 0xec, 0xc3, 0x9f, 0x68, 0xc9, 0xeb, 0xd8, + 0xe4, 0x69, 0x10, 0x90, 0xef, 0x42, 0xa2, 0x43, 0x4c, 0xa4, 0x41, 0xe2, 0x13, 0x3a, 0xe1, 0x81, + 0xc8, 0x62, 0xb6, 0x44, 0x79, 0x48, 0x3d, 0x21, 0x83, 0xb1, 0x28, 0xce, 0x2c, 0x16, 0x9b, 0xd2, + 0x6f, 0x73, 0x90, 0x65, 0xc9, 0x8c, 0xa9, 0x37, 0x72, 0x6c, 0x8f, 0xa2, 0x06, 0xa4, 0xfb, 0x2e, + 0x19, 0x52, 0x6f, 0x57, 0x31, 0x12, 0x7b, 0x99, 0x83, 0xfd, 0xaf, 0xac, 0x03, 0x79, 0xb4, 0x7c, + 0xcc, 0xce, 0x05, 0x85, 0x1c, 0x80, 0xe8, 0x9f, 0xa6, 0x21, 0xc5, 0xe9, 0xe8, 0x54, 0xd6, 0xd7, + 0x16, 0x2f, 0x88, 0xf7, 0xd7, 0xc7, 0xe5, 0xf9, 0xc9, 0x41, 0x6a, 0x31, 0x59, 0x62, 0x2d, 0x48, + 0x7b, 0x3c, 0x71, 0x82, 0xcb, 0xea, 0x7b, 0xeb, 0xc3, 0x89, 0x84, 0x93, 0x78, 0x01, 0x0c, 0x1a, + 0x41, 0xb6, 0x3f, 0x70, 0x88, 0xdf, 0x1d, 0xf1, 0xac, 0x0d, 0xae, 0xb0, 0x87, 0x1b, 0x78, 0xcf, + 0x4e, 0x8b, 0x94, 0x17, 0x81, 0xb8, 0xb5, 0x98, 0x17, 0x33, 0x11, 0x6a, 0x2d, 0x86, 0x33, 0xfd, + 0xe5, 0x16, 0x3d, 0x85, 0x9c, 0x65, 0xfb, 0xd4, 0xa4, 0xae, 0xd4, 0x29, 0x6e, 0xba, 0x1f, 0xac, + 0xaf, 0xb3, 0x2e, 0xce, 0x47, 0xb5, 0xde, 0x5e, 0xcc, 0x8b, 0x3b, 0x2b, 0xf4, 0x5a, 0x0c, 0xef, + 0x58, 0x51, 0x02, 0xfa, 0x15, 0xdc, 0x1a, 0xdb, 0x9e, 0x65, 0xda, 0xb4, 0x27, 0x55, 0x27, 0xb9, + 0xea, 0x0f, 0xd7, 0x57, 0x7d, 0x1e, 0x00, 0x44, 0x75, 0xa3, 0xc5, 0xbc, 0x98, 0x5b, 0x65, 0xd4, + 0x62, 0x38, 0x37, 0x5e, 0xa1, 0x30, 0xbf, 0x2f, 0x1c, 0x67, 0x40, 0x89, 0x2d, 0x95, 0xa7, 0x36, + 0xf5, 0xbb, 0x22, 0xce, 0xbf, 0xe0, 0xf7, 0x0a, 0x9d, 0xf9, 0x7d, 0x11, 0x25, 0x20, 0x1f, 0x76, + 0x3c, 0xdf, 0xb5, 0x6c, 0x53, 0x2a, 0x16, 0x77, 0xf3, 0xf7, 0x37, 0xc8, 0x1d, 0x7e, 0x3c, 0xaa, + 0x57, 0x5b, 0xcc, 0x8b, 0xd9, 0x28, 0xb9, 0x16, 0xc3, 0x59, 0x2f, 0xb2, 0xaf, 0xa4, 0x21, 0xc9, + 0x90, 0xf5, 0xa7, 0x00, 0xcb, 0x4c, 0x46, 0xef, 0xc0, 0xb6, 0x4f, 0x4c, 0xd1, 0x9a, 0x58, 0xa5, + 0x65, 0x2b, 0x99, 0xc5, 0xbc, 0xb8, 0xd5, 0x21, 0x26, 0x6f, 0x4c, 0x5b, 0xbe, 0x58, 0xa0, 0x0a, + 0xa0, 0x11, 0x71, 0x7d, 0xcb, 0xb7, 0x1c, 0x9b, 0x49, 0x77, 0x9f, 0x90, 0x01, 0xcb, 0x4e, 0x76, + 0x22, 0xbf, 0x98, 0x17, 0xb5, 0x33, 0xc9, 0x7d, 0x4c, 0x27, 0x1f, 0x91, 0x81, 0x87, 0xb5, 0xd1, + 0x15, 0x8a, 0xfe, 0x07, 0x05, 0x32, 0x91, 0xac, 0x47, 0x0f, 0x21, 0xe9, 0x13, 0x53, 0x56, 0xb8, + 0x71, 0x73, 0x9b, 0x26, 0x66, 0x50, 0xd2, 0xfc, 0x0c, 0x6a, 0x81, 0xca, 0x04, 0xbb, 0xfc, 0x9e, + 0x8d, 0xf3, 0x7b, 0xf6, 0x60, 0xfd, 0xf8, 0x3d, 0x22, 0x3e, 0xe1, 0xb7, 0xec, 0x76, 0x2f, 0x58, + 0xe9, 0x3f, 0x02, 0xed, 0x6a, 0xe9, 0xa0, 0x02, 0x80, 0x2f, 0xc7, 0x03, 0x61, 0xa6, 0x86, 0x23, + 0x14, 0x74, 0x07, 0xd2, 0xfc, 0xfa, 0x12, 0x81, 0x50, 0x70, 0xb0, 0xd3, 0x4f, 0x01, 0xbd, 0x58, + 0x12, 0x1b, 0xa2, 0x25, 0x42, 0xb4, 0x06, 0xbc, 0x71, 0x4d, 0x96, 0x6f, 0x08, 0x97, 0x8c, 0x1a, + 0xf7, 0x62, 0xde, 0x6e, 0x88, 0xb6, 0x1d, 0xa2, 0x3d, 0x86, 0xdb, 0x2f, 0x24, 0xe3, 0x86, 0x60, + 0xaa, 0x04, 0x2b, 0xb5, 0x41, 0xe5, 0x00, 0x41, 0xa3, 0x4b, 0x07, 0x7d, 0x3a, 0xa6, 0xbf, 0x31, + 0x9d, 0x19, 0xb7, 0x42, 0x56, 0xd0, 0xaa, 0x8b, 0x90, 0x0e, 0xdb, 0xfd, 0xaa, 0x80, 0xb0, 0x25, + 0xe8, 0x44, 0x9f, 0x2b, 0xb0, 0x2d, 0xbf, 0x37, 0x7a, 0x0b, 0x52, 0xc7, 0xa7, 0xad, 0xc3, 0x8e, + 0x16, 0xd3, 0x6f, 0x4f, 0x67, 0xc6, 0x8e, 0x64, 0xf0, 0x4f, 0x8f, 0x0c, 0xd8, 0xaa, 0x37, 0x3b, + 0xd5, 0x93, 0x2a, 0x96, 0x90, 0x92, 0x1f, 0x7c, 0x4e, 0x54, 0x82, 0xed, 0xf3, 0x66, 0xbb, 0x7e, + 0xd2, 0xac, 0x3e, 0xd2, 0xe2, 0xa2, 0x01, 0x4a, 0x11, 0xf9, 0x8d, 0x18, 0x4a, 0xa5, 0xd5, 0x3a, + 0xad, 0x1e, 0xb2, 0x16, 0xba, 0x82, 0x12, 0xc4, 0x1d, 0x15, 0x20, 0xdd, 0xee, 0xe0, 0x7a, 0xf3, + 0x44, 0x4b, 0xea, 0x68, 0x3a, 0x33, 0x72, 0x52, 0x40, 0x84, 0x32, 0x30, 0x7c, 0x0f, 0xe0, 0x88, + 0x8c, 0xc8, 0x85, 0x35, 0xb0, 0xfc, 0x09, 0xd2, 0x61, 0xbb, 0x4f, 0x89, 0x3f, 0x76, 0x83, 0x96, + 0xa8, 0xe2, 0x70, 0x5f, 0xfa, 0xb3, 0x02, 0xf9, 0x50, 0xd4, 0xa2, 0x5e, 0xd8, 0x45, 0x5b, 0x90, + 0xbc, 0x24, 0x23, 0x59, 0x61, 0x37, 0x5f, 0x30, 0xd7, 0x01, 0x30, 0xa2, 0x57, 0xb5, 0x7d, 0x77, + 0x82, 0x39, 0x90, 0xfe, 0x73, 0x50, 0x43, 0x52, 0xb4, 0xb9, 0xab, 0xa2, 0xb9, 0x7f, 0x18, 0x6d, + 0xee, 0x99, 0x83, 0x77, 0xd7, 0x53, 0x38, 0x09, 0xa6, 0x80, 0x87, 0xf1, 0x0f, 0x94, 0xd2, 0x07, + 0x90, 0x5b, 0x1d, 0xc9, 0xd9, 0xc4, 0xe0, 0xf9, 0xc4, 0xf5, 0xb9, 0xa2, 0x04, 0x16, 0x1b, 0xa6, + 0x9c, 0xda, 0x3d, 0xae, 0x28, 0x81, 0xd9, 0xb2, 0xf4, 0x4f, 0x05, 0x72, 0xf2, 0xde, 0x5a, 0x3e, + 0x28, 0xd8, 0x6d, 0xb1, 0xf6, 0x83, 0xa2, 0x43, 0x4c, 0x4f, 0x3e, 0x28, 0xfc, 0x70, 0xfd, 0xff, + 0xf6, 0x76, 0xfa, 0x75, 0x1c, 0xb4, 0x0e, 0x31, 0x3f, 0xe2, 0x45, 0xf3, 0x5a, 0xbb, 0x8a, 0xde, + 0x84, 0xad, 0xa0, 0x3d, 0xf1, 0xd1, 0x40, 0xc5, 0x69, 0xd1, 0x90, 0x4a, 0x65, 0xc8, 0x8b, 0x62, + 0x91, 0x51, 0x08, 0x32, 0x7e, 0x79, 0xb5, 0xf0, 0x6e, 0x16, 0x5e, 0x2d, 0x9f, 0x29, 0xf0, 0x66, + 0x83, 0x12, 0x6f, 0xec, 0xd2, 0x21, 0xb5, 0xfd, 0x26, 0x9b, 0x0a, 0x65, 0xe8, 0x1e, 0x40, 0xfa, + 0xab, 0xa3, 0x86, 0x03, 0x99, 0x57, 0x16, 0xa1, 0xd2, 0x97, 0x0a, 0xdc, 0x8d, 0x98, 0x74, 0x25, + 0x75, 0x37, 0x33, 0xca, 0x80, 0xcc, 0x70, 0x09, 0xc5, 0x4d, 0x53, 0x71, 0x94, 0xb4, 0x34, 0x3b, + 0xf1, 0x2a, 0x3f, 0x6c, 0xf2, 0x65, 0x73, 0xf8, 0xf7, 0x71, 0xb8, 0xb7, 0xea, 0xfc, 0x6a, 0x3a, + 0xbf, 0x6a, 0xf7, 0x23, 0x89, 0x94, 0x88, 0x26, 0xd2, 0x32, 0x2e, 0xc9, 0x57, 0x19, 0x97, 0xd4, + 0xcb, 0xc6, 0xe5, 0xdf, 0x0a, 0xec, 0x46, 0xe2, 0x72, 0x6c, 0xd1, 0x41, 0xef, 0xeb, 0x92, 0x13, + 0xff, 0x49, 0xac, 0x14, 0x84, 0xf4, 0x3d, 0xa8, 0x6c, 0x02, 0xe9, 0x3e, 0xa7, 0x04, 0xdd, 0xec, + 0xe8, 0x46, 0x05, 0xff, 0x13, 0xa7, 0xdc, 0xa0, 0x9e, 0x47, 0x4c, 0xca, 0xa9, 0xe1, 0x2b, 0x91, + 0x8b, 0xe8, 0xbf, 0x53, 0x20, 0x1b, 0x65, 0x5f, 0xd3, 0xe1, 0x3a, 0xc1, 0xd3, 0x5e, 0x8c, 0x9c, + 0x3f, 0x7c, 0x49, 0x1b, 0xf8, 0x76, 0xf9, 0xcc, 0x47, 0x6f, 0x81, 0x1a, 0x8e, 0x47, 0xfc, 0x63, + 0x68, 0x78, 0x49, 0x28, 0x3d, 0x57, 0x40, 0x0d, 0x4f, 0xa0, 0xfb, 0xcb, 0x11, 0x86, 0xcf, 0x0e, + 0x21, 0x47, 0xcc, 0x30, 0x6f, 0x47, 0x67, 0x18, 0x3e, 0xa0, 0x84, 0x02, 0x72, 0x88, 0xf9, 0xe6, + 0xca, 0x10, 0xc3, 0x7f, 0x23, 0x84, 0x32, 0xe1, 0x14, 0x53, 0x0c, 0x67, 0x94, 0x60, 0x88, 0x09, + 0x45, 0xc4, 0xbd, 0xcb, 0x14, 0xc9, 0x31, 0x27, 0x79, 0x45, 0x91, 0x9c, 0x73, 0xbe, 0x0d, 0xea, + 0x79, 0xf3, 0x51, 0xf5, 0xb8, 0xce, 0x34, 0xa5, 0xc4, 0xff, 0x86, 0x88, 0xa6, 0x1e, 0xed, 0x5b, + 0x36, 0xed, 0x05, 0xe3, 0xce, 0xdf, 0xe2, 0xa0, 0xb3, 0x21, 0xfd, 0xc7, 0x96, 0xdd, 0x73, 0x7e, + 0xb9, 0xfc, 0x15, 0xf5, 0x5a, 0xff, 0x1b, 0x34, 0x20, 0x23, 0xfc, 0xad, 0x3e, 0xa1, 0xae, 0xe8, + 0x71, 0x09, 0x1c, 0x25, 0xad, 0xfe, 0xc4, 0x4b, 0xf1, 0xcc, 0xdf, 0xfc, 0x27, 0x5e, 0xe5, 0xdd, + 0x67, 0xff, 0x28, 0xc4, 0x9e, 0x2d, 0x0a, 0xca, 0x17, 0x8b, 0x82, 0xf2, 0xf7, 0x45, 0x41, 0xf9, + 0xec, 0x79, 0x21, 0xf6, 0xc5, 0xf3, 0x42, 0xec, 0xaf, 0xcf, 0x0b, 0xb1, 0x9f, 0xf1, 0xa7, 0x14, + 0x4b, 0x44, 0xef, 0x22, 0xcd, 0x23, 0xf9, 0xde, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x38, 0x44, + 0x05, 0x81, 0x01, 0x17, 0x00, 0x00, } func (m *ReadFilterRequest) Marshal() (dAtA []byte, err error) { diff --git a/storage/reads/datatypes/storage_common.proto b/storage/reads/datatypes/storage_common.proto index 50dd006050f..57ae7bca0ca 100644 --- a/storage/reads/datatypes/storage_common.proto +++ b/storage/reads/datatypes/storage_common.proto @@ -63,6 +63,8 @@ message Aggregate { NONE = 0 [(gogoproto.enumvalue_customname) = "AggregateTypeNone"]; SUM = 1 [(gogoproto.enumvalue_customname) = "AggregateTypeSum"]; COUNT = 2 [(gogoproto.enumvalue_customname) = "AggregateTypeCount"]; + MIN = 3 [(gogoproto.enumvalue_customname) = "AggregateTypeMin"]; + MAX = 4 [(gogoproto.enumvalue_customname) = "AggregateTypeMax"]; } AggregateType type = 1; diff --git a/storage/readservice/store.go b/storage/readservice/store.go index 2f2aa7f55b3..d39ee45a531 100644 --- a/storage/readservice/store.go +++ b/storage/readservice/store.go @@ -153,3 +153,13 @@ func (s *store) GetSource(orgID, bucketID uint64) proto.Message { OrganizationID: orgID, } } + +func (s *store) HasWindowAggregateCapability(ctx context.Context, capability ...*reads.WindowAggregateCapability) bool { + return false +} + +// WindowAggregate will invoke a ReadWindowAggregateRequest against the Store. +func (s *store) WindowAggregate(ctx context.Context, req *datatypes.ReadWindowAggregateRequest) (reads.ResultSet, error) { + // TODO: https://github.com/influxdata/idpe/issues/6805 + return nil, errors.New("WindowAggregate is not implemented") +}