This repository has been archived by the owner on Jul 24, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 102
restore: support table partition #137
Merged
Merged
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
99dca81
restore: support table partition
5kbpers 1151308
Merge branch 'master' into table-partition
5kbpers c3ac0a0
add test
5kbpers d01eb8e
fix get rewrite rules
5kbpers 1fa0ffa
fix checksum
5kbpers 6dde545
add warn log
5kbpers 73de595
Merge branch 'master' into table-partition
5kbpers 4d0bde9
reset tidb-tools
5kbpers 34249ce
add check for validate file
5kbpers 0ac0523
replace zap.ByteString with zap.Binary
5kbpers 8283f63
address comments
5kbpers 6edf983
address comments
5kbpers 0e429c7
address comments
5kbpers File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,6 @@ import ( | |
"context" | ||
"fmt" | ||
"math" | ||
"sort" | ||
"sync" | ||
"time" | ||
|
||
|
@@ -17,7 +16,6 @@ import ( | |
restore_util "github.com/pingcap/tidb-tools/pkg/restore-util" | ||
"github.com/pingcap/tidb/domain" | ||
"github.com/pingcap/tidb/kv" | ||
"github.com/pingcap/tidb/tablecodec" | ||
"go.uber.org/zap" | ||
"google.golang.org/grpc" | ||
"google.golang.org/grpc/backoff" | ||
|
@@ -200,11 +198,6 @@ func (rc *Client) CreateTables( | |
Data: make([]*import_sstpb.RewriteRule, 0), | ||
} | ||
newTables := make([]*model.TableInfo, 0, len(tables)) | ||
// Sort the tables by id for ensuring the new tables has same id ordering as the old tables. | ||
// We require this constrain since newTableID of tableID+1 must be not bigger | ||
// than newTableID of tableID. | ||
sort.Sort(utils.Tables(tables)) | ||
tableIDMap := make(map[int64]int64) | ||
for _, table := range tables { | ||
err := rc.db.CreateTable(rc.ctx, table) | ||
if err != nil { | ||
|
@@ -215,21 +208,10 @@ func (rc *Client) CreateTables( | |
return nil, nil, err | ||
} | ||
rules := GetRewriteRules(newTableInfo, table.Schema, newTS) | ||
tableIDMap[table.Schema.ID] = newTableInfo.ID | ||
rewriteRules.Table = append(rewriteRules.Table, rules.Table...) | ||
rewriteRules.Data = append(rewriteRules.Data, rules.Data...) | ||
newTables = append(newTables, newTableInfo) | ||
} | ||
// If tableID + 1 has already exist, then we don't need to add a new rewrite rule for it. | ||
for oldID, newID := range tableIDMap { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should update validate.go since we change the rewrite process. |
||
if _, ok := tableIDMap[oldID+1]; !ok { | ||
rewriteRules.Table = append(rewriteRules.Table, &import_sstpb.RewriteRule{ | ||
OldKeyPrefix: tablecodec.EncodeTablePrefix(oldID + 1), | ||
NewKeyPrefix: tablecodec.EncodeTablePrefix(newID + 1), | ||
NewTimestamp: newTS, | ||
}) | ||
} | ||
} | ||
return rewriteRules, newTables, nil | ||
} | ||
|
||
|
@@ -277,9 +259,6 @@ func (rc *Client) RestoreTable( | |
errCh := make(chan error, len(table.Files)) | ||
wg := new(sync.WaitGroup) | ||
defer close(errCh) | ||
// We should encode the rewrite rewriteRules before using it to import files | ||
encodedRules := encodeRewriteRules(rewriteRules) | ||
|
||
err = rc.setSpeedLimit() | ||
if err != nil { | ||
return err | ||
|
@@ -294,7 +273,7 @@ func (rc *Client) RestoreTable( | |
select { | ||
case <-rc.ctx.Done(): | ||
errCh <- nil | ||
case errCh <- rc.fileImporter.Import(fileReplica, encodedRules): | ||
case errCh <- rc.fileImporter.Import(fileReplica, rewriteRules): | ||
updateCh <- struct{}{} | ||
} | ||
}) | ||
|
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we remove
utils.Tables
?