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.

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

Jump to bottom

Improve view support for pscale database dump / restore-dump #932

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Improve view support for pscale database dump / restore-dump #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e7b9f9
Added better support for views within dumper.go
orware Oct 25, 2024
6c37826
Added better support for views within loader.go
orware Oct 25, 2024
abe747f
Adding test fixes for dumper_test.go
orware Oct 25, 2024
af255c3
Merge branch 'main' into improve-view-support
orware Oct 28, 2024
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
40 changes: 38 additions & 2 deletions internal/dumper/dumper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,19 @@ func (d *Dumper) Run(ctx context.Context) error {
}

tables := make([][]string, len(databases))
views := make([]map[string]bool, len(databases))
for i, database := range databases {
if d.cfg.Table != "" {
tables[i] = strings.Split(d.cfg.Table, ",")
} else {
tables[i], err = d.allTables(conn, database)

if err != nil {
return err
}

views[i], err = d.allViews(conn, database)

if err != nil {
return err
}
Expand All @@ -135,13 +143,18 @@ func (d *Dumper) Run(ctx context.Context) error {
}

conn := initPool.Get()
err := d.dumpTableSchema(conn, database, table)
err := d.dumpTableSchema(conn, database, table, views[i])
if err != nil {
return err
}

initPool.Put(conn)

if _, ok := views[i][table]; ok {
// If we just processed a view we don't want to dump it so the next part is skipped:
continue
}

conn = pool.Get()
wg.Add(1)
go func(conn *Connection, database string, table string) {
Expand Down Expand Up @@ -200,7 +213,7 @@ func writeMetaData(outdir string) error {
return writeFile(file, "")
}

func (d *Dumper) dumpTableSchema(conn *Connection, database string, table string) error {
func (d *Dumper) dumpTableSchema(conn *Connection, database string, table string, views map[string]bool) error {
qr, err := conn.Fetch(fmt.Sprintf("SHOW CREATE TABLE `%s`.`%s`", database, table))
if err != nil {
return err
Expand All @@ -209,6 +222,11 @@ func (d *Dumper) dumpTableSchema(conn *Connection, database string, table string
schema := qr.Rows[0][1].String() + ";\n"

file := fmt.Sprintf("%s/%s.%s-schema.sql", d.cfg.Outdir, database, table)
if _, ok := views[table]; ok {
// https://github.com/mydumper/mydumper/blob/e55612616d17281a45eed0a60a9b054cdd1fe064/src/myloader_common.c#L374
file = fmt.Sprintf("%s/%s.%s-schema-view.sql", d.cfg.Outdir, database, table)
}

err = writeFile(file, schema)
if err != nil {
return err
Expand Down Expand Up @@ -379,6 +397,24 @@ func (d *Dumper) allTables(conn *Connection, database string) ([]string, error)
return tables, nil
}

func (d *Dumper) allViews(conn *Connection, database string) (map[string]bool, error) {
query := `SELECT TABLE_NAME
FROM information_schema.TABLES
WHERE TABLE_SCHEMA LIKE '%s'
AND TABLE_TYPE = 'VIEW'
`
qr, err := conn.Fetch(fmt.Sprintf(query, database))
if err != nil {
return nil, err
}

views := make(map[string]bool)
for _, t := range qr.Rows {
views[t[0].String()] = true
}
return views, nil
}

func (d *Dumper) allDatabases(conn *Connection) ([]string, error) {
qr, err := conn.Fetch("SHOW DATABASES")
if err != nil {
Expand Down
Loading