Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion go/vt/vttablet/tabletmanager/vdiff/workflow_differ.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (wd *workflowDiffer) reconcileExtraRows(dr *DiffReport, maxExtraRowsToCompa
}

func (wd *workflowDiffer) reconcileReferenceTables(dr *DiffReport) error {
if dr.MismatchedRows == 0 {
if dr.MismatchedRows == 0 && dr.MatchingRows > 0 {
// Get the VSchema on the target and source keyspaces. We can then use this
// for handling additional edge cases, such as adjusting results for reference
// tables when the shard count is different between the source and target as
Expand Down
114 changes: 114 additions & 0 deletions go/vt/vttablet/tabletmanager/vdiff/workflow_differ_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@ import (
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/binlog/binlogplayer"
"vitess.io/vitess/go/vt/sqlparser"
"vitess.io/vitess/go/vt/topo"
"vitess.io/vitess/go/vt/vtgate/engine"
"vitess.io/vitess/go/vt/vtgate/engine/opcode"

binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
topodatapb "vitess.io/vitess/go/vt/proto/topodata"
vschemapb "vitess.io/vitess/go/vt/proto/vschema"
)

func max(a, b int64) int64 {
Expand Down Expand Up @@ -303,6 +305,118 @@ func TestReconcileExtraRows(t *testing.T) {
})
}

func TestReconcileReferenceTables(t *testing.T) {
ctx := t.Context()
vdenv := newTestVDiffEnv(t)
defer vdenv.close()
UUID := uuid.New()
controllerQR := sqltypes.MakeTestResult(sqltypes.MakeTestFields(
vdiffTestCols,
vdiffTestColTypes,
),
fmt.Sprintf("1|%s|%s|%s|%s|%s|%s|%s|", UUID, vdiffenv.workflow, tstenv.KeyspaceName, tstenv.ShardName, vdiffDBName, PendingState, optionsJS),
)

vdiffenv.dbClient.ExpectRequest("select * from _vt.vdiff where id = 1", noResults, nil)
ct := vdenv.newController(t, controllerQR)
ct.sourceKeyspace = tstenv.KeyspaceName
wd, err := newWorkflowDiffer(ct, vdiffenv.opts, collations.MySQL8())
require.NoError(t, err)

// Create VSchema for the source keyspace with a reference table.
err = tstenv.TopoServ.EnsureVSchema(ctx, tstenv.KeyspaceName)
require.NoError(t, err)
sourceVS := &vschemapb.Keyspace{
Tables: map[string]*vschemapb.Table{
"ref_table": {
Type: "reference",
},
},
}
err = tstenv.TopoServ.SaveVSchema(ctx, &topo.KeyspaceVSchemaInfo{
Name: tstenv.KeyspaceName,
Keyspace: sourceVS,
})
require.NoError(t, err)

t.Run("division by zero with zero matching rows - source side", func(t *testing.T) {
dr := &DiffReport{
TableName: "ref_table",
ProcessedRows: 10,
MatchingRows: 0,
MismatchedRows: 0, // Must be 0 to enter reconciliation logic
ExtraRowsSource: 10,
ExtraRowsSourceDiffs: []*RowDiff{{Row: map[string]string{"id": "1"}}},
ExtraRowsTarget: 0,
}

err := wd.reconcileReferenceTables(dr)
require.NoError(t, err)

// Values should remain unchanged since MatchingRows is 0.
require.Equal(t, int64(10), dr.ExtraRowsSource)
require.Equal(t, int64(0), dr.ExtraRowsTarget)
})

t.Run("division by zero with zero matching rows - target side", func(t *testing.T) {
dr := &DiffReport{
TableName: "ref_table",
ProcessedRows: 10,
MatchingRows: 0,
MismatchedRows: 0, // Must be 0 to enter reconciliation logic
ExtraRowsSource: 0,
ExtraRowsTarget: 10,
ExtraRowsTargetDiffs: []*RowDiff{{Row: map[string]string{"id": "1"}}},
}

err := wd.reconcileReferenceTables(dr)
require.NoError(t, err)

// Values should remain unchanged since MatchingRows is 0.
require.Equal(t, int64(0), dr.ExtraRowsSource)
require.Equal(t, int64(10), dr.ExtraRowsTarget)
})

t.Run("reference table with positive matching rows - works correctly", func(t *testing.T) {
dr := &DiffReport{
TableName: "ref_table",
ProcessedRows: 15,
MatchingRows: 5,
MismatchedRows: 0,
ExtraRowsSource: 10, // 10 % 5 = 0, so it's a multiple.
ExtraRowsSourceDiffs: []*RowDiff{{Row: map[string]string{"id": "1"}}},
ExtraRowsTarget: 0,
}

err := wd.reconcileReferenceTables(dr)
require.NoError(t, err)

// ExtraRowsSource should be cleared since it's a multiple of MatchingRows.
require.Equal(t, int64(0), dr.ExtraRowsSource)
require.Equal(t, 0, len(dr.ExtraRowsSourceDiffs))
})

t.Run("mismatched rows - reconciliation skipped entirely", func(t *testing.T) {
// With mismatched rows, reconciliation is skipped, so no VSchema access.
dr := &DiffReport{
TableName: "ref_table",
ProcessedRows: 10,
MatchingRows: 0,
MismatchedRows: 5, // Non-zero means early return, no VSchema access
ExtraRowsSource: 10,
ExtraRowsSourceDiffs: []*RowDiff{{Row: map[string]string{"id": "1"}}},
ExtraRowsTarget: 0,
}

err := wd.reconcileReferenceTables(dr)
require.NoError(t, err)

// Values should remain unchanged.
require.Equal(t, int64(10), dr.ExtraRowsSource)
require.Equal(t, int64(0), dr.ExtraRowsTarget)
})
}

func TestBuildPlanSuccess(t *testing.T) {
vdenv := newTestVDiffEnv(t)
defer vdenv.close()
Expand Down
Loading