From 4c132917963af66b2b0ad984f5fa8c0e9b8a05de Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Wed, 16 Aug 2023 10:08:39 -0400 Subject: [PATCH] Resolve conflicts Signed-off-by: Matt Lord --- go/vt/vtgate/schema/tracker.go | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/go/vt/vtgate/schema/tracker.go b/go/vt/vtgate/schema/tracker.go index 3acefe20493..24fd3d77f57 100644 --- a/go/vt/vtgate/schema/tracker.go +++ b/go/vt/vtgate/schema/tracker.go @@ -21,26 +21,21 @@ import ( "sync" "time" -<<<<<<< HEAD - vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc" - "vitess.io/vitess/go/vt/sidecardb" - "vitess.io/vitess/go/vt/vterrors" - - "vitess.io/vitess/go/vt/callerid" - - "vitess.io/vitess/go/vt/vttablet/queryservice" + "golang.org/x/exp/maps" "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/sqltypes" - querypb "vitess.io/vitess/go/vt/proto/query" -======= - "golang.org/x/exp/maps" ->>>>>>> 24ea6f20b7 (vtgate: fix race condition iterating tables and views from schema tracker (#13673)) - + "vitess.io/vitess/go/vt/callerid" "vitess.io/vitess/go/vt/discovery" "vitess.io/vitess/go/vt/log" + "vitess.io/vitess/go/vt/sidecardb" "vitess.io/vitess/go/vt/sqlparser" + "vitess.io/vitess/go/vt/vterrors" "vitess.io/vitess/go/vt/vtgate/vindexes" + "vitess.io/vitess/go/vt/vttablet/queryservice" + + querypb "vitess.io/vitess/go/vt/proto/query" + vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc" ) type (