diff --git a/.travis.yml b/.travis.yml index a3e21f83c..1a4691b8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: go go: - - 1.8 - 1.9 + - "1.10" # Use string, as 1.10==1.1 if interpreted as float. + - master env: global: # AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY - secure: "VnBFmFfBOrrf7ONLN9WpAFCcV8SEt5G5VPnnHv97TP7PlJG8LWR6k6O+vRJOvf8V4vDMfKCTDonwWLgbssVf3yygo3C8ZoftY2phehEkWGffCgsd9ML/YBNbGq4LYLSE5HKvBqrZjQaOrVby71BAsP8W7RhC6hqzFQ00M/z8dZVfwaQQFwew2eEcSxLEaaDFS8Wgc3/UuwxDRPBq6u3cCN5RxfB+q70HvGVq4TT+0dqS4eCvz688+Z0GIGYx9olNjh0F2Kc8R2Po0lnUNa0GiHrZ21zeQ1DxIK04QABrWWmjL4h+bx3VHNKPFR4GYSKDf+pj1kfaqbfrAg6rMAJdGejgoS+QyjhgCoN4d3qRp8s+1nrxtp0TvezEdjwyxt4quGHbP5TxWUszssbGhWqf4mx6OeJ8MmdTaJjfu0f3NWJXMycqT6J73WKORk4rHeIqF9CIdxdmcpkwYj8rk0TEMTPTsd7WA8w2HIDsCz/jQnRmEgLUiNnTAofYc/uUi/Wg/T2hllkp+oBDTzxk9NTelkqx8TJ0bDmYYL9JWUi1siFHTHiVYTJgyirSfGNpe61u8OLmT0Hak/D399IfL7qgFLlMXk8q92typfO2xEduq6G+8KygeqiOMSsOY+xcDvZf5xtcEihYd21vjtrxRSqFsup/o8DIxEurQnfXBx1B+WA=" diff --git a/Dockerfile b/Dockerfile index 6d86de974..50e88985c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.9.2 as builder +FROM golang:1.10 as builder ARG ldflags='' diff --git a/broadcast.go b/broadcast.go index bb32ab0ba..dd8802f47 100644 --- a/broadcast.go +++ b/broadcast.go @@ -130,6 +130,8 @@ const ( MessageTypeDeleteFrame MessageTypeCreateView MessageTypeDeleteView + MessageTypeCreateField + MessageTypeDeleteField MessageTypeCreateInputDefinition MessageTypeDeleteInputDefinition MessageTypeClusterStatus @@ -158,6 +160,10 @@ func MarshalMessage(m proto.Message) ([]byte, error) { typ = MessageTypeCreateView case *internal.DeleteViewMessage: typ = MessageTypeDeleteView + case *internal.CreateFieldMessage: + typ = MessageTypeCreateField + case *internal.DeleteFieldMessage: + typ = MessageTypeDeleteField case *internal.CreateInputDefinitionMessage: typ = MessageTypeCreateInputDefinition case *internal.DeleteInputDefinitionMessage: @@ -204,6 +210,10 @@ func UnmarshalMessage(buf []byte) (proto.Message, error) { m = &internal.CreateViewMessage{} case MessageTypeDeleteView: m = &internal.DeleteViewMessage{} + case MessageTypeCreateField: + m = &internal.CreateFieldMessage{} + case MessageTypeDeleteField: + m = &internal.DeleteFieldMessage{} case MessageTypeCreateInputDefinition: m = &internal.CreateInputDefinitionMessage{} case MessageTypeDeleteInputDefinition: diff --git a/cluster.go b/cluster.go index 76642107b..d9575b58e 100644 --- a/cluster.go +++ b/cluster.go @@ -1687,7 +1687,7 @@ func (c *Cluster) NodeLeave(node *Node) error { } if c.State() != ClusterStateNormal { - return fmt.Errorf("Cluster must be in state %s to remove a node. Current state: %s", ClusterStateNormal, c.State) + return fmt.Errorf("Cluster must be in state %s to remove a node. Current state: %s", ClusterStateNormal, c.State()) } return c.nodeLeave(node) diff --git a/docs/configuration.md b/docs/configuration.md index b6d7a603e..0798d1381 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -182,9 +182,8 @@ Any flag that has a value that is a comma separated list on the command line bec #### Cluster Type -* Description: Determine how the cluster handles membership and state sharing. Choose from [static, http, gossip]. +* Description: Determine how the cluster handles membership and state sharing. Choose from [static, gossip]. * static - Messaging between nodes is disabled. This is primarily used for testing. - * http - Messages are transmitted over HTTP. * gossip - Messages are transmitted over TCP. Cluster status and node state are kept in sync via internode gossip. * Flag: `cluster.type="gossip"` * Env: `PILOSA_CLUSTER_TYPE="gossip"` diff --git a/handler.go b/handler.go index 286d00d14..5d7af3987 100644 --- a/handler.go +++ b/handler.go @@ -188,7 +188,7 @@ func loadNormal(router *mux.Router, handler *Handler) { } func (h *Handler) reportRestricted(w http.ResponseWriter, r *http.Request) { - http.Error(w, fmt.Sprintf("not allowed in cluster state %s", h.Cluster.State), http.StatusMethodNotAllowed) + http.Error(w, fmt.Sprintf("not allowed in cluster state %s", h.Cluster.State()), http.StatusMethodNotAllowed) } func (h *Handler) methodNotAllowedHandler(w http.ResponseWriter, r *http.Request) { @@ -682,7 +682,6 @@ func (h *Handler) handlePostFrame(w http.ResponseWriter, r *http.Request) { } h.Holder.Stats.CountWithCustomTags("createFrame", 1, 1.0, []string{fmt.Sprintf("index:%s", indexName)}) - } type _postFrameRequest postFrameRequest @@ -834,17 +833,30 @@ func (h *Handler) handlePostFrameField(w http.ResponseWriter, r *http.Request) { return } - // Create new field. - if err := f.CreateField(&Field{ + field := &Field{ Name: fieldName, Type: req.Type, Min: req.Min, Max: req.Max, - }); err != nil { + } + + // Create new field. + if err := f.CreateField(field); err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } + // Send the create field message to all nodes. + err := h.Broadcaster.SendSync( + &internal.CreateFieldMessage{ + Index: indexName, + Frame: frameName, + Field: encodeField(field), + }) + if err != nil { + h.logger().Printf("problem sending CreateField message: %s", err) + } + // Encode response. if err := json.NewEncoder(w).Encode(postFrameFieldResponse{}); err != nil { h.logger().Printf("response encoding error: %s", err) @@ -878,6 +890,17 @@ func (h *Handler) handleDeleteFrameField(w http.ResponseWriter, r *http.Request) return } + // Send the delete field message to all nodes. + err := h.Broadcaster.SendSync( + &internal.DeleteFieldMessage{ + Index: indexName, + Frame: frameName, + Field: fieldName, + }) + if err != nil { + h.logger().Printf("problem sending DeleteField message: %s", err) + } + // Encode response. if err := json.NewEncoder(w).Encode(deleteFrameFieldResponse{}); err != nil { h.logger().Printf("response encoding error: %s", err) diff --git a/internal/private.pb.go b/internal/private.pb.go index 3ea095687..cdf0dab40 100644 --- a/internal/private.pb.go +++ b/internal/private.pb.go @@ -21,6 +21,8 @@ CreateIndexMessage CreateFrameMessage DeleteFrameMessage + CreateFieldMessage + DeleteFieldMessage Frame Schema Index @@ -407,6 +409,70 @@ func (m *DeleteFrameMessage) GetFrame() string { return "" } +type CreateFieldMessage struct { + Index string `protobuf:"bytes,1,opt,name=Index,proto3" json:"Index,omitempty"` + Frame string `protobuf:"bytes,2,opt,name=Frame,proto3" json:"Frame,omitempty"` + Field *Field `protobuf:"bytes,3,opt,name=Field" json:"Field,omitempty"` +} + +func (m *CreateFieldMessage) Reset() { *m = CreateFieldMessage{} } +func (m *CreateFieldMessage) String() string { return proto.CompactTextString(m) } +func (*CreateFieldMessage) ProtoMessage() {} +func (*CreateFieldMessage) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{12} } + +func (m *CreateFieldMessage) GetIndex() string { + if m != nil { + return m.Index + } + return "" +} + +func (m *CreateFieldMessage) GetFrame() string { + if m != nil { + return m.Frame + } + return "" +} + +func (m *CreateFieldMessage) GetField() *Field { + if m != nil { + return m.Field + } + return nil +} + +type DeleteFieldMessage struct { + Index string `protobuf:"bytes,1,opt,name=Index,proto3" json:"Index,omitempty"` + Frame string `protobuf:"bytes,2,opt,name=Frame,proto3" json:"Frame,omitempty"` + Field string `protobuf:"bytes,3,opt,name=Field,proto3" json:"Field,omitempty"` +} + +func (m *DeleteFieldMessage) Reset() { *m = DeleteFieldMessage{} } +func (m *DeleteFieldMessage) String() string { return proto.CompactTextString(m) } +func (*DeleteFieldMessage) ProtoMessage() {} +func (*DeleteFieldMessage) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{13} } + +func (m *DeleteFieldMessage) GetIndex() string { + if m != nil { + return m.Index + } + return "" +} + +func (m *DeleteFieldMessage) GetFrame() string { + if m != nil { + return m.Frame + } + return "" +} + +func (m *DeleteFieldMessage) GetField() string { + if m != nil { + return m.Field + } + return "" +} + type Frame struct { Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"` Meta *FrameMeta `protobuf:"bytes,2,opt,name=Meta" json:"Meta,omitempty"` @@ -416,7 +482,7 @@ type Frame struct { func (m *Frame) Reset() { *m = Frame{} } func (m *Frame) String() string { return proto.CompactTextString(m) } func (*Frame) ProtoMessage() {} -func (*Frame) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{12} } +func (*Frame) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{14} } func (m *Frame) GetName() string { if m != nil { @@ -446,7 +512,7 @@ type Schema struct { func (m *Schema) Reset() { *m = Schema{} } func (m *Schema) String() string { return proto.CompactTextString(m) } func (*Schema) ProtoMessage() {} -func (*Schema) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{13} } +func (*Schema) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{15} } func (m *Schema) GetIndexes() []*Index { if m != nil { @@ -464,7 +530,7 @@ type Index struct { func (m *Index) Reset() { *m = Index{} } func (m *Index) String() string { return proto.CompactTextString(m) } func (*Index) ProtoMessage() {} -func (*Index) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{14} } +func (*Index) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{16} } func (m *Index) GetName() string { if m != nil { @@ -496,7 +562,7 @@ type InputDefinition struct { func (m *InputDefinition) Reset() { *m = InputDefinition{} } func (m *InputDefinition) String() string { return proto.CompactTextString(m) } func (*InputDefinition) ProtoMessage() {} -func (*InputDefinition) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{15} } +func (*InputDefinition) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{17} } func (m *InputDefinition) GetName() string { if m != nil { @@ -528,7 +594,7 @@ type InputDefinitionField struct { func (m *InputDefinitionField) Reset() { *m = InputDefinitionField{} } func (m *InputDefinitionField) String() string { return proto.CompactTextString(m) } func (*InputDefinitionField) ProtoMessage() {} -func (*InputDefinitionField) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{16} } +func (*InputDefinitionField) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{18} } func (m *InputDefinitionField) GetName() string { if m != nil { @@ -561,7 +627,7 @@ type InputDefinitionAction struct { func (m *InputDefinitionAction) Reset() { *m = InputDefinitionAction{} } func (m *InputDefinitionAction) String() string { return proto.CompactTextString(m) } func (*InputDefinitionAction) ProtoMessage() {} -func (*InputDefinitionAction) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{17} } +func (*InputDefinitionAction) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{19} } func (m *InputDefinitionAction) GetFrame() string { if m != nil { @@ -600,7 +666,7 @@ func (m *CreateInputDefinitionMessage) Reset() { *m = CreateInputDefinit func (m *CreateInputDefinitionMessage) String() string { return proto.CompactTextString(m) } func (*CreateInputDefinitionMessage) ProtoMessage() {} func (*CreateInputDefinitionMessage) Descriptor() ([]byte, []int) { - return fileDescriptorPrivate, []int{18} + return fileDescriptorPrivate, []int{20} } func (m *CreateInputDefinitionMessage) GetIndex() string { @@ -626,7 +692,7 @@ func (m *DeleteInputDefinitionMessage) Reset() { *m = DeleteInputDefinit func (m *DeleteInputDefinitionMessage) String() string { return proto.CompactTextString(m) } func (*DeleteInputDefinitionMessage) ProtoMessage() {} func (*DeleteInputDefinitionMessage) Descriptor() ([]byte, []int) { - return fileDescriptorPrivate, []int{19} + return fileDescriptorPrivate, []int{21} } func (m *DeleteInputDefinitionMessage) GetIndex() string { @@ -652,7 +718,7 @@ type URI struct { func (m *URI) Reset() { *m = URI{} } func (m *URI) String() string { return proto.CompactTextString(m) } func (*URI) ProtoMessage() {} -func (*URI) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{20} } +func (*URI) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{22} } func (m *URI) GetScheme() string { if m != nil { @@ -683,7 +749,7 @@ type Node struct { func (m *Node) Reset() { *m = Node{} } func (m *Node) String() string { return proto.CompactTextString(m) } func (*Node) ProtoMessage() {} -func (*Node) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{21} } +func (*Node) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{23} } func (m *Node) GetID() string { if m != nil { @@ -707,7 +773,7 @@ type NodeStateMessage struct { func (m *NodeStateMessage) Reset() { *m = NodeStateMessage{} } func (m *NodeStateMessage) String() string { return proto.CompactTextString(m) } func (*NodeStateMessage) ProtoMessage() {} -func (*NodeStateMessage) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{22} } +func (*NodeStateMessage) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{24} } func (m *NodeStateMessage) GetNodeID() string { if m != nil { @@ -732,7 +798,7 @@ type NodeStatus struct { func (m *NodeStatus) Reset() { *m = NodeStatus{} } func (m *NodeStatus) String() string { return proto.CompactTextString(m) } func (*NodeStatus) ProtoMessage() {} -func (*NodeStatus) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{23} } +func (*NodeStatus) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{25} } func (m *NodeStatus) GetNode() *Node { if m != nil { @@ -764,7 +830,7 @@ type ClusterStatus struct { func (m *ClusterStatus) Reset() { *m = ClusterStatus{} } func (m *ClusterStatus) String() string { return proto.CompactTextString(m) } func (*ClusterStatus) ProtoMessage() {} -func (*ClusterStatus) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{24} } +func (*ClusterStatus) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{26} } func (m *ClusterStatus) GetClusterID() string { if m != nil { @@ -797,7 +863,7 @@ type Field struct { func (m *Field) Reset() { *m = Field{} } func (m *Field) String() string { return proto.CompactTextString(m) } func (*Field) ProtoMessage() {} -func (*Field) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{25} } +func (*Field) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{27} } func (m *Field) GetName() string { if m != nil { @@ -836,7 +902,7 @@ type CreateViewMessage struct { func (m *CreateViewMessage) Reset() { *m = CreateViewMessage{} } func (m *CreateViewMessage) String() string { return proto.CompactTextString(m) } func (*CreateViewMessage) ProtoMessage() {} -func (*CreateViewMessage) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{26} } +func (*CreateViewMessage) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{28} } func (m *CreateViewMessage) GetIndex() string { if m != nil { @@ -868,7 +934,7 @@ type DeleteViewMessage struct { func (m *DeleteViewMessage) Reset() { *m = DeleteViewMessage{} } func (m *DeleteViewMessage) String() string { return proto.CompactTextString(m) } func (*DeleteViewMessage) ProtoMessage() {} -func (*DeleteViewMessage) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{27} } +func (*DeleteViewMessage) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{29} } func (m *DeleteViewMessage) GetIndex() string { if m != nil { @@ -903,7 +969,7 @@ type ResizeInstruction struct { func (m *ResizeInstruction) Reset() { *m = ResizeInstruction{} } func (m *ResizeInstruction) String() string { return proto.CompactTextString(m) } func (*ResizeInstruction) ProtoMessage() {} -func (*ResizeInstruction) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{28} } +func (*ResizeInstruction) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{30} } func (m *ResizeInstruction) GetJobID() int64 { if m != nil { @@ -958,7 +1024,7 @@ type ResizeSource struct { func (m *ResizeSource) Reset() { *m = ResizeSource{} } func (m *ResizeSource) String() string { return proto.CompactTextString(m) } func (*ResizeSource) ProtoMessage() {} -func (*ResizeSource) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{29} } +func (*ResizeSource) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{31} } func (m *ResizeSource) GetNode() *Node { if m != nil { @@ -1005,7 +1071,7 @@ func (m *ResizeInstructionComplete) Reset() { *m = ResizeInstructionComp func (m *ResizeInstructionComplete) String() string { return proto.CompactTextString(m) } func (*ResizeInstructionComplete) ProtoMessage() {} func (*ResizeInstructionComplete) Descriptor() ([]byte, []int) { - return fileDescriptorPrivate, []int{30} + return fileDescriptorPrivate, []int{32} } func (m *ResizeInstructionComplete) GetJobID() int64 { @@ -1036,7 +1102,7 @@ type SetCoordinatorMessage struct { func (m *SetCoordinatorMessage) Reset() { *m = SetCoordinatorMessage{} } func (m *SetCoordinatorMessage) String() string { return proto.CompactTextString(m) } func (*SetCoordinatorMessage) ProtoMessage() {} -func (*SetCoordinatorMessage) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{31} } +func (*SetCoordinatorMessage) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{33} } func (m *SetCoordinatorMessage) GetNew() *Node { if m != nil { @@ -1053,7 +1119,7 @@ type Topology struct { func (m *Topology) Reset() { *m = Topology{} } func (m *Topology) String() string { return proto.CompactTextString(m) } func (*Topology) ProtoMessage() {} -func (*Topology) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{32} } +func (*Topology) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{34} } func (m *Topology) GetClusterID() string { if m != nil { @@ -1075,7 +1141,7 @@ type RecalculateCaches struct { func (m *RecalculateCaches) Reset() { *m = RecalculateCaches{} } func (m *RecalculateCaches) String() string { return proto.CompactTextString(m) } func (*RecalculateCaches) ProtoMessage() {} -func (*RecalculateCaches) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{33} } +func (*RecalculateCaches) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{35} } func init() { proto.RegisterType((*IndexMeta)(nil), "internal.IndexMeta") @@ -1090,6 +1156,8 @@ func init() { proto.RegisterType((*CreateIndexMessage)(nil), "internal.CreateIndexMessage") proto.RegisterType((*CreateFrameMessage)(nil), "internal.CreateFrameMessage") proto.RegisterType((*DeleteFrameMessage)(nil), "internal.DeleteFrameMessage") + proto.RegisterType((*CreateFieldMessage)(nil), "internal.CreateFieldMessage") + proto.RegisterType((*DeleteFieldMessage)(nil), "internal.DeleteFieldMessage") proto.RegisterType((*Frame)(nil), "internal.Frame") proto.RegisterType((*Schema)(nil), "internal.Schema") proto.RegisterType((*Index)(nil), "internal.Index") @@ -1590,6 +1658,82 @@ func (m *DeleteFrameMessage) MarshalTo(dAtA []byte) (int, error) { return i, nil } +func (m *CreateFieldMessage) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *CreateFieldMessage) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.Index) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintPrivate(dAtA, i, uint64(len(m.Index))) + i += copy(dAtA[i:], m.Index) + } + if len(m.Frame) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintPrivate(dAtA, i, uint64(len(m.Frame))) + i += copy(dAtA[i:], m.Frame) + } + if m.Field != nil { + dAtA[i] = 0x1a + i++ + i = encodeVarintPrivate(dAtA, i, uint64(m.Field.Size())) + n9, err := m.Field.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n9 + } + return i, nil +} + +func (m *DeleteFieldMessage) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *DeleteFieldMessage) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.Index) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintPrivate(dAtA, i, uint64(len(m.Index))) + i += copy(dAtA[i:], m.Index) + } + if len(m.Frame) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintPrivate(dAtA, i, uint64(len(m.Frame))) + i += copy(dAtA[i:], m.Frame) + } + if len(m.Field) > 0 { + dAtA[i] = 0x1a + i++ + i = encodeVarintPrivate(dAtA, i, uint64(len(m.Field))) + i += copy(dAtA[i:], m.Field) + } + return i, nil +} + func (m *Frame) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1615,11 +1759,11 @@ func (m *Frame) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintPrivate(dAtA, i, uint64(m.Meta.Size())) - n9, err := m.Meta.MarshalTo(dAtA[i:]) + n10, err := m.Meta.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n9 + i += n10 } if len(m.Views) > 0 { for _, s := range m.Views { @@ -1887,11 +2031,11 @@ func (m *CreateInputDefinitionMessage) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x1a i++ i = encodeVarintPrivate(dAtA, i, uint64(m.Definition.Size())) - n10, err := m.Definition.MarshalTo(dAtA[i:]) + n11, err := m.Definition.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n10 + i += n11 } return i, nil } @@ -1986,11 +2130,11 @@ func (m *Node) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintPrivate(dAtA, i, uint64(m.URI.Size())) - n11, err := m.URI.MarshalTo(dAtA[i:]) + n12, err := m.URI.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n11 + i += n12 } return i, nil } @@ -2044,32 +2188,32 @@ func (m *NodeStatus) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintPrivate(dAtA, i, uint64(m.Node.Size())) - n12, err := m.Node.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n12 - } - if m.MaxSlices != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintPrivate(dAtA, i, uint64(m.MaxSlices.Size())) - n13, err := m.MaxSlices.MarshalTo(dAtA[i:]) + n13, err := m.Node.MarshalTo(dAtA[i:]) if err != nil { return 0, err } i += n13 } - if m.Schema != nil { - dAtA[i] = 0x1a + if m.MaxSlices != nil { + dAtA[i] = 0x12 i++ - i = encodeVarintPrivate(dAtA, i, uint64(m.Schema.Size())) - n14, err := m.Schema.MarshalTo(dAtA[i:]) + i = encodeVarintPrivate(dAtA, i, uint64(m.MaxSlices.Size())) + n14, err := m.MaxSlices.MarshalTo(dAtA[i:]) if err != nil { return 0, err } i += n14 } + if m.Schema != nil { + dAtA[i] = 0x1a + i++ + i = encodeVarintPrivate(dAtA, i, uint64(m.Schema.Size())) + n15, err := m.Schema.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n15 + } return i, nil } @@ -2251,21 +2395,21 @@ func (m *ResizeInstruction) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintPrivate(dAtA, i, uint64(m.Node.Size())) - n15, err := m.Node.MarshalTo(dAtA[i:]) + n16, err := m.Node.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n15 + i += n16 } if m.Coordinator != nil { dAtA[i] = 0x1a i++ i = encodeVarintPrivate(dAtA, i, uint64(m.Coordinator.Size())) - n16, err := m.Coordinator.MarshalTo(dAtA[i:]) + n17, err := m.Coordinator.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n16 + i += n17 } if len(m.Sources) > 0 { for _, msg := range m.Sources { @@ -2283,21 +2427,21 @@ func (m *ResizeInstruction) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x2a i++ i = encodeVarintPrivate(dAtA, i, uint64(m.Schema.Size())) - n17, err := m.Schema.MarshalTo(dAtA[i:]) + n18, err := m.Schema.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n17 + i += n18 } if m.ClusterStatus != nil { dAtA[i] = 0x32 i++ i = encodeVarintPrivate(dAtA, i, uint64(m.ClusterStatus.Size())) - n18, err := m.ClusterStatus.MarshalTo(dAtA[i:]) + n19, err := m.ClusterStatus.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n18 + i += n19 } return i, nil } @@ -2321,11 +2465,11 @@ func (m *ResizeSource) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintPrivate(dAtA, i, uint64(m.Node.Size())) - n19, err := m.Node.MarshalTo(dAtA[i:]) + n20, err := m.Node.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n19 + i += n20 } if len(m.Index) > 0 { dAtA[i] = 0x12 @@ -2377,11 +2521,11 @@ func (m *ResizeInstructionComplete) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintPrivate(dAtA, i, uint64(m.Node.Size())) - n20, err := m.Node.MarshalTo(dAtA[i:]) + n21, err := m.Node.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n20 + i += n21 } if len(m.Error) > 0 { dAtA[i] = 0x1a @@ -2411,11 +2555,11 @@ func (m *SetCoordinatorMessage) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintPrivate(dAtA, i, uint64(m.New.Size())) - n21, err := m.New.MarshalTo(dAtA[i:]) + n22, err := m.New.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n21 + i += n22 } return i, nil } @@ -2712,6 +2856,42 @@ func (m *DeleteFrameMessage) Size() (n int) { return n } +func (m *CreateFieldMessage) Size() (n int) { + var l int + _ = l + l = len(m.Index) + if l > 0 { + n += 1 + l + sovPrivate(uint64(l)) + } + l = len(m.Frame) + if l > 0 { + n += 1 + l + sovPrivate(uint64(l)) + } + if m.Field != nil { + l = m.Field.Size() + n += 1 + l + sovPrivate(uint64(l)) + } + return n +} + +func (m *DeleteFieldMessage) Size() (n int) { + var l int + _ = l + l = len(m.Index) + if l > 0 { + n += 1 + l + sovPrivate(uint64(l)) + } + l = len(m.Frame) + if l > 0 { + n += 1 + l + sovPrivate(uint64(l)) + } + l = len(m.Field) + if l > 0 { + n += 1 + l + sovPrivate(uint64(l)) + } + return n +} + func (m *Frame) Size() (n int) { var l int _ = l @@ -4812,6 +4992,284 @@ func (m *DeleteFrameMessage) Unmarshal(dAtA []byte) error { } return nil } +func (m *CreateFieldMessage) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPrivate + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: CreateFieldMessage: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: CreateFieldMessage: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPrivate + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthPrivate + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Index = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Frame", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPrivate + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthPrivate + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Frame = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Field", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPrivate + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthPrivate + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Field == nil { + m.Field = &Field{} + } + if err := m.Field.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipPrivate(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *DeleteFieldMessage) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPrivate + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: DeleteFieldMessage: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: DeleteFieldMessage: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPrivate + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthPrivate + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Index = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Frame", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPrivate + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthPrivate + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Frame = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Field", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPrivate + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthPrivate + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Field = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipPrivate(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthPrivate + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *Frame) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -7855,84 +8313,86 @@ var ( func init() { proto.RegisterFile("private.proto", fileDescriptorPrivate) } var fileDescriptorPrivate = []byte{ - // 1263 bytes of a gzipped FileDescriptorProto + // 1296 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0x67, 0xbd, 0xb6, 0x63, 0x3f, 0xd7, 0x89, 0x33, 0x4d, 0x83, 0x13, 0x45, 0xae, 0x19, 0x21, - 0x1a, 0x2a, 0x11, 0x15, 0x57, 0x02, 0x1a, 0x54, 0xa9, 0x24, 0x76, 0xd5, 0x05, 0x12, 0xca, 0x38, - 0x2d, 0x12, 0x07, 0xa4, 0x89, 0x3d, 0xa4, 0xab, 0xac, 0x77, 0xcd, 0xee, 0x6c, 0x12, 0xf7, 0xc0, - 0x11, 0x21, 0x21, 0xee, 0x88, 0x2b, 0x5f, 0x86, 0x23, 0x1f, 0x01, 0x85, 0x0f, 0x81, 0xc4, 0x05, - 0x34, 0xff, 0x76, 0xd7, 0x7f, 0x43, 0x0a, 0xb7, 0x7d, 0xbf, 0xf7, 0x67, 0x7e, 0xf3, 0xde, 0x9b, - 0x37, 0xb3, 0x50, 0x1d, 0x86, 0xee, 0x19, 0xe5, 0x6c, 0x67, 0x18, 0x06, 0x3c, 0x40, 0x25, 0xd7, - 0xe7, 0x2c, 0xf4, 0xa9, 0x87, 0x3f, 0x83, 0xb2, 0xe3, 0xf7, 0xd9, 0xc5, 0x01, 0xe3, 0x14, 0x35, - 0xa1, 0xb2, 0x1f, 0x78, 0xf1, 0xc0, 0xff, 0x94, 0x1e, 0x33, 0xaf, 0x6e, 0x35, 0xad, 0xed, 0x32, - 0xc9, 0x42, 0xc2, 0xe2, 0xc8, 0x1d, 0xb0, 0xcf, 0x63, 0xea, 0xf3, 0x78, 0x50, 0xcf, 0x29, 0x8b, - 0x0c, 0x84, 0xff, 0xb2, 0xa0, 0xfc, 0x38, 0xa4, 0x03, 0x26, 0x23, 0x6e, 0x42, 0x89, 0x04, 0xe7, - 0xd9, 0x70, 0x89, 0x8c, 0xde, 0x82, 0x65, 0xc7, 0x3f, 0x63, 0x61, 0xc4, 0x3a, 0x3e, 0x3d, 0xf6, - 0x58, 0x5f, 0x86, 0x2b, 0x91, 0x09, 0x14, 0x6d, 0x41, 0x79, 0x9f, 0xf6, 0x5e, 0xb0, 0xa3, 0xd1, - 0x90, 0xd5, 0x6d, 0x19, 0x24, 0x05, 0x12, 0x6d, 0xd7, 0x7d, 0xc9, 0xea, 0xf9, 0xa6, 0xb5, 0x5d, - 0x25, 0x29, 0x30, 0xc9, 0xb7, 0x30, 0xc5, 0x17, 0x61, 0xb8, 0x41, 0xa8, 0x7f, 0x92, 0x70, 0x28, - 0x4a, 0x0e, 0x63, 0x18, 0xba, 0x03, 0xc5, 0xc7, 0x2e, 0xf3, 0xfa, 0x51, 0x7d, 0xa9, 0x69, 0x6f, - 0x57, 0x5a, 0x2b, 0x3b, 0x26, 0x7f, 0x3b, 0x12, 0x27, 0x5a, 0x8d, 0x31, 0x2c, 0x3b, 0x83, 0x61, - 0x10, 0x72, 0xc2, 0xa2, 0x61, 0xe0, 0x47, 0x0c, 0xd5, 0xc0, 0xee, 0x84, 0xa1, 0xde, 0xbb, 0xf8, - 0xc4, 0xdf, 0x42, 0x6d, 0xcf, 0x0b, 0x7a, 0xa7, 0x6d, 0xca, 0x29, 0x61, 0xdf, 0xc4, 0x2c, 0xe2, - 0x68, 0x0d, 0x0a, 0xb2, 0x0a, 0xda, 0x4e, 0x09, 0x02, 0x95, 0x99, 0xd4, 0x69, 0x56, 0x82, 0x40, - 0xa5, 0xbf, 0x4c, 0x45, 0x9e, 0x28, 0x41, 0xa0, 0x5d, 0xcf, 0xed, 0xa9, 0x14, 0xe4, 0x89, 0x12, - 0x10, 0x82, 0xfc, 0x73, 0x97, 0x9d, 0xeb, 0x7d, 0xcb, 0x6f, 0xec, 0xc0, 0x6a, 0x66, 0x7d, 0x4d, - 0x73, 0x1d, 0x8a, 0x24, 0x38, 0x77, 0xda, 0x51, 0xdd, 0x6a, 0xda, 0xdb, 0x79, 0xa2, 0x25, 0x99, - 0x5d, 0x59, 0x7e, 0xa1, 0xca, 0x49, 0x55, 0x0a, 0xe0, 0x0d, 0x28, 0xc8, 0x54, 0x8b, 0x5d, 0xa6, - 0xbe, 0xe2, 0x13, 0xff, 0x6d, 0x41, 0xf9, 0x80, 0x5e, 0x48, 0x1a, 0x11, 0x7a, 0x08, 0xa5, 0x2e, - 0xa7, 0x7e, 0x9f, 0x86, 0x7d, 0x69, 0x54, 0x69, 0xbd, 0x91, 0xa6, 0x30, 0x31, 0xdb, 0x31, 0x36, - 0x1d, 0x9f, 0x87, 0x23, 0x92, 0xb8, 0xa0, 0x5d, 0x58, 0xd2, 0x3d, 0x21, 0x39, 0x54, 0x5a, 0xcd, - 0x59, 0xde, 0x49, 0xdb, 0x08, 0x67, 0xe3, 0xb0, 0xf9, 0x21, 0x54, 0xc7, 0xc2, 0x0a, 0xae, 0xa7, - 0x6c, 0x64, 0x2a, 0x72, 0xca, 0x46, 0x22, 0x77, 0x67, 0xd4, 0x8b, 0x55, 0x9e, 0xf3, 0x44, 0x09, - 0xbb, 0xb9, 0x0f, 0xac, 0xcd, 0x5d, 0xb8, 0x91, 0x8d, 0x7a, 0x1d, 0x5f, 0xfc, 0x15, 0xa0, 0xfd, - 0x90, 0x51, 0xce, 0x24, 0xbd, 0x03, 0x16, 0x45, 0xf4, 0x84, 0xcd, 0xaf, 0xb4, 0xaa, 0x5e, 0x2e, - 0x5b, 0xbd, 0x2d, 0x28, 0x3b, 0x91, 0xd9, 0xb8, 0x2d, 0xfb, 0x32, 0x05, 0xf0, 0x5d, 0x40, 0x6d, - 0xe6, 0x31, 0xce, 0xf4, 0xf9, 0x5d, 0x10, 0x1f, 0x77, 0x0d, 0x97, 0xab, 0x6d, 0xd1, 0x1d, 0xc8, - 0x8b, 0xa3, 0x2b, 0xa9, 0x54, 0x5a, 0x37, 0xd3, 0x4c, 0x27, 0x73, 0x82, 0x48, 0x03, 0xec, 0x9a, - 0xa0, 0xfa, 0xb8, 0x5f, 0xb1, 0xc1, 0x19, 0xad, 0x6c, 0x96, 0xb2, 0x27, 0x97, 0x4a, 0x06, 0x88, - 0x5e, 0xea, 0x91, 0xd9, 0xeb, 0xab, 0x2e, 0x85, 0xbf, 0xd4, 0xa8, 0x38, 0x12, 0x87, 0x42, 0xab, - 0x7c, 0xe4, 0xf7, 0xfc, 0x2d, 0x4f, 0xf0, 0x10, 0xb1, 0xc5, 0x19, 0x8a, 0xea, 0x76, 0xd3, 0x16, - 0xb1, 0xa5, 0x80, 0xef, 0x43, 0xb1, 0xdb, 0x7b, 0xc1, 0x06, 0x14, 0xbd, 0x2d, 0x1a, 0xb5, 0xcf, - 0x2e, 0x58, 0xa4, 0xdb, 0x7c, 0x65, 0x22, 0x7d, 0xc4, 0xe8, 0xf1, 0x0f, 0x96, 0x66, 0x3f, 0x87, - 0x51, 0x51, 0xae, 0x1d, 0xd5, 0xf3, 0x53, 0x13, 0x47, 0xe0, 0x44, 0xab, 0x51, 0x07, 0x6a, 0x8e, - 0x3f, 0x8c, 0x79, 0x9b, 0x7d, 0xed, 0xfa, 0x2e, 0x77, 0x03, 0x3f, 0xaa, 0x17, 0xa5, 0xcb, 0x46, - 0x76, 0xe9, 0x31, 0x0b, 0x32, 0xe5, 0x82, 0xbf, 0xb3, 0x60, 0x65, 0x02, 0xbc, 0x82, 0x57, 0x6e, - 0x31, 0xaf, 0xf7, 0x92, 0x91, 0x69, 0x4b, 0xc3, 0xc6, 0x5c, 0x36, 0xe3, 0x13, 0xf4, 0x17, 0x0b, - 0xd6, 0x66, 0x19, 0xcc, 0x64, 0xd3, 0x00, 0x78, 0x1a, 0xba, 0x03, 0x1a, 0x8e, 0x3e, 0x61, 0x23, - 0x7d, 0x7b, 0x64, 0x10, 0xf4, 0x05, 0xac, 0x4f, 0xc4, 0xfa, 0xa8, 0xa7, 0x52, 0xa4, 0x48, 0xdd, - 0x9e, 0x4b, 0x4a, 0xd9, 0x91, 0x39, 0xee, 0xf8, 0x4f, 0x0b, 0x6e, 0xcd, 0x54, 0xa5, 0xdd, 0x67, - 0x65, 0x1b, 0xfd, 0x2e, 0xd4, 0x9e, 0x8b, 0xc1, 0xd0, 0x66, 0x11, 0x77, 0x7d, 0x2a, 0x2c, 0x75, - 0x7b, 0x4e, 0xe1, 0xc8, 0x81, 0x92, 0xc4, 0x0e, 0xe8, 0x50, 0xd3, 0x7c, 0xe7, 0x0a, 0x9a, 0x3b, - 0xc6, 0x5e, 0xcf, 0x4d, 0x23, 0x0a, 0x32, 0x72, 0x8e, 0x9b, 0x4b, 0x41, 0x0a, 0x62, 0x22, 0x8e, - 0x39, 0x5c, 0x6b, 0xaa, 0x05, 0xb0, 0x65, 0x26, 0xc9, 0x18, 0x93, 0xc5, 0x67, 0xf2, 0x01, 0x40, - 0x6a, 0xaa, 0x8f, 0xfb, 0x82, 0xfe, 0xcc, 0x18, 0xe3, 0x27, 0xb0, 0x65, 0xc6, 0xdc, 0x35, 0x16, - 0x34, 0xdd, 0x92, 0x4b, 0xbb, 0x05, 0x77, 0xc0, 0x7e, 0x46, 0x1c, 0x71, 0xd5, 0xc9, 0xd3, 0x6a, - 0x4a, 0xa4, 0x25, 0xe1, 0xf2, 0x24, 0x88, 0xb8, 0x71, 0x11, 0xdf, 0x02, 0x7b, 0x1a, 0x84, 0x5c, - 0x32, 0xae, 0x12, 0xf9, 0x8d, 0xdf, 0x87, 0xfc, 0x61, 0xd0, 0x67, 0x68, 0x19, 0x72, 0x4e, 0x5b, - 0xc7, 0xc8, 0x39, 0x6d, 0x74, 0x5b, 0x86, 0xd7, 0x33, 0xa4, 0x9a, 0x6e, 0xee, 0x19, 0x71, 0x88, - 0xd0, 0xe0, 0x47, 0x50, 0x13, 0x8e, 0x5d, 0x4e, 0x79, 0x32, 0xc2, 0xd6, 0xa1, 0x28, 0xb0, 0x24, - 0x90, 0x96, 0xe4, 0x85, 0x20, 0xec, 0xcc, 0x10, 0x93, 0x02, 0xfe, 0xd1, 0x02, 0x30, 0x21, 0xe2, - 0x08, 0x61, 0xc5, 0x44, 0xba, 0x56, 0x5a, 0xcb, 0xe9, 0x92, 0x02, 0x25, 0x8a, 0xe5, 0xbb, 0x99, - 0x6b, 0x78, 0x7a, 0xbe, 0x25, 0x2a, 0x92, 0xb9, 0xac, 0xb7, 0xcd, 0x38, 0xd3, 0x85, 0xaa, 0xa5, - 0xf6, 0x0a, 0xd7, 0x29, 0x13, 0x37, 0x40, 0x75, 0xdf, 0x8b, 0x23, 0xce, 0x42, 0xcd, 0x48, 0x3c, - 0x17, 0x14, 0x90, 0xec, 0x28, 0x05, 0x66, 0x6f, 0x0a, 0xbd, 0x09, 0x05, 0xc1, 0xd4, 0x9c, 0xc9, - 0xc9, 0x6d, 0x28, 0x25, 0xee, 0x42, 0x61, 0xfe, 0x1c, 0x40, 0x90, 0x97, 0x8f, 0x43, 0x5d, 0x3a, - 0xf9, 0x2e, 0xac, 0x81, 0x7d, 0xe0, 0xaa, 0x5e, 0xb3, 0x89, 0xf8, 0x94, 0x08, 0xbd, 0x90, 0x67, - 0x41, 0x20, 0x54, 0x5c, 0x8b, 0xab, 0xaa, 0x99, 0xc5, 0x1c, 0x7f, 0x95, 0x0b, 0xcc, 0xbc, 0xaf, - 0xec, 0xcc, 0xfb, 0xaa, 0x0b, 0xab, 0xaa, 0x61, 0xff, 0xcf, 0xa0, 0x3f, 0xe7, 0x60, 0x95, 0xb0, - 0xc8, 0x7d, 0xc9, 0x1c, 0x3f, 0xe2, 0x61, 0x9c, 0x0c, 0x9b, 0x8f, 0x83, 0x63, 0x9d, 0x6a, 0x9b, - 0x28, 0x21, 0x69, 0x8b, 0xdc, 0x82, 0xb6, 0xb8, 0x27, 0x5e, 0xfa, 0x41, 0xd8, 0x17, 0x43, 0x27, - 0x08, 0x75, 0xa1, 0x27, 0x4d, 0xb3, 0x26, 0xe8, 0x1e, 0x2c, 0x75, 0x83, 0x38, 0xec, 0x25, 0x57, - 0xd2, 0x7a, 0x6a, 0xad, 0x98, 0x29, 0x35, 0x31, 0x66, 0x99, 0x3e, 0x2a, 0x2c, 0xee, 0x23, 0xf4, - 0x70, 0xa2, 0x8f, 0xe4, 0x23, 0xbc, 0xd2, 0x7a, 0x3d, 0x75, 0x18, 0x53, 0x93, 0x71, 0x6b, 0xfc, - 0xbd, 0x05, 0x37, 0xb2, 0x14, 0xfe, 0xd5, 0xc1, 0x48, 0x2a, 0x92, 0x9b, 0x59, 0x11, 0x7b, 0x56, - 0x45, 0xf2, 0x69, 0x45, 0xd2, 0x27, 0x5b, 0x21, 0xf3, 0x64, 0xc3, 0xa7, 0xb0, 0x31, 0x55, 0xa6, - 0xfd, 0x60, 0x30, 0x14, 0xfd, 0xf0, 0x1f, 0xca, 0xb5, 0x06, 0x85, 0x4e, 0x18, 0xea, 0x42, 0x95, - 0x89, 0x12, 0xf0, 0x03, 0xb8, 0xd5, 0x65, 0x3c, 0x53, 0x24, 0xd3, 0x6d, 0x4d, 0xb0, 0x0f, 0xd9, - 0xf9, 0x9c, 0xed, 0x0b, 0x15, 0xde, 0x83, 0xd2, 0x51, 0x30, 0x0c, 0xbc, 0xe0, 0x64, 0x74, 0xc5, - 0xa1, 0xad, 0xc3, 0x92, 0x9a, 0x49, 0xea, 0xca, 0x2f, 0x13, 0x23, 0xe2, 0x9b, 0xa2, 0x25, 0x7b, - 0xd4, 0xeb, 0xc5, 0x1e, 0xe5, 0x4c, 0xfe, 0x08, 0x44, 0x7b, 0xb5, 0x5f, 0x2f, 0x1b, 0xd6, 0x6f, - 0x97, 0x0d, 0xeb, 0xf7, 0xcb, 0x86, 0xf5, 0xd3, 0x1f, 0x8d, 0xd7, 0x8e, 0x8b, 0xf2, 0x97, 0xf3, - 0xfe, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x2d, 0x85, 0x72, 0x83, 0x0e, 0x00, 0x00, + 0x14, 0x67, 0xbd, 0xb6, 0x63, 0x3f, 0xc7, 0x89, 0x33, 0x4d, 0x83, 0x13, 0x45, 0xae, 0x19, 0x01, + 0x0d, 0x95, 0x88, 0x8a, 0x2b, 0x01, 0x0d, 0xaa, 0x54, 0x12, 0xbb, 0xea, 0x02, 0x09, 0x65, 0x9c, + 0x06, 0x89, 0x03, 0xd2, 0xc4, 0x1e, 0xd2, 0x55, 0xd6, 0xbb, 0x66, 0x77, 0x9c, 0xc4, 0x3d, 0x70, + 0x44, 0x48, 0x88, 0x3b, 0xe2, 0xca, 0x97, 0xe1, 0xc8, 0x47, 0x40, 0xe1, 0x43, 0x20, 0x71, 0x01, + 0xcd, 0xbf, 0xdd, 0xf5, 0xdf, 0x90, 0xd0, 0xdb, 0xbe, 0xdf, 0xfb, 0x33, 0xbf, 0x79, 0xef, 0xcd, + 0x9b, 0x59, 0x28, 0xf7, 0x43, 0xf7, 0x8c, 0x72, 0xb6, 0xdd, 0x0f, 0x03, 0x1e, 0xa0, 0x82, 0xeb, + 0x73, 0x16, 0xfa, 0xd4, 0xc3, 0x9f, 0x43, 0xd1, 0xf1, 0xbb, 0xec, 0x62, 0x9f, 0x71, 0x8a, 0xea, + 0x50, 0xda, 0x0b, 0xbc, 0x41, 0xcf, 0xff, 0x8c, 0x1e, 0x33, 0xaf, 0x6a, 0xd5, 0xad, 0xad, 0x22, + 0x49, 0x43, 0xc2, 0xe2, 0xd0, 0xed, 0xb1, 0x2f, 0x06, 0xd4, 0xe7, 0x83, 0x5e, 0x35, 0xa3, 0x2c, + 0x52, 0x10, 0xfe, 0xdb, 0x82, 0xe2, 0x93, 0x90, 0xf6, 0x98, 0x8c, 0xb8, 0x01, 0x05, 0x12, 0x9c, + 0xa7, 0xc3, 0xc5, 0x32, 0x7a, 0x1b, 0x96, 0x1c, 0xff, 0x8c, 0x85, 0x11, 0x6b, 0xf9, 0xf4, 0xd8, + 0x63, 0x5d, 0x19, 0xae, 0x40, 0xc6, 0x50, 0xb4, 0x09, 0xc5, 0x3d, 0xda, 0x79, 0xc1, 0x0e, 0x87, + 0x7d, 0x56, 0xb5, 0x65, 0x90, 0x04, 0x88, 0xb5, 0x6d, 0xf7, 0x25, 0xab, 0x66, 0xeb, 0xd6, 0x56, + 0x99, 0x24, 0xc0, 0x38, 0xdf, 0xdc, 0x04, 0x5f, 0x84, 0x61, 0x91, 0x50, 0xff, 0x24, 0xe6, 0x90, + 0x97, 0x1c, 0x46, 0x30, 0x74, 0x17, 0xf2, 0x4f, 0x5c, 0xe6, 0x75, 0xa3, 0xea, 0x42, 0xdd, 0xde, + 0x2a, 0x35, 0x96, 0xb7, 0x4d, 0xfe, 0xb6, 0x25, 0x4e, 0xb4, 0x1a, 0x63, 0x58, 0x72, 0x7a, 0xfd, + 0x20, 0xe4, 0x84, 0x45, 0xfd, 0xc0, 0x8f, 0x18, 0xaa, 0x80, 0xdd, 0x0a, 0x43, 0xbd, 0x77, 0xf1, + 0x89, 0xbf, 0x83, 0xca, 0xae, 0x17, 0x74, 0x4e, 0x9b, 0x94, 0x53, 0xc2, 0xbe, 0x1d, 0xb0, 0x88, + 0xa3, 0x55, 0xc8, 0xc9, 0x2a, 0x68, 0x3b, 0x25, 0x08, 0x54, 0x66, 0x52, 0xa7, 0x59, 0x09, 0x02, + 0x95, 0xfe, 0x32, 0x15, 0x59, 0xa2, 0x04, 0x81, 0xb6, 0x3d, 0xb7, 0xa3, 0x52, 0x90, 0x25, 0x4a, + 0x40, 0x08, 0xb2, 0x47, 0x2e, 0x3b, 0xd7, 0xfb, 0x96, 0xdf, 0xd8, 0x81, 0x95, 0xd4, 0xfa, 0x9a, + 0xe6, 0x1a, 0xe4, 0x49, 0x70, 0xee, 0x34, 0xa3, 0xaa, 0x55, 0xb7, 0xb7, 0xb2, 0x44, 0x4b, 0x32, + 0xbb, 0xb2, 0xfc, 0x42, 0x95, 0x91, 0xaa, 0x04, 0xc0, 0xeb, 0x90, 0x93, 0xa9, 0x16, 0xbb, 0x4c, + 0x7c, 0xc5, 0x27, 0xfe, 0xc7, 0x82, 0xe2, 0x3e, 0xbd, 0x90, 0x34, 0x22, 0xf4, 0x08, 0x0a, 0x6d, + 0x4e, 0xfd, 0x2e, 0x0d, 0xbb, 0xd2, 0xa8, 0xd4, 0x78, 0x23, 0x49, 0x61, 0x6c, 0xb6, 0x6d, 0x6c, + 0x5a, 0x3e, 0x0f, 0x87, 0x24, 0x76, 0x41, 0x3b, 0xb0, 0xa0, 0x7b, 0x42, 0x72, 0x28, 0x35, 0xea, + 0xd3, 0xbc, 0xe3, 0xb6, 0x11, 0xce, 0xc6, 0x61, 0xe3, 0x23, 0x28, 0x8f, 0x84, 0x15, 0x5c, 0x4f, + 0xd9, 0xd0, 0x54, 0xe4, 0x94, 0x0d, 0x45, 0xee, 0xce, 0xa8, 0x37, 0x50, 0x79, 0xce, 0x12, 0x25, + 0xec, 0x64, 0x3e, 0xb4, 0x36, 0x76, 0x60, 0x31, 0x1d, 0xf5, 0x3a, 0xbe, 0xf8, 0x6b, 0x40, 0x7b, + 0x21, 0xa3, 0x9c, 0x49, 0x7a, 0xfb, 0x2c, 0x8a, 0xe8, 0x09, 0x9b, 0x5d, 0x69, 0x55, 0xbd, 0x4c, + 0xba, 0x7a, 0x9b, 0x50, 0x74, 0x22, 0xb3, 0x71, 0x5b, 0xf6, 0x65, 0x02, 0xe0, 0x7b, 0x80, 0x9a, + 0xcc, 0x63, 0x9c, 0xe9, 0xf3, 0x3b, 0x27, 0x3e, 0x6e, 0x1b, 0x2e, 0x57, 0xdb, 0xa2, 0xbb, 0x90, + 0x15, 0x47, 0x57, 0x52, 0x29, 0x35, 0x6e, 0x25, 0x99, 0x8e, 0xe7, 0x04, 0x91, 0x06, 0xd8, 0x35, + 0x41, 0xf5, 0x71, 0xbf, 0x62, 0x83, 0x53, 0x5a, 0xd9, 0x2c, 0x65, 0x8f, 0x2f, 0x15, 0x0f, 0x10, + 0xbd, 0xd4, 0x63, 0xb3, 0xd7, 0x9b, 0x2e, 0x85, 0x4f, 0x62, 0xb2, 0xe2, 0xa4, 0xde, 0x84, 0xec, + 0x5b, 0x90, 0x93, 0xbe, 0x9a, 0xed, 0xc4, 0x0c, 0x50, 0x5a, 0x7c, 0x14, 0x53, 0xbd, 0xe9, 0x42, + 0xab, 0xe9, 0x85, 0x8a, 0x26, 0xee, 0x57, 0xda, 0x56, 0x9c, 0xe9, 0x03, 0xe1, 0xa3, 0x22, 0xc9, + 0xef, 0xd9, 0x35, 0x1b, 0x4b, 0xa4, 0x88, 0x2d, 0x86, 0x40, 0x54, 0xb5, 0xeb, 0xb6, 0x88, 0x2d, + 0x05, 0xfc, 0x00, 0xf2, 0xed, 0xce, 0x0b, 0xd6, 0xa3, 0xe8, 0x1d, 0x71, 0xd2, 0xba, 0xec, 0x82, + 0x45, 0xfa, 0x9c, 0x2e, 0x8f, 0xd5, 0x9f, 0x18, 0x3d, 0xfe, 0xd1, 0xd2, 0x7b, 0x9a, 0xc1, 0x28, + 0x2f, 0xd7, 0x8e, 0xaa, 0xd9, 0x89, 0x91, 0x29, 0x70, 0xa2, 0xd5, 0xa8, 0x05, 0x15, 0xc7, 0xef, + 0x0f, 0x78, 0x93, 0x7d, 0xe3, 0xfa, 0x2e, 0x77, 0x03, 0x3f, 0xaa, 0xe6, 0xa5, 0xcb, 0x7a, 0x7a, + 0xe9, 0x11, 0x0b, 0x32, 0xe1, 0x82, 0xbf, 0xb7, 0x60, 0x79, 0x0c, 0xbc, 0x82, 0x57, 0x66, 0x3e, + 0xaf, 0xf7, 0xe3, 0x99, 0x6f, 0x4b, 0xc3, 0xda, 0x4c, 0x36, 0xa3, 0x57, 0xc0, 0xaf, 0x16, 0xac, + 0x4e, 0x33, 0x98, 0xca, 0xa6, 0x06, 0xf0, 0x2c, 0x74, 0x7b, 0x34, 0x1c, 0x7e, 0xca, 0x86, 0xfa, + 0xfa, 0x4b, 0x21, 0xe8, 0x4b, 0x58, 0x1b, 0x8b, 0xf5, 0x71, 0x47, 0xa5, 0x48, 0x91, 0xba, 0x33, + 0x93, 0x94, 0xb2, 0x23, 0x33, 0xdc, 0xf1, 0x5f, 0x16, 0xdc, 0x9e, 0xaa, 0x4a, 0x7a, 0xd2, 0x4a, + 0xf7, 0xe4, 0x3d, 0xa8, 0x1c, 0x89, 0xc9, 0xd6, 0x64, 0x11, 0x77, 0x7d, 0x2a, 0x2c, 0x75, 0xd3, + 0x4e, 0xe0, 0xc8, 0x81, 0x82, 0xc4, 0xf6, 0x69, 0x5f, 0xd3, 0x7c, 0xf7, 0x0a, 0x9a, 0xdb, 0xc6, + 0x5e, 0x0f, 0x7e, 0x23, 0x0a, 0x32, 0xf2, 0x22, 0x32, 0xb7, 0x9a, 0x14, 0xc4, 0x48, 0x1f, 0x71, + 0xb8, 0xd6, 0x58, 0x0e, 0x60, 0xd3, 0x8c, 0xc2, 0x11, 0x26, 0xf3, 0x4f, 0xea, 0x43, 0x80, 0xc4, + 0x54, 0x4f, 0x80, 0x39, 0xfd, 0x99, 0x32, 0xc6, 0x4f, 0x61, 0xd3, 0xcc, 0xe9, 0x6b, 0x2c, 0x68, + 0xba, 0x25, 0x93, 0x74, 0x0b, 0x6e, 0x81, 0xfd, 0x9c, 0x38, 0xe2, 0xae, 0x96, 0xa7, 0xd5, 0x94, + 0x48, 0x4b, 0xc2, 0xe5, 0x69, 0x10, 0x71, 0xe3, 0x22, 0xbe, 0x05, 0xf6, 0x2c, 0x08, 0xb9, 0x64, + 0x5c, 0x26, 0xf2, 0x1b, 0x7f, 0x00, 0xd9, 0x83, 0xa0, 0xcb, 0xd0, 0x12, 0x64, 0x9c, 0xa6, 0x8e, + 0x91, 0x71, 0x9a, 0xe8, 0x8e, 0x0c, 0xaf, 0x67, 0x48, 0x39, 0xd9, 0xdc, 0x73, 0xe2, 0x10, 0xa1, + 0xc1, 0x8f, 0xa1, 0x22, 0x1c, 0xdb, 0x9c, 0xf2, 0x78, 0x06, 0xaf, 0x41, 0x5e, 0x60, 0x71, 0x20, + 0x2d, 0xc9, 0x1b, 0x4d, 0xd8, 0x99, 0xd1, 0x26, 0x05, 0xfc, 0x93, 0x05, 0x60, 0x42, 0x0c, 0x22, + 0x84, 0x15, 0x13, 0xe9, 0x5a, 0x6a, 0x2c, 0x25, 0x4b, 0x0a, 0x94, 0x28, 0x96, 0xef, 0xa5, 0xde, + 0x11, 0x93, 0xf3, 0x2d, 0x56, 0x91, 0xd4, 0x6b, 0x63, 0xcb, 0x8c, 0x33, 0x5d, 0xa8, 0x4a, 0x62, + 0xaf, 0x70, 0x9d, 0x32, 0x71, 0x85, 0x95, 0xf7, 0xbc, 0x41, 0xc4, 0x59, 0xa8, 0x19, 0x89, 0xf7, + 0x8e, 0x02, 0xe2, 0x1d, 0x25, 0xc0, 0xf4, 0x4d, 0xa1, 0x37, 0x21, 0x27, 0x98, 0x9a, 0x33, 0x39, + 0xbe, 0x0d, 0xa5, 0xc4, 0x6d, 0x3d, 0xd5, 0xa7, 0xce, 0x01, 0x04, 0x59, 0xf9, 0xba, 0xd5, 0xa5, + 0x93, 0x0f, 0xdb, 0x0a, 0xd8, 0xfb, 0xae, 0xea, 0x35, 0x9b, 0x88, 0x4f, 0x89, 0xd0, 0x0b, 0x79, + 0x16, 0x04, 0x42, 0xc5, 0xbd, 0xbe, 0xa2, 0x9a, 0x59, 0xcc, 0xf1, 0x9b, 0xdc, 0x35, 0xe6, 0x81, + 0x68, 0xa7, 0x1e, 0x88, 0x6d, 0x58, 0x51, 0x0d, 0xfb, 0x2a, 0x83, 0xfe, 0x92, 0x81, 0x15, 0xc2, + 0x22, 0xf7, 0x25, 0x73, 0xfc, 0x88, 0x87, 0x83, 0x78, 0xd8, 0x7c, 0x12, 0x1c, 0xeb, 0x54, 0xdb, + 0x44, 0x09, 0x71, 0x5b, 0x64, 0xe6, 0xb4, 0xc5, 0x7d, 0xf1, 0xab, 0x12, 0x84, 0x5d, 0x31, 0x74, + 0x82, 0x50, 0x17, 0x7a, 0xdc, 0x34, 0x6d, 0x82, 0xee, 0xc3, 0x42, 0x3b, 0x18, 0x84, 0x9d, 0xf8, + 0x4a, 0x5a, 0x4b, 0xac, 0x15, 0x33, 0xa5, 0x26, 0xc6, 0x2c, 0xd5, 0x47, 0xb9, 0xf9, 0x7d, 0x84, + 0x1e, 0x8d, 0xf5, 0x91, 0xfc, 0x8b, 0x28, 0x35, 0x5e, 0x4f, 0x1c, 0x46, 0xd4, 0x64, 0xd4, 0x1a, + 0xff, 0x60, 0xc1, 0x62, 0x9a, 0xc2, 0x7f, 0x3a, 0x18, 0x71, 0x45, 0x32, 0x53, 0x2b, 0x62, 0x4f, + 0xab, 0x48, 0x36, 0xa9, 0x48, 0xf2, 0xe6, 0xcc, 0xa5, 0xde, 0x9c, 0xf8, 0x14, 0xd6, 0x27, 0xca, + 0xb4, 0x17, 0xf4, 0xfa, 0xa2, 0x1f, 0xfe, 0x47, 0xb9, 0x56, 0x21, 0xd7, 0x0a, 0x43, 0x5d, 0xa8, + 0x22, 0x51, 0x02, 0x7e, 0x08, 0xb7, 0xdb, 0x8c, 0xa7, 0x8a, 0x64, 0xba, 0xad, 0x0e, 0xf6, 0x01, + 0x3b, 0x9f, 0xb1, 0x7d, 0xa1, 0xc2, 0xbb, 0x50, 0x38, 0x0c, 0xfa, 0x81, 0x17, 0x9c, 0x0c, 0xaf, + 0x38, 0xb4, 0x55, 0x58, 0x50, 0x33, 0x49, 0x5d, 0xf9, 0x45, 0x62, 0x44, 0x7c, 0x4b, 0xb4, 0x64, + 0x87, 0x7a, 0x9d, 0x81, 0x47, 0x39, 0x93, 0x7f, 0x32, 0xd1, 0x6e, 0xe5, 0xb7, 0xcb, 0x9a, 0xf5, + 0xfb, 0x65, 0xcd, 0xfa, 0xe3, 0xb2, 0x66, 0xfd, 0xfc, 0x67, 0xed, 0xb5, 0xe3, 0xbc, 0xfc, 0x67, + 0x7e, 0xf0, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x14, 0x23, 0x92, 0x89, 0x44, 0x0f, 0x00, 0x00, } diff --git a/internal/private.proto b/internal/private.proto index ccf2b1c74..b012936d9 100644 --- a/internal/private.proto +++ b/internal/private.proto @@ -69,6 +69,18 @@ message DeleteFrameMessage { string Frame = 2; } +message CreateFieldMessage { + string Index = 1; + string Frame = 2; + Field Field = 3; +} + +message DeleteFieldMessage { + string Index = 1; + string Frame = 2; + string Field = 3; +} + message Frame { string Name = 1; FrameMeta Meta = 2; diff --git a/roaring/assembly.go b/roaring/assembly.go deleted file mode 100644 index ea67cf66e..000000000 --- a/roaring/assembly.go +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright 2017 Pilosa Corp. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package roaring - - -// bit population count, take from -// https://code.google.com/p/go/issues/detail?id=4988#c11 -// credit: https://code.google.com/u/arnehormann/ -func popcntGo(x uint64) (n uint64) { - x -= (x >> 1) & 0x5555555555555555 - x = (x>>2)&0x3333333333333333 + x&0x3333333333333333 - x += x >> 4 - x &= 0x0f0f0f0f0f0f0f0f - x *= 0x0101010101010101 - return x >> 56 -} - -func popcntSliceGo(s []uint64) uint64 { - cnt := uint64(0) - for _, x := range s { - cnt += popcntGo(x) - } - return cnt -} - -func popcntMaskSliceGo(s, m []uint64) uint64 { - cnt := uint64(0) - for i := range s { - cnt += popcntGo(s[i] &^ m[i]) - } - return cnt -} - -func popcntAndSliceGo(s, m []uint64) uint64 { - cnt := uint64(0) - for i := range s { - cnt += popcntGo(s[i] & m[i]) - } - return cnt -} - -func popcntOrSliceGo(s, m []uint64) uint64 { - cnt := uint64(0) - for i := range s { - cnt += popcntGo(s[i] | m[i]) - } - return cnt -} - -func popcntXorSliceGo(s, m []uint64) uint64 { - cnt := uint64(0) - for i := range s { - cnt += popcntGo(s[i] ^ m[i]) - } - return cnt -} diff --git a/roaring/assembly_amd64.s b/roaring/assembly_amd64.s deleted file mode 100644 index 5b65e0635..000000000 --- a/roaring/assembly_amd64.s +++ /dev/null @@ -1,122 +0,0 @@ -#include "textflag.h" - -TEXT ·hasAsm(SB),4,$0-1 - MOVQ $1, AX - CPUID - SHRQ $23, CX - ANDQ $1, CX - MOVB CX, ret+0(FP) - RET - -TEXT ·POPCNTQ(SB),NOSPLIT,$0-16 - MOVQ memory+0(FP), BP - POPCNTQ BP, BX - MOVQ BX, ret+8(FP) - RET - -TEXT ·BSFQ(SB),NOSPLIT,$0-16 - MOVQ memory+0(FP), BP - BSFQ BP, BX - MOVQ BX, ret+8(FP) - RET - -#define POPCNTQ_DX_DX BYTE $0xf3; BYTE $0x48; BYTE $0x0f; BYTE $0xb8; BYTE $0xd2 - -TEXT ·popcntSliceAsm(SB),4,$0-32 -XORQ AX, AX -MOVQ s_base+0(FP), SI -MOVQ s_len+8(FP), CX -TESTQ CX, CX -JZ popcntSliceEnd -popcntSliceLoop: -BYTE $0xf3; BYTE $0x48; BYTE $0x0f; BYTE $0xb8; BYTE $0x16 // POPCNTQ (SI), DX -ADDQ DX, AX -ADDQ $8, SI -LOOP popcntSliceLoop -popcntSliceEnd: -MOVQ AX, ret+24(FP) -RET - -TEXT ·popcntMaskSliceAsm(SB),4,$0-56 -XORQ AX, AX -MOVQ s_base+0(FP), SI -MOVQ s_len+8(FP), CX -TESTQ CX, CX -JZ popcntMaskSliceEnd -MOVQ m+24(FP), DI -popcntMaskSliceLoop: -MOVQ (DI), DX -NOTQ DX -ANDQ (SI), DX -POPCNTQ_DX_DX -ADDQ DX, AX -ADDQ $8, SI -ADDQ $8, DI -LOOP popcntMaskSliceLoop -popcntMaskSliceEnd: -MOVQ AX, ret+48(FP) -RET - -TEXT ·popcntAndSliceAsm(SB),4,$0-56 -XORQ AX, AX -MOVQ s_base+0(FP), SI -MOVQ s_len+8(FP), CX -TESTQ CX, CX -JZ popcntAndSliceEnd -MOVQ m+24(FP), DI -popcntAndSliceLoop: -MOVQ (DI), DX -ANDQ (SI), DX -POPCNTQ_DX_DX -ADDQ DX, AX -ADDQ $8, SI -ADDQ $8, DI -LOOP popcntAndSliceLoop -popcntAndSliceEnd: -MOVQ AX, ret+48(FP) -RET - -TEXT ·popcntOrSliceAsm(SB),4,$0-56 -XORQ AX, AX -MOVQ s_base+0(FP), SI -MOVQ s_len+8(FP), CX -TESTQ CX, CX -JZ popcntOrSliceEnd -MOVQ m+24(FP), DI -popcntOrSliceLoop: -MOVQ (DI), DX -ORQ (SI), DX -POPCNTQ_DX_DX -ADDQ DX, AX -ADDQ $8, SI -ADDQ $8, DI -LOOP popcntOrSliceLoop -popcntOrSliceEnd: -MOVQ AX, ret+48(FP) -RET - -TEXT ·popcntXorSliceAsm(SB),4,$0-56 -XORQ AX, AX -MOVQ s_base+0(FP), SI -MOVQ s_len+8(FP), CX -TESTQ CX, CX -JZ popcntXorSliceEnd -MOVQ m+24(FP), DI -popcntXorSliceLoop: -MOVQ (DI), DX -XORQ (SI), DX -POPCNTQ_DX_DX -ADDQ DX, AX -ADDQ $8, SI -ADDQ $8, DI -LOOP popcntXorSliceLoop -popcntXorSliceEnd: -MOVQ AX, ret+48(FP) -RET - - -TEXT ·popcntAsm(SB),4,$0-16 - MOVQ x+0(FP), DX - POPCNTQ_DX_DX - MOVQ DX, ret+8(FP) - RET diff --git a/roaring/assembly_asm.go b/roaring/assembly_asm.go deleted file mode 100644 index 3eb182cce..000000000 --- a/roaring/assembly_asm.go +++ /dev/null @@ -1,87 +0,0 @@ -// Copyright 2017 Pilosa Corp. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// +build amd64 - -package roaring - -func hasAsm() bool - -func BSFQ(memory uint64) int - -func POPCNTQ(memory uint64) int - - -//go:noescape -var useAsm = hasAsm() - -//go:noescape -func popcntSliceAsm(s []uint64) uint64 - -//go:noescape -func popcntMaskSliceAsm(s, m []uint64) uint64 - -//go:noescape -func popcntAndSliceAsm(s, m []uint64) uint64 - -//go:noescape -func popcntOrSliceAsm(s, m []uint64) uint64 - -//go:noescape -func popcntXorSliceAsm(s, m []uint64) uint64 - -//go:noescape -func popcntAsm(x uint64) uint64 - -func popcntSlice(s []uint64) uint64 { - if useAsm { - return popcntSliceAsm(s) - } - return popcntSliceGo(s) -} - -func popcntMaskSlice(s, m []uint64) uint64 { - if useAsm { - return popcntMaskSliceAsm(s, m) - } - return popcntMaskSliceGo(s, m) -} - -func popcntAndSlice(s, m []uint64) uint64 { - if useAsm { - return popcntAndSliceAsm(s, m) - } - return popcntAndSliceGo(s, m) -} - -func popcntOrSlice(s, m []uint64) uint64 { - if useAsm { - return popcntOrSliceAsm(s, m) - } - return popcntOrSliceGo(s, m) -} - -func popcntXorSlice(s, m []uint64) uint64 { - if useAsm { - return popcntXorSliceAsm(s, m) - } - return popcntXorSliceGo(s, m) -} - -func popcnt(x uint64) uint64 { - if useAsm { - return popcntAsm(x) - } - return popcntGo(x) -} diff --git a/roaring/assembly_generic.go b/roaring/assembly_generic.go deleted file mode 100644 index 997bfdaa3..000000000 --- a/roaring/assembly_generic.go +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2017 Pilosa Corp. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// +build !amd64 - -package roaring - -func hasAsm() bool {return false} - - -func popcntSlice(s []uint64) uint64 { return popcntSliceGo(s) } -func popcntMaskSlice(s, m []uint64) uint64 { return popcntMaskSliceGo(s, m) } -func popcntAndSlice(s, m []uint64) uint64 { return popcntAndSliceGo(s, m) } -func popcntOrSlice(s, m []uint64) uint64 { return popcntOrSliceGo(s, m) } -func popcntXorSlice(s, m []uint64) uint64 { return popcntXorSliceGo(s, m) } -func popcnt(s uint64) uint64 { return popcntGo(s) } diff --git a/roaring/assembly_test.go b/roaring/assembly_test.go deleted file mode 100644 index f18aa65ec..000000000 --- a/roaring/assembly_test.go +++ /dev/null @@ -1,139 +0,0 @@ -// Copyright 2017 Pilosa Corp. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package roaring - -import "testing" - -func TestBSFQ(t *testing.T) { - result := BSFQ(2) - if result != 1 { - t.Fatalf("BSF INCORRECT: %d", result) - } -} - -func TestBSFQ_CompareGo(t *testing.T) { - v := uint64(1) - for i := 0; i < 64; i++ { - if BSFQ(v) != trailingZeroN(v) { - t.Fatalf("BSF INCORRECT: %d %d", BSFQ(v), trailingZeroN(v)) - } - if v == 0 { - v = 1 - } else { - v *= 2 - } - } - /* - if bsfq(0) != trailingZeroN(0) { - fmt.Println(bsfq(0)) - t.Fatalf("BSF INCORRECT") - } - */ -} -func BenchmarkBSF(b *testing.B) { - for i := 0; i < b.N; i++ { - BSFQ(uint64(i)) - } -} - -func BenchmarkTrailingZeroN(b *testing.B) { - for i := 0; i < b.N; i++ { - trailingZeroN(uint64(i)) - } -} - -func BenchmarkPOPCNTQ(b *testing.B) { - for i := 0; i < b.N; i++ { - POPCNTQ(uint64(i)) - } -} - -func BenchmarkPopcount(b *testing.B) { - for i := 0; i < b.N; i++ { - popcount(uint64(i)) - } -} - -func BenchmarkPopcntAsm(b *testing.B) { - // run the Fib function b.N times - for n := 0; n < b.N; n++ { - popcntAsm(0xdeadbeef) - } -} - -func BenchmarkPopcntGo(b *testing.B) { - // run the Fib function b.N times - for n := 0; n < b.N; n++ { - popcntGo(0xdeadbeef) - } -} - -func getData() []uint64 { - return []uint64{ - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - 0xdeadbeef, - } -} - -func BenchmarkPopcntSliceGo(b *testing.B) { - d := getData() - for n := 0; n < b.N; n++ { - popcntSliceGo(d) - } -} - -func BenchmarkPopcntSliceAsm(b *testing.B) { - d := getData() - for n := 0; n < b.N; n++ { - popcntSliceAsm(d) - } -} - -func BenchmarkPopcntSlice(b *testing.B) { - d := getData() - for n := 0; n < b.N; n++ { - popcntSlice(d) - } -} diff --git a/roaring/roaring.go b/roaring/roaring.go index 8d88b2088..8ea82af83 100644 --- a/roaring/roaring.go +++ b/roaring/roaring.go @@ -21,6 +21,7 @@ import ( "fmt" "hash/fnv" "io" + "math/bits" "sort" "unsafe" ) @@ -1274,10 +1275,10 @@ func (c *container) contains(v uint16) bool { func (c *container) bitmapCountRuns() (r int) { for i := 0; i < 1023; i++ { v, v1 := c.bitmap[i], c.bitmap[i+1] - r = r + int(popcnt((v<<1)&^v)+((v>>63)&^v1)) + r = r + int(popcount((v<<1)&^v)+((v>>63)&^v1)) } vl := c.bitmap[len(c.bitmap)-1] - r = r + int(popcnt((vl<<1)&^vl)+vl>>63) + r = r + int(popcount((vl<<1)&^vl)+vl>>63) return r } @@ -1918,7 +1919,7 @@ func intersectionCountArrayBitmap(a, b *container) (n int) { } func intersectionCountBitmapBitmap(a, b *container) (n int) { - return int(popcntAndSlice(a.bitmap, b.bitmap)) + return int(popcountAndSlice(a.bitmap, b.bitmap)) } func intersect(a, b *container) *container { @@ -2061,22 +2062,22 @@ func intersectBitmapRun(a, b *container) *container { for valast >= vb.start && vastart <= vb.last && i < bitmapN { if vastart >= vb.start && valast <= vb.last { // a within b output.bitmap[i] = a.bitmap[i] - output.n += int(popcnt(a.bitmap[i])) + output.n += int(popcount(a.bitmap[i])) } else if vb.start >= vastart && vb.last <= valast { // b within a var mask uint64 = ((1 << (vb.last - vb.start + 1)) - 1) << (vb.start - vastart) bits := a.bitmap[i] & mask output.bitmap[i] |= bits - output.n += int(popcnt(bits)) + output.n += int(popcount(bits)) } else if vastart < vb.start { // a overlaps front of b offset := 64 - (1 + valast - vb.start) bits := (a.bitmap[i] >> offset) << offset output.bitmap[i] |= bits - output.n += int(popcnt(bits)) + output.n += int(popcount(bits)) } else if vb.start < vastart { // b overlaps front of a offset := 64 - (1 + vb.last - vastart) bits := (a.bitmap[i] << offset) >> offset output.bitmap[i] |= bits - output.n += int(popcnt(bits)) + output.n += int(popcount(bits)) } // update loop vars i++ @@ -2293,19 +2294,19 @@ func (c *container) bitmapSetRange(i, j uint64) { y := (j - 1) >> 6 var X uint64 = maxBitmap << (i % 64) var Y uint64 = maxBitmap >> (63 - ((j - 1) % 64)) - xcnt := popcnt(X) - ycnt := popcnt(Y) + xcnt := popcount(X) + ycnt := popcount(Y) if x == y { - c.n += int((j - i) - popcnt(c.bitmap[x]&(X&Y))) + c.n += int((j - i) - popcount(c.bitmap[x]&(X&Y))) c.bitmap[x] |= (X & Y) } else { - c.n += int(xcnt - popcnt(c.bitmap[x]&X)) + c.n += int(xcnt - popcount(c.bitmap[x]&X)) c.bitmap[x] |= X for i := x + 1; i < y; i++ { - c.n += int(64 - popcnt(c.bitmap[i])) + c.n += int(64 - popcount(c.bitmap[i])) c.bitmap[i] = maxBitmap } - c.n += int(ycnt - popcnt(c.bitmap[y]&Y)) + c.n += int(ycnt - popcount(c.bitmap[y]&Y)) c.bitmap[y] |= Y } } @@ -2317,21 +2318,21 @@ func (c *container) bitmapXorRange(i, j uint64) { var X uint64 = maxBitmap << (i % 64) var Y uint64 = maxBitmap >> (63 - ((j - 1) % 64)) if x == y { - cnt := popcnt(c.bitmap[x]) + cnt := popcount(c.bitmap[x]) c.bitmap[x] ^= (X & Y) //// flip - c.n += int(popcnt(c.bitmap[x]) - cnt) + c.n += int(popcount(c.bitmap[x]) - cnt) } else { - cnt := popcnt(c.bitmap[x]) + cnt := popcount(c.bitmap[x]) c.bitmap[x] ^= X - c.n += int(popcnt(c.bitmap[x]) - cnt) + c.n += int(popcount(c.bitmap[x]) - cnt) for i := x + 1; i < y; i++ { - cnt = popcnt(c.bitmap[i]) + cnt = popcount(c.bitmap[i]) c.bitmap[i] ^= maxBitmap - c.n += int(popcnt(c.bitmap[i]) - cnt) + c.n += int(popcount(c.bitmap[i]) - cnt) } - cnt = popcnt(c.bitmap[y]) + cnt = popcount(c.bitmap[y]) c.bitmap[y] ^= Y - c.n += int(popcnt(c.bitmap[y]) - cnt) + c.n += int(popcount(c.bitmap[y]) - cnt) } } @@ -2342,16 +2343,16 @@ func (c *container) bitmapZeroRange(i, j uint64) { var X uint64 = maxBitmap << (i % 64) var Y uint64 = maxBitmap >> (63 - ((j - 1) % 64)) if x == y { - c.n -= int(popcnt(c.bitmap[x] & (X & Y))) + c.n -= int(popcount(c.bitmap[x] & (X & Y))) c.bitmap[x] &= ^(X & Y) } else { - c.n -= int(popcnt(c.bitmap[x] & X)) + c.n -= int(popcount(c.bitmap[x] & X)) c.bitmap[x] &= ^X for i := x + 1; i < y; i++ { - c.n -= int(popcnt(c.bitmap[i])) + c.n -= int(popcount(c.bitmap[i])) c.bitmap[i] = 0 } - c.n -= int(popcnt(c.bitmap[y] & Y)) + c.n -= int(popcount(c.bitmap[y] & Y)) c.bitmap[y] &= ^Y } } @@ -2376,7 +2377,7 @@ func unionBitmapBitmap(a, b *container) *container { for i := 0; i < bitmapN; i++ { v := a.bitmap[i] | b.bitmap[i] output.bitmap[i] = v - output.n += int(popcnt(v)) + output.n += int(popcount(v)) } return output @@ -2812,7 +2813,7 @@ func xorBitmapBitmap(a, b *container) *container { for i := 0; i < bitmapN; i++ { v := a.bitmap[i] ^ b.bitmap[i] output.bitmap[i] = v - output.n += int(popcnt(v)) + output.n += int(popcount(v)) } if output.count() < ArrayMaxSize { @@ -2975,35 +2976,7 @@ func search64(a []uint64, value uint64) int { // trailingZeroN returns the number of trailing zeros in v. // v must be greater than zero. func trailingZeroN(v uint64) int { - n := int64(63) - if y := v << 32; y != 0 { - n, v = n-32, y - } - if y := v << 16; y != 0 { - n, v = n-16, y - } - if y := v << 8; y != 0 { - n, v = n-8, y - } - if y := v << 4; y != 0 { - n, v = n-4, y - } - if y := v << 2; y != 0 { - n, v = n-2, y - } - return int(n - int64(v<<1>>63)) -} - -// bit population count, taken from -// https://code.google.com/p/go/issues/detail?id=4988#c11 -// credit: https://code.google.com/u/arnehormann/ -func popcount(x uint64) (n uint64) { - x -= (x >> 1) & 0x5555555555555555 - x = (x>>2)&0x3333333333333333 + x&0x3333333333333333 - x += x >> 4 - x &= 0x0f0f0f0f0f0f0f0f - x *= 0x0101010101010101 - return x >> 56 + return bits.TrailingZeros64(v) } // ErrorList represents a list of errors. @@ -3265,3 +3238,47 @@ func xorBitmapRun(a, b *container) *container { } return output } + +func popcount(x uint64) uint64 { + return uint64(bits.OnesCount64(x)) +} + +func popcountSlice(s []uint64) uint64 { + cnt := uint64(0) + for _, x := range s { + cnt += popcount(x) + } + return cnt +} + +func popcountMaskSlice(s, m []uint64) uint64 { + cnt := uint64(0) + for i := range s { + cnt += popcount(s[i] &^ m[i]) + } + return cnt +} + +func popcountAndSlice(s, m []uint64) uint64 { + cnt := uint64(0) + for i := range s { + cnt += popcount(s[i] & m[i]) + } + return cnt +} + +func popcountOrSlice(s, m []uint64) uint64 { + cnt := uint64(0) + for i := range s { + cnt += popcount(s[i] | m[i]) + } + return cnt +} + +func popcountXorSlice(s, m []uint64) uint64 { + cnt := uint64(0) + for i := range s { + cnt += popcount(s[i] ^ m[i]) + } + return cnt +} diff --git a/server.go b/server.go index f41b84908..6a92a7768 100644 --- a/server.go +++ b/server.go @@ -396,6 +396,17 @@ func (s *Server) ReceiveMessage(pb proto.Message) error { if err := idx.DeleteFrame(obj.Frame); err != nil { return err } + case *internal.CreateFieldMessage: + f := s.Holder.Frame(obj.Index, obj.Frame) + field := decodeField(obj.Field) + if err := f.CreateField(field); err != nil { + return err + } + case *internal.DeleteFieldMessage: + f := s.Holder.Frame(obj.Index, obj.Frame) + if err := f.DeleteField(obj.Field); err != nil { + return err + } case *internal.CreateInputDefinitionMessage: idx := s.Holder.Index(obj.Index) if idx == nil {