rebase to master

br/pkg/restore/client.go

@@ -459,7 +459,7 @@ func (rc *Client) createTables(
 				table.Info.IsCommonHandle,
 				newTableInfo.IsCommonHandle)
 		}
-		rules := GetRewriteRules(newTableInfo, table.Info, newTS)
+		rules := GetRewriteRules(newTableInfo, table.Info, newTS, true)
 		ct := CreatedTable{
 			RewriteRule: rules,
 			Table:       newTableInfo,

br/pkg/stream/client.go

@@ -15,7 +15,7 @@ import (
 	berrors "github.com/pingcap/tidb/br/pkg/errors"
 	"github.com/pingcap/tidb/br/pkg/redact"
 	"github.com/pingcap/tidb/kv"
-	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 // MetaDataClient is the client for operations over metadata.

br/pkg/stream/integration_test.go

@@ -20,9 +20,9 @@ import (
 	"github.com/pingcap/tidb/tablecodec"
 	"github.com/stretchr/testify/require"
 	"github.com/tikv/client-go/v2/kv"
-	"go.etcd.io/etcd/clientv3"
-	"go.etcd.io/etcd/embed"
-	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/server/v3/embed"
+	"go.etcd.io/etcd/server/v3/mvcc"
 )
 
 func getRandomLocalAddr() url.URL {

br/pkg/stream/prefix_scanner.go

@@ -8,7 +8,7 @@ import (
 	"github.com/pingcap/tidb/br/pkg/redact"
 	"github.com/pingcap/tidb/kv"
 	kvutil "github.com/tikv/client-go/v2/kv"
-	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/client/v3"
 )
 
 // etcdSource is the adapter for etcd client and the `Source` interface.

br/pkg/task/stream.go

@@ -220,7 +220,6 @@ func NewStreamMgr(ctx context.Context, cfg *StreamConfig, g glue.Glue, needStora
 		opts := storage.ExternalStorageOptions{
 			NoCredentials:   cfg.NoCreds,
 			SendCredentials: cfg.SendCreds,
-			SkipCheckPath:   cfg.SkipCheckPath,
 		}
 		client, err := backup.NewBackupClient(ctx, mgr)
 		if err != nil {
@@ -624,7 +623,6 @@ func RunStreamRestore(
 	opts := storage.ExternalStorageOptions{
 		NoCredentials:   cfg.NoCreds,
 		SendCredentials: cfg.SendCreds,
-		SkipCheckPath:   cfg.SkipCheckPath,
 	}
 
 	if err = client.SetStorage(ctx, u, &opts); err != nil {

go.mod

@@ -107,4 +107,4 @@ replace github.com/pingcap/tidb/parser => ./parser
 // fix potential security issue(CVE-2020-26160) introduced by indirect dependency.
 replace github.com/dgrijalva/jwt-go => github.com/form3tech-oss/jwt-go v3.2.6-0.20210809144907-32ab6a8243d7+incompatible
 
-replace github.com/pingcap/kvproto => github.com/pingcap/kvproto v0.0.0-20220211054355-f7a5a196e629
+replace github.com/pingcap/kvproto => github.com/pingcap/kvproto v0.0.0-20220222060450-3c677934c555