From cc05caeca2fbd79f7c346fd3cf45534764b39da1 Mon Sep 17 00:00:00 2001
From: disksing <i@disksing.com>
Date: Thu, 15 Apr 2021 20:57:54 +0800
Subject: [PATCH] store/tikv: clean up unused functions (#23986)

---
 store/tikv/ticlient_test.go | 80 -------------------------------------
 store/tikv/tikv_test.go     |  8 ++++
 2 files changed, 8 insertions(+), 80 deletions(-)
 delete mode 100644 store/tikv/ticlient_test.go

diff --git a/store/tikv/ticlient_test.go b/store/tikv/ticlient_test.go
deleted file mode 100644
index 8a1d60c012..0000000000
--- a/store/tikv/ticlient_test.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2016 PingCAP, Inc.
-//
-// 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"
-	"flag"
-	"strings"
-	"sync"
-
-	. "github.com/pingcap/check"
-	"github.com/pingcap/errors"
-	"github.com/pingcap/tidb/store/mockstore/unistore"
-	"github.com/pingcap/tidb/store/tikv/config"
-	pd "github.com/tikv/pd/client"
-)
-
-var (
-	withTiKVGlobalLock sync.RWMutex
-	WithTiKV           = flag.Bool("with-tikv", false, "run tests with TiKV cluster started. (not use the mock server)")
-	pdAddrs            = flag.String("pd-addrs", "127.0.0.1:2379", "pd addrs")
-)
-
-// NewTestStore creates a KVStore for testing purpose.
-func NewTestStore(c *C) *KVStore {
-	if !flag.Parsed() {
-		flag.Parse()
-	}
-
-	if *WithTiKV {
-		addrs := strings.Split(*pdAddrs, ",")
-		pdClient, err := pd.NewClient(addrs, pd.SecurityOption{})
-		c.Assert(err, IsNil)
-		var securityConfig config.Security
-		tlsConfig, err := securityConfig.ToTLSConfig()
-		c.Assert(err, IsNil)
-		spKV, err := NewEtcdSafePointKV(addrs, tlsConfig)
-		c.Assert(err, IsNil)
-		store, err := NewKVStore("test-store", &CodecPDClient{Client: pdClient}, spKV, NewRPCClient(securityConfig))
-		c.Assert(err, IsNil)
-		err = clearStorage(store)
-		c.Assert(err, IsNil)
-		return store
-	}
-	client, pdClient, cluster, err := unistore.New("")
-	c.Assert(err, IsNil)
-	unistore.BootstrapWithSingleStore(cluster)
-	store, err := NewTestTiKVStore(client, pdClient, nil, nil, 0)
-	c.Assert(err, IsNil)
-	return store
-}
-
-func clearStorage(store *KVStore) error {
-	txn, err := store.Begin()
-	if err != nil {
-		return errors.Trace(err)
-	}
-	iter, err := txn.Iter(nil, nil)
-	if err != nil {
-		return errors.Trace(err)
-	}
-	for iter.Valid() {
-		txn.Delete(iter.Key())
-		if err := iter.Next(); err != nil {
-			return errors.Trace(err)
-		}
-	}
-	return txn.Commit(context.Background())
-}
diff --git a/store/tikv/tikv_test.go b/store/tikv/tikv_test.go
index 81af86f998..a5b703ee3f 100644
--- a/store/tikv/tikv_test.go
+++ b/store/tikv/tikv_test.go
@@ -14,9 +14,17 @@
 package tikv
 
 import (
+	"flag"
+	"sync"
+
 	. "github.com/pingcap/check"
 )
 
+var (
+	withTiKVGlobalLock sync.RWMutex
+	WithTiKV           = flag.Bool("with-tikv", false, "run tests with TiKV cluster started. (not use the mock server)")
+)
+
 // OneByOneSuite is a suite, When with-tikv flag is true, there is only one storage, so the test suite have to run one by one.
 type OneByOneSuite struct{}