Skip to content

event: account for raw rows in batch DML event size #5960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wlwilliamx wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −0
Open

event: account for raw rows in batch DML event size #5960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkg/common/event/dml_event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,12 @@ func (b *BatchDMLEvent) GetStartTs() common.Ts {
return b.DMLEvents[0].GetStartTs()
}

// GetSize returns the in-memory size of the row payload.
// Remote events keep their encoded rows in RawRows until AssembleRows decodes them.
func (b *BatchDMLEvent) GetSize() int64 {
if b.Rows == nil {
return int64(len(b.RawRows))
}
return b.Rows.MemoryUsage()
}

Expand Down
8 changes: 8 additions & 0 deletions pkg/common/event/dml_event_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ func TestBatchDMLEventAssembleRowsKeepsOriginalTableInfoForLocalRowsWithoutRouti
require.Equal(t, "t", batchDMLEvent.TableInfo.GetTargetTableName())
}

// TestBatchDMLEventAssembleRowsDecodesRemoteRawRows verifies size accounting
// before and after a remotely received batch decodes its raw row payload.
func TestBatchDMLEventAssembleRowsDecodesRemoteRawRows(t *testing.T) {
helper := NewEventTestHelper(t)
defer helper.Close()
Expand All @@ -233,6 +235,9 @@ func TestBatchDMLEventAssembleRowsDecodesRemoteRawRows(t *testing.T) {
Rows: dmlEvent.Rows,
TableInfo: dmlEvent.TableInfo,
}
require.Equal(t, batchDMLEvent.Rows.MemoryUsage(), batchDMLEvent.GetSize())
require.Positive(t, batchDMLEvent.GetSize())

data, err := batchDMLEvent.Marshal()
require.NoError(t, err)

Expand All @@ -241,10 +246,13 @@ func TestBatchDMLEventAssembleRowsDecodesRemoteRawRows(t *testing.T) {
require.NoError(t, err)
require.Nil(t, reverseEvents.Rows)
require.NotEmpty(t, reverseEvents.RawRows)
require.Equal(t, int64(len(reverseEvents.RawRows)), reverseEvents.GetSize())

reverseEvents.AssembleRows(batchDMLEvent.TableInfo)

require.Nil(t, reverseEvents.RawRows)
require.Equal(t, reverseEvents.Rows.MemoryUsage(), reverseEvents.GetSize())
require.Positive(t, reverseEvents.GetSize())
require.Same(t, batchDMLEvent.TableInfo, reverseEvents.TableInfo)
require.Equal(t, batchDMLEvent.Rows.ToString(batchDMLEvent.TableInfo.GetFieldSlice()), reverseEvents.Rows.ToString(batchDMLEvent.TableInfo.GetFieldSlice()))
}
Expand Down
Loading