From a408ff04fb42ff237e89817ac2909689c396baac Mon Sep 17 00:00:00 2001 From: mattisonchao Date: Sat, 12 Aug 2023 22:06:58 +0800 Subject: [PATCH] Fix wrong model field --- pkg/utils/message_id.go | 12 ++++++------ pkg/utils/message_id_test.go | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/utils/message_id.go b/pkg/utils/message_id.go index 87d8e4a..014de3a 100644 --- a/pkg/utils/message_id.go +++ b/pkg/utils/message_id.go @@ -23,10 +23,10 @@ import ( ) type MessageID struct { - LedgerID int64 `json:"ledgerId"` - EntryID int64 `json:"entryId"` - PartitionedIndex int `json:"partitionedIndex"` - BatchIndex int `json:"-"` + LedgerID int64 `json:"ledgerId"` + EntryID int64 `json:"entryId"` + PartitionIndex int `json:"partitionIndex"` + BatchIndex int `json:"-"` } var Latest = MessageID{0x7fffffffffffffff, 0x7fffffffffffffff, -1, -1} @@ -58,7 +58,7 @@ func ParseMessageID(str string) (*MessageID, error) { if err != nil { return nil, errors.Errorf("invalid partition index. %s", str) } - m.PartitionedIndex = pi + m.PartitionIndex = pi } if len(s) == 4 { @@ -75,6 +75,6 @@ func ParseMessageID(str string) (*MessageID, error) { func (m MessageID) String() string { return strconv.FormatInt(m.LedgerID, 10) + ":" + strconv.FormatInt(m.EntryID, 10) + ":" + - strconv.Itoa(m.PartitionedIndex) + ":" + + strconv.Itoa(m.PartitionIndex) + ":" + strconv.Itoa(m.BatchIndex) } diff --git a/pkg/utils/message_id_test.go b/pkg/utils/message_id_test.go index 7d34cf7..9c74bef 100644 --- a/pkg/utils/message_id_test.go +++ b/pkg/utils/message_id_test.go @@ -24,15 +24,15 @@ import ( func TestParseMessageId(t *testing.T) { id, err := ParseMessageID("1:1") assert.Nil(t, err) - assert.Equal(t, MessageID{LedgerID: 1, EntryID: 1, PartitionedIndex: -1, BatchIndex: -1}, *id) + assert.Equal(t, MessageID{LedgerID: 1, EntryID: 1, PartitionIndex: -1, BatchIndex: -1}, *id) id, err = ParseMessageID("1:2:3") assert.Nil(t, err) - assert.Equal(t, MessageID{LedgerID: 1, EntryID: 2, PartitionedIndex: 3, BatchIndex: -1}, *id) + assert.Equal(t, MessageID{LedgerID: 1, EntryID: 2, PartitionIndex: 3, BatchIndex: -1}, *id) id, err = ParseMessageID("1:2:3:4") assert.Nil(t, err) - assert.Equal(t, MessageID{LedgerID: 1, EntryID: 2, PartitionedIndex: 3, BatchIndex: 4}, *id) + assert.Equal(t, MessageID{LedgerID: 1, EntryID: 2, PartitionIndex: 3, BatchIndex: 4}, *id) } func TestParseMessageIdErrors(t *testing.T) {