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

*: move logutil to internal directory (#207) 

Signed-off-by: disksing <i@disksing.com>
This commit is contained in:
disksing 2021-07-05 15:15:41 +08:00 committed by GitHub
parent fcf3da2ad7
commit d0a98864a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 67 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.go
View File

@ -41,7 +41,7 @@ import (
"sync/atomic"
"github.com/pingcap/errors"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/internal/logutil"
"github.com/tikv/client-go/v2/oracle"
"github.com/tikv/client-go/v2/util"
"go.uber.org/zap"

5
integration_tests/go.mod
View File

@ -7,13 +7,12 @@ require (
github.com/pingcap/errors v0.11.5-0.20201126102027-b0a155152ca3
github.com/pingcap/failpoint v0.0.0-20210316064728-7acb0f0a3dfd
github.com/pingcap/kvproto v0.0.0-20210611081648-a215b4e61d2f
github.com/pingcap/parser v0.0.0-20210618053735-57843e8185c4
github.com/pingcap/tidb v1.1.0-beta.0.20210630084325-e8af6eb0adec
github.com/pingcap/parser v0.0.0-20210618124025-07ae8d9291c4
github.com/pingcap/tidb v1.1.0-beta.0.20210702041526-83acf6a4ac28
github.com/stretchr/testify v1.7.0
github.com/tikv/client-go/v2 v2.0.0
github.com/tikv/pd v1.1.0-beta.0.20210323121136-78679e5e209d
go.uber.org/goleak v1.1.10
go.uber.org/zap v1.17.0
)
replace github.com/tikv/client-go/v2 => ../

8
integration_tests/go.sum
View File

@ -428,13 +428,13 @@ github.com/pingcap/log v0.0.0-20201112100606-8f1e84a3abc8/go.mod h1:4rbK1p9ILyIf
github.com/pingcap/log v0.0.0-20210317133921-96f4fcab92a4 h1:ERrF0fTuIOnwfGbt71Ji3DKbOEaP189tjym50u8gpC8=
github.com/pingcap/log v0.0.0-20210317133921-96f4fcab92a4/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8=
github.com/pingcap/parser v0.0.0-20210525032559-c37778aff307/go.mod h1:xZC8I7bug4GJ5KtHhgAikjTfU4kBv1Sbo3Pf1MZ6lVw=
github.com/pingcap/parser v0.0.0-20210618053735-57843e8185c4 h1:NASsbyMTNW8pbYfoO/YTykO6MQJiNRa094lwCPU6R2Q=
github.com/pingcap/parser v0.0.0-20210618053735-57843e8185c4/go.mod h1:xZC8I7bug4GJ5KtHhgAikjTfU4kBv1Sbo3Pf1MZ6lVw=
github.com/pingcap/parser v0.0.0-20210618124025-07ae8d9291c4 h1:np2wD3C5QbdTUD17ubVlrgEsklQOKN5iBm/SiV846OM=
github.com/pingcap/parser v0.0.0-20210618124025-07ae8d9291c4/go.mod h1:xZC8I7bug4GJ5KtHhgAikjTfU4kBv1Sbo3Pf1MZ6lVw=
github.com/pingcap/sysutil v0.0.0-20200206130906-2bfa6dc40bcd/go.mod h1:EB/852NMQ+aRKioCpToQ94Wl7fktV+FNnxf3CX/TTXI=
github.com/pingcap/sysutil v0.0.0-20210315073920-cc0985d983a3 h1:A9KL9R+lWSVPH8IqUuH1QSTRJ5FGoY1bT2IcfPKsWD8=
github.com/pingcap/sysutil v0.0.0-20210315073920-cc0985d983a3/go.mod h1:tckvA041UWP+NqYzrJ3fMgC/Hw9wnmQ/tUkp/JaHly8=
github.com/pingcap/tidb v1.1.0-beta.0.20210630084325-e8af6eb0adec h1:tXST/5Q0YnPOm70meDfkxCvwK39+aN2fdQOSDEw0+Ko=
github.com/pingcap/tidb v1.1.0-beta.0.20210630084325-e8af6eb0adec/go.mod h1:6lc1Xx//CQuv5mdJmxKVtxA3dT5FUbRk3aOrtaqqJBA=
github.com/pingcap/tidb v1.1.0-beta.0.20210702041526-83acf6a4ac28 h1:kSL2/dtdKHbawoMtB45xG8m4aW5HrJWc8PeiYVT4rw0=
github.com/pingcap/tidb v1.1.0-beta.0.20210702041526-83acf6a4ac28/go.mod h1:tfmyCBbnteJVr0Lep2jidlkBxTbzBzf52K+7I4w6qS8=
github.com/pingcap/tidb-dashboard v0.0.0-20210312062513-eef5d6404638/go.mod h1:OzFN8H0EDMMqeulPhPMw2i2JaiZWOKFQ7zdRPhENNgo=
github.com/pingcap/tidb-tools v4.0.9-0.20201127090955-2707c97b3853+incompatible h1:ceznmu/lLseGHP/jKyOa/3u/5H3wtLLLqkH2V3ssSjg=
github.com/pingcap/tidb-tools v4.0.9-0.20201127090955-2707c97b3853+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM=

14
integration_tests/scan_test.go
View File

@ -33,17 +33,14 @@
package tikv_test
import (
"bytes"
"context"
"fmt"
"testing"
"github.com/stretchr/testify/suite"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/tikv"
"github.com/tikv/client-go/v2/util"
"go.uber.org/zap"
)
var scanBatchSize = tikv.ConfigProbe{}.GetScanBatchSize()
@ -107,16 +104,7 @@ func (s *testScanSuite) TestScan() {
for i := 0; i < rowNum; i++ {
k := scan.Key()
expectedKey := s.makeKey(i)
if ok := bytes.Equal(k, expectedKey); !ok {
logutil.BgLogger().Error("bytes equal check fail",
zap.Int("i", i),
zap.Int("rowNum", rowNum),
zap.String("obtained key", kv.StrKey(k)),
zap.String("obtained val", kv.StrKey(scan.Value())),
zap.String("expected", kv.StrKey(expectedKey)),
zap.Bool("keyOnly", keyOnly))
}
s.Equal(k, expectedKey)
s.Equal(k, expectedKey, "i=%v,rowNum=%v,key=%v,val=%v,expected=%v,keyOnly=%v", i, rowNum, kv.StrKey(k), kv.StrKey(scan.Value()), kv.StrKey(expectedKey), keyOnly)
if !keyOnly {
v := scan.Value()
s.Equal(v, s.makeValue(i))

8
integration_tests/snapshot_test.go
View File

@ -45,10 +45,8 @@ import (
"github.com/pingcap/kvproto/pkg/kvrpcpb"
"github.com/stretchr/testify/suite"
"github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/tikv"
"github.com/tikv/client-go/v2/tikvrpc"
"go.uber.org/zap"
)
func TestSnapshot(t *testing.T) {
@ -126,8 +124,7 @@ func (s *testSnapshotSuite) deleteKeys(keys [][]byte) {
func (s *testSnapshotSuite) TestBatchGet() {
for _, rowNum := range s.rowNums {
logutil.BgLogger().Debug("test BatchGet",
zap.Int("length", rowNum))
s.T().Logf("test BatchGet, length=%v", rowNum)
txn := s.beginTxn()
for i := 0; i < rowNum; i++ {
k := encodeKey(s.prefix, s08d("key", i))
@ -169,8 +166,7 @@ func (s *testSnapshotSuite) TestSnapshotCache() {
func (s *testSnapshotSuite) TestBatchGetNotExist() {
for _, rowNum := range s.rowNums {
logutil.BgLogger().Debug("test BatchGetNotExist",
zap.Int("length", rowNum))
s.T().Logf("test BatchGetNotExist, length=%v", rowNum)
txn := s.beginTxn()
for i := 0; i < rowNum; i++ {
k := encodeKey(s.prefix, s08d("key", i))

2
internal/client/client.go
View File

@ -54,7 +54,7 @@ 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/logutil"
"github.com/tikv/client-go/v2/internal/logutil"
"github.com/tikv/client-go/v2/metrics"
"github.com/tikv/client-go/v2/tikvrpc"
"github.com/tikv/client-go/v2/util"

2
internal/client/client_batch.go
View File

@ -46,8 +46,8 @@ 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/logutil"
"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/tikvrpc"
"github.com/tikv/client-go/v2/util"

2
internal/client/mock_tikv_service_test.go
View File

@ -29,7 +29,7 @@ import (
"github.com/pingcap/kvproto/pkg/coprocessor"
"github.com/pingcap/kvproto/pkg/kvrpcpb"
"github.com/pingcap/kvproto/pkg/tikvpb"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/internal/logutil"
"go.uber.org/zap"
"google.golang.org/grpc"
)

2
internal/latch/latch.go
View File

@ -40,7 +40,7 @@ import (
"time"
"github.com/cznic/mathutil"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/internal/logutil"
"github.com/twmb/murmur3"
"go.uber.org/zap"
)

2
internal/locate/region_cache.go
View File

@ -51,9 +51,9 @@ import (
"github.com/pingcap/parser/terror"
"github.com/tikv/client-go/v2/config"
"github.com/tikv/client-go/v2/internal/client"
"github.com/tikv/client-go/v2/internal/logutil"
"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/tikvrpc"
"github.com/tikv/client-go/v2/util"

2
internal/locate/region_request.go
View File

@ -53,9 +53,9 @@ import (
"github.com/pingcap/kvproto/pkg/metapb"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/client"
"github.com/tikv/client-go/v2/internal/logutil"
"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/tikvrpc"

0
logutil/hex.go → internal/logutil/hex.go
View File

0
logutil/log.go → internal/logutil/log.go
View File

0
logutil/tracing.go → internal/logutil/tracing.go
View File

2
internal/retry/backoff.go
View File

@ -44,8 +44,8 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/log"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/logutil"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/util"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"

2
internal/retry/config.go
View File

@ -41,8 +41,8 @@ import (
"github.com/prometheus/client_golang/prometheus"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/logutil"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/metrics"
"go.uber.org/zap"
)

2
internal/unionstore/union_iter.go
View File

@ -33,8 +33,8 @@
package unionstore
import (
"github.com/tikv/client-go/v2/internal/logutil"
"github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/logutil"
"go.uber.org/zap"
)

2
mockstore/mocktikv/mvcc_leveldb.go
View File

@ -46,7 +46,7 @@ import (
"github.com/pingcap/goleveldb/leveldb/util"
"github.com/pingcap/kvproto/pkg/kvrpcpb"
"github.com/pingcap/parser/terror"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/internal/logutil"
"github.com/tikv/client-go/v2/mockstore/deadlock"
"github.com/tikv/client-go/v2/oracle"
"github.com/tikv/client-go/v2/util/codec"

2
oracle/oracles/pd.go
View File

@ -40,7 +40,7 @@ import (
"time"
"github.com/pingcap/errors"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/internal/logutil"
"github.com/tikv/client-go/v2/metrics"
"github.com/tikv/client-go/v2/oracle"
pd "github.com/tikv/pd/client"

2
tikv/2pc.go
View File

@ -52,10 +52,10 @@ import (
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/client"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/logutil"
"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/tikvrpc"

2
tikv/cleanup.go
View File

@ -37,8 +37,8 @@ import (
"github.com/pingcap/kvproto/pkg/kvrpcpb"
"github.com/prometheus/client_golang/prometheus"
"github.com/tikv/client-go/v2/internal/client"
"github.com/tikv/client-go/v2/internal/logutil"
"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/tikvrpc"
"go.uber.org/zap"

2
tikv/commit.go
View File

@ -43,8 +43,8 @@ import (
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/client"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/logutil"
"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/tikvrpc"
"go.uber.org/zap"

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/logutil"
"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/tikvrpc"
zap "go.uber.org/zap"
)

2
tikv/kv.go
View File

@ -52,9 +52,9 @@ import (
"github.com/tikv/client-go/v2/internal/client"
"github.com/tikv/client-go/v2/internal/latch"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/logutil"
"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"

2
tikv/lock_resolver.go
View File

@ -48,8 +48,8 @@ import (
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/client"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/logutil"
"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/tikvrpc"

31
tikv/logutil.go Normal file
View File

@ -0,0 +1,31 @@
// 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 tikv
import (
"context"
"github.com/tikv/client-go/v2/internal/logutil"
"go.uber.org/zap"
)
// WithLogContext returns a copy of context that is associated with a logger.
func WithLogContext(ctx context.Context, logger *zap.Logger) context.Context {
return context.WithValue(ctx, logutil.CtxLogKey, logger)
}
// SetLogContextKey sets the context key which is used by client to retrieve *zap.Logger from context.
func SetLogContextKey(key interface{}) {
logutil.CtxLogKey = key
}

2
tikv/pessimistic.go
View File

@ -45,9 +45,9 @@ import (
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/client"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/logutil"
"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/tikvrpc"
"github.com/tikv/client-go/v2/util"

2
tikv/prewrite.go
View File

@ -46,8 +46,8 @@ import (
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/client"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/logutil"
"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/tikvrpc"
"github.com/tikv/client-go/v2/util"

2
tikv/range_task.go
View File

@ -40,9 +40,9 @@ import (
"time"
"github.com/pingcap/errors"
"github.com/tikv/client-go/v2/internal/logutil"
"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"
"go.uber.org/zap"
)

2
tikv/safepoint.go
View File

@ -41,7 +41,7 @@ import (
"time"
"github.com/pingcap/errors"
"github.com/tikv/client-go/v2/logutil"
"github.com/tikv/client-go/v2/internal/logutil"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/mvcc/mvccpb"
"go.uber.org/zap"

2
tikv/scan.go
View File

@ -41,9 +41,9 @@ import (
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/client"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/logutil"
"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/tikvrpc"
"go.uber.org/zap"
)

2
tikv/snapshot.go
View File

@ -49,9 +49,9 @@ import (
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/client"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/logutil"
"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/tikvrpc"
"github.com/tikv/client-go/v2/util"

2
tikv/split_region.go
View File

@ -46,9 +46,9 @@ import (
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/client"
"github.com/tikv/client-go/v2/internal/locate"
"github.com/tikv/client-go/v2/internal/logutil"
"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/tikvrpc"
"github.com/tikv/client-go/v2/util"
pd "github.com/tikv/pd/client"

2
tikv/txn.go
View File

@ -50,10 +50,10 @@ import (
"github.com/pingcap/failpoint"
"github.com/pingcap/kvproto/pkg/kvrpcpb"
tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/internal/logutil"
"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/util"

2
util/misc.go
View File

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