*: fix build tag by run gofix (#34260)

ref #31716
pingcap · Apr 27, 2022 · 6da6e5a · 6da6e5a
1 parent a0f55d3
commit 6da6e5a
Show file tree

Hide file tree

Showing 60 changed files with 12 additions and 60 deletions.
diff --git a/br/pkg/lightning/backend/local/local_freebsd.go b/br/pkg/lightning/backend/local/local_freebsd.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build freebsd
-// +build freebsd
 
 package local
 

diff --git a/br/pkg/lightning/backend/local/local_unix.go b/br/pkg/lightning/backend/local/local_unix.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !windows
-// +build !windows
 
 package local
 

diff --git a/br/pkg/lightning/backend/local/local_unix_generic.go b/br/pkg/lightning/backend/local/local_unix_generic.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !freebsd && !windows
-// +build !freebsd,!windows
 
 package local
 

diff --git a/br/pkg/lightning/backend/local/local_windows.go b/br/pkg/lightning/backend/local/local_windows.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build windows
-// +build windows
 
 package local
 

diff --git a/br/pkg/lightning/common/storage_unix.go b/br/pkg/lightning/common/storage_unix.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !windows
-// +build !windows
 
 // TODO: Deduplicate this implementation with DM!
 

diff --git a/br/pkg/lightning/common/storage_windows.go b/br/pkg/lightning/common/storage_windows.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build windows
-// +build windows
 
 // TODO: Deduplicate this implementation with DM!
 

diff --git a/br/pkg/lightning/manual/manual_nocgo.go b/br/pkg/lightning/manual/manual_nocgo.go
@@ -3,7 +3,6 @@
 // the LICENSE file.
 
 //go:build !cgo
-// +build !cgo
 
 package manual
 

diff --git a/br/pkg/lightning/sigusr1_other.go b/br/pkg/lightning/sigusr1_other.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !linux && !darwin && !freebsd && !unix
-// +build !linux,!darwin,!freebsd,!unix
 
 package lightning
 

diff --git a/br/pkg/lightning/sigusr1_unix.go b/br/pkg/lightning/sigusr1_unix.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build linux || darwin || freebsd || unix
-// +build linux darwin freebsd unix
 
 package lightning
 

diff --git a/br/pkg/lightning/web/res.go b/br/pkg/lightning/web/res.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build dev
-// +build dev
 
 package web
 

diff --git a/br/pkg/lightning/web/res_vfsdata.go b/br/pkg/lightning/web/res_vfsdata.go
diff --git a/br/pkg/restore/merge_fuzz_test.go b/br/pkg/restore/merge_fuzz_test.go
@@ -1,6 +1,5 @@
 // Copyright 2022 PingCAP, Inc. Licensed under Apache-2.0.
 //go:build go1.18
-// +build go1.18
 
 package restore_test
 

diff --git a/br/pkg/storage/local_unix.go b/br/pkg/storage/local_unix.go
@@ -1,7 +1,6 @@
 // Copyright 2020 PingCAP, Inc. Licensed under Apache-2.0.
 
 //go:build !windows
-// +build !windows
 
 package storage
 

diff --git a/br/pkg/storage/local_windows.go b/br/pkg/storage/local_windows.go
@@ -1,7 +1,6 @@
 // Copyright 2020 PingCAP, Inc. Licensed under Apache-2.0.
 
 //go:build windows
-// +build windows
 
 package storage
 

diff --git a/br/pkg/utils/dyn_pprof_other.go b/br/pkg/utils/dyn_pprof_other.go
@@ -1,5 +1,4 @@
 //go:build !linux && !darwin && !freebsd && !unix
-// +build !linux,!darwin,!freebsd,!unix
 
 // Copyright 2020 PingCAP, Inc. Licensed under Apache-2.0.
 

diff --git a/br/pkg/utils/dyn_pprof_unix.go b/br/pkg/utils/dyn_pprof_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin || freebsd || unix
-// +build linux darwin freebsd unix
 
 // Copyright 2020 PingCAP, Inc. Licensed under Apache-2.0.
 

diff --git a/cmd/ddltest/column_test.go b/cmd/ddltest/column_test.go
@@ -15,6 +15,7 @@
 package ddltest
 
 import (
+	goctx "context"
 	"fmt"
 	"reflect"
 	"sync"
@@ -29,7 +30,6 @@ import (
 	"github.com/pingcap/tidb/types"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
-	goctx "golang.org/x/net/context"
 )
 
 // After add column finished, check the records in the table.

diff --git a/cmd/ddltest/ddl_test.go b/cmd/ddltest/ddl_test.go
@@ -15,6 +15,7 @@
 package ddltest
 
 import (
+	goctx "context"
 	"database/sql"
 	"database/sql/driver"
 	"flag"
@@ -49,7 +50,6 @@ import (
 	"github.com/pingcap/tidb/types"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
-	goctx "golang.org/x/net/context"
 )
 
 var (

diff --git a/cmd/ddltest/index_test.go b/cmd/ddltest/index_test.go
@@ -15,6 +15,7 @@
 package ddltest
 
 import (
+	goctx "context"
 	"fmt"
 	"math"
 	"sync"
@@ -25,7 +26,6 @@ import (
 	"github.com/pingcap/tidb/store/gcworker"
 	"github.com/pingcap/tidb/table"
 	"github.com/stretchr/testify/require"
-	goctx "golang.org/x/net/context"
 )
 
 func getIndex(t table.Table, name string) table.Index {

diff --git a/ddl/restart_test.go b/ddl/restart_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //go:build !race
-// +build !race
 
 package ddl
 

diff --git a/expression/typeinfer_test.go b/expression/typeinfer_test.go
@@ -15,6 +15,7 @@
 package expression_test
 
 import (
+	"context"
 	"fmt"
 	"math"
 	"testing"
@@ -30,7 +31,6 @@ import (
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/printer"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 func TestInferType(t *testing.T) {

diff --git a/owner/manager_test.go b/owner/manager_test.go
@@ -16,6 +16,7 @@ package owner_test
 
 import (
 	"context"
+	goctx "context"
 	"fmt"
 	"runtime"
 	"testing"
@@ -32,7 +33,6 @@ import (
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/client/v3/concurrency"
 	"go.etcd.io/etcd/tests/v3/integration"
-	goctx "golang.org/x/net/context"
 )
 
 const testLease = 5 * time.Millisecond

diff --git a/server/tidb_serial_test.go b/server/tidb_serial_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //go:build !race
-// +build !race
 
 package server
 

diff --git a/server/tidb_test.go b/server/tidb_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //go:build !race
-// +build !race
 
 package server
 

diff --git a/store/mockstore/unistore/client/client.go b/store/mockstore/unistore/client/client.go
@@ -15,10 +15,10 @@
 package client
 
 import (
+	"context"
 	"time"
 
 	"github.com/tikv/client-go/v2/tikvrpc"
-	"golang.org/x/net/context"
 )
 
 // Client is a client that sends RPC.

diff --git a/store/mockstore/unistore/cophandler/analyze.go b/store/mockstore/unistore/cophandler/analyze.go
@@ -16,6 +16,7 @@ package cophandler
 
 import (
 	"bytes"
+	"context"
 	"math"
 	"math/rand"
 	"sort"
@@ -40,7 +41,6 @@ import (
 	"github.com/pingcap/tidb/util/rowcodec"
 	"github.com/pingcap/tipb/go-tipb"
 	"github.com/twmb/murmur3"
-	"golang.org/x/net/context"
 )
 
 // handleCopAnalyzeRequest handles coprocessor analyze request.

diff --git a/store/mockstore/unistore/pd.go b/store/mockstore/unistore/pd.go
@@ -15,14 +15,14 @@
 package unistore
 
 import (
+	"context"
 	"errors"
 	"math"
 	"sync"
 
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	us "github.com/pingcap/tidb/store/mockstore/unistore/tikv"
 	pd "github.com/tikv/pd/client"
-	"golang.org/x/net/context"
 )
 
 var _ pd.Client = new(pdClient)

diff --git a/store/mockstore/unistore/rpc.go b/store/mockstore/unistore/rpc.go
@@ -15,6 +15,7 @@
 package unistore
 
 import (
+	"context"
 	"io"
 	"math"
 	"os"
@@ -35,7 +36,6 @@ import (
 	us "github.com/pingcap/tidb/store/mockstore/unistore/tikv"
 	"github.com/pingcap/tidb/util/codec"
 	"github.com/tikv/client-go/v2/tikvrpc"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc/metadata"
 )
 

diff --git a/store/mockstore/unistore/tikv/mock_region.go b/store/mockstore/unistore/tikv/mock_region.go
@@ -16,6 +16,7 @@ package tikv
 
 import (
 	"bytes"
+	"context"
 	"sort"
 	"sync"
 	"sync/atomic"
@@ -37,7 +38,6 @@ import (
 	"github.com/pingcap/tidb/tablecodec"
 	"github.com/pingcap/tidb/util/codec"
 	pdclient "github.com/tikv/pd/client"
-	"golang.org/x/net/context"
 )
 
 // MPPTaskHandlerMap is a map of *cophandler.MPPTaskHandler.

diff --git a/store/mockstore/unistore/tikv/region.go b/store/mockstore/unistore/tikv/region.go
@@ -16,6 +16,7 @@ package tikv
 
 import (
 	"bytes"
+	"context"
 	"encoding/binary"
 	"strconv"
 	"sync"
@@ -36,7 +37,6 @@ import (
 	"github.com/pingcap/tidb/store/mockstore/unistore/tikv/mvcc"
 	"github.com/pingcap/tidb/util/codec"
 	"go.uber.org/zap"
-	"golang.org/x/net/context"
 )
 
 // InternalKey

diff --git a/testkit/asynctestkit.go b/testkit/asynctestkit.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !codes
-// +build !codes
 
 package testkit
 

diff --git a/testkit/dbtestkit.go b/testkit/dbtestkit.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !codes
-// +build !codes
 
 package testkit
 

diff --git a/testkit/mockstore.go b/testkit/mockstore.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !codes
-// +build !codes
 
 package testkit
 

diff --git a/testkit/result.go b/testkit/result.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !codes
-// +build !codes
 
 package testkit
 

diff --git a/testkit/testkit.go b/testkit/testkit.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !codes
-// +build !codes
 
 package testkit
 

diff --git a/testkit/testmain/bench.go b/testkit/testmain/bench.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !codes
-// +build !codes
 
 package testmain
 

diff --git a/testkit/testmain/wrapper.go b/testkit/testmain/wrapper.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !codes
-// +build !codes
 
 package testmain
 

diff --git a/testkit/testutil/handle.go b/testkit/testutil/handle.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !codes
-// +build !codes
 
 package testutil
 

diff --git a/testkit/testutil/require.go b/testkit/testutil/require.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !codes
-// +build !codes
 
 package testutil