From b12a056dd90335aceccd4c39e8e8608a50b71970 Mon Sep 17 00:00:00 2001 From: Sergey Cherepanov Date: Mon, 3 Jul 2023 16:19:24 +0200 Subject: [PATCH] consensus: use strings for ids --- consensus/consensusclient/client.go | 32 ++-- consensus/consensusclient/client_test.go | 22 +-- consensus/consensusclient/stream.go | 4 +- consensus/consensusproto/consensus.pb.go | 180 +++++++++--------- .../consensusproto/protos/consensus.proto | 10 +- 5 files changed, 121 insertions(+), 127 deletions(-) diff --git a/consensus/consensusclient/client.go b/consensus/consensusclient/client.go index ff5882a7..6bf5e8ab 100644 --- a/consensus/consensusclient/client.go +++ b/consensus/consensusclient/client.go @@ -38,11 +38,11 @@ type Service interface { // AddLog adds new log to consensus servers AddLog(ctx context.Context, clog *consensusproto.Log) (err error) // AddRecord adds new record to consensus servers - AddRecord(ctx context.Context, logId []byte, clog *consensusproto.RawRecord) (record *consensusproto.RawRecordWithId, err error) + AddRecord(ctx context.Context, logId string, clog *consensusproto.RawRecord) (record *consensusproto.RawRecordWithId, err error) // Watch starts watching to given logId and calls watcher when any relative event received - Watch(logId []byte, w Watcher) (err error) + Watch(logId string, w Watcher) (err error) // UnWatch stops watching given logId and removes watcher - UnWatch(logId []byte) (err error) + UnWatch(logId string) (err error) app.ComponentRunnable } @@ -97,7 +97,7 @@ func (s *service) AddLog(ctx context.Context, clog *consensusproto.Log) (err err }) } -func (s *service) AddRecord(ctx context.Context, logId []byte, clog *consensusproto.RawRecord) (record *consensusproto.RawRecordWithId, err error) { +func (s *service) AddRecord(ctx context.Context, logId string, clog *consensusproto.RawRecord) (record *consensusproto.RawRecordWithId, err error) { err = s.doClient(ctx, func(cl consensusproto.DRPCConsensusClient) error { if record, err = cl.RecordAdd(ctx, &consensusproto.RecordAddRequest{ LogId: logId, @@ -110,30 +110,30 @@ func (s *service) AddRecord(ctx context.Context, logId []byte, clog *consensuspr return } -func (s *service) Watch(logId []byte, w Watcher) (err error) { +func (s *service) Watch(logId string, w Watcher) (err error) { s.mu.Lock() defer s.mu.Unlock() - if _, ok := s.watchers[string(logId)]; ok { + if _, ok := s.watchers[logId]; ok { return ErrWatcherExists } - s.watchers[string(logId)] = w + s.watchers[logId] = w if s.stream != nil { - if wErr := s.stream.WatchIds([][]byte{logId}); wErr != nil { + if wErr := s.stream.WatchIds([]string{logId}); wErr != nil { log.Warn("WatchIds error", zap.Error(wErr)) } } return } -func (s *service) UnWatch(logId []byte) (err error) { +func (s *service) UnWatch(logId string) (err error) { s.mu.Lock() defer s.mu.Unlock() - if _, ok := s.watchers[string(logId)]; !ok { + if _, ok := s.watchers[logId]; !ok { return ErrWatcherNotExists } - delete(s.watchers, string(logId)) + delete(s.watchers, logId) if s.stream != nil { - if wErr := s.stream.UnwatchIds([][]byte{logId}); wErr != nil { + if wErr := s.stream.UnwatchIds([]string{logId}); wErr != nil { log.Warn("UnWatchIds error", zap.Error(wErr)) } } @@ -182,9 +182,9 @@ func (s *service) streamWatcher() { // collect ids and setup stream s.mu.Lock() - var logIds = make([][]byte, 0, len(s.watchers)) + var logIds = make([]string, 0, len(s.watchers)) for id := range s.watchers { - logIds = append(logIds, []byte(id)) + logIds = append(logIds, id) } s.stream = st s.mu.Unlock() @@ -213,14 +213,14 @@ func (s *service) streamReader() error { return s.stream.Err() } for _, e := range events { - if w, ok := s.watchers[string(e.LogId)]; ok { + if w, ok := s.watchers[e.LogId]; ok { if e.Error == nil { w.AddConsensusRecords(e.Records) } else { w.AddConsensusError(rpcerr.Err(uint64(e.Error.Error))) } } else { - log.Warn("received unexpected log id", zap.Binary("logId", e.LogId)) + log.Warn("received unexpected log id", zap.String("logId", e.LogId)) } } } diff --git a/consensus/consensusclient/client_test.go b/consensus/consensusclient/client_test.go index fd21695c..f4b8f2cc 100644 --- a/consensus/consensusclient/client_test.go +++ b/consensus/consensusclient/client_test.go @@ -24,13 +24,13 @@ func TestService_Watch(t *testing.T) { t.Run("not found error", func(t *testing.T) { fx := newFixture(t).run(t) defer fx.Finish() - var logId = []byte{'1'} + var logId = "1" w := &testWatcher{ready: make(chan struct{})} require.NoError(t, fx.Watch(logId, w)) st := fx.testServer.waitStream(t) req, err := st.Recv() require.NoError(t, err) - assert.Equal(t, [][]byte{logId}, req.WatchIds) + assert.Equal(t, []string{logId}, req.WatchIds) require.NoError(t, st.Send(&consensusproto.LogWatchEvent{ LogId: logId, Error: &consensusproto.Err{ @@ -44,7 +44,7 @@ func TestService_Watch(t *testing.T) { t.Run("watcherExists error", func(t *testing.T) { fx := newFixture(t).run(t) defer fx.Finish() - var logId = []byte{'1'} + var logId = "1" w := &testWatcher{} require.NoError(t, fx.Watch(logId, w)) require.Error(t, fx.Watch(logId, w)) @@ -55,20 +55,20 @@ func TestService_Watch(t *testing.T) { t.Run("watch", func(t *testing.T) { fx := newFixture(t).run(t) defer fx.Finish() - var logId1 = []byte{'1'} + var logId1 = "1" w := &testWatcher{} require.NoError(t, fx.Watch(logId1, w)) st := fx.testServer.waitStream(t) req, err := st.Recv() require.NoError(t, err) - assert.Equal(t, [][]byte{logId1}, req.WatchIds) + assert.Equal(t, []string{logId1}, req.WatchIds) - var logId2 = []byte{'2'} + var logId2 = "2" w = &testWatcher{} require.NoError(t, fx.Watch(logId2, w)) req, err = st.Recv() require.NoError(t, err) - assert.Equal(t, [][]byte{logId2}, req.WatchIds) + assert.Equal(t, []string{logId2}, req.WatchIds) fx.testServer.releaseStream <- nil }) @@ -78,14 +78,14 @@ func TestService_UnWatch(t *testing.T) { t.Run("no watcher", func(t *testing.T) { fx := newFixture(t).run(t) defer fx.Finish() - require.Error(t, fx.UnWatch([]byte{'1'})) + require.Error(t, fx.UnWatch("1")) }) t.Run("success", func(t *testing.T) { fx := newFixture(t).run(t) defer fx.Finish() w := &testWatcher{} - require.NoError(t, fx.Watch([]byte{'1'}, w)) - assert.NoError(t, fx.UnWatch([]byte{'1'})) + require.NoError(t, fx.Watch("1", w)) + assert.NoError(t, fx.UnWatch("1")) }) } @@ -119,7 +119,7 @@ func TestService_AddLog(t *testing.T) { func TestService_AddRecord(t *testing.T) { fx := newFixture(t).run(t) defer fx.Finish() - rec, err := fx.AddRecord(ctx, []byte{'1'}, &consensusproto.RawRecord{}) + rec, err := fx.AddRecord(ctx, "1", &consensusproto.RawRecord{}) require.NoError(t, err) assert.NotEmpty(t, rec) } diff --git a/consensus/consensusclient/stream.go b/consensus/consensusclient/stream.go index 679dcd74..13348bf2 100644 --- a/consensus/consensusclient/stream.go +++ b/consensus/consensusclient/stream.go @@ -23,13 +23,13 @@ type stream struct { err error } -func (s *stream) WatchIds(logIds [][]byte) (err error) { +func (s *stream) WatchIds(logIds []string) (err error) { return s.rpcStream.Send(&consensusproto.LogWatchRequest{ WatchIds: logIds, }) } -func (s *stream) UnwatchIds(logIds [][]byte) (err error) { +func (s *stream) UnwatchIds(logIds []string) (err error) { return s.rpcStream.Send(&consensusproto.LogWatchRequest{ UnwatchIds: logIds, }) diff --git a/consensus/consensusproto/consensus.pb.go b/consensus/consensusproto/consensus.pb.go index 4e81e61c..d99079b5 100644 --- a/consensus/consensusproto/consensus.pb.go +++ b/consensus/consensusproto/consensus.pb.go @@ -57,7 +57,7 @@ func (ErrCodes) EnumDescriptor() ([]byte, []int) { } type Log struct { - Id []byte `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` Payload []byte `protobuf:"bytes,2,opt,name=payload,proto3" json:"payload,omitempty"` Records []*RawRecordWithId `protobuf:"bytes,3,rep,name=records,proto3" json:"records,omitempty"` } @@ -95,11 +95,11 @@ func (m *Log) XXX_DiscardUnknown() { var xxx_messageInfo_Log proto.InternalMessageInfo -func (m *Log) GetId() []byte { +func (m *Log) GetId() string { if m != nil { return m.Id } - return nil + return "" } func (m *Log) GetPayload() []byte { @@ -388,7 +388,7 @@ func (m *LogAddRequest) GetLog() *Log { } type RecordAddRequest struct { - LogId []byte `protobuf:"bytes,1,opt,name=logId,proto3" json:"logId,omitempty"` + LogId string `protobuf:"bytes,1,opt,name=logId,proto3" json:"logId,omitempty"` Record *RawRecord `protobuf:"bytes,2,opt,name=record,proto3" json:"record,omitempty"` } @@ -425,11 +425,11 @@ func (m *RecordAddRequest) XXX_DiscardUnknown() { var xxx_messageInfo_RecordAddRequest proto.InternalMessageInfo -func (m *RecordAddRequest) GetLogId() []byte { +func (m *RecordAddRequest) GetLogId() string { if m != nil { return m.LogId } - return nil + return "" } func (m *RecordAddRequest) GetRecord() *RawRecord { @@ -440,8 +440,8 @@ func (m *RecordAddRequest) GetRecord() *RawRecord { } type LogWatchRequest struct { - WatchIds [][]byte `protobuf:"bytes,1,rep,name=watchIds,proto3" json:"watchIds,omitempty"` - UnwatchIds [][]byte `protobuf:"bytes,2,rep,name=unwatchIds,proto3" json:"unwatchIds,omitempty"` + WatchIds []string `protobuf:"bytes,1,rep,name=watchIds,proto3" json:"watchIds,omitempty"` + UnwatchIds []string `protobuf:"bytes,2,rep,name=unwatchIds,proto3" json:"unwatchIds,omitempty"` } func (m *LogWatchRequest) Reset() { *m = LogWatchRequest{} } @@ -477,14 +477,14 @@ func (m *LogWatchRequest) XXX_DiscardUnknown() { var xxx_messageInfo_LogWatchRequest proto.InternalMessageInfo -func (m *LogWatchRequest) GetWatchIds() [][]byte { +func (m *LogWatchRequest) GetWatchIds() []string { if m != nil { return m.WatchIds } return nil } -func (m *LogWatchRequest) GetUnwatchIds() [][]byte { +func (m *LogWatchRequest) GetUnwatchIds() []string { if m != nil { return m.UnwatchIds } @@ -492,7 +492,7 @@ func (m *LogWatchRequest) GetUnwatchIds() [][]byte { } type LogWatchEvent struct { - LogId []byte `protobuf:"bytes,1,opt,name=logId,proto3" json:"logId,omitempty"` + LogId string `protobuf:"bytes,1,opt,name=logId,proto3" json:"logId,omitempty"` Records []*RawRecordWithId `protobuf:"bytes,2,rep,name=records,proto3" json:"records,omitempty"` Error *Err `protobuf:"bytes,3,opt,name=error,proto3" json:"error,omitempty"` } @@ -530,11 +530,11 @@ func (m *LogWatchEvent) XXX_DiscardUnknown() { var xxx_messageInfo_LogWatchEvent proto.InternalMessageInfo -func (m *LogWatchEvent) GetLogId() []byte { +func (m *LogWatchEvent) GetLogId() string { if m != nil { return m.LogId } - return nil + return "" } func (m *LogWatchEvent) GetRecords() []*RawRecordWithId { @@ -614,46 +614,46 @@ func init() { } var fileDescriptor_b8d7f1c16b400059 = []byte{ - // 618 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcf, 0x6e, 0xd3, 0x4e, - 0x10, 0xce, 0xda, 0x6d, 0x1a, 0x4f, 0x7e, 0x4d, 0xfd, 0x1b, 0x10, 0x32, 0x11, 0x75, 0x23, 0x4b, - 0x48, 0xa5, 0x42, 0x29, 0x04, 0x81, 0x84, 0x7a, 0x82, 0x2a, 0x48, 0x91, 0x42, 0x8b, 0x8c, 0x50, - 0x25, 0xb8, 0x60, 0xbc, 0x5b, 0xd7, 0x34, 0xf5, 0x86, 0xdd, 0x4d, 0xff, 0x3c, 0x03, 0x17, 0x5e, - 0x80, 0xf7, 0xe1, 0xd8, 0x23, 0x47, 0xd4, 0x5e, 0x78, 0x00, 0x1e, 0x00, 0x79, 0x1d, 0x3b, 0x6e, - 0x9a, 0x80, 0xb8, 0x24, 0x3b, 0xdf, 0xfc, 0xfb, 0x66, 0xe6, 0x93, 0x61, 0x33, 0xe4, 0x89, 0x64, - 0x89, 0x1c, 0xc9, 0xc9, 0x6b, 0x28, 0xb8, 0xe2, 0x9b, 0xfa, 0xb7, 0x84, 0xb6, 0x35, 0x80, 0x8d, - 0x02, 0x78, 0x95, 0xda, 0xde, 0x47, 0x30, 0xfb, 0x3c, 0xc2, 0x06, 0x18, 0x31, 0x75, 0x48, 0x8b, - 0xac, 0xff, 0xe7, 0x1b, 0x31, 0x45, 0x07, 0x96, 0x86, 0xc1, 0xd9, 0x80, 0x07, 0xd4, 0x31, 0x34, - 0x98, 0x9b, 0xf8, 0x14, 0x96, 0x04, 0x0b, 0xb9, 0xa0, 0xd2, 0x31, 0x5b, 0xe6, 0x7a, 0xbd, 0xb3, - 0xd6, 0xbe, 0x5a, 0xb2, 0xed, 0x07, 0x27, 0xbe, 0x8e, 0xd8, 0x8b, 0xd5, 0x41, 0x8f, 0xfa, 0x79, - 0xbc, 0xf7, 0x95, 0x80, 0x55, 0x38, 0xcb, 0x2d, 0xc8, 0xd5, 0x16, 0x77, 0xc0, 0x92, 0x71, 0x94, - 0x04, 0x6a, 0x24, 0xd8, 0xb8, 0xfd, 0x04, 0xc0, 0x0d, 0xb0, 0x83, 0x30, 0x64, 0x43, 0xc5, 0x45, - 0x8f, 0xb2, 0x44, 0xc5, 0xea, 0xcc, 0x31, 0x75, 0xd0, 0x35, 0x1c, 0xef, 0xc3, 0xff, 0x39, 0xf6, - 0xba, 0xa8, 0xb8, 0xa0, 0x83, 0xaf, 0x3b, 0xbc, 0x2d, 0x58, 0x99, 0xe2, 0xfe, 0x07, 0x92, 0xd9, - 0xc6, 0x52, 0x76, 0x56, 0xba, 0x31, 0x2f, 0x81, 0xea, 0x78, 0xb0, 0x5b, 0x50, 0x1d, 0x0a, 0x76, - 0xdc, 0xcb, 0x52, 0x2c, 0x7f, 0x6c, 0x61, 0x13, 0x6a, 0x71, 0x4e, 0x38, 0x9b, 0xaa, 0xb0, 0x11, - 0x61, 0x81, 0x06, 0x2a, 0x18, 0x0f, 0xa2, 0xdf, 0xe9, 0x1a, 0x54, 0x7c, 0xc4, 0xa4, 0x0a, 0x8e, - 0x86, 0x9a, 0xb4, 0xe9, 0x4f, 0x00, 0x6f, 0x01, 0x8c, 0xdd, 0x43, 0xef, 0x09, 0x2c, 0xf7, 0x79, - 0xf4, 0x8c, 0x52, 0x9f, 0x7d, 0x1a, 0x31, 0xa9, 0xf0, 0x2e, 0x98, 0x03, 0x1e, 0xe9, 0xce, 0xf5, - 0xce, 0x8d, 0xe9, 0xd3, 0xf4, 0x79, 0xe4, 0xa7, 0x7e, 0xef, 0x1d, 0xd8, 0x19, 0xdb, 0x52, 0xea, - 0x4d, 0x58, 0x1c, 0xf0, 0xa8, 0x97, 0x4f, 0x9a, 0x19, 0xf8, 0x10, 0xaa, 0xd9, 0xfd, 0x34, 0xe7, - 0x7a, 0xe7, 0xf6, 0xdc, 0x73, 0xfb, 0xe3, 0x40, 0xef, 0x25, 0xac, 0xf4, 0x79, 0xb4, 0x17, 0xa8, - 0xf0, 0x20, 0xaf, 0xdd, 0x84, 0xda, 0x49, 0x6a, 0xf7, 0xa8, 0x74, 0x48, 0xcb, 0x4c, 0x67, 0xcf, - 0x6d, 0x74, 0x01, 0x46, 0x49, 0xe1, 0x35, 0xb4, 0xb7, 0x84, 0x78, 0x9f, 0x89, 0x1e, 0x52, 0xd7, - 0xeb, 0x1e, 0xb3, 0x64, 0x1e, 0xd3, 0x92, 0x32, 0x8d, 0x7f, 0x53, 0x26, 0xde, 0x83, 0x45, 0x26, - 0x04, 0x17, 0x7a, 0xff, 0x33, 0xf6, 0xd6, 0x15, 0xc2, 0xcf, 0x22, 0xbc, 0xc7, 0x60, 0x76, 0x85, - 0xc0, 0x76, 0x9e, 0x91, 0x52, 0x68, 0x74, 0x9c, 0x19, 0x19, 0xdb, 0x9c, 0x32, 0x39, 0x4e, 0xdb, - 0x78, 0x0f, 0xb5, 0x1c, 0xc2, 0x06, 0xc0, 0x9b, 0x84, 0x9d, 0x0e, 0x59, 0xa8, 0x18, 0xb5, 0x2b, - 0xb8, 0x0c, 0x56, 0x9f, 0x47, 0xdd, 0xd3, 0x58, 0x2a, 0x69, 0x13, 0x5c, 0x81, 0x7a, 0x9f, 0x47, - 0x3b, 0x5c, 0xbd, 0xe0, 0xa3, 0x84, 0xda, 0x06, 0x22, 0x34, 0x32, 0xda, 0xdb, 0x3c, 0xd9, 0x1f, - 0xc4, 0xa1, 0xb2, 0x4d, 0xb4, 0xa1, 0xde, 0x4d, 0x0b, 0xef, 0xee, 0xef, 0x4b, 0xa6, 0xec, 0x5f, - 0x66, 0xe7, 0x27, 0x01, 0x6b, 0x3b, 0x27, 0x81, 0x5b, 0x50, 0xcd, 0x84, 0x81, 0xab, 0x33, 0x44, - 0x30, 0xb9, 0x7a, 0x13, 0xa7, 0xdd, 0xbb, 0x87, 0xb8, 0x03, 0x56, 0xa1, 0x0e, 0x6c, 0x5d, 0xdb, - 0xe2, 0x94, 0x70, 0x9a, 0x7f, 0xdb, 0x33, 0xee, 0x40, 0x2d, 0x3f, 0x20, 0xae, 0xcd, 0xa0, 0x53, - 0x96, 0x4a, 0x73, 0x75, 0x5e, 0x80, 0xbe, 0xfd, 0x3a, 0x79, 0x40, 0x9e, 0x77, 0xbe, 0x5d, 0xb8, - 0xe4, 0xfc, 0xc2, 0x25, 0x3f, 0x2e, 0x5c, 0xf2, 0xe5, 0xd2, 0xad, 0x9c, 0x5f, 0xba, 0x95, 0xef, - 0x97, 0x6e, 0xe5, 0xad, 0x33, 0xef, 0x7b, 0xf8, 0xa1, 0xaa, 0xff, 0x1e, 0xfd, 0x0e, 0x00, 0x00, - 0xff, 0xff, 0xbc, 0x83, 0xcb, 0xc1, 0x32, 0x05, 0x00, 0x00, + // 617 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcb, 0x6e, 0xd3, 0x4c, + 0x14, 0xce, 0xd8, 0x6d, 0x1a, 0x9f, 0xfc, 0x4d, 0xfd, 0x1f, 0x10, 0x32, 0x11, 0x75, 0x23, 0x4b, + 0x48, 0xa1, 0x42, 0x29, 0x04, 0x81, 0x84, 0xba, 0x82, 0x2a, 0x48, 0x91, 0x42, 0x8b, 0x8c, 0x50, + 0x25, 0xd8, 0x60, 0x3c, 0x53, 0xd7, 0x34, 0xf5, 0x84, 0x99, 0x49, 0x2f, 0xcf, 0xc0, 0x86, 0x17, + 0xe0, 0x7d, 0x58, 0x76, 0xc9, 0x12, 0xb5, 0x1b, 0x1e, 0x80, 0x07, 0x40, 0x19, 0xc7, 0x8e, 0x9b, + 0x0b, 0x88, 0x4d, 0x32, 0xe7, 0x3b, 0xb7, 0xef, 0x7c, 0xe7, 0xc8, 0xb0, 0x15, 0xf2, 0x44, 0xb2, + 0x44, 0x0e, 0xe5, 0xe4, 0x35, 0x10, 0x5c, 0xf1, 0x2d, 0xfd, 0x5b, 0x40, 0x5b, 0x1a, 0xc0, 0x5a, + 0x0e, 0xbc, 0x1a, 0xd9, 0xde, 0x47, 0x30, 0x7b, 0x3c, 0xc2, 0x1a, 0x18, 0x31, 0x75, 0x48, 0x83, + 0x34, 0x2d, 0xdf, 0x88, 0x29, 0x3a, 0xb0, 0x32, 0x08, 0xce, 0xfb, 0x3c, 0xa0, 0x8e, 0xd1, 0x20, + 0xcd, 0xff, 0xfc, 0xcc, 0xc4, 0xa7, 0xb0, 0x22, 0x58, 0xc8, 0x05, 0x95, 0x8e, 0xd9, 0x30, 0x9b, + 0xd5, 0xf6, 0x46, 0xeb, 0x7a, 0xc9, 0x96, 0x1f, 0x9c, 0xfa, 0x3a, 0x62, 0x3f, 0x56, 0x87, 0x5d, + 0xea, 0x67, 0xf1, 0xde, 0x57, 0x02, 0x56, 0xee, 0x2c, 0xb6, 0x20, 0xd7, 0x5b, 0xdc, 0x01, 0x4b, + 0xc6, 0x51, 0x12, 0xa8, 0xa1, 0x60, 0xe3, 0xf6, 0x13, 0x00, 0x37, 0xc1, 0x0e, 0xc2, 0x90, 0x0d, + 0x14, 0x17, 0x5d, 0xca, 0x12, 0x15, 0xab, 0x73, 0xc7, 0xd4, 0x41, 0x33, 0x38, 0xde, 0x87, 0xff, + 0x33, 0xec, 0x75, 0x5e, 0x71, 0x49, 0x07, 0xcf, 0x3a, 0xbc, 0x6d, 0x58, 0x9b, 0xe2, 0xfe, 0x07, + 0x92, 0xa9, 0x62, 0x46, 0xa6, 0x98, 0x97, 0x40, 0x79, 0x3c, 0xd8, 0x2d, 0x28, 0x0f, 0x04, 0x3b, + 0xe9, 0x66, 0x7a, 0x8e, 0x2d, 0xac, 0x43, 0x25, 0xce, 0x08, 0xa7, 0x53, 0xe5, 0x36, 0x22, 0x2c, + 0xd1, 0x40, 0x05, 0xe3, 0x41, 0xf4, 0x7b, 0x24, 0x83, 0x8a, 0x8f, 0x99, 0x54, 0xc1, 0xf1, 0x40, + 0x93, 0x36, 0xfd, 0x09, 0xe0, 0x2d, 0x81, 0xb1, 0x77, 0xe4, 0x3d, 0x81, 0xd5, 0x1e, 0x8f, 0x9e, + 0x51, 0xea, 0xb3, 0x4f, 0x43, 0x26, 0x15, 0xde, 0x05, 0xb3, 0xcf, 0x23, 0xdd, 0xb9, 0xda, 0xbe, + 0x31, 0xbd, 0x9a, 0x1e, 0x8f, 0xfc, 0x91, 0xdf, 0x7b, 0x07, 0x76, 0xca, 0xb6, 0x90, 0x7a, 0x13, + 0x96, 0xfb, 0x3c, 0xca, 0x69, 0xa7, 0x06, 0x3e, 0x84, 0x72, 0xba, 0x3f, 0xcd, 0xb9, 0xda, 0xbe, + 0xbd, 0x70, 0xdd, 0xfe, 0x38, 0xd0, 0x7b, 0x09, 0x6b, 0x3d, 0x1e, 0xed, 0x07, 0x2a, 0x3c, 0xcc, + 0x6a, 0xd7, 0xa1, 0x72, 0x3a, 0xb2, 0xbb, 0x54, 0x3a, 0xa4, 0x61, 0x36, 0x2d, 0x3f, 0xb7, 0xd1, + 0x05, 0x18, 0x26, 0xb9, 0xd7, 0xd0, 0xde, 0x02, 0xe2, 0x7d, 0x26, 0x7a, 0x48, 0x5d, 0xaf, 0x73, + 0xc2, 0x92, 0x45, 0x4c, 0x0b, 0x97, 0x69, 0xfc, 0xdb, 0x65, 0xe2, 0x3d, 0x58, 0x66, 0x42, 0x70, + 0xa1, 0xf5, 0x9f, 0xa3, 0x5b, 0x47, 0x08, 0x3f, 0x8d, 0xf0, 0x1e, 0x83, 0xd9, 0x11, 0x02, 0x5b, + 0x59, 0xc6, 0x88, 0x42, 0xad, 0xed, 0xcc, 0xc9, 0xd8, 0xe1, 0x94, 0xc9, 0x71, 0xda, 0xe6, 0x7b, + 0xa8, 0x64, 0x10, 0xd6, 0x00, 0xde, 0x24, 0xec, 0x6c, 0xc0, 0x42, 0xc5, 0xa8, 0x5d, 0xc2, 0x55, + 0xb0, 0x7a, 0x3c, 0xea, 0x9c, 0xc5, 0x52, 0x49, 0x9b, 0xe0, 0x1a, 0x54, 0x7b, 0x3c, 0xda, 0xe5, + 0xea, 0x05, 0x1f, 0x26, 0xd4, 0x36, 0x10, 0xa1, 0x96, 0xd2, 0xde, 0xe1, 0xc9, 0x41, 0x3f, 0x0e, + 0x95, 0x6d, 0xa2, 0x0d, 0xd5, 0xce, 0xa8, 0xf0, 0xde, 0xc1, 0x81, 0x64, 0xca, 0xfe, 0x65, 0xb6, + 0x7f, 0x12, 0xb0, 0x76, 0x32, 0x12, 0xb8, 0x0d, 0xe5, 0xf4, 0x30, 0x70, 0x7d, 0xce, 0x11, 0x4c, + 0xb6, 0x5e, 0xc7, 0x69, 0xf7, 0xde, 0x11, 0xee, 0x82, 0x95, 0x5f, 0x07, 0x36, 0x66, 0x54, 0x9c, + 0x3a, 0x9c, 0xfa, 0xdf, 0x74, 0xc6, 0x5d, 0xa8, 0x64, 0x0b, 0xc4, 0x8d, 0x39, 0x74, 0x8a, 0xa7, + 0x52, 0x5f, 0x5f, 0x14, 0xa0, 0x77, 0xdf, 0x24, 0x0f, 0xc8, 0xf3, 0xf6, 0xb7, 0x4b, 0x97, 0x5c, + 0x5c, 0xba, 0xe4, 0xc7, 0xa5, 0x4b, 0xbe, 0x5c, 0xb9, 0xa5, 0x8b, 0x2b, 0xb7, 0xf4, 0xfd, 0xca, + 0x2d, 0xbd, 0x75, 0x16, 0x7d, 0x0f, 0x3f, 0x94, 0xf5, 0xdf, 0xa3, 0xdf, 0x01, 0x00, 0x00, 0xff, + 0xff, 0xa3, 0xfa, 0x07, 0x78, 0x32, 0x05, 0x00, 0x00, } func (m *Log) Marshal() (dAtA []byte, err error) { @@ -1215,14 +1215,14 @@ func (m *LogWatchRequest) Size() (n int) { var l int _ = l if len(m.WatchIds) > 0 { - for _, b := range m.WatchIds { - l = len(b) + for _, s := range m.WatchIds { + l = len(s) n += 1 + l + sovConsensus(uint64(l)) } } if len(m.UnwatchIds) > 0 { - for _, b := range m.UnwatchIds { - l = len(b) + for _, s := range m.UnwatchIds { + l = len(s) n += 1 + l + sovConsensus(uint64(l)) } } @@ -1303,7 +1303,7 @@ func (m *Log) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowConsensus @@ -1313,25 +1313,23 @@ func (m *Log) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthConsensus } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthConsensus } if postIndex > l { return io.ErrUnexpectedEOF } - m.Id = append(m.Id[:0], dAtA[iNdEx:postIndex]...) - if m.Id == nil { - m.Id = []byte{} - } + m.Id = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -2062,7 +2060,7 @@ func (m *RecordAddRequest) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LogId", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowConsensus @@ -2072,25 +2070,23 @@ func (m *RecordAddRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthConsensus } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthConsensus } if postIndex > l { return io.ErrUnexpectedEOF } - m.LogId = append(m.LogId[:0], dAtA[iNdEx:postIndex]...) - if m.LogId == nil { - m.LogId = []byte{} - } + m.LogId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -2182,7 +2178,7 @@ func (m *LogWatchRequest) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field WatchIds", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowConsensus @@ -2192,29 +2188,29 @@ func (m *LogWatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthConsensus } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthConsensus } if postIndex > l { return io.ErrUnexpectedEOF } - m.WatchIds = append(m.WatchIds, make([]byte, postIndex-iNdEx)) - copy(m.WatchIds[len(m.WatchIds)-1], dAtA[iNdEx:postIndex]) + m.WatchIds = append(m.WatchIds, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field UnwatchIds", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowConsensus @@ -2224,23 +2220,23 @@ func (m *LogWatchRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthConsensus } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthConsensus } if postIndex > l { return io.ErrUnexpectedEOF } - m.UnwatchIds = append(m.UnwatchIds, make([]byte, postIndex-iNdEx)) - copy(m.UnwatchIds[len(m.UnwatchIds)-1], dAtA[iNdEx:postIndex]) + m.UnwatchIds = append(m.UnwatchIds, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex default: iNdEx = preIndex @@ -2296,7 +2292,7 @@ func (m *LogWatchEvent) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LogId", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowConsensus @@ -2306,25 +2302,23 @@ func (m *LogWatchEvent) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthConsensus } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthConsensus } if postIndex > l { return io.ErrUnexpectedEOF } - m.LogId = append(m.LogId[:0], dAtA[iNdEx:postIndex]...) - if m.LogId == nil { - m.LogId = []byte{} - } + m.LogId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { diff --git a/consensus/consensusproto/protos/consensus.proto b/consensus/consensusproto/protos/consensus.proto index 55918519..716ddcba 100644 --- a/consensus/consensusproto/protos/consensus.proto +++ b/consensus/consensusproto/protos/consensus.proto @@ -13,7 +13,7 @@ enum ErrCodes { message Log { - bytes id = 1; + string id = 1; bytes payload = 2; repeated RawRecordWithId records = 3; } @@ -57,17 +57,17 @@ message LogAddRequest { } message RecordAddRequest { - bytes logId = 1; + string logId = 1; RawRecord record = 2; } message LogWatchRequest { - repeated bytes watchIds = 1; - repeated bytes unwatchIds = 2; + repeated string watchIds = 1; + repeated string unwatchIds = 2; } message LogWatchEvent { - bytes logId = 1; + string logId = 1; repeated RawRecordWithId records = 2; Err error = 3; }