Skip to content

Instantly share code, notes, and snippets.

@dasl-

dasl-/foo.diff

Created September 11, 2019 22:32
Show Gist options
  • Save dasl-/e070329b829904caa2b249b08613c1c7 to your computer and use it in GitHub Desktop.
Save dasl-/e070329b829904caa2b249b08613c1c7 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
foo.diff
diff -u go/cmd/mysqlctl/mysqlctl.go.orig go/cmd/mysqlctl/mysqlctl.go
--- go/cmd/mysqlctl/mysqlctl.go.orig 2019-09-11 18:32:26.000000000 -0400
+++ go/cmd/mysqlctl/mysqlctl.go 2019-09-11 18:32:26.000000000 -0400
@@ -25,6 +25,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/exit"
"vitess.io/vitess/go/flagutil"
"vitess.io/vitess/go/mysql"
diff -u go/cmd/mysqlctld/mysqlctld.go.orig go/cmd/mysqlctld/mysqlctld.go
--- go/cmd/mysqlctld/mysqlctld.go.orig 2019-09-11 18:32:27.000000000 -0400
+++ go/cmd/mysqlctld/mysqlctld.go 2019-09-11 18:32:27.000000000 -0400
@@ -25,6 +25,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/exit"
"vitess.io/vitess/go/vt/dbconfigs"
"vitess.io/vitess/go/vt/log"
diff -u go/cmd/vtbackup/vtbackup.go.orig go/cmd/vtbackup/vtbackup.go
--- go/cmd/vtbackup/vtbackup.go.orig 2019-09-11 18:32:27.000000000 -0400
+++ go/cmd/vtbackup/vtbackup.go 2019-09-11 18:32:27.000000000 -0400
@@ -68,6 +68,7 @@
"strings"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/exit"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/sqlescape"
diff -u go/cmd/vtbench/vtbench.go.orig go/cmd/vtbench/vtbench.go
--- go/cmd/vtbench/vtbench.go.orig 2019-09-11 18:32:27.000000000 -0400
+++ go/cmd/vtbench/vtbench.go 2019-09-11 18:32:27.000000000 -0400
@@ -23,6 +23,7 @@
"strings"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/exit"
"vitess.io/vitess/go/vt/dbconfigs"
"vitess.io/vitess/go/vt/log"
diff -u go/cmd/vtclient/vtclient.go.orig go/cmd/vtclient/vtclient.go
--- go/cmd/vtclient/vtclient.go.orig 2019-09-11 18:32:27.000000000 -0400
+++ go/cmd/vtclient/vtclient.go 2019-09-11 18:32:27.000000000 -0400
@@ -30,6 +30,7 @@
"time"
"github.com/olekukonko/tablewriter"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/concurrency"
"vitess.io/vitess/go/vt/log"
"vitess.io/vitess/go/vt/logutil"
diff -u go/cmd/vtctl/vtctl.go.orig go/cmd/vtctl/vtctl.go
--- go/cmd/vtctl/vtctl.go.orig 2019-09-11 18:32:27.000000000 -0400
+++ go/cmd/vtctl/vtctl.go 2019-09-11 18:32:27.000000000 -0400
@@ -27,6 +27,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/exit"
"vitess.io/vitess/go/trace"
"vitess.io/vitess/go/vt/log"
diff -u go/cmd/vtctlclient/main.go.orig go/cmd/vtctlclient/main.go
--- go/cmd/vtctlclient/main.go.orig 2019-09-11 18:32:27.000000000 -0400
+++ go/cmd/vtctlclient/main.go 2019-09-11 18:32:27.000000000 -0400
@@ -23,6 +23,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/exit"
"vitess.io/vitess/go/trace"
"vitess.io/vitess/go/vt/log"
diff -u go/cmd/vtgateclienttest/services/echo.go.orig go/cmd/vtgateclienttest/services/echo.go
--- go/cmd/vtgateclienttest/services/echo.go.orig 2019-09-11 18:32:27.000000000 -0400
+++ go/cmd/vtgateclienttest/services/echo.go 2019-09-11 18:32:27.000000000 -0400
@@ -401,23 +401,23 @@
if strings.HasPrefix(vgtid.ShardGtids[0].Shard, EchoPrefix) {
_ = callback([]*binlogdatapb.VEvent{
{
- Type: 1,
+ Type: 1,
Timestamp: 1234,
- Gtid: "echo-gtid-1",
- Ddl: "echo-ddl-1",
- Vgtid: vgtid,
+ Gtid: "echo-gtid-1",
+ Ddl: "echo-ddl-1",
+ Vgtid: vgtid,
RowEvent: &binlogdatapb.RowEvent{
- TableName:"echo-table-1",
+ TableName: "echo-table-1",
},
},
{
- Type: 2,
+ Type: 2,
Timestamp: 4321,
- Gtid: "echo-gtid-2",
- Ddl: "echo-ddl-2",
- Vgtid: vgtid,
+ Gtid: "echo-gtid-2",
+ Ddl: "echo-ddl-2",
+ Vgtid: vgtid,
FieldEvent: &binlogdatapb.FieldEvent{
- TableName:"echo-table-2",
+ TableName: "echo-table-2",
},
},
})
diff -u go/cmd/vtqueryserver/plugin_grpcqueryservice.go.orig go/cmd/vtqueryserver/plugin_grpcqueryservice.go
--- go/cmd/vtqueryserver/plugin_grpcqueryservice.go.orig 2019-09-11 18:32:27.000000000 -0400
+++ go/cmd/vtqueryserver/plugin_grpcqueryservice.go 2019-09-11 18:32:27.000000000 -0400
@@ -24,7 +24,6 @@
"vitess.io/vitess/go/vt/vttablet/tabletserver"
)
-
func init() {
tabletserver.RegisterFunctions = append(tabletserver.RegisterFunctions, func(qsc tabletserver.Controller) {
if servenv.GRPCCheckServiceMap("queryservice") {
diff -u go/cmd/vtworkerclient/vtworkerclient.go.orig go/cmd/vtworkerclient/vtworkerclient.go
--- go/cmd/vtworkerclient/vtworkerclient.go.orig 2019-09-11 18:32:27.000000000 -0400
+++ go/cmd/vtworkerclient/vtworkerclient.go 2019-09-11 18:32:27.000000000 -0400
@@ -23,6 +23,7 @@
"syscall"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/log"
"vitess.io/vitess/go/vt/logutil"
"vitess.io/vitess/go/vt/worker/vtworkerclient"
diff -u go/cmd/zk/zkcmd.go.orig go/cmd/zk/zkcmd.go
--- go/cmd/zk/zkcmd.go.orig 2019-09-11 18:32:27.000000000 -0400
+++ go/cmd/zk/zkcmd.go 2019-09-11 18:32:27.000000000 -0400
@@ -36,6 +36,7 @@
"golang.org/x/crypto/ssh/terminal"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/exit"
"vitess.io/vitess/go/vt/log"
"vitess.io/vitess/go/vt/logutil"
diff -u go/context2/context.go.orig go/context2/context.go
--- go/context2/context.go.orig 2019-09-11 18:32:27.000000000 -0400
+++ go/context2/context.go 2019-09-11 18:32:27.000000000 -0400
@@ -3,6 +3,8 @@
import (
"context"
"time"
+
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/log"
)
diff -u go/mysql/client_test.go.orig go/mysql/client_test.go
--- go/mysql/client_test.go.orig 2019-09-11 18:32:27.000000000 -0400
+++ go/mysql/client_test.go 2019-09-11 18:32:27.000000000 -0400
@@ -26,6 +26,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
)
// assertSQLError makes sure we get the right error.
diff -u go/mysql/server_test.go.orig go/mysql/server_test.go
--- go/mysql/server_test.go.orig 2019-09-11 18:32:28.000000000 -0400
+++ go/mysql/server_test.go 2019-09-11 18:32:28.000000000 -0400
@@ -29,6 +29,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sqltypes"
vtenv "vitess.io/vitess/go/vt/env"
"vitess.io/vitess/go/vt/tlstest"
diff -u go/pools/resource_pool.go.orig go/pools/resource_pool.go
--- go/pools/resource_pool.go.orig 2019-09-11 18:32:28.000000000 -0400
+++ go/pools/resource_pool.go 2019-09-11 18:32:28.000000000 -0400
@@ -26,6 +26,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sync2"
"vitess.io/vitess/go/timer"
"vitess.io/vitess/go/trace"
diff -u go/pools/resource_pool_test.go.orig go/pools/resource_pool_test.go
--- go/pools/resource_pool_test.go.orig 2019-09-11 18:32:28.000000000 -0400
+++ go/pools/resource_pool_test.go 2019-09-11 18:32:28.000000000 -0400
@@ -22,6 +22,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sync2"
)
diff -u go/trace/opentracing.go.orig go/trace/opentracing.go
--- go/trace/opentracing.go.orig 2019-09-11 18:32:28.000000000 -0400
+++ go/trace/opentracing.go 2019-09-11 18:32:28.000000000 -0400
@@ -17,7 +17,6 @@
import (
otgrpc "github.com/opentracing-contrib/go-grpc"
- "github.com/opentracing/opentracing-go"
"golang.org/x/net/context"
"google.golang.org/grpc"
"vitess.io/vitess/go/vt/vterrors"
diff -u go/trace/plugin_jaeger.go.orig go/trace/plugin_jaeger.go
--- go/trace/plugin_jaeger.go.orig 2019-09-11 18:32:28.000000000 -0400
+++ go/trace/plugin_jaeger.go 2019-09-11 18:32:28.000000000 -0400
@@ -19,8 +19,6 @@
"flag"
"io"
- "github.com/opentracing/opentracing-go"
- "github.com/uber/jaeger-client-go"
"github.com/uber/jaeger-client-go/config"
"vitess.io/vitess/go/vt/log"
)
diff -u go/vt/binlog/binlog_streamer_test.go.orig go/vt/binlog/binlog_streamer_test.go
--- go/vt/binlog/binlog_streamer_test.go.orig 2019-09-11 18:32:29.000000000 -0400
+++ go/vt/binlog/binlog_streamer_test.go 2019-09-11 18:32:29.000000000 -0400
@@ -26,6 +26,7 @@
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
diff -u go/vt/binlog/binlogplayer/binlog_player_test.go.orig go/vt/binlog/binlogplayer/binlog_player_test.go
--- go/vt/binlog/binlogplayer/binlog_player_test.go.orig 2019-09-11 18:32:29.000000000 -0400
+++ go/vt/binlog/binlogplayer/binlog_player_test.go 2019-09-11 18:32:29.000000000 -0400
@@ -22,6 +22,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/throttler"
diff -u go/vt/binlog/slave_connection.go.orig go/vt/binlog/slave_connection.go
--- go/vt/binlog/slave_connection.go.orig 2019-09-11 18:32:29.000000000 -0400
+++ go/vt/binlog/slave_connection.go 2019-09-11 18:32:29.000000000 -0400
@@ -22,6 +22,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/pools"
"vitess.io/vitess/go/vt/dbconfigs"
diff -u go/vt/binlog/updatestreamctl.go.orig go/vt/binlog/updatestreamctl.go
--- go/vt/binlog/updatestreamctl.go.orig 2019-09-11 18:32:29.000000000 -0400
+++ go/vt/binlog/updatestreamctl.go 2019-09-11 18:32:29.000000000 -0400
@@ -22,6 +22,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/stats"
"vitess.io/vitess/go/sync2"
diff -u go/vt/discovery/healthcheck.go.orig go/vt/discovery/healthcheck.go
--- go/vt/discovery/healthcheck.go.orig 2019-09-11 18:32:29.000000000 -0400
+++ go/vt/discovery/healthcheck.go 2019-09-11 18:32:29.000000000 -0400
@@ -51,6 +51,7 @@
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/netutil"
"vitess.io/vitess/go/stats"
"vitess.io/vitess/go/sync2"
diff -u go/vt/discovery/tablet_stats_cache_wait_test.go.orig go/vt/discovery/tablet_stats_cache_wait_test.go
--- go/vt/discovery/tablet_stats_cache_wait_test.go.orig 2019-09-11 18:32:29.000000000 -0400
+++ go/vt/discovery/tablet_stats_cache_wait_test.go 2019-09-11 18:32:29.000000000 -0400
@@ -22,6 +22,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/topo"
querypb "vitess.io/vitess/go/vt/proto/query"
diff -u go/vt/discovery/topology_watcher.go.orig go/vt/discovery/topology_watcher.go
--- go/vt/discovery/topology_watcher.go.orig 2019-09-11 18:32:29.000000000 -0400
+++ go/vt/discovery/topology_watcher.go 2019-09-11 18:32:29.000000000 -0400
@@ -26,6 +26,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/stats"
"vitess.io/vitess/go/trace"
diff -u go/vt/grpcclient/client.go.orig go/vt/grpcclient/client.go
--- go/vt/grpcclient/client.go.orig 2019-09-11 18:32:29.000000000 -0400
+++ go/vt/grpcclient/client.go 2019-09-11 18:32:29.000000000 -0400
@@ -21,8 +21,6 @@
import (
"flag"
- "github.com/grpc-ecosystem/go-grpc-middleware"
- "github.com/grpc-ecosystem/go-grpc-prometheus"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/keepalive"
diff -u go/vt/grpcclient/client_test.go.orig go/vt/grpcclient/client_test.go
--- go/vt/grpcclient/client_test.go.orig 2019-09-11 18:32:29.000000000 -0400
+++ go/vt/grpcclient/client_test.go 2019-09-11 18:32:29.000000000 -0400
@@ -24,6 +24,7 @@
"google.golang.org/grpc"
+ "vitess.io/vitess/go/context2"
vtgatepb "vitess.io/vitess/go/vt/proto/vtgate"
vtgateservicepb "vitess.io/vitess/go/vt/proto/vtgateservice"
)
diff -u go/vt/log/log.go.orig go/vt/log/log.go
--- go/vt/log/log.go.orig 2019-09-11 18:32:29.000000000 -0400
+++ go/vt/log/log.go 2019-09-11 18:32:29.000000000 -0400
@@ -7,6 +7,7 @@
import (
"flag"
+
"github.com/golang/glog"
)
diff -u go/vt/mysqlctl/query.go.orig go/vt/mysqlctl/query.go
--- go/vt/mysqlctl/query.go.orig 2019-09-11 18:32:29.000000000 -0400
+++ go/vt/mysqlctl/query.go 2019-09-11 18:32:29.000000000 -0400
@@ -23,6 +23,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/dbconnpool"
diff -u go/vt/schemamanager/schemaswap/schema_swap.go.orig go/vt/schemamanager/schemaswap/schema_swap.go
--- go/vt/schemamanager/schemaswap/schema_swap.go.orig 2019-09-11 18:32:30.000000000 -0400
+++ go/vt/schemamanager/schemaswap/schema_swap.go 2019-09-11 18:32:30.000000000 -0400
@@ -29,6 +29,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/concurrency"
"vitess.io/vitess/go/vt/discovery"
diff -u go/vt/schemamanager/tablet_executor.go.orig go/vt/schemamanager/tablet_executor.go
--- go/vt/schemamanager/tablet_executor.go.orig 2019-09-11 18:32:30.000000000 -0400
+++ go/vt/schemamanager/tablet_executor.go 2019-09-11 18:32:30.000000000 -0400
@@ -23,6 +23,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sync2"
"vitess.io/vitess/go/vt/sqlparser"
"vitess.io/vitess/go/vt/wrangler"
diff -u go/vt/servenv/grpc_server_test.go.orig go/vt/servenv/grpc_server_test.go
--- go/vt/servenv/grpc_server_test.go.orig 2019-09-11 18:32:30.000000000 -0400
+++ go/vt/servenv/grpc_server_test.go 2019-09-11 18:32:30.000000000 -0400
@@ -17,62 +17,62 @@
package servenv
import (
- "testing"
+ "testing"
- "golang.org/x/net/context"
+ "golang.org/x/net/context"
- "google.golang.org/grpc"
+ "google.golang.org/grpc"
)
func TestEmpty(t *testing.T) {
- interceptors := &serverInterceptorBuilder{}
- if len(interceptors.Build()) > 0 {
- t.Fatalf("expected empty builder to report as empty")
- }
+ interceptors := &serverInterceptorBuilder{}
+ if len(interceptors.Build()) > 0 {
+ t.Fatalf("expected empty builder to report as empty")
+ }
}
func TestSingleInterceptor(t *testing.T) {
- interceptors := &serverInterceptorBuilder{}
- fake := &FakeInterceptor{}
+ interceptors := &serverInterceptorBuilder{}
+ fake := &FakeInterceptor{}
- interceptors.Add(fake.StreamServerInterceptor, fake.UnaryServerInterceptor)
+ interceptors.Add(fake.StreamServerInterceptor, fake.UnaryServerInterceptor)
- if len(interceptors.streamInterceptors) != 1 {
- t.Fatalf("expected 1 server options to be available")
- }
- if len(interceptors.unaryInterceptors) != 1 {
- t.Fatalf("expected 1 server options to be available")
- }
+ if len(interceptors.streamInterceptors) != 1 {
+ t.Fatalf("expected 1 server options to be available")
+ }
+ if len(interceptors.unaryInterceptors) != 1 {
+ t.Fatalf("expected 1 server options to be available")
+ }
}
func TestDoubleInterceptor(t *testing.T) {
- interceptors := &serverInterceptorBuilder{}
- fake1 := &FakeInterceptor{name: "ettan"}
- fake2 := &FakeInterceptor{name: "tvaon"}
-
- interceptors.Add(fake1.StreamServerInterceptor, fake1.UnaryServerInterceptor)
- interceptors.Add(fake2.StreamServerInterceptor, fake2.UnaryServerInterceptor)
-
- if len(interceptors.streamInterceptors) != 2 {
- t.Fatalf("expected 1 server options to be available")
- }
- if len(interceptors.unaryInterceptors) != 2 {
- t.Fatalf("expected 1 server options to be available")
- }
+ interceptors := &serverInterceptorBuilder{}
+ fake1 := &FakeInterceptor{name: "ettan"}
+ fake2 := &FakeInterceptor{name: "tvaon"}
+
+ interceptors.Add(fake1.StreamServerInterceptor, fake1.UnaryServerInterceptor)
+ interceptors.Add(fake2.StreamServerInterceptor, fake2.UnaryServerInterceptor)
+
+ if len(interceptors.streamInterceptors) != 2 {
+ t.Fatalf("expected 1 server options to be available")
+ }
+ if len(interceptors.unaryInterceptors) != 2 {
+ t.Fatalf("expected 1 server options to be available")
+ }
}
type FakeInterceptor struct {
- name string
- streamSeen interface{}
- unarySeen interface{}
+ name string
+ streamSeen interface{}
+ unarySeen interface{}
}
func (fake *FakeInterceptor) StreamServerInterceptor(value interface{}, stream grpc.ServerStream, _ *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
- fake.streamSeen = value
- return handler(value, stream)
+ fake.streamSeen = value
+ return handler(value, stream)
}
func (fake *FakeInterceptor) UnaryServerInterceptor(ctx context.Context, value interface{}, _ *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp interface{}, err error) {
- fake.unarySeen = value
- return handler(ctx, value)
+ fake.unarySeen = value
+ return handler(ctx, value)
}
diff -u go/vt/sqlparser/like_filter.go.orig go/vt/sqlparser/like_filter.go
--- go/vt/sqlparser/like_filter.go.orig 2019-09-11 18:32:30.000000000 -0400
+++ go/vt/sqlparser/like_filter.go 2019-09-11 18:32:30.000000000 -0400
@@ -15,7 +15,7 @@
return s[2:]
}
- result := strings.Replace(s, "%" ,".*", -1)
+ result := strings.Replace(s, "%", ".*", -1)
result = strings.Replace(result, "_", ".", -1)
return result
diff -u go/vt/sqlparser/like_filter_test.go.orig go/vt/sqlparser/like_filter_test.go
--- go/vt/sqlparser/like_filter_test.go.orig 2019-09-11 18:32:30.000000000 -0400
+++ go/vt/sqlparser/like_filter_test.go 2019-09-11 18:32:30.000000000 -0400
@@ -1,8 +1,9 @@
package sqlparser
import (
- "github.com/stretchr/testify/assert"
"testing"
+
+ "github.com/stretchr/testify/assert"
)
func TestEmptyLike(t *testing.T) {
diff -u go/vt/srvtopo/resilient_server_flaky_test.go.orig go/vt/srvtopo/resilient_server_flaky_test.go
--- go/vt/srvtopo/resilient_server_flaky_test.go.orig 2019-09-11 18:32:31.000000000 -0400
+++ go/vt/srvtopo/resilient_server_flaky_test.go 2019-09-11 18:32:31.000000000 -0400
@@ -27,6 +27,7 @@
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/status"
"vitess.io/vitess/go/vt/topo"
"vitess.io/vitess/go/vt/topo/memorytopo"
diff -u go/vt/topo/consultopo/election.go.orig go/vt/topo/consultopo/election.go
--- go/vt/topo/consultopo/election.go.orig 2019-09-11 18:32:31.000000000 -0400
+++ go/vt/topo/consultopo/election.go 2019-09-11 18:32:31.000000000 -0400
@@ -22,6 +22,7 @@
"golang.org/x/net/context"
"github.com/hashicorp/consul/api"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/log"
"vitess.io/vitess/go/vt/topo"
)
diff -u go/vt/topo/consultopo/watch.go.orig go/vt/topo/consultopo/watch.go
--- go/vt/topo/consultopo/watch.go.orig 2019-09-11 18:32:31.000000000 -0400
+++ go/vt/topo/consultopo/watch.go 2019-09-11 18:32:31.000000000 -0400
@@ -24,6 +24,7 @@
"golang.org/x/net/context"
"github.com/hashicorp/consul/api"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/topo"
)
diff -u go/vt/topo/etcd2topo/election.go.orig go/vt/topo/etcd2topo/election.go
--- go/vt/topo/etcd2topo/election.go.orig 2019-09-11 18:32:31.000000000 -0400
+++ go/vt/topo/etcd2topo/election.go 2019-09-11 18:32:31.000000000 -0400
@@ -22,6 +22,7 @@
"github.com/coreos/etcd/clientv3"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/log"
"vitess.io/vitess/go/vt/topo"
)
diff -u go/vt/topo/etcd2topo/lock.go.orig go/vt/topo/etcd2topo/lock.go
--- go/vt/topo/etcd2topo/lock.go.orig 2019-09-11 18:32:31.000000000 -0400
+++ go/vt/topo/etcd2topo/lock.go 2019-09-11 18:32:31.000000000 -0400
@@ -24,6 +24,7 @@
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/mvcc/mvccpb"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/proto/vtrpc"
"vitess.io/vitess/go/vt/vterrors"
diff -u go/vt/topo/etcd2topo/server_test.go.orig go/vt/topo/etcd2topo/server_test.go
--- go/vt/topo/etcd2topo/server_test.go.orig 2019-09-11 18:32:31.000000000 -0400
+++ go/vt/topo/etcd2topo/server_test.go 2019-09-11 18:32:31.000000000 -0400
@@ -28,6 +28,7 @@
"golang.org/x/net/context"
"github.com/coreos/etcd/clientv3"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/testfiles"
"vitess.io/vitess/go/vt/topo"
"vitess.io/vitess/go/vt/topo/test"
diff -u go/vt/topo/etcd2topo/watch.go.orig go/vt/topo/etcd2topo/watch.go
--- go/vt/topo/etcd2topo/watch.go.orig 2019-09-11 18:32:31.000000000 -0400
+++ go/vt/topo/etcd2topo/watch.go 2019-09-11 18:32:31.000000000 -0400
@@ -23,6 +23,7 @@
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/mvcc/mvccpb"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/proto/vtrpc"
"vitess.io/vitess/go/vt/vterrors"
diff -u go/vt/topo/locks.go.orig go/vt/topo/locks.go
--- go/vt/topo/locks.go.orig 2019-09-11 18:32:31.000000000 -0400
+++ go/vt/topo/locks.go 2019-09-11 18:32:31.000000000 -0400
@@ -26,6 +26,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/proto/vtrpc"
"vitess.io/vitess/go/vt/vterrors"
diff -u go/vt/topo/memorytopo/election.go.orig go/vt/topo/memorytopo/election.go
--- go/vt/topo/memorytopo/election.go.orig 2019-09-11 18:32:31.000000000 -0400
+++ go/vt/topo/memorytopo/election.go 2019-09-11 18:32:31.000000000 -0400
@@ -21,6 +21,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/log"
"vitess.io/vitess/go/vt/topo"
)
diff -u go/vt/topo/test/lock.go.orig go/vt/topo/test/lock.go
--- go/vt/topo/test/lock.go.orig 2019-09-11 18:32:32.000000000 -0400
+++ go/vt/topo/test/lock.go 2019-09-11 18:32:32.000000000 -0400
@@ -22,6 +22,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/topo"
topodatapb "vitess.io/vitess/go/vt/proto/topodata"
diff -u go/vt/topo/zk2topo/election.go.orig go/vt/topo/zk2topo/election.go
--- go/vt/topo/zk2topo/election.go.orig 2019-09-11 18:32:32.000000000 -0400
+++ go/vt/topo/zk2topo/election.go 2019-09-11 18:32:32.000000000 -0400
@@ -22,6 +22,7 @@
"github.com/z-division/go-zookeeper/zk"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/vterrors"
"vitess.io/vitess/go/vt/log"
diff -u go/vt/vtctl/throttler.go.orig go/vt/vtctl/throttler.go
--- go/vt/vtctl/throttler.go.orig 2019-09-11 18:32:32.000000000 -0400
+++ go/vt/vtctl/throttler.go 2019-09-11 18:32:32.000000000 -0400
@@ -27,6 +27,7 @@
"github.com/olekukonko/tablewriter"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/logutil"
"vitess.io/vitess/go/vt/throttler"
"vitess.io/vitess/go/vt/throttler/throttlerclient"
diff -u go/vt/vtctl/vtctl.go.orig go/vt/vtctl/vtctl.go
--- go/vt/vtctl/vtctl.go.orig 2019-09-11 18:32:32.000000000 -0400
+++ go/vt/vtctl/vtctl.go 2019-09-11 18:32:32.000000000 -0400
@@ -107,6 +107,7 @@
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/flagutil"
"vitess.io/vitess/go/json2"
"vitess.io/vitess/go/mysql"
diff -u go/vt/vtctld/action_repository.go.orig go/vt/vtctld/action_repository.go
--- go/vt/vtctld/action_repository.go.orig 2019-09-11 18:32:32.000000000 -0400
+++ go/vt/vtctld/action_repository.go 2019-09-11 18:32:32.000000000 -0400
@@ -24,6 +24,7 @@
"golang.org/x/net/context"
"vitess.io/vitess/go/acl"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/logutil"
"vitess.io/vitess/go/vt/topo"
"vitess.io/vitess/go/vt/topo/topoproto"
diff -u go/vt/vtctld/tablet_data_test.go.orig go/vt/vtctld/tablet_data_test.go
--- go/vt/vtctld/tablet_data_test.go.orig 2019-09-11 18:32:32.000000000 -0400
+++ go/vt/vtctld/tablet_data_test.go 2019-09-11 18:32:32.000000000 -0400
@@ -24,6 +24,7 @@
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/logutil"
querypb "vitess.io/vitess/go/vt/proto/query"
topodatapb "vitess.io/vitess/go/vt/proto/topodata"
diff -u go/vt/vtctld/workflow.go.orig go/vt/vtctld/workflow.go
--- go/vt/vtctld/workflow.go.orig 2019-09-11 18:32:32.000000000 -0400
+++ go/vt/vtctld/workflow.go 2019-09-11 18:32:32.000000000 -0400
@@ -21,6 +21,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/trace"
"vitess.io/vitess/go/flagutil"
diff -u go/vt/vtgate/buffer/buffer_test.go.orig go/vt/vtgate/buffer/buffer_test.go
--- go/vt/vtgate/buffer/buffer_test.go.orig 2019-09-11 18:32:33.000000000 -0400
+++ go/vt/vtgate/buffer/buffer_test.go 2019-09-11 18:32:33.000000000 -0400
@@ -26,6 +26,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/discovery"
"vitess.io/vitess/go/vt/topo/topoproto"
"vitess.io/vitess/go/vt/vterrors"
diff -u go/vt/vtgate/buffer/shard_buffer.go.orig go/vt/vtgate/buffer/shard_buffer.go
--- go/vt/vtgate/buffer/shard_buffer.go.orig 2019-09-11 18:32:33.000000000 -0400
+++ go/vt/vtgate/buffer/shard_buffer.go 2019-09-11 18:32:33.000000000 -0400
@@ -24,6 +24,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sync2"
"vitess.io/vitess/go/vt/log"
"vitess.io/vitess/go/vt/logutil"
diff -u go/vt/vtgate/endtoend/vstream_test.go.orig go/vt/vtgate/endtoend/vstream_test.go
--- go/vt/vtgate/endtoend/vstream_test.go.orig 2019-09-11 18:32:33.000000000 -0400
+++ go/vt/vtgate/endtoend/vstream_test.go 2019-09-11 18:32:33.000000000 -0400
@@ -22,6 +22,7 @@
"testing"
"github.com/golang/protobuf/proto"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
"vitess.io/vitess/go/vt/proto/query"
diff -u go/vt/vtgate/engine/merge_sort.go.orig go/vt/vtgate/engine/merge_sort.go
--- go/vt/vtgate/engine/merge_sort.go.orig 2019-09-11 18:32:33.000000000 -0400
+++ go/vt/vtgate/engine/merge_sort.go 2019-09-11 18:32:33.000000000 -0400
@@ -24,6 +24,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sqltypes"
querypb "vitess.io/vitess/go/vt/proto/query"
diff -u go/vt/vtgate/executor_stream_test.go.orig go/vt/vtgate/executor_stream_test.go
--- go/vt/vtgate/executor_stream_test.go.orig 2019-09-11 18:32:33.000000000 -0400
+++ go/vt/vtgate/executor_stream_test.go 2019-09-11 18:32:33.000000000 -0400
@@ -21,6 +21,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/discovery"
querypb "vitess.io/vitess/go/vt/proto/query"
diff -u go/vt/vtgate/gateway/gateway.go.orig go/vt/vtgate/gateway/gateway.go
--- go/vt/vtgate/gateway/gateway.go.orig 2019-09-11 18:32:33.000000000 -0400
+++ go/vt/vtgate/gateway/gateway.go 2019-09-11 18:32:33.000000000 -0400
@@ -23,6 +23,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/flagutil"
"vitess.io/vitess/go/vt/log"
diff -u go/vt/vtgate/plugin_mysql_server.go.orig go/vt/vtgate/plugin_mysql_server.go
--- go/vt/vtgate/plugin_mysql_server.go.orig 2019-09-11 18:32:34.000000000 -0400
+++ go/vt/vtgate/plugin_mysql_server.go 2019-09-11 18:32:34.000000000 -0400
@@ -26,6 +26,7 @@
"syscall"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/sqlparser"
"vitess.io/vitess/go/vt/vterrors"
diff -u go/vt/vtgate/resolver.go.orig go/vt/vtgate/resolver.go
--- go/vt/vtgate/resolver.go.orig 2019-09-11 18:32:34.000000000 -0400
+++ go/vt/vtgate/resolver.go 2019-09-11 18:32:34.000000000 -0400
@@ -26,6 +26,7 @@
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/key"
"vitess.io/vitess/go/vt/log"
diff -u go/vt/vtgate/resolver_test.go.orig go/vt/vtgate/resolver_test.go
--- go/vt/vtgate/resolver_test.go.orig 2019-09-11 18:32:34.000000000 -0400
+++ go/vt/vtgate/resolver_test.go 2019-09-11 18:32:34.000000000 -0400
@@ -27,6 +27,7 @@
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/discovery"
"vitess.io/vitess/go/vt/key"
diff -u go/vt/vtgate/scatter_conn.go.orig go/vt/vtgate/scatter_conn.go
--- go/vt/vtgate/scatter_conn.go.orig 2019-09-11 18:32:34.000000000 -0400
+++ go/vt/vtgate/scatter_conn.go 2019-09-11 18:32:34.000000000 -0400
@@ -25,6 +25,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/stats"
"vitess.io/vitess/go/vt/concurrency"
diff -u go/vt/vtgate/vcursor_impl.go.orig go/vt/vtgate/vcursor_impl.go
--- go/vt/vtgate/vcursor_impl.go.orig 2019-09-11 18:32:34.000000000 -0400
+++ go/vt/vtgate/vcursor_impl.go 2019-09-11 18:32:34.000000000 -0400
@@ -22,6 +22,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/key"
"vitess.io/vitess/go/vt/sqlparser"
diff -u go/vt/vtgate/vtgate_test.go.orig go/vt/vtgate/vtgate_test.go
--- go/vt/vtgate/vtgate_test.go.orig 2019-09-11 18:32:34.000000000 -0400
+++ go/vt/vtgate/vtgate_test.go 2019-09-11 18:32:34.000000000 -0400
@@ -29,6 +29,7 @@
"golang.org/x/net/context"
"github.com/golang/protobuf/proto"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/discovery"
"vitess.io/vitess/go/vt/key"
diff -u go/vt/vtqueryserver/plugin_mysql_server.go.orig go/vt/vtqueryserver/plugin_mysql_server.go
--- go/vt/vtqueryserver/plugin_mysql_server.go.orig 2019-09-11 18:32:35.000000000 -0400
+++ go/vt/vtqueryserver/plugin_mysql_server.go 2019-09-11 18:32:35.000000000 -0400
@@ -25,6 +25,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/callerid"
diff -u go/vt/vttablet/agentrpctest/test_agent_rpc.go.orig go/vt/vttablet/agentrpctest/test_agent_rpc.go
--- go/vt/vttablet/agentrpctest/test_agent_rpc.go.orig 2019-09-11 18:32:35.000000000 -0400
+++ go/vt/vttablet/agentrpctest/test_agent_rpc.go 2019-09-11 18:32:35.000000000 -0400
@@ -28,6 +28,7 @@
"golang.org/x/net/context"
"github.com/golang/protobuf/proto"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/hook"
"vitess.io/vitess/go/vt/logutil"
diff -u go/vt/vttablet/endtoend/misc_test.go.orig go/vt/vttablet/endtoend/misc_test.go
--- go/vt/vttablet/endtoend/misc_test.go.orig 2019-09-11 18:32:35.000000000 -0400
+++ go/vt/vttablet/endtoend/misc_test.go 2019-09-11 18:32:35.000000000 -0400
@@ -29,6 +29,7 @@
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/callerid"
diff -u go/vt/vttablet/grpctabletconn/conn.go.orig go/vt/vttablet/grpctabletconn/conn.go
--- go/vt/vttablet/grpctabletconn/conn.go.orig 2019-09-11 18:32:35.000000000 -0400
+++ go/vt/vttablet/grpctabletconn/conn.go 2019-09-11 18:32:35.000000000 -0400
@@ -23,6 +23,7 @@
"golang.org/x/net/context"
"google.golang.org/grpc"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/netutil"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/callerid"
diff -u go/vt/vttablet/heartbeat/reader.go.orig go/vt/vttablet/heartbeat/reader.go
--- go/vt/vttablet/heartbeat/reader.go.orig 2019-09-11 18:32:35.000000000 -0400
+++ go/vt/vttablet/heartbeat/reader.go 2019-09-11 18:32:35.000000000 -0400
@@ -21,6 +21,7 @@
"sync"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/vterrors"
"golang.org/x/net/context"
diff -u go/vt/vttablet/heartbeat/writer.go.orig go/vt/vttablet/heartbeat/writer.go
--- go/vt/vttablet/heartbeat/writer.go.orig 2019-09-11 18:32:35.000000000 -0400
+++ go/vt/vttablet/heartbeat/writer.go 2019-09-11 18:32:35.000000000 -0400
@@ -21,6 +21,7 @@
"sync"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/vterrors"
"golang.org/x/net/context"
diff -u go/vt/vttablet/tabletmanager/action_agent.go.orig go/vt/vttablet/tabletmanager/action_agent.go
--- go/vt/vttablet/tabletmanager/action_agent.go.orig 2019-09-11 18:32:35.000000000 -0400
+++ go/vt/vttablet/tabletmanager/action_agent.go 2019-09-11 18:32:35.000000000 -0400
@@ -44,6 +44,7 @@
"sync"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/vterrors"
"golang.org/x/net/context"
diff -u go/vt/vttablet/tabletmanager/init_tablet.go.orig go/vt/vttablet/tabletmanager/init_tablet.go
--- go/vt/vttablet/tabletmanager/init_tablet.go.orig 2019-09-11 18:32:35.000000000 -0400
+++ go/vt/vttablet/tabletmanager/init_tablet.go 2019-09-11 18:32:35.000000000 -0400
@@ -24,8 +24,7 @@
"fmt"
"time"
- "golang.org/x/net/context"
-
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/flagutil"
"vitess.io/vitess/go/netutil"
"vitess.io/vitess/go/vt/log"
diff -u go/vt/vttablet/tabletmanager/replication_reporter.go.orig go/vt/vttablet/tabletmanager/replication_reporter.go
--- go/vt/vttablet/tabletmanager/replication_reporter.go.orig 2019-09-11 18:32:35.000000000 -0400
+++ go/vt/vttablet/tabletmanager/replication_reporter.go 2019-09-11 18:32:35.000000000 -0400
@@ -22,6 +22,7 @@
"html/template"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/vterrors"
"golang.org/x/net/context"
diff -u go/vt/vttablet/tabletmanager/rpc_external_reparent.go.orig go/vt/vttablet/tabletmanager/rpc_external_reparent.go
--- go/vt/vttablet/tabletmanager/rpc_external_reparent.go.orig 2019-09-11 18:32:35.000000000 -0400
+++ go/vt/vttablet/tabletmanager/rpc_external_reparent.go 2019-09-11 18:32:35.000000000 -0400
@@ -23,6 +23,7 @@
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/event"
"vitess.io/vitess/go/stats"
"vitess.io/vitess/go/trace"
diff -u go/vt/vttablet/tabletmanager/rpc_replication.go.orig go/vt/vttablet/tabletmanager/rpc_replication.go
--- go/vt/vttablet/tabletmanager/rpc_replication.go.orig 2019-09-11 18:32:35.000000000 -0400
+++ go/vt/vttablet/tabletmanager/rpc_replication.go 2019-09-11 18:32:35.000000000 -0400
@@ -21,6 +21,7 @@
"fmt"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/vterrors"
"golang.org/x/net/context"
diff -u go/vt/vttablet/tabletmanager/vreplication/controller.go.orig go/vt/vttablet/tabletmanager/vreplication/controller.go
--- go/vt/vttablet/tabletmanager/vreplication/controller.go.orig 2019-09-11 18:32:35.000000000 -0400
+++ go/vt/vttablet/tabletmanager/vreplication/controller.go 2019-09-11 18:32:35.000000000 -0400
@@ -22,6 +22,7 @@
"strconv"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/vterrors"
"github.com/golang/protobuf/proto"
diff -u go/vt/vttablet/tabletmanager/vreplication/controller_test.go.orig go/vt/vttablet/tabletmanager/vreplication/controller_test.go
--- go/vt/vttablet/tabletmanager/vreplication/controller_test.go.orig 2019-09-11 18:32:36.000000000 -0400
+++ go/vt/vttablet/tabletmanager/vreplication/controller_test.go 2019-09-11 18:32:36.000000000 -0400
@@ -24,6 +24,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/binlog/binlogplayer"
"vitess.io/vitess/go/vt/mysqlctl/fakemysqldaemon"
diff -u go/vt/vttablet/tabletmanager/vreplication/engine.go.orig go/vt/vttablet/tabletmanager/vreplication/engine.go
--- go/vt/vttablet/tabletmanager/vreplication/engine.go.orig 2019-09-11 18:32:36.000000000 -0400
+++ go/vt/vttablet/tabletmanager/vreplication/engine.go 2019-09-11 18:32:36.000000000 -0400
@@ -24,6 +24,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/binlog/binlogplayer"
diff -u go/vt/vttablet/tabletmanager/vreplication/engine_test.go.orig go/vt/vttablet/tabletmanager/vreplication/engine_test.go
--- go/vt/vttablet/tabletmanager/vreplication/engine_test.go.orig 2019-09-11 18:32:36.000000000 -0400
+++ go/vt/vttablet/tabletmanager/vreplication/engine_test.go 2019-09-11 18:32:36.000000000 -0400
@@ -23,6 +23,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/binlog/binlogplayer"
diff -u go/vt/vttablet/tabletmanager/vreplication/vcopier.go.orig go/vt/vttablet/tabletmanager/vreplication/vcopier.go
--- go/vt/vttablet/tabletmanager/vreplication/vcopier.go.orig 2019-09-11 18:32:36.000000000 -0400
+++ go/vt/vttablet/tabletmanager/vreplication/vcopier.go 2019-09-11 18:32:36.000000000 -0400
@@ -27,6 +27,7 @@
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/binlog/binlogplayer"
diff -u go/vt/vttablet/tabletmanager/vreplication/vplayer.go.orig go/vt/vttablet/tabletmanager/vreplication/vplayer.go
--- go/vt/vttablet/tabletmanager/vreplication/vplayer.go.orig 2019-09-11 18:32:36.000000000 -0400
+++ go/vt/vttablet/tabletmanager/vreplication/vplayer.go 2019-09-11 18:32:36.000000000 -0400
@@ -24,6 +24,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/sqltypes"
diff -u go/vt/vttablet/tabletserver/connpool/dbconn_test.go.orig go/vt/vttablet/tabletserver/connpool/dbconn_test.go
--- go/vt/vttablet/tabletserver/connpool/dbconn_test.go.orig 2019-09-11 18:32:36.000000000 -0400
+++ go/vt/vttablet/tabletserver/connpool/dbconn_test.go 2019-09-11 18:32:36.000000000 -0400
@@ -26,6 +26,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/mysql/fakesqldb"
"vitess.io/vitess/go/sqltypes"
diff -u go/vt/vttablet/tabletserver/messager/message_manager.go.orig go/vt/vttablet/tabletserver/messager/message_manager.go
--- go/vt/vttablet/tabletserver/messager/message_manager.go.orig 2019-09-11 18:32:36.000000000 -0400
+++ go/vt/vttablet/tabletserver/messager/message_manager.go 2019-09-11 18:32:36.000000000 -0400
@@ -23,6 +23,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/stats"
"vitess.io/vitess/go/sync2"
diff -u go/vt/vttablet/tabletserver/messager/message_manager_test.go.orig go/vt/vttablet/tabletserver/messager/message_manager_test.go
--- go/vt/vttablet/tabletserver/messager/message_manager_test.go.orig 2019-09-11 18:32:36.000000000 -0400
+++ go/vt/vttablet/tabletserver/messager/message_manager_test.go 2019-09-11 18:32:36.000000000 -0400
@@ -26,6 +26,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql/fakesqldb"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/sync2"
diff -u go/vt/vttablet/tabletserver/query_engine.go.orig go/vt/vttablet/tabletserver/query_engine.go
--- go/vt/vttablet/tabletserver/query_engine.go.orig 2019-09-11 18:32:36.000000000 -0400
+++ go/vt/vttablet/tabletserver/query_engine.go 2019-09-11 18:32:36.000000000 -0400
@@ -28,6 +28,7 @@
"vitess.io/vitess/go/acl"
"vitess.io/vitess/go/cache"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/stats"
"vitess.io/vitess/go/streamlog"
diff -u go/vt/vttablet/tabletserver/replication_watcher.go.orig go/vt/vttablet/tabletserver/replication_watcher.go
--- go/vt/vttablet/tabletserver/replication_watcher.go.orig 2019-09-11 18:32:36.000000000 -0400
+++ go/vt/vttablet/tabletserver/replication_watcher.go 2019-09-11 18:32:36.000000000 -0400
@@ -22,6 +22,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/stats"
"vitess.io/vitess/go/vt/binlog"
diff -u go/vt/vttablet/tabletserver/tabletserver.go.orig go/vt/vttablet/tabletserver/tabletserver.go
--- go/vt/vttablet/tabletserver/tabletserver.go.orig 2019-09-11 18:32:37.000000000 -0400
+++ go/vt/vttablet/tabletserver/tabletserver.go 2019-09-11 18:32:37.000000000 -0400
@@ -31,6 +31,7 @@
"golang.org/x/net/context"
"vitess.io/vitess/go/acl"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/history"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/sqltypes"
diff -u go/vt/vttablet/tabletserver/tabletserver_test.go.orig go/vt/vttablet/tabletserver/tabletserver_test.go
--- go/vt/vttablet/tabletserver/tabletserver_test.go.orig 2019-09-11 18:32:37.000000000 -0400
+++ go/vt/vttablet/tabletserver/tabletserver_test.go 2019-09-11 18:32:37.000000000 -0400
@@ -32,6 +32,7 @@
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/mysql/fakesqldb"
"vitess.io/vitess/go/sqltypes"
diff -u go/vt/vttablet/tabletserver/tx_engine.go.orig go/vt/vttablet/tabletserver/tx_engine.go
--- go/vt/vttablet/tabletserver/tx_engine.go.orig 2019-09-11 18:32:37.000000000 -0400
+++ go/vt/vttablet/tabletserver/tx_engine.go 2019-09-11 18:32:37.000000000 -0400
@@ -23,6 +23,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/timer"
"vitess.io/vitess/go/trace"
"vitess.io/vitess/go/vt/concurrency"
diff -u go/vt/vttablet/tabletserver/tx_prep_pool.go.orig go/vt/vttablet/tabletserver/tx_prep_pool.go
--- go/vt/vttablet/tabletserver/tx_prep_pool.go.orig 2019-09-11 18:32:37.000000000 -0400
+++ go/vt/vttablet/tabletserver/tx_prep_pool.go 2019-09-11 18:32:37.000000000 -0400
@@ -24,7 +24,7 @@
var (
errPrepCommitting = errors.New("committing")
- errPrepFailed = errors.New("failed")
+ errPrepFailed = errors.New("failed")
)
// TxPreparedPool manages connections for prepared transactions.
diff -u go/vt/vttablet/tabletserver/txserializer/tx_serializer_test.go.orig go/vt/vttablet/tabletserver/txserializer/tx_serializer_test.go
--- go/vt/vttablet/tabletserver/txserializer/tx_serializer_test.go.orig 2019-09-11 18:32:37.000000000 -0400
+++ go/vt/vttablet/tabletserver/txserializer/tx_serializer_test.go 2019-09-11 18:32:37.000000000 -0400
@@ -27,6 +27,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/streamlog"
"vitess.io/vitess/go/vt/vterrors"
diff -u go/vt/vttablet/tabletserver/vstreamer/engine_test.go.orig go/vt/vttablet/tabletserver/vstreamer/engine_test.go
--- go/vt/vttablet/tabletserver/vstreamer/engine_test.go.orig 2019-09-11 18:32:37.000000000 -0400
+++ go/vt/vttablet/tabletserver/vstreamer/engine_test.go 2019-09-11 18:32:37.000000000 -0400
@@ -23,6 +23,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
)
diff -u go/vt/vttablet/tabletserver/vstreamer/rowstreamer.go.orig go/vt/vttablet/tabletserver/vstreamer/rowstreamer.go
--- go/vt/vttablet/tabletserver/vstreamer/rowstreamer.go.orig 2019-09-11 18:32:37.000000000 -0400
+++ go/vt/vttablet/tabletserver/vstreamer/rowstreamer.go 2019-09-11 18:32:37.000000000 -0400
@@ -20,6 +20,7 @@
"context"
"fmt"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/dbconfigs"
diff -u go/vt/vttablet/tabletserver/vstreamer/rowstreamer_test.go.orig go/vt/vttablet/tabletserver/vstreamer/rowstreamer_test.go
--- go/vt/vttablet/tabletserver/vstreamer/rowstreamer_test.go.orig 2019-09-11 18:32:37.000000000 -0400
+++ go/vt/vttablet/tabletserver/vstreamer/rowstreamer_test.go 2019-09-11 18:32:37.000000000 -0400
@@ -22,6 +22,7 @@
"testing"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sqltypes"
binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
diff -u go/vt/vttablet/tabletserver/vstreamer/vstreamer.go.orig go/vt/vttablet/tabletserver/vstreamer/vstreamer.go
--- go/vt/vttablet/tabletserver/vstreamer/vstreamer.go.orig 2019-09-11 18:32:37.000000000 -0400
+++ go/vt/vttablet/tabletserver/vstreamer/vstreamer.go 2019-09-11 18:32:37.000000000 -0400
@@ -23,6 +23,7 @@
"io"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/binlog"
diff -u go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go.orig go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go
--- go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go.orig 2019-09-11 18:32:37.000000000 -0400
+++ go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go 2019-09-11 18:32:37.000000000 -0400
@@ -23,6 +23,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
diff -u go/vt/vttest/mysqlctl.go.orig go/vt/vttest/mysqlctl.go
--- go/vt/vttest/mysqlctl.go.orig 2019-09-11 18:32:37.000000000 -0400
+++ go/vt/vttest/mysqlctl.go 2019-09-11 18:32:37.000000000 -0400
@@ -25,6 +25,7 @@
"strings"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
)
diff -u go/vt/worker/chunk.go.orig go/vt/worker/chunk.go
--- go/vt/worker/chunk.go.orig 2019-09-11 18:32:37.000000000 -0400
+++ go/vt/worker/chunk.go 2019-09-11 18:32:37.000000000 -0400
@@ -19,6 +19,7 @@
import (
"fmt"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/proto/vtrpc"
"vitess.io/vitess/go/vt/vterrors"
diff -u go/vt/worker/diff_utils.go.orig go/vt/worker/diff_utils.go
--- go/vt/worker/diff_utils.go.orig 2019-09-11 18:32:37.000000000 -0400
+++ go/vt/worker/diff_utils.go 2019-09-11 18:32:37.000000000 -0400
@@ -25,6 +25,7 @@
"strings"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/proto/vtrpc"
"vitess.io/vitess/go/vt/vterrors"
"vitess.io/vitess/go/vt/vttablet/tmclient"
diff -u go/vt/worker/executor.go.orig go/vt/worker/executor.go
--- go/vt/worker/executor.go.orig 2019-09-11 18:32:37.000000000 -0400
+++ go/vt/worker/executor.go 2019-09-11 18:32:37.000000000 -0400
@@ -20,6 +20,7 @@
"fmt"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/vterrors"
"golang.org/x/net/context"
diff -u go/vt/worker/instance.go.orig go/vt/worker/instance.go
--- go/vt/worker/instance.go.orig 2019-09-11 18:32:37.000000000 -0400
+++ go/vt/worker/instance.go 2019-09-11 18:32:37.000000000 -0400
@@ -24,6 +24,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/trace"
"vitess.io/vitess/go/tb"
diff -u go/vt/worker/legacy_split_clone.go.orig go/vt/worker/legacy_split_clone.go
--- go/vt/worker/legacy_split_clone.go.orig 2019-09-11 18:32:37.000000000 -0400
+++ go/vt/worker/legacy_split_clone.go 2019-09-11 18:32:37.000000000 -0400
@@ -27,6 +27,7 @@
"sync"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/vterrors"
"golang.org/x/net/context"
diff -u go/vt/worker/legacy_split_clone_test.go.orig go/vt/worker/legacy_split_clone_test.go
--- go/vt/worker/legacy_split_clone_test.go.orig 2019-09-11 18:32:38.000000000 -0400
+++ go/vt/worker/legacy_split_clone_test.go 2019-09-11 18:32:38.000000000 -0400
@@ -28,6 +28,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/mysql/fakesqldb"
"vitess.io/vitess/go/sqltypes"
diff -u go/vt/worker/multi_split_diff.go.orig go/vt/worker/multi_split_diff.go
--- go/vt/worker/multi_split_diff.go.orig 2019-09-11 18:32:38.000000000 -0400
+++ go/vt/worker/multi_split_diff.go 2019-09-11 18:32:38.000000000 -0400
@@ -24,6 +24,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/proto/vtrpc"
"vitess.io/vitess/go/vt/vttablet/queryservice"
"vitess.io/vitess/go/vt/vttablet/tabletconn"
diff -u go/vt/worker/multi_split_diff_cmd.go.orig go/vt/worker/multi_split_diff_cmd.go
--- go/vt/worker/multi_split_diff_cmd.go.orig 2019-09-11 18:32:38.000000000 -0400
+++ go/vt/worker/multi_split_diff_cmd.go 2019-09-11 18:32:38.000000000 -0400
@@ -25,6 +25,7 @@
"strings"
"sync"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/proto/topodata"
"vitess.io/vitess/go/vt/proto/vtrpc"
"vitess.io/vitess/go/vt/vterrors"
diff -u go/vt/worker/restartable_result_reader.go.orig go/vt/worker/restartable_result_reader.go
--- go/vt/worker/restartable_result_reader.go.orig 2019-09-11 18:32:38.000000000 -0400
+++ go/vt/worker/restartable_result_reader.go 2019-09-11 18:32:38.000000000 -0400
@@ -22,6 +22,7 @@
"strings"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/vterrors"
"golang.org/x/net/context"
diff -u go/vt/worker/split_clone.go.orig go/vt/worker/split_clone.go
--- go/vt/worker/split_clone.go.orig 2019-09-11 18:32:38.000000000 -0400
+++ go/vt/worker/split_clone.go 2019-09-11 18:32:38.000000000 -0400
@@ -25,6 +25,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/event"
"vitess.io/vitess/go/stats"
"vitess.io/vitess/go/vt/binlog/binlogplayer"
diff -u go/vt/worker/split_clone_cmd.go.orig go/vt/worker/split_clone_cmd.go
--- go/vt/worker/split_clone_cmd.go.orig 2019-09-11 18:32:38.000000000 -0400
+++ go/vt/worker/split_clone_cmd.go 2019-09-11 18:32:38.000000000 -0400
@@ -27,6 +27,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/concurrency"
"vitess.io/vitess/go/vt/proto/topodata"
"vitess.io/vitess/go/vt/proto/vtrpc"
diff -u go/vt/worker/split_clone_test.go.orig go/vt/worker/split_clone_test.go
--- go/vt/worker/split_clone_test.go.orig 2019-09-11 18:32:38.000000000 -0400
+++ go/vt/worker/split_clone_test.go 2019-09-11 18:32:38.000000000 -0400
@@ -27,6 +27,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/mysql/fakesqldb"
"vitess.io/vitess/go/sqltypes"
diff -u go/vt/worker/split_diff.go.orig go/vt/worker/split_diff.go
--- go/vt/worker/split_diff.go.orig 2019-09-11 18:32:38.000000000 -0400
+++ go/vt/worker/split_diff.go 2019-09-11 18:32:38.000000000 -0400
@@ -21,6 +21,7 @@
"sort"
"sync"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/proto/vtrpc"
"vitess.io/vitess/go/vt/vterrors"
diff -u go/vt/worker/split_diff_cmd.go.orig go/vt/worker/split_diff_cmd.go
--- go/vt/worker/split_diff_cmd.go.orig 2019-09-11 18:32:38.000000000 -0400
+++ go/vt/worker/split_diff_cmd.go 2019-09-11 18:32:38.000000000 -0400
@@ -25,6 +25,7 @@
"strings"
"sync"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/proto/vtrpc"
"vitess.io/vitess/go/vt/vterrors"
diff -u go/vt/worker/tablet_provider.go.orig go/vt/worker/tablet_provider.go
--- go/vt/worker/tablet_provider.go.orig 2019-09-11 18:32:38.000000000 -0400
+++ go/vt/worker/tablet_provider.go 2019-09-11 18:32:38.000000000 -0400
@@ -19,6 +19,7 @@
import (
"fmt"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/vterrors"
"golang.org/x/net/context"
diff -u go/vt/worker/topo_utils.go.orig go/vt/worker/topo_utils.go
--- go/vt/worker/topo_utils.go.orig 2019-09-11 18:32:38.000000000 -0400
+++ go/vt/worker/topo_utils.go 2019-09-11 18:32:38.000000000 -0400
@@ -22,6 +22,7 @@
"math/rand"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/vterrors"
"golang.org/x/net/context"
diff -u go/vt/worker/utils_test.go.orig go/vt/worker/utils_test.go
--- go/vt/worker/utils_test.go.orig 2019-09-11 18:32:38.000000000 -0400
+++ go/vt/worker/utils_test.go 2019-09-11 18:32:38.000000000 -0400
@@ -22,6 +22,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql/fakesqldb"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/topo"
diff -u go/vt/worker/vertical_split_clone_cmd.go.orig go/vt/worker/vertical_split_clone_cmd.go
--- go/vt/worker/vertical_split_clone_cmd.go.orig 2019-09-11 18:32:39.000000000 -0400
+++ go/vt/worker/vertical_split_clone_cmd.go 2019-09-11 18:32:39.000000000 -0400
@@ -25,6 +25,7 @@
"strings"
"sync"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/proto/topodata"
"vitess.io/vitess/go/vt/vterrors"
diff -u go/vt/worker/vertical_split_diff.go.orig go/vt/worker/vertical_split_diff.go
--- go/vt/worker/vertical_split_diff.go.orig 2019-09-11 18:32:39.000000000 -0400
+++ go/vt/worker/vertical_split_diff.go 2019-09-11 18:32:39.000000000 -0400
@@ -21,6 +21,7 @@
"html/template"
"sync"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/vterrors"
"golang.org/x/net/context"
diff -u go/vt/worker/vertical_split_diff_cmd.go.orig go/vt/worker/vertical_split_diff_cmd.go
--- go/vt/worker/vertical_split_diff_cmd.go.orig 2019-09-11 18:32:39.000000000 -0400
+++ go/vt/worker/vertical_split_diff_cmd.go 2019-09-11 18:32:39.000000000 -0400
@@ -24,6 +24,7 @@
"strconv"
"sync"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/vterrors"
"golang.org/x/net/context"
diff -u go/vt/worker/vtworkerclienttest/client_testsuite.go.orig go/vt/worker/vtworkerclienttest/client_testsuite.go
--- go/vt/worker/vtworkerclienttest/client_testsuite.go.orig 2019-09-11 18:32:39.000000000 -0400
+++ go/vt/worker/vtworkerclienttest/client_testsuite.go 2019-09-11 18:32:39.000000000 -0400
@@ -34,6 +34,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/logutil"
"vitess.io/vitess/go/vt/topo/memorytopo"
"vitess.io/vitess/go/vt/vterrors"
diff -u go/vt/workflow/manager.go.orig go/vt/workflow/manager.go
--- go/vt/workflow/manager.go.orig 2019-09-11 18:32:39.000000000 -0400
+++ go/vt/workflow/manager.go 2019-09-11 18:32:39.000000000 -0400
@@ -26,6 +26,7 @@
gouuid "github.com/pborman/uuid"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/log"
"vitess.io/vitess/go/vt/topo"
diff -u go/vt/wrangler/cleaner.go.orig go/vt/wrangler/cleaner.go
--- go/vt/wrangler/cleaner.go.orig 2019-09-11 18:32:39.000000000 -0400
+++ go/vt/wrangler/cleaner.go 2019-09-11 18:32:39.000000000 -0400
@@ -22,6 +22,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/vt/concurrency"
"vitess.io/vitess/go/vt/topo"
"vitess.io/vitess/go/vt/topo/topoproto"
diff -u go/vt/wrangler/fake_tablet_test.go.orig go/vt/wrangler/fake_tablet_test.go
--- go/vt/wrangler/fake_tablet_test.go.orig 2019-09-11 18:32:39.000000000 -0400
+++ go/vt/wrangler/fake_tablet_test.go 2019-09-11 18:32:39.000000000 -0400
@@ -25,6 +25,7 @@
"golang.org/x/net/context"
"google.golang.org/grpc"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql/fakesqldb"
"vitess.io/vitess/go/vt/mysqlctl/fakemysqldaemon"
querypb "vitess.io/vitess/go/vt/proto/query"
diff -u go/vt/wrangler/keyspace.go.orig go/vt/wrangler/keyspace.go
--- go/vt/wrangler/keyspace.go.orig 2019-09-11 18:32:39.000000000 -0400
+++ go/vt/wrangler/keyspace.go 2019-09-11 18:32:39.000000000 -0400
@@ -25,6 +25,7 @@
"time"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/event"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/binlog/binlogplayer"
diff -u go/vt/wrangler/migrater.go.orig go/vt/wrangler/migrater.go
--- go/vt/wrangler/migrater.go.orig 2019-09-11 18:32:39.000000000 -0400
+++ go/vt/wrangler/migrater.go 2019-09-11 18:32:39.000000000 -0400
@@ -28,6 +28,7 @@
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/sync2"
"vitess.io/vitess/go/vt/binlog/binlogplayer"
diff -u go/vt/wrangler/reparent.go.orig go/vt/wrangler/reparent.go
--- go/vt/wrangler/reparent.go.orig 2019-09-11 18:32:39.000000000 -0400
+++ go/vt/wrangler/reparent.go 2019-09-11 18:32:39.000000000 -0400
@@ -26,6 +26,7 @@
"sync"
"time"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/event"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/sqlescape"
diff -u go/vt/wrangler/schema.go.orig go/vt/wrangler/schema.go
--- go/vt/wrangler/schema.go.orig 2019-09-11 18:32:39.000000000 -0400
+++ go/vt/wrangler/schema.go 2019-09-11 18:32:39.000000000 -0400
@@ -26,6 +26,7 @@
"golang.org/x/net/context"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/sync2"
"vitess.io/vitess/go/vt/concurrency"
diff -u go/vt/wrangler/testlib/fake_tablet.go.orig go/vt/wrangler/testlib/fake_tablet.go
--- go/vt/wrangler/testlib/fake_tablet.go.orig 2019-09-11 18:32:39.000000000 -0400
+++ go/vt/wrangler/testlib/fake_tablet.go 2019-09-11 18:32:39.000000000 -0400
@@ -30,6 +30,7 @@
"golang.org/x/net/context"
"google.golang.org/grpc"
+ "vitess.io/vitess/go/context2"
"vitess.io/vitess/go/mysql/fakesqldb"
"vitess.io/vitess/go/vt/mysqlctl/fakemysqldaemon"
"vitess.io/vitess/go/vt/topo"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment