tikv
/
client-go
mirror of https://github.com/tikv/client-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*: move retry to internal package (#186) 

Signed-off-by: disksing <i@disksing.com>
This commit is contained in:
disksing 2021-06-30 12:01:15 +08:00 committed by GitHub
parent 156ed6a2c9
commit 58b6783d1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 52 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/client_batch.go
View File

@ -46,9 +46,9 @@ import (
"github.com/pingcap/parser/terror"
"github.com/prometheus/client_golang/prometheus"
"github.com/tikv/client-go/v2/config"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/metrics"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
"github.com/tikv/client-go/v2/util"
"go.uber.org/zap"

2
internal/locate/region_cache.go
View File

@ -51,10 +51,10 @@ import (
"github.com/pingcap/parser/terror"
"github.com/tikv/client-go/v2/client"
"github.com/tikv/client-go/v2/config"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/metrics"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
"github.com/tikv/client-go/v2/util"
pd "github.com/tikv/pd/client"

2
internal/locate/region_cache_test.go
View File

@ -46,10 +46,10 @@ import (
"github.com/pingcap/kvproto/pkg/kvrpcpb"
"github.com/pingcap/kvproto/pkg/metapb"
"github.com/stretchr/testify/suite"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/mockstore/mocktikv"
"github.com/tikv/client-go/v2/oracle"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
pd "github.com/tikv/pd/client"
)

2
internal/locate/region_request.go
View File

@ -53,11 +53,11 @@ import (
"github.com/pingcap/kvproto/pkg/metapb"
"github.com/tikv/client-go/v2/client"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/metrics"
"github.com/tikv/client-go/v2/oracle"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
"github.com/tikv/client-go/v2/util"
)

2
internal/locate/region_request3_test.go
View File

@ -45,9 +45,9 @@ import (
"github.com/pingcap/kvproto/pkg/metapb"
"github.com/stretchr/testify/suite"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/mockstore/mocktikv"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
)

2
internal/locate/region_request_test.go
View File

@ -51,8 +51,8 @@ import (
"github.com/stretchr/testify/suite"
"github.com/tikv/client-go/v2/client"
"github.com/tikv/client-go/v2/config"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/mockstore/mocktikv"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
"google.golang.org/grpc"
)

0
retry/backoff.go → internal/retry/backoff.go
View File

0
retry/backoff_test.go → internal/retry/backoff_test.go
View File

0
retry/config.go → internal/retry/config.go
View File

0
retry/main_test.go → internal/retry/main_test.go
View File

25
retry/retry.go Normal file
View File

@ -0,0 +1,25 @@
// Copyright 2021 TiKV Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// See the License for the specific language governing permissions and
// limitations under the License.
package retry
import "github.com/tikv/client-go/v2/internal/retry"
// Re-export internal/retry for compatibility.
// TODO: Remove it.
// NewNoopBackoff create a Backoffer do nothing just return error directly
var NewNoopBackoff = retry.NewNoopBackoff
// BoTiFlashRPC is the backoff config for TiFlash RPCs.
var BoTiFlashRPC = retry.BoTiFlashRPC

2
tikv/2pc.go
View File

@ -52,12 +52,12 @@ import (
"github.com/tikv/client-go/v2/config"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/internal/unionstore"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/metrics"
"github.com/tikv/client-go/v2/oracle"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
"github.com/tikv/client-go/v2/util"
zap "go.uber.org/zap"

5
tikv/backoff.go
View File

@ -35,8 +35,8 @@ package tikv
import (
"context"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/retry"
)
// Backoffer is a utility for retrying queries.
@ -103,3 +103,6 @@ func BoTiKVRPC() *BackoffConfig {
func NewGcResolveLockMaxBackoffer(ctx context.Context) *Backoffer {
return retry.NewBackofferWithVars(ctx, gcResolveLockMaxBackoff, nil)
}
// NewNoopBackoff create a Backoffer do nothing just return error directly
var NewNoopBackoff = retry.NewNoopBackoff

2
tikv/cleanup.go
View File

@ -37,9 +37,9 @@ import (
"github.com/pingcap/kvproto/pkg/kvrpcpb"
"github.com/prometheus/client_golang/prometheus"
"github.com/tikv/client-go/v2/client"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/metrics"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
"go.uber.org/zap"
)

2
tikv/commit.go
View File

@ -43,9 +43,9 @@ import (
"github.com/tikv/client-go/v2/client"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/metrics"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
"go.uber.org/zap"
)

2
tikv/delete_range.go
View File

@ -40,8 +40,8 @@ import (
"github.com/pingcap/kvproto/pkg/kvrpcpb"
"github.com/tikv/client-go/v2/client"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
)

2
tikv/gc.go
View File

@ -21,9 +21,9 @@ import (
"github.com/pingcap/kvproto/pkg/kvrpcpb"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
zap "go.uber.org/zap"
)

2
tikv/kv.go
View File

@ -52,12 +52,12 @@ import (
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/latch"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/metrics"
"github.com/tikv/client-go/v2/oracle"
"github.com/tikv/client-go/v2/oracle/oracles"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
"github.com/tikv/client-go/v2/util"
pd "github.com/tikv/pd/client"

2
tikv/lock_resolver.go
View File

@ -48,10 +48,10 @@ import (
"github.com/tikv/client-go/v2/config"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/metrics"
"github.com/tikv/client-go/v2/oracle"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
"github.com/tikv/client-go/v2/util"
pd "github.com/tikv/pd/client"

2
tikv/pessimistic.go
View File

@ -45,10 +45,10 @@ import (
"github.com/tikv/client-go/v2/client"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/metrics"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
"github.com/tikv/client-go/v2/util"
"go.uber.org/zap"

2
tikv/prewrite.go
View File

@ -46,9 +46,9 @@ import (
"github.com/tikv/client-go/v2/config"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/metrics"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
"github.com/tikv/client-go/v2/util"
"go.uber.org/zap"

2
tikv/range_task.go
View File

@ -40,10 +40,10 @@ import (
"time"
"github.com/pingcap/errors"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/metrics"
"github.com/tikv/client-go/v2/retry"
"go.uber.org/zap"
)

2
tikv/rawkv.go
View File

@ -43,8 +43,8 @@ import (
"github.com/tikv/client-go/v2/config"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/metrics"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
pd "github.com/tikv/pd/client"
)

2
tikv/rawkv_test.go
View File

@ -38,9 +38,9 @@ import (
"testing"
"github.com/stretchr/testify/suite"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/mockstore/mocktikv"
"github.com/tikv/client-go/v2/retry"
)
func TestRawKV(t *testing.T) {

2
tikv/scan.go
View File

@ -41,9 +41,9 @@ import (
"github.com/tikv/client-go/v2/client"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
"go.uber.org/zap"
)

2
tikv/snapshot.go
View File

@ -49,10 +49,10 @@ import (
"github.com/tikv/client-go/v2/client"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/metrics"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
"github.com/tikv/client-go/v2/util"
"go.uber.org/zap"

2
tikv/split_region.go
View File

@ -46,9 +46,9 @@ import (
"github.com/tikv/client-go/v2/client"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
"github.com/tikv/client-go/v2/util"
pd "github.com/tikv/pd/client"

2
tikv/test_probe.go
View File

@ -42,8 +42,8 @@ import (
"github.com/pingcap/kvproto/pkg/kvrpcpb"
"github.com/pingcap/kvproto/pkg/metapb"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/internal/unionstore"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/tikvrpc"
pd "github.com/tikv/pd/client"
)

2
tikv/txn.go
View File

@ -49,12 +49,12 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/kvproto/pkg/kvrpcpb"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/retry"
"github.com/tikv/client-go/v2/internal/unionstore"
tikv "github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/metrics"
"github.com/tikv/client-go/v2/oracle"
"github.com/tikv/client-go/v2/retry"
"github.com/tikv/client-go/v2/util"
"go.uber.org/zap"
)