From 158cc669d9690b3573dfaf0eae26679ecf53affd Mon Sep 17 00:00:00 2001 From: pokeeffe-molecula <85502298+pokeeffe-molecula@users.noreply.github.com> Date: Wed, 30 Nov 2022 11:32:37 -0600 Subject: [PATCH] Tighten up ORDER BY (fb 507) (#2318) * tighten up checks for order by expressions fixed ordering by expressions * added testing to cover order by cases * Add DecimalAgg member to proto GroupCount definition In DAX, where we have split the orchestrator from the executor, and the orchestrator can run on a different host, there are cases where `GroupCount`s can travel over the wire via the Internal Client. In these cases, when the group count contains a decimal aggregate, we need to send that value as the appropriate type. * fixed missing cases in order by and case block eval Co-authored-by: Travis Turner --- dax/test/dax/dax_test.go | 1 - dax/test/docker/client.go | 3 + encoding/proto/proto.go | 10 +- pb/private.pb.go | 236 ++++++++--- pb/public.pb.go | 645 ++++++++++++++++++----------- pb/public.proto | 1 + sql3/errors.go | 10 +- sql3/planner/compileselect.go | 14 +- sql3/planner/expression.go | 31 ++ sql3/planner/expressionanalyzer.go | 78 ++++ sql3/planner/oporderby.go | 48 ++- sql3/test/defs/defs_groupby.go | 58 +++ 12 files changed, 825 insertions(+), 310 deletions(-) diff --git a/dax/test/dax/dax_test.go b/dax/test/dax/dax_test.go index aae4a3a67..6a96354d5 100644 --- a/dax/test/dax/dax_test.go +++ b/dax/test/dax/dax_test.go @@ -94,7 +94,6 @@ func TestDAXIntegration(t *testing.T) { skips := []string{ "testinsert/test-5", // error messages differ "percentile_test/test-6", // related to TODO in orchestrator.executePercentile - "groupby_test/test-6", // something to do with GroupCount.DecimalAgg=nil in orchestrator.executeGroupBy "innerjointest/innerjoin-aggregate-groupby", // join test which won't work until we support multiple tables } diff --git a/dax/test/docker/client.go b/dax/test/docker/client.go index 1d2f6a4d7..1c831b75e 100644 --- a/dax/test/docker/client.go +++ b/dax/test/docker/client.go @@ -16,6 +16,9 @@ func init() { if err != nil { panic(err) } + if err := client.FromEnv(cli); err != nil { + panic(err) + } cli.RegistryLogin(context.Background(), types.AuthConfig{}) DefaultClient = cli diff --git a/encoding/proto/proto.go b/encoding/proto/proto.go index 4a049a881..15ddad9be 100644 --- a/encoding/proto/proto.go +++ b/encoding/proto/proto.go @@ -1513,7 +1513,8 @@ func (s Serializer) decodeGroupCounts(a *pb.GroupCounts, b []*pb.GroupCount) *pi Count: gc.Count, // note: not renaming the `pb. structure members now // to avoid breaking protobuf interactions. - Agg: gc.Agg, + Agg: gc.Agg, + DecimalAgg: s.decodeDecimalStruct(gc.DecimalAgg), } } return pilosa.NewGroupCounts(a.Aggregate, other...) @@ -1702,9 +1703,10 @@ func (s Serializer) encodeGroupCounts(counts *pilosa.GroupCounts) *pb.GroupCount } for i, gc := range groups { result.Groups[i] = &pb.GroupCount{ - Group: s.encodeFieldRows(gc.Group), - Count: gc.Count, - Agg: gc.Agg, + Group: s.encodeFieldRows(gc.Group), + Count: gc.Count, + Agg: gc.Agg, + DecimalAgg: s.encodeDecimal(gc.DecimalAgg), } } return result diff --git a/pb/private.pb.go b/pb/private.pb.go index dbf939301..c96e15435 100644 --- a/pb/private.pb.go +++ b/pb/private.pb.go @@ -6792,7 +6792,10 @@ func (m *IndexMeta) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -7261,7 +7264,10 @@ func (m *FieldOptions) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -7344,7 +7350,10 @@ func (m *ImportResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -7529,7 +7538,10 @@ func (m *BlockDataRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -7732,7 +7744,10 @@ func (m *BlockDataResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -7859,7 +7874,10 @@ func (m *Cache) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -8006,7 +8024,7 @@ func (m *MaxShards) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > postIndex { @@ -8023,7 +8041,10 @@ func (m *MaxShards) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -8157,7 +8178,10 @@ func (m *CreateShardMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -8240,7 +8264,10 @@ func (m *DeleteIndexMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -8410,7 +8437,10 @@ func (m *CreateIndexMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -8612,7 +8642,10 @@ func (m *CreateFieldMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -8735,7 +8768,10 @@ func (m *UpdateFieldMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -8850,7 +8886,10 @@ func (m *FieldUpdate) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -8965,7 +9004,10 @@ func (m *DeleteFieldMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -9099,7 +9141,10 @@ func (m *DeleteAvailableShardMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -9269,7 +9314,10 @@ func (m *Field) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -9354,7 +9402,10 @@ func (m *Schema) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -9526,7 +9577,10 @@ func (m *Index) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -9660,7 +9714,10 @@ func (m *URI) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -9867,7 +9924,10 @@ func (m *Node) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -9982,7 +10042,10 @@ func (m *NodeStateMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -10088,7 +10151,10 @@ func (m *NodeEventMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -10245,7 +10311,10 @@ func (m *NodeStatus) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -10381,7 +10450,10 @@ func (m *IndexStatus) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -10559,7 +10631,10 @@ func (m *FieldStatus) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -10744,7 +10819,10 @@ func (m *ClusterStatus) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -10897,7 +10975,10 @@ func (m *BSIGroup) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -11044,7 +11125,10 @@ func (m *CreateViewMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -11191,7 +11275,10 @@ func (m *DeleteViewMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -11473,7 +11560,10 @@ func (m *ResizeInstruction) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -11675,7 +11765,10 @@ func (m *ResizeSource) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -11813,7 +11906,10 @@ func (m *TranslationResizeSource) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -11951,7 +12047,10 @@ func (m *ResizeInstructionComplete) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -12066,7 +12165,10 @@ func (m *Topology) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -12117,7 +12219,10 @@ func (m *RecalculateCaches) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -12168,7 +12273,10 @@ func (m *LoadSchemaMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -12287,7 +12395,10 @@ func (m *TransactionMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -12484,7 +12595,10 @@ func (m *Transaction) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -12535,7 +12649,10 @@ func (m *TransactionStats) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -12586,7 +12703,10 @@ func (m *ResizeAbortMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -12701,7 +12821,10 @@ func (m *ResizeNodeMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -12980,7 +13103,10 @@ func (m *FieldOperation) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -13283,7 +13409,7 @@ func (m *ShardIngestOperation) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > postIndex { @@ -13300,7 +13426,10 @@ func (m *ShardIngestOperation) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -13385,7 +13514,10 @@ func (m *ShardIngestOperations) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -13534,7 +13666,7 @@ func (m *ShardedIngestRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > postIndex { @@ -13551,7 +13683,10 @@ func (m *ShardedIngestRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { @@ -13634,7 +13769,10 @@ func (m *DeleteDataframeMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPrivate } if (iNdEx + skippy) > l { diff --git a/pb/public.pb.go b/pb/public.pb.go index 4a9899376..5993bef3e 100644 --- a/pb/public.pb.go +++ b/pb/public.pb.go @@ -1104,6 +1104,7 @@ type GroupCount struct { Group []*FieldRow `protobuf:"bytes,1,rep,name=Group,proto3" json:"Group,omitempty"` Count uint64 `protobuf:"varint,2,opt,name=Count,proto3" json:"Count,omitempty"` Agg int64 `protobuf:"varint,3,opt,name=Agg,proto3" json:"Agg,omitempty"` + DecimalAgg *Decimal `protobuf:"bytes,4,opt,name=DecimalAgg,proto3" json:"DecimalAgg,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1163,6 +1164,13 @@ func (m *GroupCount) GetAgg() int64 { return 0 } +func (m *GroupCount) GetDecimalAgg() *Decimal { + if m != nil { + return m.DecimalAgg + } + return nil +} + 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"` @@ -2793,118 +2801,118 @@ func init() { func init() { proto.RegisterFile("public.proto", fileDescriptor_413a91106d7bcce8) } var fileDescriptor_413a91106d7bcce8 = []byte{ - // 1771 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xdd, 0x8e, 0x23, 0x47, - 0x15, 0x9e, 0xfe, 0xf1, 0xdf, 0xb1, 0x67, 0x76, 0xa6, 0x76, 0x12, 0x3a, 0xcb, 0xc4, 0x71, 0x5a, - 0x28, 0x38, 0x0c, 0xda, 0x08, 0x83, 0x22, 0x14, 0x09, 0x22, 0x7b, 0x3c, 0xcb, 0x5a, 0x9b, 0x9d, - 0x2c, 0xe5, 0xc5, 0x70, 0x91, 0x9b, 0x1e, 0xbb, 0x70, 0x5a, 0xb4, 0xdd, 0xa6, 0xbb, 0x1d, 0xcf, - 0x3c, 0x00, 0x82, 0x47, 0xe0, 0x8e, 0xa7, 0x41, 0xe1, 0x0e, 0x2e, 0xb9, 0x44, 0xcb, 0x8b, 0xa0, - 0x73, 0xaa, 0xaa, 0xbb, 0xba, 0xed, 0x89, 0xa2, 0x88, 0xbb, 0x3e, 0x3f, 0x75, 0xaa, 0xce, 0x77, - 0x7e, 0x6d, 0xe8, 0x6c, 0xb6, 0xb7, 0x51, 0x38, 0x7f, 0xba, 0x49, 0xe2, 0x2c, 0x66, 0xf6, 0xe6, - 0xd6, 0xbf, 0x07, 0x87, 0xc7, 0x3b, 0xe6, 0x41, 0xe3, 0x2a, 0x8e, 0xb6, 0xab, 0x75, 0xea, 0x59, - 0x3d, 0xa7, 0xef, 0x72, 0x4d, 0x32, 0x06, 0xee, 0x0b, 0x71, 0x9f, 0x7a, 0x4e, 0xcf, 0xe9, 0xb7, - 0x38, 0x7d, 0xa3, 0x36, 0x8f, 0x83, 0x24, 0x5c, 0x2f, 0x3d, 0xb7, 0x67, 0xf5, 0x3b, 0x5c, 0x93, - 0xec, 0x1c, 0x6a, 0x93, 0xf5, 0x42, 0xdc, 0x79, 0xb5, 0x9e, 0xd5, 0x6f, 0x71, 0x49, 0x20, 0xf7, - 0x59, 0x28, 0xa2, 0x85, 0x57, 0x97, 0x5c, 0x22, 0xfc, 0x3e, 0xb4, 0x78, 0xbc, 0x7b, 0x19, 0x64, - 0x49, 0x78, 0xc7, 0xbe, 0x0f, 0x2e, 0x8f, 0x77, 0xf2, 0xf6, 0xf6, 0xa0, 0xf1, 0x74, 0x73, 0xfb, - 0x94, 0xc7, 0x3b, 0x4e, 0x4c, 0x7f, 0x08, 0xad, 0x69, 0xb8, 0x5c, 0x8b, 0x05, 0x3e, 0xf5, 0x1d, - 0x70, 0x5e, 0xc5, 0xa8, 0x68, 0x99, 0x8a, 0xc8, 0x43, 0xd1, 0x8d, 0x58, 0x7a, 0x76, 0x45, 0x74, - 0x23, 0x96, 0xfe, 0xcf, 0xe1, 0x84, 0xc7, 0xbb, 0xc9, 0x42, 0xac, 0xb3, 0xf0, 0xf7, 0xa1, 0x48, - 0xc8, 0xb1, 0xfc, 0x46, 0x57, 0x5e, 0x94, 0x3b, 0x6b, 0x17, 0xce, 0xfa, 0x4f, 0xa0, 0x3e, 0x19, - 0x7f, 0x16, 0xa6, 0x19, 0x3b, 0x05, 0x67, 0x32, 0xd6, 0x07, 0xf0, 0xd3, 0xbf, 0x82, 0xb3, 0xeb, - 0xbb, 0x2c, 0x09, 0xe6, 0x99, 0x58, 0x4c, 0xc6, 0x12, 0x32, 0x76, 0x02, 0xf6, 0x64, 0x4c, 0xef, - 0x73, 0xb9, 0x3d, 0x19, 0xb3, 0x2e, 0xb8, 0xb3, 0x20, 0x92, 0x46, 0xdb, 0x03, 0xc0, 0x67, 0x49, - 0x83, 0x9c, 0xf8, 0xfe, 0x17, 0x25, 0x23, 0x0a, 0x8f, 0xb7, 0xa1, 0x4e, 0x28, 0xc9, 0xeb, 0x5a, - 0x5c, 0x51, 0xec, 0xa3, 0x22, 0x50, 0xd2, 0xde, 0x5b, 0x68, 0x6f, 0xef, 0x11, 0x79, 0xfc, 0xfc, - 0x77, 0xa1, 0xf1, 0x42, 0xdc, 0xd3, 0xfb, 0xb5, 0x77, 0x96, 0xe1, 0xdd, 0x3f, 0x2d, 0x78, 0x9c, - 0x9f, 0x7e, 0x1d, 0xdc, 0x46, 0x62, 0x16, 0x44, 0x5b, 0xc1, 0xba, 0xda, 0x57, 0xab, 0xfc, 0xe6, - 0xe7, 0x47, 0xe4, 0x39, 0x7b, 0x3f, 0x47, 0x0a, 0x15, 0xda, 0xa8, 0xa0, 0xae, 0x79, 0x7e, 0xa4, - 0xb2, 0xe4, 0x02, 0x9a, 0xa3, 0xe9, 0x84, 0xcc, 0x79, 0x4e, 0xcf, 0xea, 0x3b, 0xcf, 0x8f, 0x78, - 0xce, 0x61, 0x4f, 0xa0, 0xf1, 0x72, 0x9b, 0x89, 0xbb, 0xc9, 0x98, 0x72, 0xc8, 0x7d, 0x7e, 0xc4, - 0x35, 0x03, 0x4f, 0xd2, 0xe7, 0x0b, 0x71, 0x2f, 0x13, 0x09, 0x4f, 0x6a, 0x0e, 0x3b, 0x07, 0x77, - 0x14, 0xc7, 0x11, 0x25, 0x53, 0x13, 0x6f, 0x43, 0x6a, 0xd4, 0x80, 0x1a, 0x19, 0xf6, 0xef, 0xe0, - 0xbc, 0xec, 0x90, 0x0a, 0x0b, 0x03, 0x07, 0xed, 0x59, 0xca, 0x1e, 0x12, 0xec, 0x94, 0x42, 0x65, - 0xab, 0xfb, 0x31, 0x58, 0x1f, 0x41, 0x9d, 0xcc, 0xc8, 0x84, 0x6f, 0x0f, 0xbe, 0x57, 0x82, 0xb7, - 0x00, 0x88, 0x2b, 0xb5, 0x51, 0x8b, 0xf0, 0xfd, 0x3c, 0x99, 0x8c, 0xfd, 0x5f, 0x54, 0xa1, 0xa4, - 0x98, 0x21, 0xec, 0x37, 0xc1, 0x4a, 0xc8, 0x9b, 0x39, 0x7d, 0x23, 0xef, 0xf5, 0xfd, 0x46, 0xd0, - 0xd5, 0x2d, 0x4e, 0xdf, 0xfe, 0x16, 0x4e, 0xca, 0xc7, 0xf1, 0x31, 0x46, 0x12, 0x1c, 0x7c, 0x0c, - 0xc9, 0xf3, 0xec, 0x18, 0x54, 0xb3, 0xc3, 0xdb, 0x3f, 0x51, 0x4d, 0x90, 0x5f, 0x82, 0xfb, 0x2a, - 0x08, 0x93, 0xbd, 0xb4, 0x3d, 0x95, 0x78, 0x39, 0xf4, 0x42, 0x47, 0x02, 0x5f, 0xbb, 0x8a, 0xb7, - 0xeb, 0x4c, 0x02, 0xc6, 0x25, 0xe1, 0x7f, 0x0a, 0x2d, 0x3c, 0x2f, 0x7d, 0xbd, 0x90, 0xc6, 0x54, - 0xde, 0x34, 0xf1, 0x76, 0xa4, 0xb9, 0xbc, 0x22, 0xef, 0x03, 0xb6, 0xd9, 0x07, 0x46, 0x00, 0x28, - 0x4d, 0xa5, 0x85, 0x2e, 0xd4, 0x88, 0x52, 0x2e, 0x17, 0x26, 0x24, 0xfb, 0x01, 0x1b, 0xef, 0x62, - 0xdf, 0xc9, 0x3e, 0xfe, 0x19, 0x8a, 0x65, 0xc6, 0xe1, 0x0b, 0x1c, 0xae, 0x72, 0x22, 0x86, 0xa6, - 0x04, 0x2a, 0xde, 0x15, 0x06, 0x2c, 0xc3, 0x00, 0x72, 0xb1, 0x3f, 0x8c, 0xb5, 0x6f, 0x44, 0x60, - 0x15, 0xf2, 0x78, 0x57, 0xc0, 0xa0, 0x28, 0xf6, 0x9e, 0xbe, 0xc5, 0x25, 0x3f, 0x5b, 0x54, 0x1f, - 0x78, 0xbf, 0xbe, 0xf0, 0x77, 0x00, 0xbf, 0x4a, 0xe2, 0xed, 0x86, 0x20, 0x62, 0x3e, 0xd4, 0x88, - 0x52, 0x3e, 0x75, 0x50, 0x5d, 0xbf, 0x87, 0x4b, 0xd1, 0x61, 0x70, 0x31, 0x08, 0xc3, 0xe5, 0x52, - 0x96, 0x0f, 0xc7, 0x4f, 0xff, 0x6f, 0x16, 0x34, 0x67, 0x41, 0x94, 0x8b, 0x67, 0x41, 0xa4, 0x7c, - 0xc5, 0xcf, 0xb2, 0x19, 0x47, 0x9b, 0x79, 0x02, 0xcd, 0x67, 0x51, 0x1c, 0x64, 0xa8, 0x8c, 0xb6, - 0x2c, 0x9e, 0xd3, 0xec, 0x12, 0x60, 0x2c, 0xe6, 0xe1, 0x2a, 0x88, 0x50, 0xea, 0x16, 0xf5, 0xac, - 0xb8, 0xdc, 0x10, 0x33, 0x1f, 0x3a, 0xaf, 0xc3, 0x95, 0x48, 0xb3, 0x60, 0xb5, 0x41, 0x75, 0xd9, - 0xe6, 0x4b, 0x3c, 0xff, 0x4f, 0x16, 0x34, 0xd4, 0x91, 0xc3, 0xe1, 0x40, 0xee, 0x74, 0x1e, 0x44, - 0x42, 0x3f, 0x92, 0x08, 0xd6, 0x05, 0xb8, 0x11, 0xbb, 0x99, 0x48, 0xd2, 0x30, 0x5e, 0xd3, 0x33, - 0x9b, 0xdc, 0xe0, 0x60, 0x30, 0x66, 0x41, 0x34, 0xbc, 0x4d, 0xd5, 0xd0, 0x51, 0x94, 0xe2, 0x63, - 0xe3, 0xaf, 0xd1, 0x19, 0x45, 0xf9, 0x9f, 0xc2, 0xd9, 0x38, 0x4c, 0xb3, 0x70, 0x3d, 0xcf, 0xf2, - 0xf7, 0x29, 0x65, 0xac, 0x6f, 0xd5, 0x57, 0x25, 0x95, 0x17, 0xa9, 0x5d, 0x14, 0xa9, 0xff, 0x77, - 0x0b, 0x3a, 0xbf, 0xde, 0x8a, 0xe4, 0x9e, 0x8b, 0x3f, 0x6e, 0x45, 0x9a, 0xe1, 0xbb, 0x89, 0xd6, - 0xa9, 0x43, 0x04, 0x9a, 0x9c, 0x7e, 0x19, 0x24, 0x0b, 0x59, 0x73, 0x2e, 0x57, 0x14, 0x25, 0x8f, - 0x58, 0xc5, 0x99, 0xd0, 0xef, 0x92, 0x14, 0xbb, 0x84, 0xce, 0xf5, 0xea, 0x56, 0x2c, 0x16, 0x62, - 0x31, 0x0e, 0xb2, 0xc0, 0x6b, 0x96, 0x47, 0x5e, 0x49, 0xc8, 0x7e, 0x00, 0xc7, 0xaf, 0x12, 0xf1, - 0x3a, 0x09, 0xd6, 0x69, 0x14, 0x64, 0x62, 0xe1, 0xb5, 0xc8, 0x56, 0x99, 0xc9, 0x2e, 0xa0, 0xf5, - 0x32, 0xb8, 0x7b, 0x29, 0x56, 0x71, 0x72, 0xef, 0x01, 0x81, 0x5a, 0x30, 0xfc, 0xcf, 0xe0, 0x58, - 0xb9, 0x91, 0x6e, 0xe2, 0x75, 0x2a, 0x30, 0x6d, 0xae, 0x93, 0x44, 0x79, 0x81, 0x9f, 0xec, 0x43, - 0x68, 0x70, 0x91, 0x6e, 0xa3, 0x4c, 0x37, 0x8e, 0x47, 0xf8, 0x1c, 0x7d, 0x6a, 0x1b, 0x65, 0x5c, - 0xcb, 0xfd, 0xaf, 0xeb, 0xd0, 0x36, 0x04, 0x79, 0x2b, 0xc3, 0x76, 0x7c, 0x2c, 0x5b, 0x19, 0x0e, - 0x62, 0x1e, 0xef, 0xf6, 0x66, 0x34, 0x96, 0x5f, 0x07, 0xac, 0x1b, 0x95, 0xe3, 0xd6, 0x4d, 0x51, - 0xed, 0xce, 0xe1, 0x6a, 0xc7, 0xbd, 0xe4, 0xcb, 0x60, 0xbd, 0x14, 0x0b, 0x0a, 0x7a, 0x93, 0x6b, - 0x92, 0xf5, 0x8b, 0x32, 0x20, 0x7c, 0x55, 0x59, 0x69, 0x1e, 0x2f, 0x8a, 0x44, 0x16, 0x31, 0x4e, - 0xb3, 0x86, 0x8c, 0x8f, 0xa4, 0xd8, 0xc7, 0x70, 0xf2, 0x79, 0xb4, 0x28, 0xca, 0x34, 0x55, 0x91, - 0x38, 0x41, 0x3b, 0x05, 0x9b, 0x57, 0xb4, 0xd8, 0x27, 0xd5, 0x55, 0x82, 0x62, 0xd2, 0x1e, 0x30, - 0xe5, 0xa7, 0x21, 0xe1, 0xd5, 0xa5, 0xe3, 0xd2, 0xd8, 0x64, 0x28, 0x50, 0xed, 0xc1, 0x31, 0x1e, - 0xcb, 0x99, 0xdc, 0xd8, 0x74, 0x9e, 0x9a, 0x8d, 0xd1, 0x6b, 0x93, 0xf6, 0x89, 0x46, 0x48, 0x72, - 0xb9, 0xd9, 0x3a, 0x2f, 0x8d, 0x4e, 0xec, 0x75, 0x0a, 0xe3, 0x39, 0x93, 0x1b, 0x9d, 0xfa, 0xea, - 0xc0, 0xd6, 0xe1, 0x1d, 0xd3, 0xa1, 0xea, 0x4a, 0x21, 0x85, 0xfc, 0xc0, 0x96, 0xf2, 0x49, 0x75, - 0x64, 0x79, 0x27, 0x05, 0x14, 0x65, 0x09, 0xaf, 0x0e, 0xb7, 0x4b, 0x63, 0xfd, 0xf3, 0x1e, 0x15, - 0xaf, 0xcd, 0x99, 0xdc, 0x58, 0x0f, 0x7f, 0x02, 0x6d, 0x33, 0x50, 0xa7, 0xa4, 0xfe, 0xa8, 0x1c, - 0xa8, 0x94, 0x9b, 0x3a, 0xe8, 0xe0, 0x5e, 0xf9, 0x7b, 0x67, 0x85, 0x83, 0x7b, 0x42, 0x7e, 0xa0, - 0x5d, 0x5c, 0x42, 0x0b, 0xcb, 0xf0, 0x59, 0x82, 0xbd, 0x81, 0x15, 0x8f, 0xcc, 0x99, 0xbc, 0x90, - 0x63, 0xbc, 0x86, 0x49, 0x12, 0xef, 0x24, 0x12, 0x8f, 0x8b, 0x78, 0x15, 0x5c, 0x6e, 0x68, 0xf8, - 0x5f, 0xdb, 0x70, 0x3c, 0x59, 0x6d, 0xe2, 0x24, 0x33, 0x1a, 0x8c, 0x5c, 0x9f, 0xad, 0x83, 0xeb, - 0xb3, 0x5d, 0x99, 0x58, 0xd4, 0x68, 0xa8, 0x53, 0xba, 0x5c, 0x12, 0x46, 0xb2, 0xbb, 0xa5, 0x64, - 0xbf, 0x80, 0x96, 0x1c, 0xf8, 0x28, 0xaa, 0x91, 0xa8, 0x60, 0xc8, 0x85, 0x7e, 0x47, 0x0b, 0x5d, - 0x83, 0xda, 0xa2, 0x26, 0xb1, 0x29, 0x4b, 0x35, 0x12, 0x36, 0x49, 0x68, 0x70, 0x50, 0x9e, 0xa3, - 0x95, 0x7a, 0xf5, 0x9e, 0xd3, 0x77, 0xb8, 0xc1, 0x61, 0x1f, 0xc0, 0x09, 0x39, 0x71, 0x95, 0x08, - 0xec, 0x54, 0xc3, 0x8c, 0x8a, 0xc5, 0xe1, 0x15, 0x2e, 0xea, 0x91, 0x5b, 0x85, 0x9e, 0x6c, 0x63, - 0x15, 0x2e, 0xcd, 0xb7, 0x48, 0x04, 0x09, 0x95, 0x43, 0x93, 0x4b, 0xc2, 0xff, 0xb7, 0x0d, 0x4c, - 0x22, 0x29, 0x97, 0xb3, 0xff, 0x1b, 0x9c, 0xdf, 0x0c, 0x5b, 0x19, 0x9c, 0xc6, 0x1e, 0x38, 0xc5, - 0xb0, 0x91, 0xc0, 0xe8, 0x61, 0xd3, 0x83, 0xb6, 0x1e, 0xbf, 0x28, 0x44, 0x54, 0x2d, 0x6e, 0xb2, - 0x70, 0xce, 0x4e, 0x33, 0xfc, 0x45, 0xa5, 0x54, 0x5a, 0x64, 0xbb, 0xc4, 0x3b, 0x00, 0x2d, 0x7c, - 0x4b, 0x68, 0xdb, 0xdf, 0x0c, 0x6d, 0xc7, 0x84, 0xf6, 0xcf, 0x16, 0x74, 0x86, 0x59, 0xbc, 0x0a, - 0xe7, 0x5c, 0xcc, 0xe3, 0x64, 0xf1, 0x30, 0xa8, 0x12, 0x3e, 0xdb, 0x84, 0xaf, 0x0f, 0xce, 0xe4, - 0xab, 0x44, 0x35, 0xf7, 0xb7, 0x69, 0x4b, 0xda, 0x8b, 0x12, 0x47, 0x15, 0xf6, 0x3e, 0xd8, 0x93, - 0x84, 0x72, 0xb6, 0x3d, 0x38, 0x2b, 0x14, 0xb5, 0x8e, 0x3d, 0x49, 0xfc, 0x1f, 0xc3, 0xb9, 0x7c, - 0x88, 0x16, 0xa9, 0x69, 0x76, 0x0e, 0xb5, 0xeb, 0x24, 0x89, 0xf5, 0x3c, 0x93, 0x04, 0xfe, 0x0c, - 0xc8, 0x07, 0x24, 0x06, 0xe3, 0xbb, 0xe4, 0xc4, 0xa1, 0xdf, 0xbe, 0x3d, 0x68, 0xdf, 0xc4, 0xd9, - 0x6f, 0x93, 0x30, 0xa3, 0x2a, 0x97, 0x53, 0xc9, 0x64, 0xf9, 0x1f, 0xc2, 0x5b, 0x95, 0x9b, 0x8b, - 0xb1, 0x8b, 0x69, 0xe4, 0x14, 0xbf, 0x1f, 0xa7, 0xf0, 0x38, 0x57, 0x9d, 0x8c, 0xbf, 0xd3, 0x1b, - 0xf7, 0x8d, 0xfe, 0xc8, 0xf0, 0x9c, 0x8c, 0xaa, 0xeb, 0x0f, 0x78, 0xe3, 0x8f, 0xc0, 0x53, 0x68, - 0xca, 0x1f, 0xf0, 0xea, 0x05, 0xb3, 0x50, 0xec, 0x1e, 0xfa, 0xdd, 0x42, 0x3b, 0x8b, 0x4d, 0x1b, - 0x18, 0x7d, 0xfb, 0x7f, 0xb1, 0xe1, 0xfc, 0x90, 0x91, 0x22, 0xa1, 0x2c, 0x23, 0xa1, 0xd8, 0x00, - 0x6a, 0x5f, 0x85, 0x62, 0xa7, 0x17, 0x8d, 0x0b, 0x23, 0xd8, 0x7b, 0x6f, 0xe0, 0x52, 0x15, 0x0b, - 0x69, 0x38, 0xcf, 0xf4, 0x5a, 0xd8, 0xe2, 0x8a, 0xc2, 0x1b, 0x46, 0x51, 0x3c, 0xff, 0x83, 0xfc, - 0x09, 0xc9, 0x25, 0x71, 0xa0, 0x30, 0x6a, 0xdf, 0xb2, 0x30, 0xea, 0x07, 0x0b, 0xa3, 0x0f, 0x8f, - 0x7e, 0xb3, 0x59, 0x04, 0x99, 0xb8, 0xbe, 0x0b, 0xd3, 0x4c, 0xac, 0xe7, 0xc2, 0x6b, 0x90, 0x47, - 0x55, 0x36, 0xae, 0xbe, 0xc7, 0xca, 0x0b, 0x29, 0x7a, 0xe0, 0xd7, 0x06, 0x03, 0x17, 0xdd, 0xd3, - 0xdb, 0x26, 0xc1, 0x9d, 0xa3, 0xe5, 0x10, 0xb6, 0x0a, 0xad, 0x53, 0x70, 0xa6, 0x22, 0x53, 0x1b, - 0x2f, 0x7e, 0x62, 0x6b, 0x20, 0x91, 0x2c, 0xc7, 0x54, 0x2d, 0x97, 0x25, 0x9e, 0xff, 0x05, 0xbc, - 0x53, 0x82, 0x94, 0xaa, 0x51, 0x87, 0xa5, 0xd8, 0x4b, 0xad, 0xd2, 0x5e, 0xfa, 0x43, 0xa8, 0xcd, - 0x8c, 0xc0, 0x9c, 0xc9, 0x61, 0x6c, 0x38, 0xc3, 0xa5, 0xdc, 0x9f, 0x96, 0x86, 0x31, 0xf6, 0xc8, - 0xe1, 0x72, 0x99, 0x88, 0x65, 0x90, 0xe9, 0x64, 0x29, 0x18, 0xec, 0x03, 0xa8, 0x93, 0xb2, 0x36, - 0x5b, 0xdd, 0xae, 0x94, 0xd4, 0x7f, 0xcf, 0x98, 0xb4, 0x79, 0x9a, 0x59, 0x46, 0x9a, 0xf5, 0xcc, - 0xe9, 0x7a, 0x48, 0x63, 0x74, 0xfa, 0x8f, 0x37, 0x5d, 0xeb, 0x5f, 0x6f, 0xba, 0xd6, 0x7f, 0xde, - 0x74, 0xad, 0xbf, 0xfe, 0xb7, 0x7b, 0x74, 0x5b, 0xa7, 0x3f, 0xba, 0x7e, 0xfa, 0xbf, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x30, 0x62, 0xf1, 0x1a, 0xf8, 0x12, 0x00, 0x00, + // 1774 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x18, 0xdb, 0x8e, 0x23, 0x47, + 0x75, 0xfa, 0xe2, 0xdb, 0xb1, 0x67, 0x76, 0xa6, 0x76, 0x12, 0x3a, 0xcb, 0xc4, 0x71, 0x5a, 0x28, + 0x38, 0x0c, 0xda, 0x08, 0x83, 0x22, 0x14, 0x09, 0x22, 0x7b, 0x3c, 0xcb, 0x5a, 0x9b, 0x9d, 0x2c, + 0xe5, 0xc5, 0xbc, 0xe4, 0xa5, 0xc7, 0x2e, 0x9c, 0x16, 0x6d, 0xb7, 0xe9, 0x6e, 0xc7, 0x33, 0x1f, + 0x80, 0xe0, 0x13, 0x78, 0xe3, 0x6b, 0x50, 0x78, 0x83, 0x47, 0x1e, 0xd1, 0xf2, 0x23, 0xe8, 0x9c, + 0xaa, 0xea, 0xae, 0x6e, 0x7b, 0x57, 0xd1, 0x2a, 0x6f, 0x7d, 0x2e, 0x75, 0xee, 0x37, 0x1b, 0x3a, + 0x9b, 0xed, 0x6d, 0x14, 0xce, 0x1f, 0x6f, 0x92, 0x38, 0x8b, 0x99, 0xbd, 0xb9, 0xf5, 0xef, 0xc1, + 0xe1, 0xf1, 0x8e, 0x79, 0xd0, 0xb8, 0x8a, 0xa3, 0xed, 0x6a, 0x9d, 0x7a, 0x56, 0xcf, 0xe9, 0xbb, + 0x5c, 0x83, 0x8c, 0x81, 0xfb, 0x4c, 0xdc, 0xa7, 0x9e, 0xd3, 0x73, 0xfa, 0x2d, 0x4e, 0xdf, 0xc8, + 0xcd, 0xe3, 0x20, 0x09, 0xd7, 0x4b, 0xcf, 0xed, 0x59, 0xfd, 0x0e, 0xd7, 0x20, 0x3b, 0x87, 0xda, + 0x64, 0xbd, 0x10, 0x77, 0x5e, 0xad, 0x67, 0xf5, 0x5b, 0x5c, 0x02, 0x88, 0x7d, 0x12, 0x8a, 0x68, + 0xe1, 0xd5, 0x25, 0x96, 0x00, 0xbf, 0x0f, 0x2d, 0x1e, 0xef, 0x9e, 0x07, 0x59, 0x12, 0xde, 0xb1, + 0x1f, 0x82, 0xcb, 0xe3, 0x9d, 0xd4, 0xde, 0x1e, 0x34, 0x1e, 0x6f, 0x6e, 0x1f, 0xf3, 0x78, 0xc7, + 0x09, 0xe9, 0x0f, 0xa1, 0x35, 0x0d, 0x97, 0x6b, 0xb1, 0x40, 0x53, 0xdf, 0x03, 0xe7, 0x45, 0x8c, + 0x8c, 0x96, 0xc9, 0x88, 0x38, 0x24, 0xdd, 0x88, 0xa5, 0x67, 0x57, 0x48, 0x37, 0x62, 0xe9, 0xff, + 0x12, 0x4e, 0x78, 0xbc, 0x9b, 0x2c, 0xc4, 0x3a, 0x0b, 0xff, 0x10, 0x8a, 0x84, 0x1c, 0xcb, 0x35, + 0xba, 0x52, 0x51, 0xee, 0xac, 0x5d, 0x38, 0xeb, 0x3f, 0x82, 0xfa, 0x64, 0xfc, 0x45, 0x98, 0x66, + 0xec, 0x14, 0x9c, 0xc9, 0x58, 0x3f, 0xc0, 0x4f, 0xff, 0x0a, 0xce, 0xae, 0xef, 0xb2, 0x24, 0x98, + 0x67, 0x62, 0x31, 0x19, 0xcb, 0x90, 0xb1, 0x13, 0xb0, 0x27, 0x63, 0xb2, 0xcf, 0xe5, 0xf6, 0x64, + 0xcc, 0xba, 0xe0, 0xce, 0x82, 0x48, 0x0a, 0x6d, 0x0f, 0x00, 0xcd, 0x92, 0x02, 0x39, 0xe1, 0xfd, + 0xaf, 0x4a, 0x42, 0x54, 0x3c, 0xde, 0x85, 0x3a, 0x45, 0x49, 0xaa, 0x6b, 0x71, 0x05, 0xb1, 0x4f, + 0x8a, 0x44, 0x49, 0x79, 0xef, 0xa0, 0xbc, 0x3d, 0x23, 0xf2, 0xfc, 0xf9, 0xef, 0x43, 0xe3, 0x99, + 0xb8, 0x27, 0xfb, 0xb5, 0x77, 0x96, 0xe1, 0xdd, 0xbf, 0x2c, 0x78, 0x98, 0xbf, 0x7e, 0x19, 0xdc, + 0x46, 0x62, 0x16, 0x44, 0x5b, 0xc1, 0xba, 0xda, 0x57, 0xab, 0x6c, 0xf3, 0xd3, 0x23, 0xf2, 0x9c, + 0x7d, 0x98, 0x47, 0x0a, 0x19, 0xda, 0xc8, 0xa0, 0xd4, 0x3c, 0x3d, 0x52, 0x55, 0x72, 0x01, 0xcd, + 0xd1, 0x74, 0x42, 0xe2, 0x3c, 0xa7, 0x67, 0xf5, 0x9d, 0xa7, 0x47, 0x3c, 0xc7, 0xb0, 0x47, 0xd0, + 0x78, 0xbe, 0xcd, 0xc4, 0xdd, 0x64, 0x4c, 0x35, 0xe4, 0x3e, 0x3d, 0xe2, 0x1a, 0x81, 0x2f, 0xe9, + 0xf3, 0x99, 0xb8, 0x97, 0x85, 0x84, 0x2f, 0x35, 0x86, 0x9d, 0x83, 0x3b, 0x8a, 0xe3, 0x88, 0x8a, + 0xa9, 0x89, 0xda, 0x10, 0x1a, 0x35, 0xa0, 0x46, 0x82, 0xfd, 0x3b, 0x38, 0x2f, 0x3b, 0xa4, 0xd2, + 0xc2, 0xc0, 0x41, 0x79, 0x96, 0x92, 0x87, 0x00, 0x3b, 0xa5, 0x54, 0xd9, 0x4a, 0x3f, 0x26, 0xeb, + 0x13, 0xa8, 0x93, 0x18, 0x59, 0xf0, 0xed, 0xc1, 0x0f, 0x4a, 0xe1, 0x2d, 0x02, 0xc4, 0x15, 0xdb, + 0xa8, 0x45, 0xf1, 0xfd, 0x32, 0x99, 0x8c, 0xfd, 0x5f, 0x55, 0x43, 0x49, 0x39, 0xc3, 0xb0, 0xdf, + 0x04, 0x2b, 0x21, 0x35, 0x73, 0xfa, 0x46, 0xdc, 0xcb, 0xfb, 0x8d, 0x20, 0xd5, 0x2d, 0x4e, 0xdf, + 0xfe, 0x16, 0x4e, 0xca, 0xcf, 0xd1, 0x18, 0xa3, 0x08, 0x0e, 0x1a, 0x43, 0xf4, 0xbc, 0x3a, 0x06, + 0xd5, 0xea, 0xf0, 0xf6, 0x5f, 0x54, 0x0b, 0xe4, 0xd7, 0xe0, 0xbe, 0x08, 0xc2, 0x64, 0xaf, 0x6c, + 0x4f, 0x65, 0xbc, 0x1c, 0xb2, 0xd0, 0x91, 0x81, 0xaf, 0x5d, 0xc5, 0xdb, 0x75, 0x26, 0x03, 0xc6, + 0x25, 0xe0, 0x7f, 0x0e, 0x2d, 0x7c, 0x2f, 0x7d, 0xbd, 0x90, 0xc2, 0x54, 0xdd, 0x34, 0x51, 0x3b, + 0xc2, 0x5c, 0xaa, 0xc8, 0xe7, 0x80, 0x6d, 0xce, 0x81, 0x11, 0x00, 0x52, 0x53, 0x29, 0xa1, 0x0b, + 0x35, 0x82, 0x94, 0xcb, 0x85, 0x08, 0x89, 0x7e, 0x8d, 0x8c, 0xf7, 0x71, 0xee, 0x64, 0x9f, 0xfe, + 0x02, 0xc9, 0xb2, 0xe2, 0xd0, 0x02, 0x87, 0xab, 0x9a, 0x88, 0xa1, 0x29, 0x03, 0x15, 0xef, 0x0a, + 0x01, 0x96, 0x21, 0x00, 0xb1, 0x38, 0x1f, 0xc6, 0xda, 0x37, 0x02, 0xb0, 0x0b, 0x79, 0xbc, 0x2b, + 0xc2, 0xa0, 0x20, 0xf6, 0x81, 0xd6, 0xe2, 0x92, 0x9f, 0x2d, 0xea, 0x0f, 0xd4, 0xaf, 0x15, 0xfe, + 0xd9, 0x02, 0xf8, 0x4d, 0x12, 0x6f, 0x37, 0x14, 0x23, 0xe6, 0x43, 0x8d, 0x20, 0xe5, 0x54, 0x07, + 0xf9, 0xb5, 0x41, 0x5c, 0x92, 0x0e, 0x47, 0x17, 0xb3, 0x30, 0x5c, 0x2e, 0x65, 0xff, 0x70, 0xfc, + 0x64, 0x97, 0x00, 0x63, 0x31, 0x0f, 0x57, 0x41, 0x84, 0x04, 0xb7, 0xe8, 0x3f, 0x85, 0xe5, 0x06, + 0xd9, 0xff, 0xbb, 0x05, 0xcd, 0x59, 0x10, 0xe5, 0xb2, 0x66, 0x41, 0xa4, 0x22, 0x83, 0x9f, 0x65, + 0x9d, 0x8e, 0xd6, 0xf9, 0x08, 0x9a, 0x4f, 0xa2, 0x38, 0xc8, 0x90, 0x19, 0x15, 0x5b, 0x3c, 0x87, + 0x0d, 0xed, 0x48, 0x7d, 0x83, 0x76, 0x64, 0xf6, 0xa1, 0xf3, 0x32, 0x5c, 0x89, 0x34, 0x0b, 0x56, + 0x1b, 0x64, 0x97, 0x4b, 0xa1, 0x84, 0xc3, 0x48, 0x35, 0xd4, 0x93, 0xc3, 0xc9, 0x43, 0xec, 0x74, + 0x1e, 0x44, 0x42, 0x1b, 0x49, 0x00, 0xeb, 0x02, 0xdc, 0x88, 0xdd, 0x4c, 0x24, 0x69, 0x18, 0xaf, + 0xc9, 0xcc, 0x26, 0x37, 0x30, 0x98, 0xba, 0x59, 0x10, 0x0d, 0x6f, 0x53, 0xb5, 0xa2, 0x14, 0xa4, + 0xf0, 0xb8, 0x26, 0x6a, 0xf4, 0x46, 0x41, 0xfe, 0xe7, 0x70, 0x36, 0x0e, 0xd3, 0x2c, 0x5c, 0xcf, + 0xb3, 0xdc, 0x3e, 0xc5, 0x8c, 0xd3, 0x40, 0x4d, 0x61, 0x09, 0xe5, 0x2d, 0x6d, 0x17, 0x2d, 0xed, + 0xff, 0xc3, 0x82, 0xce, 0x6f, 0xb7, 0x22, 0xb9, 0xe7, 0xe2, 0x4f, 0x5b, 0x91, 0x66, 0x68, 0x37, + 0xc1, 0xba, 0xd0, 0x08, 0x40, 0x91, 0xd3, 0xaf, 0x83, 0x64, 0x21, 0x3b, 0xd4, 0xe5, 0x0a, 0xa2, + 0x52, 0x13, 0xab, 0x38, 0x13, 0xda, 0x2e, 0x09, 0xb1, 0x4b, 0xe8, 0x5c, 0xaf, 0x6e, 0xc5, 0x62, + 0x21, 0x16, 0xe3, 0x20, 0x0b, 0xbc, 0x66, 0x79, 0x41, 0x96, 0x88, 0xec, 0x47, 0x70, 0xfc, 0x22, + 0x11, 0x2f, 0x93, 0x60, 0x9d, 0x46, 0x41, 0x26, 0x16, 0x5e, 0x8b, 0x64, 0x95, 0x91, 0xec, 0x02, + 0x5a, 0xcf, 0x83, 0xbb, 0xe7, 0x62, 0x15, 0x27, 0xf7, 0x1e, 0x50, 0x50, 0x0b, 0x84, 0xff, 0x05, + 0x1c, 0x2b, 0x37, 0xd2, 0x4d, 0xbc, 0x4e, 0x05, 0x96, 0xcd, 0x75, 0x92, 0x28, 0x2f, 0xf0, 0x93, + 0x7d, 0x0c, 0x0d, 0x2e, 0xd2, 0x6d, 0x94, 0xe9, 0x31, 0xf3, 0x00, 0xcd, 0xd1, 0xaf, 0xb6, 0x51, + 0xc6, 0x35, 0xdd, 0xff, 0xb6, 0x0e, 0x6d, 0x83, 0x90, 0x0f, 0x3e, 0x1c, 0xde, 0xc7, 0x72, 0xf0, + 0xe1, 0xda, 0xe6, 0xf1, 0x6e, 0x6f, 0xa3, 0x63, 0xb3, 0x76, 0xc0, 0xba, 0x51, 0x0d, 0x61, 0xdd, + 0x14, 0xb3, 0xc1, 0x39, 0x3c, 0x1b, 0xf0, 0x8a, 0xf9, 0x3a, 0x58, 0x2f, 0xc5, 0x82, 0x92, 0xde, + 0xe4, 0x1a, 0x64, 0xfd, 0xa2, 0x0d, 0x28, 0xbe, 0xaa, 0x07, 0x35, 0x8e, 0x17, 0x4d, 0x22, 0x5b, + 0x1e, 0x77, 0x5f, 0x43, 0xe6, 0x47, 0x42, 0xec, 0x53, 0x38, 0xf9, 0x32, 0x5a, 0x14, 0x3d, 0x9d, + 0xaa, 0x4c, 0x9c, 0xa0, 0x9c, 0x02, 0xcd, 0x2b, 0x5c, 0xec, 0xb3, 0xea, 0xe1, 0x41, 0x39, 0x69, + 0x0f, 0x98, 0xf2, 0xd3, 0xa0, 0xf0, 0xea, 0x89, 0x72, 0x69, 0xdc, 0x3d, 0x94, 0xa8, 0xf6, 0xe0, + 0x18, 0x9f, 0xe5, 0x48, 0x6e, 0xdc, 0x45, 0x8f, 0xcd, 0x31, 0xea, 0xb5, 0x89, 0xfb, 0x44, 0x47, + 0x48, 0x62, 0xb9, 0x39, 0x68, 0x2f, 0x8d, 0xb9, 0xed, 0x75, 0x0a, 0xe1, 0x39, 0x92, 0x1b, 0x73, + 0xfd, 0xea, 0xc0, 0x8d, 0xe2, 0x1d, 0xd3, 0xa3, 0xea, 0x01, 0x22, 0x89, 0xfc, 0xc0, 0x4d, 0xf3, + 0x59, 0x75, 0xc1, 0x79, 0x27, 0x45, 0x28, 0xca, 0x14, 0x5e, 0x5d, 0x85, 0x97, 0xc6, 0xb1, 0xe8, + 0x3d, 0x28, 0xac, 0xcd, 0x91, 0xdc, 0x38, 0x26, 0x7f, 0x06, 0x6d, 0x33, 0x51, 0xa7, 0xc4, 0xfe, + 0xa0, 0x9c, 0xa8, 0x94, 0x9b, 0x3c, 0xe8, 0xe0, 0x5e, 0xfb, 0x7b, 0x67, 0x85, 0x83, 0x7b, 0x44, + 0x7e, 0x60, 0x5c, 0x5c, 0x42, 0x0b, 0xdb, 0xf0, 0x49, 0x82, 0xb3, 0x81, 0x15, 0x46, 0xe6, 0x48, + 0x5e, 0xd0, 0x31, 0x5f, 0xc3, 0x24, 0x89, 0x77, 0x32, 0x12, 0x0f, 0x8b, 0x7c, 0x15, 0x58, 0x6e, + 0x70, 0xf8, 0xdf, 0xda, 0x70, 0x3c, 0x59, 0x6d, 0xe2, 0x24, 0x33, 0x06, 0x8c, 0x3c, 0xb6, 0xad, + 0x83, 0xc7, 0xb6, 0x5d, 0xd9, 0x6f, 0x34, 0x68, 0x68, 0x52, 0xba, 0x5c, 0x02, 0x46, 0xb1, 0xbb, + 0xa5, 0x62, 0xbf, 0x80, 0x96, 0x3c, 0x0f, 0x90, 0x54, 0x23, 0x52, 0x81, 0x90, 0xe7, 0xff, 0x8e, + 0xce, 0xbf, 0x06, 0x8d, 0x45, 0x0d, 0xe2, 0x50, 0x96, 0x6c, 0x44, 0x6c, 0x12, 0xd1, 0xc0, 0x20, + 0x3d, 0x8f, 0x56, 0xea, 0xd5, 0x7b, 0x4e, 0xdf, 0xe1, 0x06, 0x86, 0x7d, 0x04, 0x27, 0xe4, 0xc4, + 0x55, 0x22, 0x70, 0x52, 0x0d, 0x33, 0x6a, 0x16, 0x87, 0x57, 0xb0, 0xc8, 0x47, 0x6e, 0x15, 0x7c, + 0x72, 0x8c, 0x55, 0xb0, 0xb4, 0xdf, 0x22, 0x11, 0x24, 0xd4, 0x0e, 0x4d, 0x2e, 0x01, 0xff, 0x3f, + 0x36, 0x30, 0x19, 0x49, 0x79, 0xca, 0x7d, 0x6f, 0xe1, 0x7c, 0x73, 0xd8, 0xca, 0xc1, 0x69, 0xec, + 0x05, 0xa7, 0x58, 0x36, 0x32, 0x30, 0x7a, 0xd9, 0xf4, 0xa0, 0xad, 0xd7, 0x2f, 0x12, 0x31, 0xaa, + 0x16, 0x37, 0x51, 0xb8, 0x67, 0xa7, 0x19, 0xfe, 0xfe, 0x52, 0x2c, 0x2d, 0x92, 0x5d, 0xc2, 0x1d, + 0x08, 0x2d, 0x7c, 0xc7, 0xd0, 0xb6, 0xdf, 0x1c, 0xda, 0x8e, 0x19, 0xda, 0xbf, 0x58, 0xd0, 0x19, + 0x66, 0xf1, 0x2a, 0x9c, 0x73, 0x31, 0x8f, 0x93, 0xc5, 0xeb, 0x83, 0x2a, 0xc3, 0x67, 0x9b, 0xe1, + 0xeb, 0x83, 0x33, 0xf9, 0x26, 0x51, 0xc3, 0xfd, 0x5d, 0xba, 0xa9, 0xf6, 0xb2, 0xc4, 0x91, 0x85, + 0x7d, 0x08, 0xf6, 0x24, 0xa1, 0x9a, 0x6d, 0x0f, 0xce, 0x0a, 0x46, 0xcd, 0x63, 0x4f, 0x12, 0xff, + 0xa7, 0x70, 0x2e, 0x0d, 0xd1, 0x24, 0xb5, 0xcd, 0xce, 0xa1, 0x76, 0x9d, 0x24, 0xb1, 0xde, 0x67, + 0x12, 0xc0, 0x1f, 0x0d, 0xf9, 0x82, 0xc4, 0x64, 0xbc, 0x4d, 0x4d, 0x1c, 0xfa, 0xa5, 0xdc, 0x83, + 0xf6, 0x4d, 0x9c, 0xfd, 0x3e, 0x09, 0x33, 0xea, 0x72, 0xb9, 0x95, 0x4c, 0x94, 0xff, 0x31, 0xbc, + 0x53, 0xd1, 0x5c, 0xac, 0x5d, 0x2c, 0x23, 0xa7, 0xf8, 0xb5, 0x39, 0x85, 0x87, 0x39, 0xeb, 0x64, + 0xfc, 0x56, 0x36, 0xee, 0x0b, 0xfd, 0x89, 0xe1, 0x39, 0x09, 0x55, 0xea, 0x0f, 0x78, 0xe3, 0x8f, + 0xc0, 0x53, 0xd1, 0x94, 0x3f, 0xf7, 0x95, 0x05, 0xb3, 0x50, 0xec, 0x5e, 0xf7, 0x2b, 0x87, 0x6e, + 0x16, 0x9b, 0x2e, 0x30, 0xfa, 0xf6, 0xff, 0x6a, 0xc3, 0xf9, 0x21, 0x21, 0x45, 0x41, 0x59, 0x46, + 0x41, 0xb1, 0x01, 0xd4, 0xbe, 0x09, 0xc5, 0x4e, 0x1f, 0x1a, 0x17, 0x46, 0xb2, 0xf7, 0x6c, 0xe0, + 0x92, 0x15, 0x1b, 0x69, 0x38, 0xcf, 0xf4, 0x59, 0xd8, 0xe2, 0x0a, 0x42, 0x0d, 0xa3, 0x28, 0x9e, + 0xff, 0x51, 0xfe, 0xe0, 0xe4, 0x12, 0x38, 0xd0, 0x18, 0xb5, 0xef, 0xd8, 0x18, 0xf5, 0x83, 0x8d, + 0xd1, 0x87, 0x07, 0xbf, 0xdb, 0x2c, 0x82, 0x4c, 0x5c, 0xdf, 0x85, 0x69, 0x26, 0xd6, 0x73, 0xe1, + 0x35, 0xc8, 0xa3, 0x2a, 0x1a, 0x4f, 0xdf, 0x63, 0xe5, 0x85, 0x24, 0xbd, 0xe6, 0xb7, 0x09, 0x03, + 0x17, 0xdd, 0xd3, 0xd7, 0x26, 0x85, 0x3b, 0x8f, 0x96, 0x43, 0xb1, 0x55, 0xd1, 0x3a, 0x05, 0x67, + 0x2a, 0x32, 0x75, 0xf1, 0xe2, 0x27, 0x8e, 0x06, 0x22, 0xc9, 0x76, 0x4c, 0xd5, 0x71, 0x59, 0xc2, + 0xf9, 0x5f, 0xc1, 0x7b, 0xa5, 0x90, 0x52, 0x37, 0xea, 0xb4, 0x14, 0x77, 0xa9, 0x55, 0xba, 0x4b, + 0x7f, 0x0c, 0xb5, 0x99, 0x91, 0x98, 0x33, 0xb9, 0x8c, 0x0d, 0x67, 0xb8, 0xa4, 0xfb, 0xd3, 0xd2, + 0x32, 0xc6, 0x19, 0x39, 0x5c, 0x2e, 0x13, 0xb1, 0x0c, 0x32, 0x5d, 0x2c, 0x05, 0x82, 0x7d, 0x04, + 0x75, 0x62, 0xd6, 0x62, 0xab, 0xd7, 0x95, 0xa2, 0xfa, 0x1f, 0x18, 0x9b, 0x36, 0x2f, 0x33, 0xcb, + 0x28, 0xb3, 0x9e, 0xb9, 0x5d, 0x0f, 0x71, 0x8c, 0x4e, 0xff, 0xf9, 0xaa, 0x6b, 0xfd, 0xfb, 0x55, + 0xd7, 0xfa, 0xef, 0xab, 0xae, 0xf5, 0xb7, 0xff, 0x75, 0x8f, 0x6e, 0xeb, 0xf4, 0xb7, 0xd8, 0xcf, + 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0xf1, 0xea, 0x48, 0xee, 0x26, 0x13, 0x00, 0x00, } func (m *Row) Marshal() (dAtA []byte, err error) { @@ -3862,6 +3870,18 @@ func (m *GroupCount) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if m.DecimalAgg != nil { + { + size, err := m.DecimalAgg.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintPublic(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } if m.Agg != 0 { i = encodeVarintPublic(dAtA, i, uint64(m.Agg)) i-- @@ -4122,20 +4142,20 @@ func (m *QueryRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x28 } if len(m.Shards) > 0 { - dAtA15 := make([]byte, len(m.Shards)*10) - var j14 int + dAtA16 := make([]byte, len(m.Shards)*10) + var j15 int for _, num := range m.Shards { for num >= 1<<7 { - dAtA15[j14] = uint8(uint64(num)&0x7f | 0x80) + dAtA16[j15] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j14++ + j15++ } - dAtA15[j14] = uint8(num) - j14++ + dAtA16[j15] = uint8(num) + j15++ } - i -= j14 - copy(dAtA[i:], dAtA15[:j14]) - i = encodeVarintPublic(dAtA, i, uint64(j14)) + i -= j15 + copy(dAtA[i:], dAtA16[:j15]) + i = encodeVarintPublic(dAtA, i, uint64(j15)) i-- dAtA[i] = 0x12 } @@ -4376,20 +4396,20 @@ func (m *QueryResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { } } if len(m.RowIDs) > 0 { - dAtA28 := make([]byte, len(m.RowIDs)*10) - var j27 int + dAtA29 := make([]byte, len(m.RowIDs)*10) + var j28 int for _, num := range m.RowIDs { for num >= 1<<7 { - dAtA28[j27] = uint8(uint64(num)&0x7f | 0x80) + dAtA29[j28] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j27++ + j28++ } - dAtA28[j27] = uint8(num) - j27++ + dAtA29[j28] = uint8(num) + j28++ } - i -= j27 - copy(dAtA[i:], dAtA28[:j27]) - i = encodeVarintPublic(dAtA, i, uint64(j27)) + i -= j28 + copy(dAtA[i:], dAtA29[:j28]) + i = encodeVarintPublic(dAtA, i, uint64(j28)) i-- dAtA[i] = 0x3a } @@ -4517,57 +4537,57 @@ func (m *ImportRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { } } if len(m.Timestamps) > 0 { - dAtA32 := make([]byte, len(m.Timestamps)*10) - var j31 int + dAtA33 := make([]byte, len(m.Timestamps)*10) + var j32 int for _, num1 := range m.Timestamps { num := uint64(num1) for num >= 1<<7 { - dAtA32[j31] = uint8(uint64(num)&0x7f | 0x80) + dAtA33[j32] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j31++ + j32++ } - dAtA32[j31] = uint8(num) - j31++ + dAtA33[j32] = uint8(num) + j32++ } - i -= j31 - copy(dAtA[i:], dAtA32[:j31]) - i = encodeVarintPublic(dAtA, i, uint64(j31)) + i -= j32 + copy(dAtA[i:], dAtA33[:j32]) + i = encodeVarintPublic(dAtA, i, uint64(j32)) i-- dAtA[i] = 0x32 } if len(m.ColumnIDs) > 0 { - dAtA34 := make([]byte, len(m.ColumnIDs)*10) - var j33 int + dAtA35 := make([]byte, len(m.ColumnIDs)*10) + var j34 int for _, num := range m.ColumnIDs { for num >= 1<<7 { - dAtA34[j33] = uint8(uint64(num)&0x7f | 0x80) + dAtA35[j34] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j33++ + j34++ } - dAtA34[j33] = uint8(num) - j33++ + dAtA35[j34] = uint8(num) + j34++ } - i -= j33 - copy(dAtA[i:], dAtA34[:j33]) - i = encodeVarintPublic(dAtA, i, uint64(j33)) + i -= j34 + copy(dAtA[i:], dAtA35[:j34]) + i = encodeVarintPublic(dAtA, i, uint64(j34)) i-- dAtA[i] = 0x2a } if len(m.RowIDs) > 0 { - dAtA36 := make([]byte, len(m.RowIDs)*10) - var j35 int + dAtA37 := make([]byte, len(m.RowIDs)*10) + var j36 int for _, num := range m.RowIDs { for num >= 1<<7 { - dAtA36[j35] = uint8(uint64(num)&0x7f | 0x80) + dAtA37[j36] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j35++ + j36++ } - dAtA36[j35] = uint8(num) - j35++ + dAtA37[j36] = uint8(num) + j36++ } - i -= j35 - copy(dAtA[i:], dAtA36[:j35]) - i = encodeVarintPublic(dAtA, i, uint64(j35)) + i -= j36 + copy(dAtA[i:], dAtA37[:j36]) + i = encodeVarintPublic(dAtA, i, uint64(j36)) i-- dAtA[i] = 0x22 } @@ -4648,9 +4668,9 @@ func (m *ImportValueRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { } if len(m.FloatValues) > 0 { for iNdEx := len(m.FloatValues) - 1; iNdEx >= 0; iNdEx-- { - f37 := math.Float64bits(float64(m.FloatValues[iNdEx])) + f38 := math.Float64bits(float64(m.FloatValues[iNdEx])) i -= 8 - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f37)) + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f38)) } i = encodeVarintPublic(dAtA, i, uint64(len(m.FloatValues)*8)) i-- @@ -4666,39 +4686,39 @@ func (m *ImportValueRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { } } if len(m.Values) > 0 { - dAtA39 := make([]byte, len(m.Values)*10) - var j38 int + dAtA40 := make([]byte, len(m.Values)*10) + var j39 int for _, num1 := range m.Values { num := uint64(num1) for num >= 1<<7 { - dAtA39[j38] = uint8(uint64(num)&0x7f | 0x80) + dAtA40[j39] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j38++ + j39++ } - dAtA39[j38] = uint8(num) - j38++ + dAtA40[j39] = uint8(num) + j39++ } - i -= j38 - copy(dAtA[i:], dAtA39[:j38]) - i = encodeVarintPublic(dAtA, i, uint64(j38)) + i -= j39 + copy(dAtA[i:], dAtA40[:j39]) + i = encodeVarintPublic(dAtA, i, uint64(j39)) i-- dAtA[i] = 0x32 } if len(m.ColumnIDs) > 0 { - dAtA41 := make([]byte, len(m.ColumnIDs)*10) - var j40 int + dAtA42 := make([]byte, len(m.ColumnIDs)*10) + var j41 int for _, num := range m.ColumnIDs { for num >= 1<<7 { - dAtA41[j40] = uint8(uint64(num)&0x7f | 0x80) + dAtA42[j41] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j40++ + j41++ } - dAtA41[j40] = uint8(num) - j40++ + dAtA42[j41] = uint8(num) + j41++ } - i -= j40 - copy(dAtA[i:], dAtA41[:j40]) - i = encodeVarintPublic(dAtA, i, uint64(j40)) + i -= j41 + copy(dAtA[i:], dAtA42[:j41]) + i = encodeVarintPublic(dAtA, i, uint64(j41)) i-- dAtA[i] = 0x2a } @@ -4910,20 +4930,20 @@ func (m *TranslateKeysResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.XXX_unrecognized) } if len(m.IDs) > 0 { - dAtA43 := make([]byte, len(m.IDs)*10) - var j42 int + dAtA44 := make([]byte, len(m.IDs)*10) + var j43 int for _, num := range m.IDs { for num >= 1<<7 { - dAtA43[j42] = uint8(uint64(num)&0x7f | 0x80) + dAtA44[j43] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j42++ + j43++ } - dAtA43[j42] = uint8(num) - j42++ + dAtA44[j43] = uint8(num) + j43++ } - i -= j42 - copy(dAtA[i:], dAtA43[:j42]) - i = encodeVarintPublic(dAtA, i, uint64(j42)) + i -= j43 + copy(dAtA[i:], dAtA44[:j43]) + i = encodeVarintPublic(dAtA, i, uint64(j43)) i-- dAtA[i] = 0x1a } @@ -4955,20 +4975,20 @@ func (m *TranslateIDsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.XXX_unrecognized) } if len(m.IDs) > 0 { - dAtA45 := make([]byte, len(m.IDs)*10) - var j44 int + dAtA46 := make([]byte, len(m.IDs)*10) + var j45 int for _, num := range m.IDs { for num >= 1<<7 { - dAtA45[j44] = uint8(uint64(num)&0x7f | 0x80) + dAtA46[j45] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j44++ + j45++ } - dAtA45[j44] = uint8(num) - j44++ + dAtA46[j45] = uint8(num) + j45++ } - i -= j44 - copy(dAtA[i:], dAtA45[:j44]) - i = encodeVarintPublic(dAtA, i, uint64(j44)) + i -= j45 + copy(dAtA[i:], dAtA46[:j45]) + i = encodeVarintPublic(dAtA, i, uint64(j45)) i-- dAtA[i] = 0x1a } @@ -5858,6 +5878,10 @@ func (m *GroupCount) Size() (n int) { if m.Agg != 0 { n += 1 + sovPublic(uint64(m.Agg)) } + if m.DecimalAgg != nil { + l = m.DecimalAgg.Size() + n += 1 + l + sovPublic(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -6771,7 +6795,10 @@ func (m *Row) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -6856,7 +6883,10 @@ func (m *RowMatrix) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -6979,7 +7009,10 @@ func (m *SignedRow) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -7138,7 +7171,10 @@ func (m *RowIdentifiers) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -7265,7 +7301,10 @@ func (m *IDList) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -7369,7 +7408,10 @@ func (m *ExtractedIDColumn) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -7486,7 +7528,10 @@ func (m *ExtractedIDMatrix) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -7569,7 +7614,10 @@ func (m *KeyList) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -7783,7 +7831,10 @@ func (m *ExtractedTableValue) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -7920,7 +7971,10 @@ func (m *ExtractedTableColumn) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -8035,7 +8089,10 @@ func (m *ExtractedTableField) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -8154,7 +8211,10 @@ func (m *ExtractedTable) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -8275,7 +8335,10 @@ func (m *Pair) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -8394,7 +8457,10 @@ func (m *PairField) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -8511,7 +8577,10 @@ func (m *PairsField) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -8581,7 +8650,10 @@ func (m *Int64) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -8751,7 +8823,10 @@ func (m *FieldRow) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -8868,13 +8943,52 @@ func (m *GroupCount) Unmarshal(dAtA []byte) error { break } } + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DecimalAgg", 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.DecimalAgg == nil { + m.DecimalAgg = &Decimal{} + } + if err := m.DecimalAgg.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) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -9042,7 +9156,10 @@ func (m *ValCount) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -9205,7 +9322,10 @@ func (m *Decimal) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -9320,7 +9440,10 @@ func (m *DistinctTimestamp) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -9572,7 +9695,10 @@ func (m *QueryRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -9689,7 +9815,10 @@ func (m *QueryResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -10410,7 +10539,10 @@ func (m *QueryResult) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -10894,7 +11026,10 @@ func (m *ImportRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -11356,7 +11491,10 @@ func (m *ImportValueRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -11526,7 +11664,10 @@ func (m *AtomicRecord) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -11609,7 +11750,10 @@ func (m *AtomicImportResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -11776,7 +11920,10 @@ func (m *TranslateKeysRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -11903,7 +12050,10 @@ func (m *TranslateKeysResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -12094,7 +12244,10 @@ func (m *TranslateIDsRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -12177,7 +12330,10 @@ func (m *TranslateIDsResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -12294,7 +12450,10 @@ func (m *ImportRoaringRequestView) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -12508,7 +12667,10 @@ func (m *ImportRoaringRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -12711,7 +12873,10 @@ func (m *RoaringUpdate) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -12816,7 +12981,10 @@ func (m *ImportRoaringShardRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -12933,7 +13101,10 @@ func (m *GroupCounts) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -13018,7 +13189,10 @@ func (m *DataFrame) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { @@ -13103,7 +13277,10 @@ func (m *ArrowTable) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthPublic + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthPublic } if (iNdEx + skippy) > l { diff --git a/pb/public.proto b/pb/public.proto index 5416d233b..d1630a8d8 100644 --- a/pb/public.proto +++ b/pb/public.proto @@ -102,6 +102,7 @@ message GroupCount{ repeated FieldRow Group = 1; uint64 Count = 2; int64 Agg = 3; + Decimal DecimalAgg = 4; } message ValCount { diff --git a/sql3/errors.go b/sql3/errors.go index 03b31c14d..f62e667ed 100644 --- a/sql3/errors.go +++ b/sql3/errors.go @@ -78,7 +78,8 @@ const ( ErrConflictingColumnConstraint errors.Code = "ErrConflictingColumnConstraint" // expected errors - ErrExpectedColumnReference errors.Code = "ErrExpectedColumnReference" + ErrExpectedColumnReference errors.Code = "ErrExpectedColumnReference" + ErrExpectedSortExpressionReference errors.Code = "ErrExpectedSortExpressionReference" // call errors ErrCallUnknownFunction errors.Code = "ErrCallUnknownFunction" @@ -523,6 +524,13 @@ func NewErrExpectedColumnReference(line, col int) error { ) } +func NewErrExpectedSortExpressionReference(line, col int) error { + return errors.New( + ErrExpectedSortExpressionReference, + fmt.Sprintf("[%d:%d] column reference, alias reference or column position expected", line, col), + ) +} + // calls func NewErrCallParameterCountMismatch(line, col int, functionName string, formalCount, actualCount int) error { diff --git a/sql3/planner/compileselect.go b/sql3/planner/compileselect.go index f2a995d03..dbfa77c34 100644 --- a/sql3/planner/compileselect.go +++ b/sql3/planner/compileselect.go @@ -117,12 +117,16 @@ func (p *ExecutionPlanner) compileSelectStatement(stmt *parser.SelectStatement, if len(stmt.OrderingTerms) > 0 { orderByFields := make([]*OrderByExpression, 0) for _, ot := range stmt.OrderingTerms { - otExpr, err := p.compileExpr(ot.X) + index, err := p.compileOrderingTermExpr(ot.X) if err != nil { return nil, err } + // get the data type from the projection + projDataType := projections[index].Type() + f := &OrderByExpression{ - Expr: otExpr, + Index: index, + ExprType: projDataType, } f.Order = orderByAsc if ot.Desc.IsValid() { @@ -424,13 +428,11 @@ func (p *ExecutionPlanner) analyzeSelectStatement(stmt *parser.SelectStatement) } for _, term := range stmt.OrderingTerms { - expr, err = p.analyzeExpression(term.X, stmt) + expr, err := p.analyzeOrderingTermExpression(term.X, stmt) if err != nil { return err } - if expr != nil { - term.X = expr - } + term.X = expr } return nil diff --git a/sql3/planner/expression.go b/sql3/planner/expression.go index c9a04e14e..104b22d70 100644 --- a/sql3/planner/expression.go +++ b/sql3/planner/expression.go @@ -875,6 +875,14 @@ func (n *casePlanExpression) Evaluate(currentRow []interface{}) (interface{}, er return b, nil } return nil, sql3.NewErrInternalf("unexpected type conversion error '%t'", bok) + + case *parser.DataTypeBool: + b, bok := evalBlockBody.(bool) + if bok { + return b, nil + } + return nil, sql3.NewErrInternalf("unexpected type conversion error '%t'", bok) + case *parser.DataTypeString: s, sok := evalBlockBody.(string) if sok { @@ -2726,6 +2734,29 @@ func (p *ExecutionPlanner) compileCallExpr(expr *parser.Call) (_ types.PlanExpre } } +func (p *ExecutionPlanner) compileOrderingTermExpr(expr parser.Expr) (index int, err error) { + if expr == nil { + return 0, nil + } + + switch thisExpr := expr.(type) { + case *parser.QualifiedRef: + return thisExpr.ColumnIndex, nil + + case *parser.IntegerLit: + val, err := strconv.ParseInt(thisExpr.Value, 10, 64) + if err != nil { + return 0, err + } + // subtract one because ordering terms are 1 based, not 0 based + return int(val - 1), nil + + default: + return 0, sql3.NewErrInternalf("unexpected ordering expression type: %T", expr) + + } +} + // wildCardToRegexp converts a wildcard pattern to a regular expression pattern. // used by the LIKE/NOT LIKE operator func wildCardToRegexp(pattern string) string { diff --git a/sql3/planner/expressionanalyzer.go b/sql3/planner/expressionanalyzer.go index 98a4f0a0f..f3db6e0e3 100644 --- a/sql3/planner/expressionanalyzer.go +++ b/sql3/planner/expressionanalyzer.go @@ -3,6 +3,7 @@ package planner import ( + "strconv" "strings" "github.com/molecula/featurebase/v3/sql3" @@ -741,3 +742,80 @@ func (p *ExecutionPlanner) analyzeCaseBlockExpression(expr *parser.CaseBlock, ca return expr, nil } + +func (p *ExecutionPlanner) analyzeOrderingTermExpression(expr parser.Expr, scope parser.Statement) (parser.Expr, error) { + if expr == nil { + return nil, nil + } + + // ordering terms need to be either a column name, an alias name or an integer literal representing + // position of column in the select list + + switch thisExpr := expr.(type) { + case *parser.Ident: + switch sc := scope.(type) { + case *parser.SelectStatement: + + // go find the first ident in the projection list that matches + columnIndex := 0 + found := false + for idx, proj := range sc.Columns { + // if the expression is a qualified ref, check the name + colExpr, ok := proj.Expr.(*parser.QualifiedRef) + if ok && strings.EqualFold(thisExpr.Name, colExpr.Column.Name) { + columnIndex = idx + found = true + break + } + // try the alias is there is one + if proj.Alias != nil && strings.EqualFold(thisExpr.Name, proj.Alias.Name) { + columnIndex = idx + found = true + break + } + } + + if !found { + return nil, sql3.NewErrColumnNotFound(thisExpr.NamePos.Line, thisExpr.NamePos.Column, thisExpr.Name) + } + + // turn *parser.Ident into *parser.QualifiedRef + ident := &parser.QualifiedRef{ + Table: &parser.Ident{ + Name: "", + NamePos: parser.Pos{Line: 0, Column: 0}, + }, + Column: &parser.Ident{ + Name: thisExpr.Name, + NamePos: thisExpr.NamePos, + }, + ColumnIndex: columnIndex, + // since this is a ordring term, we don't care about the type + RefDataType: parser.NewDataTypeVoid(), + } + return ident, nil + + default: + return nil, sql3.NewErrInternalf("unhandled scope type '%T'", sc) + } + + case *parser.IntegerLit: + switch sc := scope.(type) { + case *parser.SelectStatement: + // check to see if the offset is in the range + value, err := strconv.ParseInt(thisExpr.Value, 10, 64) + if err != nil { + return nil, sql3.NewErrInternalf("unexpected integer literal value") + } + if value < 1 || value > int64(len(sc.Columns)) { + return nil, sql3.NewErrExpectedSortExpressionReference(0, 0) + } + default: + return nil, sql3.NewErrInternalf("unhandled scope type '%T'", sc) + } + + default: + return nil, sql3.NewErrExpectedSortExpressionReference(expr.Pos().Line, expr.Pos().Column) + } + return expr, nil +} diff --git a/sql3/planner/oporderby.go b/sql3/planner/oporderby.go index 3b44f3acb..f329d8264 100644 --- a/sql3/planner/oporderby.go +++ b/sql3/planner/oporderby.go @@ -8,6 +8,7 @@ import ( "sort" "time" + "github.com/molecula/featurebase/v3/pql" "github.com/molecula/featurebase/v3/sql3" "github.com/molecula/featurebase/v3/sql3/parser" "github.com/molecula/featurebase/v3/sql3/planner/types" @@ -31,7 +32,8 @@ const ( // OrderByExpression is the expression on which an order by can be computed type OrderByExpression struct { - Expr types.PlanExpression + Index int + ExprType parser.ExprDataType Order orderByOrder NullOrdering nullOrdering } @@ -94,7 +96,8 @@ func (n *PlanOpOrderBy) Plan() map[string]interface{} { ps := make([]interface{}, 0) for _, e := range n.orderByFields { ps = append(ps, &map[string]interface{}{ - "expr": e.Expr.Plan(), + "index": e.Index, + "exprType": e.ExprType.TypeName(), "order": e.Order, "nullOrdering": e.NullOrdering, }) @@ -204,17 +207,8 @@ func (s *OrderBySorter) Less(i, j int) bool { a := s.Rows[i] b := s.Rows[j] for _, sf := range s.SortFields { - av, err := sf.Expr.Evaluate(a) - if err != nil { - s.LastError = sql3.NewErrInternalf("unable to sort '%s'", err.Error()) - return false - } - - bv, err := sf.Expr.Evaluate(b) - if err != nil { - s.LastError = sql3.NewErrInternalf("unable to sort '%s'", err.Error()) - return false - } + av := a[sf.Index] + bv := b[sf.Index] if sf.Order == orderByDesc { av, bv = bv, av @@ -228,7 +222,7 @@ func (s *OrderBySorter) Less(i, j int) bool { return sf.NullOrdering != nullOrderingFirst } - switch sf.Expr.Type().(type) { + switch sf.ExprType.(type) { case *parser.DataTypeInt, *parser.DataTypeID: avInt, aok := av.(int64) bvInt, bok := bv.(int64) @@ -253,6 +247,30 @@ func (s *OrderBySorter) Less(i, j int) bool { } return true + case *parser.DataTypeString: + avString, aok := av.(string) + bvString, bok := bv.(string) + if !(aok && bok) { + s.LastError = sql3.NewErrInternalf("unexpected type conversion result") + return false + } + if avString > bvString { + return false + } + return true + + case *parser.DataTypeDecimal: + avDecimal, aok := av.(pql.Decimal) + bvDecimal, bok := bv.(pql.Decimal) + if !(aok && bok) { + s.LastError = sql3.NewErrInternalf("unexpected type conversion result") + return false + } + if avDecimal.GreaterThan(bvDecimal) { + return false + } + return true + case *parser.DataTypeTimestamp: avTime, aok := av.(time.Time) bvTime, bok := bv.(time.Time) @@ -266,7 +284,7 @@ func (s *OrderBySorter) Less(i, j int) bool { return true default: - s.LastError = sql3.NewErrInternalf("unhandled data type '%T'", sf.Expr.Type()) + s.LastError = sql3.NewErrInternalf("unhandled data type '%T'", sf.ExprType) return false } } diff --git a/sql3/test/defs/defs_groupby.go b/sql3/test/defs/defs_groupby.go index e7e4dd8f6..f54d85237 100644 --- a/sql3/test/defs/defs_groupby.go +++ b/sql3/test/defs/defs_groupby.go @@ -27,6 +27,64 @@ var groupByTests = TableTest{ ), ), SQLTests: []SQLTest{ + { + SQLs: sqls( + "SELECT COUNT(*), i1 FROM groupby_test group by i1 order by count(*) asc", + "SELECT COUNT(_id), i1 FROM groupby_test group by i1 order by count(*) asc", + ), + ExpErr: "column reference, alias reference or column position expected", + }, + { + SQLs: sqls( + "SELECT COUNT(*), i1 FROM groupby_test group by i1 order by 2 asc", + "SELECT COUNT(_id), i1 FROM groupby_test group by i1 order by 2 asc", + ), + ExpHdrs: hdrs( + hdr("", fldTypeInt), + hdr("i1", fldTypeInt), + ), + ExpRows: rows( + row(int64(2), int64(10)), + row(int64(1), int64(11)), + row(int64(2), int64(12)), + row(int64(1), int64(13)), + ), + Compare: CompareExactOrdered, + }, + { + SQLs: sqls( + "SELECT COUNT(*), i1 as c FROM groupby_test group by i1 order by c asc", + "SELECT COUNT(_id), i1 as c FROM groupby_test group by i1 order by c asc", + ), + ExpHdrs: hdrs( + hdr("", fldTypeInt), + hdr("c", fldTypeInt), + ), + ExpRows: rows( + row(int64(2), int64(10)), + row(int64(1), int64(11)), + row(int64(2), int64(12)), + row(int64(1), int64(13)), + ), + Compare: CompareExactOrdered, + }, + { + SQLs: sqls( + "SELECT COUNT(*), i1 as c FROM groupby_test group by i1 order by i1 asc", + "SELECT COUNT(_id), i1 as c FROM groupby_test group by i1 order by i1 asc", + ), + ExpHdrs: hdrs( + hdr("", fldTypeInt), + hdr("c", fldTypeInt), + ), + ExpRows: rows( + row(int64(2), int64(10)), + row(int64(1), int64(11)), + row(int64(2), int64(12)), + row(int64(1), int64(13)), + ), + Compare: CompareExactOrdered, + }, { SQLs: sqls( "SELECT COUNT(*), i1 FROM groupby_test group by i1",