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

Consistent snapshot using retries instead of DBLog algorithm #60

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

Consistent snapshot using retries instead of DBLog algorithm #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
723b7bc
Consistent snapshot using retries instead of DBLog algorithm
tirsen May 10, 2023
dfad3a6
Tweaks
tirsen May 10, 2023
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
1 change: 1 addition & 0 deletions cmd/cloner/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const TimestampFormat = `2006-01-02T15:04:05.000`

var cli struct {
Clone clone.Clone `cmd:"" help:"Best effort copy of databases"`
NewClone clone.NewClone `cmd:"" help:"Best effort copy of databases"`
Checksum clone.Checksum `cmd:"" help:"Find differences between databases"`
Replicate clone.Replicate `cmd:"" help:"Replicate from one database to another and consistent clone"`
Ping clone.Ping `cmd:"" help:"Ping the databases to check the config is right"`
Expand Down
1 change: 0 additions & 1 deletion pkg/clone/chunker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@ func generateTableChunksAsync(ctx context.Context, table *Table, source *sql.DB,
startTime := time.Now()

chunkSize := table.Config.ChunkSize

ids := streamIds(source, table, chunkSize, retry)

var err error
Expand Down
20 changes: 0 additions & 20 deletions pkg/clone/clone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,23 +256,3 @@ func (cmd *Clone) copyTableSchema(ctx context.Context, table *Table, source *sql
}
return nil
}

func removeElement[T comparable](slice []T, element T) []T {
return removeElementByIndex(slice, findIndex(slice, func(t T) bool {
return element == t
}))
}

func removeElementByIndex[T any](slice []T, index int) []T {
return append(slice[:index], slice[index+1:]...)
}

func findIndex[T any](slice []T, matchFunc func(T) bool) int {
for index, element := range slice {
if matchFunc(element) {
return index
}
}

return -1 // not found
}
131 changes: 0 additions & 131 deletions pkg/clone/clone_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,144 +2,13 @@ package clone

import (
"context"
"database/sql"
"testing"
"time"

"github.com/mightyguava/autotx"
"vitess.io/vitess/go/vt/proto/topodata"

"github.com/alecthomas/kong"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"vitess.io/vitess/go/vt/key"
)

func insertBunchaData(ctx context.Context, config DBConfig, rowCount int) error {
db, err := config.DB()
if err != nil {
return errors.WithStack(err)
}
defer db.Close()

err = autotx.Transact(ctx, db, func(tx *sql.Tx) error {
for i := 0; i < rowCount; i++ {
result, err := tx.ExecContext(ctx, `
INSERT INTO customers (name) VALUES (CONCAT('Customer ', LEFT(MD5(RAND()), 8)))
`)
if err != nil {
return errors.WithStack(err)
}
customerID, err := result.LastInsertId()
if err != nil {
return errors.WithStack(err)
}

// Insert a new row
_, err = tx.ExecContext(ctx, `
INSERT INTO transactions (customer_id, amount_cents, description)
VALUES (?, RAND()*9999+1, CONCAT('Description ', LEFT(MD5(RAND()), 8)))
`, customerID)
if err != nil {
return errors.WithStack(err)
}
}

return nil
})

if err != nil {
return errors.WithStack(err)
}
return nil
}

func clearTables(ctx context.Context, config DBConfig) error {
db, err := config.DB()
if err != nil {
return errors.WithStack(err)
}
defer db.Close()

err = autotx.Transact(ctx, db, func(tx *sql.Tx) error {
_, err = tx.ExecContext(ctx, `DELETE FROM customers`)
if err != nil {
return errors.WithStack(err)
}
_, err = tx.ExecContext(ctx, `DELETE FROM transactions`)
if err != nil {
return errors.WithStack(err)
}
return nil
})

if err != nil {
return errors.WithStack(err)
}
return nil
}

func countRows(target DBConfig, tableName string) (int, error) {
db, err := target.DB()
if err != nil {
return 0, errors.WithStack(err)
}
defer db.Close()
ctx := context.Background()
conn, err := db.Conn(ctx)
if err != nil {
return 0, errors.WithStack(err)
}
row := conn.QueryRowContext(ctx, "SELECT COUNT(*) FROM "+tableName)
var rowCount int
err = row.Scan(&rowCount)
return rowCount, err
}

func countRowsShardFilter(target DBConfig, tableName string, shard string) (int, error) {
db, err := target.DB()
if err != nil {
return 0, errors.WithStack(err)
}
defer db.Close()
ctx := context.Background()
conn, err := db.Conn(ctx)
if err != nil {
return 0, errors.WithStack(err)
}
spec, err := key.ParseShardingSpec(shard)
if err != nil {
return 0, errors.WithStack(err)
}
rows, err := conn.QueryContext(ctx, "SELECT id FROM "+tableName)
if err != nil {
return 0, errors.WithStack(err)
}
defer rows.Close()
var rowCount int
for rows.Next() {
var id int64
err = rows.Scan(&id)
if err != nil {
return 0, errors.WithStack(err)
}
if inShard(uint64(id), spec) {
rowCount++
}
}
return rowCount, err
}

func inShard(id uint64, shard []*topodata.KeyRange) bool {
destination := key.DestinationKeyspaceID(vhash(id))
for _, keyRange := range shard {
if key.KeyRangeContains(keyRange, destination) {
return true
}
}
return false
}

func TestOneShardCloneWithTargetData(t *testing.T) {
_, _, err := startAll()
assert.NoError(t, err)
Expand Down
Loading