Skip to content
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.

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

vrepl: misc cleanup #5594

Merged
merged 4 commits into from
Dec 30, 2019
Merged

vrepl: misc cleanup #5594

merged 4 commits into from
Dec 30, 2019

Conversation

sougou
Copy link
Contributor

@sougou sougou commented Dec 19, 2019

Some misc cleanup before the Migrate command implementation.

@sougou sougou requested a review from deepthi December 19, 2019 06:53
@@ -116,8 +108,12 @@ func (plan *Plan) filter(values []sqltypes.Value) (bool, []sqltypes.Value, error
return true, result, nil
}

func getKeyspaceID(values []sqltypes.Value, vindex vindexes.Vindex) (key.DestinationKeyspaceID, error) {
destinations, err := vindexes.Map(vindex, nil, [][]sqltypes.Value{values})
func getKeyspaceID(values []sqltypes.Value, vindex vindexes.Vindex, vindexColumns []int) (key.DestinationKeyspaceID, error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
The vstreamer API changes used by MySQLVStreamerClient raised some
lint errors. The new APIs export a more clean one which don't raise
any linter alarms.

Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
The function was returning a match if a regexp failed. It now treats
it as no match. This code appears to be unreachable because there is
a higher level function that checks for regexp errors. This is just
a conservative change to prevent future bugs.

Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
Copy link
Member

@deepthi deepthi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@deepthi deepthi merged commit c9b1a63 into vitessio:master Dec 30, 2019
@sougou sougou deleted the ss-vrepl-misc branch December 30, 2019 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants