Merge branch 'master' into sa-master-v2

Author: salarali

.github/workflows/compatibility.yml

@@ -34,35 +34,6 @@ jobs:
         make server
       working-directory: tidb
 
-    - name: Checkout BR
-      uses: actions/checkout@v2
-      with:
-        repository: pingcap/br
-        path: br
-
-    - name: Check build
-      run: |
-        cp go.mod1 go.mod && cp go.sum1 go.sum
-        go mod edit -replace=github.com/tikv/client-go/v2=../client-go
-        go mod edit -replace=github.com/pingcap/tidb=../tidb
-        go mod tidy
-        go build ./...
-      working-directory: br
-    
-    - name: Checkout TiCDC
-      uses: actions/checkout@v2
-      with:
-        repository: pingcap/ticdc
-        path: ticdc
-
-    - name: Check build
-      run: |
-        go mod edit -replace=github.com/tikv/client-go/v2=../client-go
-        go mod edit -replace=github.com/pingcap/tidb=../tidb
-        go mod tidy
-        make
-      working-directory: ticdc
-
     - name: Checkout go-ycsb
       uses: actions/checkout@v2
       with:

.github/workflows/integration.yml

@@ -20,7 +20,7 @@ jobs:
           go-version: 1.16
 
       - name: Test
-        run: go test
+        run: go test ./...
         working-directory: integration_tests
 
   integration-local-race:
@@ -35,7 +35,7 @@ jobs:
           go-version: 1.16
 
       - name: Test
-        run: go test -race
+        run: go test ./... -race
         working-directory: integration_tests
 
   integration-tikv:
@@ -77,3 +77,41 @@ jobs:
         run: go test --with-tikv
         working-directory: integration_tests
 
+  integration-raw-tikv:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
+
+      - name: Fetch PD
+        uses: shrink/actions-docker-extract@v1
+        id: extract-pd
+        with:
+          image: pingcap/pd:nightly
+          path: /pd-server
+
+      - name: Fetch TiKV
+        uses: shrink/actions-docker-extract@v1
+        id: extract-tikv
+        with:
+          image: pingcap/tikv:nightly
+          path: /tikv-server
+
+      - name: Run PD & TiKV
+        run: |
+          mv ../../${{steps.extract-pd.outputs.destination}}/pd-server .
+          mv ../../${{steps.extract-tikv.outputs.destination}}/tikv-server .
+          ./pd-server > pd.log 2>&1 &
+          sleep 5
+          ./tikv-server -C tikv.toml > tikv.log 2>&1 &
+          sleep 15
+        working-directory: integration_tests/raw
+
+      - name: Test
+        run: go test --with-tikv
+        working-directory: integration_tests/raw

.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Test
       run: go test ./...
@@ -28,7 +28,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Test with race
       run: go test -race ./...
@@ -42,7 +42,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16
 
       - name: Lint
         uses: golangci/golangci-lint-action@v2

.gitignore

@@ -1,2 +1,3 @@
 vendor
 .idea
+.vscode

README.md

@@ -9,26 +9,22 @@ TiKV Go Client provides support for interacting with the [TiKV](https://github.c
 [![Integration Test](https://github.com/tikv/client-go/actions/workflows/integration.yml/badge.svg)](https://github.com/tikv/client-go/actions/workflows/integration.yml)
 [![Compatibility Test](https://github.com/tikv/client-go/actions/workflows/compatibility.yml/badge.svg)](https://github.com/tikv/client-go/actions/workflows/compatibility.yml)
 
-
 ## Package versions
 
 There are 2 major versions of the `client-go` package.
 
-- `v2` is the new active version. This version was extracted from [pingcap/tidb](https://github.com/pingcap/tidb) and it includes new TiKV features like Follower Read, 1PC, Async Commit. The development of this version is on the `master` branch. The documentation for this version is below.
+- `v2` is the latest stable version. This version was extracted from [pingcap/tidb](https://github.com/pingcap/tidb) and it includes new TiKV features like Follower Read, 1PC, Async Commit. The development of this version is on the `master` branch. The documentation for this version is below.
 
 - `v1` is the previous stable version and is only maintained for bug fixes. You can read the documentation [here](https://tikv.org/docs/4.0/reference/clients/go/).
 
-```diff
-- warning: The v2 branch is still being refactored and sorted out, and external interfaces may change before the v2.0.0 release. Please use caution in production environments.
-```
-
 ## Usage/Examples
 
 ```bash
+  # valid versions be like @latest, @e5f932ae270887550b0cd221343dbd6b870b6c8f, @v2.0.0, @v2.0.1...
   go get github.com/tikv/client-go/v2@COMMIT_HASH_OR_TAG_VERSION
 ```
 
-More examples can be found in [examples directory](https://github.com/tikv/client-go/tree/master/examples).
+Explanation of related concepts and sample code can be found in the [Client-Go Wiki](https://github.com/tikv/client-go/wiki). There are also executable examples in [examples directory](https://github.com/tikv/client-go/tree/master/examples).
 
 ## Contributing to client-go
 

config/client.go

@@ -8,6 +8,7 @@
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
@@ -27,6 +28,7 @@
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
@@ -80,7 +82,8 @@ type TiKVClient struct {
 	StoreLivenessTimeout string           `toml:"store-liveness-timeout" json:"store-liveness-timeout"`
 	CoprCache            CoprocessorCache `toml:"copr-cache" json:"copr-cache"`
 	// TTLRefreshedTxnSize controls whether a transaction should update its TTL or not.
-	TTLRefreshedTxnSize int64 `toml:"ttl-refreshed-txn-size" json:"ttl-refreshed-txn-size"`
+	TTLRefreshedTxnSize      int64  `toml:"ttl-refreshed-txn-size" json:"ttl-refreshed-txn-size"`
+	ResolveLockLiteThreshold uint64 `toml:"resolve-lock-lite-threshold" json:"resolve-lock-lite-threshold"`
 }
 
 // AsyncCommit is the config for the async commit feature. The switch to enable it is a system variable.
@@ -147,6 +150,8 @@ func DefaultTiKVClient() TiKVClient {
 			AdmissionMaxResultMB:  10,
 			AdmissionMinProcessMs: 5,
 		},
+
+		ResolveLockLiteThreshold: 16,
 	}
 }
 

config/config.go

@@ -8,6 +8,7 @@
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
@@ -27,20 +28,19 @@
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 package config
 
 import (
 	"fmt"
-	"net/http"
 	"net/url"
 	"strings"
-	"sync"
 	"sync/atomic"
 
-	"github.com/pingcap/errors"
+	"github.com/pkg/errors"
 	"github.com/tikv/client-go/v2/internal/logutil"
 	"github.com/tikv/client-go/v2/oracle"
 	"github.com/tikv/client-go/v2/util"
@@ -184,7 +184,7 @@ func ParsePath(path string) (etcdAddrs []string, disableGC bool, err error) {
 	var u *url.URL
 	u, err = url.Parse(path)
 	if err != nil {
-		err = errors.Trace(err)
+		err = errors.WithStack(err)
 		return
 	}
 	if strings.ToLower(u.Scheme) != "tikv" {
@@ -203,38 +203,3 @@ func ParsePath(path string) (etcdAddrs []string, disableGC bool, err error) {
 	etcdAddrs = strings.Split(u.Host, ",")
 	return
 }
-
-var (
-	internalClientInit sync.Once
-	internalHTTPClient *http.Client
-	internalHTTPSchema string
-)
-
-// InternalHTTPClient is used by TiDB-Server to request other components.
-func InternalHTTPClient() *http.Client {
-	internalClientInit.Do(initInternalClient)
-	return internalHTTPClient
-}
-
-// InternalHTTPSchema specifies use http or https to request other components.
-func InternalHTTPSchema() string {
-	internalClientInit.Do(initInternalClient)
-	return internalHTTPSchema
-}
-
-func initInternalClient() {
-	clusterSecurity := GetGlobalConfig().Security
-	tlsCfg, err := clusterSecurity.ToTLSConfig()
-	if err != nil {
-		logutil.BgLogger().Fatal("could not load cluster ssl", zap.Error(err))
-	}
-	if tlsCfg == nil {
-		internalHTTPSchema = "http"
-		internalHTTPClient = http.DefaultClient
-		return
-	}
-	internalHTTPSchema = "https"
-	internalHTTPClient = &http.Client{
-		Transport: &http.Transport{TLSClientConfig: tlsCfg},
-	}
-}

config/config_test.go

@@ -8,6 +8,7 @@
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
@@ -27,6 +28,7 @@
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 

config/main_test.go

@@ -8,6 +8,7 @@
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 

config/security.go

@@ -8,6 +8,7 @@
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
@@ -27,6 +28,7 @@
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
@@ -35,9 +37,9 @@ package config
 import (
 	"crypto/tls"
 	"crypto/x509"
-	"io/ioutil"
+	"os"
 
-	"github.com/pingcap/errors"
+	"github.com/pkg/errors"
 )
 
 // Security is the security section of the config.
@@ -64,7 +66,7 @@ func (s *Security) ToTLSConfig() (tlsConfig *tls.Config, err error) {
 		certPool := x509.NewCertPool()
 		// Create a certificate pool from the certificate authority
 		var ca []byte
-		ca, err = ioutil.ReadFile(s.ClusterSSLCA)
+		ca, err = os.ReadFile(s.ClusterSSLCA)
 		if err != nil {
 			err = errors.Errorf("could not read ca certificate: %s", err)
 			return