Miscellaneous changes in export schema transformations #2378
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
sanyamsinghal
changed the title
- fixed the console output whether recommendations are applied or not. - regression: added --skip-recommendations flag back
sanyamsinghal
changed the title
priyanshi-yb
approved these changes
Mar 5, 2025
yb-voyager/cmd/exportSchema.go
Outdated
Comment on lines
316
to
320
| if !skipRecommendations { | ||
| transformations = append(transformations, applyShardedTableTransformation) // transform #1 | ||
| transformations = append(transformations, applyMergeConstraintsTransformation) // transform #2 | ||
| } else { | ||
| transformations = append(transformations, applyMergeConstraintsTransformation) // transform #1 |
There was a problem hiding this comment.
nit:
if !skipRecommendations {
transformations = append(transformations, applyShardedTableTransformation) // transform #1
}
transformations = append(transformations, applyMergeConstraintsTransformation) // transform #1
| newStmts, err := transformFn(transformedStmts) | ||
| if err != nil { | ||
| transformFuncName := utils.GetFuncName(transformFn) | ||
| log.Infof("applying transformation: %s on %s", filepath.Base(transformFuncName), filePath) |
There was a problem hiding this comment.
I believe filepath.Base is for the filePath arg?
There was a problem hiding this comment.
transformFuncName also comes as fullpath to the function name
| @@ -122,6 +122,7 @@ func (t *Transformer) MergeConstraints(stmts []*pg_query.RawStmt) ([]*pg_query.R | |||
| Otherwise, add it to the result slice | |||
| */ | |||
| alterTableCmdType := alterTableCmd.GetSubtype() | |||
| log.Infof("alterTableCmdType: %v", *alterTableCmdType.Enum()) | |||
There was a problem hiding this comment.
Is this required as Info log?
There was a problem hiding this comment.
yeah might be useful.
| @@ -146,6 +147,7 @@ func (t *Transformer) MergeConstraints(stmts []*pg_query.RawStmt) ([]*pg_query.R | |||
| if !ok { | |||
| return nil, fmt.Errorf("CREATE TABLE stmt not found for table %v", objectName) | |||
| } | |||
| log.Infof("merging constraint %v into CREATE TABLE for object %v", constrType, objectName) | |||
There was a problem hiding this comment.
can this be debug log?
There was a problem hiding this comment.
this might help in debugging so kept it for default log level.
| @@ -103,6 +103,7 @@ func ora2pgExtractSchema(source *Source, exportDir string, schemaDir string) { | |||
| } | |||
| } | |||
| } | |||
| fmt.Println() | |||
There was a problem hiding this comment.
i added it explicitly to print a empty line after the schema export. To make it more readable.
yb-voyager/src/srcdb/postgres.go
Outdated
| @@ -113,8 +113,8 @@ func (pg *PostgreSQL) Connect() error { | |||
| err := pg.db.Ping() | |||
| if err == nil { | |||
| log.Infof("Already connected to the source database") | |||
| log.Infof("Already connected to the source database") | |||
| return nil | |||
| log.Infof("Already connected to the source database") | |||
sanyamsinghal
added a commit
that referenced
this pull request
Mar 6, 2025
This reverts commit 7d21b3e.
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.
Describe the changes in this pull request
Added unit test for testing pg parser Deparsing API
Fixing bug https://yugabyte.atlassian.net/browse/DB-15613 is dependent on the upstream release.
Sample console output:
Describe if there are any user-facing changes
Console output wrt recommendations applied or not.
How was this pull request tested?
Does your PR have changes that can cause upgrade issues?