sync-diff-inspector: add session configuration in toml #847
+77
−12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/release-note-none |
ti-chi-bot
bot
added
release-note-none
and removed
do-not-merge/release-note-label-needed
labels
3 tasks
|
Will also close #844 |
|
/retest |
|
/retest |
|
/cc @kennytm |
kennytm
reviewed
Feb 25, 2025
sync_diff_inspector/config/config.go
Outdated
| for param, value := range d.SessionConfig { | ||
| switch v := value.(type) { | ||
| case string: | ||
| cfg.Params[param] = "\"" + v + "\"" |
There was a problem hiding this comment.
Suggested change
| cfg.Params[param] = "\"" + v + "\"" | |
| cfg.Params[param] = "'" + strings.ReplaceAll(v, "'", "''") + "'" |
| return nil | ||
| } | ||
| for param, value := range *sessionCfg { | ||
| res, err := db.Query(fmt.Sprintf("show session variables like '%s'", param)) |
There was a problem hiding this comment.
Suggested change
| res, err := db.Query(fmt.Sprintf("show session variables like '%s'", param)) | |
| res, err := db.Query("show session variables like ?", param) |
sync_diff_inspector/config/config.go
Outdated
| case string: | ||
| cfg.Params[param] = "\"" + v + "\"" | ||
| default: | ||
| cfg.Params[param] = fmt.Sprintf("%v", v) |
There was a problem hiding this comment.
Suggested change
| cfg.Params[param] = fmt.Sprintf("%v", v) | |
| cfg.Params[param] = fmt.Sprint(v) |
| if err := res.Scan(¶mName, &actual); err != nil { | ||
| return err | ||
| } | ||
| expected := fmt.Sprintf("%v", value) |
There was a problem hiding this comment.
Suggested change
| expected := fmt.Sprintf("%v", value) | |
| expected := fmt.Sprint(value) |
sync_diff_inspector/source/source.go
Outdated
Comment on lines
279
to
281
| log.Error(fmt.Sprintf("failed to configure session for data source '%s'", cfg.Task.Target), | ||
| zap.String("error", err.Error()), | ||
| ) |
There was a problem hiding this comment.
Suggested change
| log.Error(fmt.Sprintf("failed to configure session for data source '%s'", cfg.Task.Target), | |
| zap.String("error", err.Error()), | |
| ) | |
| log.Error("failed to configure session", zap.String("data-source", cfg.Task.Target), zap.Error(err)) |
printf should be avoided when using structured logging
sync_diff_inspector/source/source.go
Outdated
Comment on lines
300
to
302
| log.Error(fmt.Sprintf("failed to configure session for data source '%s'", cfg.Task.Source[sourceIdx]), | ||
| zap.String("error", err.Error()), | ||
| ) |
There was a problem hiding this comment.
Suggested change
| log.Error(fmt.Sprintf("failed to configure session for data source '%s'", cfg.Task.Source[sourceIdx]), | |
| zap.String("error", err.Error()), | |
| ) | |
| log.Error("failed to configure session", zap.String("data-source", cfg.Task.Source[sourceIdx]), zap.Error(err)) |
kennytm
approved these changes
Feb 27, 2025
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: kennytm The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
[LGTM Timeline notifier]Timeline:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Issue Number: ref #836, close #844
What is changed and how it works?
Add session variable configuration for each data source.
Check List
Tests
Code changes
Side effects
Related changes