From 7c28e2c3f3c7ac778a3cbc8f8154c0c3d252bee6 Mon Sep 17 00:00:00 2001 From: Linh Vo Date: Fri, 9 Jun 2017 10:27:11 -0500 Subject: [PATCH] InputFrame struct --- handler.go | 10 +- index.go | 4 +- input_definition.go | 8 +- input_definition_test.go | 1 + internal/private.pb.go | 333 ++++++++------------------------------- internal/private.proto | 1 - 6 files changed, 82 insertions(+), 275 deletions(-) create mode 100644 input_definition_test.go diff --git a/handler.go b/handler.go index c0dbd8ba6..00ced11ce 100644 --- a/handler.go +++ b/handler.go @@ -1514,7 +1514,6 @@ func (h *Handler) handlePostDefinition(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusBadRequest) return } - fmt.Println(req) // Find index. index := h.Holder.Index(indexName) @@ -1553,6 +1552,11 @@ func (h *Handler) handleDeleteDefinition(w http.ResponseWriter, r *http.Request) } type postInputDefinition struct { - Frames []Frame `json:"frames,omitempty"` - Fields []Field `json:"field,omitempty"` + Frames []InputFrame `json:"frames,omitempty"` + Fields []Field `json:"fields,omitempty"` } + +type InputFrame struct { + Name string + Options FrameOptions +} \ No newline at end of file diff --git a/index.go b/index.go index a3776e48e..9a4f88149 100644 --- a/index.go +++ b/index.go @@ -372,7 +372,7 @@ func (i *Index) CreateFrame(name string, opt FrameOptions) (*Frame, error) { } // CreateInputDefinition creates a new input definition. -func (i *Index) CreateInputDefinition(name string, frames []Frame, field []Field) (*InputDefinition, error) { +func (i *Index) CreateInputDefinition(name string, frames []InputFrame, field []Field) (*InputDefinition, error) { i.mu.Lock() defer i.mu.Unlock() @@ -383,7 +383,7 @@ func (i *Index) CreateInputDefinition(name string, frames []Frame, field []Field return i.createInputDefinition(name, frames, field) } -func (i *Index) createInputDefinition(name string, frames []Frame, field []Field) (*InputDefinition, error) { +func (i *Index) createInputDefinition(name string, frames []InputFrame, field []Field) (*InputDefinition, error) { if name == "" { return nil, errors.New("input-definition name required") } diff --git a/input_definition.go b/input_definition.go index 789ade7cc..3aa6e6657 100644 --- a/input_definition.go +++ b/input_definition.go @@ -1,7 +1,6 @@ package pilosa import ( - "fmt" "io" "io/ioutil" "os" @@ -15,6 +14,8 @@ type InputDefinition struct { broadcaster Broadcaster Stats StatsClient LogOutput io.Writer + frames []Frame + fields []Field } func NewInputDefinition(path, index, name string) (*InputDefinition, error) { @@ -40,9 +41,7 @@ func (i *InputDefinition) Index() string { return i.index } func (i *InputDefinition) Path() string { return i.path } func (i *InputDefinition) Open() error { - fmt.Println(i.path) if err := func() error { - // Ensure the input definition's path exists. if err := os.MkdirAll(i.path, 0777); err != nil { return err } @@ -55,7 +54,6 @@ func (i *InputDefinition) Open() error { }(); err != nil { return err } - return nil } @@ -70,7 +68,7 @@ func (f *InputDefinition) saveMeta() error { //} // Write to meta file. - if err := ioutil.WriteFile(filepath.Join(f.path, f.name), []byte("123"), 0666); err != nil { + if err := ioutil.WriteFile(filepath.Join(f.path, f.name), []byte(""), 0666); err != nil { return err } diff --git a/input_definition_test.go b/input_definition_test.go new file mode 100644 index 000000000..191b5d182 --- /dev/null +++ b/input_definition_test.go @@ -0,0 +1 @@ +package pilosa diff --git a/internal/private.pb.go b/internal/private.pb.go index 1c546e74e..48d410476 100644 --- a/internal/private.pb.go +++ b/internal/private.pb.go @@ -24,7 +24,6 @@ Frame Index InputDefinition - InputDefinitionMeta InputDefinitionField Action CreateInputDefinitionMessage @@ -248,8 +247,9 @@ func (m *Index) GetInputDefinitions() []*InputDefinition { } type InputDefinition struct { - Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"` - Meta *InputDefinitionMeta `protobuf:"bytes,2,opt,name=Meta" json:"Meta,omitempty"` + Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"` + Frames []*Frame `protobuf:"bytes,2,rep,name=Frames" json:"Frames,omitempty"` + InputDefinitionFields []*InputDefinitionField `protobuf:"bytes,3,rep,name=InputDefinitionFields" json:"InputDefinitionFields,omitempty"` } func (m *InputDefinition) Reset() { *m = InputDefinition{} } @@ -257,31 +257,14 @@ func (m *InputDefinition) String() string { return proto.CompactTextS func (*InputDefinition) ProtoMessage() {} func (*InputDefinition) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{14} } -func (m *InputDefinition) GetMeta() *InputDefinitionMeta { - if m != nil { - return m.Meta - } - return nil -} - -type InputDefinitionMeta struct { - Frames []*Frame `protobuf:"bytes,1,rep,name=Frames" json:"Frames,omitempty"` - InputDefinitionFields []*InputDefinitionField `protobuf:"bytes,2,rep,name=InputDefinitionFields" json:"InputDefinitionFields,omitempty"` -} - -func (m *InputDefinitionMeta) Reset() { *m = InputDefinitionMeta{} } -func (m *InputDefinitionMeta) String() string { return proto.CompactTextString(m) } -func (*InputDefinitionMeta) ProtoMessage() {} -func (*InputDefinitionMeta) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{15} } - -func (m *InputDefinitionMeta) GetFrames() []*Frame { +func (m *InputDefinition) GetFrames() []*Frame { if m != nil { return m.Frames } return nil } -func (m *InputDefinitionMeta) GetInputDefinitionFields() []*InputDefinitionField { +func (m *InputDefinition) GetInputDefinitionFields() []*InputDefinitionField { if m != nil { return m.InputDefinitionFields } @@ -297,7 +280,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{15} } func (m *InputDefinitionField) GetMeta() *Action { if m != nil { @@ -316,7 +299,7 @@ type Action struct { func (m *Action) Reset() { *m = Action{} } func (m *Action) String() string { return proto.CompactTextString(m) } func (*Action) ProtoMessage() {} -func (*Action) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{17} } +func (*Action) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{16} } func (m *Action) GetValueMap() map[string]uint64 { if m != nil { @@ -326,23 +309,15 @@ func (m *Action) GetValueMap() map[string]uint64 { } type CreateInputDefinitionMessage struct { - Index string `protobuf:"bytes,1,opt,name=Index,proto3" json:"Index,omitempty"` - InputDefinition string `protobuf:"bytes,2,opt,name=InputDefinition,proto3" json:"InputDefinition,omitempty"` - Meta *InputDefinitionMeta `protobuf:"bytes,3,opt,name=Meta" json:"Meta,omitempty"` + Index string `protobuf:"bytes,1,opt,name=Index,proto3" json:"Index,omitempty"` + InputDefinition string `protobuf:"bytes,2,opt,name=InputDefinition,proto3" json:"InputDefinition,omitempty"` } func (m *CreateInputDefinitionMessage) Reset() { *m = CreateInputDefinitionMessage{} } func (m *CreateInputDefinitionMessage) String() string { return proto.CompactTextString(m) } func (*CreateInputDefinitionMessage) ProtoMessage() {} func (*CreateInputDefinitionMessage) Descriptor() ([]byte, []int) { - return fileDescriptorPrivate, []int{18} -} - -func (m *CreateInputDefinitionMessage) GetMeta() *InputDefinitionMeta { - if m != nil { - return m.Meta - } - return nil + return fileDescriptorPrivate, []int{17} } type NodeStatus struct { @@ -354,7 +329,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{19} } +func (*NodeStatus) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{18} } func (m *NodeStatus) GetIndexes() []*Index { if m != nil { @@ -370,7 +345,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{20} } +func (*ClusterStatus) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{19} } func (m *ClusterStatus) GetNodes() []*NodeStatus { if m != nil { @@ -395,7 +370,6 @@ func init() { proto.RegisterType((*Frame)(nil), "internal.Frame") proto.RegisterType((*Index)(nil), "internal.Index") proto.RegisterType((*InputDefinition)(nil), "internal.InputDefinition") - proto.RegisterType((*InputDefinitionMeta)(nil), "internal.InputDefinitionMeta") proto.RegisterType((*InputDefinitionField)(nil), "internal.InputDefinitionField") proto.RegisterType((*Action)(nil), "internal.Action") proto.RegisterType((*CreateInputDefinitionMessage)(nil), "internal.CreateInputDefinitionMessage") @@ -976,37 +950,9 @@ func (m *InputDefinition) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintPrivate(dAtA, i, uint64(len(m.Name))) i += copy(dAtA[i:], m.Name) } - if m.Meta != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintPrivate(dAtA, i, uint64(m.Meta.Size())) - n13, err := m.Meta.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n13 - } - return i, nil -} - -func (m *InputDefinitionMeta) 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 *InputDefinitionMeta) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l if len(m.Frames) > 0 { for _, msg := range m.Frames { - dAtA[i] = 0xa + dAtA[i] = 0x12 i++ i = encodeVarintPrivate(dAtA, i, uint64(msg.Size())) n, err := msg.MarshalTo(dAtA[i:]) @@ -1018,7 +964,7 @@ func (m *InputDefinitionMeta) MarshalTo(dAtA []byte) (int, error) { } if len(m.InputDefinitionFields) > 0 { for _, msg := range m.InputDefinitionFields { - dAtA[i] = 0x12 + dAtA[i] = 0x1a i++ i = encodeVarintPrivate(dAtA, i, uint64(msg.Size())) n, err := msg.MarshalTo(dAtA[i:]) @@ -1066,11 +1012,11 @@ func (m *InputDefinitionField) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x1a i++ i = encodeVarintPrivate(dAtA, i, uint64(m.Meta.Size())) - n14, err := m.Meta.MarshalTo(dAtA[i:]) + n13, err := m.Meta.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n14 + i += n13 } return i, nil } @@ -1153,16 +1099,6 @@ func (m *CreateInputDefinitionMessage) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintPrivate(dAtA, i, uint64(len(m.InputDefinition))) i += copy(dAtA[i:], m.InputDefinition) } - if m.Meta != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintPrivate(dAtA, i, uint64(m.Meta.Size())) - n15, err := m.Meta.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n15 - } return i, nil } @@ -1513,16 +1449,6 @@ func (m *InputDefinition) Size() (n int) { if l > 0 { n += 1 + l + sovPrivate(uint64(l)) } - if m.Meta != nil { - l = m.Meta.Size() - n += 1 + l + sovPrivate(uint64(l)) - } - return n -} - -func (m *InputDefinitionMeta) Size() (n int) { - var l int - _ = l if len(m.Frames) > 0 { for _, e := range m.Frames { l = e.Size() @@ -1591,10 +1517,6 @@ func (m *CreateInputDefinitionMessage) Size() (n int) { if l > 0 { n += 1 + l + sovPrivate(uint64(l)) } - if m.Meta != nil { - l = m.Meta.Size() - n += 1 + l + sovPrivate(uint64(l)) - } return n } @@ -3607,89 +3529,6 @@ func (m *InputDefinition) Unmarshal(dAtA []byte) error { m.Name = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Meta", 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.Meta == nil { - m.Meta = &InputDefinitionMeta{} - } - if err := m.Meta.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 *InputDefinitionMeta) 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: InputDefinitionMeta: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: InputDefinitionMeta: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Frames", wireType) } @@ -3720,7 +3559,7 @@ func (m *InputDefinitionMeta) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 2: + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field InputDefinitionFields", wireType) } @@ -4224,39 +4063,6 @@ func (m *CreateInputDefinitionMessage) Unmarshal(dAtA []byte) error { } m.InputDefinition = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Meta", 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.Meta == nil { - m.Meta = &InputDefinitionMeta{} - } - if err := m.Meta.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipPrivate(dAtA[iNdEx:]) @@ -4606,58 +4412,57 @@ var ( func init() { proto.RegisterFile("private.proto", fileDescriptorPrivate) } var fileDescriptorPrivate = []byte{ - // 848 bytes of a gzipped FileDescriptorProto + // 820 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcd, 0x6e, 0x23, 0x45, - 0x10, 0xa6, 0xe3, 0xb1, 0xb1, 0x2b, 0x4a, 0xe2, 0xed, 0x0d, 0x68, 0x36, 0x0a, 0x96, 0x35, 0x42, - 0xac, 0xf1, 0xc1, 0xd2, 0x86, 0x0b, 0xda, 0xe5, 0x00, 0x6b, 0x7b, 0xb5, 0x16, 0x78, 0x81, 0x76, - 0xb4, 0xe2, 0x84, 0xd4, 0xb1, 0x0b, 0x18, 0x65, 0x3c, 0x33, 0x4c, 0xf7, 0x24, 0x6b, 0x0e, 0xbc, - 0x03, 0x12, 0x07, 0x24, 0x9e, 0x81, 0xf7, 0xe0, 0xc8, 0x95, 0x1b, 0x0a, 0x17, 0x1e, 0x03, 0xf5, - 0xcf, 0xfc, 0x78, 0x6c, 0x67, 0x09, 0xb7, 0xa9, 0xaf, 0xfe, 0xbe, 0xaa, 0xae, 0x2a, 0x1b, 0x0e, - 0xe2, 0xc4, 0xbf, 0xe2, 0x12, 0x07, 0x71, 0x12, 0xc9, 0x88, 0x36, 0xfd, 0x50, 0x62, 0x12, 0xf2, - 0xc0, 0xfb, 0x1c, 0x5a, 0x93, 0x70, 0x81, 0xaf, 0xa6, 0x28, 0x39, 0xed, 0xc2, 0xfe, 0x30, 0x0a, - 0xd2, 0x65, 0xf8, 0x19, 0xbf, 0xc0, 0xc0, 0x25, 0x5d, 0xd2, 0x6b, 0xb1, 0x32, 0xa4, 0x2c, 0xce, - 0xfd, 0x25, 0x7e, 0x99, 0xf2, 0x50, 0xa6, 0x4b, 0x77, 0xcf, 0x58, 0x94, 0x20, 0xef, 0x37, 0x02, - 0xad, 0x67, 0x09, 0x5f, 0xa2, 0x8e, 0x78, 0x02, 0x4d, 0x16, 0x5d, 0x97, 0xc3, 0xe5, 0x32, 0x7d, - 0x0f, 0x0e, 0x27, 0xe1, 0x15, 0x26, 0x02, 0xc7, 0x21, 0xbf, 0x08, 0x70, 0xa1, 0xc3, 0x35, 0x59, - 0x05, 0xa5, 0xa7, 0xd0, 0x1a, 0xf2, 0xf9, 0x77, 0x78, 0xbe, 0x8a, 0xd1, 0xad, 0xe9, 0x20, 0x05, - 0x90, 0x6b, 0x67, 0xfe, 0x0f, 0xe8, 0x3a, 0x5d, 0xd2, 0x3b, 0x60, 0x05, 0x50, 0xe5, 0x5b, 0xdf, - 0xe4, 0xeb, 0xc1, 0xe1, 0x64, 0x19, 0x47, 0x89, 0x64, 0x28, 0xe2, 0x28, 0x14, 0x48, 0xdb, 0x50, - 0x1b, 0x27, 0x89, 0xa5, 0xab, 0x3e, 0xbd, 0x1f, 0xa1, 0xfd, 0x34, 0x88, 0xe6, 0x97, 0x23, 0x2e, - 0x39, 0xc3, 0xef, 0x53, 0x14, 0x92, 0x1e, 0x43, 0x5d, 0x37, 0xce, 0xda, 0x19, 0x41, 0xa1, 0xba, - 0x78, 0xdb, 0x19, 0x23, 0x28, 0x54, 0xfb, 0x6b, 0xf6, 0x0e, 0x33, 0x82, 0x42, 0x67, 0x81, 0x3f, - 0x37, 0xac, 0x1d, 0x66, 0x04, 0x4a, 0xc1, 0x79, 0xe9, 0xe3, 0xb5, 0xa5, 0xaa, 0xbf, 0xbd, 0x09, - 0xdc, 0x2b, 0xe5, 0xb7, 0x34, 0xdf, 0x86, 0x06, 0x8b, 0xae, 0x27, 0x23, 0xe1, 0x92, 0x6e, 0xad, - 0xe7, 0x30, 0x2b, 0xe9, 0x86, 0xe8, 0x17, 0x53, 0xaa, 0x3d, 0xad, 0x2a, 0x00, 0xef, 0x01, 0xd4, - 0x75, 0x77, 0x54, 0x95, 0x85, 0xaf, 0xfa, 0xf4, 0x7e, 0x25, 0x70, 0x6f, 0xca, 0x5f, 0x69, 0x1a, - 0x22, 0x4f, 0xf3, 0x1c, 0x5a, 0x39, 0xa8, 0xad, 0xf7, 0xcf, 0xfa, 0x83, 0x6c, 0x7c, 0x06, 0x1b, - 0xf6, 0x05, 0x32, 0x0e, 0x65, 0xb2, 0x62, 0x85, 0xf3, 0xc9, 0x47, 0x70, 0xb8, 0xae, 0x54, 0x1c, - 0x2e, 0x71, 0x95, 0x75, 0xfa, 0x12, 0x57, 0xaa, 0x27, 0x57, 0x3c, 0x48, 0x4d, 0xff, 0x1c, 0x66, - 0x84, 0xc7, 0x7b, 0x1f, 0x12, 0xef, 0x6b, 0xa0, 0xc3, 0x04, 0xb9, 0x44, 0x1d, 0x60, 0x8a, 0x42, - 0xf0, 0x6f, 0x71, 0xf7, 0x2b, 0x98, 0xce, 0xee, 0x95, 0x3b, 0x7b, 0x0a, 0xad, 0x89, 0xb0, 0xb3, - 0xa5, 0x5f, 0xa2, 0xc9, 0x0a, 0xc0, 0xeb, 0x03, 0x1d, 0x61, 0x80, 0x12, 0xed, 0x3a, 0xdc, 0x12, - 0xdf, 0x9b, 0x65, 0x5c, 0x5e, 0x6f, 0x4b, 0x1f, 0x82, 0xa3, 0x36, 0x41, 0x53, 0xd9, 0x3f, 0xbb, - 0x5f, 0xb4, 0x2e, 0x5f, 0x3b, 0xa6, 0x0d, 0x3c, 0x3f, 0x0b, 0x6a, 0xb7, 0xe7, 0x35, 0x05, 0x6e, - 0x19, 0xb3, 0x2c, 0x55, 0xad, 0x9a, 0x2a, 0xdf, 0x47, 0x9b, 0xea, 0xe3, 0xac, 0xd6, 0xff, 0x9b, - 0xca, 0x1b, 0x59, 0x54, 0x8d, 0xeb, 0x0b, 0xa5, 0x35, 0x3e, 0xfa, 0x7b, 0x77, 0xc9, 0x55, 0x1e, - 0xff, 0x10, 0x9b, 0xf2, 0x6e, 0x61, 0x2a, 0x9d, 0x53, 0x47, 0x26, 0x1b, 0x2c, 0xbb, 0x61, 0xb9, - 0x4c, 0x1f, 0x42, 0x43, 0x67, 0x15, 0xae, 0xa3, 0x67, 0xf7, 0xa8, 0xc2, 0x86, 0x59, 0xb5, 0x5a, - 0x27, 0x3b, 0xe4, 0x75, 0xb3, 0x4e, 0x46, 0xa2, 0x63, 0x68, 0x4f, 0xc2, 0x38, 0x95, 0x23, 0xfc, - 0xc6, 0x0f, 0x7d, 0xe9, 0x47, 0xa1, 0x70, 0x1b, 0x3a, 0xd4, 0x83, 0x32, 0xa3, 0x35, 0x0b, 0xb6, - 0xe1, 0xe2, 0x7d, 0x05, 0x47, 0x15, 0x6c, 0x6b, 0xcd, 0x8f, 0xd6, 0x6a, 0x7e, 0x67, 0x67, 0x86, - 0x52, 0x13, 0x7f, 0x26, 0x70, 0x7f, 0x8b, 0xb6, 0x54, 0x39, 0xb9, 0xbd, 0xf2, 0x73, 0x78, 0xab, - 0xe2, 0xff, 0xcc, 0xc7, 0x60, 0x61, 0x8e, 0xc7, 0xfe, 0x59, 0x67, 0x27, 0x09, 0x6d, 0xc6, 0xb6, - 0x3b, 0x7b, 0x31, 0x1c, 0x6f, 0x53, 0x6c, 0xad, 0xba, 0x03, 0xf0, 0x45, 0xe2, 0x2f, 0x79, 0xb2, - 0xfa, 0x14, 0x57, 0xf6, 0x57, 0xa0, 0x84, 0xd0, 0x77, 0xd7, 0x06, 0xbb, 0x5d, 0x10, 0xfa, 0x64, - 0xae, 0xdb, 0x6d, 0x1a, 0xf1, 0x27, 0x81, 0x86, 0x01, 0x8a, 0xa1, 0x25, 0xe5, 0xfd, 0xe8, 0x43, - 0xfb, 0xa5, 0xba, 0x27, 0x23, 0x14, 0xd2, 0x0f, 0xb9, 0xb2, 0xb4, 0x53, 0xbd, 0x81, 0xd3, 0xc7, - 0xd0, 0xd4, 0xd8, 0x94, 0xc7, 0x6e, 0xad, 0xda, 0x07, 0x93, 0x65, 0x90, 0x19, 0x98, 0x4b, 0x97, - 0xdb, 0xab, 0xec, 0xfa, 0x16, 0x67, 0x87, 0x5d, 0x0b, 0x27, 0x4f, 0xe0, 0x60, 0xcd, 0xe1, 0x4e, - 0xd7, 0xef, 0x27, 0x02, 0xa7, 0xd9, 0xc9, 0xa9, 0x3c, 0xf5, 0x6d, 0xcb, 0xdb, 0xdb, 0x98, 0x3a, - 0x5b, 0xf0, 0xc6, 0x30, 0x3e, 0x5a, 0x6b, 0xf1, 0x7f, 0x1a, 0x3c, 0x0e, 0xf0, 0x22, 0x5a, 0xe0, - 0x4c, 0x72, 0x99, 0x0a, 0xf5, 0xae, 0xcf, 0x23, 0x21, 0xb3, 0x77, 0x55, 0xdf, 0xfa, 0x0e, 0x4b, - 0x2e, 0xf3, 0xdb, 0xa1, 0x05, 0xfa, 0x3e, 0xbc, 0xa9, 0xd9, 0xa1, 0xb0, 0x9d, 0x3d, 0xaa, 0xac, - 0x36, 0xcb, 0xf4, 0xde, 0x13, 0x38, 0x18, 0x06, 0xa9, 0x90, 0x98, 0xd8, 0x2c, 0x7d, 0xa8, 0xab, - 0x9c, 0xd9, 0x4c, 0x1f, 0x17, 0x9e, 0x05, 0x15, 0x66, 0x4c, 0x9e, 0xb6, 0x7f, 0xbf, 0xe9, 0x90, - 0x3f, 0x6e, 0x3a, 0xe4, 0xaf, 0x9b, 0x0e, 0xf9, 0xe5, 0xef, 0xce, 0x1b, 0x17, 0x0d, 0xfd, 0xef, - 0xe7, 0x83, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xc5, 0x8e, 0x46, 0x6d, 0x0e, 0x09, 0x00, 0x00, + 0x10, 0x66, 0xec, 0xb1, 0xb1, 0x2b, 0x4a, 0xe2, 0x6d, 0x02, 0x9a, 0x8d, 0x22, 0x2b, 0x6a, 0x21, + 0x36, 0xe4, 0x90, 0xc3, 0x72, 0x41, 0xbb, 0x1c, 0x60, 0xe3, 0xac, 0xd6, 0x82, 0x2c, 0xd0, 0x8e, + 0xf6, 0x88, 0xd4, 0xb1, 0x0b, 0x18, 0x65, 0x3c, 0x33, 0x4c, 0xf7, 0x24, 0x6b, 0x0e, 0x3c, 0x07, + 0x12, 0x57, 0xae, 0xbc, 0x07, 0x47, 0xae, 0xdc, 0x50, 0xb8, 0xf0, 0x18, 0xa8, 0xab, 0x7b, 0x7e, + 0x3c, 0xb6, 0xb3, 0xca, 0xde, 0xa6, 0xbe, 0xfa, 0xfb, 0xaa, 0xba, 0xaa, 0x6c, 0xd8, 0x4e, 0xb3, + 0xf0, 0x5a, 0x6a, 0x3c, 0x49, 0xb3, 0x44, 0x27, 0xac, 0x17, 0xc6, 0x1a, 0xb3, 0x58, 0x46, 0xfc, + 0x6b, 0xe8, 0x8f, 0xe3, 0x19, 0xbe, 0x3e, 0x47, 0x2d, 0xd9, 0x21, 0x6c, 0x9d, 0x26, 0x51, 0x3e, + 0x8f, 0xbf, 0x92, 0x97, 0x18, 0x05, 0xde, 0xa1, 0x77, 0xd4, 0x17, 0x75, 0xc8, 0x58, 0x5c, 0x84, + 0x73, 0xfc, 0x36, 0x97, 0xb1, 0xce, 0xe7, 0x41, 0xcb, 0x5a, 0xd4, 0x20, 0xfe, 0x87, 0x07, 0xfd, + 0xe7, 0x99, 0x9c, 0x23, 0x45, 0xdc, 0x87, 0x9e, 0x48, 0x6e, 0xea, 0xe1, 0x4a, 0x99, 0x7d, 0x04, + 0x3b, 0xe3, 0xf8, 0x1a, 0x33, 0x85, 0x67, 0xb1, 0xbc, 0x8c, 0x70, 0x46, 0xe1, 0x7a, 0xa2, 0x81, + 0xb2, 0x03, 0xe8, 0x9f, 0xca, 0xe9, 0x8f, 0x78, 0xb1, 0x48, 0x31, 0x68, 0x53, 0x90, 0x0a, 0x28, + 0xb5, 0x93, 0xf0, 0x67, 0x0c, 0xfc, 0x43, 0xef, 0x68, 0x5b, 0x54, 0x40, 0x93, 0x6f, 0x67, 0x95, + 0x2f, 0x87, 0x9d, 0xf1, 0x3c, 0x4d, 0x32, 0x2d, 0x50, 0xa5, 0x49, 0xac, 0x90, 0x0d, 0xa0, 0x7d, + 0x96, 0x65, 0x8e, 0xae, 0xf9, 0xe4, 0xbf, 0xc0, 0xe0, 0x59, 0x94, 0x4c, 0xaf, 0x46, 0x52, 0x4b, + 0x81, 0x3f, 0xe5, 0xa8, 0x34, 0xdb, 0x83, 0x0e, 0x35, 0xce, 0xd9, 0x59, 0xc1, 0xa0, 0x54, 0xbc, + 0xeb, 0x8c, 0x15, 0x0c, 0x4a, 0xfe, 0xc4, 0xde, 0x17, 0x56, 0x30, 0xe8, 0x24, 0x0a, 0xa7, 0x96, + 0xb5, 0x2f, 0xac, 0xc0, 0x18, 0xf8, 0xaf, 0x42, 0xbc, 0x71, 0x54, 0xe9, 0x9b, 0x8f, 0xe1, 0x41, + 0x2d, 0xbf, 0xa3, 0xf9, 0x01, 0x74, 0x45, 0x72, 0x33, 0x1e, 0xa9, 0xc0, 0x3b, 0x6c, 0x1f, 0xf9, + 0xc2, 0x49, 0xd4, 0x10, 0x7a, 0x31, 0xa3, 0x6a, 0x91, 0xaa, 0x02, 0xf8, 0x43, 0xe8, 0x50, 0x77, + 0x4c, 0x95, 0x95, 0xaf, 0xf9, 0xe4, 0xbf, 0x79, 0xf0, 0xe0, 0x5c, 0xbe, 0x26, 0x1a, 0xaa, 0x4c, + 0xf3, 0x02, 0xfa, 0x25, 0x48, 0xd6, 0x5b, 0x8f, 0x8f, 0x4f, 0x8a, 0xf1, 0x39, 0x59, 0xb1, 0xaf, + 0x90, 0xb3, 0x58, 0x67, 0x0b, 0x51, 0x39, 0xef, 0x7f, 0x06, 0x3b, 0xcb, 0x4a, 0xc3, 0xe1, 0x0a, + 0x17, 0x45, 0xa7, 0xaf, 0x70, 0x61, 0x7a, 0x72, 0x2d, 0xa3, 0xdc, 0xf6, 0xcf, 0x17, 0x56, 0x78, + 0xd2, 0xfa, 0xd4, 0xe3, 0xdf, 0x01, 0x3b, 0xcd, 0x50, 0x6a, 0xa4, 0x00, 0xe7, 0xa8, 0x94, 0xfc, + 0x01, 0x37, 0xbf, 0x82, 0xed, 0x6c, 0xab, 0xde, 0xd9, 0x03, 0xe8, 0x8f, 0x95, 0x9b, 0x2d, 0x7a, + 0x89, 0x9e, 0xa8, 0x00, 0x7e, 0x0c, 0x6c, 0x84, 0x11, 0x6a, 0x74, 0xeb, 0x70, 0x47, 0x7c, 0x3e, + 0x29, 0xb8, 0xbc, 0xd9, 0x96, 0x3d, 0x02, 0xdf, 0x6c, 0x02, 0x51, 0xd9, 0x7a, 0xfc, 0x5e, 0xd5, + 0xba, 0x72, 0xed, 0x04, 0x19, 0xf0, 0xb0, 0x08, 0xea, 0xb6, 0xe7, 0x0d, 0x05, 0xae, 0x19, 0xb3, + 0x22, 0x55, 0xbb, 0x99, 0xaa, 0xdc, 0x47, 0x97, 0xea, 0xf3, 0xa2, 0xd6, 0xb7, 0x4d, 0xc5, 0x47, + 0x0e, 0x35, 0xe3, 0xfa, 0xd2, 0x68, 0xad, 0x0f, 0x7d, 0x6f, 0x2e, 0xb9, 0xc9, 0xe3, 0x3f, 0xcf, + 0xa5, 0xbc, 0x5f, 0x98, 0x46, 0xe7, 0xcc, 0x91, 0x29, 0x06, 0xcb, 0x6d, 0x58, 0x29, 0xb3, 0x47, + 0xd0, 0xa5, 0xac, 0x2a, 0xf0, 0x69, 0x76, 0x77, 0x1b, 0x6c, 0x84, 0x53, 0x9b, 0x75, 0x72, 0x43, + 0xde, 0xb1, 0xeb, 0x64, 0x25, 0x76, 0x06, 0x83, 0x71, 0x9c, 0xe6, 0x7a, 0x84, 0xdf, 0x87, 0x71, + 0xa8, 0xc3, 0x24, 0x56, 0x41, 0x97, 0x42, 0x3d, 0xac, 0x33, 0x5a, 0xb2, 0x10, 0x2b, 0x2e, 0xfc, + 0x77, 0x0f, 0x76, 0x1b, 0xe0, 0x86, 0xa2, 0x0b, 0xbe, 0xad, 0xbb, 0xf9, 0x5e, 0xc0, 0xfb, 0x8d, + 0x78, 0xcf, 0x43, 0x8c, 0x66, 0x2a, 0x68, 0x93, 0xdf, 0x70, 0x23, 0x39, 0x32, 0x13, 0xeb, 0x9d, + 0x79, 0x0a, 0x7b, 0xeb, 0x14, 0x6b, 0xa9, 0x0e, 0x01, 0xbe, 0xc9, 0xc2, 0xb9, 0xcc, 0x16, 0x5f, + 0xe2, 0xc2, 0xdd, 0xee, 0x1a, 0xc2, 0x3e, 0x5c, 0x1a, 0xc7, 0x41, 0x45, 0xe8, 0x8b, 0x29, 0x35, + 0xc9, 0xce, 0xc0, 0xdf, 0x1e, 0x74, 0x2d, 0x50, 0x8d, 0x9a, 0x57, 0x9f, 0xea, 0x63, 0x18, 0xbc, + 0x32, 0x57, 0x60, 0x84, 0x4a, 0x87, 0xb1, 0x34, 0x96, 0x6e, 0x16, 0x57, 0x70, 0xf6, 0x04, 0x7a, + 0x84, 0x9d, 0xcb, 0x74, 0xb5, 0x0f, 0x36, 0xcb, 0x49, 0x61, 0x60, 0xef, 0x53, 0x69, 0x6f, 0xb2, + 0xd3, 0x05, 0x2d, 0xce, 0x31, 0x09, 0xfb, 0x4f, 0x61, 0x7b, 0xc9, 0xe1, 0x9e, 0x37, 0xeb, 0xa0, + 0xb8, 0x13, 0x4b, 0x3d, 0xbd, 0x7b, 0xe3, 0x8e, 0x56, 0x26, 0xc5, 0xd5, 0xdb, 0x84, 0xb9, 0x04, + 0x78, 0x99, 0xcc, 0x70, 0xa2, 0xa5, 0xce, 0x95, 0x79, 0xa3, 0x17, 0x89, 0xd2, 0xc5, 0x1b, 0x99, + 0x6f, 0xba, 0x84, 0x5a, 0xea, 0x72, 0x7b, 0x49, 0x60, 0x1f, 0xc3, 0xbb, 0x94, 0x0a, 0x8b, 0x69, + 0xd9, 0x6d, 0x2c, 0x97, 0x28, 0xf4, 0xfc, 0x29, 0x6c, 0x9f, 0x46, 0xb9, 0xd2, 0x98, 0xb9, 0x2c, + 0xc7, 0xd0, 0x31, 0x39, 0x8b, 0xdf, 0x82, 0xbd, 0xca, 0xb3, 0xa2, 0x22, 0xac, 0xc9, 0xb3, 0xc1, + 0x9f, 0xb7, 0x43, 0xef, 0xaf, 0xdb, 0xa1, 0xf7, 0xcf, 0xed, 0xd0, 0xfb, 0xf5, 0xdf, 0xe1, 0x3b, + 0x97, 0x5d, 0xfa, 0xff, 0xf1, 0xc9, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x74, 0xd0, 0x83, + 0x90, 0x08, 0x00, 0x00, } diff --git a/internal/private.proto b/internal/private.proto index 660633f2c..1c494c080 100644 --- a/internal/private.proto +++ b/internal/private.proto @@ -103,7 +103,6 @@ message Action { message CreateInputDefinitionMessage { string Index = 1; string InputDefinition = 2; - InputDefinitionMeta Meta = 3; } message NodeStatus {