Fix conflicts

Signed-off-by: Matt Lord <mattalord@gmail.com>

go/vt/vttablet/tabletmanager/vdiff/schema.go

@@ -36,16 +36,10 @@ const (
  vd.started_at as started_at, vdt.rows_compared as rows_compared, vd.completed_at as completed_at,
  IF(vdt.mismatch = 1, 1, 0) as has_mismatch, vdt.report as report
  from _vt.vdiff as vd left join _vt.vdiff_table as vdt on (vd.id = vdt.vdiff_id)
-<<<<<<< HEAD
  where vd.id = %d`
- // sqlUpdateVDiffState has a penultimate placeholder for any additional columns you want to update, e.g. `, foo = 1`
- sqlUpdateVDiffState = "update _vt.vdiff set state = %s, last_error = %s %s where id = %d"
-=======
- where vd.id = %a`
  // sqlUpdateVDiffState has a penultimate placeholder for any additional columns you want to update, e.g. `, foo = 1`.
  // It also truncates the error if needed to ensure that we can save the state when the error text is very long.
  sqlUpdateVDiffState = "update _vt.vdiff set state = %s, last_error = left(%s, 1024) %s where id = %d"
->>>>>>> 54f2daf05d (VDiff: wait for shard streams of one table diff to complete for before starting that of the next table (#14345))
  sqlUpdateVDiffStopped = `update _vt.vdiff as vd, _vt.vdiff_table as vdt set vd.state = 'stopped', vdt.state = 'stopped', vd.last_error = ''
  where vd.id = vdt.vdiff_id and vd.id = %d and vd.state != 'completed'`
  sqlGetVReplicationEntry = "select * from _vt.vreplication %s"

go/vt/vttablet/tabletmanager/vdiff/table_differ.go

@@ -24,11 +24,6 @@ import (
  "sync"
  "time"
 
- "vitess.io/vitess/go/vt/proto/topodata"
- vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
- "vitess.io/vitess/go/vt/sqlparser"
- "vitess.io/vitess/go/vt/topo"
-
  "google.golang.org/protobuf/encoding/prototext"
  "google.golang.org/protobuf/proto"
 
@@ -39,14 +34,8 @@ import (
  "vitess.io/vitess/go/vt/concurrency"
  "vitess.io/vitess/go/vt/discovery"
  "vitess.io/vitess/go/vt/log"
-<<<<<<< HEAD
- binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
- querypb "vitess.io/vitess/go/vt/proto/query"
- tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
-=======
  "vitess.io/vitess/go/vt/sqlparser"
  "vitess.io/vitess/go/vt/topo"
->>>>>>> 54f2daf05d (VDiff: wait for shard streams of one table diff to complete for before starting that of the next table (#14345))
  "vitess.io/vitess/go/vt/topo/topoproto"
  "vitess.io/vitess/go/vt/vterrors"
  "vitess.io/vitess/go/vt/vtgate/engine"
@@ -274,13 +263,8 @@ func (td *tableDiffer) selectTablets(ctx context.Context) error {
  return targetErr
 }
 
-<<<<<<< HEAD
-func pickTablet(ctx context.Context, ts *topo.Server, cells []string, keyspace, shard, tabletTypes string) (*topodata.Tablet, error) {
+func pickTablet(ctx context.Context, ts *topo.Server, cells []string, keyspace, shard, tabletTypes string) (*topodatapb.Tablet, error) {
  tp, err := discovery.NewTabletPicker(ts, cells, keyspace, shard, tabletTypes)
-=======
-func pickTablet(ctx context.Context, ts *topo.Server, cells []string, localCell, keyspace, shard, tabletTypes string) (*topodatapb.Tablet, error) {
- tp, err := discovery.NewTabletPicker(ctx, ts, cells, localCell, keyspace, shard, tabletTypes, discovery.TabletPickerOptions{})
->>>>>>> 54f2daf05d (VDiff: wait for shard streams of one table diff to complete for before starting that of the next table (#14345))
  if err != nil {
  return nil, err
  }