From f24c44f0d4552805cc49a9becb4ab70414b1d7c7 Mon Sep 17 00:00:00 2001 From: Mahdi Dibaiee Date: Wed, 31 Jul 2024 20:18:25 +0100 Subject: [PATCH] rename to estuary/vitess --- Makefile | 22 +- README.md | 2 +- changelog/16.0/16.0.0/release_notes.md | 2 +- changelog/16.0/16.0.0/summary.md | 2 +- changelog/17.0/17.0.0/changelog.md | 4 +- changelog/20.0/20.0.0/changelog.md | 2 +- changelog/20.0/20.0.0/release_notes.md | 4 +- changelog/20.0/20.0.0/summary.md | 4 +- doc/DockerBuild.md | 2 +- doc/viper/viper.md | 4 +- docker/bootstrap/Dockerfile.common | 14 +- docker/bootstrap/build.sh | 2 +- docker/lite/Dockerfile | 10 +- docker/lite/Dockerfile.percona80 | 6 +- docker/local/Dockerfile | 6 +- docker/mini/Dockerfile | 2 +- docker/test/run.sh | 12 +- docker/vttestserver/Dockerfile.mysql80 | 2 +- examples/compose/client.go | 2 +- examples/compose/vtcompose/vtcompose.go | 2 +- examples/demo/demo.go | 10 +- examples/local/vstream_client.go | 12 +- go.mod | 2 +- go/README.md | 4 +- go/acl/acl.go | 2 +- go/cache/theine/store.go | 2 +- go/cmd/internal/docgen/docgen.go | 4 +- go/cmd/mysqlctl/command/init.go | 2 +- go/cmd/mysqlctl/command/init_config.go | 2 +- .../command/plugin_prometheusbackend.go | 4 +- go/cmd/mysqlctl/command/position.go | 2 +- go/cmd/mysqlctl/command/reinit_config.go | 2 +- go/cmd/mysqlctl/command/root.go | 12 +- go/cmd/mysqlctl/command/shutdown.go | 2 +- go/cmd/mysqlctl/command/start.go | 4 +- go/cmd/mysqlctl/command/teardown.go | 2 +- go/cmd/mysqlctl/docgen/main.go | 4 +- go/cmd/mysqlctl/mysqlctl.go | 4 +- go/cmd/mysqlctld/cli/mysqlctld.go | 14 +- .../cli/plugin_grpcmysqlctlserver.go | 4 +- .../mysqlctld/cli/plugin_prometheusbackend.go | 4 +- go/cmd/mysqlctld/docgen/main.go | 4 +- go/cmd/mysqlctld/mysqlctld.go | 4 +- go/cmd/rulesctl/cmd/add.go | 6 +- go/cmd/rulesctl/cmd/explain.go | 2 +- go/cmd/rulesctl/cmd/list.go | 2 +- go/cmd/rulesctl/cmd/main.go | 4 +- go/cmd/rulesctl/cmd/remove.go | 2 +- go/cmd/rulesctl/common/common.go | 4 +- go/cmd/rulesctl/main.go | 10 +- go/cmd/topo2topo/cli/plugin_consultopo.go | 2 +- go/cmd/topo2topo/cli/plugin_etcd2topo.go | 2 +- go/cmd/topo2topo/cli/plugin_zk2topo.go | 2 +- go/cmd/topo2topo/cli/topo2topo.go | 14 +- go/cmd/topo2topo/docgen/main.go | 4 +- go/cmd/topo2topo/topo2topo.go | 6 +- go/cmd/vtaclcheck/cli/vtactlcheck.go | 8 +- go/cmd/vtaclcheck/docgen/main.go | 4 +- go/cmd/vtaclcheck/vtaclcheck.go | 6 +- go/cmd/vtadmin/main.go | 26 +- .../cli/plugin_azblobbackupstorage.go | 2 +- .../vtbackup/cli/plugin_cephbackupstorage.go | 2 +- go/cmd/vtbackup/cli/plugin_consultopo.go | 2 +- go/cmd/vtbackup/cli/plugin_etcd2topo.go | 2 +- .../vtbackup/cli/plugin_filebackupstorage.go | 2 +- .../vtbackup/cli/plugin_gcsbackupstorage.go | 2 +- go/cmd/vtbackup/cli/plugin_opentsdb.go | 2 +- .../vtbackup/cli/plugin_prometheusbackend.go | 4 +- go/cmd/vtbackup/cli/plugin_s3backupstorage.go | 2 +- go/cmd/vtbackup/cli/plugin_zk2topo.go | 2 +- go/cmd/vtbackup/cli/vtbackup.go | 38 +- go/cmd/vtbackup/docgen/main.go | 4 +- go/cmd/vtbackup/vtbackup.go | 6 +- go/cmd/vtbench/cli/vtbench.go | 16 +- go/cmd/vtbench/docgen/main.go | 4 +- go/cmd/vtbench/vtbench.go | 6 +- go/cmd/vtclient/cli/plugin_opentracing.go | 4 +- go/cmd/vtclient/cli/vtclient.go | 24 +- go/cmd/vtclient/cli/vtclient_test.go | 6 +- go/cmd/vtclient/docgen/main.go | 4 +- go/cmd/vtclient/vtclient.go | 4 +- go/cmd/vtcombo/cli/main.go | 50 +- go/cmd/vtcombo/cli/plugin_dbddl.go | 6 +- go/cmd/vtcombo/cli/plugin_grpcvtctldserver.go | 4 +- go/cmd/vtcombo/cli/plugin_grpcvtctlserver.go | 4 +- .../vtcombo/cli/plugin_grpcvtgateservice.go | 4 +- go/cmd/vtcombo/cli/plugin_opentracing.go | 4 +- go/cmd/vtcombo/cli/status.go | 8 +- go/cmd/vtcombo/cli/vschema_watcher.go | 8 +- go/cmd/vtcombo/docgen/main.go | 4 +- go/cmd/vtcombo/main.go | 6 +- go/cmd/vtctl/plugin_azblobbackupstorage.go | 2 +- go/cmd/vtctl/plugin_cephbackupstorage.go | 2 +- go/cmd/vtctl/plugin_filebackupstorage.go | 2 +- go/cmd/vtctl/plugin_gcsbackupstorage.go | 2 +- go/cmd/vtctl/plugin_grpctabletconn.go | 2 +- go/cmd/vtctl/plugin_grpctmclient.go | 2 +- go/cmd/vtctl/plugin_grpcvtgateconn.go | 2 +- go/cmd/vtctl/plugin_s3backupstorage.go | 2 +- go/cmd/vtctl/vtctl.go | 30 +- go/cmd/vtctl/vtctl_unix.go | 2 +- go/cmd/vtctl/vtctl_windows.go | 2 +- go/cmd/vtctlclient/main.go | 18 +- go/cmd/vtctlclient/plugin_grpcvtctlclient.go | 2 +- go/cmd/vtctld/cli/cli.go | 10 +- .../vtctld/cli/plugin_azblobbackupstorage.go | 2 +- go/cmd/vtctld/cli/plugin_cephbackupstorage.go | 2 +- go/cmd/vtctld/cli/plugin_consultopo.go | 2 +- go/cmd/vtctld/cli/plugin_etcd2topo.go | 2 +- go/cmd/vtctld/cli/plugin_filebackupstorage.go | 2 +- go/cmd/vtctld/cli/plugin_gcsbackupstorage.go | 2 +- go/cmd/vtctld/cli/plugin_grpctabletconn.go | 2 +- go/cmd/vtctld/cli/plugin_grpctmclient.go | 2 +- go/cmd/vtctld/cli/plugin_grpcvtctldserver.go | 4 +- go/cmd/vtctld/cli/plugin_grpcvtctlserver.go | 4 +- go/cmd/vtctld/cli/plugin_grpcvtgateconn.go | 2 +- go/cmd/vtctld/cli/plugin_opentracing.go | 4 +- go/cmd/vtctld/cli/plugin_opentsdb.go | 2 +- go/cmd/vtctld/cli/plugin_prometheusbackend.go | 4 +- go/cmd/vtctld/cli/plugin_s3backupstorage.go | 2 +- go/cmd/vtctld/cli/plugin_zk2topo.go | 2 +- go/cmd/vtctld/cli/schema.go | 16 +- go/cmd/vtctld/docgen/main.go | 4 +- go/cmd/vtctld/main.go | 4 +- go/cmd/vtctldclient/cli/awk.go | 8 +- go/cmd/vtctldclient/cli/cobra.go | 2 +- go/cmd/vtctldclient/cli/pflag.go | 4 +- go/cmd/vtctldclient/cli/query.go | 2 +- go/cmd/vtctldclient/cli/shards.go | 10 +- go/cmd/vtctldclient/cli/tablets.go | 4 +- go/cmd/vtctldclient/command/backups.go | 10 +- go/cmd/vtctldclient/command/cells.go | 6 +- .../command/keyspace_routing_rules.go | 8 +- go/cmd/vtctldclient/command/keyspaces.go | 18 +- go/cmd/vtctldclient/command/legacy_shim.go | 12 +- go/cmd/vtctldclient/command/onlineddl.go | 20 +- go/cmd/vtctldclient/command/query.go | 8 +- go/cmd/vtctldclient/command/reparents.go | 18 +- go/cmd/vtctldclient/command/root.go | 46 +- go/cmd/vtctldclient/command/root_test.go | 10 +- go/cmd/vtctldclient/command/routing_rules.go | 8 +- go/cmd/vtctldclient/command/schema.go | 18 +- go/cmd/vtctldclient/command/serving_graph.go | 4 +- .../command/shard_routing_rules.go | 8 +- go/cmd/vtctldclient/command/shards.go | 12 +- go/cmd/vtctldclient/command/tablets.go | 12 +- go/cmd/vtctldclient/command/throttler.go | 10 +- go/cmd/vtctldclient/command/topology.go | 4 +- go/cmd/vtctldclient/command/validate.go | 6 +- .../command/vreplication/common/cancel.go | 4 +- .../command/vreplication/common/complete.go | 4 +- .../command/vreplication/common/show.go | 4 +- .../command/vreplication/common/status.go | 4 +- .../vreplication/common/switchtraffic.go | 10 +- .../command/vreplication/common/update.go | 16 +- .../command/vreplication/common/utils.go | 20 +- .../command/vreplication/common/utils_test.go | 18 +- .../vreplication/lookupvindex/lookupvindex.go | 12 +- .../vreplication/materialize/create.go | 10 +- .../vreplication/materialize/materialize.go | 6 +- .../command/vreplication/migrate/migrate.go | 6 +- .../command/vreplication/mount/mount.go | 6 +- .../command/vreplication/movetables/create.go | 6 +- .../vreplication/movetables/movetables.go | 2 +- .../command/vreplication/reshard/create.go | 6 +- .../command/vreplication/reshard/reshard.go | 2 +- .../command/vreplication/vdiff/vdiff.go | 22 +- .../vreplication/vdiff/vdiff_env_test.go | 32 +- .../command/vreplication/vdiff/vdiff_test.go | 8 +- .../command/vreplication/workflow/delete.go | 6 +- .../command/vreplication/workflow/get.go | 6 +- .../command/vreplication/workflow/show.go | 6 +- .../command/vreplication/workflow/state.go | 16 +- .../command/vreplication/workflow/update.go | 16 +- .../command/vreplication/workflow/workflow.go | 4 +- go/cmd/vtctldclient/command/vschemas.go | 8 +- go/cmd/vtctldclient/docgen/main.go | 4 +- go/cmd/vtctldclient/main.go | 24 +- go/cmd/vtctldclient/plugin_grpcvtctlclient.go | 2 +- .../vtctldclient/plugin_grpcvtctldclient.go | 2 +- go/cmd/vtexplain/cli/vtexplain.go | 18 +- go/cmd/vtexplain/docgen/main.go | 4 +- go/cmd/vtexplain/vtexplain.go | 4 +- go/cmd/vtgate/cli/cli.go | 30 +- go/cmd/vtgate/cli/plugin_auth_clientcert.go | 4 +- go/cmd/vtgate/cli/plugin_auth_ldap.go | 6 +- go/cmd/vtgate/cli/plugin_auth_static.go | 4 +- go/cmd/vtgate/cli/plugin_auth_vault.go | 4 +- go/cmd/vtgate/cli/plugin_consultopo.go | 2 +- go/cmd/vtgate/cli/plugin_etcd2topo.go | 2 +- go/cmd/vtgate/cli/plugin_grpctabletconn.go | 2 +- go/cmd/vtgate/cli/plugin_grpcvtgateservice.go | 2 +- go/cmd/vtgate/cli/plugin_opentracing.go | 4 +- go/cmd/vtgate/cli/plugin_opentsdb.go | 2 +- go/cmd/vtgate/cli/plugin_prometheusbackend.go | 4 +- go/cmd/vtgate/cli/plugin_statsd.go | 2 +- go/cmd/vtgate/cli/plugin_zk2topo.go | 2 +- go/cmd/vtgate/cli/status.go | 8 +- go/cmd/vtgate/docgen/main.go | 4 +- go/cmd/vtgate/index.go | 2 +- go/cmd/vtgate/vtgate.go | 4 +- go/cmd/vtgateclienttest/cli/main.go | 8 +- .../cli/plugin_grpcvtgateservice.go | 2 +- go/cmd/vtgateclienttest/docgen/main.go | 4 +- go/cmd/vtgateclienttest/main.go | 6 +- go/cmd/vtgateclienttest/services/callerid.go | 12 +- go/cmd/vtgateclienttest/services/echo.go | 18 +- go/cmd/vtgateclienttest/services/errors.go | 12 +- go/cmd/vtgateclienttest/services/fallback.go | 12 +- go/cmd/vtgateclienttest/services/services.go | 2 +- go/cmd/vtgateclienttest/services/terminal.go | 16 +- go/cmd/vtorc/cli/cli.go | 14 +- go/cmd/vtorc/cli/plugin_consultopo.go | 2 +- go/cmd/vtorc/cli/plugin_etcd2topo.go | 2 +- go/cmd/vtorc/cli/plugin_grpctmclient.go | 2 +- go/cmd/vtorc/cli/plugin_prometheusbackend.go | 4 +- go/cmd/vtorc/cli/plugin_zk2topo.go | 2 +- go/cmd/vtorc/docgen/main.go | 4 +- go/cmd/vtorc/index.go | 2 +- go/cmd/vtorc/main.go | 4 +- go/cmd/vttablet/cli/cli.go | 42 +- .../cli/plugin_azblobbackupstorage.go | 2 +- .../vttablet/cli/plugin_cephbackupstorage.go | 2 +- go/cmd/vttablet/cli/plugin_consultopo.go | 2 +- go/cmd/vttablet/cli/plugin_etcd2topo.go | 2 +- .../vttablet/cli/plugin_filebackupstorage.go | 2 +- go/cmd/vttablet/cli/plugin_filecustomrule.go | 2 +- go/cmd/vttablet/cli/plugin_filelogger.go | 2 +- .../vttablet/cli/plugin_gcsbackupstorage.go | 2 +- .../vttablet/cli/plugin_grpcbinlogplayer.go | 2 +- .../vttablet/cli/plugin_grpcbinlogstreamer.go | 2 +- .../vttablet/cli/plugin_grpcqueryservice.go | 6 +- go/cmd/vttablet/cli/plugin_grpctabletconn.go | 2 +- .../cli/plugin_grpcthrottlerserver.go | 2 +- go/cmd/vttablet/cli/plugin_grpctmclient.go | 2 +- go/cmd/vttablet/cli/plugin_grpctmserver.go | 2 +- go/cmd/vttablet/cli/plugin_opentracing.go | 4 +- go/cmd/vttablet/cli/plugin_opentsdb.go | 2 +- .../vttablet/cli/plugin_prometheusbackend.go | 4 +- go/cmd/vttablet/cli/plugin_s3backupstorage.go | 2 +- go/cmd/vttablet/cli/plugin_statsd.go | 2 +- go/cmd/vttablet/cli/plugin_sysloglogger.go | 2 +- go/cmd/vttablet/cli/plugin_topocustomrule.go | 2 +- go/cmd/vttablet/cli/plugin_zk2topo.go | 2 +- go/cmd/vttablet/cli/status.go | 8 +- go/cmd/vttablet/docgen/main.go | 4 +- go/cmd/vttablet/index.go | 2 +- go/cmd/vttablet/vttablet.go | 4 +- go/cmd/vttestserver/cli/main.go | 10 +- go/cmd/vttestserver/cli/main_test.go | 22 +- go/cmd/vttestserver/docgen/main.go | 4 +- go/cmd/vttestserver/main.go | 4 +- go/cmd/vttlstest/cli/vttlstest.go | 2 +- go/cmd/vttlstest/docgen/main.go | 4 +- go/cmd/vttlstest/vttlstest.go | 6 +- go/cmd/zk/command/cat.go | 8 +- go/cmd/zk/command/chmod.go | 8 +- go/cmd/zk/command/edit.go | 4 +- go/cmd/zk/command/ls.go | 6 +- go/cmd/zk/command/rm.go | 6 +- go/cmd/zk/command/root.go | 10 +- go/cmd/zk/command/stat.go | 8 +- go/cmd/zk/command/touch.go | 4 +- go/cmd/zk/command/unzip.go | 2 +- go/cmd/zk/command/wait.go | 2 +- go/cmd/zk/command/watch.go | 4 +- go/cmd/zk/command/zip.go | 6 +- go/cmd/zk/docgen/main.go | 4 +- go/cmd/zk/internal/zkfilepath/zkfilepath.go | 2 +- go/cmd/zk/internal/zkfs/zkfs.go | 4 +- go/cmd/zk/zkcmd.go | 6 +- go/cmd/zkctl/command/root.go | 6 +- go/cmd/zkctl/docgen/main.go | 4 +- go/cmd/zkctl/zkctl.go | 6 +- go/cmd/zkctld/cli/zkctld.go | 10 +- go/cmd/zkctld/docgen/main.go | 4 +- go/cmd/zkctld/zkctld.go | 6 +- go/constants/sidecar/queries.go | 2 +- go/event/syslogger/fake_logger.go | 2 +- go/event/syslogger/syslogger.go | 6 +- go/event/syslogger/syslogger_test.go | 2 +- go/exit/exit.go | 4 +- go/flags/endtoend/flags_test.go | 2 +- go/flagutil/sets.go | 2 +- go/json2/marshal.go | 2 +- go/json2/marshal_test.go | 4 +- go/logstats/logger.go | 6 +- go/logstats/logger_test.go | 4 +- go/mysql/auth_server.go | 8 +- go/mysql/auth_server_clientcert.go | 2 +- go/mysql/auth_server_clientcert_test.go | 4 +- go/mysql/auth_server_none.go | 2 +- go/mysql/auth_server_static.go | 10 +- go/mysql/binlog/binlog_json.go | 12 +- go/mysql/binlog/binlog_json_test.go | 2 +- go/mysql/binlog/rbr.go | 8 +- go/mysql/binlog/rbr_test.go | 4 +- go/mysql/binlog_dump.go | 6 +- go/mysql/binlog_event.go | 6 +- go/mysql/binlog_event_common.go | 6 +- go/mysql/binlog_event_common_test.go | 2 +- go/mysql/binlog_event_compression.go | 4 +- go/mysql/binlog_event_filepos.go | 2 +- go/mysql/binlog_event_make.go | 2 +- go/mysql/binlog_event_make_test.go | 8 +- go/mysql/binlog_event_mariadb.go | 6 +- go/mysql/binlog_event_mariadb_test.go | 2 +- go/mysql/binlog_event_mysql56.go | 6 +- go/mysql/binlog_event_mysql56_test.go | 2 +- go/mysql/binlog_event_rbr.go | 10 +- go/mysql/binlog_event_test.go | 2 +- go/mysql/capabilities/capability.go | 4 +- go/mysql/charset.go | 6 +- go/mysql/client.go | 10 +- go/mysql/client_test.go | 6 +- go/mysql/collations/cached_size.go | 12 +- go/mysql/collations/charset/charset.go | 12 +- go/mysql/collations/charset/convert.go | 2 +- go/mysql/collations/charset/eightbit/8bit.go | 2 +- .../collations/charset/eightbit/binary.go | 2 +- .../collations/charset/eightbit/latin1.go | 2 +- go/mysql/collations/charset/japanese/sjis.go | 2 +- go/mysql/collations/charset/japanese/ujis.go | 2 +- go/mysql/collations/charset/korean/euckr.go | 2 +- .../charset/simplifiedchinese/gb18030.go | 2 +- .../charset/simplifiedchinese/gb2312.go | 2 +- go/mysql/collations/charset/unicode/utf16.go | 2 +- go/mysql/collations/charset/unicode/utf32.go | 2 +- go/mysql/collations/charset/unicode/utf8.go | 2 +- go/mysql/collations/colldata/8bit.go | 6 +- go/mysql/collations/colldata/cached_size.go | 4 +- go/mysql/collations/colldata/collation.go | 6 +- go/mysql/collations/colldata/golden_test.go | 4 +- go/mysql/collations/colldata/multibyte.go | 6 +- go/mysql/collations/colldata/mysqldata.go | 6 +- go/mysql/collations/colldata/uca.go | 8 +- .../colldata/uca_contraction_test.go | 4 +- .../collations/colldata/uca_tables_test.go | 4 +- go/mysql/collations/colldata/uca_test.go | 4 +- go/mysql/collations/colldata/unicase.go | 2 +- go/mysql/collations/colldata/unicode.go | 6 +- go/mysql/collations/colldata/wildcard.go | 2 +- go/mysql/collations/colldata/wildcard_test.go | 2 +- .../collations/integration/charset_test.go | 8 +- .../collations/integration/coercion_test.go | 8 +- .../collations/integration/collations_test.go | 12 +- .../collations/integration/helpers_test.go | 12 +- go/mysql/collations/integration/main_test.go | 8 +- .../integration/weight_string_test.go | 10 +- .../collations/integration/wildcard_test.go | 8 +- go/mysql/collations/internal/uca/collation.go | 2 +- .../collations/internal/uca/contractions.go | 2 +- go/mysql/collations/internal/uca/iter_900.go | 2 +- .../collations/internal/uca/iter_legacy.go | 2 +- go/mysql/collations/local.go | 2 +- go/mysql/collations/remote/charset.go | 6 +- go/mysql/collations/remote/collation.go | 14 +- .../tools/makecolldata/codegen/codegen.go | 2 +- .../tools/makecolldata/codegen/tablegen.go | 2 +- .../tools/makecolldata/contractions.go | 4 +- .../collations/tools/makecolldata/main.go | 10 +- .../tools/makecolldata/maketables.go | 8 +- .../tools/makecolldata/mysqldata.go | 8 +- .../tools/makecolldata/mysqlversions.go | 4 +- .../tools/maketestdata/maketestdata.go | 10 +- go/mysql/collations/vindex/collate/collate.go | 4 +- go/mysql/collations/vindex/collate/index.go | 2 +- go/mysql/collations/vindex/doc.go | 2 +- .../vindex/internal/colltab/table.go | 2 +- go/mysql/collations/vindex/unicode/doc.go | 2 +- .../vindex/unicode/norm/composition.go | 2 +- .../vindex/unicode/norm/normalize.go | 2 +- go/mysql/conn.go | 20 +- go/mysql/conn_params.go | 4 +- go/mysql/conn_params_test.go | 2 +- go/mysql/conn_test.go | 12 +- go/mysql/conn_unix.go | 2 +- go/mysql/constants.go | 2 +- go/mysql/constants_test.go | 2 +- go/mysql/datetime/datetime.go | 4 +- go/mysql/datetime/datetime_test.go | 4 +- go/mysql/datetime/interval.go | 4 +- go/mysql/datetime/interval_test.go | 2 +- go/mysql/datetime/parse.go | 4 +- go/mysql/datetime/parse_test.go | 2 +- go/mysql/datetime/time_zone.go | 4 +- go/mysql/decimal/cached_size.go | 2 +- go/mysql/decimal/helpers.go | 2 +- go/mysql/decimal/scan.go | 2 +- go/mysql/endtoend/client_test.go | 4 +- go/mysql/endtoend/main_test.go | 14 +- go/mysql/endtoend/query_benchmark_test.go | 6 +- go/mysql/endtoend/query_test.go | 10 +- go/mysql/endtoend/replication_test.go | 12 +- go/mysql/fakesqldb/server.go | 16 +- go/mysql/flavor.go | 14 +- go/mysql/flavor_filepos.go | 12 +- go/mysql/flavor_mariadb.go | 12 +- go/mysql/flavor_mysql.go | 12 +- go/mysql/flavor_mysql_legacy.go | 6 +- go/mysql/flavor_mysql_test.go | 2 +- go/mysql/flavor_mysqlgr.go | 10 +- go/mysql/flavor_mysqlgr_test.go | 8 +- go/mysql/flavor_test.go | 2 +- go/mysql/handshake_test.go | 8 +- go/mysql/icuregex/compiler.go | 14 +- go/mysql/icuregex/icu_test.go | 4 +- .../internal/normalizer/normalizer.go | 10 +- .../icuregex/internal/pattern/unescape.go | 2 +- go/mysql/icuregex/internal/ubidi/loader.go | 6 +- go/mysql/icuregex/internal/ucase/fold.go | 2 +- go/mysql/icuregex/internal/ucase/loader.go | 6 +- go/mysql/icuregex/internal/ucase/ucase.go | 2 +- go/mysql/icuregex/internal/uchar/loader.go | 6 +- go/mysql/icuregex/internal/uemoji/loader.go | 6 +- go/mysql/icuregex/internal/uemoji/uemoji.go | 2 +- go/mysql/icuregex/internal/ulayout/ulayout.go | 6 +- go/mysql/icuregex/internal/unames/loader.go | 4 +- go/mysql/icuregex/internal/uprops/loader.go | 4 +- .../icuregex/internal/uprops/properties.go | 22 +- go/mysql/icuregex/internal/uprops/uprops.go | 4 +- .../icuregex/internal/uprops/uprops_binary.go | 10 +- .../icuregex/internal/uprops/uprops_int.go | 8 +- go/mysql/icuregex/internal/uprops/uscript.go | 2 +- go/mysql/icuregex/internal/uset/close.go | 2 +- go/mysql/icuregex/internal/uset/pattern.go | 2 +- go/mysql/icuregex/internal/utrie/ucptrie.go | 2 +- go/mysql/icuregex/internal/utrie/utrie2.go | 4 +- go/mysql/icuregex/matcher.go | 6 +- go/mysql/icuregex/ops.go | 4 +- go/mysql/icuregex/pattern.go | 2 +- go/mysql/icuregex/sets.go | 4 +- go/mysql/json/cached_size.go | 10 +- go/mysql/json/helpers.go | 8 +- go/mysql/json/json_path.go | 8 +- go/mysql/json/marshal.go | 8 +- go/mysql/json/parser.go | 10 +- go/mysql/json/parser_test.go | 2 +- go/mysql/json/weights.go | 4 +- go/mysql/json/weights_test.go | 2 +- go/mysql/ldapauthserver/auth_server_ldap.go | 10 +- go/mysql/mysql_fuzzer.go | 10 +- go/mysql/query.go | 16 +- go/mysql/query_test.go | 8 +- go/mysql/register_replica.go | 4 +- go/mysql/replication.go | 6 +- go/mysql/replication/gtid.go | 4 +- go/mysql/replication/mariadb_gtid.go | 4 +- go/mysql/replication/mysql56_gtid.go | 4 +- go/mysql/replication/mysql56_gtid_set.go | 4 +- go/mysql/replication/primary_status.go | 6 +- go/mysql/replication/replication_position.go | 4 +- go/mysql/replication/replication_status.go | 6 +- go/mysql/replication_test.go | 2 +- go/mysql/schema.go | 6 +- go/mysql/server.go | 26 +- go/mysql/server_test.go | 26 +- go/mysql/sqlerror/sql_error.go | 4 +- go/mysql/sqlerror/sql_error_test.go | 4 +- go/mysql/streaming_query.go | 8 +- go/mysql/vault/auth_server_vault.go | 6 +- go/pools/numbered.go | 2 +- go/pools/refresh_pool.go | 2 +- go/pools/resource_pool.go | 8 +- .../benchmarking/legacy/refresh_pool.go | 2 +- .../benchmarking/legacy/resource_pool.go | 10 +- .../smartconnpool/benchmarking/load_test.go | 4 +- go/pools/smartconnpool/cached_size.go | 2 +- go/pools/smartconnpool/pool.go | 8 +- go/pools/smartconnpool/stack.go | 2 +- go/pools/smartconnpool/waitlist.go | 2 +- go/protoutil/binlogsource.go | 2 +- go/protoutil/binlogsource_test.go | 2 +- go/protoutil/duration.go | 2 +- go/protoutil/duration_test.go | 2 +- go/protoutil/time.go | 2 +- go/protoutil/time_test.go | 4 +- go/sqltypes/bind_variables.go | 2 +- go/sqltypes/bind_variables_test.go | 2 +- go/sqltypes/cached_size.go | 6 +- go/sqltypes/cast.go | 4 +- go/sqltypes/cast_test.go | 4 +- go/sqltypes/event_token.go | 2 +- go/sqltypes/event_token_test.go | 2 +- go/sqltypes/marshal.go | 14 +- go/sqltypes/marshal_test.go | 4 +- go/sqltypes/named_result.go | 2 +- go/sqltypes/named_result_test.go | 2 +- go/sqltypes/parse_rows.go | 2 +- go/sqltypes/proto3.go | 4 +- go/sqltypes/proto3_test.go | 6 +- go/sqltypes/query_response.go | 2 +- go/sqltypes/result.go | 2 +- go/sqltypes/result_test.go | 4 +- go/sqltypes/testing.go | 2 +- go/sqltypes/type.go | 2 +- go/sqltypes/type_test.go | 2 +- go/sqltypes/value.go | 16 +- go/sqltypes/value_test.go | 4 +- go/stats/counter.go | 2 +- go/stats/export.go | 2 +- go/stats/opentsdb/backend.go | 2 +- go/stats/opentsdb/backend_test.go | 2 +- go/stats/opentsdb/collector.go | 2 +- go/stats/opentsdb/flags.go | 2 +- go/stats/opentsdb/init.go | 6 +- go/stats/opentsdb/opentsdb_test.go | 2 +- go/stats/prometheusbackend/collectors.go | 4 +- go/stats/prometheusbackend/collectors_test.go | 2 +- .../prometheusbackend/prometheusbackend.go | 6 +- .../prometheusbackend_test.go | 2 +- go/stats/statsd/statsd.go | 6 +- go/stats/statsd/statsd_test.go | 2 +- go/streamlog/streamlog.go | 8 +- go/streamlog/streamlog_test.go | 2 +- go/streamlog/streamlog_windows.go | 2 +- go/sync2/consolidator.go | 4 +- go/sync2/consolidator_test.go | 2 +- go/sync2/fake_consolidator.go | 2 +- .../backup/mysqlctld/backup_mysqlctld_test.go | 4 +- .../endtoend/backup/pitr/backup_pitr_test.go | 2 +- .../backup_pitr_xtrabackup_test.go | 2 +- .../backup/vtbackup/backup_only_test.go | 10 +- go/test/endtoend/backup/vtbackup/main_test.go | 6 +- .../backup/vtctlbackup/backup_test.go | 2 +- .../backup/vtctlbackup/backup_utils.go | 26 +- .../backup/vtctlbackup/pitr_test_framework.go | 6 +- .../backup/xtrabackup/xtrabackup_test.go | 4 +- .../xtrabackup_stream_test.go | 4 +- go/test/endtoend/cellalias/cell_alias_test.go | 4 +- go/test/endtoend/cluster/cluster_process.go | 34 +- go/test/endtoend/cluster/cluster_util.go | 14 +- go/test/endtoend/cluster/mysqlctl_process.go | 10 +- go/test/endtoend/cluster/mysqlctld_process.go | 4 +- go/test/endtoend/cluster/topo_process.go | 10 +- go/test/endtoend/cluster/vtbackup_process.go | 2 +- go/test/endtoend/cluster/vtctl_process.go | 2 +- .../endtoend/cluster/vtctlclient_process.go | 4 +- go/test/endtoend/cluster/vtctld_process.go | 2 +- .../endtoend/cluster/vtctldclient_process.go | 12 +- go/test/endtoend/cluster/vtgate_process.go | 8 +- go/test/endtoend/cluster/vtorc_process.go | 2 +- go/test/endtoend/cluster/vttablet_process.go | 10 +- .../endtoend/clustertest/add_keyspace_test.go | 8 +- go/test/endtoend/clustertest/etcd_test.go | 2 +- go/test/endtoend/clustertest/main_test.go | 4 +- go/test/endtoend/clustertest/vtctld_test.go | 4 +- go/test/endtoend/clustertest/vtgate_test.go | 6 +- go/test/endtoend/clustertest/vttablet_test.go | 2 +- go/test/endtoend/docker/vttestserver.go | 2 +- go/test/endtoend/docker/vttestserver_test.go | 6 +- .../encrypted_replication_test.go | 8 +- .../encrypted_transport_test.go | 20 +- go/test/endtoend/keyspace/keyspace_test.go | 12 +- go/test/endtoend/messaging/main_test.go | 4 +- go/test/endtoend/messaging/message_test.go | 18 +- go/test/endtoend/migration/migration_test.go | 12 +- go/test/endtoend/mysqlctl/mysqlctl_test.go | 4 +- go/test/endtoend/mysqlctld/mysqlctld_test.go | 8 +- go/test/endtoend/mysqlserver/main_test.go | 4 +- .../endtoend/mysqlserver/mysql_server_test.go | 6 +- go/test/endtoend/onlineddl/exec_util.go | 2 +- .../onlineddl/flow/onlineddl_flow_test.go | 18 +- go/test/endtoend/onlineddl/query_util.go | 2 +- .../onlineddl/revert/onlineddl_revert_test.go | 16 +- .../scheduler/onlineddl_scheduler_test.go | 22 +- .../onlineddl/vrepl/onlineddl_vrepl_test.go | 18 +- .../onlineddl_vrepl_mini_stress_test.go | 14 +- .../onlineddl_vrepl_stress_suite_test.go | 18 +- .../vrepl_suite/onlineddl_vrepl_suite_test.go | 18 +- go/test/endtoend/onlineddl/vtctlutil.go | 2 +- go/test/endtoend/onlineddl/vtgate_util.go | 12 +- go/test/endtoend/onlineddl/vttablet_util.go | 8 +- go/test/endtoend/preparestmt/main_test.go | 2 +- .../endtoend/preparestmt/stmt_methods_test.go | 2 +- .../endtoend/recovery/pitr/binlog_server.go | 2 +- .../recovery/pitr/shardedpitr_test.go | 16 +- go/test/endtoend/recovery/recovery_util.go | 4 +- .../recovery/unshardedrecovery/recovery.go | 10 +- .../unshardedrecovery/recovery_test.go | 2 +- .../recovery/xtrabackup/recovery_test.go | 6 +- .../reparent/emergencyreparent/ers_test.go | 8 +- .../reparent/newfeaturetest/reparent_test.go | 6 +- .../reparent_range_based_test.go | 4 +- .../reparent/plannedreparent/reparent_test.go | 10 +- .../endtoend/reparent/prscomplex/main_test.go | 8 +- .../reparent/prssettingspool/main_test.go | 8 +- go/test/endtoend/reparent/utils/utils.go | 16 +- .../vrepl/schemadiff_vrepl_suite_test.go | 14 +- .../endtoend/sharded/sharded_keyspace_test.go | 6 +- go/test/endtoend/stress/stress_test.go | 6 +- .../buffer/buffer_test_helpers.go | 8 +- .../buffer/reparent/failover_buffer_test.go | 6 +- .../buffer/reshard/sharded_buffer_test.go | 10 +- go/test/endtoend/tabletgateway/main_test.go | 4 +- go/test/endtoend/tabletgateway/vtgate_test.go | 12 +- .../endtoend/tabletmanager/commands_test.go | 10 +- .../tabletmanager/custom_rule_topo_test.go | 6 +- .../tabletmanager/lock_unlock_test.go | 6 +- go/test/endtoend/tabletmanager/main_test.go | 8 +- .../tabletmanager/primary/tablet_test.go | 4 +- go/test/endtoend/tabletmanager/qps_test.go | 6 +- .../replication_manager/tablet_test.go | 10 +- .../tabletmanager/tablegc/tablegc_test.go | 16 +- .../tabletmanager/tablet_health_test.go | 10 +- .../tablet_security_policy_test.go | 2 +- go/test/endtoend/tabletmanager/tablet_test.go | 4 +- .../throttler_topo/throttler_test.go | 16 +- go/test/endtoend/throttler/util.go | 16 +- go/test/endtoend/topoconncache/main_test.go | 2 +- .../topoconncache/topo_conn_cache_test.go | 2 +- go/test/endtoend/topotest/consul/main_test.go | 12 +- go/test/endtoend/topotest/etcd2/main_test.go | 14 +- go/test/endtoend/topotest/zk2/main_test.go | 14 +- go/test/endtoend/utils/cmp.go | 4 +- go/test/endtoend/utils/mysql.go | 16 +- go/test/endtoend/utils/mysql_test.go | 10 +- .../endtoend/utils/mysqlvsvitess/main_test.go | 6 +- go/test/endtoend/utils/utils.go | 6 +- go/test/endtoend/vault/vault_server.go | 2 +- go/test/endtoend/vault/vault_test.go | 8 +- .../endtoend/versionupgrade/upgrade_test.go | 4 +- go/test/endtoend/vreplication/cluster_test.go | 16 +- .../fk_ext_load_generator_test.go | 8 +- go/test/endtoend/vreplication/fk_ext_test.go | 6 +- go/test/endtoend/vreplication/fk_test.go | 10 +- go/test/endtoend/vreplication/helper_test.go | 28 +- .../vreplication/initial_data_test.go | 2 +- go/test/endtoend/vreplication/migrate_test.go | 4 +- .../vreplication/movetables_buffering_test.go | 4 +- .../vreplication/multi_tenant_test.go | 8 +- .../partial_movetables_seq_test.go | 8 +- .../vreplication/partial_movetables_test.go | 4 +- .../endtoend/vreplication/performance_test.go | 2 +- .../resharding_workflows_v2_test.go | 12 +- .../endtoend/vreplication/sidecardb_test.go | 2 +- .../endtoend/vreplication/time_zone_test.go | 6 +- go/test/endtoend/vreplication/vdiff2_test.go | 12 +- .../vreplication/vdiff_helper_test.go | 10 +- .../vdiff_multiple_movetables_test.go | 4 +- .../vreplication/vdiff_online_ddl_test.go | 8 +- .../vreplication/vreplication_test.go | 30 +- .../vreplication_vtctldclient_cli_test.go | 16 +- .../vreplication/vschema_load_test.go | 10 +- go/test/endtoend/vreplication/vstream_test.go | 16 +- .../endtoend/vreplication/wrappers_test.go | 4 +- .../vtcombo/recreate/recreate_test.go | 8 +- .../endtoend/vtcombo/vttest_sample_test.go | 10 +- go/test/endtoend/vtctldclient/cli_test.go | 10 +- .../vtgate/concurrentdml/main_test.go | 6 +- .../endtoend/vtgate/consolidator/main_test.go | 8 +- .../vtgate/createdb_plugin/main_test.go | 6 +- .../vtgate/errors_as_warnings/main_test.go | 8 +- .../vtgate/foreignkey/fk_fuzz_test.go | 8 +- go/test/endtoend/vtgate/foreignkey/fk_test.go | 12 +- .../endtoend/vtgate/foreignkey/main_test.go | 6 +- .../foreignkey/stress/fk_stress_test.go | 22 +- .../endtoend/vtgate/foreignkey/utils_test.go | 8 +- .../endtoend/vtgate/gen4/column_name_test.go | 6 +- go/test/endtoend/vtgate/gen4/gen4_test.go | 4 +- go/test/endtoend/vtgate/gen4/main_test.go | 8 +- .../vtgate/gen4/system_schema_test.go | 6 +- go/test/endtoend/vtgate/godriver/main_test.go | 6 +- go/test/endtoend/vtgate/grpc_api/acl_test.go | 4 +- .../endtoend/vtgate/grpc_api/execute_test.go | 10 +- go/test/endtoend/vtgate/grpc_api/main_test.go | 2 +- .../keyspace_watches/keyspace_watch_test.go | 4 +- go/test/endtoend/vtgate/lookup_test.go | 6 +- go/test/endtoend/vtgate/main_test.go | 6 +- go/test/endtoend/vtgate/misc_test.go | 8 +- go/test/endtoend/vtgate/mysql80/main_test.go | 6 +- go/test/endtoend/vtgate/mysql80/misc_test.go | 6 +- .../vtgate/partialfailure/main_test.go | 6 +- .../endtoend/vtgate/prefixfanout/main_test.go | 6 +- .../queries/aggregation/aggregation_test.go | 6 +- .../queries/aggregation/distinct_test.go | 2 +- .../vtgate/queries/aggregation/main_test.go | 6 +- .../queries/benchmark/benchmark_test.go | 2 +- .../vtgate/queries/benchmark/main_test.go | 6 +- .../vtgate/queries/derived/cte_test.go | 2 +- .../vtgate/queries/derived/derived_test.go | 4 +- .../vtgate/queries/derived/main_test.go | 6 +- .../endtoend/vtgate/queries/dml/dml_test.go | 6 +- .../vtgate/queries/dml/insert_test.go | 4 +- .../endtoend/vtgate/queries/dml/main_test.go | 8 +- .../queries/foundrows/found_rows_test.go | 4 +- .../vtgate/queries/foundrows/main_test.go | 6 +- .../informationschema_test.go | 6 +- .../queries/informationschema/main_test.go | 6 +- .../endtoend/vtgate/queries/kill/kill_test.go | 4 +- .../endtoend/vtgate/queries/kill/main_test.go | 8 +- .../queries/lookup_queries/main_test.go | 8 +- .../endtoend/vtgate/queries/misc/main_test.go | 6 +- .../endtoend/vtgate/queries/misc/misc_test.go | 4 +- .../vtgate/queries/no_scatter/main_test.go | 4 +- .../vtgate/queries/no_scatter/queries_test.go | 6 +- .../vtgate/queries/normalize/main_test.go | 4 +- .../queries/normalize/normalize_test.go | 6 +- .../vtgate/queries/orderby/main_test.go | 6 +- .../vtgate/queries/orderby/orderby_test.go | 4 +- .../without_schematracker/main_test.go | 6 +- .../without_schematracker/orderby_test.go | 4 +- .../vtgate/queries/random/main_test.go | 6 +- .../vtgate/queries/random/query_gen.go | 6 +- .../vtgate/queries/random/random_expr_test.go | 4 +- .../vtgate/queries/random/random_test.go | 8 +- .../vtgate/queries/random/simplifier_test.go | 14 +- .../vtgate/queries/reference/main_test.go | 8 +- .../queries/reference/reference_test.go | 6 +- .../vtgate/queries/subquery/main_test.go | 6 +- .../vtgate/queries/subquery/subquery_test.go | 4 +- .../vtgate/queries/timeout/main_test.go | 6 +- .../vtgate/queries/timeout/timeout_test.go | 4 +- .../endtoend/vtgate/queries/tpch/main_test.go | 6 +- .../endtoend/vtgate/queries/tpch/tpch_test.go | 4 +- .../vtgate/queries/union/main_test.go | 6 +- .../vtgate/queries/union/union_test.go | 4 +- .../vtgate/queries/vexplain/main_test.go | 6 +- .../vtgate/queries/vexplain/vexplain_test.go | 8 +- .../vtgate/readafterwrite/raw_test.go | 6 +- .../vtgate/reservedconn/get_lock_test.go | 4 +- .../endtoend/vtgate/reservedconn/main_test.go | 8 +- .../reservedconn/reconnect1/main_test.go | 6 +- .../reservedconn/reconnect2/main_test.go | 6 +- .../reservedconn/reconnect3/main_test.go | 6 +- .../reservedconn/reconnect4/main_test.go | 6 +- .../vtgate/reservedconn/sysvar_test.go | 8 +- .../endtoend/vtgate/reservedconn/udv_test.go | 8 +- go/test/endtoend/vtgate/schema/schema_test.go | 2 +- .../loadkeyspace/schema_load_keyspace_test.go | 4 +- .../restarttablet/schema_restart_test.go | 6 +- .../schematracker/sharded/st_sharded_test.go | 8 +- .../sharded_prs/st_sharded_test.go | 8 +- .../unsharded/st_unsharded_test.go | 8 +- go/test/endtoend/vtgate/sec_vind/main_test.go | 6 +- go/test/endtoend/vtgate/sequence/seq_test.go | 8 +- .../tablet_healthcheck/reparent_test.go | 4 +- .../correctness_test.go | 4 +- .../vtgate/transaction/restart/main_test.go | 6 +- .../rollback/txn_rollback_shutdown_test.go | 6 +- .../vtgate/transaction/single/main_test.go | 8 +- .../vtgate/transaction/twopc/main_test.go | 16 +- .../vtgate/transaction/twopc/twopc_test.go | 10 +- .../endtoend/vtgate/transaction/tx_test.go | 6 +- .../endtoend/vtgate/unsharded/main_test.go | 12 +- .../vtgate/vindex_bindvars/main_test.go | 6 +- .../endtoend/vtgate/vschema/vschema_test.go | 6 +- go/test/endtoend/vtorc/api/api_test.go | 4 +- go/test/endtoend/vtorc/api/main_test.go | 4 +- go/test/endtoend/vtorc/general/main_test.go | 4 +- go/test/endtoend/vtorc/general/vtorc_test.go | 12 +- .../vtorc/primaryfailure/main_test.go | 4 +- .../primaryfailure/primary_failure_test.go | 6 +- .../vtorc/readtopologyinstance/main_test.go | 14 +- go/test/endtoend/vtorc/utils/utils.go | 20 +- go/test/fuzzing/ast_fuzzer.go | 2 +- .../autogenerate/convert_grep_to_fuzzer.go | 74 +- go/test/fuzzing/oss_fuzz_build.sh | 54 +- go/test/fuzzing/parser_fuzzer.go | 4 +- go/test/fuzzing/tablet_manager_fuzzer.go | 18 +- go/test/fuzzing/tabletserver_rules_fuzzer.go | 2 +- go/test/fuzzing/tabletserver_schema_fuzzer.go | 16 +- go/test/fuzzing/vt_schema_fuzzer.go | 4 +- go/test/fuzzing/vtctl_fuzzer.go | 16 +- go/test/fuzzing/vttablet_fuzzer.go | 8 +- go/test/stress/stress.go | 2 +- go/test/stress/utils.go | 4 +- go/test/utils/noleak.go | 12 +- go/test/vschemawrapper/vschema_wrapper.go | 30 +- go/textutil/strings.go | 6 +- go/textutil/strings_test.go | 4 +- go/tools/astfmtgen/main.go | 2 +- go/tools/asthelpergen/asthelpergen.go | 6 +- go/tools/asthelpergen/asthelpergen_test.go | 2 +- go/tools/asthelpergen/integration/types.go | 2 +- go/tools/asthelpergen/main/main.go | 4 +- go/tools/ci-config/main.go | 4 +- go/tools/codegen/goimports.go | 2 +- go/tools/release-notes/release_notes_test.go | 2 +- go/tools/sizegen/integration/cached_size.go | 16 +- .../sizegen/integration/integration_test.go | 2 +- go/tools/sizegen/sizegen.go | 16 +- go/tools/sizegen/sizegen_test.go | 2 +- go/trace/logger.go | 2 +- go/trace/opentracing.go | 2 +- go/trace/plugin_datadog.go | 2 +- go/trace/plugin_jaeger.go | 4 +- go/trace/trace.go | 6 +- go/trace/trace_test.go | 2 +- go/trace/utils.go | 2 +- go/viperutil/config.go | 8 +- go/viperutil/debug/debug.go | 2 +- go/viperutil/debug/handler.go | 6 +- go/viperutil/errors.go | 4 +- go/viperutil/funcs/get_test.go | 6 +- go/viperutil/internal/log/log.go | 2 +- go/viperutil/internal/registry/registry.go | 2 +- go/viperutil/internal/sync/sync.go | 6 +- go/viperutil/internal/sync/sync_test.go | 6 +- go/viperutil/internal/value/value.go | 8 +- go/viperutil/value.go | 2 +- go/viperutil/viper.go | 8 +- go/viperutil/vipertest/stub.go | 4 +- go/vt/binlog/binlog_connection.go | 12 +- go/vt/binlog/binlog_streamer.go | 26 +- go/vt/binlog/binlog_streamer_rbr_test.go | 20 +- go/vt/binlog/binlog_streamer_test.go | 12 +- go/vt/binlog/binlogplayer/binlog_player.go | 30 +- .../binlog/binlogplayer/binlog_player_test.go | 14 +- go/vt/binlog/binlogplayer/client.go | 8 +- go/vt/binlog/binlogplayer/dbclient.go | 16 +- go/vt/binlog/binlogplayer/fake_dbclient.go | 2 +- go/vt/binlog/binlogplayer/framework_test.go | 6 +- go/vt/binlog/binlogplayer/mock_dbclient.go | 4 +- go/vt/binlog/binlogplayertest/player.go | 10 +- go/vt/binlog/eventtoken/compare.go | 4 +- go/vt/binlog/eventtoken/compare_test.go | 2 +- go/vt/binlog/grpcbinlogplayer/player.go | 14 +- go/vt/binlog/grpcbinlogplayer/player_test.go | 8 +- go/vt/binlog/grpcbinlogstreamer/streamer.go | 8 +- go/vt/binlog/keyrange_filter.go | 10 +- go/vt/binlog/keyspace_id_resolver.go | 12 +- go/vt/binlog/tables_filter.go | 6 +- go/vt/binlog/tables_filter_test.go | 4 +- go/vt/binlog/updatestream.go | 4 +- go/vt/binlog/updatestreamctl.go | 22 +- go/vt/callerid/callerid.go | 4 +- go/vt/callerid/testsuite/callerid_test.go | 6 +- go/vt/callerid/testsuite/testsuite.go | 6 +- go/vt/callinfo/callinfo_test.go | 2 +- go/vt/callinfo/plugin_mysql.go | 2 +- go/vt/concurrency/error_recorder.go | 2 +- go/vt/dbconfigs/credentials.go | 6 +- go/vt/dbconfigs/dbconfigs.go | 16 +- go/vt/dbconfigs/dbconfigs_test.go | 6 +- go/vt/dbconnpool/connection.go | 10 +- go/vt/dbconnpool/connection_pool.go | 8 +- go/vt/discovery/fake_healthcheck.go | 18 +- go/vt/discovery/healthcheck.go | 26 +- go/vt/discovery/healthcheck_test.go | 24 +- go/vt/discovery/keyspace_events.go | 22 +- go/vt/discovery/keyspace_events_test.go | 12 +- go/vt/discovery/replicationlag.go | 4 +- go/vt/discovery/replicationlag_test.go | 6 +- go/vt/discovery/tablet_health.go | 8 +- go/vt/discovery/tablet_health_check.go | 20 +- go/vt/discovery/tablet_picker.go | 24 +- go/vt/discovery/tablet_picker_test.go | 10 +- go/vt/discovery/tablets_cache_status.go | 6 +- go/vt/discovery/topology_watcher.go | 14 +- go/vt/discovery/topology_watcher_test.go | 10 +- go/vt/discovery/utils.go | 4 +- go/vt/dtids/dtids.go | 10 +- go/vt/dtids/dtids_test.go | 6 +- go/vt/events/status_test.go | 2 +- go/vt/external/golib/sqlutils/sqlutils.go | 2 +- go/vt/grpcclient/client.go | 10 +- go/vt/grpcclient/client_auth_static.go | 2 +- go/vt/grpcclient/client_test.go | 4 +- go/vt/grpcclient/glogger.go | 2 +- go/vt/grpccommon/options.go | 2 +- go/vt/grpcoptionaltls/server_test.go | 2 +- go/vt/hook/hook.go | 4 +- go/vt/hook/hook_test.go | 2 +- go/vt/key/cached_size.go | 4 +- go/vt/key/destination.go | 6 +- go/vt/key/destination_test.go | 2 +- go/vt/key/key.go | 2 +- go/vt/key/key_test.go | 2 +- go/vt/logutil/console_logger.go | 2 +- go/vt/logutil/flush.go | 2 +- go/vt/logutil/flush_glog.go | 2 +- go/vt/logutil/level.go | 2 +- go/vt/logutil/logger.go | 4 +- go/vt/logutil/logger_test.go | 6 +- go/vt/logutil/logutil.go | 2 +- go/vt/logutil/proto3.go | 2 +- go/vt/logutil/purge.go | 2 +- go/vt/logutil/throttled.go | 2 +- go/vt/mysqlctl/azblobbackupstorage/azblob.go | 10 +- go/vt/mysqlctl/backup.go | 20 +- go/vt/mysqlctl/backup_blackbox_test.go | 34 +- go/vt/mysqlctl/backup_test.go | 16 +- go/vt/mysqlctl/backupengine.go | 20 +- go/vt/mysqlctl/backupstats/deprecated.go | 2 +- go/vt/mysqlctl/backupstats/stats.go | 2 +- go/vt/mysqlctl/backupstats/stats_test.go | 2 +- go/vt/mysqlctl/backupstorage/interface.go | 4 +- go/vt/mysqlctl/backupstorage/params.go | 6 +- go/vt/mysqlctl/binlogs_gtid.go | 6 +- go/vt/mysqlctl/binlogs_gtid_test.go | 2 +- go/vt/mysqlctl/builtinbackupengine.go | 36 +- go/vt/mysqlctl/builtinbackupengine_test.go | 2 +- go/vt/mysqlctl/cephbackupstorage/ceph.go | 8 +- go/vt/mysqlctl/cmd.go | 4 +- go/vt/mysqlctl/compression.go | 6 +- go/vt/mysqlctl/compression_benchmark_test.go | 4 +- go/vt/mysqlctl/compression_test.go | 2 +- go/vt/mysqlctl/fakebackupengine.go | 4 +- go/vt/mysqlctl/fakebackupstorage.go | 4 +- go/vt/mysqlctl/fakemysqldaemon.go | 24 +- go/vt/mysqlctl/filebackupstorage/file.go | 10 +- go/vt/mysqlctl/filebackupstorage/file_test.go | 2 +- go/vt/mysqlctl/gcsbackupstorage/gcs.go | 8 +- go/vt/mysqlctl/grpcmysqlctlclient/client.go | 6 +- go/vt/mysqlctl/grpcmysqlctlserver/server.go | 6 +- go/vt/mysqlctl/mycnf_flag.go | 4 +- go/vt/mysqlctl/mycnf_gen.go | 4 +- go/vt/mysqlctl/mycnf_test.go | 6 +- go/vt/mysqlctl/mysql_daemon.go | 20 +- go/vt/mysqlctl/mysqlctlclient/interface.go | 6 +- go/vt/mysqlctl/mysqlctlproto/backup.go | 8 +- go/vt/mysqlctl/mysqlctlproto/backup_test.go | 10 +- go/vt/mysqlctl/mysqld.go | 32 +- go/vt/mysqlctl/mysqld_test.go | 6 +- go/vt/mysqlctl/permissions.go | 4 +- go/vt/mysqlctl/permissions_test.go | 4 +- go/vt/mysqlctl/plugin_grpcmysqlctlclient.go | 2 +- go/vt/mysqlctl/query.go | 8 +- go/vt/mysqlctl/redo_log_test.go | 6 +- go/vt/mysqlctl/reparent.go | 8 +- go/vt/mysqlctl/reparent_test.go | 8 +- go/vt/mysqlctl/replication.go | 20 +- go/vt/mysqlctl/replication_test.go | 10 +- go/vt/mysqlctl/s3backupstorage/s3.go | 10 +- go/vt/mysqlctl/s3backupstorage/s3_test.go | 6 +- go/vt/mysqlctl/schema.go | 22 +- go/vt/mysqlctl/schema_test.go | 12 +- go/vt/mysqlctl/tabledefinitions_test.go | 2 +- go/vt/mysqlctl/tmutils/permissions.go | 8 +- go/vt/mysqlctl/tmutils/permissions_test.go | 6 +- go/vt/mysqlctl/tmutils/schema.go | 8 +- go/vt/mysqlctl/tmutils/schema_test.go | 2 +- go/vt/mysqlctl/xtrabackupengine.go | 16 +- go/vt/mysqlctl/xtrabackupengine_test.go | 4 +- go/vt/proto/binlogdata/binlogdata.pb.go | 6 +- .../proto/binlogdata/binlogdata_vtproto.pb.go | 6 +- go/vt/proto/binlogservice/binlogservice.pb.go | 2 +- .../binlogservice/binlogservice_grpc.pb.go | 2 +- go/vt/proto/logutil/logutil.pb.go | 2 +- go/vt/proto/logutil/logutil_vtproto.pb.go | 2 +- go/vt/proto/mysqlctl/mysqlctl.pb.go | 4 +- go/vt/proto/mysqlctl/mysqlctl_vtproto.pb.go | 4 +- go/vt/proto/query/cached_size.go | 4 +- go/vt/proto/query/query.pb.go | 4 +- go/vt/proto/query/query_vtproto.pb.go | 4 +- go/vt/proto/queryservice/queryservice.pb.go | 4 +- .../queryservice/queryservice_grpc.pb.go | 4 +- .../tabletmanagerdata/tabletmanagerdata.pb.go | 14 +- .../tabletmanagerdata_vtproto.pb.go | 14 +- .../tabletmanagerservice.pb.go | 2 +- .../tabletmanagerservice_grpc.pb.go | 2 +- .../throttlerservice/throttlerservice.pb.go | 2 +- .../throttlerservice_grpc.pb.go | 2 +- go/vt/proto/topodata/cached_size.go | 4 +- go/vt/proto/topodata/topodata.pb.go | 2 +- go/vt/proto/topodata/topodata_vtproto.pb.go | 2 +- go/vt/proto/vschema/vschema.pb.go | 2 +- go/vt/proto/vschema/vschema_vtproto.pb.go | 2 +- go/vt/proto/vtadmin/vtadmin.pb.go | 12 +- go/vt/proto/vtadmin/vtadmin_grpc.pb.go | 2 +- go/vt/proto/vtadmin/vtadmin_vtproto.pb.go | 12 +- go/vt/proto/vtctldata/vtctldata.pb.go | 20 +- go/vt/proto/vtctldata/vtctldata_vtproto.pb.go | 20 +- go/vt/proto/vtctlservice/vtctlservice.pb.go | 2 +- .../vtctlservice/vtctlservice_grpc.pb.go | 2 +- go/vt/proto/vtgate/vtgate.pb.go | 8 +- go/vt/proto/vtgate/vtgate_vtproto.pb.go | 8 +- go/vt/proto/vtgateservice/vtgateservice.pb.go | 2 +- .../vtgateservice/vtgateservice_grpc.pb.go | 2 +- go/vt/proto/vttest/vttest.pb.go | 2 +- go/vt/proto/vttest/vttest_vtproto.pb.go | 2 +- go/vt/proto/vttime/cached_size.go | 2 +- go/vt/schema/cached_size.go | 4 +- go/vt/schema/online_ddl.go | 6 +- go/vt/schema/online_ddl_test.go | 2 +- go/vt/schema/parser.go | 4 +- go/vt/schema/tablegc.go | 2 +- go/vt/schemadiff/analysis.go | 2 +- go/vt/schemadiff/analysis_test.go | 2 +- go/vt/schemadiff/annotations_test.go | 2 +- go/vt/schemadiff/capability.go | 4 +- go/vt/schemadiff/capability_test.go | 4 +- go/vt/schemadiff/column.go | 4 +- go/vt/schemadiff/diff.go | 2 +- go/vt/schemadiff/diff_test.go | 6 +- go/vt/schemadiff/env.go | 4 +- go/vt/schemadiff/errors.go | 4 +- go/vt/schemadiff/schema.go | 6 +- go/vt/schemadiff/schema_diff.go | 2 +- go/vt/schemadiff/schema_diff_test.go | 4 +- go/vt/schemadiff/schema_test.go | 4 +- go/vt/schemadiff/semantics.go | 16 +- go/vt/schemadiff/table.go | 4 +- go/vt/schemadiff/table_test.go | 2 +- go/vt/schemadiff/types.go | 4 +- go/vt/schemadiff/view.go | 2 +- go/vt/schemadiff/view_test.go | 2 +- go/vt/schemamanager/local_controller.go | 2 +- go/vt/schemamanager/local_controller_test.go | 2 +- go/vt/schemamanager/plain_controller.go | 2 +- go/vt/schemamanager/schemamanager.go | 4 +- go/vt/schemamanager/schemamanager_test.go | 26 +- go/vt/schemamanager/tablet_executor.go | 34 +- go/vt/schemamanager/tablet_executor_test.go | 16 +- go/vt/schemamanager/ui_controller.go | 2 +- go/vt/servenv/buildinfo.go | 2 +- go/vt/servenv/exporter.go | 2 +- go/vt/servenv/exporter_test.go | 2 +- go/vt/servenv/flush_logutil.go | 2 +- go/vt/servenv/flushlogs.go | 2 +- go/vt/servenv/grpc_auth.go | 2 +- go/vt/servenv/grpc_server.go | 10 +- go/vt/servenv/grpc_server_auth_mtls.go | 2 +- go/vt/servenv/grpc_server_auth_static.go | 2 +- go/vt/servenv/http.go | 2 +- go/vt/servenv/liveness_test.go | 2 +- go/vt/servenv/mysql.go | 2 +- go/vt/servenv/pid_file.go | 2 +- go/vt/servenv/pprof.go | 2 +- go/vt/servenv/pprof_unix.go | 2 +- go/vt/servenv/pprof_windows.go | 2 +- go/vt/servenv/rpc_utils.go | 2 +- go/vt/servenv/run.go | 4 +- go/vt/servenv/servenv.go | 22 +- go/vt/servenv/servenv_test.go | 2 +- go/vt/servenv/servenv_unix.go | 4 +- go/vt/servenv/service_map.go | 2 +- go/vt/servenv/status.go | 4 +- go/vt/servenv/status_test.go | 2 +- go/vt/servenv/testutils/testutils.go | 2 +- go/vt/servenv/unix_socket.go | 2 +- go/vt/sidecardb/identifier_cache.go | 8 +- go/vt/sidecardb/identifier_cache_test.go | 4 +- go/vt/sidecardb/sidecardb.go | 28 +- go/vt/sidecardb/sidecardb_test.go | 14 +- go/vt/sqlparser/ast.go | 4 +- go/vt/sqlparser/ast_format.go | 2 +- go/vt/sqlparser/ast_format_fast.go | 2 +- go/vt/sqlparser/ast_funcs.go | 14 +- go/vt/sqlparser/ast_funcs_test.go | 4 +- go/vt/sqlparser/ast_rewriting.go | 8 +- go/vt/sqlparser/ast_rewriting_test.go | 2 +- go/vt/sqlparser/cached_size.go | 1018 ++++++++--------- go/vt/sqlparser/comments.go | 8 +- go/vt/sqlparser/comments_test.go | 4 +- go/vt/sqlparser/constants.go | 2 +- go/vt/sqlparser/encodable.go | 2 +- go/vt/sqlparser/encodable_test.go | 2 +- go/vt/sqlparser/generate.go | 4 +- go/vt/sqlparser/goyacc/goyacc.go | 2 +- go/vt/sqlparser/literal.go | 12 +- go/vt/sqlparser/normalizer.go | 10 +- go/vt/sqlparser/normalizer_test.go | 8 +- go/vt/sqlparser/parse_table.go | 4 +- go/vt/sqlparser/parse_test.go | 2 +- go/vt/sqlparser/parsed_query.go | 4 +- go/vt/sqlparser/parsed_query_test.go | 4 +- go/vt/sqlparser/parser.go | 8 +- go/vt/sqlparser/redact_query.go | 2 +- go/vt/sqlparser/sql.go | 2 +- go/vt/sqlparser/sql.y | 2 +- go/vt/sqlparser/token.go | 2 +- go/vt/sqlparser/utils.go | 2 +- go/vt/srvtopo/cached_size.go | 4 +- go/vt/srvtopo/discover.go | 10 +- go/vt/srvtopo/discover_test.go | 8 +- go/vt/srvtopo/keyspace_filtering_server.go | 6 +- .../srvtopo/keyspace_filtering_server_test.go | 10 +- go/vt/srvtopo/query.go | 4 +- go/vt/srvtopo/query_srvkeyspacenames.go | 4 +- go/vt/srvtopo/query_test.go | 2 +- go/vt/srvtopo/read_only_server.go | 6 +- go/vt/srvtopo/resilient_server.go | 8 +- go/vt/srvtopo/resilient_server_test.go | 12 +- go/vt/srvtopo/resolver.go | 16 +- go/vt/srvtopo/resolver_test.go | 18 +- go/vt/srvtopo/server.go | 6 +- go/vt/srvtopo/srvtopotest/passthrough.go | 6 +- go/vt/srvtopo/status.go | 2 +- go/vt/srvtopo/watch.go | 8 +- go/vt/srvtopo/watch_srvkeyspace.go | 6 +- go/vt/srvtopo/watch_srvvschema.go | 6 +- go/vt/tableacl/acl/acl.go | 2 +- go/vt/tableacl/cached_size.go | 4 +- go/vt/tableacl/simpleacl/simpleacl.go | 4 +- go/vt/tableacl/simpleacl/simpleacl_test.go | 2 +- go/vt/tableacl/tableacl.go | 8 +- go/vt/tableacl/tableacl_test.go | 8 +- go/vt/tableacl/testlib/testlib.go | 8 +- go/vt/throttler/demo/throttler_demo.go | 32 +- .../grpcthrottlerserver.go | 8 +- go/vt/throttler/manager.go | 4 +- go/vt/throttler/manager_test.go | 2 +- go/vt/throttler/max_replication_lag_module.go | 10 +- .../max_replication_lag_module_config.go | 2 +- .../max_replication_lag_module_test.go | 8 +- go/vt/throttler/replication_lag_cache.go | 2 +- go/vt/throttler/replication_lag_cache_test.go | 2 +- go/vt/throttler/replication_lag_record.go | 2 +- go/vt/throttler/result.go | 2 +- go/vt/throttler/throttler.go | 8 +- go/vt/throttler/throttler_test.go | 2 +- go/vt/throttler/throttlerlogz.go | 4 +- go/vt/throttler/throttlerz.go | 4 +- go/vt/tlstest/tlstest.go | 2 +- go/vt/tlstest/tlstest_test.go | 2 +- go/vt/topo/cell_info.go | 8 +- go/vt/topo/cells_aliases.go | 2 +- go/vt/topo/cells_aliases_test.go | 2 +- go/vt/topo/consultopo/directory.go | 2 +- go/vt/topo/consultopo/election.go | 4 +- go/vt/topo/consultopo/error.go | 2 +- go/vt/topo/consultopo/file.go | 2 +- go/vt/topo/consultopo/lock.go | 8 +- go/vt/topo/consultopo/server.go | 8 +- go/vt/topo/consultopo/server_flaky_test.go | 10 +- go/vt/topo/consultopo/watch.go | 4 +- go/vt/topo/decode.go | 4 +- go/vt/topo/etcd2topo/directory.go | 2 +- go/vt/topo/etcd2topo/election.go | 4 +- go/vt/topo/etcd2topo/error.go | 2 +- go/vt/topo/etcd2topo/file.go | 2 +- go/vt/topo/etcd2topo/lock.go | 10 +- go/vt/topo/etcd2topo/server.go | 4 +- go/vt/topo/etcd2topo/server_test.go | 12 +- go/vt/topo/etcd2topo/watch.go | 8 +- go/vt/topo/etcd2topo/watch_test.go | 4 +- go/vt/topo/events/external_cluster_change.go | 2 +- go/vt/topo/events/keyspace_change.go | 2 +- go/vt/topo/events/keyspace_change_syslog.go | 2 +- .../events/keyspace_change_syslog_test.go | 2 +- go/vt/topo/events/shard_change.go | 2 +- go/vt/topo/events/shard_change_syslog.go | 2 +- go/vt/topo/events/shard_change_syslog_test.go | 4 +- go/vt/topo/events/tablet_change.go | 2 +- go/vt/topo/events/tablet_change_syslog.go | 4 +- .../topo/events/tablet_change_syslog_test.go | 2 +- go/vt/topo/external_vitess_cluster.go | 8 +- go/vt/topo/faketopo/faketopo.go | 8 +- go/vt/topo/helpers/compare.go | 6 +- go/vt/topo/helpers/compare_test.go | 2 +- go/vt/topo/helpers/copy.go | 12 +- go/vt/topo/helpers/copy_test.go | 10 +- go/vt/topo/keyspace.go | 24 +- go/vt/topo/keyspace_external_test.go | 10 +- go/vt/topo/keyspace_lock_test.go | 6 +- go/vt/topo/locks.go | 10 +- go/vt/topo/memorytopo/directory.go | 6 +- go/vt/topo/memorytopo/election.go | 4 +- go/vt/topo/memorytopo/file.go | 6 +- go/vt/topo/memorytopo/lock.go | 2 +- go/vt/topo/memorytopo/memorytopo.go | 8 +- go/vt/topo/memorytopo/server_test.go | 4 +- go/vt/topo/memorytopo/watch.go | 2 +- go/vt/topo/metadata.go | 6 +- go/vt/topo/replication.go | 12 +- go/vt/topo/routing_rules_lock_test.go | 6 +- go/vt/topo/server.go | 8 +- go/vt/topo/shard.go | 28 +- go/vt/topo/shard_lock_test.go | 4 +- go/vt/topo/shard_test.go | 4 +- go/vt/topo/srv_keyspace.go | 10 +- go/vt/topo/srv_vschema.go | 6 +- go/vt/topo/stats_conn.go | 6 +- go/vt/topo/stats_conn_test.go | 4 +- go/vt/topo/tablet.go | 26 +- go/vt/topo/tablet_test.go | 6 +- go/vt/topo/test/directory.go | 2 +- go/vt/topo/test/election.go | 2 +- go/vt/topo/test/file.go | 2 +- go/vt/topo/test/keyspace.go | 4 +- go/vt/topo/test/lock.go | 4 +- go/vt/topo/test/replication.go | 4 +- go/vt/topo/test/serving.go | 6 +- go/vt/topo/test/shard.go | 4 +- go/vt/topo/test/tablet.go | 4 +- go/vt/topo/test/testing.go | 6 +- go/vt/topo/test/trylock.go | 4 +- go/vt/topo/test/vschema.go | 6 +- go/vt/topo/test/watch.go | 6 +- go/vt/topo/topoproto/destination.go | 8 +- go/vt/topo/topoproto/destination_test.go | 4 +- go/vt/topo/topoproto/flag.go | 2 +- go/vt/topo/topoproto/keyspace.go | 2 +- go/vt/topo/topoproto/replication.go | 2 +- go/vt/topo/topoproto/srvkeyspace.go | 4 +- go/vt/topo/topoproto/tablet.go | 8 +- go/vt/topo/topoproto/tablet_test.go | 2 +- go/vt/topo/topotests/cell_info_test.go | 6 +- go/vt/topo/topotests/cells_aliases_test.go | 4 +- go/vt/topo/topotests/keyspace_test.go | 8 +- go/vt/topo/topotests/replication_test.go | 10 +- go/vt/topo/topotests/shard_watch_test.go | 6 +- go/vt/topo/topotests/srv_keyspace_test.go | 10 +- go/vt/topo/topotests/srv_vschema_test.go | 6 +- go/vt/topo/topotests/tablet_test.go | 4 +- go/vt/topo/topotests/wildcards_test.go | 6 +- go/vt/topo/validator.go | 4 +- go/vt/topo/vschema.go | 6 +- go/vt/topo/wildcards.go | 8 +- go/vt/topo/workflow.go | 2 +- go/vt/topo/zk2topo/directory.go | 2 +- go/vt/topo/zk2topo/election.go | 6 +- go/vt/topo/zk2topo/error.go | 2 +- go/vt/topo/zk2topo/file.go | 2 +- go/vt/topo/zk2topo/lock.go | 6 +- go/vt/topo/zk2topo/server.go | 2 +- go/vt/topo/zk2topo/server_test.go | 10 +- go/vt/topo/zk2topo/utils.go | 6 +- go/vt/topo/zk2topo/version.go | 2 +- go/vt/topo/zk2topo/watch.go | 4 +- go/vt/topo/zk2topo/zk_conn.go | 4 +- go/vt/topotools/events/reparent.go | 6 +- go/vt/topotools/events/reparent_syslog.go | 6 +- .../topotools/events/reparent_syslog_test.go | 6 +- go/vt/topotools/keyspace.go | 8 +- go/vt/topotools/rebuild_keyspace.go | 10 +- go/vt/topotools/routing_rules.go | 6 +- go/vt/topotools/routing_rules_test.go | 4 +- go/vt/topotools/shard_test.go | 4 +- go/vt/topotools/split.go | 6 +- go/vt/topotools/split_test.go | 4 +- go/vt/topotools/tablet.go | 18 +- go/vt/topotools/tablet_test.go | 2 +- go/vt/topotools/utils.go | 4 +- go/vt/topotools/vschema_ddl.go | 8 +- go/vt/vitessdriver/README.md | 4 +- go/vt/vitessdriver/convert.go | 8 +- go/vt/vitessdriver/convert_test.go | 2 +- go/vt/vitessdriver/doc.go | 2 +- go/vt/vitessdriver/driver.go | 10 +- go/vt/vitessdriver/driver_test.go | 6 +- go/vt/vitessdriver/fakeserver_test.go | 12 +- go/vt/vitessdriver/plugin_grpcvtgateconn.go | 2 +- go/vt/vitessdriver/rows.go | 4 +- go/vt/vitessdriver/rows_test.go | 4 +- go/vt/vitessdriver/streaming_rows.go | 4 +- go/vt/vitessdriver/streaming_rows_test.go | 4 +- go/vt/vitessdriver/time.go | 2 +- go/vt/vitessdriver/time_test.go | 2 +- go/vt/vtaclcheck/vtaclcheck.go | 6 +- go/vt/vtadmin/api.go | 56 +- go/vt/vtadmin/api_authz_test.go | 30 +- go/vt/vtadmin/api_test.go | 52 +- go/vt/vtadmin/cache/cache.go | 2 +- go/vt/vtadmin/cache/cache_test.go | 2 +- go/vt/vtadmin/cache/refresh.go | 2 +- go/vt/vtadmin/cache/refresh_test.go | 2 +- go/vt/vtadmin/cluster/cluster.go | 44 +- .../vtadmin/cluster/cluster_internal_test.go | 32 +- go/vt/vtadmin/cluster/cluster_test.go | 34 +- go/vt/vtadmin/cluster/config.go | 12 +- go/vt/vtadmin/cluster/discovery/discovery.go | 2 +- .../cluster/discovery/discovery_consul.go | 6 +- .../discovery/discovery_consul_test.go | 2 +- .../cluster/discovery/discovery_dynamic.go | 2 +- .../discovery/discovery_dynamic_test.go | 2 +- .../cluster/discovery/discovery_json.go | 4 +- .../discovery/discovery_static_file.go | 2 +- .../discovery/discovery_static_file_test.go | 2 +- .../cluster/discovery/discovery_test.go | 2 +- .../discovery/fakediscovery/discovery.go | 4 +- .../discovery/fakediscovery/discovery_test.go | 2 +- go/vt/vtadmin/cluster/dynamic/api.go | 4 +- go/vt/vtadmin/cluster/dynamic/cluster.go | 2 +- go/vt/vtadmin/cluster/dynamic/interceptors.go | 6 +- go/vt/vtadmin/cluster/flags.go | 4 +- .../internal/caches/schemacache/cache.go | 18 +- .../internal/caches/schemacache/cache_test.go | 2 +- go/vt/vtadmin/cluster/resolver/resolver.go | 10 +- .../vtadmin/cluster/resolver/resolver_test.go | 4 +- go/vt/vtadmin/cluster/trace.go | 8 +- go/vt/vtadmin/credentials/credentials.go | 2 +- go/vt/vtadmin/credentials/credentials_test.go | 2 +- go/vt/vtadmin/debug.go | 2 +- go/vt/vtadmin/grpcserver/server.go | 6 +- go/vt/vtadmin/http/api.go | 12 +- go/vt/vtadmin/http/backups.go | 6 +- go/vt/vtadmin/http/cells.go | 2 +- go/vt/vtadmin/http/clusters.go | 4 +- go/vt/vtadmin/http/debug/debug.go | 2 +- go/vt/vtadmin/http/debug/env.go | 4 +- go/vt/vtadmin/http/experimental/tablets.go | 4 +- go/vt/vtadmin/http/experimental/whoami.go | 4 +- go/vt/vtadmin/http/gates.go | 2 +- go/vt/vtadmin/http/handlers/authentication.go | 2 +- go/vt/vtadmin/http/handlers/panic_recovery.go | 2 +- go/vt/vtadmin/http/handlers/trace.go | 2 +- go/vt/vtadmin/http/keyspaces.go | 6 +- go/vt/vtadmin/http/replication.go | 2 +- go/vt/vtadmin/http/request.go | 6 +- go/vt/vtadmin/http/response.go | 4 +- go/vt/vtadmin/http/schema_migrations.go | 6 +- go/vt/vtadmin/http/schemas.go | 8 +- go/vt/vtadmin/http/shards.go | 12 +- go/vt/vtadmin/http/srvkeyspaces.go | 2 +- go/vt/vtadmin/http/srvvschemas.go | 2 +- go/vt/vtadmin/http/tablets.go | 2 +- go/vt/vtadmin/http/vschemas.go | 2 +- go/vt/vtadmin/http/vtctlds.go | 2 +- go/vt/vtadmin/http/vtexplain.go | 2 +- go/vt/vtadmin/http/workflows.go | 2 +- go/vt/vtadmin/internal/backoff/backoff.go | 2 +- go/vt/vtadmin/rbac/authentication.go | 4 +- go/vt/vtadmin/rbac/config.go | 6 +- go/vt/vtadmin/rbac/example/main.go | 2 +- go/vt/vtadmin/rbac/rule.go | 2 +- go/vt/vtadmin/sort/clusters.go | 2 +- .../testutil/authztestgen/functions.go | 2 +- go/vt/vtadmin/testutil/authztestgen/main.go | 4 +- .../vtadmin/testutil/authztestgen/template.go | 30 +- go/vt/vtadmin/testutil/cluster.go | 36 +- go/vt/vtadmin/testutil/proto_compare.go | 4 +- go/vt/vtadmin/testutil/tablets.go | 4 +- go/vt/vtadmin/testutil/workflows.go | 2 +- go/vt/vtadmin/vtadminproto/tablet.go | 4 +- go/vt/vtadmin/vtadminproto/trace.go | 4 +- go/vt/vtadmin/vtctldclient/config.go | 12 +- go/vt/vtadmin/vtctldclient/config_test.go | 6 +- .../fakevtctldclient/vtctldclient.go | 10 +- go/vt/vtadmin/vtctldclient/proxy.go | 22 +- go/vt/vtadmin/vtctldclient/proxy_test.go | 10 +- go/vt/vtadmin/vtsql/config.go | 12 +- go/vt/vtadmin/vtsql/config_test.go | 6 +- go/vt/vtadmin/vtsql/credentials.go | 2 +- go/vt/vtadmin/vtsql/fakevtsql/conn.go | 6 +- go/vt/vtadmin/vtsql/fakevtsql/driver.go | 2 +- go/vt/vtadmin/vtsql/vtsql.go | 18 +- go/vt/vtadmin/vtsql/vtsql_test.go | 8 +- go/vt/vtcombo/tablet_map.go | 60 +- go/vt/vtctl/backup.go | 20 +- go/vt/vtctl/cell_info.go | 6 +- go/vt/vtctl/cells_aliases.go | 6 +- go/vt/vtctl/endtoend/get_schema_test.go | 30 +- go/vt/vtctl/endtoend/onlineddl_show_test.go | 20 +- go/vt/vtctl/grpcclientcommon/dial_option.go | 4 +- go/vt/vtctl/grpcvtctlclient/client.go | 16 +- go/vt/vtctl/grpcvtctlclient/client_test.go | 12 +- go/vt/vtctl/grpcvtctldclient/client.go | 8 +- go/vt/vtctl/grpcvtctldclient/client_gen.go | 4 +- go/vt/vtctl/grpcvtctldclient/client_test.go | 22 +- .../endtoend/init_shard_primary_test.go | 30 +- go/vt/vtctl/grpcvtctldserver/log.go | 4 +- go/vt/vtctl/grpcvtctldserver/query.go | 20 +- go/vt/vtctl/grpcvtctldserver/query_test.go | 12 +- go/vt/vtctl/grpcvtctldserver/server.go | 84 +- .../grpcvtctldserver/server_slow_test.go | 30 +- go/vt/vtctl/grpcvtctldserver/server_test.go | 56 +- .../testutil/proto_compare.go | 8 +- .../grpcvtctldserver/testutil/srv_keyspace.go | 4 +- .../testutil/test_backupstorage.go | 2 +- .../testutil/test_tmclient.go | 38 +- go/vt/vtctl/grpcvtctldserver/testutil/util.go | 12 +- go/vt/vtctl/grpcvtctldserver/topo.go | 18 +- go/vt/vtctl/grpcvtctlserver/server.go | 24 +- go/vt/vtctl/localvtctldclient/client.go | 4 +- go/vt/vtctl/localvtctldclient/client_gen.go | 6 +- go/vt/vtctl/plugin_consultopo.go | 2 +- go/vt/vtctl/plugin_etcd2topo.go | 2 +- go/vt/vtctl/plugin_zk2topo.go | 2 +- go/vt/vtctl/reparent.go | 12 +- go/vt/vtctl/reparentutil/durability.go | 8 +- go/vt/vtctl/reparentutil/durability_funcs.go | 6 +- .../reparentutil/durability_funcs_test.go | 2 +- go/vt/vtctl/reparentutil/durability_test.go | 6 +- .../reparentutil/emergency_reparenter.go | 36 +- .../reparentutil/emergency_reparenter_test.go | 26 +- .../vtctl/reparentutil/planned_reparenter.go | 26 +- .../planned_reparenter_flaky_test.go | 26 +- go/vt/vtctl/reparentutil/reparent_sorter.go | 8 +- .../reparentutil/reparent_sorter_test.go | 4 +- .../reparentutil/reparenttestutil/util.go | 2 +- go/vt/vtctl/reparentutil/replication.go | 32 +- go/vt/vtctl/reparentutil/replication_test.go | 24 +- go/vt/vtctl/reparentutil/util.go | 30 +- go/vt/vtctl/reparentutil/util_test.go | 26 +- go/vt/vtctl/schematools/diff.go | 10 +- go/vt/vtctl/schematools/marshal.go | 10 +- go/vt/vtctl/schematools/marshal_test.go | 8 +- go/vt/vtctl/schematools/reload.go | 10 +- go/vt/vtctl/schematools/reload_test.go | 12 +- go/vt/vtctl/schematools/schematools.go | 16 +- go/vt/vtctl/schematools/schematools_test.go | 2 +- go/vt/vtctl/topo.go | 4 +- go/vt/vtctl/vdiff2.go | 16 +- go/vt/vtctl/vdiff2_test.go | 6 +- go/vt/vtctl/vdiff_env_test.go | 32 +- go/vt/vtctl/vtctl.go | 66 +- go/vt/vtctl/vtctl_env_test.go | 32 +- go/vt/vtctl/vtctl_test.go | 8 +- go/vt/vtctl/vtctlclient/interface.go | 6 +- go/vt/vtctl/vtctlclient/wrapper.go | 2 +- go/vt/vtctl/vtctlclienttest/client.go | 16 +- go/vt/vtctl/vtctldclient/client.go | 2 +- go/vt/vtctl/vtctldclient/codegen/template.go | 2 +- go/vt/vtctl/workflow/common/utils.go | 4 +- go/vt/vtctl/workflow/framework_test.go | 32 +- go/vt/vtctl/workflow/materializer.go | 42 +- go/vt/vtctl/workflow/materializer_env_test.go | 30 +- go/vt/vtctl/workflow/materializer_test.go | 26 +- go/vt/vtctl/workflow/mount.go | 8 +- go/vt/vtctl/workflow/resharder.go | 28 +- go/vt/vtctl/workflow/server.go | 72 +- go/vt/vtctl/workflow/server_test.go | 26 +- go/vt/vtctl/workflow/stream_migrator.go | 36 +- go/vt/vtctl/workflow/stream_migrator_test.go | 10 +- go/vt/vtctl/workflow/switcher.go | 2 +- go/vt/vtctl/workflow/switcher_dry_run.go | 6 +- go/vt/vtctl/workflow/switcher_interface.go | 2 +- go/vt/vtctl/workflow/traffic_switcher.go | 50 +- go/vt/vtctl/workflow/traffic_switcher_test.go | 2 +- go/vt/vtctl/workflow/utils.go | 42 +- go/vt/vtctl/workflow/utils_test.go | 12 +- go/vt/vtctl/workflow/vexec/query_plan.go | 16 +- go/vt/vtctl/workflow/vexec/query_plan_test.go | 12 +- go/vt/vtctl/workflow/vexec/query_planner.go | 4 +- .../workflow/vexec/query_planner_test.go | 4 +- go/vt/vtctl/workflow/vexec/testutil/query.go | 2 +- go/vt/vtctl/workflow/vexec/vexec.go | 22 +- go/vt/vtctl/workflow/vreplication_stream.go | 4 +- go/vt/vtctld/action_repository.go | 18 +- go/vt/vtctld/api.go | 34 +- go/vt/vtctld/api_test.go | 12 +- go/vt/vtctld/debug_health.go | 6 +- go/vt/vtctld/explorer.go | 2 +- go/vt/vtctld/explorer_test.go | 6 +- go/vt/vtctld/tablet_data.go | 18 +- go/vt/vtctld/tablet_data_test.go | 22 +- go/vt/vtctld/vtctld.go | 14 +- go/vt/vtenv/cached_size.go | 6 +- go/vt/vtenv/vtenv.go | 6 +- go/vt/vtenv/vtenv_test.go | 6 +- go/vt/vterrors/aggregate.go | 2 +- go/vt/vterrors/aggregate_test.go | 2 +- go/vt/vterrors/code.go | 2 +- go/vt/vterrors/errors_test.go | 2 +- go/vt/vterrors/grpc.go | 2 +- go/vt/vterrors/last_error.go | 2 +- go/vt/vterrors/proto3.go | 2 +- go/vt/vterrors/proto3_test.go | 2 +- go/vt/vterrors/state.go | 2 +- go/vt/vterrors/vterrors.go | 2 +- go/vt/vterrors/vterrorsgen/main.go | 6 +- go/vt/vtexplain/vtexplain.go | 32 +- go/vt/vtexplain/vtexplain_test.go | 18 +- go/vt/vtexplain/vtexplain_topo.go | 6 +- go/vt/vtexplain/vtexplain_vtgate.go | 40 +- go/vt/vtexplain/vtexplain_vttablet.go | 46 +- go/vt/vtexplain/vtexplain_vttablet_test.go | 16 +- go/vt/vtgate/api.go | 6 +- go/vt/vtgate/autocommit_test.go | 8 +- go/vt/vtgate/bench_test.go | 2 +- go/vt/vtgate/buffer/buffer.go | 10 +- go/vt/vtgate/buffer/buffer_helper_test.go | 10 +- go/vt/vtgate/buffer/buffer_test.go | 8 +- go/vt/vtgate/buffer/flags.go | 6 +- go/vt/vtgate/buffer/shard_buffer.go | 16 +- go/vt/vtgate/buffer/variables.go | 2 +- go/vt/vtgate/buffer/variables_test.go | 2 +- go/vt/vtgate/debugenv.go | 6 +- go/vt/vtgate/endtoend/aggr_test.go | 2 +- .../vtgate/endtoend/deletetest/delete_test.go | 12 +- go/vt/vtgate/endtoend/last_insert_id_test.go | 4 +- go/vt/vtgate/endtoend/lookup_test.go | 6 +- go/vt/vtgate/endtoend/main_test.go | 12 +- go/vt/vtgate/endtoend/misc_test.go | 2 +- go/vt/vtgate/endtoend/oltp_test.go | 2 +- go/vt/vtgate/endtoend/row_count_test.go | 4 +- .../endtoend/update/lookup_unique_test.go | 16 +- go/vt/vtgate/endtoend/vstream_test.go | 20 +- go/vt/vtgate/engine/aggregations.go | 18 +- go/vt/vtgate/engine/aggregations_test.go | 6 +- go/vt/vtgate/engine/cached_size.go | 282 ++--- go/vt/vtgate/engine/concatenate.go | 10 +- go/vt/vtgate/engine/concatenate_test.go | 6 +- go/vt/vtgate/engine/dbddl.go | 16 +- go/vt/vtgate/engine/dbddl_plugin.go | 2 +- go/vt/vtgate/engine/ddl.go | 14 +- go/vt/vtgate/engine/ddl_test.go | 6 +- go/vt/vtgate/engine/delete.go | 12 +- go/vt/vtgate/engine/delete_test.go | 8 +- go/vt/vtgate/engine/distinct.go | 12 +- go/vt/vtgate/engine/distinct_test.go | 8 +- go/vt/vtgate/engine/dml.go | 20 +- go/vt/vtgate/engine/dml_with_input.go | 8 +- go/vt/vtgate/engine/dml_with_input_test.go | 8 +- .../vtgate/engine/exec_prepared_statement.go | 8 +- go/vt/vtgate/engine/fake_primitive_test.go | 4 +- go/vt/vtgate/engine/fake_vcursor_test.go | 28 +- go/vt/vtgate/engine/filter.go | 8 +- go/vt/vtgate/engine/filter_test.go | 10 +- go/vt/vtgate/engine/fk_cascade.go | 8 +- go/vt/vtgate/engine/fk_cascade_test.go | 6 +- go/vt/vtgate/engine/fk_verify.go | 8 +- go/vt/vtgate/engine/fk_verify_test.go | 6 +- go/vt/vtgate/engine/fuzz.go | 4 +- go/vt/vtgate/engine/hash_join.go | 12 +- go/vt/vtgate/engine/hash_join_test.go | 8 +- go/vt/vtgate/engine/insert.go | 20 +- go/vt/vtgate/engine/insert_common.go | 20 +- go/vt/vtgate/engine/insert_select.go | 18 +- go/vt/vtgate/engine/insert_test.go | 14 +- go/vt/vtgate/engine/join.go | 4 +- go/vt/vtgate/engine/join_test.go | 4 +- go/vt/vtgate/engine/limit.go | 8 +- go/vt/vtgate/engine/limit_test.go | 8 +- go/vt/vtgate/engine/lock.go | 18 +- go/vt/vtgate/engine/memory_sort.go | 6 +- go/vt/vtgate/engine/memory_sort_test.go | 10 +- go/vt/vtgate/engine/merge_sort.go | 12 +- go/vt/vtgate/engine/merge_sort_test.go | 10 +- go/vt/vtgate/engine/mstream.go | 10 +- go/vt/vtgate/engine/online_ddl.go | 16 +- go/vt/vtgate/engine/opcode/constants.go | 8 +- go/vt/vtgate/engine/opcode/constants_test.go | 4 +- go/vt/vtgate/engine/ordered_aggregate.go | 10 +- go/vt/vtgate/engine/ordered_aggregate_test.go | 14 +- go/vt/vtgate/engine/plan.go | 4 +- go/vt/vtgate/engine/plan_description.go | 8 +- go/vt/vtgate/engine/plan_description_test.go | 10 +- go/vt/vtgate/engine/primitive.go | 24 +- go/vt/vtgate/engine/projection.go | 12 +- go/vt/vtgate/engine/projection_test.go | 12 +- go/vt/vtgate/engine/rename_fields.go | 6 +- go/vt/vtgate/engine/replace_variables.go | 4 +- go/vt/vtgate/engine/revert_migration.go | 16 +- go/vt/vtgate/engine/route.go | 28 +- go/vt/vtgate/engine/route_test.go | 18 +- go/vt/vtgate/engine/routing.go | 20 +- go/vt/vtgate/engine/rows.go | 4 +- go/vt/vtgate/engine/scalar_aggregation.go | 4 +- .../vtgate/engine/scalar_aggregation_test.go | 8 +- go/vt/vtgate/engine/semi_join.go | 4 +- go/vt/vtgate/engine/semi_join_test.go | 6 +- go/vt/vtgate/engine/send.go | 16 +- go/vt/vtgate/engine/send_test.go | 8 +- go/vt/vtgate/engine/sequential.go | 8 +- go/vt/vtgate/engine/session_primitive.go | 6 +- go/vt/vtgate/engine/set.go | 26 +- go/vt/vtgate/engine/set_test.go | 14 +- go/vt/vtgate/engine/shard_route.go | 8 +- go/vt/vtgate/engine/show_exec.go | 6 +- go/vt/vtgate/engine/simple_projection.go | 6 +- go/vt/vtgate/engine/simple_projection_test.go | 4 +- go/vt/vtgate/engine/singlerow.go | 4 +- go/vt/vtgate/engine/sql_calc_found_rows.go | 8 +- go/vt/vtgate/engine/throttle_app.go | 12 +- go/vt/vtgate/engine/uncorrelated_subquery.go | 10 +- .../engine/uncorrelated_subquery_test.go | 6 +- go/vt/vtgate/engine/unlock.go | 6 +- go/vt/vtgate/engine/update.go | 12 +- go/vt/vtgate/engine/update_target.go | 8 +- go/vt/vtgate/engine/update_target_test.go | 2 +- go/vt/vtgate/engine/update_test.go | 14 +- go/vt/vtgate/engine/upsert.go | 10 +- go/vt/vtgate/engine/vexplain.go | 12 +- go/vt/vtgate/engine/vindex_func.go | 18 +- go/vt/vtgate/engine/vindex_func_test.go | 10 +- go/vt/vtgate/engine/vindex_lookup.go | 18 +- go/vt/vtgate/engine/vschema_ddl.go | 10 +- go/vt/vtgate/engine/vstream.go | 12 +- go/vt/vtgate/evalengine/api_aggregation.go | 10 +- .../vtgate/evalengine/api_aggregation_test.go | 10 +- .../vtgate/evalengine/api_arithmetic_test.go | 8 +- go/vt/vtgate/evalengine/api_coerce.go | 8 +- go/vt/vtgate/evalengine/api_compare.go | 12 +- go/vt/vtgate/evalengine/api_compare_test.go | 14 +- go/vt/vtgate/evalengine/api_hash.go | 16 +- go/vt/vtgate/evalengine/api_hash_test.go | 10 +- go/vt/vtgate/evalengine/api_literal.go | 18 +- .../vtgate/evalengine/api_type_aggregation.go | 6 +- .../evalengine/api_type_aggregation_test.go | 4 +- go/vt/vtgate/evalengine/arena.go | 8 +- go/vt/vtgate/evalengine/arithmetic.go | 8 +- go/vt/vtgate/evalengine/cached_size.go | 346 +++--- go/vt/vtgate/evalengine/casting_test.go | 2 +- go/vt/vtgate/evalengine/collation.go | 6 +- go/vt/vtgate/evalengine/compare.go | 12 +- go/vt/vtgate/evalengine/compiler.go | 20 +- go/vt/vtgate/evalengine/compiler_asm.go | 36 +- go/vt/vtgate/evalengine/compiler_asm_push.go | 16 +- go/vt/vtgate/evalengine/compiler_fn.go | 2 +- go/vt/vtgate/evalengine/compiler_test.go | 14 +- go/vt/vtgate/evalengine/eval.go | 18 +- go/vt/vtgate/evalengine/eval_bytes.go | 14 +- go/vt/vtgate/evalengine/eval_enum.go | 4 +- go/vt/vtgate/evalengine/eval_json.go | 14 +- go/vt/vtgate/evalengine/eval_numeric.go | 12 +- go/vt/vtgate/evalengine/eval_result.go | 12 +- go/vt/vtgate/evalengine/eval_set.go | 4 +- go/vt/vtgate/evalengine/eval_temporal.go | 18 +- go/vt/vtgate/evalengine/eval_tuple.go | 2 +- go/vt/vtgate/evalengine/expr.go | 2 +- go/vt/vtgate/evalengine/expr_arithmetic.go | 2 +- go/vt/vtgate/evalengine/expr_bit.go | 6 +- go/vt/vtgate/evalengine/expr_bvar.go | 10 +- go/vt/vtgate/evalengine/expr_collate.go | 12 +- go/vt/vtgate/evalengine/expr_column.go | 12 +- go/vt/vtgate/evalengine/expr_column_test.go | 6 +- go/vt/vtgate/evalengine/expr_compare.go | 12 +- go/vt/vtgate/evalengine/expr_convert.go | 12 +- go/vt/vtgate/evalengine/expr_env.go | 14 +- go/vt/vtgate/evalengine/expr_env_test.go | 8 +- go/vt/vtgate/evalengine/expr_literal.go | 2 +- go/vt/vtgate/evalengine/expr_logical.go | 4 +- go/vt/vtgate/evalengine/expr_tuple.go | 4 +- go/vt/vtgate/evalengine/expr_tuple_bvar.go | 8 +- .../vtgate/evalengine/expr_tuple_bvar_test.go | 6 +- go/vt/vtgate/evalengine/fn_base64.go | 4 +- go/vt/vtgate/evalengine/fn_bit.go | 2 +- go/vt/vtgate/evalengine/fn_compare.go | 12 +- go/vt/vtgate/evalengine/fn_crypto.go | 4 +- go/vt/vtgate/evalengine/fn_hex.go | 8 +- go/vt/vtgate/evalengine/fn_info.go | 2 +- go/vt/vtgate/evalengine/fn_json.go | 12 +- go/vt/vtgate/evalengine/fn_misc.go | 10 +- go/vt/vtgate/evalengine/fn_numeric.go | 12 +- go/vt/vtgate/evalengine/fn_regexp.go | 16 +- go/vt/vtgate/evalengine/fn_string.go | 14 +- go/vt/vtgate/evalengine/fn_time.go | 10 +- go/vt/vtgate/evalengine/format.go | 6 +- .../evalengine/integration/comparison_test.go | 26 +- .../evalengine/integration/fuzz_test.go | 16 +- go/vt/vtgate/evalengine/mysql_test.go | 6 +- go/vt/vtgate/evalengine/perf_test.go | 8 +- go/vt/vtgate/evalengine/testcases/cases.go | 4 +- go/vt/vtgate/evalengine/testcases/helpers.go | 6 +- go/vt/vtgate/evalengine/testcases/inputs.go | 2 +- go/vt/vtgate/evalengine/translate.go | 14 +- go/vt/vtgate/evalengine/translate_builtin.go | 8 +- go/vt/vtgate/evalengine/translate_card.go | 6 +- go/vt/vtgate/evalengine/translate_convert.go | 12 +- go/vt/vtgate/evalengine/translate_simplify.go | 2 +- go/vt/vtgate/evalengine/translate_test.go | 10 +- go/vt/vtgate/evalengine/vm.go | 4 +- go/vt/vtgate/evalengine/weights.go | 20 +- go/vt/vtgate/evalengine/weights_test.go | 6 +- go/vt/vtgate/executor.go | 68 +- go/vt/vtgate/executor_ddl_test.go | 2 +- go/vt/vtgate/executor_dml_test.go | 20 +- go/vt/vtgate/executor_framework_test.go | 36 +- go/vt/vtgate/executor_scatter_stats.go | 8 +- go/vt/vtgate/executor_scatter_stats_test.go | 2 +- go/vt/vtgate/executor_select_test.go | 32 +- go/vt/vtgate/executor_set_test.go | 16 +- go/vt/vtgate/executor_stream_test.go | 22 +- go/vt/vtgate/executor_test.go | 40 +- go/vt/vtgate/executor_vschema_ddl_test.go | 18 +- go/vt/vtgate/executor_vstream_test.go | 12 +- go/vt/vtgate/fakerpcvtgateconn/conn.go | 12 +- go/vt/vtgate/grpcvtgateconn/conn.go | 24 +- go/vt/vtgate/grpcvtgateconn/conn_rpc_test.go | 8 +- .../vtgate/grpcvtgateconn/fuzz_flaky_test.go | 8 +- go/vt/vtgate/grpcvtgateconn/suite_test.go | 22 +- go/vt/vtgate/grpcvtgateservice/server.go | 26 +- go/vt/vtgate/legacy_scatter_conn_test.go | 26 +- go/vt/vtgate/logstats/logstats.go | 10 +- go/vt/vtgate/logstats/logstats_test.go | 12 +- go/vt/vtgate/plan_execute.go | 20 +- go/vt/vtgate/planbuilder/builder.go | 20 +- go/vt/vtgate/planbuilder/bypass.go | 12 +- go/vt/vtgate/planbuilder/call_proc.go | 8 +- go/vt/vtgate/planbuilder/collations_test.go | 8 +- go/vt/vtgate/planbuilder/ddl.go | 14 +- go/vt/vtgate/planbuilder/delete.go | 14 +- .../planbuilder/expression_converter.go | 12 +- .../planbuilder/expression_converter_test.go | 6 +- go/vt/vtgate/planbuilder/fuzz.go | 8 +- go/vt/vtgate/planbuilder/insert.go | 16 +- go/vt/vtgate/planbuilder/locktables.go | 12 +- go/vt/vtgate/planbuilder/migration.go | 24 +- .../planbuilder/operator_transformers.go | 26 +- .../planbuilder/operators/SQL_builder.go | 10 +- .../operators/aggregation_pushing.go | 8 +- .../operators/aggregation_pushing_helper.go | 10 +- .../planbuilder/operators/aggregator.go | 12 +- .../planbuilder/operators/apply_join.go | 8 +- .../vtgate/planbuilder/operators/ast_to_op.go | 10 +- .../vtgate/planbuilder/operators/comments.go | 4 +- go/vt/vtgate/planbuilder/operators/delete.go | 14 +- .../vtgate/planbuilder/operators/distinct.go | 6 +- .../planbuilder/operators/dml_planning.go | 8 +- .../planbuilder/operators/dml_with_input.go | 6 +- .../planbuilder/operators/expressions.go | 6 +- go/vt/vtgate/planbuilder/operators/filter.go | 12 +- .../planbuilder/operators/fk_cascade.go | 4 +- .../vtgate/planbuilder/operators/fk_verify.go | 2 +- go/vt/vtgate/planbuilder/operators/fuzz.go | 4 +- .../vtgate/planbuilder/operators/hash_join.go | 12 +- .../planbuilder/operators/hash_join_test.go | 12 +- go/vt/vtgate/planbuilder/operators/helpers.go | 8 +- go/vt/vtgate/planbuilder/operators/horizon.go | 8 +- .../operators/horizon_expanding.go | 10 +- .../operators/info_schema_planning.go | 16 +- go/vt/vtgate/planbuilder/operators/insert.go | 14 +- .../planbuilder/operators/insert_selection.go | 2 +- go/vt/vtgate/planbuilder/operators/join.go | 6 +- .../planbuilder/operators/join_merging.go | 4 +- go/vt/vtgate/planbuilder/operators/joins.go | 6 +- go/vt/vtgate/planbuilder/operators/limit.go | 4 +- .../planbuilder/operators/misc_routing.go | 10 +- .../planbuilder/operators/offset_planning.go | 10 +- .../vtgate/planbuilder/operators/operator.go | 4 +- .../vtgate/planbuilder/operators/ordering.go | 6 +- go/vt/vtgate/planbuilder/operators/phases.go | 12 +- .../planbuilder/operators/plan_query.go | 8 +- .../planbuilder/operators/projection.go | 12 +- .../operators/projection_pushing.go | 10 +- .../planbuilder/operators/query_planning.go | 12 +- .../operators/query_planning_test.go | 2 +- .../planbuilder/operators/querygraph.go | 6 +- .../planbuilder/operators/queryprojection.go | 10 +- .../vtgate/planbuilder/operators/rewriters.go | 4 +- go/vt/vtgate/planbuilder/operators/route.go | 24 +- .../planbuilder/operators/route_planning.go | 16 +- .../planbuilder/operators/sequential.go | 2 +- .../planbuilder/operators/sharded_routing.go | 18 +- .../vtgate/planbuilder/operators/subquery.go | 12 +- .../planbuilder/operators/subquery_builder.go | 8 +- .../operators/subquery_container.go | 4 +- .../operators/subquery_planning.go | 12 +- go/vt/vtgate/planbuilder/operators/table.go | 12 +- go/vt/vtgate/planbuilder/operators/union.go | 8 +- .../planbuilder/operators/union_merging.go | 8 +- go/vt/vtgate/planbuilder/operators/update.go | 22 +- .../planbuilder/operators/update_test.go | 6 +- go/vt/vtgate/planbuilder/operators/upsert.go | 8 +- .../planbuilder/operators/utils_test.go | 6 +- go/vt/vtgate/planbuilder/operators/vindex.go | 14 +- go/vt/vtgate/planbuilder/other_read.go | 6 +- go/vt/vtgate/planbuilder/plan_test.go | 28 +- go/vt/vtgate/planbuilder/plan_test_vindex.go | 8 +- .../plancontext/planning_context.go | 10 +- .../plancontext/planning_context_test.go | 10 +- .../vtgate/planbuilder/plancontext/vschema.go | 24 +- go/vt/vtgate/planbuilder/planner.go | 10 +- go/vt/vtgate/planbuilder/planner_test.go | 8 +- .../planbuilder/predicate_rewrite_test.go | 10 +- .../vtgate/planbuilder/prepared_statement.go | 12 +- go/vt/vtgate/planbuilder/rewrite.go | 6 +- go/vt/vtgate/planbuilder/rewrite_test.go | 6 +- go/vt/vtgate/planbuilder/route.go | 12 +- go/vt/vtgate/planbuilder/select.go | 18 +- go/vt/vtgate/planbuilder/set.go | 16 +- go/vt/vtgate/planbuilder/show.go | 26 +- go/vt/vtgate/planbuilder/show_test.go | 12 +- go/vt/vtgate/planbuilder/simplifier_test.go | 12 +- .../planbuilder/single_sharded_shortcut.go | 12 +- go/vt/vtgate/planbuilder/stream.go | 12 +- go/vt/vtgate/planbuilder/system_variables.go | 10 +- go/vt/vtgate/planbuilder/throttler.go | 10 +- go/vt/vtgate/planbuilder/update.go | 14 +- go/vt/vtgate/planbuilder/use.go | 4 +- go/vt/vtgate/planbuilder/vexplain.go | 20 +- go/vt/vtgate/planbuilder/vindex_func.go | 10 +- go/vt/vtgate/planbuilder/vstream.go | 12 +- go/vt/vtgate/plugin_mysql_server.go | 32 +- go/vt/vtgate/plugin_mysql_server_test.go | 16 +- go/vt/vtgate/plugin_mysql_server_unix.go | 2 +- go/vt/vtgate/plugin_mysql_server_windows.go | 2 +- go/vt/vtgate/querylog.go | 6 +- go/vt/vtgate/querylogz.go | 10 +- go/vt/vtgate/querylogz_test.go | 8 +- go/vt/vtgate/queryz.go | 8 +- go/vt/vtgate/queryz_test.go | 8 +- go/vt/vtgate/resolver.go | 8 +- go/vt/vtgate/safe_session.go | 24 +- go/vt/vtgate/safe_session_test.go | 6 +- go/vt/vtgate/sandbox_test.go | 26 +- go/vt/vtgate/scatter_conn.go | 34 +- go/vt/vtgate/scatter_conn_test.go | 24 +- go/vt/vtgate/schema/tracker.go | 14 +- go/vt/vtgate/schema/tracker_test.go | 24 +- go/vt/vtgate/schema/update_controller.go | 6 +- .../schema/update_controller_flaky_test.go | 6 +- go/vt/vtgate/semantics/FakeSI.go | 14 +- go/vt/vtgate/semantics/analyzer.go | 12 +- go/vt/vtgate/semantics/analyzer_dml_test.go | 2 +- go/vt/vtgate/semantics/analyzer_test.go | 8 +- go/vt/vtgate/semantics/binder.go | 6 +- go/vt/vtgate/semantics/check_invalid.go | 6 +- go/vt/vtgate/semantics/check_invalid_test.go | 2 +- go/vt/vtgate/semantics/dependencies.go | 6 +- go/vt/vtgate/semantics/derived_table.go | 10 +- go/vt/vtgate/semantics/derived_test.go | 4 +- go/vt/vtgate/semantics/early_rewriter.go | 10 +- go/vt/vtgate/semantics/early_rewriter_test.go | 6 +- go/vt/vtgate/semantics/errors.go | 6 +- go/vt/vtgate/semantics/foreign_keys.go | 6 +- go/vt/vtgate/semantics/foreign_keys_test.go | 6 +- go/vt/vtgate/semantics/info_schema.go | 16 +- .../vtgate/semantics/info_schema_gen_test.go | 6 +- go/vt/vtgate/semantics/real_table.go | 10 +- go/vt/vtgate/semantics/scoper.go | 6 +- go/vt/vtgate/semantics/semantic_state.go | 22 +- go/vt/vtgate/semantics/semantic_state_test.go | 8 +- go/vt/vtgate/semantics/table_collector.go | 18 +- go/vt/vtgate/semantics/table_set.go | 2 +- go/vt/vtgate/semantics/typer.go | 8 +- go/vt/vtgate/semantics/typer_test.go | 6 +- go/vt/vtgate/semantics/vindex_table.go | 4 +- go/vt/vtgate/semantics/vtable.go | 8 +- .../simplifier/expression_simplifier.go | 4 +- go/vt/vtgate/simplifier/simplifier.go | 6 +- go/vt/vtgate/simplifier/simplifier_test.go | 10 +- go/vt/vtgate/status.go | 4 +- go/vt/vtgate/status_test.go | 2 +- go/vt/vtgate/tabletgateway.go | 30 +- go/vt/vtgate/tabletgateway_flaky_test.go | 16 +- go/vt/vtgate/tabletgateway_test.go | 18 +- go/vt/vtgate/tx_conn.go | 24 +- go/vt/vtgate/tx_conn_test.go | 24 +- go/vt/vtgate/vcursor_impl.go | 58 +- go/vt/vtgate/vcursor_impl_test.go | 18 +- go/vt/vtgate/vindexes/binary.go | 4 +- go/vt/vtgate/vindexes/binary_test.go | 4 +- go/vt/vtgate/vindexes/binarymd5.go | 4 +- go/vt/vtgate/vindexes/binarymd5_test.go | 4 +- go/vt/vtgate/vindexes/cached_size.go | 38 +- go/vt/vtgate/vindexes/cfc.go | 10 +- go/vt/vtgate/vindexes/cfc_test.go | 10 +- go/vt/vtgate/vindexes/consistent_lookup.go | 20 +- .../vtgate/vindexes/consistent_lookup_test.go | 26 +- go/vt/vtgate/vindexes/foreign_keys.go | 2 +- go/vt/vtgate/vindexes/fuzz.go | 4 +- go/vt/vtgate/vindexes/hash.go | 4 +- go/vt/vtgate/vindexes/hash_test.go | 4 +- go/vt/vtgate/vindexes/lookup.go | 8 +- go/vt/vtgate/vindexes/lookup_hash.go | 10 +- go/vt/vtgate/vindexes/lookup_hash_test.go | 6 +- .../vindexes/lookup_hash_unique_test.go | 6 +- go/vt/vtgate/vindexes/lookup_internal.go | 10 +- go/vt/vtgate/vindexes/lookup_test.go | 20 +- .../vindexes/lookup_unicodeloosemd5_hash.go | 8 +- .../lookup_unicodeloosemd5_hash_test.go | 8 +- go/vt/vtgate/vindexes/lookup_unique_test.go | 8 +- go/vt/vtgate/vindexes/multicol.go | 8 +- go/vt/vtgate/vindexes/multicol_test.go | 10 +- go/vt/vtgate/vindexes/null.go | 4 +- go/vt/vtgate/vindexes/null_test.go | 4 +- go/vt/vtgate/vindexes/numeric.go | 4 +- go/vt/vtgate/vindexes/numeric_static_map.go | 8 +- .../vindexes/numeric_static_map_test.go | 8 +- go/vt/vtgate/vindexes/numeric_test.go | 4 +- go/vt/vtgate/vindexes/region_experimental.go | 8 +- .../vindexes/region_experimental_test.go | 10 +- go/vt/vtgate/vindexes/region_json.go | 6 +- go/vt/vtgate/vindexes/reverse_bits.go | 4 +- go/vt/vtgate/vindexes/reverse_bits_test.go | 4 +- go/vt/vtgate/vindexes/unicode.go | 4 +- go/vt/vtgate/vindexes/unicode_hash_test.go | 4 +- go/vt/vtgate/vindexes/unicode_test.go | 2 +- go/vt/vtgate/vindexes/unicodeloosemd5.go | 4 +- go/vt/vtgate/vindexes/unicodeloosemd5_test.go | 4 +- go/vt/vtgate/vindexes/unicodeloosexxhash.go | 4 +- .../vindexes/unicodeloosexxhash_test.go | 4 +- go/vt/vtgate/vindexes/vindex.go | 20 +- go/vt/vtgate/vindexes/vindex_test.go | 4 +- go/vt/vtgate/vindexes/vschema.go | 26 +- go/vt/vtgate/vindexes/vschema_test.go | 18 +- go/vt/vtgate/vindexes/xxhash.go | 4 +- go/vt/vtgate/vindexes/xxhash_test.go | 4 +- go/vt/vtgate/vschema_manager.go | 22 +- go/vt/vtgate/vschema_manager_test.go | 10 +- go/vt/vtgate/vschema_stats.go | 2 +- go/vt/vtgate/vschemaacl/vschemaacl.go | 4 +- go/vt/vtgate/vschemaacl/vschemaacl_test.go | 2 +- go/vt/vtgate/vstream_manager.go | 30 +- go/vt/vtgate/vstream_manager_test.go | 32 +- go/vt/vtgate/vtgate.go | 50 +- go/vt/vtgate/vtgate_test.go | 18 +- go/vt/vtgate/vtgateconn/vtgateconn.go | 16 +- go/vt/vtgate/vtgateservice/interface.go | 10 +- go/vt/vthash/hash.go | 4 +- go/vt/vtorc/collection/collection.go | 4 +- go/vt/vtorc/config/config.go | 2 +- go/vt/vtorc/db/db.go | 6 +- go/vt/vtorc/discovery/aggregated.go | 2 +- go/vt/vtorc/discovery/queue.go | 4 +- go/vt/vtorc/inst/analysis.go | 4 +- go/vt/vtorc/inst/analysis_dao.go | 20 +- go/vt/vtorc/inst/analysis_dao_test.go | 8 +- go/vt/vtorc/inst/audit_dao.go | 8 +- go/vt/vtorc/inst/audit_dao_test.go | 10 +- go/vt/vtorc/inst/binlog_test.go | 2 +- go/vt/vtorc/inst/instance_dao.go | 28 +- go/vt/vtorc/inst/instance_dao_test.go | 12 +- go/vt/vtorc/inst/instance_test.go | 2 +- go/vt/vtorc/inst/keyspace_dao.go | 10 +- go/vt/vtorc/inst/keyspace_dao_test.go | 10 +- go/vt/vtorc/inst/replication_thread_state.go | 2 +- go/vt/vtorc/inst/shard_dao.go | 10 +- go/vt/vtorc/inst/shard_dao_test.go | 8 +- go/vt/vtorc/inst/tablet_dao.go | 16 +- go/vt/vtorc/inst/tablet_dao_test.go | 10 +- go/vt/vtorc/logic/disable_recovery.go | 6 +- go/vt/vtorc/logic/keyspace_shard_discovery.go | 6 +- .../logic/keyspace_shard_discovery_test.go | 14 +- go/vt/vtorc/logic/tablet_discovery.go | 24 +- go/vt/vtorc/logic/tablet_discovery_test.go | 20 +- go/vt/vtorc/logic/topology_recovery.go | 20 +- go/vt/vtorc/logic/topology_recovery_dao.go | 10 +- .../vtorc/logic/topology_recovery_dao_test.go | 8 +- go/vt/vtorc/logic/topology_recovery_test.go | 14 +- go/vt/vtorc/logic/vtorc.go | 18 +- go/vt/vtorc/metrics/metrics.go | 2 +- go/vt/vtorc/process/health.go | 4 +- go/vt/vtorc/server/api.go | 14 +- go/vt/vtorc/server/api_test.go | 2 +- go/vt/vtorc/server/discovery.go | 4 +- go/vt/vtorc/test/db.go | 6 +- go/vt/vtorc/test/recovery_analysis.go | 4 +- .../filecustomrule/filecustomrule.go | 8 +- .../filecustomrule/filecustomrule_test.go | 4 +- .../topocustomrule/topocustomrule.go | 10 +- .../topocustomrule/topocustomrule_test.go | 6 +- go/vt/vttablet/endtoend/acl_test.go | 8 +- go/vt/vttablet/endtoend/call_test.go | 2 +- go/vt/vttablet/endtoend/compatibility_test.go | 8 +- go/vt/vttablet/endtoend/config_test.go | 16 +- .../endtoend/connkilling/connkiller_test.go | 2 +- .../endtoend/connkilling/main_test.go | 14 +- go/vt/vttablet/endtoend/endtoend.go | 4 +- go/vt/vttablet/endtoend/framework/client.go | 12 +- .../endtoend/framework/eventcatcher.go | 4 +- go/vt/vttablet/endtoend/framework/server.go | 38 +- go/vt/vttablet/endtoend/framework/testcase.go | 6 +- go/vt/vttablet/endtoend/healthstream_test.go | 4 +- go/vt/vttablet/endtoend/main_test.go | 14 +- go/vt/vttablet/endtoend/metadata_test.go | 8 +- go/vt/vttablet/endtoend/misc_test.go | 16 +- go/vt/vttablet/endtoend/queries_test.go | 8 +- go/vt/vttablet/endtoend/reserve_test.go | 2 +- go/vt/vttablet/endtoend/rpc_test.go | 8 +- go/vt/vttablet/endtoend/savepoint_test.go | 2 +- go/vt/vttablet/endtoend/sequence_test.go | 10 +- go/vt/vttablet/endtoend/settings_test.go | 2 +- go/vt/vttablet/endtoend/stream_test.go | 8 +- .../streamtimeout/healthstream_test.go | 6 +- .../endtoend/streamtimeout/main_test.go | 8 +- go/vt/vttablet/endtoend/transaction_test.go | 16 +- go/vt/vttablet/endtoend/udfs_test.go | 8 +- go/vt/vttablet/endtoend/views_test.go | 8 +- go/vt/vttablet/endtoend/vstreamer_test.go | 12 +- go/vt/vttablet/faketmclient/fake_client.go | 22 +- go/vt/vttablet/filelogger/filelogger.go | 8 +- go/vt/vttablet/filelogger/filelogger_test.go | 4 +- go/vt/vttablet/flags.go | 2 +- go/vt/vttablet/grpcqueryservice/server.go | 18 +- go/vt/vttablet/grpctabletconn/conn.go | 24 +- go/vt/vttablet/grpctabletconn/conn_test.go | 18 +- go/vt/vttablet/grpctmclient/cached_client.go | 16 +- .../grpctmclient/cached_client_flaky_test.go | 8 +- go/vt/vttablet/grpctmclient/client.go | 34 +- go/vt/vttablet/grpctmclient/client_test.go | 6 +- go/vt/vttablet/grpctmserver/server.go | 26 +- go/vt/vttablet/grpctmserver/server_test.go | 8 +- go/vt/vttablet/onlineddl/analysis.go | 12 +- go/vt/vttablet/onlineddl/analysis_test.go | 4 +- go/vt/vttablet/onlineddl/executor.go | 58 +- go/vt/vttablet/onlineddl/executor_test.go | 10 +- go/vt/vttablet/onlineddl/ghost.go | 2 +- go/vt/vttablet/onlineddl/util.go | 2 +- go/vt/vttablet/onlineddl/vrepl.go | 32 +- go/vt/vttablet/onlineddl/vrepl/columns.go | 2 +- go/vt/vttablet/onlineddl/vrepl/foreign_key.go | 6 +- .../onlineddl/vrepl/foreign_key_test.go | 2 +- go/vt/vttablet/onlineddl/vrepl/parser.go | 6 +- go/vt/vttablet/onlineddl/vrepl/parser_test.go | 2 +- go/vt/vttablet/onlineddl/vrepl/types.go | 2 +- .../queryservice/fakes/error_query_service.go | 4 +- .../fakes/stream_health_query_service.go | 8 +- go/vt/vttablet/queryservice/queryservice.go | 8 +- go/vt/vttablet/queryservice/wrapped.go | 10 +- go/vt/vttablet/sandboxconn/sandboxconn.go | 24 +- go/vt/vttablet/sysloglogger/sysloglogger.go | 6 +- .../sysloglogger/sysloglogger_test.go | 4 +- go/vt/vttablet/tabletconn/grpc_error.go | 4 +- go/vt/vttablet/tabletconn/grpc_error_test.go | 4 +- go/vt/vttablet/tabletconn/tablet_conn.go | 16 +- .../tabletconntest/fakequeryservice.go | 14 +- .../vttablet/tabletconntest/tabletconntest.go | 24 +- .../tabletmanager/events/state_change.go | 2 +- .../vttablet/tabletmanager/framework_test.go | 42 +- go/vt/vttablet/tabletmanager/restore.go | 48 +- go/vt/vttablet/tabletmanager/rpc_actions.go | 14 +- go/vt/vttablet/tabletmanager/rpc_agent.go | 16 +- go/vt/vttablet/tabletmanager/rpc_backup.go | 18 +- .../vttablet/tabletmanager/rpc_lock_tables.go | 8 +- go/vt/vttablet/tabletmanager/rpc_query.go | 18 +- .../vttablet/tabletmanager/rpc_query_test.go | 18 +- .../vttablet/tabletmanager/rpc_replication.go | 26 +- go/vt/vttablet/tabletmanager/rpc_schema.go | 12 +- go/vt/vttablet/tabletmanager/rpc_server.go | 10 +- go/vt/vttablet/tabletmanager/rpc_throttler.go | 12 +- go/vt/vttablet/tabletmanager/rpc_vdiff.go | 2 +- .../tabletmanager/rpc_vreplication.go | 30 +- .../tabletmanager/rpc_vreplication_test.go | 44 +- go/vt/vttablet/tabletmanager/shard_sync.go | 18 +- .../vttablet/tabletmanager/shard_sync_test.go | 12 +- go/vt/vttablet/tabletmanager/shard_watcher.go | 4 +- go/vt/vttablet/tabletmanager/tm_init.go | 54 +- go/vt/vttablet/tabletmanager/tm_init_test.go | 40 +- go/vt/vttablet/tabletmanager/tm_state.go | 26 +- go/vt/vttablet/tabletmanager/tm_state_test.go | 26 +- go/vt/vttablet/tabletmanager/vdiff/action.go | 18 +- .../tabletmanager/vdiff/action_test.go | 10 +- .../tabletmanager/vdiff/controller.go | 26 +- go/vt/vttablet/tabletmanager/vdiff/cursor.go | 8 +- go/vt/vttablet/tabletmanager/vdiff/engine.go | 24 +- .../tabletmanager/vdiff/engine_test.go | 8 +- .../tabletmanager/vdiff/framework_test.go | 42 +- .../tabletmanager/vdiff/primitive_executor.go | 8 +- go/vt/vttablet/tabletmanager/vdiff/report.go | 4 +- .../tabletmanager/vdiff/shard_streamer.go | 8 +- go/vt/vttablet/tabletmanager/vdiff/stats.go | 2 +- .../tabletmanager/vdiff/stats_test.go | 4 +- .../tabletmanager/vdiff/table_differ.go | 42 +- .../tabletmanager/vdiff/table_plan.go | 24 +- go/vt/vttablet/tabletmanager/vdiff/utils.go | 12 +- .../tabletmanager/vdiff/workflow_differ.go | 32 +- .../vdiff/workflow_differ_test.go | 16 +- .../tabletmanager/vreplication/controller.go | 22 +- .../vreplication/controller_plan.go | 6 +- .../vreplication/controller_plan_test.go | 2 +- .../vreplication/controller_test.go | 20 +- .../tabletmanager/vreplication/engine.go | 36 +- .../tabletmanager/vreplication/engine_test.go | 8 +- .../vreplication/external_connector.go | 30 +- .../vreplication/external_connector_test.go | 6 +- .../tabletmanager/vreplication/flags.go | 2 +- .../vreplication/framework_test.go | 54 +- .../tabletmanager/vreplication/fuzz.go | 12 +- .../vreplication/insert_generator.go | 6 +- .../vreplication/insert_generator_test.go | 2 +- .../vreplication/journal_test.go | 4 +- .../tabletmanager/vreplication/relaylog.go | 4 +- .../vreplication/replica_connector.go | 16 +- .../vreplication/replicator_plan.go | 30 +- .../vreplication/replicator_plan_test.go | 10 +- .../tabletmanager/vreplication/stats.go | 8 +- .../tabletmanager/vreplication/stats_test.go | 10 +- .../vreplication/table_plan_builder.go | 24 +- .../vreplication/table_plan_partial.go | 16 +- .../tabletmanager/vreplication/utils.go | 20 +- .../tabletmanager/vreplication/utils_test.go | 8 +- .../tabletmanager/vreplication/vcopier.go | 28 +- .../vreplication/vcopier_atomic.go | 16 +- .../vreplication/vcopier_test.go | 16 +- .../tabletmanager/vreplication/vdbclient.go | 12 +- .../tabletmanager/vreplication/vplayer.go | 18 +- .../vreplication/vplayer_flaky_test.go | 20 +- .../tabletmanager/vreplication/vreplicator.go | 32 +- .../vreplication/vreplicator_test.go | 12 +- .../tabletmanager/vreplication/vrlog.go | 6 +- go/vt/vttablet/tabletserver/bench_test.go | 6 +- go/vt/vttablet/tabletserver/binlog_watcher.go | 8 +- go/vt/vttablet/tabletserver/cached_size.go | 8 +- .../vttablet/tabletserver/connpool/dbconn.go | 28 +- .../tabletserver/connpool/dbconn_test.go | 20 +- go/vt/vttablet/tabletserver/connpool/pool.go | 18 +- .../tabletserver/connpool/pool_test.go | 14 +- go/vt/vttablet/tabletserver/controller.go | 22 +- go/vt/vttablet/tabletserver/debugenv.go | 4 +- go/vt/vttablet/tabletserver/fuzz.go | 12 +- go/vt/vttablet/tabletserver/gc/tablegc.go | 28 +- .../vttablet/tabletserver/gc/tablegc_test.go | 2 +- .../vttablet/tabletserver/health_streamer.go | 30 +- .../tabletserver/health_streamer_test.go | 18 +- go/vt/vttablet/tabletserver/livequeryz.go | 6 +- .../vttablet/tabletserver/livequeryz_test.go | 2 +- go/vt/vttablet/tabletserver/messager/cache.go | 4 +- .../tabletserver/messager/cache_test.go | 2 +- .../vttablet/tabletserver/messager/engine.go | 20 +- .../tabletserver/messager/engine_test.go | 14 +- .../tabletserver/messager/message_manager.go | 24 +- .../messager/message_manager_test.go | 20 +- .../tabletserver/planbuilder/builder.go | 12 +- .../tabletserver/planbuilder/cached_size.go | 16 +- .../tabletserver/planbuilder/permission.go | 4 +- .../planbuilder/permission_test.go | 6 +- .../vttablet/tabletserver/planbuilder/plan.go | 16 +- .../tabletserver/planbuilder/plan_test.go | 8 +- .../tabletserver/planbuilder/query_gen.go | 2 +- go/vt/vttablet/tabletserver/query_engine.go | 46 +- .../tabletserver/query_engine_test.go | 32 +- go/vt/vttablet/tabletserver/query_executor.go | 48 +- .../tabletserver/query_executor_test.go | 52 +- go/vt/vttablet/tabletserver/query_list.go | 12 +- .../vttablet/tabletserver/query_list_test.go | 2 +- go/vt/vttablet/tabletserver/querylogz.go | 10 +- go/vt/vttablet/tabletserver/querylogz_test.go | 10 +- go/vt/vttablet/tabletserver/queryz.go | 8 +- go/vt/vttablet/tabletserver/queryz_test.go | 8 +- .../tabletserver/repltracker/poller.go | 8 +- .../tabletserver/repltracker/poller_test.go | 2 +- .../tabletserver/repltracker/reader.go | 22 +- .../tabletserver/repltracker/reader_test.go | 16 +- .../tabletserver/repltracker/repltracker.go | 16 +- .../repltracker/repltracker_test.go | 14 +- .../tabletserver/repltracker/writer.go | 26 +- .../tabletserver/repltracker/writer_test.go | 12 +- .../tabletserver/rules/cached_size.go | 20 +- go/vt/vttablet/tabletserver/rules/map.go | 4 +- go/vt/vttablet/tabletserver/rules/map_test.go | 2 +- go/vt/vttablet/tabletserver/rules/rules.go | 12 +- .../vttablet/tabletserver/rules/rules_test.go | 12 +- .../tabletserver/schema/cached_size.go | 12 +- go/vt/vttablet/tabletserver/schema/db.go | 12 +- go/vt/vttablet/tabletserver/schema/db_test.go | 18 +- go/vt/vttablet/tabletserver/schema/engine.go | 50 +- .../tabletserver/schema/engine_test.go | 36 +- .../vttablet/tabletserver/schema/historian.go | 18 +- .../tabletserver/schema/historian_test.go | 12 +- .../tabletserver/schema/load_table.go | 16 +- .../tabletserver/schema/load_table_test.go | 20 +- .../vttablet/tabletserver/schema/main_test.go | 6 +- go/vt/vttablet/tabletserver/schema/schema.go | 6 +- .../schema/schematest/schematest.go | 8 +- go/vt/vttablet/tabletserver/schema/schemaz.go | 6 +- go/vt/vttablet/tabletserver/schema/tracker.go | 22 +- .../tabletserver/schema/tracker_test.go | 12 +- go/vt/vttablet/tabletserver/state_manager.go | 16 +- .../tabletserver/state_manager_test.go | 20 +- .../tabletserver/stateful_connection.go | 26 +- .../tabletserver/stateful_connection_pool.go | 18 +- .../stateful_connection_pool_test.go | 10 +- go/vt/vttablet/tabletserver/status.go | 2 +- .../tabletserver/stream_consolidator.go | 10 +- .../stream_consolidator_flaky_test.go | 8 +- .../vttablet/tabletserver/tabletenv/config.go | 32 +- .../tabletserver/tabletenv/config_test.go | 22 +- go/vt/vttablet/tabletserver/tabletenv/env.go | 8 +- .../tabletserver/tabletenv/logstats.go | 12 +- .../tabletserver/tabletenv/logstats_test.go | 10 +- .../tabletserver/tabletenv/seconds_test.go | 2 +- .../vttablet/tabletserver/tabletenv/stats.go | 6 +- .../tabletenv/tabletenvtest/tabletenvtest.go | 4 +- go/vt/vttablet/tabletserver/tabletserver.go | 78 +- .../tabletserver/tabletserver_test.go | 42 +- go/vt/vttablet/tabletserver/testutils_test.go | 4 +- go/vt/vttablet/tabletserver/throttle/check.go | 8 +- .../tabletserver/throttle/check_result.go | 2 +- .../vttablet/tabletserver/throttle/client.go | 2 +- go/vt/vttablet/tabletserver/throttle/mysql.go | 4 +- .../throttle/mysql/mysql_inventory.go | 2 +- .../throttle/mysql/mysql_throttle_metric.go | 2 +- .../tabletserver/throttle/mysql/probe.go | 2 +- .../tabletserver/throttle/mysql_test.go | 4 +- .../tabletserver/throttle/throttler.go | 44 +- .../tabletserver/throttle/throttler_test.go | 22 +- go/vt/vttablet/tabletserver/twopc.go | 28 +- go/vt/vttablet/tabletserver/twopc_test.go | 6 +- go/vt/vttablet/tabletserver/twopcz.go | 6 +- go/vt/vttablet/tabletserver/tx/api.go | 8 +- go/vt/vttablet/tabletserver/tx/twopc.go | 2 +- go/vt/vttablet/tabletserver/tx_engine.go | 32 +- go/vt/vttablet/tabletserver/tx_engine_test.go | 12 +- go/vt/vttablet/tabletserver/tx_executor.go | 14 +- .../vttablet/tabletserver/tx_executor_test.go | 16 +- go/vt/vttablet/tabletserver/tx_pool.go | 30 +- go/vt/vttablet/tabletserver/tx_pool_test.go | 20 +- .../tabletserver/txlimiter/tx_limiter.go | 12 +- .../tabletserver/txlimiter/tx_limiter_test.go | 10 +- go/vt/vttablet/tabletserver/txlogz.go | 16 +- go/vt/vttablet/tabletserver/txlogz_test.go | 8 +- .../txserializer/tx_serializer.go | 18 +- .../txserializer/tx_serializer_test.go | 10 +- .../txthrottler/mock_healthcheck_test.go | 10 +- .../txthrottler/mock_throttler_test.go | 8 +- .../tabletserver/txthrottler/tx_throttler.go | 22 +- .../txthrottler/tx_throttler_test.go | 22 +- go/vt/vttablet/tabletserver/vstreamer/copy.go | 12 +- .../vttablet/tabletserver/vstreamer/engine.go | 38 +- .../tabletserver/vstreamer/engine_test.go | 12 +- go/vt/vttablet/tabletserver/vstreamer/fuzz.go | 8 +- .../vstreamer/helper_event_test.go | 18 +- .../tabletserver/vstreamer/local_vschema.go | 6 +- .../vstreamer/local_vschema_test.go | 6 +- .../tabletserver/vstreamer/main_test.go | 24 +- .../tabletserver/vstreamer/packet_size.go | 4 +- .../tabletserver/vstreamer/planbuilder.go | 30 +- .../vstreamer/planbuilder_test.go | 24 +- .../tabletserver/vstreamer/resultstreamer.go | 12 +- .../vstreamer/resultstreamer_test.go | 2 +- .../tabletserver/vstreamer/rowstreamer.go | 34 +- .../vstreamer/rowstreamer_test.go | 10 +- .../tabletserver/vstreamer/snapshot_conn.go | 16 +- .../vstreamer/snapshot_conn_test.go | 2 +- .../tabletserver/vstreamer/tablestreamer.go | 20 +- .../vstreamer/tablestreamer_test.go | 2 +- .../tabletserver/vstreamer/testenv/testenv.go | 32 +- .../tabletserver/vstreamer/uvstreamer.go | 24 +- .../vstreamer/uvstreamer_flaky_test.go | 14 +- .../tabletserver/vstreamer/vstreamer.go | 42 +- .../tabletserver/vstreamer/vstreamer_test.go | 18 +- go/vt/vttablet/tabletservermock/controller.go | 24 +- go/vt/vttablet/tmclient/rpc_client_api.go | 20 +- go/vt/vttablet/tmclienttest/tmclienttest.go | 6 +- go/vt/vttablet/tmrpctest/test_tm_rpc.go | 28 +- go/vt/vttest/environment.go | 4 +- go/vt/vttest/local_cluster.go | 24 +- go/vt/vttest/mysqlctl.go | 6 +- go/vt/vttest/plugin_consultopo.go | 2 +- go/vt/vttest/plugin_etcd2topo.go | 2 +- go/vt/vttest/plugin_grpctmclient.go | 2 +- go/vt/vttest/plugin_zk2topo.go | 2 +- go/vt/vttest/topoctl.go | 8 +- go/vt/vttest/toxiproxyctl.go | 8 +- go/vt/vttest/vtprocess.go | 4 +- go/vt/vttls/crl.go | 2 +- go/vt/vttls/vttls.go | 4 +- go/vt/wrangler/external_cluster.go | 2 +- go/vt/wrangler/external_cluster_test.go | 10 +- go/vt/wrangler/fake_dbclient_test.go | 6 +- go/vt/wrangler/fake_tablet_test.go | 42 +- go/vt/wrangler/keyspace.go | 16 +- go/vt/wrangler/materializer.go | 52 +- go/vt/wrangler/materializer_env_test.go | 32 +- go/vt/wrangler/materializer_test.go | 30 +- go/vt/wrangler/permissions.go | 12 +- go/vt/wrangler/reparent.go | 18 +- go/vt/wrangler/resharder.go | 30 +- go/vt/wrangler/resharder_env_test.go | 22 +- go/vt/wrangler/resharder_test.go | 10 +- go/vt/wrangler/schema.go | 26 +- go/vt/wrangler/schema_test.go | 4 +- go/vt/wrangler/shard.go | 6 +- go/vt/wrangler/split.go | 12 +- go/vt/wrangler/stream_migrater_test.go | 8 +- go/vt/wrangler/switcher.go | 4 +- go/vt/wrangler/switcher_dry_run.go | 8 +- go/vt/wrangler/switcher_interface.go | 4 +- go/vt/wrangler/tablet.go | 16 +- go/vt/wrangler/tablet_test.go | 10 +- go/vt/wrangler/testlib/backup_test.go | 36 +- .../testlib/copy_schema_shard_test.go | 28 +- .../testlib/emergency_reparent_shard_test.go | 26 +- .../testlib/external_reparent_test.go | 20 +- go/vt/wrangler/testlib/fake_tablet.go | 38 +- go/vt/wrangler/testlib/find_tablet_test.go | 18 +- go/vt/wrangler/testlib/permissions_test.go | 22 +- .../testlib/planned_reparent_shard_test.go | 28 +- go/vt/wrangler/testlib/reparent_utils_test.go | 26 +- go/vt/wrangler/testlib/semi_sync_test.go | 2 +- go/vt/wrangler/testlib/shard_test.go | 18 +- go/vt/wrangler/testlib/utils.go | 6 +- go/vt/wrangler/testlib/version_test.go | 16 +- go/vt/wrangler/testlib/vtctl_pipe.go | 14 +- go/vt/wrangler/testlib/vtctl_topo_test.go | 4 +- go/vt/wrangler/traffic_switcher.go | 50 +- go/vt/wrangler/traffic_switcher_env_test.go | 50 +- go/vt/wrangler/traffic_switcher_test.go | 18 +- go/vt/wrangler/validator.go | 4 +- go/vt/wrangler/vdiff.go | 66 +- go/vt/wrangler/vdiff2.go | 8 +- go/vt/wrangler/vdiff_env_test.go | 34 +- go/vt/wrangler/vdiff_test.go | 20 +- go/vt/wrangler/version.go | 8 +- go/vt/wrangler/vexec.go | 38 +- go/vt/wrangler/vexec_plan.go | 8 +- go/vt/wrangler/vexec_test.go | 14 +- go/vt/wrangler/workflow.go | 24 +- go/vt/wrangler/workflow_test.go | 20 +- go/vt/wrangler/wrangler.go | 18 +- go/vt/wrangler/wrangler_env_test.go | 34 +- go/vt/zkctl/zkconf.go | 6 +- go/vt/zkctl/zkctl.go | 6 +- go/vt/zkctl/zkctl_local.go | 4 +- go/vtbench/client.go | 22 +- go/vtbench/vtbench.go | 6 +- misc/errcheck_excludes.txt | 20 +- misc/git/hooks/asthelpers | 2 +- misc/git/hooks/goimports | 4 +- proto/binlogdata.proto | 2 +- proto/binlogservice.proto | 2 +- proto/logutil.proto | 2 +- proto/mysqlctl.proto | 2 +- proto/query.proto | 2 +- proto/queryservice.proto | 2 +- proto/replicationdata.proto | 2 +- proto/tableacl.proto | 2 +- proto/tabletmanagerdata.proto | 2 +- proto/tabletmanagerservice.proto | 2 +- proto/throttlerdata.proto | 2 +- proto/throttlerservice.proto | 2 +- proto/topodata.proto | 2 +- proto/vschema.proto | 2 +- proto/vtadmin.proto | 2 +- proto/vtctldata.proto | 2 +- proto/vtctlservice.proto | 2 +- proto/vtgate.proto | 2 +- proto/vtgateservice.proto | 2 +- proto/vtrpc.proto | 2 +- proto/vttest.proto | 2 +- proto/vttime.proto | 2 +- test.go | 2 +- test/README.md | 2 +- test/client/client.go | 2 +- test/config.json | 276 ++--- test/config_partial_keyspace.json | 32 +- test/templates/dockerfile.tpl | 8 +- tools/all_test_for_coverage.sh | 18 +- tools/build_version_flags.sh | 12 +- tools/rowlog/rowlog.go | 40 +- vitess-mixin/e2e/vtcompose/vtcompose.go | 2 +- vitess-mixin/go.mod | 2 +- vitess-mixin/go.sum | 4 +- 2309 files changed, 11602 insertions(+), 11602 deletions(-) diff --git a/Makefile b/Makefile index 3dc622dc1ee..a48edaebfee 100644 --- a/Makefile +++ b/Makefile @@ -178,11 +178,11 @@ demo: sizegen: go run ./go/tools/sizegen/sizegen.go \ --in ./go/... \ - --gen github.com/mdibaiee/vitess/go/pools/smartconnpool.Setting \ - --gen github.com/mdibaiee/vitess/go/vt/schema.DDLStrategySetting \ - --gen github.com/mdibaiee/vitess/go/vt/vtgate/engine.Plan \ - --gen github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver.TabletPlan \ - --gen github.com/mdibaiee/vitess/go/sqltypes.Result + --gen github.com/vitess/vitess/go/pools/smartconnpool.Setting \ + --gen github.com/vitess/vitess/go/vt/schema.DDLStrategySetting \ + --gen github.com/vitess/vitess/go/vt/vtgate/engine.Plan \ + --gen github.com/vitess/vitess/go/vt/vttablet/tabletserver.TabletPlan \ + --gen github.com/vitess/vitess/go/sqltypes.Result # To pass extra flags, run test.go manually. # For example: go run test.go -docker=false -- --extra-flag @@ -216,7 +216,7 @@ e2e_test: build # Run the code coverage tools, compute aggregate. unit_test_cover: build dependency_check demo source build.env - go test $(VT_GO_PARALLEL) -count=1 -failfast -covermode=atomic -coverpkg=github.com/mdibaiee/vitess/go/... -coverprofile=coverage.out ./go/... + go test $(VT_GO_PARALLEL) -count=1 -failfast -covermode=atomic -coverpkg=github.com/vitess/vitess/go/... -coverprofile=coverage.out ./go/... # Handle go tool cover failures due to not handling `//line` directives, which # the goyacc compiler adds to the generated parser in sql.go. See: # https://github.com/golang/go/issues/41222 @@ -269,12 +269,12 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto --go-grpc_out=. --plugin protoc-gen-go-grpc="${VTROOTBIN}/protoc-gen-go-grpc" \ --go-vtproto_out=. --plugin protoc-gen-go-vtproto="${VTROOTBIN}/protoc-gen-go-vtproto" \ --go-vtproto_opt=features=marshal+unmarshal+size+pool+clone \ - --go-vtproto_opt=pool=github.com/mdibaiee/vitess/go/vt/proto/query.Row \ - --go-vtproto_opt=pool=github.com/mdibaiee/vitess/go/vt/proto/binlogdata.VStreamRowsResponse \ - --go-vtproto_opt=pool=github.com/mdibaiee/vitess/go/vt/proto/binlogdata.VStreamTablesResponse \ + --go-vtproto_opt=pool=github.com/vitess/vitess/go/vt/proto/query.Row \ + --go-vtproto_opt=pool=github.com/vitess/vitess/go/vt/proto/binlogdata.VStreamRowsResponse \ + --go-vtproto_opt=pool=github.com/vitess/vitess/go/vt/proto/binlogdata.VStreamTablesResponse \ -I${PWD}/dist/vt-protoc-21.3/include:proto $(PROTO_SRCS) - cp -Rf github.com/mdibaiee/vitess/go/vt/proto/* go/vt/proto - rm -rf github.com/mdibaiee/vitess/go/vt/proto/ + cp -Rf github.com/vitess/vitess/go/vt/proto/* go/vt/proto + rm -rf github.com/vitess/vitess/go/vt/proto/ # Helper targets for building Docker images. # Please read docker/README.md to understand the different available images. diff --git a/README.md b/README.md index 3b9c92d7232..cb5b09eaeda 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.vitess/vitess-jdbc/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.vitess/vitess-jdbc) [![Coverage Status](https://codecov.io/gh/vitessio/vitess/branch/main/graph/badge.svg)](https://app.codecov.io/gh/vitessio/vitess/tree/main) -[![Go Report Card](https://goreportcard.com/badge/github.com/mdibaiee/vitess)](https://goreportcard.com/report/github.com/mdibaiee/vitess) +[![Go Report Card](https://goreportcard.com/badge/github.com/vitess/vitess)](https://goreportcard.com/report/github.com/vitess/vitess) [![FOSSA Status](https://app.fossa.com/api/projects/custom%2B162%2Fvitess.svg?type=shield&issueType=license)](https://app.fossa.com/projects/custom%2B162%2Fvitess?ref=badge_shield&issueType=license) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1724/badge)](https://bestpractices.coreinfrastructure.org/projects/1724) diff --git a/changelog/16.0/16.0.0/release_notes.md b/changelog/16.0/16.0.0/release_notes.md index 490d65ade48..64c2fef9143 100644 --- a/changelog/16.0/16.0.0/release_notes.md +++ b/changelog/16.0/16.0.0/release_notes.md @@ -514,7 +514,7 @@ Here are sample results from a 2020-era Mac M1 with 16 GiB of memory: $ go test -bench=BenchmarkCompress ./go/vt/mysqlctl -run=NONE -timeout=12h -benchtime=1x -v goos: darwin goarch: arm64 -pkg: github.com/mdibaiee/vitess/go/vt/mysqlctl +pkg: github.com/vitess/vitess/go/vt/mysqlctl BenchmarkCompressLz4Builtin compression_benchmark_test.go:310: downloading data from https://www.dropbox.com/s/raw/smmgifsooy5qytd/enwiki-20080103-pages-articles.ibd.tar.zst BenchmarkCompressLz4Builtin-8 1 11737493087 ns/op 577.98 MB/s 2.554 compression-ratio diff --git a/changelog/16.0/16.0.0/summary.md b/changelog/16.0/16.0.0/summary.md index a1fb0d43c48..ee8141c8ed8 100644 --- a/changelog/16.0/16.0.0/summary.md +++ b/changelog/16.0/16.0.0/summary.md @@ -512,7 +512,7 @@ Here are sample results from a 2020-era Mac M1 with 16 GiB of memory: $ go test -bench=BenchmarkCompress ./go/vt/mysqlctl -run=NONE -timeout=12h -benchtime=1x -v goos: darwin goarch: arm64 -pkg: github.com/mdibaiee/vitess/go/vt/mysqlctl +pkg: github.com/vitess/vitess/go/vt/mysqlctl BenchmarkCompressLz4Builtin compression_benchmark_test.go:310: downloading data from https://www.dropbox.com/s/raw/smmgifsooy5qytd/enwiki-20080103-pages-articles.ibd.tar.zst BenchmarkCompressLz4Builtin-8 1 11737493087 ns/op 577.98 MB/s 2.554 compression-ratio diff --git a/changelog/17.0/17.0.0/changelog.md b/changelog/17.0/17.0.0/changelog.md index 301a49a94b9..cc1807b8217 100644 --- a/changelog/17.0/17.0.0/changelog.md +++ b/changelog/17.0/17.0.0/changelog.md @@ -184,8 +184,8 @@ * Update additional Go dependencies [#12401](https://github.com/vitessio/vitess/pull/12401) * Fix another mixin dep [#12403](https://github.com/vitessio/vitess/pull/12403) #### Observability - * Bump github.com/mdibaiee/vitess from 0.15.2 to 0.16.1 in /vitess-mixin [#12875](https://github.com/vitessio/vitess/pull/12875) - * build(deps): bump github.com/mdibaiee/vitess from 0.16.1 to 0.16.2 in /vitess-mixin [#13076](https://github.com/vitessio/vitess/pull/13076) + * Bump github.com/vitess/vitess from 0.15.2 to 0.16.1 in /vitess-mixin [#12875](https://github.com/vitessio/vitess/pull/12875) + * build(deps): bump github.com/vitess/vitess from 0.16.1 to 0.16.2 in /vitess-mixin [#13076](https://github.com/vitessio/vitess/pull/13076) #### VTAdmin * Bump dns-packet from 5.3.1 to 5.4.0 in /web/vtadmin [#12545](https://github.com/vitessio/vitess/pull/12545) * Bump webpack from 5.65.0 to 5.76.1 in /web/vtadmin [#12632](https://github.com/vitessio/vitess/pull/12632) diff --git a/changelog/20.0/20.0.0/changelog.md b/changelog/20.0/20.0.0/changelog.md index b6ddce0c97b..d67142ea920 100644 --- a/changelog/20.0/20.0.0/changelog.md +++ b/changelog/20.0/20.0.0/changelog.md @@ -169,7 +169,7 @@ * Upgrade the Golang Dependencies [#15823](https://github.com/vitessio/vitess/pull/15823) * Upgrade the Golang Dependencies [#15942](https://github.com/vitessio/vitess/pull/15942) #### Observability - * Bump github.com/mdibaiee/vitess from 0.16.2 to 0.17.7 in /vitess-mixin [#15918](https://github.com/vitessio/vitess/pull/15918) + * Bump github.com/vitess/vitess from 0.16.2 to 0.17.7 in /vitess-mixin [#15918](https://github.com/vitessio/vitess/pull/15918) * Update `github.com/Azure/go-autorest/autorest/adal` to fix Dependabot alert [#15986](https://github.com/vitessio/vitess/pull/15986) #### VTAdmin * Bump vite from 4.5.2 to 4.5.3 in /web/vtadmin [#15634](https://github.com/vitessio/vitess/pull/15634) diff --git a/changelog/20.0/20.0.0/release_notes.md b/changelog/20.0/20.0.0/release_notes.md index edbb5d55903..2dc530d676c 100644 --- a/changelog/20.0/20.0.0/release_notes.md +++ b/changelog/20.0/20.0.0/release_notes.md @@ -112,7 +112,7 @@ The following metric names have been changed in VTOrc. The old metrics are still #### ENUM and SET column handling in VTGate VStream API -The [VTGate VStream API](https://vitess.io/docs/reference/vreplication/vstream/) now returns [`ENUM`](https://dev.mysql.com/doc/refman/en/enum.html) and [`SET`](https://dev.mysql.com/doc/refman/en/set.html) column type values in [`VEvent`](https://pkg.go.dev/github.com/mdibaiee/vitess/go/vt/proto/binlogdata#VEvent) messages (in the embedded [`RowChange`](https://pkg.go.dev/github.com/mdibaiee/vitess/go/vt/proto/binlogdata#RowChange) messages) as their string values instead of the integer based ones — in both the copy/snapshot phase and the streaming phase. This change was done to make the `VStream` API more user-friendly, intuitive, and to align the behavior across both phases. Before [this change](https://github.com/vitessio/vitess/pull/15723) the values for [`ENUM`](https://dev.mysql.com/doc/refman/en/enum.html) and [`SET`](https://dev.mysql.com/doc/refman/en/set.html) columns were string values in the copy phase but integer values (which only have an internal meaning to MySQL) in the streaming phase. This inconsistency led to various [challenges and issues](https://github.com/vitessio/vitess/issues/15750) for each `VStream` client/consumer (e.g. the [`Debezium` Vitess connector](https://debezium.io/documentation/reference/stable/connectors/vitess.html) failed to properly perform a snapshot for tables containing these column types). Now the behavior is intuitive — clients need the string values as the eventual sink is often not MySQL so each consumer needed to perform the mappings themselves — and consistent. While this is a (potentially) breaking change, a new boolean field has been added to the [`FieldEvent`](https://pkg.go.dev/github.com/mdibaiee/vitess/go/vt/proto/binlogdata#FieldEvent) message called `EnumSetStringValues`. When that field is `false` (in Vitess v19 and older) then the consumer will need to perform the mappings during streaming phase, but not during copy phase. When this field is `true`, then no mapping is required. This will help to ensure a smooth transition for all consumers over time. To demonstrate, let's look at the textual output (printing the received `VEvents` as strings) when streaming a single `enum_set_test` table from the unsharded `commerce` keyspace so that we can see what the VStream looks like before and after when we start a new VStream in copy/snapshot mode and then transition to streaming mode for the following table: +The [VTGate VStream API](https://vitess.io/docs/reference/vreplication/vstream/) now returns [`ENUM`](https://dev.mysql.com/doc/refman/en/enum.html) and [`SET`](https://dev.mysql.com/doc/refman/en/set.html) column type values in [`VEvent`](https://pkg.go.dev/github.com/vitess/vitess/go/vt/proto/binlogdata#VEvent) messages (in the embedded [`RowChange`](https://pkg.go.dev/github.com/vitess/vitess/go/vt/proto/binlogdata#RowChange) messages) as their string values instead of the integer based ones — in both the copy/snapshot phase and the streaming phase. This change was done to make the `VStream` API more user-friendly, intuitive, and to align the behavior across both phases. Before [this change](https://github.com/vitessio/vitess/pull/15723) the values for [`ENUM`](https://dev.mysql.com/doc/refman/en/enum.html) and [`SET`](https://dev.mysql.com/doc/refman/en/set.html) columns were string values in the copy phase but integer values (which only have an internal meaning to MySQL) in the streaming phase. This inconsistency led to various [challenges and issues](https://github.com/vitessio/vitess/issues/15750) for each `VStream` client/consumer (e.g. the [`Debezium` Vitess connector](https://debezium.io/documentation/reference/stable/connectors/vitess.html) failed to properly perform a snapshot for tables containing these column types). Now the behavior is intuitive — clients need the string values as the eventual sink is often not MySQL so each consumer needed to perform the mappings themselves — and consistent. While this is a (potentially) breaking change, a new boolean field has been added to the [`FieldEvent`](https://pkg.go.dev/github.com/vitess/vitess/go/vt/proto/binlogdata#FieldEvent) message called `EnumSetStringValues`. When that field is `false` (in Vitess v19 and older) then the consumer will need to perform the mappings during streaming phase, but not during copy phase. When this field is `true`, then no mapping is required. This will help to ensure a smooth transition for all consumers over time. To demonstrate, let's look at the textual output (printing the received `VEvents` as strings) when streaming a single `enum_set_test` table from the unsharded `commerce` keyspace so that we can see what the VStream looks like before and after when we start a new VStream in copy/snapshot mode and then transition to streaming mode for the following table: ```sql CREATE TABLE `enum_set_test` ( @@ -175,7 +175,7 @@ An example key difference there being that `after:{lengths:1 lengths:9 lengths:1 If you're using the [`Debezium` Vitess connector](https://debezium.io/documentation/reference/stable/connectors/vitess.html), you should upgrade your connector to 2.7 (the next release) — which should contain [the relevant necessary changes](https://issues.redhat.com/browse/DBZ-7792) — *prior to upgrading Vitess* to v20.0.1 or later. If you're using any of the PlanetScale connectors ([`AirByte`](https://github.com/planetscale/airbyte-source/), [`FiveTran`](https://github.com/planetscale/fivetran-source), or [`singer-tap`](https://github.com/planetscale/singer-tap)) then no actions are required. -If you're using a custom `VStream` client/consumer, then you will need to build a new client with the updated v20 [binlogdata protos](https://pkg.go.dev/github.com/mdibaiee/vitess/go/vt/proto/binlogdata) ([source](https://github.com/vitessio/vitess/blob/main/proto/binlogdata.proto) for which would be in `main` or the `release-20.0` branch) before needing to support Vitess v20.0.1 or later. Your client will then be able to handle old and new messages, with older messages always having this new field set to `false`. +If you're using a custom `VStream` client/consumer, then you will need to build a new client with the updated v20 [binlogdata protos](https://pkg.go.dev/github.com/vitess/vitess/go/vt/proto/binlogdata) ([source](https://github.com/vitessio/vitess/blob/main/proto/binlogdata.proto) for which would be in `main` or the `release-20.0` branch) before needing to support Vitess v20.0.1 or later. Your client will then be able to handle old and new messages, with older messages always having this new field set to `false`. #### `shutdown_grace_period` Default Change diff --git a/changelog/20.0/20.0.0/summary.md b/changelog/20.0/20.0.0/summary.md index 21cf5a95a91..2bd5471fe45 100644 --- a/changelog/20.0/20.0.0/summary.md +++ b/changelog/20.0/20.0.0/summary.md @@ -111,7 +111,7 @@ The following metric names have been changed in VTOrc. The old metrics are still #### ENUM and SET column handling in VTGate VStream API -The [VTGate VStream API](https://vitess.io/docs/reference/vreplication/vstream/) now returns [`ENUM`](https://dev.mysql.com/doc/refman/en/enum.html) and [`SET`](https://dev.mysql.com/doc/refman/en/set.html) column type values in [`VEvent`](https://pkg.go.dev/github.com/mdibaiee/vitess/go/vt/proto/binlogdata#VEvent) messages (in the embedded [`RowChange`](https://pkg.go.dev/github.com/mdibaiee/vitess/go/vt/proto/binlogdata#RowChange) messages) as their string values instead of the integer based ones — in both the copy/snapshot phase and the streaming phase. This change was done to make the `VStream` API more user-friendly, intuitive, and to align the behavior across both phases. Before [this change](https://github.com/vitessio/vitess/pull/15723) the values for [`ENUM`](https://dev.mysql.com/doc/refman/en/enum.html) and [`SET`](https://dev.mysql.com/doc/refman/en/set.html) columns were string values in the copy phase but integer values (which only have an internal meaning to MySQL) in the streaming phase. This inconsistency led to various [challenges and issues](https://github.com/vitessio/vitess/issues/15750) for each `VStream` client/consumer (e.g. the [`Debezium` Vitess connector](https://debezium.io/documentation/reference/stable/connectors/vitess.html) failed to properly perform a snapshot for tables containing these column types). Now the behavior is intuitive — clients need the string values as the eventual sink is often not MySQL so each consumer needed to perform the mappings themselves — and consistent. While this is a (potentially) breaking change, a new boolean field has been added to the [`FieldEvent`](https://pkg.go.dev/github.com/mdibaiee/vitess/go/vt/proto/binlogdata#FieldEvent) message called `EnumSetStringValues`. When that field is `false` (in Vitess v19 and older) then the consumer will need to perform the mappings during streaming phase, but not during copy phase. When this field is `true`, then no mapping is required. This will help to ensure a smooth transition for all consumers over time. To demonstrate, let's look at the textual output (printing the received `VEvents` as strings) when streaming a single `enum_set_test` table from the unsharded `commerce` keyspace so that we can see what the VStream looks like before and after when we start a new VStream in copy/snapshot mode and then transition to streaming mode for the following table: +The [VTGate VStream API](https://vitess.io/docs/reference/vreplication/vstream/) now returns [`ENUM`](https://dev.mysql.com/doc/refman/en/enum.html) and [`SET`](https://dev.mysql.com/doc/refman/en/set.html) column type values in [`VEvent`](https://pkg.go.dev/github.com/vitess/vitess/go/vt/proto/binlogdata#VEvent) messages (in the embedded [`RowChange`](https://pkg.go.dev/github.com/vitess/vitess/go/vt/proto/binlogdata#RowChange) messages) as their string values instead of the integer based ones — in both the copy/snapshot phase and the streaming phase. This change was done to make the `VStream` API more user-friendly, intuitive, and to align the behavior across both phases. Before [this change](https://github.com/vitessio/vitess/pull/15723) the values for [`ENUM`](https://dev.mysql.com/doc/refman/en/enum.html) and [`SET`](https://dev.mysql.com/doc/refman/en/set.html) columns were string values in the copy phase but integer values (which only have an internal meaning to MySQL) in the streaming phase. This inconsistency led to various [challenges and issues](https://github.com/vitessio/vitess/issues/15750) for each `VStream` client/consumer (e.g. the [`Debezium` Vitess connector](https://debezium.io/documentation/reference/stable/connectors/vitess.html) failed to properly perform a snapshot for tables containing these column types). Now the behavior is intuitive — clients need the string values as the eventual sink is often not MySQL so each consumer needed to perform the mappings themselves — and consistent. While this is a (potentially) breaking change, a new boolean field has been added to the [`FieldEvent`](https://pkg.go.dev/github.com/vitess/vitess/go/vt/proto/binlogdata#FieldEvent) message called `EnumSetStringValues`. When that field is `false` (in Vitess v19 and older) then the consumer will need to perform the mappings during streaming phase, but not during copy phase. When this field is `true`, then no mapping is required. This will help to ensure a smooth transition for all consumers over time. To demonstrate, let's look at the textual output (printing the received `VEvents` as strings) when streaming a single `enum_set_test` table from the unsharded `commerce` keyspace so that we can see what the VStream looks like before and after when we start a new VStream in copy/snapshot mode and then transition to streaming mode for the following table: ```sql CREATE TABLE `enum_set_test` ( @@ -174,7 +174,7 @@ An example key difference there being that `after:{lengths:1 lengths:9 lengths:1 If you're using the [`Debezium` Vitess connector](https://debezium.io/documentation/reference/stable/connectors/vitess.html), you should upgrade your connector to 2.7 (the next release) — which should contain [the relevant necessary changes](https://issues.redhat.com/browse/DBZ-7792) — *prior to upgrading Vitess* to v20.0.1 or later. If you're using any of the PlanetScale connectors ([`AirByte`](https://github.com/planetscale/airbyte-source/), [`FiveTran`](https://github.com/planetscale/fivetran-source), or [`singer-tap`](https://github.com/planetscale/singer-tap)) then no actions are required. -If you're using a custom `VStream` client/consumer, then you will need to build a new client with the updated v20 [binlogdata protos](https://pkg.go.dev/github.com/mdibaiee/vitess/go/vt/proto/binlogdata) ([source](https://github.com/vitessio/vitess/blob/main/proto/binlogdata.proto) for which would be in `main` or the `release-20.0` branch) before needing to support Vitess v20.0.1 or later. Your client will then be able to handle old and new messages, with older messages always having this new field set to `false`. +If you're using a custom `VStream` client/consumer, then you will need to build a new client with the updated v20 [binlogdata protos](https://pkg.go.dev/github.com/vitess/vitess/go/vt/proto/binlogdata) ([source](https://github.com/vitessio/vitess/blob/main/proto/binlogdata.proto) for which would be in `main` or the `release-20.0` branch) before needing to support Vitess v20.0.1 or later. Your client will then be able to handle old and new messages, with older messages always having this new field set to `false`. #### `shutdown_grace_period` Default Change diff --git a/doc/DockerBuild.md b/doc/DockerBuild.md index a4bdb203830..d93cc5a1844 100644 --- a/doc/DockerBuild.md +++ b/doc/DockerBuild.md @@ -17,7 +17,7 @@ Then you can run our build script for the `lite` image which extracts the Vitess 1. Create an account on [Docker Hub](https://docs.docker.com/docker-hub/) and then `docker login` to it. -1. Go to your `src/github.com/mdibaiee/vitess` directory. +1. Go to your `src/github.com/vitess/vitess` directory. 1. Usually, you won't need to [build your own bootstrap image](https://github.com/vitessio/vitess/blob/main/docker/bootstrap/README.md) unless you edit [bootstrap.sh](https://github.com/vitessio/vitess/blob/main/bootstrap.sh) diff --git a/doc/viper/viper.md b/doc/viper/viper.md index e9e54f68007..56491591ea0 100644 --- a/doc/viper/viper.md +++ b/doc/viper/viper.md @@ -166,8 +166,8 @@ package trace import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/viperutil" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/viperutil" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/docker/bootstrap/Dockerfile.common b/docker/bootstrap/Dockerfile.common index 19e747c7a88..4012cffcd7b 100644 --- a/docker/bootstrap/Dockerfile.common +++ b/docker/bootstrap/Dockerfile.common @@ -20,16 +20,16 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins && rm -rf /var/lib/apt/lists/* # Set up Vitess environment (equivalent to '. dev.env') -ENV VTROOT /vt/src/github.com/mdibaiee/vitess +ENV VTROOT /vt/src/github.com/vitess/vitess ENV VTDATAROOT /vt/vtdataroot ENV VTPORTSTART 15000 ENV PATH $VTROOT/bin:$VTROOT/dist/maven/bin:$PATH ENV USER vitess # Copy files needed for bootstrap -COPY bootstrap.sh dev.env build.env go.mod go.sum /vt/src/github.com/mdibaiee/vitess/ -COPY config /vt/src/github.com/mdibaiee/vitess/config -COPY tools /vt/src/github.com/mdibaiee/vitess/tools +COPY bootstrap.sh dev.env build.env go.mod go.sum /vt/src/github.com/vitess/vitess/ +COPY config /vt/src/github.com/vitess/vitess/config +COPY tools /vt/src/github.com/vitess/vitess/tools # Create vitess user RUN groupadd -r vitess && useradd -r -g vitess vitess && \ @@ -37,7 +37,7 @@ RUN groupadd -r vitess && useradd -r -g vitess vitess && \ chown -R vitess:vitess /vt /home/vitess # Download vendored Go dependencies -RUN cd /vt/src/github.com/mdibaiee/vitess && \ +RUN cd /vt/src/github.com/vitess/vitess && \ su vitess -c "/usr/local/go/bin/go mod download" # Create mount point for actual data (e.g. MySQL data dir) @@ -45,10 +45,10 @@ VOLUME /vt/vtdataroot # The docker lite images copy from the builder in /vt/bin # Add compatibility to the previous layout for now -RUN su vitess -c "mkdir -p /vt/src/github.com/mdibaiee/vitess/bin && rm -rf /vt/bin && ln -s /vt/src/github.com/mdibaiee/vitess/bin /vt/bin" +RUN su vitess -c "mkdir -p /vt/src/github.com/vitess/vitess/bin && rm -rf /vt/bin && ln -s /vt/src/github.com/vitess/vitess/bin /vt/bin" # Bootstrap Vitess -WORKDIR /vt/src/github.com/mdibaiee/vitess +WORKDIR /vt/src/github.com/vitess/vitess USER vitess RUN ./bootstrap.sh diff --git a/docker/bootstrap/build.sh b/docker/bootstrap/build.sh index e85f4d62208..c9645fc6bd4 100755 --- a/docker/bootstrap/build.sh +++ b/docker/bootstrap/build.sh @@ -39,7 +39,7 @@ fi version="${2:-0}" if [[ ! -f bootstrap.sh ]]; then - echo "This script should be run from the root of the Vitess source tree - e.g. ~/src/github.com/mdibaiee/vitess" + echo "This script should be run from the root of the Vitess source tree - e.g. ~/src/github.com/vitess/vitess" exit 1 fi diff --git a/docker/lite/Dockerfile b/docker/lite/Dockerfile index 647010ea318..dd1a9cd5154 100644 --- a/docker/lite/Dockerfile +++ b/docker/lite/Dockerfile @@ -26,7 +26,7 @@ FROM "${image}" AS builder ARG BUILD_NUMBER # Re-copy sources from working tree. -COPY --chown=vitess:vitess . /vt/src/github.com/mdibaiee/vitess +COPY --chown=vitess:vitess . /vt/src/github.com/vitess/vitess # Build and install Vitess in a temporary output directory. USER vitess @@ -45,16 +45,16 @@ RUN groupadd -r vitess && useradd -r -g vitess vitess RUN mkdir -p /vt/vtdataroot && chown -R vitess:vitess /vt # Set up Vitess environment (just enough to run pre-built Go binaries) -ENV VTROOT /vt/src/github.com/mdibaiee/vitess +ENV VTROOT /vt/src/github.com/vitess/vitess ENV VTDATAROOT /vt/vtdataroot ENV PATH $VTROOT/bin:$PATH # Copy artifacts from builder layer. COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=builder --chown=vitess:vitess /vt/install /vt -COPY --from=builder --chown=vitess:vitess /vt/src/github.com/mdibaiee/vitess/web/vtadmin /vt/web/vtadmin -COPY --from=builder --chown=vitess:vitess /vt/src/github.com/mdibaiee/vitess/config/init_db.sql /vt/config/ -COPY --from=builder --chown=vitess:vitess /vt/src/github.com/mdibaiee/vitess/config/mycnf /vt/config/ +COPY --from=builder --chown=vitess:vitess /vt/src/github.com/vitess/vitess/web/vtadmin /vt/web/vtadmin +COPY --from=builder --chown=vitess:vitess /vt/src/github.com/vitess/vitess/config/init_db.sql /vt/config/ +COPY --from=builder --chown=vitess:vitess /vt/src/github.com/vitess/vitess/config/mycnf /vt/config/ # Create mount point for actual data (e.g. MySQL data dir) VOLUME /vt/vtdataroot diff --git a/docker/lite/Dockerfile.percona80 b/docker/lite/Dockerfile.percona80 index 7bbf2723d65..b617c159238 100644 --- a/docker/lite/Dockerfile.percona80 +++ b/docker/lite/Dockerfile.percona80 @@ -26,7 +26,7 @@ FROM "${image}" AS builder ARG BUILD_NUMBER # Re-copy sources from working tree. -COPY --chown=vitess:vitess . /vt/src/github.com/mdibaiee/vitess +COPY --chown=vitess:vitess . /vt/src/github.com/vitess/vitess # Build and install Vitess in a temporary output directory. USER vitess @@ -44,13 +44,13 @@ RUN groupadd -r vitess && useradd -r -g vitess vitess RUN mkdir -p /vt/vtdataroot && chown -R vitess:vitess /vt # Set up Vitess environment (just enough to run pre-built Go binaries) -ENV VTROOT /vt/src/github.com/mdibaiee/vitess +ENV VTROOT /vt/src/github.com/vitess/vitess ENV VTDATAROOT /vt/vtdataroot ENV PATH $VTROOT/bin:$PATH # Copy artifacts from builder layer. COPY --from=builder --chown=vitess:vitess /vt/install /vt -COPY --from=builder --chown=vitess:vitess /vt/src/github.com/mdibaiee/vitess/web/vtadmin /vt/web/vtadmin +COPY --from=builder --chown=vitess:vitess /vt/src/github.com/vitess/vitess/web/vtadmin /vt/web/vtadmin # Create mount point for actual data (e.g. MySQL data dir) VOLUME /vt/vtdataroot diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile index 0b814dc0f07..7035463ce1a 100644 --- a/docker/local/Dockerfile +++ b/docker/local/Dockerfile @@ -18,15 +18,15 @@ RUN echo "source /vt/common/env.sh" >> /etc/bash.bashrc ARG CGO_ENABLED=0 # Re-copy sources from working tree. -COPY --chown=vitess:vitess . /vt/src/github.com/mdibaiee/vitess +COPY --chown=vitess:vitess . /vt/src/github.com/vitess/vitess # Build and install Vitess in a temporary output directory. USER vitess -WORKDIR /vt/src/github.com/mdibaiee/vitess +WORKDIR /vt/src/github.com/vitess/vitess RUN make install PREFIX=/vt/install -ENV VTROOT /vt/src/github.com/mdibaiee/vitess +ENV VTROOT /vt/src/github.com/vitess/vitess ENV VTDATAROOT /vt/vtdataroot ENV PATH $VTROOT/bin:$PATH ENV PATH="/var/opt/etcd:${PATH}" diff --git a/docker/mini/Dockerfile b/docker/mini/Dockerfile index 771c1efd8e1..dc0bf417dcc 100644 --- a/docker/mini/Dockerfile +++ b/docker/mini/Dockerfile @@ -38,7 +38,7 @@ RUN echo "hostname=127.0.0.1" >> /vt/dist/scripts/env.sh RUN cat /vt/dist/scripts/env.sh | egrep "^alias" >> /etc/bash.bashrc # Set up Vitess environment (just enough to run pre-built Go binaries) -ENV VTROOT /vt/src/github.com/mdibaiee/vitess +ENV VTROOT /vt/src/github.com/vitess/vitess ENV VTDATAROOT /vt/vtdataroot ENV PATH $VTROOT/bin:$PATH ENV PATH="/vt/bin:${PATH}" diff --git a/docker/test/run.sh b/docker/test/run.sh index d9cd3611214..69e0dec53cb 100755 --- a/docker/test/run.sh +++ b/docker/test/run.sh @@ -112,7 +112,7 @@ if [[ -z "$cmd" ]]; then fi if [[ ! -f bootstrap.sh ]]; then - echo "This script should be run from the root of the Vitess source tree - e.g. ~/src/github.com/mdibaiee/vitess" + echo "This script should be run from the root of the Vitess source tree - e.g. ~/src/github.com/vitess/vitess" exit 1 fi @@ -171,15 +171,15 @@ if [[ -z "$existing_cache_image" ]]; then fi # Reset the environment if this was an old bootstrap. We can detect this from VTTOP presence. -bashcmd=$(append_cmd "$bashcmd" "export VTROOT=/vt/src/github.com/mdibaiee/vitess") +bashcmd=$(append_cmd "$bashcmd" "export VTROOT=/vt/src/github.com/vitess/vitess") bashcmd=$(append_cmd "$bashcmd" "export VTDATAROOT=/vt/vtdataroot") bashcmd=$(append_cmd "$bashcmd" "export EXTRA_BIN=/tmp/bin") bashcmd=$(append_cmd "$bashcmd" "mkdir -p dist; mkdir -p bin; mkdir -p lib; mkdir -p vthook") -bashcmd=$(append_cmd "$bashcmd" "rm -rf /vt/dist; ln -s /vt/src/github.com/mdibaiee/vitess/dist /vt/dist") -bashcmd=$(append_cmd "$bashcmd" "rm -rf /vt/bin; ln -s /vt/src/github.com/mdibaiee/vitess/bin /vt/bin") -bashcmd=$(append_cmd "$bashcmd" "rm -rf /vt/lib; ln -s /vt/src/github.com/mdibaiee/vitess/lib /vt/lib") -bashcmd=$(append_cmd "$bashcmd" "rm -rf /vt/vthook; ln -s /vt/src/github.com/mdibaiee/vitess/vthook /vt/vthook") +bashcmd=$(append_cmd "$bashcmd" "rm -rf /vt/dist; ln -s /vt/src/github.com/vitess/vitess/dist /vt/dist") +bashcmd=$(append_cmd "$bashcmd" "rm -rf /vt/bin; ln -s /vt/src/github.com/vitess/vitess/bin /vt/bin") +bashcmd=$(append_cmd "$bashcmd" "rm -rf /vt/lib; ln -s /vt/src/github.com/vitess/vitess/lib /vt/lib") +bashcmd=$(append_cmd "$bashcmd" "rm -rf /vt/vthook; ln -s /vt/src/github.com/vitess/vitess/vthook /vt/vthook") # Maven was setup in /vt/dist, may need to reinstall it. bashcmd=$(append_cmd "$bashcmd" "echo 'Checking if mvn needs installing...'; if [[ ! \$(command -v mvn) ]]; then echo 'install maven'; curl -sL --connect-timeout 10 --retry 3 http://www-us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz | tar -xz && mv apache-maven-3.3.9 /vt/dist/maven; fi; echo 'mvn check done'") diff --git a/docker/vttestserver/Dockerfile.mysql80 b/docker/vttestserver/Dockerfile.mysql80 index c1d69295518..7f95f00b90a 100644 --- a/docker/vttestserver/Dockerfile.mysql80 +++ b/docker/vttestserver/Dockerfile.mysql80 @@ -26,7 +26,7 @@ FROM "${image}" AS builder ARG BUILD_NUMBER # Re-copy sources from working tree. -COPY --chown=vitess:vitess . /vt/src/github.com/mdibaiee/vitess +COPY --chown=vitess:vitess . /vt/src/github.com/vitess/vitess # Build and install Vitess in a temporary output directory. USER vitess diff --git a/examples/compose/client.go b/examples/compose/client.go index b45706226a8..978a26d4b57 100644 --- a/examples/compose/client.go +++ b/examples/compose/client.go @@ -33,7 +33,7 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/vitessdriver" + "github.com/vitess/vitess/go/vt/vitessdriver" ) var ( diff --git a/examples/compose/vtcompose/vtcompose.go b/examples/compose/vtcompose/vtcompose.go index f692b125a87..9cd8c6d81a6 100644 --- a/examples/compose/vtcompose/vtcompose.go +++ b/examples/compose/vtcompose/vtcompose.go @@ -30,7 +30,7 @@ import ( yamlpatch "github.com/krishicks/yaml-patch" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) const ( diff --git a/examples/demo/demo.go b/examples/demo/demo.go index 045459c14f3..f75b39444e6 100644 --- a/examples/demo/demo.go +++ b/examples/demo/demo.go @@ -31,11 +31,11 @@ import ( "syscall" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" - "github.com/mdibaiee/vitess/go/vt/vttest" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" + "github.com/vitess/vitess/go/vt/vttest" ) var cluster *vttest.LocalCluster diff --git a/examples/local/vstream_client.go b/examples/local/vstream_client.go index 544d435e903..52e69fbbfe0 100644 --- a/examples/local/vstream_client.go +++ b/examples/local/vstream_client.go @@ -23,13 +23,13 @@ import ( "log" "time" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - _ "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctlclient" - _ "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateconn" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + _ "github.com/vitess/vitess/go/vt/vtctl/grpcvtctlclient" + _ "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateconn" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" ) /* diff --git a/go.mod b/go.mod index 02d3f353e64..28d96e550c1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/mdibaiee/vitess +module github.com/vitess/vitess go 1.22.4 diff --git a/go/README.md b/go/README.md index 8bc2e34092f..2cc2b74bce5 100644 --- a/go/README.md +++ b/go/README.md @@ -6,7 +6,7 @@ Most of the packages at the top level are general-purpose and are suitable for use outside Vitess. Packages that are specific to Vitess are in the *vt* subdirectory. Binaries are in the *cmd* subdirectory. -Please see [GoDoc](https://godoc.org/github.com/mdibaiee/vitess/go) for +Please see [GoDoc](https://godoc.org/github.com/vitess/vitess/go) for a listing of the packages and their purposes. vt/proto contains the compiled protos for go, one per each directory. @@ -15,6 +15,6 @@ import to XXXpb. For instance: ```go import ( - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) ``` diff --git a/go/acl/acl.go b/go/acl/acl.go index bc1c4103868..65a36191b48 100644 --- a/go/acl/acl.go +++ b/go/acl/acl.go @@ -42,7 +42,7 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // This is a list of predefined roles. Applications are free diff --git a/go/cache/theine/store.go b/go/cache/theine/store.go index 9feafce72dc..8f5648f85fe 100644 --- a/go/cache/theine/store.go +++ b/go/cache/theine/store.go @@ -26,7 +26,7 @@ import ( "github.com/gammazero/deque" - "github.com/mdibaiee/vitess/go/cache/theine/bf" + "github.com/vitess/vitess/go/cache/theine/bf" ) const ( diff --git a/go/cmd/internal/docgen/docgen.go b/go/cmd/internal/docgen/docgen.go index 6891277423b..0bd45dc1909 100644 --- a/go/cmd/internal/docgen/docgen.go +++ b/go/cmd/internal/docgen/docgen.go @@ -24,8 +24,8 @@ limitations under the License. // import ( // "github.com/spf13/cobra" // -// "github.com/mdibaiee/vitess/go/cmd/internal/docgen" -// vtctldclient "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command" +// "github.com/vitess/vitess/go/cmd/internal/docgen" +// vtctldclient "github.com/vitess/vitess/go/cmd/vtctldclient/command" // ) // // func main() { diff --git a/go/cmd/mysqlctl/command/init.go b/go/cmd/mysqlctl/command/init.go index db36316ea82..f6543ee2ea8 100644 --- a/go/cmd/mysqlctl/command/init.go +++ b/go/cmd/mysqlctl/command/init.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl" ) var Init = &cobra.Command{ diff --git a/go/cmd/mysqlctl/command/init_config.go b/go/cmd/mysqlctl/command/init_config.go index f9920c3e53b..81d24444d34 100644 --- a/go/cmd/mysqlctl/command/init_config.go +++ b/go/cmd/mysqlctl/command/init_config.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl" ) var InitConfig = &cobra.Command{ diff --git a/go/cmd/mysqlctl/command/plugin_prometheusbackend.go b/go/cmd/mysqlctl/command/plugin_prometheusbackend.go index 1c15e5d8c10..9d1a71661a1 100644 --- a/go/cmd/mysqlctl/command/plugin_prometheusbackend.go +++ b/go/cmd/mysqlctl/command/plugin_prometheusbackend.go @@ -20,8 +20,8 @@ package command // with the Prometheus client library import ( - "github.com/mdibaiee/vitess/go/stats/prometheusbackend" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/stats/prometheusbackend" + "github.com/vitess/vitess/go/vt/servenv" ) func init() { diff --git a/go/cmd/mysqlctl/command/position.go b/go/cmd/mysqlctl/command/position.go index 0d70cd673dd..d0062129421 100644 --- a/go/cmd/mysqlctl/command/position.go +++ b/go/cmd/mysqlctl/command/position.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/replication" ) var Position = &cobra.Command{ diff --git a/go/cmd/mysqlctl/command/reinit_config.go b/go/cmd/mysqlctl/command/reinit_config.go index b0f1854b097..4146ed652ea 100644 --- a/go/cmd/mysqlctl/command/reinit_config.go +++ b/go/cmd/mysqlctl/command/reinit_config.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl" ) var ReinitConfig = &cobra.Command{ diff --git a/go/cmd/mysqlctl/command/root.go b/go/cmd/mysqlctl/command/root.go index 62cafc5e864..96fa808f8b8 100644 --- a/go/cmd/mysqlctl/command/root.go +++ b/go/cmd/mysqlctl/command/root.go @@ -21,12 +21,12 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/acl" - vtcmd "github.com/mdibaiee/vitess/go/cmd" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/acl" + vtcmd "github.com/vitess/vitess/go/cmd" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/go/cmd/mysqlctl/command/shutdown.go b/go/cmd/mysqlctl/command/shutdown.go index 56217e38689..b713c2247a3 100644 --- a/go/cmd/mysqlctl/command/shutdown.go +++ b/go/cmd/mysqlctl/command/shutdown.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl" ) var Shutdown = &cobra.Command{ diff --git a/go/cmd/mysqlctl/command/start.go b/go/cmd/mysqlctl/command/start.go index 9b09ed67ef6..23f6249df81 100644 --- a/go/cmd/mysqlctl/command/start.go +++ b/go/cmd/mysqlctl/command/start.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/flagutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/flagutil" + "github.com/vitess/vitess/go/vt/mysqlctl" ) var Start = &cobra.Command{ diff --git a/go/cmd/mysqlctl/command/teardown.go b/go/cmd/mysqlctl/command/teardown.go index cbd282a7aa7..fb37dcb985e 100644 --- a/go/cmd/mysqlctl/command/teardown.go +++ b/go/cmd/mysqlctl/command/teardown.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl" ) var Teardown = &cobra.Command{ diff --git a/go/cmd/mysqlctl/docgen/main.go b/go/cmd/mysqlctl/docgen/main.go index df14ac64793..f4bef7665d2 100644 --- a/go/cmd/mysqlctl/docgen/main.go +++ b/go/cmd/mysqlctl/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/mysqlctl/command" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/mysqlctl/command" ) func main() { diff --git a/go/cmd/mysqlctl/mysqlctl.go b/go/cmd/mysqlctl/mysqlctl.go index c7204beda71..5b6c45a9c9b 100644 --- a/go/cmd/mysqlctl/mysqlctl.go +++ b/go/cmd/mysqlctl/mysqlctl.go @@ -18,8 +18,8 @@ limitations under the License. package main import ( - "github.com/mdibaiee/vitess/go/cmd/mysqlctl/command" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/mysqlctl/command" + "github.com/vitess/vitess/go/vt/log" ) func main() { diff --git a/go/cmd/mysqlctld/cli/mysqlctld.go b/go/cmd/mysqlctld/cli/mysqlctld.go index d74819806c7..ca238ba3270 100644 --- a/go/cmd/mysqlctld/cli/mysqlctld.go +++ b/go/cmd/mysqlctld/cli/mysqlctld.go @@ -27,13 +27,13 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/go/cmd/mysqlctld/cli/plugin_grpcmysqlctlserver.go b/go/cmd/mysqlctld/cli/plugin_grpcmysqlctlserver.go index 86ce2f49845..ce365503cbb 100644 --- a/go/cmd/mysqlctld/cli/plugin_grpcmysqlctlserver.go +++ b/go/cmd/mysqlctld/cli/plugin_grpcmysqlctlserver.go @@ -19,8 +19,8 @@ package cli // Import and register the gRPC mysqlctl server import ( - "github.com/mdibaiee/vitess/go/vt/mysqlctl/grpcmysqlctlserver" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/mysqlctl/grpcmysqlctlserver" + "github.com/vitess/vitess/go/vt/servenv" ) func init() { diff --git a/go/cmd/mysqlctld/cli/plugin_prometheusbackend.go b/go/cmd/mysqlctld/cli/plugin_prometheusbackend.go index d1d108c0817..42b9b833630 100644 --- a/go/cmd/mysqlctld/cli/plugin_prometheusbackend.go +++ b/go/cmd/mysqlctld/cli/plugin_prometheusbackend.go @@ -20,8 +20,8 @@ package cli // with the Prometheus client library import ( - "github.com/mdibaiee/vitess/go/stats/prometheusbackend" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/stats/prometheusbackend" + "github.com/vitess/vitess/go/vt/servenv" ) func init() { diff --git a/go/cmd/mysqlctld/docgen/main.go b/go/cmd/mysqlctld/docgen/main.go index 73681a74bff..c68a81bb460 100644 --- a/go/cmd/mysqlctld/docgen/main.go +++ b/go/cmd/mysqlctld/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/mysqlctld/cli" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/mysqlctld/cli" ) func main() { diff --git a/go/cmd/mysqlctld/mysqlctld.go b/go/cmd/mysqlctld/mysqlctld.go index 82be04a1737..1090173afff 100644 --- a/go/cmd/mysqlctld/mysqlctld.go +++ b/go/cmd/mysqlctld/mysqlctld.go @@ -20,8 +20,8 @@ limitations under the License. package main import ( - "github.com/mdibaiee/vitess/go/cmd/mysqlctld/cli" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/mysqlctld/cli" + "github.com/vitess/vitess/go/vt/log" ) func main() { diff --git a/go/cmd/rulesctl/cmd/add.go b/go/cmd/rulesctl/cmd/add.go index 2c16e93dab8..b4e7a34b649 100644 --- a/go/cmd/rulesctl/cmd/add.go +++ b/go/cmd/rulesctl/cmd/add.go @@ -7,9 +7,9 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/rulesctl/common" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder" - vtrules "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules" + "github.com/vitess/vitess/go/cmd/rulesctl/common" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder" + vtrules "github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules" ) var ( diff --git a/go/cmd/rulesctl/cmd/explain.go b/go/cmd/rulesctl/cmd/explain.go index 91a026d2262..bfdc2423480 100644 --- a/go/cmd/rulesctl/cmd/explain.go +++ b/go/cmd/rulesctl/cmd/explain.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder" ) func Explain() *cobra.Command { diff --git a/go/cmd/rulesctl/cmd/list.go b/go/cmd/rulesctl/cmd/list.go index 0801dc8adfe..d9df7e80a61 100644 --- a/go/cmd/rulesctl/cmd/list.go +++ b/go/cmd/rulesctl/cmd/list.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/rulesctl/common" + "github.com/vitess/vitess/go/cmd/rulesctl/common" ) func List() *cobra.Command { diff --git a/go/cmd/rulesctl/cmd/main.go b/go/cmd/rulesctl/cmd/main.go index f7c261be60d..3dae2bdddc0 100644 --- a/go/cmd/rulesctl/cmd/main.go +++ b/go/cmd/rulesctl/cmd/main.go @@ -3,8 +3,8 @@ package cmd import ( "github.com/spf13/cobra" - _flag "github.com/mdibaiee/vitess/go/internal/flag" - "github.com/mdibaiee/vitess/go/vt/logutil" + _flag "github.com/vitess/vitess/go/internal/flag" + "github.com/vitess/vitess/go/vt/logutil" ) var configFile string diff --git a/go/cmd/rulesctl/cmd/remove.go b/go/cmd/rulesctl/cmd/remove.go index 3a3b2d60f25..9a5ffa562ad 100644 --- a/go/cmd/rulesctl/cmd/remove.go +++ b/go/cmd/rulesctl/cmd/remove.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/rulesctl/common" + "github.com/vitess/vitess/go/cmd/rulesctl/common" ) func Remove() *cobra.Command { diff --git a/go/cmd/rulesctl/common/common.go b/go/cmd/rulesctl/common/common.go index ca3ee9d8b85..e25aa045cbc 100644 --- a/go/cmd/rulesctl/common/common.go +++ b/go/cmd/rulesctl/common/common.go @@ -6,8 +6,8 @@ import ( "log" "os" - vtfcr "github.com/mdibaiee/vitess/go/vt/vttablet/customrule/filecustomrule" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules" + vtfcr "github.com/vitess/vitess/go/vt/vttablet/customrule/filecustomrule" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules" ) func GetRules(path string) *rules.Rules { diff --git a/go/cmd/rulesctl/main.go b/go/cmd/rulesctl/main.go index 164787c0a33..a1ed6b195f3 100644 --- a/go/cmd/rulesctl/main.go +++ b/go/cmd/rulesctl/main.go @@ -3,11 +3,11 @@ package main import ( "log" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/cmd/rulesctl/cmd" - vtlog "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/cmd/rulesctl/cmd" + vtlog "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" ) func main() { diff --git a/go/cmd/topo2topo/cli/plugin_consultopo.go b/go/cmd/topo2topo/cli/plugin_consultopo.go index 326ebf0306e..d0bf1f8d051 100644 --- a/go/cmd/topo2topo/cli/plugin_consultopo.go +++ b/go/cmd/topo2topo/cli/plugin_consultopo.go @@ -19,5 +19,5 @@ package cli // This plugin imports consultopo to register the consul implementation of TopoServer. import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/consultopo" + _ "github.com/vitess/vitess/go/vt/topo/consultopo" ) diff --git a/go/cmd/topo2topo/cli/plugin_etcd2topo.go b/go/cmd/topo2topo/cli/plugin_etcd2topo.go index 67b3647ea8c..8f6c0f7f4b1 100644 --- a/go/cmd/topo2topo/cli/plugin_etcd2topo.go +++ b/go/cmd/topo2topo/cli/plugin_etcd2topo.go @@ -19,5 +19,5 @@ package cli // This plugin imports etcd2topo to register the etcd2 implementation of TopoServer. import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/etcd2topo" + _ "github.com/vitess/vitess/go/vt/topo/etcd2topo" ) diff --git a/go/cmd/topo2topo/cli/plugin_zk2topo.go b/go/cmd/topo2topo/cli/plugin_zk2topo.go index ff91fecf3e9..f2b2144cd79 100644 --- a/go/cmd/topo2topo/cli/plugin_zk2topo.go +++ b/go/cmd/topo2topo/cli/plugin_zk2topo.go @@ -18,5 +18,5 @@ package cli import ( // Imports and register the zk2 TopologyServer - _ "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + _ "github.com/vitess/vitess/go/vt/topo/zk2topo" ) diff --git a/go/cmd/topo2topo/cli/topo2topo.go b/go/cmd/topo2topo/cli/topo2topo.go index f57da2b89f3..c5ddf823c6c 100644 --- a/go/cmd/topo2topo/cli/topo2topo.go +++ b/go/cmd/topo2topo/cli/topo2topo.go @@ -22,13 +22,13 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/grpccommon" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/helpers" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/grpccommon" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/helpers" ) var ( diff --git a/go/cmd/topo2topo/docgen/main.go b/go/cmd/topo2topo/docgen/main.go index 157bfa89862..a3ac5f84de5 100644 --- a/go/cmd/topo2topo/docgen/main.go +++ b/go/cmd/topo2topo/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/topo2topo/cli" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/topo2topo/cli" ) func main() { diff --git a/go/cmd/topo2topo/topo2topo.go b/go/cmd/topo2topo/topo2topo.go index 017c5013d39..fb8fe2dd4c1 100644 --- a/go/cmd/topo2topo/topo2topo.go +++ b/go/cmd/topo2topo/topo2topo.go @@ -17,9 +17,9 @@ limitations under the License. package main import ( - "github.com/mdibaiee/vitess/go/cmd/topo2topo/cli" - "github.com/mdibaiee/vitess/go/exit" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/topo2topo/cli" + "github.com/vitess/vitess/go/exit" + "github.com/vitess/vitess/go/vt/log" ) func main() { diff --git a/go/cmd/vtaclcheck/cli/vtactlcheck.go b/go/cmd/vtaclcheck/cli/vtactlcheck.go index 35fad892e73..143eb8770f8 100644 --- a/go/cmd/vtaclcheck/cli/vtactlcheck.go +++ b/go/cmd/vtaclcheck/cli/vtactlcheck.go @@ -19,10 +19,10 @@ package cli import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtaclcheck" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtaclcheck" ) var ( diff --git a/go/cmd/vtaclcheck/docgen/main.go b/go/cmd/vtaclcheck/docgen/main.go index e0b8c87ccc8..5a63c279a2d 100644 --- a/go/cmd/vtaclcheck/docgen/main.go +++ b/go/cmd/vtaclcheck/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/vtaclcheck/cli" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/vtaclcheck/cli" ) func main() { diff --git a/go/cmd/vtaclcheck/vtaclcheck.go b/go/cmd/vtaclcheck/vtaclcheck.go index 2519d7518f6..d0b1703b9b2 100644 --- a/go/cmd/vtaclcheck/vtaclcheck.go +++ b/go/cmd/vtaclcheck/vtaclcheck.go @@ -19,9 +19,9 @@ package main import ( "fmt" - "github.com/mdibaiee/vitess/go/cmd/vtaclcheck/cli" - "github.com/mdibaiee/vitess/go/exit" - "github.com/mdibaiee/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/cmd/vtaclcheck/cli" + "github.com/vitess/vitess/go/exit" + "github.com/vitess/vitess/go/vt/logutil" ) func init() { diff --git a/go/cmd/vtadmin/main.go b/go/cmd/vtadmin/main.go index 6761c4d783b..0ed5566377e 100644 --- a/go/cmd/vtadmin/main.go +++ b/go/cmd/vtadmin/main.go @@ -23,19 +23,19 @@ import ( "github.com/spf13/cobra" - _flag "github.com/mdibaiee/vitess/go/internal/flag" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtadmin" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cache" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster" - "github.com/mdibaiee/vitess/go/vt/vtadmin/grpcserver" - vtadminhttp "github.com/mdibaiee/vitess/go/vt/vtadmin/http" - "github.com/mdibaiee/vitess/go/vt/vtadmin/http/debug" - "github.com/mdibaiee/vitess/go/vt/vtadmin/rbac" - "github.com/mdibaiee/vitess/go/vt/vtenv" + _flag "github.com/vitess/vitess/go/internal/flag" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtadmin" + "github.com/vitess/vitess/go/vt/vtadmin/cache" + "github.com/vitess/vitess/go/vt/vtadmin/cluster" + "github.com/vitess/vitess/go/vt/vtadmin/grpcserver" + vtadminhttp "github.com/vitess/vitess/go/vt/vtadmin/http" + "github.com/vitess/vitess/go/vt/vtadmin/http/debug" + "github.com/vitess/vitess/go/vt/vtadmin/rbac" + "github.com/vitess/vitess/go/vt/vtenv" ) var ( diff --git a/go/cmd/vtbackup/cli/plugin_azblobbackupstorage.go b/go/cmd/vtbackup/cli/plugin_azblobbackupstorage.go index c5079c60753..242df5c89de 100644 --- a/go/cmd/vtbackup/cli/plugin_azblobbackupstorage.go +++ b/go/cmd/vtbackup/cli/plugin_azblobbackupstorage.go @@ -17,5 +17,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/azblobbackupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/azblobbackupstorage" ) diff --git a/go/cmd/vtbackup/cli/plugin_cephbackupstorage.go b/go/cmd/vtbackup/cli/plugin_cephbackupstorage.go index 57f30544472..b9fddfd2f56 100644 --- a/go/cmd/vtbackup/cli/plugin_cephbackupstorage.go +++ b/go/cmd/vtbackup/cli/plugin_cephbackupstorage.go @@ -16,5 +16,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/cephbackupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/cephbackupstorage" ) diff --git a/go/cmd/vtbackup/cli/plugin_consultopo.go b/go/cmd/vtbackup/cli/plugin_consultopo.go index 5d75740b1b5..f0855f30e9c 100644 --- a/go/cmd/vtbackup/cli/plugin_consultopo.go +++ b/go/cmd/vtbackup/cli/plugin_consultopo.go @@ -17,5 +17,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/consultopo" + _ "github.com/vitess/vitess/go/vt/topo/consultopo" ) diff --git a/go/cmd/vtbackup/cli/plugin_etcd2topo.go b/go/cmd/vtbackup/cli/plugin_etcd2topo.go index 8c8584471bb..35e8f1854ef 100644 --- a/go/cmd/vtbackup/cli/plugin_etcd2topo.go +++ b/go/cmd/vtbackup/cli/plugin_etcd2topo.go @@ -17,5 +17,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/etcd2topo" + _ "github.com/vitess/vitess/go/vt/topo/etcd2topo" ) diff --git a/go/cmd/vtbackup/cli/plugin_filebackupstorage.go b/go/cmd/vtbackup/cli/plugin_filebackupstorage.go index 642db766777..935a8b9d9e9 100644 --- a/go/cmd/vtbackup/cli/plugin_filebackupstorage.go +++ b/go/cmd/vtbackup/cli/plugin_filebackupstorage.go @@ -16,5 +16,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/filebackupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/filebackupstorage" ) diff --git a/go/cmd/vtbackup/cli/plugin_gcsbackupstorage.go b/go/cmd/vtbackup/cli/plugin_gcsbackupstorage.go index 76a0a7f1245..6e81a3c3eed 100644 --- a/go/cmd/vtbackup/cli/plugin_gcsbackupstorage.go +++ b/go/cmd/vtbackup/cli/plugin_gcsbackupstorage.go @@ -16,5 +16,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/gcsbackupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/gcsbackupstorage" ) diff --git a/go/cmd/vtbackup/cli/plugin_opentsdb.go b/go/cmd/vtbackup/cli/plugin_opentsdb.go index 89730571d5b..5626b94c6bf 100644 --- a/go/cmd/vtbackup/cli/plugin_opentsdb.go +++ b/go/cmd/vtbackup/cli/plugin_opentsdb.go @@ -16,7 +16,7 @@ limitations under the License. package cli -import "github.com/mdibaiee/vitess/go/stats/opentsdb" +import "github.com/vitess/vitess/go/stats/opentsdb" // This plugin imports opentsdb to register the opentsdb stats backend. diff --git a/go/cmd/vtbackup/cli/plugin_prometheusbackend.go b/go/cmd/vtbackup/cli/plugin_prometheusbackend.go index a24918ec169..5a043904b55 100644 --- a/go/cmd/vtbackup/cli/plugin_prometheusbackend.go +++ b/go/cmd/vtbackup/cli/plugin_prometheusbackend.go @@ -20,8 +20,8 @@ package cli // with the Prometheus client library import ( - "github.com/mdibaiee/vitess/go/stats/prometheusbackend" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/stats/prometheusbackend" + "github.com/vitess/vitess/go/vt/servenv" ) func init() { diff --git a/go/cmd/vtbackup/cli/plugin_s3backupstorage.go b/go/cmd/vtbackup/cli/plugin_s3backupstorage.go index 9b0a6347850..fc8ad2a2fd7 100644 --- a/go/cmd/vtbackup/cli/plugin_s3backupstorage.go +++ b/go/cmd/vtbackup/cli/plugin_s3backupstorage.go @@ -16,5 +16,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/s3backupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/s3backupstorage" ) diff --git a/go/cmd/vtbackup/cli/plugin_zk2topo.go b/go/cmd/vtbackup/cli/plugin_zk2topo.go index 679918fe918..8943c3c2fb8 100644 --- a/go/cmd/vtbackup/cli/plugin_zk2topo.go +++ b/go/cmd/vtbackup/cli/plugin_zk2topo.go @@ -17,5 +17,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + _ "github.com/vitess/vitess/go/vt/topo/zk2topo" ) diff --git a/go/cmd/vtbackup/cli/vtbackup.go b/go/cmd/vtbackup/cli/vtbackup.go index ab9f3520609..3a613c89c42 100644 --- a/go/cmd/vtbackup/cli/vtbackup.go +++ b/go/cmd/vtbackup/cli/vtbackup.go @@ -29,25 +29,25 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/cmd" - "github.com/mdibaiee/vitess/go/exit" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstats" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmclient" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/cmd" + "github.com/vitess/vitess/go/exit" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstats" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctmclient" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" ) const ( diff --git a/go/cmd/vtbackup/docgen/main.go b/go/cmd/vtbackup/docgen/main.go index 8368f2741a7..9b68d2bc803 100644 --- a/go/cmd/vtbackup/docgen/main.go +++ b/go/cmd/vtbackup/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/vtbackup/cli" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/vtbackup/cli" ) func main() { diff --git a/go/cmd/vtbackup/vtbackup.go b/go/cmd/vtbackup/vtbackup.go index 32fad5a4138..17afcfddb68 100644 --- a/go/cmd/vtbackup/vtbackup.go +++ b/go/cmd/vtbackup/vtbackup.go @@ -17,9 +17,9 @@ limitations under the License. package main import ( - "github.com/mdibaiee/vitess/go/cmd/vtbackup/cli" - "github.com/mdibaiee/vitess/go/exit" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/vtbackup/cli" + "github.com/vitess/vitess/go/exit" + "github.com/vitess/vitess/go/vt/log" ) func main() { diff --git a/go/cmd/vtbench/cli/vtbench.go b/go/cmd/vtbench/cli/vtbench.go index 0c44a6ee588..665314cb2ec 100644 --- a/go/cmd/vtbench/cli/vtbench.go +++ b/go/cmd/vtbench/cli/vtbench.go @@ -25,17 +25,17 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/grpccommon" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vtbench" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/grpccommon" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vtbench" // Import and register the gRPC vtgateconn client - _ "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateconn" + _ "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateconn" // Import and register the gRPC tabletconn client - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctabletconn" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctabletconn" ) /* diff --git a/go/cmd/vtbench/docgen/main.go b/go/cmd/vtbench/docgen/main.go index 47295d00315..18593b55b5d 100644 --- a/go/cmd/vtbench/docgen/main.go +++ b/go/cmd/vtbench/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/vtbench/cli" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/vtbench/cli" ) func main() { diff --git a/go/cmd/vtbench/vtbench.go b/go/cmd/vtbench/vtbench.go index 5f12ce6b0ef..76bf22fbbb0 100644 --- a/go/cmd/vtbench/vtbench.go +++ b/go/cmd/vtbench/vtbench.go @@ -17,9 +17,9 @@ limitations under the License. package main import ( - "github.com/mdibaiee/vitess/go/cmd/vtbench/cli" - "github.com/mdibaiee/vitess/go/exit" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/vtbench/cli" + "github.com/vitess/vitess/go/exit" + "github.com/vitess/vitess/go/vt/log" ) func main() { diff --git a/go/cmd/vtclient/cli/plugin_opentracing.go b/go/cmd/vtclient/cli/plugin_opentracing.go index 72236607f24..d332028535e 100644 --- a/go/cmd/vtclient/cli/plugin_opentracing.go +++ b/go/cmd/vtclient/cli/plugin_opentracing.go @@ -17,8 +17,8 @@ limitations under the License. package cli import ( - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/servenv" ) func init() { diff --git a/go/cmd/vtclient/cli/vtclient.go b/go/cmd/vtclient/cli/vtclient.go index 9642c682574..12bf59fe9e3 100644 --- a/go/cmd/vtclient/cli/vtclient.go +++ b/go/cmd/vtclient/cli/vtclient.go @@ -32,18 +32,18 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/grpccommon" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vitessdriver" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" - - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/grpccommon" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vitessdriver" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" + + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" // Include deprecation warnings for soon-to-be-unsupported flag invocations. ) diff --git a/go/cmd/vtclient/cli/vtclient_test.go b/go/cmd/vtclient/cli/vtclient_test.go index 0f695dd147e..66f935c2e30 100644 --- a/go/cmd/vtclient/cli/vtclient_test.go +++ b/go/cmd/vtclient/cli/vtclient_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/vttest" + "github.com/vitess/vitess/go/vt/vttest" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" ) func TestVtclient(t *testing.T) { diff --git a/go/cmd/vtclient/docgen/main.go b/go/cmd/vtclient/docgen/main.go index f1a31ab630f..e4be3fbb12f 100644 --- a/go/cmd/vtclient/docgen/main.go +++ b/go/cmd/vtclient/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/vtclient/cli" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/vtclient/cli" ) func main() { diff --git a/go/cmd/vtclient/vtclient.go b/go/cmd/vtclient/vtclient.go index 3ee27f4093b..af2f156a85d 100644 --- a/go/cmd/vtclient/vtclient.go +++ b/go/cmd/vtclient/vtclient.go @@ -17,8 +17,8 @@ limitations under the License. package main import ( - "github.com/mdibaiee/vitess/go/cmd/vtclient/cli" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/vtclient/cli" + "github.com/vitess/vitess/go/vt/log" ) func main() { diff --git a/go/cmd/vtcombo/cli/main.go b/go/cmd/vtcombo/cli/main.go index 1dff1253dce..fc9b6a2a269 100644 --- a/go/cmd/vtcombo/cli/main.go +++ b/go/cmd/vtcombo/cli/main.go @@ -30,31 +30,31 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtcombo" - "github.com/mdibaiee/vitess/go/vt/vtctld" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttest" - "github.com/mdibaiee/vitess/go/vt/wrangler" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtcombo" + "github.com/vitess/vitess/go/vt/vtctld" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttest" + "github.com/vitess/vitess/go/vt/wrangler" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" ) var ( diff --git a/go/cmd/vtcombo/cli/plugin_dbddl.go b/go/cmd/vtcombo/cli/plugin_dbddl.go index d705ca77c1a..367f742310b 100644 --- a/go/cmd/vtcombo/cli/plugin_dbddl.go +++ b/go/cmd/vtcombo/cli/plugin_dbddl.go @@ -20,10 +20,10 @@ import ( "context" "sync" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtgate/engine" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" ) var globalCreateDb func(ctx context.Context, ks *vttestpb.Keyspace) error diff --git a/go/cmd/vtcombo/cli/plugin_grpcvtctldserver.go b/go/cmd/vtcombo/cli/plugin_grpcvtctldserver.go index 11cfa2bb6d3..39f9005ca24 100644 --- a/go/cmd/vtcombo/cli/plugin_grpcvtctldserver.go +++ b/go/cmd/vtcombo/cli/plugin_grpcvtctldserver.go @@ -17,8 +17,8 @@ limitations under the License. package cli import ( - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver" ) func init() { diff --git a/go/cmd/vtcombo/cli/plugin_grpcvtctlserver.go b/go/cmd/vtcombo/cli/plugin_grpcvtctlserver.go index b2d62ccbbd1..0ca959d2128 100644 --- a/go/cmd/vtcombo/cli/plugin_grpcvtctlserver.go +++ b/go/cmd/vtcombo/cli/plugin_grpcvtctlserver.go @@ -17,8 +17,8 @@ limitations under the License. package cli import ( - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctlserver" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctlserver" ) func init() { diff --git a/go/cmd/vtcombo/cli/plugin_grpcvtgateservice.go b/go/cmd/vtcombo/cli/plugin_grpcvtgateservice.go index d96006540b5..7faa57e03c0 100644 --- a/go/cmd/vtcombo/cli/plugin_grpcvtgateservice.go +++ b/go/cmd/vtcombo/cli/plugin_grpcvtgateservice.go @@ -19,6 +19,6 @@ package cli // Imports and register the gRPC vtgateservice server import ( - _ "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateconn" - _ "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateservice" + _ "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateconn" + _ "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateservice" ) diff --git a/go/cmd/vtcombo/cli/plugin_opentracing.go b/go/cmd/vtcombo/cli/plugin_opentracing.go index 1446ca18980..27623ac853d 100644 --- a/go/cmd/vtcombo/cli/plugin_opentracing.go +++ b/go/cmd/vtcombo/cli/plugin_opentracing.go @@ -17,9 +17,9 @@ limitations under the License. package cli import ( - "github.com/mdibaiee/vitess/go/trace" + "github.com/vitess/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/servenv" ) func init() { diff --git a/go/cmd/vtcombo/cli/status.go b/go/cmd/vtcombo/cli/status.go index ea22724a4de..7d672f573c5 100644 --- a/go/cmd/vtcombo/cli/status.go +++ b/go/cmd/vtcombo/cli/status.go @@ -17,10 +17,10 @@ limitations under the License. package cli import ( - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vtgate" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vtgate" ) func addStatusParts(vtg *vtgate.VTGate) { diff --git a/go/cmd/vtcombo/cli/vschema_watcher.go b/go/cmd/vtcombo/cli/vschema_watcher.go index 8ebf1f75178..137fd3e54a4 100644 --- a/go/cmd/vtcombo/cli/vschema_watcher.go +++ b/go/cmd/vtcombo/cli/vschema_watcher.go @@ -22,11 +22,11 @@ import ( "os" "path" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) func startVschemaWatcher(ctx context.Context, vschemaPersistenceDir string, ts *topo.Server) { diff --git a/go/cmd/vtcombo/docgen/main.go b/go/cmd/vtcombo/docgen/main.go index d25ea065ac7..de99ed0f653 100644 --- a/go/cmd/vtcombo/docgen/main.go +++ b/go/cmd/vtcombo/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/vtcombo/cli" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/vtcombo/cli" ) func main() { diff --git a/go/cmd/vtcombo/main.go b/go/cmd/vtcombo/main.go index a32c8564575..a92709467be 100644 --- a/go/cmd/vtcombo/main.go +++ b/go/cmd/vtcombo/main.go @@ -22,9 +22,9 @@ limitations under the License. package main import ( - "github.com/mdibaiee/vitess/go/cmd/vtcombo/cli" - "github.com/mdibaiee/vitess/go/exit" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/vtcombo/cli" + "github.com/vitess/vitess/go/exit" + "github.com/vitess/vitess/go/vt/log" ) func main() { diff --git a/go/cmd/vtctl/plugin_azblobbackupstorage.go b/go/cmd/vtctl/plugin_azblobbackupstorage.go index 6bdb3da069d..d5ac0d59c61 100644 --- a/go/cmd/vtctl/plugin_azblobbackupstorage.go +++ b/go/cmd/vtctl/plugin_azblobbackupstorage.go @@ -17,5 +17,5 @@ limitations under the License. package main import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/azblobbackupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/azblobbackupstorage" ) diff --git a/go/cmd/vtctl/plugin_cephbackupstorage.go b/go/cmd/vtctl/plugin_cephbackupstorage.go index ef52ffe4851..6576833f19c 100644 --- a/go/cmd/vtctl/plugin_cephbackupstorage.go +++ b/go/cmd/vtctl/plugin_cephbackupstorage.go @@ -17,5 +17,5 @@ limitations under the License. package main import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/cephbackupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/cephbackupstorage" ) diff --git a/go/cmd/vtctl/plugin_filebackupstorage.go b/go/cmd/vtctl/plugin_filebackupstorage.go index c89792da226..131ebf284b7 100644 --- a/go/cmd/vtctl/plugin_filebackupstorage.go +++ b/go/cmd/vtctl/plugin_filebackupstorage.go @@ -17,5 +17,5 @@ limitations under the License. package main import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/filebackupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/filebackupstorage" ) diff --git a/go/cmd/vtctl/plugin_gcsbackupstorage.go b/go/cmd/vtctl/plugin_gcsbackupstorage.go index 9eeb4685919..3a8d4aa64ac 100644 --- a/go/cmd/vtctl/plugin_gcsbackupstorage.go +++ b/go/cmd/vtctl/plugin_gcsbackupstorage.go @@ -17,5 +17,5 @@ limitations under the License. package main import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/gcsbackupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/gcsbackupstorage" ) diff --git a/go/cmd/vtctl/plugin_grpctabletconn.go b/go/cmd/vtctl/plugin_grpctabletconn.go index 4aefbb834e5..83c804d645e 100644 --- a/go/cmd/vtctl/plugin_grpctabletconn.go +++ b/go/cmd/vtctl/plugin_grpctabletconn.go @@ -19,5 +19,5 @@ package main // Imports and register the gRPC tabletconn client import ( - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctabletconn" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctabletconn" ) diff --git a/go/cmd/vtctl/plugin_grpctmclient.go b/go/cmd/vtctl/plugin_grpctmclient.go index 6b5bd382c67..271912969c0 100644 --- a/go/cmd/vtctl/plugin_grpctmclient.go +++ b/go/cmd/vtctl/plugin_grpctmclient.go @@ -19,5 +19,5 @@ package main // Imports and register the gRPC tabletmanager client import ( - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmclient" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctmclient" ) diff --git a/go/cmd/vtctl/plugin_grpcvtgateconn.go b/go/cmd/vtctl/plugin_grpcvtgateconn.go index f94f877d192..1444e53783a 100644 --- a/go/cmd/vtctl/plugin_grpcvtgateconn.go +++ b/go/cmd/vtctl/plugin_grpcvtgateconn.go @@ -19,5 +19,5 @@ package main // Imports and register the gRPC vtgateconn client import ( - _ "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateconn" + _ "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateconn" ) diff --git a/go/cmd/vtctl/plugin_s3backupstorage.go b/go/cmd/vtctl/plugin_s3backupstorage.go index 8daaceae8e6..2eda086c8e6 100644 --- a/go/cmd/vtctl/plugin_s3backupstorage.go +++ b/go/cmd/vtctl/plugin_s3backupstorage.go @@ -17,5 +17,5 @@ limitations under the License. package main import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/s3backupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/s3backupstorage" ) diff --git a/go/cmd/vtctl/vtctl.go b/go/cmd/vtctl/vtctl.go index 333f1c3519d..08c0e6dfd2f 100644 --- a/go/cmd/vtctl/vtctl.go +++ b/go/cmd/vtctl/vtctl.go @@ -27,21 +27,21 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/cmd" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command" - "github.com/mdibaiee/vitess/go/exit" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtctl" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver" - "github.com/mdibaiee/vitess/go/vt/vtctl/localvtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/cmd" + "github.com/vitess/vitess/go/cmd/vtctldclient/command" + "github.com/vitess/vitess/go/exit" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtctl" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver" + "github.com/vitess/vitess/go/vt/vtctl/localvtctldclient" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" ) var ( diff --git a/go/cmd/vtctl/vtctl_unix.go b/go/cmd/vtctl/vtctl_unix.go index 49cb722e2ed..b70973c68b0 100644 --- a/go/cmd/vtctl/vtctl_unix.go +++ b/go/cmd/vtctl/vtctl_unix.go @@ -21,7 +21,7 @@ package main import ( "log/syslog" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) func logSyslog(msg string) { diff --git a/go/cmd/vtctl/vtctl_windows.go b/go/cmd/vtctl/vtctl_windows.go index 751957e1805..7653977f0ea 100644 --- a/go/cmd/vtctl/vtctl_windows.go +++ b/go/cmd/vtctl/vtctl_windows.go @@ -19,7 +19,7 @@ limitations under the License. package main import ( - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) func logSyslog(msg string) { diff --git a/go/cmd/vtctlclient/main.go b/go/cmd/vtctlclient/main.go index 64041a78a28..bbe4e7f6470 100644 --- a/go/cmd/vtctlclient/main.go +++ b/go/cmd/vtctlclient/main.go @@ -26,15 +26,15 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/exit" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctlclient" - - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/exit" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtctl/vtctlclient" + + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" // Include deprecation warnings for soon-to-be-unsupported flag invocations. ) diff --git a/go/cmd/vtctlclient/plugin_grpcvtctlclient.go b/go/cmd/vtctlclient/plugin_grpcvtctlclient.go index f37d9a71b81..538e4f783f6 100644 --- a/go/cmd/vtctlclient/plugin_grpcvtctlclient.go +++ b/go/cmd/vtctlclient/plugin_grpcvtctlclient.go @@ -19,5 +19,5 @@ package main // Imports and register the gRPC vtctl client. import ( - _ "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctlclient" + _ "github.com/vitess/vitess/go/vt/vtctl/grpcvtctlclient" ) diff --git a/go/cmd/vtctld/cli/cli.go b/go/cmd/vtctld/cli/cli.go index 7b36a9682a3..d93a654b04c 100644 --- a/go/cmd/vtctld/cli/cli.go +++ b/go/cmd/vtctld/cli/cli.go @@ -19,11 +19,11 @@ package cli import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtctld" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtctld" + "github.com/vitess/vitess/go/vt/vtenv" ) var ( diff --git a/go/cmd/vtctld/cli/plugin_azblobbackupstorage.go b/go/cmd/vtctld/cli/plugin_azblobbackupstorage.go index c5079c60753..242df5c89de 100644 --- a/go/cmd/vtctld/cli/plugin_azblobbackupstorage.go +++ b/go/cmd/vtctld/cli/plugin_azblobbackupstorage.go @@ -17,5 +17,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/azblobbackupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/azblobbackupstorage" ) diff --git a/go/cmd/vtctld/cli/plugin_cephbackupstorage.go b/go/cmd/vtctld/cli/plugin_cephbackupstorage.go index 4fda1110b58..b4fc46cf976 100644 --- a/go/cmd/vtctld/cli/plugin_cephbackupstorage.go +++ b/go/cmd/vtctld/cli/plugin_cephbackupstorage.go @@ -17,5 +17,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/cephbackupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/cephbackupstorage" ) diff --git a/go/cmd/vtctld/cli/plugin_consultopo.go b/go/cmd/vtctld/cli/plugin_consultopo.go index eb60ffd56d3..f6331590248 100644 --- a/go/cmd/vtctld/cli/plugin_consultopo.go +++ b/go/cmd/vtctld/cli/plugin_consultopo.go @@ -19,5 +19,5 @@ package cli // Imports and register the 'consul' topo.Server. import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/consultopo" + _ "github.com/vitess/vitess/go/vt/topo/consultopo" ) diff --git a/go/cmd/vtctld/cli/plugin_etcd2topo.go b/go/cmd/vtctld/cli/plugin_etcd2topo.go index ebc234b159b..96938cd6929 100644 --- a/go/cmd/vtctld/cli/plugin_etcd2topo.go +++ b/go/cmd/vtctld/cli/plugin_etcd2topo.go @@ -19,5 +19,5 @@ package cli // Imports and register the 'etcd2' topo.Server. import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/etcd2topo" + _ "github.com/vitess/vitess/go/vt/topo/etcd2topo" ) diff --git a/go/cmd/vtctld/cli/plugin_filebackupstorage.go b/go/cmd/vtctld/cli/plugin_filebackupstorage.go index a015d60f474..8b61759b2b8 100644 --- a/go/cmd/vtctld/cli/plugin_filebackupstorage.go +++ b/go/cmd/vtctld/cli/plugin_filebackupstorage.go @@ -17,5 +17,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/filebackupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/filebackupstorage" ) diff --git a/go/cmd/vtctld/cli/plugin_gcsbackupstorage.go b/go/cmd/vtctld/cli/plugin_gcsbackupstorage.go index 7a1685cd500..915753bb90b 100644 --- a/go/cmd/vtctld/cli/plugin_gcsbackupstorage.go +++ b/go/cmd/vtctld/cli/plugin_gcsbackupstorage.go @@ -17,5 +17,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/gcsbackupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/gcsbackupstorage" ) diff --git a/go/cmd/vtctld/cli/plugin_grpctabletconn.go b/go/cmd/vtctld/cli/plugin_grpctabletconn.go index 6e4fb71f4e7..cb5d997d77e 100644 --- a/go/cmd/vtctld/cli/plugin_grpctabletconn.go +++ b/go/cmd/vtctld/cli/plugin_grpctabletconn.go @@ -19,5 +19,5 @@ package cli // Imports and register the gRPC tabletconn client import ( - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctabletconn" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctabletconn" ) diff --git a/go/cmd/vtctld/cli/plugin_grpctmclient.go b/go/cmd/vtctld/cli/plugin_grpctmclient.go index 7aaa3feab79..5da125762bd 100644 --- a/go/cmd/vtctld/cli/plugin_grpctmclient.go +++ b/go/cmd/vtctld/cli/plugin_grpctmclient.go @@ -19,5 +19,5 @@ package cli // Imports and register the gRPC tabletmanager client import ( - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmclient" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctmclient" ) diff --git a/go/cmd/vtctld/cli/plugin_grpcvtctldserver.go b/go/cmd/vtctld/cli/plugin_grpcvtctldserver.go index bf2d8373145..e0fc4b6f484 100644 --- a/go/cmd/vtctld/cli/plugin_grpcvtctldserver.go +++ b/go/cmd/vtctld/cli/plugin_grpcvtctldserver.go @@ -17,8 +17,8 @@ limitations under the License. package cli import ( - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver" ) func init() { diff --git a/go/cmd/vtctld/cli/plugin_grpcvtctlserver.go b/go/cmd/vtctld/cli/plugin_grpcvtctlserver.go index b2d62ccbbd1..0ca959d2128 100644 --- a/go/cmd/vtctld/cli/plugin_grpcvtctlserver.go +++ b/go/cmd/vtctld/cli/plugin_grpcvtctlserver.go @@ -17,8 +17,8 @@ limitations under the License. package cli import ( - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctlserver" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctlserver" ) func init() { diff --git a/go/cmd/vtctld/cli/plugin_grpcvtgateconn.go b/go/cmd/vtctld/cli/plugin_grpcvtgateconn.go index 1c29b860425..2279943eb49 100644 --- a/go/cmd/vtctld/cli/plugin_grpcvtgateconn.go +++ b/go/cmd/vtctld/cli/plugin_grpcvtgateconn.go @@ -19,5 +19,5 @@ package cli // Imports and register the gRPC vtgateconn client import ( - _ "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateconn" + _ "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateconn" ) diff --git a/go/cmd/vtctld/cli/plugin_opentracing.go b/go/cmd/vtctld/cli/plugin_opentracing.go index bc931580900..3749c59c463 100644 --- a/go/cmd/vtctld/cli/plugin_opentracing.go +++ b/go/cmd/vtctld/cli/plugin_opentracing.go @@ -17,8 +17,8 @@ limitations under the License. package cli import ( - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/servenv" ) func init() { diff --git a/go/cmd/vtctld/cli/plugin_opentsdb.go b/go/cmd/vtctld/cli/plugin_opentsdb.go index f15e8c4b8b1..e9e4660c4a4 100644 --- a/go/cmd/vtctld/cli/plugin_opentsdb.go +++ b/go/cmd/vtctld/cli/plugin_opentsdb.go @@ -19,7 +19,7 @@ package cli // This plugin imports opentsdb to register the opentsdb stats backend. import ( - "github.com/mdibaiee/vitess/go/stats/opentsdb" + "github.com/vitess/vitess/go/stats/opentsdb" ) func init() { diff --git a/go/cmd/vtctld/cli/plugin_prometheusbackend.go b/go/cmd/vtctld/cli/plugin_prometheusbackend.go index fb66c5ad61c..cd3de79cd98 100644 --- a/go/cmd/vtctld/cli/plugin_prometheusbackend.go +++ b/go/cmd/vtctld/cli/plugin_prometheusbackend.go @@ -20,8 +20,8 @@ package cli // with the Prometheus client library import ( - "github.com/mdibaiee/vitess/go/stats/prometheusbackend" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/stats/prometheusbackend" + "github.com/vitess/vitess/go/vt/servenv" ) func init() { diff --git a/go/cmd/vtctld/cli/plugin_s3backupstorage.go b/go/cmd/vtctld/cli/plugin_s3backupstorage.go index d5cd2eff54e..7e6026b8dcb 100644 --- a/go/cmd/vtctld/cli/plugin_s3backupstorage.go +++ b/go/cmd/vtctld/cli/plugin_s3backupstorage.go @@ -17,5 +17,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/s3backupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/s3backupstorage" ) diff --git a/go/cmd/vtctld/cli/plugin_zk2topo.go b/go/cmd/vtctld/cli/plugin_zk2topo.go index 9f18c4f2d90..9fb52f2e367 100644 --- a/go/cmd/vtctld/cli/plugin_zk2topo.go +++ b/go/cmd/vtctld/cli/plugin_zk2topo.go @@ -19,5 +19,5 @@ package cli // Imports and register the 'zk2' topo.Server. import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + _ "github.com/vitess/vitess/go/vt/topo/zk2topo" ) diff --git a/go/cmd/vtctld/cli/schema.go b/go/cmd/vtctld/cli/schema.go index 90addfbd897..aad42ba6768 100644 --- a/go/cmd/vtctld/cli/schema.go +++ b/go/cmd/vtctld/cli/schema.go @@ -20,14 +20,14 @@ import ( "context" "time" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/schemamanager" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/schemamanager" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" ) var ( diff --git a/go/cmd/vtctld/docgen/main.go b/go/cmd/vtctld/docgen/main.go index d80ee14fcb6..a00408819e7 100644 --- a/go/cmd/vtctld/docgen/main.go +++ b/go/cmd/vtctld/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/vtctld/cli" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/vtctld/cli" ) func main() { diff --git a/go/cmd/vtctld/main.go b/go/cmd/vtctld/main.go index 74cdf5c2ad4..de3f8e0a794 100644 --- a/go/cmd/vtctld/main.go +++ b/go/cmd/vtctld/main.go @@ -17,8 +17,8 @@ limitations under the License. package main import ( - "github.com/mdibaiee/vitess/go/cmd/vtctld/cli" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/vtctld/cli" + "github.com/vitess/vitess/go/vt/log" ) func main() { diff --git a/go/cmd/vtctldclient/cli/awk.go b/go/cmd/vtctldclient/cli/awk.go index 218657b8061..b9c266052ad 100644 --- a/go/cmd/vtctldclient/cli/awk.go +++ b/go/cmd/vtctldclient/cli/awk.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // MarshalMapAWK returns a string representation of a string->string map in an diff --git a/go/cmd/vtctldclient/cli/cobra.go b/go/cmd/vtctldclient/cli/cobra.go index b6be7fc33eb..4a1238227b8 100644 --- a/go/cmd/vtctldclient/cli/cobra.go +++ b/go/cmd/vtctldclient/cli/cobra.go @@ -25,7 +25,7 @@ import "github.com/spf13/cobra" // from its RunE function when it has finished processing its flags and is // moving into the pure "business logic" of its entrypoint. // -// Package github.com/mdibaiee/vitess/go/cmd/vtctldclient/internal/command has more +// Package github.com/vitess/vitess/go/cmd/vtctldclient/internal/command has more // details on why this exists. func FinishedParsing(cmd *cobra.Command) { cmd.SilenceUsage = true diff --git a/go/cmd/vtctldclient/cli/pflag.go b/go/cmd/vtctldclient/cli/pflag.go index c7f336db04c..15d322d38c1 100644 --- a/go/cmd/vtctldclient/cli/pflag.go +++ b/go/cmd/vtctldclient/cli/pflag.go @@ -19,9 +19,9 @@ package cli import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topo/topoproto" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // KeyspaceTypeFlag adds the pflag.Value interface to a topodatapb.KeyspaceType. diff --git a/go/cmd/vtctldclient/cli/query.go b/go/cmd/vtctldclient/cli/query.go index 855e00be813..de3786dfe9e 100644 --- a/go/cmd/vtctldclient/cli/query.go +++ b/go/cmd/vtctldclient/cli/query.go @@ -21,7 +21,7 @@ import ( "github.com/olekukonko/tablewriter" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) // WriteQueryResultTable writes a QueryResult as a human-friendly table to the diff --git a/go/cmd/vtctldclient/cli/shards.go b/go/cmd/vtctldclient/cli/shards.go index 73b5490008b..28bcd4e1be2 100644 --- a/go/cmd/vtctldclient/cli/shards.go +++ b/go/cmd/vtctldclient/cli/shards.go @@ -19,12 +19,12 @@ package cli import ( "sort" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/vt/topo/topoproto" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // ParseKeyspaceShards takes a list of positional arguments and converts them to diff --git a/go/cmd/vtctldclient/cli/tablets.go b/go/cmd/vtctldclient/cli/tablets.go index a635d57df54..421ece4e8b3 100644 --- a/go/cmd/vtctldclient/cli/tablets.go +++ b/go/cmd/vtctldclient/cli/tablets.go @@ -17,9 +17,9 @@ limitations under the License. package cli import ( - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topo/topoproto" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // TabletAliasesFromPosArgs takes a list of positional (non-flag) arguments and diff --git a/go/cmd/vtctldclient/command/backups.go b/go/cmd/vtctldclient/command/backups.go index e2dc1979ea2..b4c974ffa9d 100644 --- a/go/cmd/vtctldclient/command/backups.go +++ b/go/cmd/vtctldclient/command/backups.go @@ -24,12 +24,12 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/topo/topoproto" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/cells.go b/go/cmd/vtctldclient/command/cells.go index d0185584657..ccabdf52abd 100644 --- a/go/cmd/vtctldclient/command/cells.go +++ b/go/cmd/vtctldclient/command/cells.go @@ -22,10 +22,10 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/keyspace_routing_rules.go b/go/cmd/vtctldclient/command/keyspace_routing_rules.go index 456f2e41289..0e25691e050 100644 --- a/go/cmd/vtctldclient/command/keyspace_routing_rules.go +++ b/go/cmd/vtctldclient/command/keyspace_routing_rules.go @@ -24,11 +24,11 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/json2" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/json2" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/keyspaces.go b/go/cmd/vtctldclient/command/keyspaces.go index a02535a979e..9c4c8db4aee 100644 --- a/go/cmd/vtctldclient/command/keyspaces.go +++ b/go/cmd/vtctldclient/command/keyspaces.go @@ -24,15 +24,15 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/protoutil" - - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/mysql" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/protoutil" + + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/mysql" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/vt/proto/vttime" ) var ( diff --git a/go/cmd/vtctldclient/command/legacy_shim.go b/go/cmd/vtctldclient/command/legacy_shim.go index ccb51b3316a..25717534315 100644 --- a/go/cmd/vtctldclient/command/legacy_shim.go +++ b/go/cmd/vtctldclient/command/legacy_shim.go @@ -23,13 +23,13 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/internal/flag" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctlclient" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/internal/flag" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/vtctl/vtctlclient" - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" ) var ( diff --git a/go/cmd/vtctldclient/command/onlineddl.go b/go/cmd/vtctldclient/command/onlineddl.go index 51fb87623bd..11ebb4bf62a 100644 --- a/go/cmd/vtctldclient/command/onlineddl.go +++ b/go/cmd/vtctldclient/command/onlineddl.go @@ -23,16 +23,16 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/vtctl/schematools" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/vtctl/schematools" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) const ( diff --git a/go/cmd/vtctldclient/command/query.go b/go/cmd/vtctldclient/command/query.go index b96f64167b3..3a7eb584315 100644 --- a/go/cmd/vtctldclient/command/query.go +++ b/go/cmd/vtctldclient/command/query.go @@ -21,11 +21,11 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/topo/topoproto" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/reparents.go b/go/cmd/vtctldclient/command/reparents.go index a54f243ab45..500b0c45973 100644 --- a/go/cmd/vtctldclient/command/reparents.go +++ b/go/cmd/vtctldclient/command/reparents.go @@ -22,15 +22,15 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/root.go b/go/cmd/vtctldclient/command/root.go index 40c5f56faec..14c5a3503cc 100644 --- a/go/cmd/vtctldclient/command/root.go +++ b/go/cmd/vtctldclient/command/root.go @@ -28,33 +28,33 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver" - "github.com/mdibaiee/vitess/go/vt/vtctl/localvtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver" + "github.com/vitess/vitess/go/vt/vtctl/localvtctldclient" + "github.com/vitess/vitess/go/vt/vtctl/vtctldclient" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" // These imports ensure init()s within them get called and they register their commands/subcommands. - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - vreplcommon "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" - _ "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/lookupvindex" - _ "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/materialize" - _ "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/migrate" - _ "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/mount" - _ "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/movetables" - _ "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/reshard" - _ "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/vdiff" - _ "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/workflow" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + vreplcommon "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" + _ "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/lookupvindex" + _ "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/materialize" + _ "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/migrate" + _ "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/mount" + _ "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/movetables" + _ "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/reshard" + _ "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/vdiff" + _ "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/workflow" // These imports register the topo factories to use when --server=internal. - _ "github.com/mdibaiee/vitess/go/vt/topo/consultopo" - _ "github.com/mdibaiee/vitess/go/vt/topo/etcd2topo" - _ "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + _ "github.com/vitess/vitess/go/vt/topo/consultopo" + _ "github.com/vitess/vitess/go/vt/topo/etcd2topo" + _ "github.com/vitess/vitess/go/vt/topo/zk2topo" ) // The --server value if you want to use a "local" vtctld server. diff --git a/go/cmd/vtctldclient/command/root_test.go b/go/cmd/vtctldclient/command/root_test.go index c7706f1ebe1..bff799158b1 100644 --- a/go/cmd/vtctldclient/command/root_test.go +++ b/go/cmd/vtctldclient/command/root_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtctl/localvtctldclient" + "github.com/vitess/vitess/go/cmd/vtctldclient/command" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtctl/localvtctldclient" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) type emptyLocalServer struct { diff --git a/go/cmd/vtctldclient/command/routing_rules.go b/go/cmd/vtctldclient/command/routing_rules.go index 44ccde71e68..303b12524df 100644 --- a/go/cmd/vtctldclient/command/routing_rules.go +++ b/go/cmd/vtctldclient/command/routing_rules.go @@ -24,11 +24,11 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/json2" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/json2" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/schema.go b/go/cmd/vtctldclient/command/schema.go index 004dc27cf59..bffdedf5514 100644 --- a/go/cmd/vtctldclient/command/schema.go +++ b/go/cmd/vtctldclient/command/schema.go @@ -25,15 +25,15 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver" - - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver" + + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var ( diff --git a/go/cmd/vtctldclient/command/serving_graph.go b/go/cmd/vtctldclient/command/serving_graph.go index cdaab4bf25e..0bdd66bbffe 100644 --- a/go/cmd/vtctldclient/command/serving_graph.go +++ b/go/cmd/vtctldclient/command/serving_graph.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/shard_routing_rules.go b/go/cmd/vtctldclient/command/shard_routing_rules.go index e9bca14c383..40941a47e60 100644 --- a/go/cmd/vtctldclient/command/shard_routing_rules.go +++ b/go/cmd/vtctldclient/command/shard_routing_rules.go @@ -24,11 +24,11 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/json2" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/json2" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/shards.go b/go/cmd/vtctldclient/command/shards.go index 7b3144fe044..024f397ed0f 100644 --- a/go/cmd/vtctldclient/command/shards.go +++ b/go/cmd/vtctldclient/command/shards.go @@ -22,13 +22,13 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/tablets.go b/go/cmd/vtctldclient/command/tablets.go index 217a8bf4044..f1fa6f09201 100644 --- a/go/cmd/vtctldclient/command/tablets.go +++ b/go/cmd/vtctldclient/command/tablets.go @@ -24,13 +24,13 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/topo/topoproto" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/throttler.go b/go/cmd/vtctldclient/command/throttler.go index 951ac055577..9e267e05a0e 100644 --- a/go/cmd/vtctldclient/command/throttler.go +++ b/go/cmd/vtctldclient/command/throttler.go @@ -22,12 +22,12 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/protoutil" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/protoutil" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle" ) var ( diff --git a/go/cmd/vtctldclient/command/topology.go b/go/cmd/vtctldclient/command/topology.go index 329f6d454d8..afeb6ec7b06 100644 --- a/go/cmd/vtctldclient/command/topology.go +++ b/go/cmd/vtctldclient/command/topology.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/validate.go b/go/cmd/vtctldclient/command/validate.go index 899b5c1b84c..7c3cf328e23 100644 --- a/go/cmd/vtctldclient/command/validate.go +++ b/go/cmd/vtctldclient/command/validate.go @@ -23,10 +23,10 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/vt/topo/topoproto" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/common/cancel.go b/go/cmd/vtctldclient/command/vreplication/common/cancel.go index f6b4f351deb..bc4f9c06562 100644 --- a/go/cmd/vtctldclient/command/vreplication/common/cancel.go +++ b/go/cmd/vtctldclient/command/vreplication/common/cancel.go @@ -22,9 +22,9 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var CancelOptions = struct { diff --git a/go/cmd/vtctldclient/command/vreplication/common/complete.go b/go/cmd/vtctldclient/command/vreplication/common/complete.go index 181b1a2ef32..8d8b479534f 100644 --- a/go/cmd/vtctldclient/command/vreplication/common/complete.go +++ b/go/cmd/vtctldclient/command/vreplication/common/complete.go @@ -6,9 +6,9 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var CompleteOptions = struct { diff --git a/go/cmd/vtctldclient/command/vreplication/common/show.go b/go/cmd/vtctldclient/command/vreplication/common/show.go index c738f1fda87..a131bfe22d7 100644 --- a/go/cmd/vtctldclient/command/vreplication/common/show.go +++ b/go/cmd/vtctldclient/command/vreplication/common/show.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ShowOptions = struct { diff --git a/go/cmd/vtctldclient/command/vreplication/common/status.go b/go/cmd/vtctldclient/command/vreplication/common/status.go index a70f3eb77d2..1c27f365cb3 100644 --- a/go/cmd/vtctldclient/command/vreplication/common/status.go +++ b/go/cmd/vtctldclient/command/vreplication/common/status.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var StatusOptions = struct { diff --git a/go/cmd/vtctldclient/command/vreplication/common/switchtraffic.go b/go/cmd/vtctldclient/command/vreplication/common/switchtraffic.go index 1881aa69131..4d286bfc35a 100644 --- a/go/cmd/vtctldclient/command/vreplication/common/switchtraffic.go +++ b/go/cmd/vtctldclient/command/vreplication/common/switchtraffic.go @@ -22,12 +22,12 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/vtctl/workflow" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) func GetSwitchTrafficCommand(opts *SubCommandsOpts) *cobra.Command { diff --git a/go/cmd/vtctldclient/command/vreplication/common/update.go b/go/cmd/vtctldclient/command/vreplication/common/update.go index 491c5df2ec8..dd196cc6d3b 100644 --- a/go/cmd/vtctldclient/command/vreplication/common/update.go +++ b/go/cmd/vtctldclient/command/vreplication/common/update.go @@ -21,18 +21,18 @@ import ( "sort" "strings" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/textutil" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/textutil" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) func bridgeToWorkflow(cmd *cobra.Command, args []string) { diff --git a/go/cmd/vtctldclient/command/vreplication/common/utils.go b/go/cmd/vtctldclient/command/vreplication/common/utils.go index 35f94bf85c2..22eeecdb9ce 100644 --- a/go/cmd/vtctldclient/command/vreplication/common/utils.go +++ b/go/cmd/vtctldclient/command/vreplication/common/utils.go @@ -25,16 +25,16 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/vtctldclient" + "github.com/vitess/vitess/go/vt/vtctl/workflow" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/common/utils_test.go b/go/cmd/vtctldclient/command/vreplication/common/utils_test.go index 357c3509508..2181dd364cc 100644 --- a/go/cmd/vtctldclient/command/vreplication/common/utils_test.go +++ b/go/cmd/vtctldclient/command/vreplication/common/utils_test.go @@ -24,15 +24,15 @@ import ( "github.com/spf13/cobra" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver" - "github.com/mdibaiee/vitess/go/vt/vtctl/localvtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/cmd/vtctldclient/command" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver" + "github.com/vitess/vitess/go/vt/vtctl/localvtctldclient" + "github.com/vitess/vitess/go/vt/vtctl/vtctldclient" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" ) func TestParseAndValidateCreateOptions(t *testing.T) { diff --git a/go/cmd/vtctldclient/command/vreplication/lookupvindex/lookupvindex.go b/go/cmd/vtctldclient/command/vreplication/lookupvindex/lookupvindex.go index 24b160f2a4c..a7f5c363051 100644 --- a/go/cmd/vtctldclient/command/vreplication/lookupvindex/lookupvindex.go +++ b/go/cmd/vtctldclient/command/vreplication/lookupvindex/lookupvindex.go @@ -22,13 +22,13 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - topoprotopb "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + topoprotopb "github.com/vitess/vitess/go/vt/topo/topoproto" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/materialize/create.go b/go/cmd/vtctldclient/command/vreplication/materialize/create.go index 42637da73fa..f8ff59e49a3 100644 --- a/go/cmd/vtctldclient/command/vreplication/materialize/create.go +++ b/go/cmd/vtctldclient/command/vreplication/materialize/create.go @@ -23,12 +23,12 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo/topoproto" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/materialize/materialize.go b/go/cmd/vtctldclient/command/vreplication/materialize/materialize.go index dc2dc92f1e1..1d688aebd55 100644 --- a/go/cmd/vtctldclient/command/vreplication/materialize/materialize.go +++ b/go/cmd/vtctldclient/command/vreplication/materialize/materialize.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" - "github.com/mdibaiee/vitess/go/mysql/config" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/mysql/config" + "github.com/vitess/vitess/go/vt/topo/topoproto" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/migrate/migrate.go b/go/cmd/vtctldclient/command/vreplication/migrate/migrate.go index 2a38c9faa18..8ef69c143a4 100644 --- a/go/cmd/vtctldclient/command/vreplication/migrate/migrate.go +++ b/go/cmd/vtctldclient/command/vreplication/migrate/migrate.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/mount/mount.go b/go/cmd/vtctldclient/command/vreplication/mount/mount.go index e8acb2274e3..6bdf4f365a0 100644 --- a/go/cmd/vtctldclient/command/vreplication/mount/mount.go +++ b/go/cmd/vtctldclient/command/vreplication/mount/mount.go @@ -22,10 +22,10 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/movetables/create.go b/go/cmd/vtctldclient/command/vreplication/movetables/create.go index cd458811520..493a0056c19 100644 --- a/go/cmd/vtctldclient/command/vreplication/movetables/create.go +++ b/go/cmd/vtctldclient/command/vreplication/movetables/create.go @@ -22,10 +22,10 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/movetables/movetables.go b/go/cmd/vtctldclient/command/vreplication/movetables/movetables.go index 1039ac5bf87..5f9df869461 100644 --- a/go/cmd/vtctldclient/command/vreplication/movetables/movetables.go +++ b/go/cmd/vtctldclient/command/vreplication/movetables/movetables.go @@ -19,7 +19,7 @@ package movetables import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/reshard/create.go b/go/cmd/vtctldclient/command/vreplication/reshard/create.go index 02e8276df6f..0f6a9fac1ca 100644 --- a/go/cmd/vtctldclient/command/vreplication/reshard/create.go +++ b/go/cmd/vtctldclient/command/vreplication/reshard/create.go @@ -19,10 +19,10 @@ package reshard import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/reshard/reshard.go b/go/cmd/vtctldclient/command/vreplication/reshard/reshard.go index 697e094c120..dbea2566e9a 100644 --- a/go/cmd/vtctldclient/command/vreplication/reshard/reshard.go +++ b/go/cmd/vtctldclient/command/vreplication/reshard/reshard.go @@ -19,7 +19,7 @@ package reshard import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff.go b/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff.go index 1ad76ef0eb8..82886421219 100644 --- a/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff.go +++ b/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff.go @@ -31,17 +31,17 @@ import ( "github.com/google/uuid" "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vdiff" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - topoprotopb "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vdiff" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + topoprotopb "github.com/vitess/vitess/go/vt/topo/topoproto" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff_env_test.go b/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff_env_test.go index 2265d11de49..0cc34a507f6 100644 --- a/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff_env_test.go +++ b/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff_env_test.go @@ -25,22 +25,22 @@ import ( "sync" "testing" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice/fakes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconntest" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtctl/workflow" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/queryservice/fakes" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletconntest" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff_test.go b/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff_test.go index c5f9eb3db3e..9201bce588c 100644 --- a/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff_test.go +++ b/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff_test.go @@ -26,11 +26,11 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vdiff" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vdiff" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/workflow/delete.go b/go/cmd/vtctldclient/command/vreplication/workflow/delete.go index aad8011cdc3..d50d4345c0f 100644 --- a/go/cmd/vtctldclient/command/vreplication/workflow/delete.go +++ b/go/cmd/vtctldclient/command/vreplication/workflow/delete.go @@ -22,10 +22,10 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/workflow/get.go b/go/cmd/vtctldclient/command/vreplication/workflow/get.go index e669f2d7456..c2f00876fa9 100644 --- a/go/cmd/vtctldclient/command/vreplication/workflow/get.go +++ b/go/cmd/vtctldclient/command/vreplication/workflow/get.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/workflow/show.go b/go/cmd/vtctldclient/command/vreplication/workflow/show.go index 919bbcbd08c..70877907d19 100644 --- a/go/cmd/vtctldclient/command/vreplication/workflow/show.go +++ b/go/cmd/vtctldclient/command/vreplication/workflow/show.go @@ -22,10 +22,10 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/workflow/state.go b/go/cmd/vtctldclient/command/vreplication/workflow/state.go index af451e65abb..ab529823d0d 100644 --- a/go/cmd/vtctldclient/command/vreplication/workflow/state.go +++ b/go/cmd/vtctldclient/command/vreplication/workflow/state.go @@ -23,14 +23,14 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" - "github.com/mdibaiee/vitess/go/textutil" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/textutil" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/workflow/update.go b/go/cmd/vtctldclient/command/vreplication/workflow/update.go index c069599cba6..a32cecb172d 100644 --- a/go/cmd/vtctldclient/command/vreplication/workflow/update.go +++ b/go/cmd/vtctldclient/command/vreplication/workflow/update.go @@ -23,14 +23,14 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" - "github.com/mdibaiee/vitess/go/textutil" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/textutil" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/command/vreplication/workflow/workflow.go b/go/cmd/vtctldclient/command/vreplication/workflow/workflow.go index 5eff96d3484..c69dd79ff57 100644 --- a/go/cmd/vtctldclient/command/vreplication/workflow/workflow.go +++ b/go/cmd/vtctldclient/command/vreplication/workflow/workflow.go @@ -19,8 +19,8 @@ package workflow import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command/vreplication/common" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/cmd/vtctldclient/command/vreplication/common" + "github.com/vitess/vitess/go/vt/topo/topoproto" ) var ( diff --git a/go/cmd/vtctldclient/command/vschemas.go b/go/cmd/vtctldclient/command/vschemas.go index 6b553d0a04a..8975db5b8f1 100644 --- a/go/cmd/vtctldclient/command/vschemas.go +++ b/go/cmd/vtctldclient/command/vschemas.go @@ -22,11 +22,11 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/json2" + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/json2" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/cmd/vtctldclient/docgen/main.go b/go/cmd/vtctldclient/docgen/main.go index 0351d260e5d..b481d9751a6 100644 --- a/go/cmd/vtctldclient/docgen/main.go +++ b/go/cmd/vtctldclient/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/vtctldclient/command" ) func main() { diff --git a/go/cmd/vtctldclient/main.go b/go/cmd/vtctldclient/main.go index 86f001fa253..289d11dc23e 100644 --- a/go/cmd/vtctldclient/main.go +++ b/go/cmd/vtctldclient/main.go @@ -19,18 +19,18 @@ package main import ( "flag" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command" - "github.com/mdibaiee/vitess/go/exit" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/grpccommon" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcclientcommon" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctlclient" - - _flag "github.com/mdibaiee/vitess/go/internal/flag" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/cmd/vtctldclient/command" + "github.com/vitess/vitess/go/exit" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/grpccommon" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtctl/grpcclientcommon" + "github.com/vitess/vitess/go/vt/vtctl/vtctlclient" + + _flag "github.com/vitess/vitess/go/internal/flag" ) func main() { diff --git a/go/cmd/vtctldclient/plugin_grpcvtctlclient.go b/go/cmd/vtctldclient/plugin_grpcvtctlclient.go index 64f9e58c2cc..d59ec80245e 100644 --- a/go/cmd/vtctldclient/plugin_grpcvtctlclient.go +++ b/go/cmd/vtctldclient/plugin_grpcvtctlclient.go @@ -19,5 +19,5 @@ package main // Imports and registers the gRPC vtctl client. import ( - _ "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctlclient" + _ "github.com/vitess/vitess/go/vt/vtctl/grpcvtctlclient" ) diff --git a/go/cmd/vtctldclient/plugin_grpcvtctldclient.go b/go/cmd/vtctldclient/plugin_grpcvtctldclient.go index b97a9e0ca50..9f77428ed0c 100644 --- a/go/cmd/vtctldclient/plugin_grpcvtctldclient.go +++ b/go/cmd/vtctldclient/plugin_grpcvtctldclient.go @@ -19,5 +19,5 @@ package main // Imports and register the gRPC vtctld client. import ( - _ "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldclient" + _ "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldclient" ) diff --git a/go/cmd/vtexplain/cli/vtexplain.go b/go/cmd/vtexplain/cli/vtexplain.go index c85c347e6dd..612f00189fe 100644 --- a/go/cmd/vtexplain/cli/vtexplain.go +++ b/go/cmd/vtexplain/cli/vtexplain.go @@ -21,18 +21,18 @@ import ( "fmt" "os" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtexplain" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtexplain" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" "github.com/spf13/cobra" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var ( diff --git a/go/cmd/vtexplain/docgen/main.go b/go/cmd/vtexplain/docgen/main.go index da23650acdf..b84a1ad0f30 100644 --- a/go/cmd/vtexplain/docgen/main.go +++ b/go/cmd/vtexplain/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/vtexplain/cli" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/vtexplain/cli" ) func main() { diff --git a/go/cmd/vtexplain/vtexplain.go b/go/cmd/vtexplain/vtexplain.go index 6af8d0ebee1..37666f232c6 100644 --- a/go/cmd/vtexplain/vtexplain.go +++ b/go/cmd/vtexplain/vtexplain.go @@ -19,8 +19,8 @@ package main import ( "fmt" - "github.com/mdibaiee/vitess/go/cmd/vtexplain/cli" - "github.com/mdibaiee/vitess/go/exit" + "github.com/vitess/vitess/go/cmd/vtexplain/cli" + "github.com/vitess/vitess/go/exit" ) func main() { diff --git a/go/cmd/vtgate/cli/cli.go b/go/cmd/vtgate/cli/cli.go index d7f3d0569b4..0d80c6c4c39 100644 --- a/go/cmd/vtgate/cli/cli.go +++ b/go/cmd/vtgate/cli/cli.go @@ -23,21 +23,21 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/exit" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/exit" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var ( diff --git a/go/cmd/vtgate/cli/plugin_auth_clientcert.go b/go/cmd/vtgate/cli/plugin_auth_clientcert.go index 7d236b87ac8..27b59f4461f 100644 --- a/go/cmd/vtgate/cli/plugin_auth_clientcert.go +++ b/go/cmd/vtgate/cli/plugin_auth_clientcert.go @@ -19,8 +19,8 @@ package cli // This plugin imports clientcert to register the client certificate implementation of AuthServer. import ( - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/vtgate" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/vtgate" ) var clientcertAuthMethod string diff --git a/go/cmd/vtgate/cli/plugin_auth_ldap.go b/go/cmd/vtgate/cli/plugin_auth_ldap.go index ed833a6fbd5..c85fa3ca41a 100644 --- a/go/cmd/vtgate/cli/plugin_auth_ldap.go +++ b/go/cmd/vtgate/cli/plugin_auth_ldap.go @@ -19,9 +19,9 @@ package cli // This plugin imports ldapauthserver to register the LDAP implementation of AuthServer. import ( - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/ldapauthserver" - "github.com/mdibaiee/vitess/go/vt/vtgate" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/ldapauthserver" + "github.com/vitess/vitess/go/vt/vtgate" ) var ( diff --git a/go/cmd/vtgate/cli/plugin_auth_static.go b/go/cmd/vtgate/cli/plugin_auth_static.go index fcb2ccd4426..39d0f6eed54 100644 --- a/go/cmd/vtgate/cli/plugin_auth_static.go +++ b/go/cmd/vtgate/cli/plugin_auth_static.go @@ -21,8 +21,8 @@ package cli import ( "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/vtgate" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/vtgate" ) var ( diff --git a/go/cmd/vtgate/cli/plugin_auth_vault.go b/go/cmd/vtgate/cli/plugin_auth_vault.go index 8622279e36f..fa41c650dd7 100644 --- a/go/cmd/vtgate/cli/plugin_auth_vault.go +++ b/go/cmd/vtgate/cli/plugin_auth_vault.go @@ -21,8 +21,8 @@ package cli import ( "time" - "github.com/mdibaiee/vitess/go/mysql/vault" - "github.com/mdibaiee/vitess/go/vt/vtgate" + "github.com/vitess/vitess/go/mysql/vault" + "github.com/vitess/vitess/go/vt/vtgate" ) var ( diff --git a/go/cmd/vtgate/cli/plugin_consultopo.go b/go/cmd/vtgate/cli/plugin_consultopo.go index 326ebf0306e..d0bf1f8d051 100644 --- a/go/cmd/vtgate/cli/plugin_consultopo.go +++ b/go/cmd/vtgate/cli/plugin_consultopo.go @@ -19,5 +19,5 @@ package cli // This plugin imports consultopo to register the consul implementation of TopoServer. import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/consultopo" + _ "github.com/vitess/vitess/go/vt/topo/consultopo" ) diff --git a/go/cmd/vtgate/cli/plugin_etcd2topo.go b/go/cmd/vtgate/cli/plugin_etcd2topo.go index 67b3647ea8c..8f6c0f7f4b1 100644 --- a/go/cmd/vtgate/cli/plugin_etcd2topo.go +++ b/go/cmd/vtgate/cli/plugin_etcd2topo.go @@ -19,5 +19,5 @@ package cli // This plugin imports etcd2topo to register the etcd2 implementation of TopoServer. import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/etcd2topo" + _ "github.com/vitess/vitess/go/vt/topo/etcd2topo" ) diff --git a/go/cmd/vtgate/cli/plugin_grpctabletconn.go b/go/cmd/vtgate/cli/plugin_grpctabletconn.go index 6e4fb71f4e7..cb5d997d77e 100644 --- a/go/cmd/vtgate/cli/plugin_grpctabletconn.go +++ b/go/cmd/vtgate/cli/plugin_grpctabletconn.go @@ -19,5 +19,5 @@ package cli // Imports and register the gRPC tabletconn client import ( - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctabletconn" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctabletconn" ) diff --git a/go/cmd/vtgate/cli/plugin_grpcvtgateservice.go b/go/cmd/vtgate/cli/plugin_grpcvtgateservice.go index 776669e1555..386a0c2a5eb 100644 --- a/go/cmd/vtgate/cli/plugin_grpcvtgateservice.go +++ b/go/cmd/vtgate/cli/plugin_grpcvtgateservice.go @@ -19,5 +19,5 @@ package cli // Imports and register the gRPC vtgateservice server import ( - _ "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateservice" + _ "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateservice" ) diff --git a/go/cmd/vtgate/cli/plugin_opentracing.go b/go/cmd/vtgate/cli/plugin_opentracing.go index da35621ff90..4141969305c 100644 --- a/go/cmd/vtgate/cli/plugin_opentracing.go +++ b/go/cmd/vtgate/cli/plugin_opentracing.go @@ -17,8 +17,8 @@ limitations under the License. package cli import ( - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/servenv" ) func init() { diff --git a/go/cmd/vtgate/cli/plugin_opentsdb.go b/go/cmd/vtgate/cli/plugin_opentsdb.go index c150e9db666..11d3d51574b 100644 --- a/go/cmd/vtgate/cli/plugin_opentsdb.go +++ b/go/cmd/vtgate/cli/plugin_opentsdb.go @@ -19,7 +19,7 @@ package cli // This plugin imports opentsdb to register the opentsdb stats backend. import ( - "github.com/mdibaiee/vitess/go/stats/opentsdb" + "github.com/vitess/vitess/go/stats/opentsdb" ) func init() { diff --git a/go/cmd/vtgate/cli/plugin_prometheusbackend.go b/go/cmd/vtgate/cli/plugin_prometheusbackend.go index 8cd6e730826..889c7e4f81e 100644 --- a/go/cmd/vtgate/cli/plugin_prometheusbackend.go +++ b/go/cmd/vtgate/cli/plugin_prometheusbackend.go @@ -20,8 +20,8 @@ package cli // with the Prometheus client library import ( - "github.com/mdibaiee/vitess/go/stats/prometheusbackend" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/stats/prometheusbackend" + "github.com/vitess/vitess/go/vt/servenv" ) func init() { diff --git a/go/cmd/vtgate/cli/plugin_statsd.go b/go/cmd/vtgate/cli/plugin_statsd.go index cede0928645..c84ab35a209 100644 --- a/go/cmd/vtgate/cli/plugin_statsd.go +++ b/go/cmd/vtgate/cli/plugin_statsd.go @@ -16,7 +16,7 @@ limitations under the License. package cli -import "github.com/mdibaiee/vitess/go/stats/statsd" +import "github.com/vitess/vitess/go/stats/statsd" func init() { statsd.Init("vtgate") diff --git a/go/cmd/vtgate/cli/plugin_zk2topo.go b/go/cmd/vtgate/cli/plugin_zk2topo.go index ff91fecf3e9..f2b2144cd79 100644 --- a/go/cmd/vtgate/cli/plugin_zk2topo.go +++ b/go/cmd/vtgate/cli/plugin_zk2topo.go @@ -18,5 +18,5 @@ package cli import ( // Imports and register the zk2 TopologyServer - _ "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + _ "github.com/vitess/vitess/go/vt/topo/zk2topo" ) diff --git a/go/cmd/vtgate/cli/status.go b/go/cmd/vtgate/cli/status.go index ab99d83f45e..f4ee34638d3 100644 --- a/go/cmd/vtgate/cli/status.go +++ b/go/cmd/vtgate/cli/status.go @@ -17,10 +17,10 @@ limitations under the License. package cli import ( - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vtgate" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vtgate" ) func addStatusParts(vtg *vtgate.VTGate) { diff --git a/go/cmd/vtgate/docgen/main.go b/go/cmd/vtgate/docgen/main.go index 1acd3708417..9f3b2f0c8c8 100644 --- a/go/cmd/vtgate/docgen/main.go +++ b/go/cmd/vtgate/docgen/main.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/vtgate/cli" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/vtgate/cli" ) func main() { diff --git a/go/cmd/vtgate/index.go b/go/cmd/vtgate/index.go index 0d902c1bd3f..ff73dbdd925 100644 --- a/go/cmd/vtgate/index.go +++ b/go/cmd/vtgate/index.go @@ -19,7 +19,7 @@ package main import ( "net/http" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/servenv" ) // This is a separate file so it can be selectively included/excluded from diff --git a/go/cmd/vtgate/vtgate.go b/go/cmd/vtgate/vtgate.go index 8e6e404a0ce..41a59079cba 100644 --- a/go/cmd/vtgate/vtgate.go +++ b/go/cmd/vtgate/vtgate.go @@ -17,8 +17,8 @@ limitations under the License. package main import ( - "github.com/mdibaiee/vitess/go/cmd/vtgate/cli" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/vtgate/cli" + "github.com/vitess/vitess/go/vt/log" ) func main() { diff --git a/go/cmd/vtgateclienttest/cli/main.go b/go/cmd/vtgateclienttest/cli/main.go index 05e26509f76..bb2a4285a15 100644 --- a/go/cmd/vtgateclienttest/cli/main.go +++ b/go/cmd/vtgateclienttest/cli/main.go @@ -22,10 +22,10 @@ package cli import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/cmd/vtgateclienttest/services" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtgate" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/cmd/vtgateclienttest/services" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtgate" ) var Main = &cobra.Command{ diff --git a/go/cmd/vtgateclienttest/cli/plugin_grpcvtgateservice.go b/go/cmd/vtgateclienttest/cli/plugin_grpcvtgateservice.go index 776669e1555..386a0c2a5eb 100644 --- a/go/cmd/vtgateclienttest/cli/plugin_grpcvtgateservice.go +++ b/go/cmd/vtgateclienttest/cli/plugin_grpcvtgateservice.go @@ -19,5 +19,5 @@ package cli // Imports and register the gRPC vtgateservice server import ( - _ "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateservice" + _ "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateservice" ) diff --git a/go/cmd/vtgateclienttest/docgen/main.go b/go/cmd/vtgateclienttest/docgen/main.go index e2ba867463b..2aeacbeb8a5 100644 --- a/go/cmd/vtgateclienttest/docgen/main.go +++ b/go/cmd/vtgateclienttest/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/vtgateclienttest/cli" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/vtgateclienttest/cli" ) func main() { diff --git a/go/cmd/vtgateclienttest/main.go b/go/cmd/vtgateclienttest/main.go index e694a55936b..cd58a53eba7 100644 --- a/go/cmd/vtgateclienttest/main.go +++ b/go/cmd/vtgateclienttest/main.go @@ -17,9 +17,9 @@ limitations under the License. package main import ( - "github.com/mdibaiee/vitess/go/cmd/vtgateclienttest/cli" - "github.com/mdibaiee/vitess/go/exit" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/vtgateclienttest/cli" + "github.com/vitess/vitess/go/exit" + "github.com/vitess/vitess/go/vt/log" ) func main() { diff --git a/go/cmd/vtgateclienttest/services/callerid.go b/go/cmd/vtgateclienttest/services/callerid.go index 00c1f9a07e9..8f68ef19a86 100644 --- a/go/cmd/vtgateclienttest/services/callerid.go +++ b/go/cmd/vtgateclienttest/services/callerid.go @@ -24,12 +24,12 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/callerid" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateservice" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/callerid" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vtgate/vtgateservice" ) // CallerIDPrefix is the prefix to send with queries so they go diff --git a/go/cmd/vtgateclienttest/services/echo.go b/go/cmd/vtgateclienttest/services/echo.go index e22053e9ae5..8bc66abf225 100644 --- a/go/cmd/vtgateclienttest/services/echo.go +++ b/go/cmd/vtgateclienttest/services/echo.go @@ -24,15 +24,15 @@ import ( "sort" "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateservice" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/vtgate/vtgateservice" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) // EchoPrefix is the prefix to send with queries so they go diff --git a/go/cmd/vtgateclienttest/services/errors.go b/go/cmd/vtgateclienttest/services/errors.go index bf23f20ee78..9ae40b404f3 100644 --- a/go/cmd/vtgateclienttest/services/errors.go +++ b/go/cmd/vtgateclienttest/services/errors.go @@ -20,13 +20,13 @@ import ( "context" "strings" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateservice" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vtgateservice" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // errorClient implements vtgateservice.VTGateService diff --git a/go/cmd/vtgateclienttest/services/fallback.go b/go/cmd/vtgateclienttest/services/fallback.go index ccf68cec8cd..801089a3ee7 100644 --- a/go/cmd/vtgateclienttest/services/fallback.go +++ b/go/cmd/vtgateclienttest/services/fallback.go @@ -19,13 +19,13 @@ package services import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateservice" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vtgate/vtgateservice" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) // fallbackClient implements vtgateservice.VTGateService, and always passes diff --git a/go/cmd/vtgateclienttest/services/services.go b/go/cmd/vtgateclienttest/services/services.go index a4c97a29157..0d47f60fa93 100644 --- a/go/cmd/vtgateclienttest/services/services.go +++ b/go/cmd/vtgateclienttest/services/services.go @@ -18,7 +18,7 @@ limitations under the License. package services import ( - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateservice" + "github.com/vitess/vitess/go/vt/vtgate/vtgateservice" ) // CreateServices creates the implementation chain of all the test cases diff --git a/go/cmd/vtgateclienttest/services/terminal.go b/go/cmd/vtgateclienttest/services/terminal.go index 012cebbc166..a11de67019e 100644 --- a/go/cmd/vtgateclienttest/services/terminal.go +++ b/go/cmd/vtgateclienttest/services/terminal.go @@ -21,16 +21,16 @@ import ( "errors" "fmt" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateservice" + "github.com/vitess/vitess/go/vt/vtgate/vtgateservice" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/tb" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/tb" + "github.com/vitess/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) var errTerminal = errors.New("vtgate test client, errTerminal") diff --git a/go/cmd/vtorc/cli/cli.go b/go/cmd/vtorc/cli/cli.go index ff44fe4cb7e..6a709d4f25b 100644 --- a/go/cmd/vtorc/cli/cli.go +++ b/go/cmd/vtorc/cli/cli.go @@ -19,13 +19,13 @@ package cli import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" - "github.com/mdibaiee/vitess/go/vt/vtorc/inst" - "github.com/mdibaiee/vitess/go/vt/vtorc/logic" - "github.com/mdibaiee/vitess/go/vt/vtorc/server" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/inst" + "github.com/vitess/vitess/go/vt/vtorc/logic" + "github.com/vitess/vitess/go/vt/vtorc/server" ) var ( diff --git a/go/cmd/vtorc/cli/plugin_consultopo.go b/go/cmd/vtorc/cli/plugin_consultopo.go index 326ebf0306e..d0bf1f8d051 100644 --- a/go/cmd/vtorc/cli/plugin_consultopo.go +++ b/go/cmd/vtorc/cli/plugin_consultopo.go @@ -19,5 +19,5 @@ package cli // This plugin imports consultopo to register the consul implementation of TopoServer. import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/consultopo" + _ "github.com/vitess/vitess/go/vt/topo/consultopo" ) diff --git a/go/cmd/vtorc/cli/plugin_etcd2topo.go b/go/cmd/vtorc/cli/plugin_etcd2topo.go index 67b3647ea8c..8f6c0f7f4b1 100644 --- a/go/cmd/vtorc/cli/plugin_etcd2topo.go +++ b/go/cmd/vtorc/cli/plugin_etcd2topo.go @@ -19,5 +19,5 @@ package cli // This plugin imports etcd2topo to register the etcd2 implementation of TopoServer. import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/etcd2topo" + _ "github.com/vitess/vitess/go/vt/topo/etcd2topo" ) diff --git a/go/cmd/vtorc/cli/plugin_grpctmclient.go b/go/cmd/vtorc/cli/plugin_grpctmclient.go index 7aaa3feab79..5da125762bd 100644 --- a/go/cmd/vtorc/cli/plugin_grpctmclient.go +++ b/go/cmd/vtorc/cli/plugin_grpctmclient.go @@ -19,5 +19,5 @@ package cli // Imports and register the gRPC tabletmanager client import ( - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmclient" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctmclient" ) diff --git a/go/cmd/vtorc/cli/plugin_prometheusbackend.go b/go/cmd/vtorc/cli/plugin_prometheusbackend.go index 3ce9eabec71..09a15af8b45 100644 --- a/go/cmd/vtorc/cli/plugin_prometheusbackend.go +++ b/go/cmd/vtorc/cli/plugin_prometheusbackend.go @@ -20,8 +20,8 @@ package cli // with the Prometheus client library import ( - "github.com/mdibaiee/vitess/go/stats/prometheusbackend" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/stats/prometheusbackend" + "github.com/vitess/vitess/go/vt/servenv" ) func init() { diff --git a/go/cmd/vtorc/cli/plugin_zk2topo.go b/go/cmd/vtorc/cli/plugin_zk2topo.go index d3ed4842c49..a4ffc157bf5 100644 --- a/go/cmd/vtorc/cli/plugin_zk2topo.go +++ b/go/cmd/vtorc/cli/plugin_zk2topo.go @@ -19,5 +19,5 @@ package cli // Imports and register the zk2 TopologyServer import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + _ "github.com/vitess/vitess/go/vt/topo/zk2topo" ) diff --git a/go/cmd/vtorc/docgen/main.go b/go/cmd/vtorc/docgen/main.go index 40fd3dd3d2b..a5bdc56a4e5 100644 --- a/go/cmd/vtorc/docgen/main.go +++ b/go/cmd/vtorc/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/vtorc/cli" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/vtorc/cli" ) func main() { diff --git a/go/cmd/vtorc/index.go b/go/cmd/vtorc/index.go index 78907321bde..c0db4452050 100644 --- a/go/cmd/vtorc/index.go +++ b/go/cmd/vtorc/index.go @@ -19,7 +19,7 @@ package main import ( "net/http" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/servenv" ) func init() { diff --git a/go/cmd/vtorc/main.go b/go/cmd/vtorc/main.go index 54b7b3594cd..8a58178ade0 100644 --- a/go/cmd/vtorc/main.go +++ b/go/cmd/vtorc/main.go @@ -17,8 +17,8 @@ package main import ( - "github.com/mdibaiee/vitess/go/cmd/vtorc/cli" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/vtorc/cli" + "github.com/vitess/vitess/go/vt/log" ) // main is the application's entry point. It will spawn an HTTP interface. diff --git a/go/cmd/vttablet/cli/cli.go b/go/cmd/vttablet/cli/cli.go index 09d47bf3a28..ee6ca81a7c6 100644 --- a/go/cmd/vttablet/cli/cli.go +++ b/go/cmd/vttablet/cli/cli.go @@ -24,27 +24,27 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/binlog" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/tableacl" - "github.com/mdibaiee/vitess/go/vt/tableacl/simpleacl" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vdiff" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/yaml2" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/binlog" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/tableacl" + "github.com/vitess/vitess/go/vt/tableacl/simpleacl" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vdiff" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/yaml2" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/cmd/vttablet/cli/plugin_azblobbackupstorage.go b/go/cmd/vttablet/cli/plugin_azblobbackupstorage.go index c5079c60753..242df5c89de 100644 --- a/go/cmd/vttablet/cli/plugin_azblobbackupstorage.go +++ b/go/cmd/vttablet/cli/plugin_azblobbackupstorage.go @@ -17,5 +17,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/azblobbackupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/azblobbackupstorage" ) diff --git a/go/cmd/vttablet/cli/plugin_cephbackupstorage.go b/go/cmd/vttablet/cli/plugin_cephbackupstorage.go index 4fda1110b58..b4fc46cf976 100644 --- a/go/cmd/vttablet/cli/plugin_cephbackupstorage.go +++ b/go/cmd/vttablet/cli/plugin_cephbackupstorage.go @@ -17,5 +17,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/cephbackupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/cephbackupstorage" ) diff --git a/go/cmd/vttablet/cli/plugin_consultopo.go b/go/cmd/vttablet/cli/plugin_consultopo.go index 326ebf0306e..d0bf1f8d051 100644 --- a/go/cmd/vttablet/cli/plugin_consultopo.go +++ b/go/cmd/vttablet/cli/plugin_consultopo.go @@ -19,5 +19,5 @@ package cli // This plugin imports consultopo to register the consul implementation of TopoServer. import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/consultopo" + _ "github.com/vitess/vitess/go/vt/topo/consultopo" ) diff --git a/go/cmd/vttablet/cli/plugin_etcd2topo.go b/go/cmd/vttablet/cli/plugin_etcd2topo.go index 67b3647ea8c..8f6c0f7f4b1 100644 --- a/go/cmd/vttablet/cli/plugin_etcd2topo.go +++ b/go/cmd/vttablet/cli/plugin_etcd2topo.go @@ -19,5 +19,5 @@ package cli // This plugin imports etcd2topo to register the etcd2 implementation of TopoServer. import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/etcd2topo" + _ "github.com/vitess/vitess/go/vt/topo/etcd2topo" ) diff --git a/go/cmd/vttablet/cli/plugin_filebackupstorage.go b/go/cmd/vttablet/cli/plugin_filebackupstorage.go index a015d60f474..8b61759b2b8 100644 --- a/go/cmd/vttablet/cli/plugin_filebackupstorage.go +++ b/go/cmd/vttablet/cli/plugin_filebackupstorage.go @@ -17,5 +17,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/filebackupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/filebackupstorage" ) diff --git a/go/cmd/vttablet/cli/plugin_filecustomrule.go b/go/cmd/vttablet/cli/plugin_filecustomrule.go index 59977c0d262..02ac1dc687c 100644 --- a/go/cmd/vttablet/cli/plugin_filecustomrule.go +++ b/go/cmd/vttablet/cli/plugin_filecustomrule.go @@ -19,5 +19,5 @@ package cli // Imports and register the file custom rule source import ( - _ "github.com/mdibaiee/vitess/go/vt/vttablet/customrule/filecustomrule" + _ "github.com/vitess/vitess/go/vt/vttablet/customrule/filecustomrule" ) diff --git a/go/cmd/vttablet/cli/plugin_filelogger.go b/go/cmd/vttablet/cli/plugin_filelogger.go index 17a2733fb27..eb2fe261754 100644 --- a/go/cmd/vttablet/cli/plugin_filelogger.go +++ b/go/cmd/vttablet/cli/plugin_filelogger.go @@ -19,5 +19,5 @@ package cli // Imports and register the file-based query logger import ( - _ "github.com/mdibaiee/vitess/go/vt/vttablet/filelogger" + _ "github.com/vitess/vitess/go/vt/vttablet/filelogger" ) diff --git a/go/cmd/vttablet/cli/plugin_gcsbackupstorage.go b/go/cmd/vttablet/cli/plugin_gcsbackupstorage.go index 7a1685cd500..915753bb90b 100644 --- a/go/cmd/vttablet/cli/plugin_gcsbackupstorage.go +++ b/go/cmd/vttablet/cli/plugin_gcsbackupstorage.go @@ -17,5 +17,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/gcsbackupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/gcsbackupstorage" ) diff --git a/go/cmd/vttablet/cli/plugin_grpcbinlogplayer.go b/go/cmd/vttablet/cli/plugin_grpcbinlogplayer.go index 6c180670a5c..aaa19ed24a4 100644 --- a/go/cmd/vttablet/cli/plugin_grpcbinlogplayer.go +++ b/go/cmd/vttablet/cli/plugin_grpcbinlogplayer.go @@ -19,5 +19,5 @@ package cli // Imports and register the gRPC binlog player import ( - _ "github.com/mdibaiee/vitess/go/vt/binlog/grpcbinlogplayer" + _ "github.com/vitess/vitess/go/vt/binlog/grpcbinlogplayer" ) diff --git a/go/cmd/vttablet/cli/plugin_grpcbinlogstreamer.go b/go/cmd/vttablet/cli/plugin_grpcbinlogstreamer.go index c927e97c9a5..48fa1b680f2 100644 --- a/go/cmd/vttablet/cli/plugin_grpcbinlogstreamer.go +++ b/go/cmd/vttablet/cli/plugin_grpcbinlogstreamer.go @@ -19,5 +19,5 @@ package cli // Imports and register the gRPC binlog streamer import ( - _ "github.com/mdibaiee/vitess/go/vt/binlog/grpcbinlogstreamer" + _ "github.com/vitess/vitess/go/vt/binlog/grpcbinlogstreamer" ) diff --git a/go/cmd/vttablet/cli/plugin_grpcqueryservice.go b/go/cmd/vttablet/cli/plugin_grpcqueryservice.go index 2f36ce9c66c..71d5984a6c0 100644 --- a/go/cmd/vttablet/cli/plugin_grpcqueryservice.go +++ b/go/cmd/vttablet/cli/plugin_grpcqueryservice.go @@ -19,9 +19,9 @@ package cli // Imports and register the gRPC queryservice server import ( - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/grpcqueryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vttablet/grpcqueryservice" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver" ) func init() { diff --git a/go/cmd/vttablet/cli/plugin_grpctabletconn.go b/go/cmd/vttablet/cli/plugin_grpctabletconn.go index 6e4fb71f4e7..cb5d997d77e 100644 --- a/go/cmd/vttablet/cli/plugin_grpctabletconn.go +++ b/go/cmd/vttablet/cli/plugin_grpctabletconn.go @@ -19,5 +19,5 @@ package cli // Imports and register the gRPC tabletconn client import ( - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctabletconn" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctabletconn" ) diff --git a/go/cmd/vttablet/cli/plugin_grpcthrottlerserver.go b/go/cmd/vttablet/cli/plugin_grpcthrottlerserver.go index c71e6d8fc01..1a018bcfc25 100644 --- a/go/cmd/vttablet/cli/plugin_grpcthrottlerserver.go +++ b/go/cmd/vttablet/cli/plugin_grpcthrottlerserver.go @@ -19,5 +19,5 @@ package cli // Imports and register the gRPC throttler server. import ( - _ "github.com/mdibaiee/vitess/go/vt/throttler/grpcthrottlerserver" + _ "github.com/vitess/vitess/go/vt/throttler/grpcthrottlerserver" ) diff --git a/go/cmd/vttablet/cli/plugin_grpctmclient.go b/go/cmd/vttablet/cli/plugin_grpctmclient.go index 7aaa3feab79..5da125762bd 100644 --- a/go/cmd/vttablet/cli/plugin_grpctmclient.go +++ b/go/cmd/vttablet/cli/plugin_grpctmclient.go @@ -19,5 +19,5 @@ package cli // Imports and register the gRPC tabletmanager client import ( - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmclient" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctmclient" ) diff --git a/go/cmd/vttablet/cli/plugin_grpctmserver.go b/go/cmd/vttablet/cli/plugin_grpctmserver.go index d547b28438b..7193273a8b5 100644 --- a/go/cmd/vttablet/cli/plugin_grpctmserver.go +++ b/go/cmd/vttablet/cli/plugin_grpctmserver.go @@ -19,5 +19,5 @@ package cli // Imports and register the gRPC tabletmanager server import ( - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmserver" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctmserver" ) diff --git a/go/cmd/vttablet/cli/plugin_opentracing.go b/go/cmd/vttablet/cli/plugin_opentracing.go index 5a2b770e80b..cad6dcd1879 100644 --- a/go/cmd/vttablet/cli/plugin_opentracing.go +++ b/go/cmd/vttablet/cli/plugin_opentracing.go @@ -17,8 +17,8 @@ limitations under the License. package cli import ( - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/servenv" ) func init() { diff --git a/go/cmd/vttablet/cli/plugin_opentsdb.go b/go/cmd/vttablet/cli/plugin_opentsdb.go index 9eaee3ddfca..b4ec28d2738 100644 --- a/go/cmd/vttablet/cli/plugin_opentsdb.go +++ b/go/cmd/vttablet/cli/plugin_opentsdb.go @@ -19,7 +19,7 @@ package cli // This plugin imports opentsdb to register the opentsdb stats backend. import ( - "github.com/mdibaiee/vitess/go/stats/opentsdb" + "github.com/vitess/vitess/go/stats/opentsdb" ) func init() { diff --git a/go/cmd/vttablet/cli/plugin_prometheusbackend.go b/go/cmd/vttablet/cli/plugin_prometheusbackend.go index 0a020f2e175..0bd80103779 100644 --- a/go/cmd/vttablet/cli/plugin_prometheusbackend.go +++ b/go/cmd/vttablet/cli/plugin_prometheusbackend.go @@ -20,8 +20,8 @@ package cli // with the Prometheus client library import ( - "github.com/mdibaiee/vitess/go/stats/prometheusbackend" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/stats/prometheusbackend" + "github.com/vitess/vitess/go/vt/servenv" ) func init() { diff --git a/go/cmd/vttablet/cli/plugin_s3backupstorage.go b/go/cmd/vttablet/cli/plugin_s3backupstorage.go index d5cd2eff54e..7e6026b8dcb 100644 --- a/go/cmd/vttablet/cli/plugin_s3backupstorage.go +++ b/go/cmd/vttablet/cli/plugin_s3backupstorage.go @@ -17,5 +17,5 @@ limitations under the License. package cli import ( - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/s3backupstorage" + _ "github.com/vitess/vitess/go/vt/mysqlctl/s3backupstorage" ) diff --git a/go/cmd/vttablet/cli/plugin_statsd.go b/go/cmd/vttablet/cli/plugin_statsd.go index be7e0167249..f92c1de2741 100644 --- a/go/cmd/vttablet/cli/plugin_statsd.go +++ b/go/cmd/vttablet/cli/plugin_statsd.go @@ -15,7 +15,7 @@ limitations under the License. */ package cli -import "github.com/mdibaiee/vitess/go/stats/statsd" +import "github.com/vitess/vitess/go/stats/statsd" func init() { statsd.Init("vttablet") diff --git a/go/cmd/vttablet/cli/plugin_sysloglogger.go b/go/cmd/vttablet/cli/plugin_sysloglogger.go index 3f7874dfd27..eff362aa3e4 100644 --- a/go/cmd/vttablet/cli/plugin_sysloglogger.go +++ b/go/cmd/vttablet/cli/plugin_sysloglogger.go @@ -21,5 +21,5 @@ package cli // Imports and register the syslog-based query logger import ( - _ "github.com/mdibaiee/vitess/go/vt/vttablet/sysloglogger" + _ "github.com/vitess/vitess/go/vt/vttablet/sysloglogger" ) diff --git a/go/cmd/vttablet/cli/plugin_topocustomrule.go b/go/cmd/vttablet/cli/plugin_topocustomrule.go index 4004177e47b..ffef5ac9c10 100644 --- a/go/cmd/vttablet/cli/plugin_topocustomrule.go +++ b/go/cmd/vttablet/cli/plugin_topocustomrule.go @@ -19,5 +19,5 @@ package cli // Imports and register the topo custom rule source import ( - _ "github.com/mdibaiee/vitess/go/vt/vttablet/customrule/topocustomrule" + _ "github.com/vitess/vitess/go/vt/vttablet/customrule/topocustomrule" ) diff --git a/go/cmd/vttablet/cli/plugin_zk2topo.go b/go/cmd/vttablet/cli/plugin_zk2topo.go index d3ed4842c49..a4ffc157bf5 100644 --- a/go/cmd/vttablet/cli/plugin_zk2topo.go +++ b/go/cmd/vttablet/cli/plugin_zk2topo.go @@ -19,5 +19,5 @@ package cli // Imports and register the zk2 TopologyServer import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + _ "github.com/vitess/vitess/go/vt/topo/zk2topo" ) diff --git a/go/cmd/vttablet/cli/status.go b/go/cmd/vttablet/cli/status.go index 5266a5534af..2930ffb4c95 100644 --- a/go/cmd/vttablet/cli/status.go +++ b/go/cmd/vttablet/cli/status.go @@ -17,10 +17,10 @@ limitations under the License. package cli import ( - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver" ) var ( diff --git a/go/cmd/vttablet/docgen/main.go b/go/cmd/vttablet/docgen/main.go index e256fe3642a..096a30b2331 100644 --- a/go/cmd/vttablet/docgen/main.go +++ b/go/cmd/vttablet/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/vttablet/cli" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/vttablet/cli" ) func main() { diff --git a/go/cmd/vttablet/index.go b/go/cmd/vttablet/index.go index 0d902c1bd3f..ff73dbdd925 100644 --- a/go/cmd/vttablet/index.go +++ b/go/cmd/vttablet/index.go @@ -19,7 +19,7 @@ package main import ( "net/http" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/servenv" ) // This is a separate file so it can be selectively included/excluded from diff --git a/go/cmd/vttablet/vttablet.go b/go/cmd/vttablet/vttablet.go index b3de0cb2995..3bbed41e25c 100644 --- a/go/cmd/vttablet/vttablet.go +++ b/go/cmd/vttablet/vttablet.go @@ -18,8 +18,8 @@ limitations under the License. package main import ( - "github.com/mdibaiee/vitess/go/cmd/vttablet/cli" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/vttablet/cli" + "github.com/vitess/vitess/go/vt/log" ) func main() { diff --git a/go/cmd/vttestserver/cli/main.go b/go/cmd/vttestserver/cli/main.go index 0fcd633fa5d..41d27739e43 100644 --- a/go/cmd/vttestserver/cli/main.go +++ b/go/cmd/vttestserver/cli/main.go @@ -31,12 +31,12 @@ import ( "github.com/spf13/cobra" "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vttest" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vttest" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" ) type topoFlags struct { diff --git a/go/cmd/vttestserver/cli/main_test.go b/go/cmd/vttestserver/cli/main_test.go index 924c820197f..e2acd4c8069 100644 --- a/go/cmd/vttestserver/cli/main_test.go +++ b/go/cmd/vttestserver/cli/main_test.go @@ -32,17 +32,17 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/encoding/protojson" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/tlstest" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctlclient" - "github.com/mdibaiee/vitess/go/vt/vttest" - - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/tlstest" + "github.com/vitess/vitess/go/vt/vtctl/vtctlclient" + "github.com/vitess/vitess/go/vt/vttest" + + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) type columnVindex struct { diff --git a/go/cmd/vttestserver/docgen/main.go b/go/cmd/vttestserver/docgen/main.go index 0de8bffd446..db9fd4aad62 100644 --- a/go/cmd/vttestserver/docgen/main.go +++ b/go/cmd/vttestserver/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/vttestserver/cli" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/vttestserver/cli" ) func main() { diff --git a/go/cmd/vttestserver/main.go b/go/cmd/vttestserver/main.go index f8d20d3818d..742d1eea4b3 100644 --- a/go/cmd/vttestserver/main.go +++ b/go/cmd/vttestserver/main.go @@ -17,8 +17,8 @@ limitations under the License. package main import ( - "github.com/mdibaiee/vitess/go/cmd/vttestserver/cli" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/vttestserver/cli" + "github.com/vitess/vitess/go/vt/log" ) func main() { diff --git a/go/cmd/vttlstest/cli/vttlstest.go b/go/cmd/vttlstest/cli/vttlstest.go index 302eb48001f..22ece20b7ac 100644 --- a/go/cmd/vttlstest/cli/vttlstest.go +++ b/go/cmd/vttlstest/cli/vttlstest.go @@ -19,7 +19,7 @@ package cli import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/vt/tlstest" + "github.com/vitess/vitess/go/vt/tlstest" ) var ( diff --git a/go/cmd/vttlstest/docgen/main.go b/go/cmd/vttlstest/docgen/main.go index bd6a7b40f14..bb853c9edfe 100644 --- a/go/cmd/vttlstest/docgen/main.go +++ b/go/cmd/vttlstest/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/vttlstest/cli" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/vttlstest/cli" ) func main() { diff --git a/go/cmd/vttlstest/vttlstest.go b/go/cmd/vttlstest/vttlstest.go index 98d1cfee458..d936370d760 100644 --- a/go/cmd/vttlstest/vttlstest.go +++ b/go/cmd/vttlstest/vttlstest.go @@ -19,9 +19,9 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/vttlstest/cli" - "github.com/mdibaiee/vitess/go/exit" - "github.com/mdibaiee/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/cmd/vttlstest/cli" + "github.com/vitess/vitess/go/exit" + "github.com/vitess/vitess/go/vt/logutil" ) func main() { diff --git a/go/cmd/zk/command/cat.go b/go/cmd/zk/command/cat.go index 5f8b773042f..9d46c30e29d 100644 --- a/go/cmd/zk/command/cat.go +++ b/go/cmd/zk/command/cat.go @@ -24,10 +24,10 @@ import ( "github.com/z-division/go-zookeeper/zk" "golang.org/x/term" - "github.com/mdibaiee/vitess/go/cmd/zk/internal/zkfilepath" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + "github.com/vitess/vitess/go/cmd/zk/internal/zkfilepath" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/zk2topo" ) var ( diff --git a/go/cmd/zk/command/chmod.go b/go/cmd/zk/command/chmod.go index aa9d523567c..8e510efb57c 100644 --- a/go/cmd/zk/command/chmod.go +++ b/go/cmd/zk/command/chmod.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/zk/internal/zkfilepath" - "github.com/mdibaiee/vitess/go/cmd/zk/internal/zkfs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + "github.com/vitess/vitess/go/cmd/zk/internal/zkfilepath" + "github.com/vitess/vitess/go/cmd/zk/internal/zkfs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo/zk2topo" ) var Chmod = &cobra.Command{ diff --git a/go/cmd/zk/command/edit.go b/go/cmd/zk/command/edit.go index 38ee638e120..1c587c70a15 100644 --- a/go/cmd/zk/command/edit.go +++ b/go/cmd/zk/command/edit.go @@ -27,8 +27,8 @@ import ( "github.com/spf13/cobra" "github.com/z-division/go-zookeeper/zk" - "github.com/mdibaiee/vitess/go/cmd/zk/internal/zkfilepath" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/zk/internal/zkfilepath" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/cmd/zk/command/ls.go b/go/cmd/zk/command/ls.go index aa3dc37b474..f7740dc61b1 100644 --- a/go/cmd/zk/command/ls.go +++ b/go/cmd/zk/command/ls.go @@ -25,9 +25,9 @@ import ( "github.com/spf13/cobra" "github.com/z-division/go-zookeeper/zk" - "github.com/mdibaiee/vitess/go/cmd/zk/internal/zkfilepath" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + "github.com/vitess/vitess/go/cmd/zk/internal/zkfilepath" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo/zk2topo" ) var ( diff --git a/go/cmd/zk/command/rm.go b/go/cmd/zk/command/rm.go index cd2011ddac3..b01b2321d4f 100644 --- a/go/cmd/zk/command/rm.go +++ b/go/cmd/zk/command/rm.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" "github.com/z-division/go-zookeeper/zk" - "github.com/mdibaiee/vitess/go/cmd/zk/internal/zkfilepath" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + "github.com/vitess/vitess/go/cmd/zk/internal/zkfilepath" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo/zk2topo" ) var ( diff --git a/go/cmd/zk/command/root.go b/go/cmd/zk/command/root.go index 1c05b00ea0d..83df6c07c27 100644 --- a/go/cmd/zk/command/root.go +++ b/go/cmd/zk/command/root.go @@ -19,11 +19,11 @@ package command import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/cmd/zk/internal/zkfs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/cmd/zk/internal/zkfs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo/zk2topo" ) var ( diff --git a/go/cmd/zk/command/stat.go b/go/cmd/zk/command/stat.go index d6e4fdfd797..d9c6cef6428 100644 --- a/go/cmd/zk/command/stat.go +++ b/go/cmd/zk/command/stat.go @@ -22,10 +22,10 @@ import ( "github.com/spf13/cobra" "github.com/z-division/go-zookeeper/zk" - "github.com/mdibaiee/vitess/go/cmd/zk/internal/zkfilepath" - "github.com/mdibaiee/vitess/go/cmd/zk/internal/zkfs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + "github.com/vitess/vitess/go/cmd/zk/internal/zkfilepath" + "github.com/vitess/vitess/go/cmd/zk/internal/zkfs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo/zk2topo" ) var ( diff --git a/go/cmd/zk/command/touch.go b/go/cmd/zk/command/touch.go index 6e5a0f02653..4eb7d3f0e44 100644 --- a/go/cmd/zk/command/touch.go +++ b/go/cmd/zk/command/touch.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" "github.com/z-division/go-zookeeper/zk" - "github.com/mdibaiee/vitess/go/cmd/zk/internal/zkfilepath" - "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + "github.com/vitess/vitess/go/cmd/zk/internal/zkfilepath" + "github.com/vitess/vitess/go/vt/topo/zk2topo" ) var ( diff --git a/go/cmd/zk/command/unzip.go b/go/cmd/zk/command/unzip.go index 7481e47b2fe..a8f9f16100c 100644 --- a/go/cmd/zk/command/unzip.go +++ b/go/cmd/zk/command/unzip.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/cobra" "github.com/z-division/go-zookeeper/zk" - "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + "github.com/vitess/vitess/go/vt/topo/zk2topo" ) var Unzip = &cobra.Command{ diff --git a/go/cmd/zk/command/wait.go b/go/cmd/zk/command/wait.go index d6dc7a002d2..1812d17c563 100644 --- a/go/cmd/zk/command/wait.go +++ b/go/cmd/zk/command/wait.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" "github.com/z-division/go-zookeeper/zk" - "github.com/mdibaiee/vitess/go/cmd/zk/internal/zkfilepath" + "github.com/vitess/vitess/go/cmd/zk/internal/zkfilepath" ) var ( diff --git a/go/cmd/zk/command/watch.go b/go/cmd/zk/command/watch.go index 971f0b85cac..03bf42dbf41 100644 --- a/go/cmd/zk/command/watch.go +++ b/go/cmd/zk/command/watch.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" "github.com/z-division/go-zookeeper/zk" - "github.com/mdibaiee/vitess/go/cmd/zk/internal/zkfilepath" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/zk/internal/zkfilepath" + "github.com/vitess/vitess/go/vt/log" ) var Watch = &cobra.Command{ diff --git a/go/cmd/zk/command/zip.go b/go/cmd/zk/command/zip.go index 9b8aa7c16a1..fd290ccbfd2 100644 --- a/go/cmd/zk/command/zip.go +++ b/go/cmd/zk/command/zip.go @@ -26,9 +26,9 @@ import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/zk/internal/zkfilepath" - "github.com/mdibaiee/vitess/go/cmd/zk/internal/zkfs" - "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + "github.com/vitess/vitess/go/cmd/zk/internal/zkfilepath" + "github.com/vitess/vitess/go/cmd/zk/internal/zkfs" + "github.com/vitess/vitess/go/vt/topo/zk2topo" ) var Zip = &cobra.Command{ diff --git a/go/cmd/zk/docgen/main.go b/go/cmd/zk/docgen/main.go index 61010f001ab..54914ba5381 100644 --- a/go/cmd/zk/docgen/main.go +++ b/go/cmd/zk/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/zk/command" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/zk/command" ) func main() { diff --git a/go/cmd/zk/internal/zkfilepath/zkfilepath.go b/go/cmd/zk/internal/zkfilepath/zkfilepath.go index 1c20262c2d3..ea46583a9b0 100644 --- a/go/cmd/zk/internal/zkfilepath/zkfilepath.go +++ b/go/cmd/zk/internal/zkfilepath/zkfilepath.go @@ -24,7 +24,7 @@ import ( "github.com/z-division/go-zookeeper/zk" - "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + "github.com/vitess/vitess/go/vt/topo/zk2topo" ) const ( diff --git a/go/cmd/zk/internal/zkfs/zkfs.go b/go/cmd/zk/internal/zkfs/zkfs.go index b2343631e7a..e3d2c465ecb 100644 --- a/go/cmd/zk/internal/zkfs/zkfs.go +++ b/go/cmd/zk/internal/zkfs/zkfs.go @@ -28,8 +28,8 @@ import ( "github.com/z-division/go-zookeeper/zk" - "github.com/mdibaiee/vitess/go/cmd/zk/internal/zkfilepath" - "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + "github.com/vitess/vitess/go/cmd/zk/internal/zkfilepath" + "github.com/vitess/vitess/go/vt/topo/zk2topo" ) // FS wraps a zk2topo connection to provide FS utility methods. diff --git a/go/cmd/zk/zkcmd.go b/go/cmd/zk/zkcmd.go index a6b9635e6d1..e028b99c6d5 100644 --- a/go/cmd/zk/zkcmd.go +++ b/go/cmd/zk/zkcmd.go @@ -21,9 +21,9 @@ import ( "os" "os/signal" - "github.com/mdibaiee/vitess/go/cmd/zk/command" - "github.com/mdibaiee/vitess/go/exit" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/zk/command" + "github.com/vitess/vitess/go/exit" + "github.com/vitess/vitess/go/vt/log" ) func main() { diff --git a/go/cmd/zkctl/command/root.go b/go/cmd/zkctl/command/root.go index 0c53362de25..024bd893cec 100644 --- a/go/cmd/zkctl/command/root.go +++ b/go/cmd/zkctl/command/root.go @@ -19,9 +19,9 @@ package command import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/zkctl" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/zkctl" ) var ( diff --git a/go/cmd/zkctl/docgen/main.go b/go/cmd/zkctl/docgen/main.go index 0e15b4301ac..f06757efea3 100644 --- a/go/cmd/zkctl/docgen/main.go +++ b/go/cmd/zkctl/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/zkctl/command" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/zkctl/command" ) func main() { diff --git a/go/cmd/zkctl/zkctl.go b/go/cmd/zkctl/zkctl.go index 78886c8924c..610947ee4f7 100644 --- a/go/cmd/zkctl/zkctl.go +++ b/go/cmd/zkctl/zkctl.go @@ -17,9 +17,9 @@ limitations under the License. package main import ( - "github.com/mdibaiee/vitess/go/cmd/zkctl/command" - "github.com/mdibaiee/vitess/go/exit" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/zkctl/command" + "github.com/vitess/vitess/go/exit" + "github.com/vitess/vitess/go/vt/log" ) func main() { diff --git a/go/cmd/zkctld/cli/zkctld.go b/go/cmd/zkctld/cli/zkctld.go index 50e5d3ecbb8..53391b7336f 100644 --- a/go/cmd/zkctld/cli/zkctld.go +++ b/go/cmd/zkctld/cli/zkctld.go @@ -25,11 +25,11 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/zkctl" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/zkctl" ) var ( diff --git a/go/cmd/zkctld/docgen/main.go b/go/cmd/zkctld/docgen/main.go index 06d5fc68d3a..f8d22104f83 100644 --- a/go/cmd/zkctld/docgen/main.go +++ b/go/cmd/zkctld/docgen/main.go @@ -19,8 +19,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/mdibaiee/vitess/go/cmd/internal/docgen" - "github.com/mdibaiee/vitess/go/cmd/zkctld/cli" + "github.com/vitess/vitess/go/cmd/internal/docgen" + "github.com/vitess/vitess/go/cmd/zkctld/cli" ) func main() { diff --git a/go/cmd/zkctld/zkctld.go b/go/cmd/zkctld/zkctld.go index 395f6c897a3..a83959fb86e 100644 --- a/go/cmd/zkctld/zkctld.go +++ b/go/cmd/zkctld/zkctld.go @@ -20,9 +20,9 @@ limitations under the License. package main import ( - "github.com/mdibaiee/vitess/go/cmd/zkctld/cli" - "github.com/mdibaiee/vitess/go/exit" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/cmd/zkctld/cli" + "github.com/vitess/vitess/go/exit" + "github.com/vitess/vitess/go/vt/log" ) func main() { diff --git a/go/constants/sidecar/queries.go b/go/constants/sidecar/queries.go index 51dd145a836..d8c518c0dd3 100644 --- a/go/constants/sidecar/queries.go +++ b/go/constants/sidecar/queries.go @@ -16,7 +16,7 @@ limitations under the License. package sidecar -import "github.com/mdibaiee/vitess/go/vt/sqlparser" +import "github.com/vitess/vitess/go/vt/sqlparser" // region unit-test-only // This section uses helpers used in tests, but also in diff --git a/go/event/syslogger/fake_logger.go b/go/event/syslogger/fake_logger.go index 070d170d769..a93fe1ef1eb 100644 --- a/go/event/syslogger/fake_logger.go +++ b/go/event/syslogger/fake_logger.go @@ -19,7 +19,7 @@ package syslogger import ( "fmt" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) type loggerMsg struct { diff --git a/go/event/syslogger/syslogger.go b/go/event/syslogger/syslogger.go index fa664ea0b2d..6d1ade12616 100644 --- a/go/event/syslogger/syslogger.go +++ b/go/event/syslogger/syslogger.go @@ -56,9 +56,9 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/event" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/event" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" ) // Syslogger is the interface that events should implement if they want to be diff --git a/go/event/syslogger/syslogger_test.go b/go/event/syslogger/syslogger_test.go index 87480b076a9..104616897eb 100644 --- a/go/event/syslogger/syslogger_test.go +++ b/go/event/syslogger/syslogger_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/event" + "github.com/vitess/vitess/go/event" "github.com/stretchr/testify/assert" ) diff --git a/go/exit/exit.go b/go/exit/exit.go index f26e0cdc13c..ba48fe000a5 100644 --- a/go/exit/exit.go +++ b/go/exit/exit.go @@ -50,8 +50,8 @@ package exit import ( "os" - "github.com/mdibaiee/vitess/go/tb" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/tb" + "github.com/vitess/vitess/go/vt/log" ) type exitCode int diff --git a/go/flags/endtoend/flags_test.go b/go/flags/endtoend/flags_test.go index 21af7a61b8e..3ef41accd10 100644 --- a/go/flags/endtoend/flags_test.go +++ b/go/flags/endtoend/flags_test.go @@ -31,7 +31,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" ) var ( diff --git a/go/flagutil/sets.go b/go/flagutil/sets.go index f84d6fe9a7a..9c1f3f448d9 100644 --- a/go/flagutil/sets.go +++ b/go/flagutil/sets.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/sets" + "github.com/vitess/vitess/go/sets" ) var _ pflag.Value = (*StringSetFlag)(nil) diff --git a/go/json2/marshal.go b/go/json2/marshal.go index 55a4e85bfff..b63b9ae5676 100644 --- a/go/json2/marshal.go +++ b/go/json2/marshal.go @@ -20,7 +20,7 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/hack" + "github.com/vitess/vitess/go/hack" ) func init() { diff --git a/go/json2/marshal_test.go b/go/json2/marshal_test.go index 3b96ae4ef90..ebfd9add0f4 100644 --- a/go/json2/marshal_test.go +++ b/go/json2/marshal_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) func TestMarshalPB(t *testing.T) { diff --git a/go/logstats/logger.go b/go/logstats/logger.go index 852152fdadf..602ff8c2fed 100644 --- a/go/logstats/logger.go +++ b/go/logstats/logger.go @@ -24,9 +24,9 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) type logbv struct { diff --git a/go/logstats/logger_test.go b/go/logstats/logger_test.go index ac2d7954e76..771963c795d 100644 --- a/go/logstats/logger_test.go +++ b/go/logstats/logger_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestInit(t *testing.T) { diff --git a/go/mysql/auth_server.go b/go/mysql/auth_server.go index 480440c8471..7fe865a4b1d 100644 --- a/go/mysql/auth_server.go +++ b/go/mysql/auth_server.go @@ -26,10 +26,10 @@ import ( "net" "sync" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // AuthServer is the interface that servers must implement to validate diff --git a/go/mysql/auth_server_clientcert.go b/go/mysql/auth_server_clientcert.go index cf2b786bd13..d84292531c4 100644 --- a/go/mysql/auth_server_clientcert.go +++ b/go/mysql/auth_server_clientcert.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // AuthServerClientCert implements AuthServer which enforces client side certificates diff --git a/go/mysql/auth_server_clientcert_test.go b/go/mysql/auth_server_clientcert_test.go index 23425053858..fa4ad1aea23 100644 --- a/go/mysql/auth_server_clientcert_test.go +++ b/go/mysql/auth_server_clientcert_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/tlstest" - "github.com/mdibaiee/vitess/go/vt/vttls" + "github.com/vitess/vitess/go/vt/tlstest" + "github.com/vitess/vitess/go/vt/vttls" ) const clientCertUsername = "Client Cert" diff --git a/go/mysql/auth_server_none.go b/go/mysql/auth_server_none.go index 56386012b84..48873d813e1 100644 --- a/go/mysql/auth_server_none.go +++ b/go/mysql/auth_server_none.go @@ -19,7 +19,7 @@ package mysql import ( "net" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // AuthServerNone takes all comers. diff --git a/go/mysql/auth_server_static.go b/go/mysql/auth_server_static.go index 10af27063f3..e56863e8472 100644 --- a/go/mysql/auth_server_static.go +++ b/go/mysql/auth_server_static.go @@ -27,13 +27,13 @@ import ( "syscall" "time" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vterrors" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const ( diff --git a/go/mysql/binlog/binlog_json.go b/go/mysql/binlog/binlog_json.go index 644662205d1..32d032575c6 100644 --- a/go/mysql/binlog/binlog_json.go +++ b/go/mysql/binlog/binlog_json.go @@ -22,12 +22,12 @@ import ( "math" "strconv" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/mysql/format" - "github.com/mdibaiee/vitess/go/mysql/json" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/mysql/format" + "github.com/vitess/vitess/go/mysql/json" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) /* diff --git a/go/mysql/binlog/binlog_json_test.go b/go/mysql/binlog/binlog_json_test.go index a92f4d54d06..0938aa0099d 100644 --- a/go/mysql/binlog/binlog_json_test.go +++ b/go/mysql/binlog/binlog_json_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/json" + "github.com/vitess/vitess/go/mysql/json" ) func jsonObject(entries map[string]*json.Value) *json.Value { diff --git a/go/mysql/binlog/rbr.go b/go/mysql/binlog/rbr.go index 6c49d7dfe46..464dbc8f6b7 100644 --- a/go/mysql/binlog/rbr.go +++ b/go/mysql/binlog/rbr.go @@ -25,10 +25,10 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // ZeroTimestamp is the special value 0 for a timestamp. diff --git a/go/mysql/binlog/rbr_test.go b/go/mysql/binlog/rbr_test.go index 11a89d38998..99053905e09 100644 --- a/go/mysql/binlog/rbr_test.go +++ b/go/mysql/binlog/rbr_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestCellLengthAndData(t *testing.T) { diff --git a/go/mysql/binlog_dump.go b/go/mysql/binlog_dump.go index 7ba976ea438..55a3039acd2 100644 --- a/go/mysql/binlog_dump.go +++ b/go/mysql/binlog_dump.go @@ -20,9 +20,9 @@ import ( "encoding/binary" "io" - "github.com/mdibaiee/vitess/go/mysql/replication" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/replication" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) var ( diff --git a/go/mysql/binlog_event.go b/go/mysql/binlog_event.go index 1c15917971e..f9bae1fe2ad 100644 --- a/go/mysql/binlog_event.go +++ b/go/mysql/binlog_event.go @@ -19,10 +19,10 @@ package mysql import ( "fmt" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/replication" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) // BinlogEvent represents a single event from a raw MySQL binlog dump stream. diff --git a/go/mysql/binlog_event_common.go b/go/mysql/binlog_event_common.go index 4caf6f257a5..4f10c6f0bbf 100644 --- a/go/mysql/binlog_event_common.go +++ b/go/mysql/binlog_event_common.go @@ -20,9 +20,9 @@ import ( "bytes" "encoding/binary" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // binlogEvent wraps a raw packet buffer and provides methods to examine it diff --git a/go/mysql/binlog_event_common_test.go b/go/mysql/binlog_event_common_test.go index 5ea45d4b8d2..644968408b6 100644 --- a/go/mysql/binlog_event_common_test.go +++ b/go/mysql/binlog_event_common_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" "github.com/stretchr/testify/assert" ) diff --git a/go/mysql/binlog_event_compression.go b/go/mysql/binlog_event_compression.go index 85f87e1c08c..6a70b057e0e 100644 --- a/go/mysql/binlog_event_compression.go +++ b/go/mysql/binlog_event_compression.go @@ -24,8 +24,8 @@ import ( "github.com/klauspost/compress/zstd" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // This file contains code related to handling compression related diff --git a/go/mysql/binlog_event_filepos.go b/go/mysql/binlog_event_filepos.go index f6bf5c84634..69665f51ebe 100644 --- a/go/mysql/binlog_event_filepos.go +++ b/go/mysql/binlog_event_filepos.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "fmt" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/replication" ) // filePosBinlogEvent wraps a raw packet buffer and provides methods to examine diff --git a/go/mysql/binlog_event_make.go b/go/mysql/binlog_event_make.go index 2c69c261890..c877cb4dea4 100644 --- a/go/mysql/binlog_event_make.go +++ b/go/mysql/binlog_event_make.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "hash/crc32" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/replication" ) const ( diff --git a/go/mysql/binlog_event_make_test.go b/go/mysql/binlog_event_make_test.go index f95b57664d6..3dd929d90c6 100644 --- a/go/mysql/binlog_event_make_test.go +++ b/go/mysql/binlog_event_make_test.go @@ -23,11 +23,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/binlog" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + "github.com/vitess/vitess/go/mysql/binlog" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) // TestFormatDescriptionEvent tests both MySQL 5.6 and MariaDB 10.0 diff --git a/go/mysql/binlog_event_mariadb.go b/go/mysql/binlog_event_mariadb.go index e4bac8ccf93..2e863e996c8 100644 --- a/go/mysql/binlog_event_mariadb.go +++ b/go/mysql/binlog_event_mariadb.go @@ -19,9 +19,9 @@ package mysql import ( "encoding/binary" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // mariadbBinlogEvent wraps a raw packet buffer and provides methods to examine diff --git a/go/mysql/binlog_event_mariadb_test.go b/go/mysql/binlog_event_mariadb_test.go index 33896c89cec..b09ad5fa82e 100644 --- a/go/mysql/binlog_event_mariadb_test.go +++ b/go/mysql/binlog_event_mariadb_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/replication" ) // sample event data diff --git a/go/mysql/binlog_event_mysql56.go b/go/mysql/binlog_event_mysql56.go index b04dd3e502a..f1941c79529 100644 --- a/go/mysql/binlog_event_mysql56.go +++ b/go/mysql/binlog_event_mysql56.go @@ -19,9 +19,9 @@ package mysql import ( "encoding/binary" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // mysql56BinlogEvent wraps a raw packet buffer and provides methods to examine diff --git a/go/mysql/binlog_event_mysql56_test.go b/go/mysql/binlog_event_mysql56_test.go index f8f724a2d6c..8bc9f102e58 100644 --- a/go/mysql/binlog_event_mysql56_test.go +++ b/go/mysql/binlog_event_mysql56_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/replication" ) // Sample event data for MySQL 5.6. diff --git a/go/mysql/binlog_event_rbr.go b/go/mysql/binlog_event_rbr.go index a75f31c10d5..9dad4e51917 100644 --- a/go/mysql/binlog_event_rbr.go +++ b/go/mysql/binlog_event_rbr.go @@ -19,12 +19,12 @@ package mysql import ( "encoding/binary" - "github.com/mdibaiee/vitess/go/mysql/binlog" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/binlog" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/vterrors" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // These are the TABLE_MAP_EVENT's optional metadata field types from diff --git a/go/mysql/binlog_event_test.go b/go/mysql/binlog_event_test.go index 18f1e2fa89b..111c229c9d5 100644 --- a/go/mysql/binlog_event_test.go +++ b/go/mysql/binlog_event_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) func TestQueryString(t *testing.T) { diff --git a/go/mysql/capabilities/capability.go b/go/mysql/capabilities/capability.go index 14e2d54fca6..5d94d1cfec4 100644 --- a/go/mysql/capabilities/capability.go +++ b/go/mysql/capabilities/capability.go @@ -20,8 +20,8 @@ import ( "strconv" "strings" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) var ( diff --git a/go/mysql/charset.go b/go/mysql/charset.go index 0a42963c15e..746a3749253 100644 --- a/go/mysql/charset.go +++ b/go/mysql/charset.go @@ -20,9 +20,9 @@ import ( "fmt" "strconv" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // This file contains utility methods for Conn objects. Only useful on the client diff --git a/go/mysql/client.go b/go/mysql/client.go index b895e6a6254..e1730a4bdd3 100644 --- a/go/mysql/client.go +++ b/go/mysql/client.go @@ -26,11 +26,11 @@ import ( "net" "time" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttls" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/sqlerror" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttls" ) // connectResult is used by Connect. diff --git a/go/mysql/client_test.go b/go/mysql/client_test.go index a82a70da32c..ee202ed6068 100644 --- a/go/mysql/client_test.go +++ b/go/mysql/client_test.go @@ -32,10 +32,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/vt/tlstest" - "github.com/mdibaiee/vitess/go/vt/vttls" + "github.com/vitess/vitess/go/vt/tlstest" + "github.com/vitess/vitess/go/vt/vttls" ) // assertSQLError makes sure we get the right error. diff --git a/go/mysql/collations/cached_size.go b/go/mysql/collations/cached_size.go index 8e97932f9d3..10f358a54f5 100644 --- a/go/mysql/collations/cached_size.go +++ b/go/mysql/collations/cached_size.go @@ -22,7 +22,7 @@ import ( "reflect" "unsafe" - hack "github.com/mdibaiee/vitess/go/hack" + hack "github.com/vitess/vitess/go/hack" ) //go:nocheckptr @@ -34,7 +34,7 @@ func (cached *Environment) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field byName map[string]github.com/mdibaiee/vitess/go/mysql/collations.ID + // field byName map[string]github.com/vitess/vitess/go/mysql/collations.ID if cached.byName != nil { size += int64(48) hmap := reflect.ValueOf(cached.byName) @@ -48,7 +48,7 @@ func (cached *Environment) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(len(k))) } } - // field byCharset map[string]*github.com/mdibaiee/vitess/go/mysql/collations.colldefaults + // field byCharset map[string]*github.com/vitess/vitess/go/mysql/collations.colldefaults if cached.byCharset != nil { size += int64(48) hmap := reflect.ValueOf(cached.byCharset) @@ -65,7 +65,7 @@ func (cached *Environment) CachedSize(alloc bool) int64 { } } } - // field byCharsetName map[github.com/mdibaiee/vitess/go/mysql/collations.ID]string + // field byCharsetName map[github.com/vitess/vitess/go/mysql/collations.ID]string if cached.byCharsetName != nil { size += int64(48) hmap := reflect.ValueOf(cached.byCharsetName) @@ -79,7 +79,7 @@ func (cached *Environment) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(len(v))) } } - // field unsupported map[string]github.com/mdibaiee/vitess/go/mysql/collations.ID + // field unsupported map[string]github.com/vitess/vitess/go/mysql/collations.ID if cached.unsupported != nil { size += int64(48) hmap := reflect.ValueOf(cached.unsupported) @@ -93,7 +93,7 @@ func (cached *Environment) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(len(k))) } } - // field byID map[github.com/mdibaiee/vitess/go/mysql/collations.ID]string + // field byID map[github.com/vitess/vitess/go/mysql/collations.ID]string if cached.byID != nil { size += int64(48) hmap := reflect.ValueOf(cached.byID) diff --git a/go/mysql/collations/charset/charset.go b/go/mysql/collations/charset/charset.go index 9bfe153cda7..f61359fcc7c 100644 --- a/go/mysql/collations/charset/charset.go +++ b/go/mysql/collations/charset/charset.go @@ -19,12 +19,12 @@ package charset import ( "unicode/utf8" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/eightbit" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/japanese" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/korean" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/simplifiedchinese" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/types" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/unicode" + "github.com/vitess/vitess/go/mysql/collations/charset/eightbit" + "github.com/vitess/vitess/go/mysql/collations/charset/japanese" + "github.com/vitess/vitess/go/mysql/collations/charset/korean" + "github.com/vitess/vitess/go/mysql/collations/charset/simplifiedchinese" + "github.com/vitess/vitess/go/mysql/collations/charset/types" + "github.com/vitess/vitess/go/mysql/collations/charset/unicode" ) const RuneError = utf8.RuneError diff --git a/go/mysql/collations/charset/convert.go b/go/mysql/collations/charset/convert.go index 57dce738c8d..c828bcde3e7 100644 --- a/go/mysql/collations/charset/convert.go +++ b/go/mysql/collations/charset/convert.go @@ -20,7 +20,7 @@ import ( "fmt" "unicode/utf8" - "github.com/mdibaiee/vitess/go/hack" + "github.com/vitess/vitess/go/hack" ) func failedConversionError(from, to Charset, input []byte) error { diff --git a/go/mysql/collations/charset/eightbit/8bit.go b/go/mysql/collations/charset/eightbit/8bit.go index c2f121c0178..9daf904480d 100644 --- a/go/mysql/collations/charset/eightbit/8bit.go +++ b/go/mysql/collations/charset/eightbit/8bit.go @@ -19,7 +19,7 @@ package eightbit import ( "unicode/utf8" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/types" + "github.com/vitess/vitess/go/mysql/collations/charset/types" ) type UnicodeMapping struct { diff --git a/go/mysql/collations/charset/eightbit/binary.go b/go/mysql/collations/charset/eightbit/binary.go index 8f91af75149..d02a6366cd5 100644 --- a/go/mysql/collations/charset/eightbit/binary.go +++ b/go/mysql/collations/charset/eightbit/binary.go @@ -19,7 +19,7 @@ package eightbit import ( "unicode/utf8" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/types" + "github.com/vitess/vitess/go/mysql/collations/charset/types" ) type Charset_binary struct{} diff --git a/go/mysql/collations/charset/eightbit/latin1.go b/go/mysql/collations/charset/eightbit/latin1.go index fca5801dca5..266c973e4fc 100644 --- a/go/mysql/collations/charset/eightbit/latin1.go +++ b/go/mysql/collations/charset/eightbit/latin1.go @@ -19,7 +19,7 @@ package eightbit import ( "unicode/utf8" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/types" + "github.com/vitess/vitess/go/mysql/collations/charset/types" ) var latin1p0 = [256]byte{ diff --git a/go/mysql/collations/charset/japanese/sjis.go b/go/mysql/collations/charset/japanese/sjis.go index c859c79cd34..d6107a6626b 100644 --- a/go/mysql/collations/charset/japanese/sjis.go +++ b/go/mysql/collations/charset/japanese/sjis.go @@ -19,7 +19,7 @@ package japanese import ( "unicode/utf8" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/types" + "github.com/vitess/vitess/go/mysql/collations/charset/types" ) type Charset_sjis struct{} diff --git a/go/mysql/collations/charset/japanese/ujis.go b/go/mysql/collations/charset/japanese/ujis.go index 2a01cccfba2..7e49fc57ac0 100644 --- a/go/mysql/collations/charset/japanese/ujis.go +++ b/go/mysql/collations/charset/japanese/ujis.go @@ -20,7 +20,7 @@ import ( "unicode/utf8" _ "unsafe" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/types" + "github.com/vitess/vitess/go/mysql/collations/charset/types" ) func ujisEncodeRune(dst []byte, r rune, table208, table212 *[65536]uint16) int { diff --git a/go/mysql/collations/charset/korean/euckr.go b/go/mysql/collations/charset/korean/euckr.go index 9a5731332c6..7ae7f1e5dd2 100644 --- a/go/mysql/collations/charset/korean/euckr.go +++ b/go/mysql/collations/charset/korean/euckr.go @@ -19,7 +19,7 @@ package korean import ( "unicode/utf8" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/types" + "github.com/vitess/vitess/go/mysql/collations/charset/types" ) type Charset_euckr struct{} diff --git a/go/mysql/collations/charset/simplifiedchinese/gb18030.go b/go/mysql/collations/charset/simplifiedchinese/gb18030.go index 3499496053f..e9800e17cf3 100644 --- a/go/mysql/collations/charset/simplifiedchinese/gb18030.go +++ b/go/mysql/collations/charset/simplifiedchinese/gb18030.go @@ -20,7 +20,7 @@ import ( "unicode/utf8" _ "unsafe" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/types" + "github.com/vitess/vitess/go/mysql/collations/charset/types" ) type Charset_gb18030 struct{} diff --git a/go/mysql/collations/charset/simplifiedchinese/gb2312.go b/go/mysql/collations/charset/simplifiedchinese/gb2312.go index 424bb8ea630..5d76ad41cc0 100644 --- a/go/mysql/collations/charset/simplifiedchinese/gb2312.go +++ b/go/mysql/collations/charset/simplifiedchinese/gb2312.go @@ -19,7 +19,7 @@ package simplifiedchinese import ( "unicode/utf8" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/types" + "github.com/vitess/vitess/go/mysql/collations/charset/types" ) type Charset_gb2312 struct{} diff --git a/go/mysql/collations/charset/unicode/utf16.go b/go/mysql/collations/charset/unicode/utf16.go index d2711a30c0c..2eae2bfe842 100644 --- a/go/mysql/collations/charset/unicode/utf16.go +++ b/go/mysql/collations/charset/unicode/utf16.go @@ -20,7 +20,7 @@ import ( "unicode/utf16" "unicode/utf8" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/types" + "github.com/vitess/vitess/go/mysql/collations/charset/types" ) // 0xd800-0xdc00 encodes the high 10 bits of a pair. diff --git a/go/mysql/collations/charset/unicode/utf32.go b/go/mysql/collations/charset/unicode/utf32.go index e56b765372d..896e116aff4 100644 --- a/go/mysql/collations/charset/unicode/utf32.go +++ b/go/mysql/collations/charset/unicode/utf32.go @@ -19,7 +19,7 @@ package unicode import ( "unicode/utf8" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/types" + "github.com/vitess/vitess/go/mysql/collations/charset/types" ) type Charset_utf32 struct{} diff --git a/go/mysql/collations/charset/unicode/utf8.go b/go/mysql/collations/charset/unicode/utf8.go index 5e4907d8b30..12372aabc1e 100644 --- a/go/mysql/collations/charset/unicode/utf8.go +++ b/go/mysql/collations/charset/unicode/utf8.go @@ -19,7 +19,7 @@ package unicode import ( "unicode/utf8" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/types" + "github.com/vitess/vitess/go/mysql/collations/charset/types" ) // Code points in the surrogate range are not valid for UTF-8. diff --git a/go/mysql/collations/colldata/8bit.go b/go/mysql/collations/colldata/8bit.go index 51eff4bdd2d..c8d6c4a170f 100644 --- a/go/mysql/collations/colldata/8bit.go +++ b/go/mysql/collations/colldata/8bit.go @@ -19,9 +19,9 @@ package colldata import ( "encoding/binary" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/vt/vthash" ) var sortOrderIdentity [256]byte diff --git a/go/mysql/collations/colldata/cached_size.go b/go/mysql/collations/colldata/cached_size.go index 9d00198d688..d7dc564d6be 100644 --- a/go/mysql/collations/colldata/cached_size.go +++ b/go/mysql/collations/colldata/cached_size.go @@ -17,7 +17,7 @@ limitations under the License. package colldata -import hack "github.com/mdibaiee/vitess/go/hack" +import hack "github.com/vitess/vitess/go/hack" type cachedObject interface { CachedSize(alloc bool) int64 @@ -63,7 +63,7 @@ func (cached *unicodeWildcard) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field charset github.com/mdibaiee/vitess/go/mysql/collations/charset/types.Charset + // field charset github.com/vitess/vitess/go/mysql/collations/charset/types.Charset if cc, ok := cached.charset.(cachedObject); ok { size += cc.CachedSize(true) } diff --git a/go/mysql/collations/colldata/collation.go b/go/mysql/collations/colldata/collation.go index d02f59e52cc..82e48973efb 100644 --- a/go/mysql/collations/colldata/collation.go +++ b/go/mysql/collations/colldata/collation.go @@ -21,9 +21,9 @@ import ( "fmt" "math" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/vt/vthash" ) type Charset = charset.Charset diff --git a/go/mysql/collations/colldata/golden_test.go b/go/mysql/collations/colldata/golden_test.go index 0505ce37e6b..9b1ce6aa04a 100644 --- a/go/mysql/collations/colldata/golden_test.go +++ b/go/mysql/collations/colldata/golden_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/testutil" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/testutil" ) func TestGoldenWeights(t *testing.T) { diff --git a/go/mysql/collations/colldata/multibyte.go b/go/mysql/collations/colldata/multibyte.go index a34f958bd33..6fe0da8e7ee 100644 --- a/go/mysql/collations/colldata/multibyte.go +++ b/go/mysql/collations/colldata/multibyte.go @@ -19,9 +19,9 @@ package colldata import ( "math" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/vt/vthash" ) type Collation_multibyte struct { diff --git a/go/mysql/collations/colldata/mysqldata.go b/go/mysql/collations/colldata/mysqldata.go index 2c3038b2e5b..5418ec3f5dd 100644 --- a/go/mysql/collations/colldata/mysqldata.go +++ b/go/mysql/collations/colldata/mysqldata.go @@ -19,9 +19,9 @@ limitations under the License. package colldata import ( - charset "github.com/mdibaiee/vitess/go/mysql/collations/charset" - eightbit "github.com/mdibaiee/vitess/go/mysql/collations/charset/eightbit" - uca "github.com/mdibaiee/vitess/go/mysql/collations/internal/uca" + charset "github.com/vitess/vitess/go/mysql/collations/charset" + eightbit "github.com/vitess/vitess/go/mysql/collations/charset/eightbit" + uca "github.com/vitess/vitess/go/mysql/collations/internal/uca" ) var ctype_dec8_swedish_ci = [...]uint8{ diff --git a/go/mysql/collations/colldata/uca.go b/go/mysql/collations/colldata/uca.go index 9bd50e2c8f5..77a095817b6 100644 --- a/go/mysql/collations/colldata/uca.go +++ b/go/mysql/collations/colldata/uca.go @@ -21,10 +21,10 @@ import ( "encoding/binary" "math/bits" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/internal/uca" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/internal/uca" + "github.com/vitess/vitess/go/vt/vthash" ) type Collation_utf8mb4_uca_0900 struct { diff --git a/go/mysql/collations/colldata/uca_contraction_test.go b/go/mysql/collations/colldata/uca_contraction_test.go index 33e6b44eab4..30a64f36692 100644 --- a/go/mysql/collations/colldata/uca_contraction_test.go +++ b/go/mysql/collations/colldata/uca_contraction_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/internal/uca" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/internal/uca" ) type CollationWithContractions struct { diff --git a/go/mysql/collations/colldata/uca_tables_test.go b/go/mysql/collations/colldata/uca_tables_test.go index b0867c104ea..efa8d8f976d 100644 --- a/go/mysql/collations/colldata/uca_tables_test.go +++ b/go/mysql/collations/colldata/uca_tables_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/internal/uca" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/internal/uca" ) func verifyAllCodepoints(t *testing.T, expected map[rune][]uint16, weights uca.Weights, layout uca.Layout) { diff --git a/go/mysql/collations/colldata/uca_test.go b/go/mysql/collations/colldata/uca_test.go index 7e9454833db..7da94cecc7e 100644 --- a/go/mysql/collations/colldata/uca_test.go +++ b/go/mysql/collations/colldata/uca_test.go @@ -30,8 +30,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/vt/vthash" ) var testcollationMap map[string]Collation diff --git a/go/mysql/collations/colldata/unicase.go b/go/mysql/collations/colldata/unicase.go index 83926320d55..9764c9c5df9 100644 --- a/go/mysql/collations/colldata/unicase.go +++ b/go/mysql/collations/colldata/unicase.go @@ -17,7 +17,7 @@ limitations under the License. package colldata import ( - "github.com/mdibaiee/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/charset" ) type UnicaseChar struct { diff --git a/go/mysql/collations/colldata/unicode.go b/go/mysql/collations/colldata/unicode.go index 8d3d85bdd30..7e252cd2c04 100644 --- a/go/mysql/collations/colldata/unicode.go +++ b/go/mysql/collations/colldata/unicode.go @@ -21,9 +21,9 @@ import ( "math" "math/bits" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/vt/vthash" ) type Collation_unicode_general_ci struct { diff --git a/go/mysql/collations/colldata/wildcard.go b/go/mysql/collations/colldata/wildcard.go index c60ed920658..5b13188fb7e 100644 --- a/go/mysql/collations/colldata/wildcard.go +++ b/go/mysql/collations/colldata/wildcard.go @@ -43,7 +43,7 @@ package colldata import ( "unicode/utf8" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/charset" ) type match byte diff --git a/go/mysql/collations/colldata/wildcard_test.go b/go/mysql/collations/colldata/wildcard_test.go index 1e2bc8b7dc8..be07ee76575 100644 --- a/go/mysql/collations/colldata/wildcard_test.go +++ b/go/mysql/collations/colldata/wildcard_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/charset" ) type wildcardtest struct { diff --git a/go/mysql/collations/integration/charset_test.go b/go/mysql/collations/integration/charset_test.go index 55792739293..90a3e3a55bc 100644 --- a/go/mysql/collations/integration/charset_test.go +++ b/go/mysql/collations/integration/charset_test.go @@ -23,11 +23,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/remote" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/remote" ) func TestLocalEncodings(t *testing.T) { diff --git a/go/mysql/collations/integration/coercion_test.go b/go/mysql/collations/integration/coercion_test.go index 90b3f072034..7b08ffccc86 100644 --- a/go/mysql/collations/integration/coercion_test.go +++ b/go/mysql/collations/integration/coercion_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/remote" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/remote" + "github.com/vitess/vitess/go/sqltypes" ) type TextWithCollation struct { diff --git a/go/mysql/collations/integration/collations_test.go b/go/mysql/collations/integration/collations_test.go index 3fa13636a32..c23e2254001 100644 --- a/go/mysql/collations/integration/collations_test.go +++ b/go/mysql/collations/integration/collations_test.go @@ -32,13 +32,13 @@ import ( "github.com/spf13/pflag" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/remote" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/remote" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" ) var collationEnv *collations.Environment diff --git a/go/mysql/collations/integration/helpers_test.go b/go/mysql/collations/integration/helpers_test.go index 7ed12776fde..1acd49cf462 100644 --- a/go/mysql/collations/integration/helpers_test.go +++ b/go/mysql/collations/integration/helpers_test.go @@ -27,13 +27,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/remote" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/remote" + "github.com/vitess/vitess/go/sqltypes" ) type testweight struct { diff --git a/go/mysql/collations/integration/main_test.go b/go/mysql/collations/integration/main_test.go index cf0b7741e9f..89604d5106a 100644 --- a/go/mysql/collations/integration/main_test.go +++ b/go/mysql/collations/integration/main_test.go @@ -26,11 +26,11 @@ import ( "github.com/spf13/pflag" - _flag "github.com/mdibaiee/vitess/go/internal/flag" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/vttest" + _flag "github.com/vitess/vitess/go/internal/flag" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/vttest" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" ) var ( diff --git a/go/mysql/collations/integration/weight_string_test.go b/go/mysql/collations/integration/weight_string_test.go index f91f495c2b4..63b08a36084 100644 --- a/go/mysql/collations/integration/weight_string_test.go +++ b/go/mysql/collations/integration/weight_string_test.go @@ -23,11 +23,11 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/mysql/collations/remote" - "github.com/mdibaiee/vitess/go/mysql/collations/testutil" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/mysql/collations/remote" + "github.com/vitess/vitess/go/mysql/collations/testutil" ) func TestFastIterators(t *testing.T) { diff --git a/go/mysql/collations/integration/wildcard_test.go b/go/mysql/collations/integration/wildcard_test.go index e4231a126b5..91f12890dfe 100644 --- a/go/mysql/collations/integration/wildcard_test.go +++ b/go/mysql/collations/integration/wildcard_test.go @@ -20,10 +20,10 @@ import ( "encoding/hex" "testing" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/mysql/collations/remote" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/mysql/collations/remote" ) func TestRemoteWildcardMatches(t *testing.T) { diff --git a/go/mysql/collations/internal/uca/collation.go b/go/mysql/collations/internal/uca/collation.go index 792500fc3b7..7a1ddeaa60d 100644 --- a/go/mysql/collations/internal/uca/collation.go +++ b/go/mysql/collations/internal/uca/collation.go @@ -19,7 +19,7 @@ package uca import ( "sync" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/charset" ) type Collation interface { diff --git a/go/mysql/collations/internal/uca/contractions.go b/go/mysql/collations/internal/uca/contractions.go index b00966c55c2..8c2a7a7a971 100644 --- a/go/mysql/collations/internal/uca/contractions.go +++ b/go/mysql/collations/internal/uca/contractions.go @@ -17,7 +17,7 @@ limitations under the License. package uca import ( - "github.com/mdibaiee/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/charset" ) type Contraction struct { diff --git a/go/mysql/collations/internal/uca/iter_900.go b/go/mysql/collations/internal/uca/iter_900.go index ac063f6eb7c..10f99e6bdf3 100644 --- a/go/mysql/collations/internal/uca/iter_900.go +++ b/go/mysql/collations/internal/uca/iter_900.go @@ -19,7 +19,7 @@ package uca import ( "unicode/utf8" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/charset" ) type iterator900 struct { diff --git a/go/mysql/collations/internal/uca/iter_legacy.go b/go/mysql/collations/internal/uca/iter_legacy.go index 9c0ffcf715b..01fbc75934d 100644 --- a/go/mysql/collations/internal/uca/iter_legacy.go +++ b/go/mysql/collations/internal/uca/iter_legacy.go @@ -17,7 +17,7 @@ limitations under the License. package uca import ( - "github.com/mdibaiee/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/charset" ) type WeightIteratorLegacy struct { diff --git a/go/mysql/collations/local.go b/go/mysql/collations/local.go index 5c1c5b262c4..96f10d4f572 100644 --- a/go/mysql/collations/local.go +++ b/go/mysql/collations/local.go @@ -19,7 +19,7 @@ limitations under the License. package collations import ( - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) // MySQL8 is the collation Environment for MySQL 8. This should diff --git a/go/mysql/collations/remote/charset.go b/go/mysql/collations/remote/charset.go index bfc6450665a..944116af37b 100644 --- a/go/mysql/collations/remote/charset.go +++ b/go/mysql/collations/remote/charset.go @@ -22,9 +22,9 @@ import ( "io" "sync" - "github.com/mdibaiee/vitess/go/bytes2" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/bytes2" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations/charset" ) type Charset struct { diff --git a/go/mysql/collations/remote/collation.go b/go/mysql/collations/remote/collation.go index 89cccba93df..0030f4a980d 100644 --- a/go/mysql/collations/remote/collation.go +++ b/go/mysql/collations/remote/collation.go @@ -24,13 +24,13 @@ import ( "strings" "sync" - "github.com/mdibaiee/vitess/go/bytes2" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/bytes2" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vthash" ) // Collation is a generic implementation of the Collation interface diff --git a/go/mysql/collations/tools/makecolldata/codegen/codegen.go b/go/mysql/collations/tools/makecolldata/codegen/codegen.go index 9fc477419bd..50e66bd7b26 100644 --- a/go/mysql/collations/tools/makecolldata/codegen/codegen.go +++ b/go/mysql/collations/tools/makecolldata/codegen/codegen.go @@ -26,7 +26,7 @@ import ( "sort" "time" - "github.com/mdibaiee/vitess/go/tools/codegen" + "github.com/vitess/vitess/go/tools/codegen" ) type Generator struct { diff --git a/go/mysql/collations/tools/makecolldata/codegen/tablegen.go b/go/mysql/collations/tools/makecolldata/codegen/tablegen.go index c54e637e3dd..3018a355b3d 100644 --- a/go/mysql/collations/tools/makecolldata/codegen/tablegen.go +++ b/go/mysql/collations/tools/makecolldata/codegen/tablegen.go @@ -25,7 +25,7 @@ import ( "math/bits" "os" - "github.com/mdibaiee/vitess/go/mysql/collations/internal/uca" + "github.com/vitess/vitess/go/mysql/collations/internal/uca" ) type LiteralPageGenerator struct { diff --git a/go/mysql/collations/tools/makecolldata/contractions.go b/go/mysql/collations/tools/makecolldata/contractions.go index 3cbc5c69abf..bce1c68cb95 100644 --- a/go/mysql/collations/tools/makecolldata/contractions.go +++ b/go/mysql/collations/tools/makecolldata/contractions.go @@ -20,8 +20,8 @@ import ( "fmt" "sort" - "github.com/mdibaiee/vitess/go/mysql/collations/internal/uca" - "github.com/mdibaiee/vitess/go/mysql/collations/tools/makecolldata/codegen" + "github.com/vitess/vitess/go/mysql/collations/internal/uca" + "github.com/vitess/vitess/go/mysql/collations/tools/makecolldata/codegen" ) func sortContractionTrie(trie map[rune][]uca.Contraction) (sorted []rune) { diff --git a/go/mysql/collations/tools/makecolldata/main.go b/go/mysql/collations/tools/makecolldata/main.go index 4802bbbf849..283d6b77aff 100644 --- a/go/mysql/collations/tools/makecolldata/main.go +++ b/go/mysql/collations/tools/makecolldata/main.go @@ -26,9 +26,9 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/internal/uca" - "github.com/mdibaiee/vitess/go/mysql/collations/tools/makecolldata/codegen" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/internal/uca" + "github.com/vitess/vitess/go/mysql/collations/tools/makecolldata/codegen" ) type TailoringWeights map[string][]uint16 @@ -106,8 +106,8 @@ func (all AllMetadata) get(name string) *CollationMetadata { return nil } -const PkgCollationsData codegen.Package = "github.com/mdibaiee/vitess/go/mysql/collations/colldata" -const PkgCharset codegen.Package = "github.com/mdibaiee/vitess/go/mysql/collations/charset" +const PkgCollationsData codegen.Package = "github.com/vitess/vitess/go/mysql/collations/colldata" +const PkgCharset codegen.Package = "github.com/vitess/vitess/go/mysql/collations/charset" func main() { pflag.Parse() diff --git a/go/mysql/collations/tools/makecolldata/maketables.go b/go/mysql/collations/tools/makecolldata/maketables.go index 50472746c7f..3647e747abe 100644 --- a/go/mysql/collations/tools/makecolldata/maketables.go +++ b/go/mysql/collations/tools/makecolldata/maketables.go @@ -20,8 +20,8 @@ import ( "path" "strconv" - "github.com/mdibaiee/vitess/go/mysql/collations/internal/uca" - "github.com/mdibaiee/vitess/go/mysql/collations/tools/makecolldata/codegen" + "github.com/vitess/vitess/go/mysql/collations/internal/uca" + "github.com/vitess/vitess/go/mysql/collations/tools/makecolldata/codegen" ) func maketable(g *codegen.Generator, table string, collation *CollationMetadata, pages codegen.PageGenerator, layout uca.Layout) *codegen.TableGenerator { @@ -39,8 +39,8 @@ func maketable(g *codegen.Generator, table string, collation *CollationMetadata, func maketables(embed bool, output string, metadata AllMetadata) { var pages = codegen.NewPageGenerator(embed) - var g = codegen.NewGenerator("github.com/mdibaiee/vitess/go/mysql/collations/colldata") - var fastg = codegen.NewGenerator("github.com/mdibaiee/vitess/go/mysql/collations/internal/uca") + var g = codegen.NewGenerator("github.com/vitess/vitess/go/mysql/collations/colldata") + var fastg = codegen.NewGenerator("github.com/vitess/vitess/go/mysql/collations/internal/uca") tablegen := maketable(g, "uca900", metadata.get("utf8mb4_0900_ai_ci"), pages, uca.Layout_uca900{}) tablegen.WriteFastTables(fastg, uca.Layout_uca900{}) diff --git a/go/mysql/collations/tools/makecolldata/mysqldata.go b/go/mysql/collations/tools/makecolldata/mysqldata.go index ab515a5e235..3504f722baa 100644 --- a/go/mysql/collations/tools/makecolldata/mysqldata.go +++ b/go/mysql/collations/tools/makecolldata/mysqldata.go @@ -24,9 +24,9 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/internal/uca" - "github.com/mdibaiee/vitess/go/mysql/collations/tools/makecolldata/codegen" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/internal/uca" + "github.com/vitess/vitess/go/mysql/collations/tools/makecolldata/codegen" ) const Print8BitData = true @@ -367,7 +367,7 @@ func makemysqldata(output string, supportedOutput string, metadata AllMetadata) } var h = Generator{ - Generator: codegen.NewGenerator("github.com/mdibaiee/vitess/go/mysql/collations"), + Generator: codegen.NewGenerator("github.com/vitess/vitess/go/mysql/collations"), } g.P("var collationsById = [...]Collation{") diff --git a/go/mysql/collations/tools/makecolldata/mysqlversions.go b/go/mysql/collations/tools/makecolldata/mysqlversions.go index dd112832d91..85aba7d50c6 100644 --- a/go/mysql/collations/tools/makecolldata/mysqlversions.go +++ b/go/mysql/collations/tools/makecolldata/mysqlversions.go @@ -30,7 +30,7 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/mysql/collations/tools/makecolldata/codegen" + "github.com/vitess/vitess/go/mysql/collations/tools/makecolldata/codegen" ) type versionInfo struct { @@ -125,7 +125,7 @@ func makeversions(output string) { versions = append(versions, base) } - var g = codegen.NewGenerator("github.com/mdibaiee/vitess/go/mysql/collations") + var g = codegen.NewGenerator("github.com/vitess/vitess/go/mysql/collations") g.P("type collver byte") g.P("type collalias struct { mask collver; name string; charset string }") g.P("const (") diff --git a/go/mysql/collations/tools/maketestdata/maketestdata.go b/go/mysql/collations/tools/maketestdata/maketestdata.go index 1724f5711aa..89867e8e3d1 100644 --- a/go/mysql/collations/tools/maketestdata/maketestdata.go +++ b/go/mysql/collations/tools/maketestdata/maketestdata.go @@ -30,12 +30,12 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/mysql/collations/testutil" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/mysql/collations/testutil" - "github.com/mdibaiee/vitess/go/internal/flag" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/internal/flag" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" ) func wikiRequest(lang testutil.Lang, args map[string]string, output any) error { diff --git a/go/mysql/collations/vindex/collate/collate.go b/go/mysql/collations/vindex/collate/collate.go index 0cd23cf998c..33124ea4f2b 100644 --- a/go/mysql/collations/vindex/collate/collate.go +++ b/go/mysql/collations/vindex/collate/collate.go @@ -8,12 +8,12 @@ // Package collate contains types for comparing and sorting Unicode strings // according to a given collation order. -package collate // import "github.com/mdibaiee/vitess/go/mysql/collations/vindex/collate" +package collate // import "github.com/vitess/vitess/go/mysql/collations/vindex/collate" import ( "hash" - "github.com/mdibaiee/vitess/go/mysql/collations/vindex/internal/colltab" + "github.com/vitess/vitess/go/mysql/collations/vindex/internal/colltab" ) type Hasher struct { diff --git a/go/mysql/collations/vindex/collate/index.go b/go/mysql/collations/vindex/collate/index.go index 80eec485d26..811a8a4ac31 100644 --- a/go/mysql/collations/vindex/collate/index.go +++ b/go/mysql/collations/vindex/collate/index.go @@ -4,7 +4,7 @@ package collate -import "github.com/mdibaiee/vitess/go/mysql/collations/vindex/internal/colltab" +import "github.com/vitess/vitess/go/mysql/collations/vindex/internal/colltab" const blockSize = 64 diff --git a/go/mysql/collations/vindex/doc.go b/go/mysql/collations/vindex/doc.go index 19905e3c0bd..41ea80c104b 100644 --- a/go/mysql/collations/vindex/doc.go +++ b/go/mysql/collations/vindex/doc.go @@ -9,7 +9,7 @@ // transformations, and locale-specific text handling. // // There is a 30 minute video, recorded on 2017-11-30, on the "State of -// github.com/mdibaiee/vitess/go/mysql/collations/vindex" at https://www.youtube.com/watch?v=uYrDrMEGu58 +// github.com/vitess/vitess/go/mysql/collations/vindex" at https://www.youtube.com/watch?v=uYrDrMEGu58 package text // TODO: more documentation on general concepts, such as Transformers, use diff --git a/go/mysql/collations/vindex/internal/colltab/table.go b/go/mysql/collations/vindex/internal/colltab/table.go index 72043810b1b..46bd30c3679 100644 --- a/go/mysql/collations/vindex/internal/colltab/table.go +++ b/go/mysql/collations/vindex/internal/colltab/table.go @@ -7,7 +7,7 @@ package colltab import ( "unicode/utf8" - "github.com/mdibaiee/vitess/go/mysql/collations/vindex/unicode/norm" + "github.com/vitess/vitess/go/mysql/collations/vindex/unicode/norm" ) // Table holds all collation data for a given collation ordering. diff --git a/go/mysql/collations/vindex/unicode/doc.go b/go/mysql/collations/vindex/unicode/doc.go index 3742b7d8f2d..3dffde1b183 100644 --- a/go/mysql/collations/vindex/unicode/doc.go +++ b/go/mysql/collations/vindex/unicode/doc.go @@ -3,6 +3,6 @@ // license that can be found in the LICENSE file. // unicode holds packages with implementations of Unicode standards that are -// mostly used as building blocks for other packages in github.com/mdibaiee/vitess/go/mysql/collations/vindex, +// mostly used as building blocks for other packages in github.com/vitess/vitess/go/mysql/collations/vindex, // layout engines, or are otherwise more low-level in nature. package unicode diff --git a/go/mysql/collations/vindex/unicode/norm/composition.go b/go/mysql/collations/vindex/unicode/norm/composition.go index 88640d62f38..bd92f5a439f 100644 --- a/go/mysql/collations/vindex/unicode/norm/composition.go +++ b/go/mysql/collations/vindex/unicode/norm/composition.go @@ -7,7 +7,7 @@ package norm import ( "unicode/utf8" - "github.com/mdibaiee/vitess/go/hack" + "github.com/vitess/vitess/go/hack" ) const ( diff --git a/go/mysql/collations/vindex/unicode/norm/normalize.go b/go/mysql/collations/vindex/unicode/norm/normalize.go index 887d339a73e..4f4cd10dd6b 100644 --- a/go/mysql/collations/vindex/unicode/norm/normalize.go +++ b/go/mysql/collations/vindex/unicode/norm/normalize.go @@ -7,7 +7,7 @@ //go:generate go test -tags test // Package norm contains types and functions for normalizing Unicode strings. -package norm // import "github.com/mdibaiee/vitess/go/mysql/collations/vindex/unicode/norm" +package norm // import "github.com/vitess/vitess/go/mysql/collations/vindex/unicode/norm" import ( "unicode/utf8" diff --git a/go/mysql/conn.go b/go/mysql/conn.go index 03db233a70f..4fe53253370 100644 --- a/go/mysql/conn.go +++ b/go/mysql/conn.go @@ -30,16 +30,16 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/bucketpool" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/bucketpool" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) const ( diff --git a/go/mysql/conn_params.go b/go/mysql/conn_params.go index 8df0bbbaad1..ed7ebae27ab 100644 --- a/go/mysql/conn_params.go +++ b/go/mysql/conn_params.go @@ -19,8 +19,8 @@ package mysql import ( "time" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/vttls" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/vttls" ) // ConnParams contains all the parameters to use to connect to mysql. diff --git a/go/mysql/conn_params_test.go b/go/mysql/conn_params_test.go index 6641b643ead..3536dfa4013 100644 --- a/go/mysql/conn_params_test.go +++ b/go/mysql/conn_params_test.go @@ -19,7 +19,7 @@ package mysql import ( "testing" - "github.com/mdibaiee/vitess/go/vt/vttls" + "github.com/vitess/vitess/go/vt/vttls" "github.com/stretchr/testify/assert" ) diff --git a/go/mysql/conn_test.go b/go/mysql/conn_test.go index afb82430b0e..a90b8863fa1 100644 --- a/go/mysql/conn_test.go +++ b/go/mysql/conn_test.go @@ -34,12 +34,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vtenv" ) func createSocketPair(t *testing.T) (net.Listener, *Conn, *Conn) { diff --git a/go/mysql/conn_unix.go b/go/mysql/conn_unix.go index fe9d1e2e390..885d613e2be 100644 --- a/go/mysql/conn_unix.go +++ b/go/mysql/conn_unix.go @@ -23,7 +23,7 @@ import ( "io" "syscall" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/mysql/sqlerror" ) // ConnCheck ensures that this connection to the MySQL server hasn't been broken. diff --git a/go/mysql/constants.go b/go/mysql/constants.go index fdd715235cd..bdea582b869 100644 --- a/go/mysql/constants.go +++ b/go/mysql/constants.go @@ -17,7 +17,7 @@ limitations under the License. package mysql import ( - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) const ( diff --git a/go/mysql/constants_test.go b/go/mysql/constants_test.go index f97c743c29e..04d187c988c 100644 --- a/go/mysql/constants_test.go +++ b/go/mysql/constants_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/mysql/sqlerror" ) func TestIsConnErr(t *testing.T) { diff --git a/go/mysql/datetime/datetime.go b/go/mysql/datetime/datetime.go index 6274804367c..16cf7e22bed 100644 --- a/go/mysql/datetime/datetime.go +++ b/go/mysql/datetime/datetime.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "time" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/vt/vthash" ) const negMask = uint16(1 << 15) diff --git a/go/mysql/datetime/datetime_test.go b/go/mysql/datetime/datetime_test.go index d4885ba79c9..da893950c32 100644 --- a/go/mysql/datetime/datetime_test.go +++ b/go/mysql/datetime/datetime_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/vt/vthash" ) var testGoTime = time.Date(2024, 03, 12, 12, 30, 20, 987654321, time.UTC) diff --git a/go/mysql/datetime/interval.go b/go/mysql/datetime/interval.go index 28812c6c45b..7fd6b7eed5a 100644 --- a/go/mysql/datetime/interval.go +++ b/go/mysql/datetime/interval.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/mysql/decimal" ) // IntervalType represents the temporal elements contained in an Interval. diff --git a/go/mysql/datetime/interval_test.go b/go/mysql/datetime/interval_test.go index 83ce43b5db0..1983fd08866 100644 --- a/go/mysql/datetime/interval_test.go +++ b/go/mysql/datetime/interval_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/decimal" ) func TestIntervalType(t *testing.T) { diff --git a/go/mysql/datetime/parse.go b/go/mysql/datetime/parse.go index b9205f27614..1c888756122 100644 --- a/go/mysql/datetime/parse.go +++ b/go/mysql/datetime/parse.go @@ -20,8 +20,8 @@ import ( "math" "strings" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/mysql/fastparse" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/fastparse" ) func parsetimeHours(tp *timeparts, in string) (string, TimeState) { diff --git a/go/mysql/datetime/parse_test.go b/go/mysql/datetime/parse_test.go index fbe7fc5de0f..cddf6f03845 100644 --- a/go/mysql/datetime/parse_test.go +++ b/go/mysql/datetime/parse_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/decimal" ) func TestParseDate(t *testing.T) { diff --git a/go/mysql/datetime/time_zone.go b/go/mysql/datetime/time_zone.go index e7b22f8e3d4..5c3cde44c1a 100644 --- a/go/mysql/datetime/time_zone.go +++ b/go/mysql/datetime/time_zone.go @@ -21,8 +21,8 @@ import ( "strconv" "time" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) func unknownTimeZone(tz string) error { diff --git a/go/mysql/decimal/cached_size.go b/go/mysql/decimal/cached_size.go index 763688a5f61..6ccbec01998 100644 --- a/go/mysql/decimal/cached_size.go +++ b/go/mysql/decimal/cached_size.go @@ -17,7 +17,7 @@ limitations under the License. package decimal -import hack "github.com/mdibaiee/vitess/go/hack" +import hack "github.com/vitess/vitess/go/hack" func (cached *Decimal) CachedSize(alloc bool) int64 { if cached == nil { diff --git a/go/mysql/decimal/helpers.go b/go/mysql/decimal/helpers.go index 2f17e61ae6f..5880669c27f 100644 --- a/go/mysql/decimal/helpers.go +++ b/go/mysql/decimal/helpers.go @@ -16,7 +16,7 @@ limitations under the License. package decimal -import "github.com/mdibaiee/vitess/go/vt/vthash" +import "github.com/vitess/vitess/go/vt/vthash" func (d *Decimal) Hash(hasher *vthash.Hasher) { _, _ = hasher.Write(d.formatFast(0, false, true)) diff --git a/go/mysql/decimal/scan.go b/go/mysql/decimal/scan.go index c24d29e9856..cd33939f511 100644 --- a/go/mysql/decimal/scan.go +++ b/go/mysql/decimal/scan.go @@ -25,7 +25,7 @@ import ( "math/bits" "strings" - "github.com/mdibaiee/vitess/go/mysql/fastparse" + "github.com/vitess/vitess/go/mysql/fastparse" ) var errOverflow = errors.New("overflow") diff --git a/go/mysql/endtoend/client_test.go b/go/mysql/endtoend/client_test.go index c2f2eec4730..7f7f6677e44 100644 --- a/go/mysql/endtoend/client_test.go +++ b/go/mysql/endtoend/client_test.go @@ -25,11 +25,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/mysql/sqlerror" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" ) // TestKill opens a connection, issues a command that diff --git a/go/mysql/endtoend/main_test.go b/go/mysql/endtoend/main_test.go index 07bbc7441aa..54c9a98bb6d 100644 --- a/go/mysql/endtoend/main_test.go +++ b/go/mysql/endtoend/main_test.go @@ -27,15 +27,15 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/mysql" - vtenv "github.com/mdibaiee/vitess/go/vt/env" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/tlstest" - "github.com/mdibaiee/vitess/go/vt/vttest" + "github.com/vitess/vitess/go/mysql" + vtenv "github.com/vitess/vitess/go/vt/env" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/tlstest" + "github.com/vitess/vitess/go/vt/vttest" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" ) var ( diff --git a/go/mysql/endtoend/query_benchmark_test.go b/go/mysql/endtoend/query_benchmark_test.go index 653885eaabe..72949d33c02 100644 --- a/go/mysql/endtoend/query_benchmark_test.go +++ b/go/mysql/endtoend/query_benchmark_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" - "github.com/mdibaiee/vitess/go/vt/vttest" + "github.com/vitess/vitess/go/mysql" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" + "github.com/vitess/vitess/go/vt/vttest" ) // This file contains various long-running tests for mysql. diff --git a/go/mysql/endtoend/query_test.go b/go/mysql/endtoend/query_test.go index 32c4838353e..0d9f3b8438c 100644 --- a/go/mysql/endtoend/query_test.go +++ b/go/mysql/endtoend/query_test.go @@ -26,13 +26,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) const ( diff --git a/go/mysql/endtoend/replication_test.go b/go/mysql/endtoend/replication_test.go index 9a8f26f41c3..62ee09ede1d 100644 --- a/go/mysql/endtoend/replication_test.go +++ b/go/mysql/endtoend/replication_test.go @@ -29,13 +29,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/binlog" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/binlog" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // connectForReplication is a helper method to connect for replication diff --git a/go/mysql/fakesqldb/server.go b/go/mysql/fakesqldb/server.go index 56b0f57a094..93f7f7bb4e0 100644 --- a/go/mysql/fakesqldb/server.go +++ b/go/mysql/fakesqldb/server.go @@ -29,14 +29,14 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + + querypb "github.com/vitess/vitess/go/vt/proto/query" ) const ( diff --git a/go/mysql/flavor.go b/go/mysql/flavor.go index f9f958c4963..90e438254e8 100644 --- a/go/mysql/flavor.go +++ b/go/mysql/flavor.go @@ -23,13 +23,13 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/proto/replicationdata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) var ( diff --git a/go/mysql/flavor_filepos.go b/go/mysql/flavor_filepos.go index e649545c22b..9533264f5a2 100644 --- a/go/mysql/flavor_filepos.go +++ b/go/mysql/flavor_filepos.go @@ -23,12 +23,12 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/vt/proto/replicationdata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) type filePosFlavor struct { diff --git a/go/mysql/flavor_mariadb.go b/go/mysql/flavor_mariadb.go index 982c86c0e52..5f66a9b162c 100644 --- a/go/mysql/flavor_mariadb.go +++ b/go/mysql/flavor_mariadb.go @@ -25,13 +25,13 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/vt/proto/replicationdata" + "github.com/vitess/vitess/go/vt/vterrors" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // mariadbFlavor implements the Flavor interface for MariaDB. diff --git a/go/mysql/flavor_mysql.go b/go/mysql/flavor_mysql.go index 98d78043dc4..99c1e3010a3 100644 --- a/go/mysql/flavor_mysql.go +++ b/go/mysql/flavor_mysql.go @@ -24,13 +24,13 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/vt/proto/replicationdata" + "github.com/vitess/vitess/go/vt/vterrors" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // mysqlFlavor implements the Flavor interface for Mysql. This is diff --git a/go/mysql/flavor_mysql_legacy.go b/go/mysql/flavor_mysql_legacy.go index 42de6c6943d..68f35d5b877 100644 --- a/go/mysql/flavor_mysql_legacy.go +++ b/go/mysql/flavor_mysql_legacy.go @@ -20,9 +20,9 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/mysql/replication" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/replication" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // mysqlFlavorLegacy implements the Flavor interface for Mysql for diff --git a/go/mysql/flavor_mysql_test.go b/go/mysql/flavor_mysql_test.go index 865a15f66fb..22c17240fc8 100644 --- a/go/mysql/flavor_mysql_test.go +++ b/go/mysql/flavor_mysql_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/replication" ) func TestMysql8SetReplicationSourceCommand(t *testing.T) { diff --git a/go/mysql/flavor_mysqlgr.go b/go/mysql/flavor_mysqlgr.go index 2dc319c2156..1c0705f7adf 100644 --- a/go/mysql/flavor_mysqlgr.go +++ b/go/mysql/flavor_mysqlgr.go @@ -21,13 +21,13 @@ import ( "fmt" "math" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) // GRFlavorID is the string identifier for the MysqlGR flavor. diff --git a/go/mysql/flavor_mysqlgr_test.go b/go/mysql/flavor_mysqlgr_test.go index 95f3300dbeb..be3c3d083c3 100644 --- a/go/mysql/flavor_mysqlgr_test.go +++ b/go/mysql/flavor_mysqlgr_test.go @@ -21,11 +21,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestMysqlGRParsePrimaryGroupMember(t *testing.T) { diff --git a/go/mysql/flavor_test.go b/go/mysql/flavor_test.go index 74ef32dba88..77abcfdcf28 100644 --- a/go/mysql/flavor_test.go +++ b/go/mysql/flavor_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/mysql/capabilities" ) func TestServerVersionCapableOf(t *testing.T) { diff --git a/go/mysql/handshake_test.go b/go/mysql/handshake_test.go index 9b0ee235fa3..530207cfa38 100644 --- a/go/mysql/handshake_test.go +++ b/go/mysql/handshake_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/tlstest" - "github.com/mdibaiee/vitess/go/vt/vttls" + "github.com/vitess/vitess/go/vt/tlstest" + "github.com/vitess/vitess/go/vt/vttls" ) // This file tests the handshake scenarios between our client and our server. diff --git a/go/mysql/icuregex/compiler.go b/go/mysql/icuregex/compiler.go index 9d390f7dadd..1efa82f48a9 100644 --- a/go/mysql/icuregex/compiler.go +++ b/go/mysql/icuregex/compiler.go @@ -27,13 +27,13 @@ import ( "strings" "unicode/utf8" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/pattern" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/ucase" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uchar" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/unames" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uprops" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uset" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/utf16" + "github.com/vitess/vitess/go/mysql/icuregex/internal/pattern" + "github.com/vitess/vitess/go/mysql/icuregex/internal/ucase" + "github.com/vitess/vitess/go/mysql/icuregex/internal/uchar" + "github.com/vitess/vitess/go/mysql/icuregex/internal/unames" + "github.com/vitess/vitess/go/mysql/icuregex/internal/uprops" + "github.com/vitess/vitess/go/mysql/icuregex/internal/uset" + "github.com/vitess/vitess/go/mysql/icuregex/internal/utf16" ) const BreakIteration = false diff --git a/go/mysql/icuregex/icu_test.go b/go/mysql/icuregex/icu_test.go index 35873e5d392..9e51c734aa4 100644 --- a/go/mysql/icuregex/icu_test.go +++ b/go/mysql/icuregex/icu_test.go @@ -34,8 +34,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/icuregex" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/pattern" + "github.com/vitess/vitess/go/mysql/icuregex" + "github.com/vitess/vitess/go/mysql/icuregex/internal/pattern" ) var ErrSkip = errors.New("ignored test") diff --git a/go/mysql/icuregex/internal/normalizer/normalizer.go b/go/mysql/icuregex/internal/normalizer/normalizer.go index c8e6c79de6a..c513236fc66 100644 --- a/go/mysql/icuregex/internal/normalizer/normalizer.go +++ b/go/mysql/icuregex/internal/normalizer/normalizer.go @@ -25,11 +25,11 @@ import ( "errors" "sync" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/icudata" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/udata" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uset" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/utf16" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/utrie" + "github.com/vitess/vitess/go/mysql/icuregex/internal/icudata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/udata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/uset" + "github.com/vitess/vitess/go/mysql/icuregex/internal/utf16" + "github.com/vitess/vitess/go/mysql/icuregex/internal/utrie" ) type Normalizer struct { diff --git a/go/mysql/icuregex/internal/pattern/unescape.go b/go/mysql/icuregex/internal/pattern/unescape.go index 36a8fd564bd..7a2861c40db 100644 --- a/go/mysql/icuregex/internal/pattern/unescape.go +++ b/go/mysql/icuregex/internal/pattern/unescape.go @@ -25,7 +25,7 @@ import ( "strings" "unicode/utf8" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/utf16" + "github.com/vitess/vitess/go/mysql/icuregex/internal/utf16" ) /* Convert one octal digit to a numeric value 0..7, or -1 on failure */ diff --git a/go/mysql/icuregex/internal/ubidi/loader.go b/go/mysql/icuregex/internal/ubidi/loader.go index 842b6e9f4aa..889aeb8ee8f 100644 --- a/go/mysql/icuregex/internal/ubidi/loader.go +++ b/go/mysql/icuregex/internal/ubidi/loader.go @@ -25,9 +25,9 @@ import ( "errors" "sync" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/icudata" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/udata" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/utrie" + "github.com/vitess/vitess/go/mysql/icuregex/internal/icudata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/udata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/utrie" ) var ubidiOnce sync.Once diff --git a/go/mysql/icuregex/internal/ucase/fold.go b/go/mysql/icuregex/internal/ucase/fold.go index b62cf9116d3..cdd32262791 100644 --- a/go/mysql/icuregex/internal/ucase/fold.go +++ b/go/mysql/icuregex/internal/ucase/fold.go @@ -24,7 +24,7 @@ package ucase import ( "math/bits" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/utf16" + "github.com/vitess/vitess/go/mysql/icuregex/internal/utf16" ) func FoldRunes(str []rune) []rune { diff --git a/go/mysql/icuregex/internal/ucase/loader.go b/go/mysql/icuregex/internal/ucase/loader.go index 65ce8b00635..a6547d51b93 100644 --- a/go/mysql/icuregex/internal/ucase/loader.go +++ b/go/mysql/icuregex/internal/ucase/loader.go @@ -25,9 +25,9 @@ import ( "errors" "sync" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/icudata" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/udata" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/utrie" + "github.com/vitess/vitess/go/mysql/icuregex/internal/icudata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/udata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/utrie" ) var ucaseOnce sync.Once diff --git a/go/mysql/icuregex/internal/ucase/ucase.go b/go/mysql/icuregex/internal/ucase/ucase.go index 56f7e604ef8..56516eb90e9 100644 --- a/go/mysql/icuregex/internal/ucase/ucase.go +++ b/go/mysql/icuregex/internal/ucase/ucase.go @@ -22,7 +22,7 @@ limitations under the License. package ucase import ( - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/utf16" + "github.com/vitess/vitess/go/mysql/icuregex/internal/utf16" ) const ( diff --git a/go/mysql/icuregex/internal/uchar/loader.go b/go/mysql/icuregex/internal/uchar/loader.go index 745b1dd29d3..db3d61e4c00 100644 --- a/go/mysql/icuregex/internal/uchar/loader.go +++ b/go/mysql/icuregex/internal/uchar/loader.go @@ -25,9 +25,9 @@ import ( "errors" "sync" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/icudata" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/udata" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/utrie" + "github.com/vitess/vitess/go/mysql/icuregex/internal/icudata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/udata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/utrie" ) var upropsOnce sync.Once diff --git a/go/mysql/icuregex/internal/uemoji/loader.go b/go/mysql/icuregex/internal/uemoji/loader.go index ecd4288feba..54c4fdc45bd 100644 --- a/go/mysql/icuregex/internal/uemoji/loader.go +++ b/go/mysql/icuregex/internal/uemoji/loader.go @@ -24,9 +24,9 @@ package uemoji import ( "sync" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/icudata" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/udata" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/utrie" + "github.com/vitess/vitess/go/mysql/icuregex/internal/icudata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/udata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/utrie" ) var uemojiOnce sync.Once diff --git a/go/mysql/icuregex/internal/uemoji/uemoji.go b/go/mysql/icuregex/internal/uemoji/uemoji.go index fe66eacc63b..84bb473d788 100644 --- a/go/mysql/icuregex/internal/uemoji/uemoji.go +++ b/go/mysql/icuregex/internal/uemoji/uemoji.go @@ -22,7 +22,7 @@ limitations under the License. package uemoji import ( - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/utrie" + "github.com/vitess/vitess/go/mysql/icuregex/internal/utrie" ) type propertySet interface { diff --git a/go/mysql/icuregex/internal/ulayout/ulayout.go b/go/mysql/icuregex/internal/ulayout/ulayout.go index b9420343ee4..ba528205cba 100644 --- a/go/mysql/icuregex/internal/ulayout/ulayout.go +++ b/go/mysql/icuregex/internal/ulayout/ulayout.go @@ -25,9 +25,9 @@ import ( "errors" "sync" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/icudata" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/udata" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/utrie" + "github.com/vitess/vitess/go/mysql/icuregex/internal/icudata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/udata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/utrie" ) var inpcTrie *utrie.UcpTrie diff --git a/go/mysql/icuregex/internal/unames/loader.go b/go/mysql/icuregex/internal/unames/loader.go index 6fe4a92f883..31f66d48e77 100644 --- a/go/mysql/icuregex/internal/unames/loader.go +++ b/go/mysql/icuregex/internal/unames/loader.go @@ -24,8 +24,8 @@ package unames import ( "sync" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/icudata" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/udata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/icudata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/udata" ) var charNamesOnce sync.Once diff --git a/go/mysql/icuregex/internal/uprops/loader.go b/go/mysql/icuregex/internal/uprops/loader.go index ba1653773d5..6a4e6740b39 100644 --- a/go/mysql/icuregex/internal/uprops/loader.go +++ b/go/mysql/icuregex/internal/uprops/loader.go @@ -25,8 +25,8 @@ import ( "fmt" "sync" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/icudata" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/udata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/icudata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/udata" ) var pnamesOnce sync.Once diff --git a/go/mysql/icuregex/internal/uprops/properties.go b/go/mysql/icuregex/internal/uprops/properties.go index cfb15cf86ca..7eb39996b76 100644 --- a/go/mysql/icuregex/internal/uprops/properties.go +++ b/go/mysql/icuregex/internal/uprops/properties.go @@ -26,17 +26,17 @@ import ( "strings" "sync" - "github.com/mdibaiee/vitess/go/mysql/icuregex/errors" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/normalizer" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/pattern" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/ubidi" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/ucase" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uchar" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uemoji" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/ulayout" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/unames" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uset" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/utrie" + "github.com/vitess/vitess/go/mysql/icuregex/errors" + "github.com/vitess/vitess/go/mysql/icuregex/internal/normalizer" + "github.com/vitess/vitess/go/mysql/icuregex/internal/pattern" + "github.com/vitess/vitess/go/mysql/icuregex/internal/ubidi" + "github.com/vitess/vitess/go/mysql/icuregex/internal/ucase" + "github.com/vitess/vitess/go/mysql/icuregex/internal/uchar" + "github.com/vitess/vitess/go/mysql/icuregex/internal/uemoji" + "github.com/vitess/vitess/go/mysql/icuregex/internal/ulayout" + "github.com/vitess/vitess/go/mysql/icuregex/internal/unames" + "github.com/vitess/vitess/go/mysql/icuregex/internal/uset" + "github.com/vitess/vitess/go/mysql/icuregex/internal/utrie" ) var inclusionsMu sync.Mutex diff --git a/go/mysql/icuregex/internal/uprops/uprops.go b/go/mysql/icuregex/internal/uprops/uprops.go index 79ad923597a..ce12255ba4c 100644 --- a/go/mysql/icuregex/internal/uprops/uprops.go +++ b/go/mysql/icuregex/internal/uprops/uprops.go @@ -22,8 +22,8 @@ limitations under the License. package uprops import ( - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/bytestrie" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uchar" + "github.com/vitess/vitess/go/mysql/icuregex/internal/bytestrie" + "github.com/vitess/vitess/go/mysql/icuregex/internal/uchar" ) const ( diff --git a/go/mysql/icuregex/internal/uprops/uprops_binary.go b/go/mysql/icuregex/internal/uprops/uprops_binary.go index d4fb1101726..32996d5367d 100644 --- a/go/mysql/icuregex/internal/uprops/uprops_binary.go +++ b/go/mysql/icuregex/internal/uprops/uprops_binary.go @@ -24,11 +24,11 @@ package uprops import ( "slices" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/normalizer" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/ubidi" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/ucase" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uchar" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uemoji" + "github.com/vitess/vitess/go/mysql/icuregex/internal/normalizer" + "github.com/vitess/vitess/go/mysql/icuregex/internal/ubidi" + "github.com/vitess/vitess/go/mysql/icuregex/internal/ucase" + "github.com/vitess/vitess/go/mysql/icuregex/internal/uchar" + "github.com/vitess/vitess/go/mysql/icuregex/internal/uemoji" ) type binaryProperty struct { diff --git a/go/mysql/icuregex/internal/uprops/uprops_int.go b/go/mysql/icuregex/internal/uprops/uprops_int.go index c712a91b88e..4a4813cf41c 100644 --- a/go/mysql/icuregex/internal/uprops/uprops_int.go +++ b/go/mysql/icuregex/internal/uprops/uprops_int.go @@ -22,10 +22,10 @@ limitations under the License. package uprops import ( - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/normalizer" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/ubidi" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uchar" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/ulayout" + "github.com/vitess/vitess/go/mysql/icuregex/internal/normalizer" + "github.com/vitess/vitess/go/mysql/icuregex/internal/ubidi" + "github.com/vitess/vitess/go/mysql/icuregex/internal/uchar" + "github.com/vitess/vitess/go/mysql/icuregex/internal/ulayout" ) type intPropertyGetValue func(prop *intProperty, c rune, which Property) int32 diff --git a/go/mysql/icuregex/internal/uprops/uscript.go b/go/mysql/icuregex/internal/uprops/uscript.go index f31bd30f9a1..2a73936c463 100644 --- a/go/mysql/icuregex/internal/uprops/uscript.go +++ b/go/mysql/icuregex/internal/uprops/uscript.go @@ -21,7 +21,7 @@ limitations under the License. package uprops -import "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uchar" +import "github.com/vitess/vitess/go/mysql/icuregex/internal/uchar" /** * Constants for ISO 15924 script codes. diff --git a/go/mysql/icuregex/internal/uset/close.go b/go/mysql/icuregex/internal/uset/close.go index 84be61f5336..f7c72adca21 100644 --- a/go/mysql/icuregex/internal/uset/close.go +++ b/go/mysql/icuregex/internal/uset/close.go @@ -21,7 +21,7 @@ limitations under the License. package uset -import "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/ucase" +import "github.com/vitess/vitess/go/mysql/icuregex/internal/ucase" type USet uint32 diff --git a/go/mysql/icuregex/internal/uset/pattern.go b/go/mysql/icuregex/internal/uset/pattern.go index 3a1d09d33d3..2d8a546597a 100644 --- a/go/mysql/icuregex/internal/uset/pattern.go +++ b/go/mysql/icuregex/internal/uset/pattern.go @@ -24,7 +24,7 @@ package uset import ( "strings" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/pattern" + "github.com/vitess/vitess/go/mysql/icuregex/internal/pattern" ) func (u *UnicodeSet) String() string { diff --git a/go/mysql/icuregex/internal/utrie/ucptrie.go b/go/mysql/icuregex/internal/utrie/ucptrie.go index 64a5a355c92..856a33c5364 100644 --- a/go/mysql/icuregex/internal/utrie/ucptrie.go +++ b/go/mysql/icuregex/internal/utrie/ucptrie.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/udata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/udata" ) type UcpTrie struct { diff --git a/go/mysql/icuregex/internal/utrie/utrie2.go b/go/mysql/icuregex/internal/utrie/utrie2.go index 736098ac612..c69792616cd 100644 --- a/go/mysql/icuregex/internal/utrie/utrie2.go +++ b/go/mysql/icuregex/internal/utrie/utrie2.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/udata" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/utf16" + "github.com/vitess/vitess/go/mysql/icuregex/internal/udata" + "github.com/vitess/vitess/go/mysql/icuregex/internal/utf16" ) type UTrie2 struct { diff --git a/go/mysql/icuregex/matcher.go b/go/mysql/icuregex/matcher.go index 13c72d719dd..21f9b684a79 100644 --- a/go/mysql/icuregex/matcher.go +++ b/go/mysql/icuregex/matcher.go @@ -25,9 +25,9 @@ import ( "fmt" "io" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/ucase" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uchar" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uprops" + "github.com/vitess/vitess/go/mysql/icuregex/internal/ucase" + "github.com/vitess/vitess/go/mysql/icuregex/internal/uchar" + "github.com/vitess/vitess/go/mysql/icuregex/internal/uprops" ) const timerInitialValue = 10000 diff --git a/go/mysql/icuregex/ops.go b/go/mysql/icuregex/ops.go index a10bd12777f..00518fda8bc 100644 --- a/go/mysql/icuregex/ops.go +++ b/go/mysql/icuregex/ops.go @@ -24,8 +24,8 @@ package icuregex import ( "slices" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/ucase" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/utf16" + "github.com/vitess/vitess/go/mysql/icuregex/internal/ucase" + "github.com/vitess/vitess/go/mysql/icuregex/internal/utf16" ) type opcode uint8 diff --git a/go/mysql/icuregex/pattern.go b/go/mysql/icuregex/pattern.go index e21dda2bc6c..8b33bbfde99 100644 --- a/go/mysql/icuregex/pattern.go +++ b/go/mysql/icuregex/pattern.go @@ -22,7 +22,7 @@ limitations under the License. package icuregex import ( - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uset" + "github.com/vitess/vitess/go/mysql/icuregex/internal/uset" ) type Pattern struct { diff --git a/go/mysql/icuregex/sets.go b/go/mysql/icuregex/sets.go index a78037376d7..fedccdbb02d 100644 --- a/go/mysql/icuregex/sets.go +++ b/go/mysql/icuregex/sets.go @@ -22,8 +22,8 @@ limitations under the License. package icuregex import ( - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uprops" - "github.com/mdibaiee/vitess/go/mysql/icuregex/internal/uset" + "github.com/vitess/vitess/go/mysql/icuregex/internal/uprops" + "github.com/vitess/vitess/go/mysql/icuregex/internal/uset" ) var staticPropertySets [13]*uset.UnicodeSet diff --git a/go/mysql/json/cached_size.go b/go/mysql/json/cached_size.go index 08ae74a3ef0..f490961ffdd 100644 --- a/go/mysql/json/cached_size.go +++ b/go/mysql/json/cached_size.go @@ -17,7 +17,7 @@ limitations under the License. package json -import hack "github.com/mdibaiee/vitess/go/hack" +import hack "github.com/vitess/vitess/go/hack" func (cached *Object) CachedSize(alloc bool) int64 { if cached == nil { @@ -27,7 +27,7 @@ func (cached *Object) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field kvs []github.com/mdibaiee/vitess/go/mysql/json.kv + // field kvs []github.com/vitess/vitess/go/mysql/json.kv { size += hack.RuntimeAllocSize(int64(cap(cached.kvs)) * int64(24)) for _, elem := range cached.kvs { @@ -44,9 +44,9 @@ func (cached *Value) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field o github.com/mdibaiee/vitess/go/mysql/json.Object + // field o github.com/vitess/vitess/go/mysql/json.Object size += cached.o.CachedSize(false) - // field a []*github.com/mdibaiee/vitess/go/mysql/json.Value + // field a []*github.com/vitess/vitess/go/mysql/json.Value { size += hack.RuntimeAllocSize(int64(cap(cached.a)) * int64(8)) for _, elem := range cached.a { @@ -67,7 +67,7 @@ func (cached *kv) CachedSize(alloc bool) int64 { } // field k string size += hack.RuntimeAllocSize(int64(len(cached.k))) - // field v *github.com/mdibaiee/vitess/go/mysql/json.Value + // field v *github.com/vitess/vitess/go/mysql/json.Value size += cached.v.CachedSize(true) return size } diff --git a/go/mysql/json/helpers.go b/go/mysql/json/helpers.go index 3ee960dac09..776aa060156 100644 --- a/go/mysql/json/helpers.go +++ b/go/mysql/json/helpers.go @@ -17,10 +17,10 @@ limitations under the License. package json import ( - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vthash" ) const hashPrefixJSON = 0xCCBB diff --git a/go/mysql/json/json_path.go b/go/mysql/json/json_path.go index f308758461f..f7d5682849a 100644 --- a/go/mysql/json/json_path.go +++ b/go/mysql/json/json_path.go @@ -27,10 +27,10 @@ import ( "unicode" "unicode/utf8" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/unicode2" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/unicode2" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) type jpKind uint32 diff --git a/go/mysql/json/marshal.go b/go/mysql/json/marshal.go index 615c8b3da3f..35a8389e464 100644 --- a/go/mysql/json/marshal.go +++ b/go/mysql/json/marshal.go @@ -20,11 +20,11 @@ import ( "fmt" "math/big" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/mysql/hex" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/mysql/hex" + querypb "github.com/vitess/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) // MarshalSQLTo appends marshaled v to dst and returns the result in diff --git a/go/mysql/json/parser.go b/go/mysql/json/parser.go index 585feaa25af..7ca720613e9 100644 --- a/go/mysql/json/parser.go +++ b/go/mysql/json/parser.go @@ -27,12 +27,12 @@ import ( "time" "unicode/utf16" - "github.com/mdibaiee/vitess/go/mysql/fastparse" + "github.com/vitess/vitess/go/mysql/fastparse" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/mysql/datetime" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/mysql/format" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/mysql/datetime" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/format" ) // Parser parses JSON. diff --git a/go/mysql/json/parser_test.go b/go/mysql/json/parser_test.go index 2cc11e89587..f32efadbe3d 100644 --- a/go/mysql/json/parser_test.go +++ b/go/mysql/json/parser_test.go @@ -20,7 +20,7 @@ package json import ( "testing" - "github.com/mdibaiee/vitess/go/hack" + "github.com/vitess/vitess/go/hack" ) func TestParseRawNumber(t *testing.T) { diff --git a/go/mysql/json/weights.go b/go/mysql/json/weights.go index 5e683d3a691..69e3637dc09 100644 --- a/go/mysql/json/weights.go +++ b/go/mysql/json/weights.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "strings" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/mysql/fastparse" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/mysql/fastparse" ) const ( diff --git a/go/mysql/json/weights_test.go b/go/mysql/json/weights_test.go index 59bb88afaf7..bf75c4f7504 100644 --- a/go/mysql/json/weights_test.go +++ b/go/mysql/json/weights_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/mdibaiee/vitess/go/mysql/format" + "github.com/vitess/vitess/go/mysql/format" ) func TestWeightStrings(t *testing.T) { diff --git a/go/mysql/ldapauthserver/auth_server_ldap.go b/go/mysql/ldapauthserver/auth_server_ldap.go index 6aefb41df19..b8cb52ead8b 100644 --- a/go/mysql/ldapauthserver/auth_server_ldap.go +++ b/go/mysql/ldapauthserver/auth_server_ldap.go @@ -26,12 +26,12 @@ import ( "gopkg.in/ldap.v2" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vttls" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vttls" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // AuthServerLdap implements AuthServer with an LDAP backend diff --git a/go/mysql/mysql_fuzzer.go b/go/mysql/mysql_fuzzer.go index 3b49c17f861..0b07a090e3c 100644 --- a/go/mysql/mysql_fuzzer.go +++ b/go/mysql/mysql_fuzzer.go @@ -31,11 +31,11 @@ import ( gofuzzheaders "github.com/AdaLogics/go-fuzz-headers" - "github.com/mdibaiee/vitess/go/mysql/config" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/tlstest" - "github.com/mdibaiee/vitess/go/vt/vttls" + "github.com/vitess/vitess/go/mysql/config" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/tlstest" + "github.com/vitess/vitess/go/vt/vttls" ) func createFuzzingSocketPair() (net.Listener, *Conn, *Conn) { diff --git a/go/mysql/query.go b/go/mysql/query.go index 5f66e1d24de..23c96b0f789 100644 --- a/go/mysql/query.go +++ b/go/mysql/query.go @@ -23,14 +23,14 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // This file contains the methods related to queries. diff --git a/go/mysql/query_test.go b/go/mysql/query_test.go index 39d5a942521..57719db58dd 100644 --- a/go/mysql/query_test.go +++ b/go/mysql/query_test.go @@ -24,16 +24,16 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // Utility function to write sql query as packets to test parseComPrepare diff --git a/go/mysql/register_replica.go b/go/mysql/register_replica.go index 2284300f361..227fd0c358c 100644 --- a/go/mysql/register_replica.go +++ b/go/mysql/register_replica.go @@ -17,8 +17,8 @@ limitations under the License. package mysql import ( - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) var ( diff --git a/go/mysql/replication.go b/go/mysql/replication.go index 67580e272f5..4c4a9d4614a 100644 --- a/go/mysql/replication.go +++ b/go/mysql/replication.go @@ -19,9 +19,9 @@ package mysql import ( "fmt" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) const ( diff --git a/go/mysql/replication/gtid.go b/go/mysql/replication/gtid.go index a41a3f4e218..e9346618d73 100644 --- a/go/mysql/replication/gtid.go +++ b/go/mysql/replication/gtid.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // GTID represents a Global Transaction ID, also known as Transaction Group ID. diff --git a/go/mysql/replication/mariadb_gtid.go b/go/mysql/replication/mariadb_gtid.go index 3c7d1813c3d..3518ff732e6 100644 --- a/go/mysql/replication/mariadb_gtid.go +++ b/go/mysql/replication/mariadb_gtid.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // MariadbFlavorID is the string identifier for the MariaDB flavor. diff --git a/go/mysql/replication/mysql56_gtid.go b/go/mysql/replication/mysql56_gtid.go index 891dec7a44d..1cc7cb40b41 100644 --- a/go/mysql/replication/mysql56_gtid.go +++ b/go/mysql/replication/mysql56_gtid.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // Mysql56FlavorID is the string identifier for the Mysql56 flavor. diff --git a/go/mysql/replication/mysql56_gtid_set.go b/go/mysql/replication/mysql56_gtid_set.go index f20fe4ee097..fb923233811 100644 --- a/go/mysql/replication/mysql56_gtid_set.go +++ b/go/mysql/replication/mysql56_gtid_set.go @@ -23,8 +23,8 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) type interval struct { diff --git a/go/mysql/replication/primary_status.go b/go/mysql/replication/primary_status.go index 9de34c677f5..a7c3905b1c2 100644 --- a/go/mysql/replication/primary_status.go +++ b/go/mysql/replication/primary_status.go @@ -19,9 +19,9 @@ package replication import ( "fmt" - "github.com/mdibaiee/vitess/go/vt/log" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/log" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + "github.com/vitess/vitess/go/vt/vterrors" ) // PrimaryStatus holds replication information from SHOW BINARY LOG STATUS. diff --git a/go/mysql/replication/replication_position.go b/go/mysql/replication/replication_position.go index ccb5888e6e2..cc80bac6296 100644 --- a/go/mysql/replication/replication_position.go +++ b/go/mysql/replication/replication_position.go @@ -21,8 +21,8 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) const ( diff --git a/go/mysql/replication/replication_status.go b/go/mysql/replication/replication_status.go index ff0f6845b14..e6d6ef81fc1 100644 --- a/go/mysql/replication/replication_status.go +++ b/go/mysql/replication/replication_status.go @@ -20,9 +20,9 @@ import ( "fmt" "strconv" - "github.com/mdibaiee/vitess/go/vt/log" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/log" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + "github.com/vitess/vitess/go/vt/vterrors" ) // ReplicationStatus holds replication information from SHOW REPLICA STATUS. diff --git a/go/mysql/replication_test.go b/go/mysql/replication_test.go index 0bed322dcd6..d7d2a65a177 100644 --- a/go/mysql/replication_test.go +++ b/go/mysql/replication_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) func TestComBinlogDump(t *testing.T) { diff --git a/go/mysql/schema.go b/go/mysql/schema.go index f6c92ee4d88..3ea93f7f6b5 100644 --- a/go/mysql/schema.go +++ b/go/mysql/schema.go @@ -17,10 +17,10 @@ limitations under the License. package mysql import ( - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // This file contains the mysql queries used by different parts of the code. diff --git a/go/mysql/server.go b/go/mysql/server.go index 5513948f9f1..9f3e0757c0d 100644 --- a/go/mysql/server.go +++ b/go/mysql/server.go @@ -27,19 +27,19 @@ import ( "github.com/pires/go-proxyproto" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/tb" - "github.com/mdibaiee/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/tb" + "github.com/vitess/vitess/go/vt/log" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" ) const ( diff --git a/go/mysql/server_test.go b/go/mysql/server_test.go index ed9d8e09c9b..d5e67c5a014 100644 --- a/go/mysql/server_test.go +++ b/go/mysql/server_test.go @@ -32,19 +32,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - venv "github.com/mdibaiee/vitess/go/vt/env" - "github.com/mdibaiee/vitess/go/vt/tlstest" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttls" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + venv "github.com/vitess/vitess/go/vt/env" + "github.com/vitess/vitess/go/vt/tlstest" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttls" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var selectRowsResult = &sqltypes.Result{ diff --git a/go/mysql/sqlerror/sql_error.go b/go/mysql/sqlerror/sql_error.go index 3e9c19e8e9d..4681ac6833e 100644 --- a/go/mysql/sqlerror/sql_error.go +++ b/go/mysql/sqlerror/sql_error.go @@ -22,9 +22,9 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // SQLError is the error structure returned from calling a db library function diff --git a/go/mysql/sqlerror/sql_error_test.go b/go/mysql/sqlerror/sql_error_test.go index e8072dac2e8..0e38ced94f3 100644 --- a/go/mysql/sqlerror/sql_error_test.go +++ b/go/mysql/sqlerror/sql_error_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) func TestDemuxResourceExhaustedErrors(t *testing.T) { diff --git a/go/mysql/streaming_query.go b/go/mysql/streaming_query.go index db55eb1c1f3..f021c6e60e1 100644 --- a/go/mysql/streaming_query.go +++ b/go/mysql/streaming_query.go @@ -17,11 +17,11 @@ limitations under the License. package mysql import ( - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // This file contains the methods needed to execute streaming queries. diff --git a/go/mysql/vault/auth_server_vault.go b/go/mysql/vault/auth_server_vault.go index 0af78073f3d..d544b720263 100644 --- a/go/mysql/vault/auth_server_vault.go +++ b/go/mysql/vault/auth_server_vault.go @@ -29,9 +29,9 @@ import ( vaultapi "github.com/aquarapid/vaultlib" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/vt/log" ) // AuthServerVault implements AuthServer with a config loaded from Vault. diff --git a/go/pools/numbered.go b/go/pools/numbered.go index 260f99cd0a4..e9d96907a61 100644 --- a/go/pools/numbered.go +++ b/go/pools/numbered.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/cache" + "github.com/vitess/vitess/go/cache" ) // Numbered allows you to manage resources by tracking them with numbers. diff --git a/go/pools/refresh_pool.go b/go/pools/refresh_pool.go index 76636652638..a836188b90e 100644 --- a/go/pools/refresh_pool.go +++ b/go/pools/refresh_pool.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) type ( diff --git a/go/pools/resource_pool.go b/go/pools/resource_pool.go index 5d83c8aefe9..47b5b1f71a6 100644 --- a/go/pools/resource_pool.go +++ b/go/pools/resource_pool.go @@ -27,11 +27,11 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vterrors" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) type ( diff --git a/go/pools/smartconnpool/benchmarking/legacy/refresh_pool.go b/go/pools/smartconnpool/benchmarking/legacy/refresh_pool.go index e94cad449bf..45c292c2cbd 100644 --- a/go/pools/smartconnpool/benchmarking/legacy/refresh_pool.go +++ b/go/pools/smartconnpool/benchmarking/legacy/refresh_pool.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) type ( diff --git a/go/pools/smartconnpool/benchmarking/legacy/resource_pool.go b/go/pools/smartconnpool/benchmarking/legacy/resource_pool.go index 5dd0d3c72bc..cd3db013147 100644 --- a/go/pools/smartconnpool/benchmarking/legacy/resource_pool.go +++ b/go/pools/smartconnpool/benchmarking/legacy/resource_pool.go @@ -25,12 +25,12 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/pools/smartconnpool" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/pools/smartconnpool" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vterrors" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) type ( diff --git a/go/pools/smartconnpool/benchmarking/load_test.go b/go/pools/smartconnpool/benchmarking/load_test.go index 50c2852e588..4e219b33dde 100644 --- a/go/pools/smartconnpool/benchmarking/load_test.go +++ b/go/pools/smartconnpool/benchmarking/load_test.go @@ -33,8 +33,8 @@ import ( "gonum.org/v1/gonum/floats" "gonum.org/v1/gonum/stat/distuv" - "github.com/mdibaiee/vitess/go/pools/smartconnpool" - pools "github.com/mdibaiee/vitess/go/pools/smartconnpool/benchmarking/legacy" + "github.com/vitess/vitess/go/pools/smartconnpool" + pools "github.com/vitess/vitess/go/pools/smartconnpool/benchmarking/legacy" ) type Request struct { diff --git a/go/pools/smartconnpool/cached_size.go b/go/pools/smartconnpool/cached_size.go index 682f03cbd41..f8bc1058fb5 100644 --- a/go/pools/smartconnpool/cached_size.go +++ b/go/pools/smartconnpool/cached_size.go @@ -17,7 +17,7 @@ limitations under the License. package smartconnpool -import hack "github.com/mdibaiee/vitess/go/hack" +import hack "github.com/vitess/vitess/go/hack" func (cached *Setting) CachedSize(alloc bool) int64 { if cached == nil { diff --git a/go/pools/smartconnpool/pool.go b/go/pools/smartconnpool/pool.go index 82892d5c5ff..0d58067cd55 100644 --- a/go/pools/smartconnpool/pool.go +++ b/go/pools/smartconnpool/pool.go @@ -24,10 +24,10 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/vt/log" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/log" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vterrors" ) var ( diff --git a/go/pools/smartconnpool/stack.go b/go/pools/smartconnpool/stack.go index 74b8e22ccdc..285de057aa7 100644 --- a/go/pools/smartconnpool/stack.go +++ b/go/pools/smartconnpool/stack.go @@ -19,7 +19,7 @@ package smartconnpool import ( "runtime" - "github.com/mdibaiee/vitess/go/atomic2" + "github.com/vitess/vitess/go/atomic2" ) // connStack is a lock-free stack for Connection objects. It is safe to diff --git a/go/pools/smartconnpool/waitlist.go b/go/pools/smartconnpool/waitlist.go index 042ecb39a58..9b8dd15e798 100644 --- a/go/pools/smartconnpool/waitlist.go +++ b/go/pools/smartconnpool/waitlist.go @@ -20,7 +20,7 @@ import ( "context" "sync" - "github.com/mdibaiee/vitess/go/list" + "github.com/vitess/vitess/go/list" ) // waiter represents a client waiting for a connection in the waitlist diff --git a/go/protoutil/binlogsource.go b/go/protoutil/binlogsource.go index c48af7e02c3..5cfea88f2ad 100644 --- a/go/protoutil/binlogsource.go +++ b/go/protoutil/binlogsource.go @@ -21,7 +21,7 @@ import ( "sort" "strings" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) // SortBinlogSourceTables sorts the table related contents of the diff --git a/go/protoutil/binlogsource_test.go b/go/protoutil/binlogsource_test.go index 0e97de5b505..9f884d33631 100644 --- a/go/protoutil/binlogsource_test.go +++ b/go/protoutil/binlogsource_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) func TestSortBinlogSourceTables(t *testing.T) { diff --git a/go/protoutil/duration.go b/go/protoutil/duration.go index 7a478f2f92b..6032af2c70c 100644 --- a/go/protoutil/duration.go +++ b/go/protoutil/duration.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/vt/proto/vttime" ) // DurationFromProto converts a durationpb type to a time.Duration. It returns a diff --git a/go/protoutil/duration_test.go b/go/protoutil/duration_test.go index c7fd892250b..6edfcdb9d3d 100644 --- a/go/protoutil/duration_test.go +++ b/go/protoutil/duration_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/vt/proto/vttime" ) func TestDurationFromProto(t *testing.T) { diff --git a/go/protoutil/time.go b/go/protoutil/time.go index 77068f8f640..5a3a5dec817 100644 --- a/go/protoutil/time.go +++ b/go/protoutil/time.go @@ -19,7 +19,7 @@ package protoutil import ( "time" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/vt/proto/vttime" ) // TimeFromProto converts a vttime.Time proto message into a time.Time object. diff --git a/go/protoutil/time_test.go b/go/protoutil/time_test.go index b46caf44b9e..1719207632c 100644 --- a/go/protoutil/time_test.go +++ b/go/protoutil/time_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/proto/vttime" ) func TestTimeFromProto(t *testing.T) { diff --git a/go/sqltypes/bind_variables.go b/go/sqltypes/bind_variables.go index 1be3e23cf94..2597e616845 100644 --- a/go/sqltypes/bind_variables.go +++ b/go/sqltypes/bind_variables.go @@ -24,7 +24,7 @@ import ( "google.golang.org/protobuf/proto" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) type DecimalString string diff --git a/go/sqltypes/bind_variables_test.go b/go/sqltypes/bind_variables_test.go index 92487c53766..fb4c31808d0 100644 --- a/go/sqltypes/bind_variables_test.go +++ b/go/sqltypes/bind_variables_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // TestProtoConversions checks coverting to and fro between querypb.Value and sqltypes.Value. diff --git a/go/sqltypes/cached_size.go b/go/sqltypes/cached_size.go index 24232fd5cfa..97be52b6a22 100644 --- a/go/sqltypes/cached_size.go +++ b/go/sqltypes/cached_size.go @@ -17,7 +17,7 @@ limitations under the License. package sqltypes -import hack "github.com/mdibaiee/vitess/go/hack" +import hack "github.com/vitess/vitess/go/hack" func (cached *Result) CachedSize(alloc bool) int64 { if cached == nil { @@ -27,14 +27,14 @@ func (cached *Result) CachedSize(alloc bool) int64 { if alloc { size += int64(112) } - // field Fields []*github.com/mdibaiee/vitess/go/vt/proto/query.Field + // field Fields []*github.com/vitess/vitess/go/vt/proto/query.Field { size += hack.RuntimeAllocSize(int64(cap(cached.Fields)) * int64(8)) for _, elem := range cached.Fields { size += elem.CachedSize(true) } } - // field Rows [][]github.com/mdibaiee/vitess/go/sqltypes.Value + // field Rows [][]github.com/vitess/vitess/go/sqltypes.Value { size += hack.RuntimeAllocSize(int64(cap(cached.Rows)) * int64(24)) for _, elem := range cached.Rows { diff --git a/go/sqltypes/cast.go b/go/sqltypes/cast.go index 1a003c8ce56..4f91e3bbe77 100644 --- a/go/sqltypes/cast.go +++ b/go/sqltypes/cast.go @@ -17,8 +17,8 @@ limitations under the License. package sqltypes import ( - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // Cast converts a Value to the target type. diff --git a/go/sqltypes/cast_test.go b/go/sqltypes/cast_test.go index 4a01e4a2d4f..43c6b0e5892 100644 --- a/go/sqltypes/cast_test.go +++ b/go/sqltypes/cast_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) func TestCast(t *testing.T) { diff --git a/go/sqltypes/event_token.go b/go/sqltypes/event_token.go index ddfa511f21f..b19143d7b7f 100644 --- a/go/sqltypes/event_token.go +++ b/go/sqltypes/event_token.go @@ -17,7 +17,7 @@ limitations under the License. package sqltypes import ( - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // EventTokenMinimum returns an event token that is guaranteed to diff --git a/go/sqltypes/event_token_test.go b/go/sqltypes/event_token_test.go index 82bfc70f1dd..fab7d333a59 100644 --- a/go/sqltypes/event_token_test.go +++ b/go/sqltypes/event_token_test.go @@ -21,7 +21,7 @@ import ( "google.golang.org/protobuf/proto" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestEventTokenMinimum(t *testing.T) { diff --git a/go/sqltypes/marshal.go b/go/sqltypes/marshal.go index 0406c0e3f55..96c24df5896 100644 --- a/go/sqltypes/marshal.go +++ b/go/sqltypes/marshal.go @@ -22,12 +22,12 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/vterrors" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/proto/vttime" ) // ResultMarshaller knows how to marshal itself into a Result. @@ -254,7 +254,7 @@ func fieldType(field reflect.StructField) (querypb.Type, error) { switch ptr.Kind() { case reflect.Struct: switch ptr.PkgPath() { - case "github.com/mdibaiee/vitess/go/vt/proto/vttime": + case "github.com/vitess/vitess/go/vt/proto/vttime": switch ptr.Name() { case "Time": typeName = "timestamp" @@ -280,7 +280,7 @@ func fieldType(field reflect.StructField) (querypb.Type, error) { } case reflect.Struct: switch field.Type.PkgPath() { - case "github.com/mdibaiee/vitess/go/vt/proto/vttime": + case "github.com/vitess/vitess/go/vt/proto/vttime": switch field.Type.Name() { case "Time": typeName = "timestamp" diff --git a/go/sqltypes/marshal_test.go b/go/sqltypes/marshal_test.go index 855165cbc24..6922470b854 100644 --- a/go/sqltypes/marshal_test.go +++ b/go/sqltypes/marshal_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topo/topoproto" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) type T1 struct { diff --git a/go/sqltypes/named_result.go b/go/sqltypes/named_result.go index ae7e51c3667..acfae656f5d 100644 --- a/go/sqltypes/named_result.go +++ b/go/sqltypes/named_result.go @@ -19,7 +19,7 @@ package sqltypes import ( "errors" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var ( diff --git a/go/sqltypes/named_result_test.go b/go/sqltypes/named_result_test.go index 7194c3398ab..96ed02d3e55 100644 --- a/go/sqltypes/named_result_test.go +++ b/go/sqltypes/named_result_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestToNamedResult(t *testing.T) { diff --git a/go/sqltypes/parse_rows.go b/go/sqltypes/parse_rows.go index 89411ae34b5..2c60a8503f1 100644 --- a/go/sqltypes/parse_rows.go +++ b/go/sqltypes/parse_rows.go @@ -24,7 +24,7 @@ import ( "strings" "text/scanner" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // ParseRows parses the output generated by fmt.Sprintf("#v", rows), and reifies the original []sqltypes.Row diff --git a/go/sqltypes/proto3.go b/go/sqltypes/proto3.go index c7d75dc7fc7..b2c95bebd91 100644 --- a/go/sqltypes/proto3.go +++ b/go/sqltypes/proto3.go @@ -19,9 +19,9 @@ package sqltypes import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // This file contains the proto3 conversion functions for the structures diff --git a/go/sqltypes/proto3_test.go b/go/sqltypes/proto3_test.go index 916c57208f6..830ab403028 100644 --- a/go/sqltypes/proto3_test.go +++ b/go/sqltypes/proto3_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) func TestResult(t *testing.T) { diff --git a/go/sqltypes/query_response.go b/go/sqltypes/query_response.go index 1d662d4726d..9273f5429dd 100644 --- a/go/sqltypes/query_response.go +++ b/go/sqltypes/query_response.go @@ -17,7 +17,7 @@ limitations under the License. package sqltypes import ( - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" ) // QueryResponse represents a query response for ExecuteBatch. diff --git a/go/sqltypes/result.go b/go/sqltypes/result.go index 6ff183014a0..d0a8a653950 100644 --- a/go/sqltypes/result.go +++ b/go/sqltypes/result.go @@ -23,7 +23,7 @@ import ( "google.golang.org/protobuf/proto" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // Result represents a query result. diff --git a/go/sqltypes/result_test.go b/go/sqltypes/result_test.go index 459707f4a41..41e0ad3cc87 100644 --- a/go/sqltypes/result_test.go +++ b/go/sqltypes/result_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestRepair(t *testing.T) { diff --git a/go/sqltypes/testing.go b/go/sqltypes/testing.go index 885eaa75b91..520e9948041 100644 --- a/go/sqltypes/testing.go +++ b/go/sqltypes/testing.go @@ -26,7 +26,7 @@ import ( "strings" "time" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // Functions in this file should only be used for testing. diff --git a/go/sqltypes/type.go b/go/sqltypes/type.go index 178b6a7b9b0..606ae67a6da 100644 --- a/go/sqltypes/type.go +++ b/go/sqltypes/type.go @@ -19,7 +19,7 @@ package sqltypes import ( "fmt" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) type Type = querypb.Type diff --git a/go/sqltypes/type_test.go b/go/sqltypes/type_test.go index b08a435f382..481255f22c1 100644 --- a/go/sqltypes/type_test.go +++ b/go/sqltypes/type_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestTypeValues(t *testing.T) { diff --git a/go/sqltypes/value.go b/go/sqltypes/value.go index faf55e4fe34..e3fc8df6342 100644 --- a/go/sqltypes/value.go +++ b/go/sqltypes/value.go @@ -30,14 +30,14 @@ import ( "google.golang.org/protobuf/encoding/protowire" - "github.com/mdibaiee/vitess/go/bytes2" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/mysql/fastparse" - "github.com/mdibaiee/vitess/go/mysql/format" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/bytes2" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/fastparse" + "github.com/vitess/vitess/go/mysql/format" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) var ( diff --git a/go/sqltypes/value_test.go b/go/sqltypes/value_test.go index aebfb33cc0b..eebd6417b08 100644 --- a/go/sqltypes/value_test.go +++ b/go/sqltypes/value_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/bytes2" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/bytes2" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) const ( diff --git a/go/stats/counter.go b/go/stats/counter.go index 081db06e140..9c6de951a93 100644 --- a/go/stats/counter.go +++ b/go/stats/counter.go @@ -22,7 +22,7 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/logutil" ) // logCounterNegative is for throttling adding a negative value to a counter messages in logs diff --git a/go/stats/export.go b/go/stats/export.go index 23337fc408b..3d72b615b08 100644 --- a/go/stats/export.go +++ b/go/stats/export.go @@ -39,7 +39,7 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/stats/opentsdb/backend.go b/go/stats/opentsdb/backend.go index ecf2a0aea83..64cdc30059a 100644 --- a/go/stats/opentsdb/backend.go +++ b/go/stats/opentsdb/backend.go @@ -19,7 +19,7 @@ package opentsdb import ( "time" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) // backend implements stats.PushBackend diff --git a/go/stats/opentsdb/backend_test.go b/go/stats/opentsdb/backend_test.go index df6f4d2e65c..d147023d358 100644 --- a/go/stats/opentsdb/backend_test.go +++ b/go/stats/opentsdb/backend_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) type mockWriter struct { diff --git a/go/stats/opentsdb/collector.go b/go/stats/opentsdb/collector.go index 8fd0c983af4..5ae3ef7b26d 100644 --- a/go/stats/opentsdb/collector.go +++ b/go/stats/opentsdb/collector.go @@ -22,7 +22,7 @@ import ( "strings" "unicode" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) // collector tracks state for a single pass of stats reporting / data collection. diff --git a/go/stats/opentsdb/flags.go b/go/stats/opentsdb/flags.go index 1fe69fd615e..26d08109ed5 100644 --- a/go/stats/opentsdb/flags.go +++ b/go/stats/opentsdb/flags.go @@ -19,7 +19,7 @@ package opentsdb import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/go/stats/opentsdb/init.go b/go/stats/opentsdb/init.go index b4c23c627bf..b1d8eeacc57 100644 --- a/go/stats/opentsdb/init.go +++ b/go/stats/opentsdb/init.go @@ -23,9 +23,9 @@ import ( "net/url" "sort" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" ) var singletonBackend stats.PushBackend diff --git a/go/stats/opentsdb/opentsdb_test.go b/go/stats/opentsdb/opentsdb_test.go index 156a0ef0ba3..9774a1acf69 100644 --- a/go/stats/opentsdb/opentsdb_test.go +++ b/go/stats/opentsdb/opentsdb_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) func TestFloatFunc(t *testing.T) { diff --git a/go/stats/prometheusbackend/collectors.go b/go/stats/prometheusbackend/collectors.go index 959ed1ee530..a502e7c549f 100644 --- a/go/stats/prometheusbackend/collectors.go +++ b/go/stats/prometheusbackend/collectors.go @@ -21,8 +21,8 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/log" ) type metricFuncCollector struct { diff --git a/go/stats/prometheusbackend/collectors_test.go b/go/stats/prometheusbackend/collectors_test.go index 2c7f19fe635..d5792f74ade 100644 --- a/go/stats/prometheusbackend/collectors_test.go +++ b/go/stats/prometheusbackend/collectors_test.go @@ -19,7 +19,7 @@ package prometheusbackend import ( "testing" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) func getStats() map[string]int64 { diff --git a/go/stats/prometheusbackend/prometheusbackend.go b/go/stats/prometheusbackend/prometheusbackend.go index aa95fc19fce..cb1821fe931 100644 --- a/go/stats/prometheusbackend/prometheusbackend.go +++ b/go/stats/prometheusbackend/prometheusbackend.go @@ -23,9 +23,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" ) // PromBackend implements PullBackend using Prometheus as the backing metrics storage. diff --git a/go/stats/prometheusbackend/prometheusbackend_test.go b/go/stats/prometheusbackend/prometheusbackend_test.go index ad39d9f5c60..2dc6f655347 100644 --- a/go/stats/prometheusbackend/prometheusbackend_test.go +++ b/go/stats/prometheusbackend/prometheusbackend_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/go/stats/statsd/statsd.go b/go/stats/statsd/statsd.go index 5a3ada2dad2..57db1bf0e68 100644 --- a/go/stats/statsd/statsd.go +++ b/go/stats/statsd/statsd.go @@ -11,9 +11,9 @@ import ( "github.com/DataDog/datadog-go/v5/statsd" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/go/stats/statsd/statsd_test.go b/go/stats/statsd/statsd_test.go index 62c49a2244d..20845a06d3a 100644 --- a/go/stats/statsd/statsd_test.go +++ b/go/stats/statsd/statsd_test.go @@ -11,7 +11,7 @@ import ( "github.com/DataDog/datadog-go/v5/statsd" "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) func getBackend(t *testing.T) (StatsBackend, *net.UDPConn) { diff --git a/go/streamlog/streamlog.go b/go/streamlog/streamlog.go index ccdfb46cb26..eb0ca1e3aa1 100644 --- a/go/streamlog/streamlog.go +++ b/go/streamlog/streamlog.go @@ -29,10 +29,10 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/go/streamlog/streamlog_test.go b/go/streamlog/streamlog_test.go index 5be6ef4217e..5962c9f3201 100644 --- a/go/streamlog/streamlog_test.go +++ b/go/streamlog/streamlog_test.go @@ -33,7 +33,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/servenv" ) type logMessage struct { diff --git a/go/streamlog/streamlog_windows.go b/go/streamlog/streamlog_windows.go index 76eb8ba56fb..4e8391cfdcb 100644 --- a/go/streamlog/streamlog_windows.go +++ b/go/streamlog/streamlog_windows.go @@ -21,7 +21,7 @@ package streamlog import ( "os" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) func setupRotate(ch chan os.Signal) { diff --git a/go/sync2/consolidator.go b/go/sync2/consolidator.go index 5a20a2e0ec3..bb5467416f8 100644 --- a/go/sync2/consolidator.go +++ b/go/sync2/consolidator.go @@ -20,8 +20,8 @@ import ( "sync" "sync/atomic" - "github.com/mdibaiee/vitess/go/cache" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/cache" + "github.com/vitess/vitess/go/sqltypes" ) // Consolidator consolidates duplicate queries from executing simulaneously diff --git a/go/sync2/consolidator_test.go b/go/sync2/consolidator_test.go index b1251bd4efe..31c8c1ffad7 100644 --- a/go/sync2/consolidator_test.go +++ b/go/sync2/consolidator_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) func TestConsolidator(t *testing.T) { diff --git a/go/sync2/fake_consolidator.go b/go/sync2/fake_consolidator.go index 4892d0ff85e..3f66449ca48 100644 --- a/go/sync2/fake_consolidator.go +++ b/go/sync2/fake_consolidator.go @@ -17,7 +17,7 @@ limitations under the License. package sync2 import ( - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) // FakeConsolidator satisfies the Consolidator interface and can be used to mock diff --git a/go/test/endtoend/backup/mysqlctld/backup_mysqlctld_test.go b/go/test/endtoend/backup/mysqlctld/backup_mysqlctld_test.go index 3b9e43783ff..817bdfbc8bd 100644 --- a/go/test/endtoend/backup/mysqlctld/backup_mysqlctld_test.go +++ b/go/test/endtoend/backup/mysqlctld/backup_mysqlctld_test.go @@ -19,9 +19,9 @@ package mysqlctld import ( "testing" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl" - backup "github.com/mdibaiee/vitess/go/test/endtoend/backup/vtctlbackup" + backup "github.com/vitess/vitess/go/test/endtoend/backup/vtctlbackup" ) // TestBackupMysqlctld - tests the backup using mysqlctld. diff --git a/go/test/endtoend/backup/pitr/backup_pitr_test.go b/go/test/endtoend/backup/pitr/backup_pitr_test.go index 5141f84e83f..255886367f3 100644 --- a/go/test/endtoend/backup/pitr/backup_pitr_test.go +++ b/go/test/endtoend/backup/pitr/backup_pitr_test.go @@ -19,7 +19,7 @@ package mysqlctld import ( "testing" - backup "github.com/mdibaiee/vitess/go/test/endtoend/backup/vtctlbackup" + backup "github.com/vitess/vitess/go/test/endtoend/backup/vtctlbackup" ) // TestIncrementalBackupAndRestoreToPos - tests incremental backups and restores. diff --git a/go/test/endtoend/backup/pitr_xtrabackup/backup_pitr_xtrabackup_test.go b/go/test/endtoend/backup/pitr_xtrabackup/backup_pitr_xtrabackup_test.go index 2e9526811d8..ec76d50caef 100644 --- a/go/test/endtoend/backup/pitr_xtrabackup/backup_pitr_xtrabackup_test.go +++ b/go/test/endtoend/backup/pitr_xtrabackup/backup_pitr_xtrabackup_test.go @@ -19,7 +19,7 @@ package mysqlctld import ( "testing" - backup "github.com/mdibaiee/vitess/go/test/endtoend/backup/vtctlbackup" + backup "github.com/vitess/vitess/go/test/endtoend/backup/vtctlbackup" ) // TestIncrementalBackupAndRestoreToPos diff --git a/go/test/endtoend/backup/vtbackup/backup_only_test.go b/go/test/endtoend/backup/vtbackup/backup_only_test.go index 4e3ec7eb3c0..41b4f4763ff 100644 --- a/go/test/endtoend/backup/vtbackup/backup_only_test.go +++ b/go/test/endtoend/backup/vtbackup/backup_only_test.go @@ -31,11 +31,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/stats/opentsdb" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/stats/opentsdb" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl" ) var ( diff --git a/go/test/endtoend/backup/vtbackup/main_test.go b/go/test/endtoend/backup/vtbackup/main_test.go index 2bae5d4ffdb..484feeca8d1 100644 --- a/go/test/endtoend/backup/vtbackup/main_test.go +++ b/go/test/endtoend/backup/vtbackup/main_test.go @@ -24,9 +24,9 @@ import ( "path" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/test/endtoend/backup/vtctlbackup/backup_test.go b/go/test/endtoend/backup/vtctlbackup/backup_test.go index 15a9089ab04..47e4d46c253 100644 --- a/go/test/endtoend/backup/vtctlbackup/backup_test.go +++ b/go/test/endtoend/backup/vtctlbackup/backup_test.go @@ -19,7 +19,7 @@ package vtctlbackup import ( "testing" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl" ) // TestBuiltinBackup - main tests backup using vtctl commands diff --git a/go/test/endtoend/backup/vtctlbackup/backup_utils.go b/go/test/endtoend/backup/vtctlbackup/backup_utils.go index de79d873932..db344dd88ae 100644 --- a/go/test/endtoend/backup/vtctlbackup/backup_utils.go +++ b/go/test/endtoend/backup/vtctlbackup/backup_utils.go @@ -34,19 +34,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) // constants for test variants diff --git a/go/test/endtoend/backup/vtctlbackup/pitr_test_framework.go b/go/test/endtoend/backup/vtctlbackup/pitr_test_framework.go index bf4e6f3ae7a..5345975a4e6 100644 --- a/go/test/endtoend/backup/vtctlbackup/pitr_test_framework.go +++ b/go/test/endtoend/backup/vtctlbackup/pitr_test_framework.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/mysqlctl" ) var ( diff --git a/go/test/endtoend/backup/xtrabackup/xtrabackup_test.go b/go/test/endtoend/backup/xtrabackup/xtrabackup_test.go index ad3f1395a9e..09dd662162f 100644 --- a/go/test/endtoend/backup/xtrabackup/xtrabackup_test.go +++ b/go/test/endtoend/backup/xtrabackup/xtrabackup_test.go @@ -19,9 +19,9 @@ package vtctlbackup import ( "testing" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl" - backup "github.com/mdibaiee/vitess/go/test/endtoend/backup/vtctlbackup" + backup "github.com/vitess/vitess/go/test/endtoend/backup/vtctlbackup" ) // TestXtraBackup - tests the backup using xtrabackup diff --git a/go/test/endtoend/backup/xtrabackupstream/xtrabackup_stream_test.go b/go/test/endtoend/backup/xtrabackupstream/xtrabackup_stream_test.go index aecd9082b11..cc59cb4c12e 100644 --- a/go/test/endtoend/backup/xtrabackupstream/xtrabackup_stream_test.go +++ b/go/test/endtoend/backup/xtrabackupstream/xtrabackup_stream_test.go @@ -19,9 +19,9 @@ package vtctlbackup import ( "testing" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl" - backup "github.com/mdibaiee/vitess/go/test/endtoend/backup/vtctlbackup" + backup "github.com/vitess/vitess/go/test/endtoend/backup/vtctlbackup" ) // TestXtrabackupStream - tests the backup using xtrabackup with xbstream mode diff --git a/go/test/endtoend/cellalias/cell_alias_test.go b/go/test/endtoend/cellalias/cell_alias_test.go index 0444b673d30..fedd52ff559 100644 --- a/go/test/endtoend/cellalias/cell_alias_test.go +++ b/go/test/endtoend/cellalias/cell_alias_test.go @@ -33,8 +33,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/test/endtoend/cluster/cluster_process.go b/go/test/endtoend/cluster/cluster_process.go index 105b904a326..feb11804b5c 100644 --- a/go/test/endtoend/cluster/cluster_process.go +++ b/go/test/endtoend/cluster/cluster_process.go @@ -37,25 +37,25 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/syscallutil" - "github.com/mdibaiee/vitess/go/test/endtoend/filelock" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/syscallutil" + "github.com/vitess/vitess/go/test/endtoend/filelock" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" // Ensure dialers are registered (needed by ExecOnTablet and ExecOnVTGate). - _ "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateconn" - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctabletconn" + _ "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateconn" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctabletconn" ) // DefaultCell : If no cell name is passed, then use following diff --git a/go/test/endtoend/cluster/cluster_util.go b/go/test/endtoend/cluster/cluster_util.go index dc09f718e53..fbc96e52d4b 100644 --- a/go/test/endtoend/cluster/cluster_util.go +++ b/go/test/endtoend/cluster/cluster_util.go @@ -28,19 +28,19 @@ import ( "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateconn" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateconn" "github.com/buger/jsonparser" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - tmc "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmclient" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + tmc "github.com/vitess/vitess/go/vt/vttablet/grpctmclient" ) var ( diff --git a/go/test/endtoend/cluster/mysqlctl_process.go b/go/test/endtoend/cluster/mysqlctl_process.go index 1b84bdf5ebd..96f15e17d04 100644 --- a/go/test/endtoend/cluster/mysqlctl_process.go +++ b/go/test/endtoend/cluster/mysqlctl_process.go @@ -29,11 +29,11 @@ import ( "github.com/google/safehtml/template" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/syscallutil" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/tlstest" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/syscallutil" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/tlstest" ) // MysqlctlProcess is a generic handle for a running mysqlctl command . diff --git a/go/test/endtoend/cluster/mysqlctld_process.go b/go/test/endtoend/cluster/mysqlctld_process.go index 295ed5d024a..f0dd7ff03fe 100644 --- a/go/test/endtoend/cluster/mysqlctld_process.go +++ b/go/test/endtoend/cluster/mysqlctld_process.go @@ -25,8 +25,8 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/log" ) // MysqlctldProcess is a generic handle for a running mysqlctld command . diff --git a/go/test/endtoend/cluster/topo_process.go b/go/test/endtoend/cluster/topo_process.go index ace4af722f8..b42c39fcc72 100644 --- a/go/test/endtoend/cluster/topo_process.go +++ b/go/test/endtoend/cluster/topo_process.go @@ -31,13 +31,13 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" - "github.com/mdibaiee/vitess/go/vt/log" - vtopo "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/log" + vtopo "github.com/vitess/vitess/go/vt/topo" // Register topo server implementations - _ "github.com/mdibaiee/vitess/go/vt/topo/consultopo" - _ "github.com/mdibaiee/vitess/go/vt/topo/etcd2topo" - _ "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + _ "github.com/vitess/vitess/go/vt/topo/consultopo" + _ "github.com/vitess/vitess/go/vt/topo/etcd2topo" + _ "github.com/vitess/vitess/go/vt/topo/zk2topo" ) // TopoProcess is a generic handle for a running Topo service . diff --git a/go/test/endtoend/cluster/vtbackup_process.go b/go/test/endtoend/cluster/vtbackup_process.go index c08653d0a88..a02b6689afd 100644 --- a/go/test/endtoend/cluster/vtbackup_process.go +++ b/go/test/endtoend/cluster/vtbackup_process.go @@ -25,7 +25,7 @@ import ( "syscall" "time" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // VtbackupProcess is a generic handle for a running Vtbackup. diff --git a/go/test/endtoend/cluster/vtctl_process.go b/go/test/endtoend/cluster/vtctl_process.go index faa4db80aca..f4603c79a6e 100644 --- a/go/test/endtoend/cluster/vtctl_process.go +++ b/go/test/endtoend/cluster/vtctl_process.go @@ -21,7 +21,7 @@ import ( "os/exec" "strings" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // VtctlProcess is a generic handle for a running vtctl command . diff --git a/go/test/endtoend/cluster/vtctlclient_process.go b/go/test/endtoend/cluster/vtctlclient_process.go index cd609b3416f..8b3f31dacb1 100644 --- a/go/test/endtoend/cluster/vtctlclient_process.go +++ b/go/test/endtoend/cluster/vtctlclient_process.go @@ -22,9 +22,9 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // VtctlClientProcess is a generic handle for a running vtctlclient command . diff --git a/go/test/endtoend/cluster/vtctld_process.go b/go/test/endtoend/cluster/vtctld_process.go index 20a3014220b..a915d252dcc 100644 --- a/go/test/endtoend/cluster/vtctld_process.go +++ b/go/test/endtoend/cluster/vtctld_process.go @@ -26,7 +26,7 @@ import ( "syscall" "time" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // VtctldProcess is a generic handle for a running vtctld . diff --git a/go/test/endtoend/cluster/vtctldclient_process.go b/go/test/endtoend/cluster/vtctldclient_process.go index d44486c702e..ea7745205e3 100644 --- a/go/test/endtoend/cluster/vtctldclient_process.go +++ b/go/test/endtoend/cluster/vtctldclient_process.go @@ -22,14 +22,14 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vterrors" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // VtctldClientProcess is a generic handle for a running vtctldclient command . diff --git a/go/test/endtoend/cluster/vtgate_process.go b/go/test/endtoend/cluster/vtgate_process.go index 2375752d1a1..a33255867da 100644 --- a/go/test/endtoend/cluster/vtgate_process.go +++ b/go/test/endtoend/cluster/vtgate_process.go @@ -30,10 +30,10 @@ import ( "syscall" "time" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) // VtgateProcess is a generic handle for a running vtgate . diff --git a/go/test/endtoend/cluster/vtorc_process.go b/go/test/endtoend/cluster/vtorc_process.go index 0cfc2c959e6..90131540f93 100644 --- a/go/test/endtoend/cluster/vtorc_process.go +++ b/go/test/endtoend/cluster/vtorc_process.go @@ -30,7 +30,7 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // VTOrcProcess is a test struct for running diff --git a/go/test/endtoend/cluster/vttablet_process.go b/go/test/endtoend/cluster/vttablet_process.go index af53fcfe17e..21558463019 100644 --- a/go/test/endtoend/cluster/vttablet_process.go +++ b/go/test/endtoend/cluster/vttablet_process.go @@ -35,11 +35,11 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" ) const vttabletStateTimeout = 60 * time.Second diff --git a/go/test/endtoend/clustertest/add_keyspace_test.go b/go/test/endtoend/clustertest/add_keyspace_test.go index 6458cdefa89..faee6bd6386 100644 --- a/go/test/endtoend/clustertest/add_keyspace_test.go +++ b/go/test/endtoend/clustertest/add_keyspace_test.go @@ -23,12 +23,12 @@ import ( "fmt" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/clustertest/etcd_test.go b/go/test/endtoend/clustertest/etcd_test.go index c7c67d826fa..e84d4ab436b 100644 --- a/go/test/endtoend/clustertest/etcd_test.go +++ b/go/test/endtoend/clustertest/etcd_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" clientv3 "go.etcd.io/etcd/client/v3" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) func TestEtcdServer(t *testing.T) { diff --git a/go/test/endtoend/clustertest/main_test.go b/go/test/endtoend/clustertest/main_test.go index 511582a453d..d1bc8af1998 100644 --- a/go/test/endtoend/clustertest/main_test.go +++ b/go/test/endtoend/clustertest/main_test.go @@ -22,8 +22,8 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/clustertest/vtctld_test.go b/go/test/endtoend/clustertest/vtctld_test.go index cd38b085520..9c73740e8e2 100644 --- a/go/test/endtoend/clustertest/vtctld_test.go +++ b/go/test/endtoend/clustertest/vtctld_test.go @@ -26,12 +26,12 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/clustertest/vtgate_test.go b/go/test/endtoend/clustertest/vtgate_test.go index da92ccf1e4f..b2458591f29 100644 --- a/go/test/endtoend/clustertest/vtgate_test.go +++ b/go/test/endtoend/clustertest/vtgate_test.go @@ -27,12 +27,12 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) func TestVtgateProcess(t *testing.T) { diff --git a/go/test/endtoend/clustertest/vttablet_test.go b/go/test/endtoend/clustertest/vttablet_test.go index 59d44f2b136..f0b19cca77e 100644 --- a/go/test/endtoend/clustertest/vttablet_test.go +++ b/go/test/endtoend/clustertest/vttablet_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) func TestVttabletProcess(t *testing.T) { diff --git a/go/test/endtoend/docker/vttestserver.go b/go/test/endtoend/docker/vttestserver.go index 7686633a83d..46157bc703f 100644 --- a/go/test/endtoend/docker/vttestserver.go +++ b/go/test/endtoend/docker/vttestserver.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) const ( diff --git a/go/test/endtoend/docker/vttestserver_test.go b/go/test/endtoend/docker/vttestserver_test.go index 276a5783413..fa1fd8206e0 100644 --- a/go/test/endtoend/docker/vttestserver_test.go +++ b/go/test/endtoend/docker/vttestserver_test.go @@ -22,10 +22,10 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" "github.com/stretchr/testify/require" ) diff --git a/go/test/endtoend/encryption/encryptedreplication/encrypted_replication_test.go b/go/test/endtoend/encryption/encryptedreplication/encrypted_replication_test.go index 39761553efe..90a921d0d91 100644 --- a/go/test/endtoend/encryption/encryptedreplication/encrypted_replication_test.go +++ b/go/test/endtoend/encryption/encryptedreplication/encrypted_replication_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/encryption" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/encryption" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/test/endtoend/encryption/encryptedtransport/encrypted_transport_test.go b/go/test/endtoend/encryption/encryptedtransport/encrypted_transport_test.go index ddfcb0d998f..e9c5b1787df 100644 --- a/go/test/endtoend/encryption/encryptedtransport/encrypted_transport_test.go +++ b/go/test/endtoend/encryption/encryptedtransport/encrypted_transport_test.go @@ -65,21 +65,21 @@ import ( "github.com/pkg/errors" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/test/endtoend/encryption" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/test/endtoend/encryption" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtgateservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtgateservice" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/log" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtgateservicepb "github.com/vitess/vitess/go/vt/proto/vtgateservice" ) var ( diff --git a/go/test/endtoend/keyspace/keyspace_test.go b/go/test/endtoend/keyspace/keyspace_test.go index 71f0c0634c2..661cc5fe777 100644 --- a/go/test/endtoend/keyspace/keyspace_test.go +++ b/go/test/endtoend/keyspace/keyspace_test.go @@ -25,13 +25,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/test/endtoend/messaging/main_test.go b/go/test/endtoend/messaging/main_test.go index 047edf8acab..5455a3eb3a4 100644 --- a/go/test/endtoend/messaging/main_test.go +++ b/go/test/endtoend/messaging/main_test.go @@ -22,8 +22,8 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - _ "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateconn" + "github.com/vitess/vitess/go/test/endtoend/cluster" + _ "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateconn" ) var ( diff --git a/go/test/endtoend/messaging/message_test.go b/go/test/endtoend/messaging/message_test.go index 1f7cd0a97e1..3a485627c3e 100644 --- a/go/test/endtoend/messaging/message_test.go +++ b/go/test/endtoend/messaging/message_test.go @@ -28,17 +28,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - cmp "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" + cmp "github.com/vitess/vitess/go/test/utils" ) var testMessage = "{\"message\": \"hello world\"}" diff --git a/go/test/endtoend/migration/migration_test.go b/go/test/endtoend/migration/migration_test.go index 992c4cd4afe..df75ecd66d4 100644 --- a/go/test/endtoend/migration/migration_test.go +++ b/go/test/endtoend/migration/migration_test.go @@ -29,11 +29,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) var ( @@ -112,7 +112,7 @@ take a yaml config that defines these external sources. it will look like this: externalConnections: product: - socket: /home/sougou/dev/src/github.com/mdibaiee/vitess/vtdataroot/vtroot_15201/vt_0000000622/mysql.sock + socket: /home/sougou/dev/src/github.com/vitess/vitess/vtdataroot/vtroot_15201/vt_0000000622/mysql.sock dbName: vt_product app: user: vt_app @@ -120,7 +120,7 @@ externalConnections: user: vt_dba customer: flavor: FilePos - socket: /home/sougou/dev/src/github.com/mdibaiee/vitess/vtdataroot/vtroot_15201/vt_0000000620/mysql.sock + socket: /home/sougou/dev/src/github.com/vitess/vitess/vtdataroot/vtroot_15201/vt_0000000620/mysql.sock dbName: vt_customer app: user: vt_app diff --git a/go/test/endtoend/mysqlctl/mysqlctl_test.go b/go/test/endtoend/mysqlctl/mysqlctl_test.go index 6f264c4d6c8..0b805d03db4 100644 --- a/go/test/endtoend/mysqlctl/mysqlctl_test.go +++ b/go/test/endtoend/mysqlctl/mysqlctl_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/mysqlctld/mysqlctld_test.go b/go/test/endtoend/mysqlctld/mysqlctld_test.go index d8b9c690f35..7f27515c67c 100644 --- a/go/test/endtoend/mysqlctld/mysqlctld_test.go +++ b/go/test/endtoend/mysqlctld/mysqlctld_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/mysqlctlclient" - "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/vt/mysqlctl/mysqlctlclient" + "github.com/vitess/vitess/go/vt/proto/mysqlctl" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/mysqlserver/main_test.go b/go/test/endtoend/mysqlserver/main_test.go index 2b80bc22e35..365f2630436 100644 --- a/go/test/endtoend/mysqlserver/main_test.go +++ b/go/test/endtoend/mysqlserver/main_test.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/mysqlserver/mysql_server_test.go b/go/test/endtoend/mysqlserver/mysql_server_test.go index 687953697f0..45a71fc5444 100644 --- a/go/test/endtoend/mysqlserver/mysql_server_test.go +++ b/go/test/endtoend/mysqlserver/mysql_server_test.go @@ -32,10 +32,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" _ "github.com/go-sql-driver/mysql" ) diff --git a/go/test/endtoend/onlineddl/exec_util.go b/go/test/endtoend/onlineddl/exec_util.go index 92ab3adc368..dccfd9c7cee 100644 --- a/go/test/endtoend/onlineddl/exec_util.go +++ b/go/test/endtoend/onlineddl/exec_util.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" ) // CreateTempScript creates a script in the temporary directory with given content diff --git a/go/test/endtoend/onlineddl/flow/onlineddl_flow_test.go b/go/test/endtoend/onlineddl/flow/onlineddl_flow_test.go index 8ac2f7e1a50..9ea1081b5d0 100644 --- a/go/test/endtoend/onlineddl/flow/onlineddl_flow_test.go +++ b/go/test/endtoend/onlineddl/flow/onlineddl_flow_test.go @@ -57,15 +57,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/onlineddl" - "github.com/mdibaiee/vitess/go/test/endtoend/throttler" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet" - throttlebase "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/base" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/onlineddl" + "github.com/vitess/vitess/go/test/endtoend/throttler" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/vttablet" + throttlebase "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/base" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" ) var ( diff --git a/go/test/endtoend/onlineddl/query_util.go b/go/test/endtoend/onlineddl/query_util.go index 1258cb6f661..78326ba1c28 100644 --- a/go/test/endtoend/onlineddl/query_util.go +++ b/go/test/endtoend/onlineddl/query_util.go @@ -20,7 +20,7 @@ import ( "io" "strings" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" "github.com/olekukonko/tablewriter" ) diff --git a/go/test/endtoend/onlineddl/revert/onlineddl_revert_test.go b/go/test/endtoend/onlineddl/revert/onlineddl_revert_test.go index f1a65bd26b6..15e9944995c 100644 --- a/go/test/endtoend/onlineddl/revert/onlineddl_revert_test.go +++ b/go/test/endtoend/onlineddl/revert/onlineddl_revert_test.go @@ -29,14 +29,14 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/schema" - - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/onlineddl" - "github.com/mdibaiee/vitess/go/test/endtoend/throttler" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/schema" + + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/onlineddl" + "github.com/vitess/vitess/go/test/endtoend/throttler" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/go/test/endtoend/onlineddl/scheduler/onlineddl_scheduler_test.go b/go/test/endtoend/onlineddl/scheduler/onlineddl_scheduler_test.go index c5a2d7d7391..41775552aaa 100644 --- a/go/test/endtoend/onlineddl/scheduler/onlineddl_scheduler_test.go +++ b/go/test/endtoend/onlineddl/scheduler/onlineddl_scheduler_test.go @@ -30,17 +30,17 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/onlineddl" - "github.com/mdibaiee/vitess/go/test/endtoend/throttler" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/onlineddl" + "github.com/vitess/vitess/go/test/endtoend/throttler" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/go/test/endtoend/onlineddl/vrepl/onlineddl_vrepl_test.go b/go/test/endtoend/onlineddl/vrepl/onlineddl_vrepl_test.go index afd7b03c45d..7d650f977fb 100644 --- a/go/test/endtoend/onlineddl/vrepl/onlineddl_vrepl_test.go +++ b/go/test/endtoend/onlineddl/vrepl/onlineddl_vrepl_test.go @@ -29,15 +29,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/onlineddl" - "github.com/mdibaiee/vitess/go/test/endtoend/throttler" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/onlineddl" + "github.com/vitess/vitess/go/test/endtoend/throttler" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) var ( diff --git a/go/test/endtoend/onlineddl/vrepl_stress/onlineddl_vrepl_mini_stress_test.go b/go/test/endtoend/onlineddl/vrepl_stress/onlineddl_vrepl_mini_stress_test.go index 34e1c592de0..895dc53d1f7 100644 --- a/go/test/endtoend/onlineddl/vrepl_stress/onlineddl_vrepl_mini_stress_test.go +++ b/go/test/endtoend/onlineddl/vrepl_stress/onlineddl_vrepl_mini_stress_test.go @@ -32,13 +32,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/onlineddl" - "github.com/mdibaiee/vitess/go/test/endtoend/throttler" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/onlineddl" + "github.com/vitess/vitess/go/test/endtoend/throttler" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/vttablet" ) type WriteMetrics struct { diff --git a/go/test/endtoend/onlineddl/vrepl_stress_suite/onlineddl_vrepl_stress_suite_test.go b/go/test/endtoend/onlineddl/vrepl_stress_suite/onlineddl_vrepl_stress_suite_test.go index 8bbdf2721ca..6cce35a0de3 100644 --- a/go/test/endtoend/onlineddl/vrepl_stress_suite/onlineddl_vrepl_stress_suite_test.go +++ b/go/test/endtoend/onlineddl/vrepl_stress_suite/onlineddl_vrepl_stress_suite_test.go @@ -43,15 +43,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/onlineddl" - "github.com/mdibaiee/vitess/go/test/endtoend/throttler" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/onlineddl" + "github.com/vitess/vitess/go/test/endtoend/throttler" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/vttablet" ) type testcase struct { diff --git a/go/test/endtoend/onlineddl/vrepl_suite/onlineddl_vrepl_suite_test.go b/go/test/endtoend/onlineddl/vrepl_suite/onlineddl_vrepl_suite_test.go index a349a3f3de2..75920150c1a 100644 --- a/go/test/endtoend/onlineddl/vrepl_suite/onlineddl_vrepl_suite_test.go +++ b/go/test/endtoend/onlineddl/vrepl_suite/onlineddl_vrepl_suite_test.go @@ -27,15 +27,15 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/config" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/onlineddl" - "github.com/mdibaiee/vitess/go/test/endtoend/throttler" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/config" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/onlineddl" + "github.com/vitess/vitess/go/test/endtoend/throttler" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/go/test/endtoend/onlineddl/vtctlutil.go b/go/test/endtoend/onlineddl/vtctlutil.go index 7204eda29eb..1644e833725 100644 --- a/go/test/endtoend/onlineddl/vtctlutil.go +++ b/go/test/endtoend/onlineddl/vtctlutil.go @@ -19,7 +19,7 @@ package onlineddl import ( "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" "github.com/stretchr/testify/assert" ) diff --git a/go/test/endtoend/onlineddl/vtgate_util.go b/go/test/endtoend/onlineddl/vtgate_util.go index fa8a25e1ba7..ffbd6476e95 100644 --- a/go/test/endtoend/onlineddl/vtgate_util.go +++ b/go/test/endtoend/onlineddl/vtgate_util.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/go/test/endtoend/onlineddl/vttablet_util.go b/go/test/endtoend/onlineddl/vttablet_util.go index 32962b30aed..e0a24e74783 100644 --- a/go/test/endtoend/onlineddl/vttablet_util.go +++ b/go/test/endtoend/onlineddl/vttablet_util.go @@ -20,11 +20,11 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/go/test/endtoend/preparestmt/main_test.go b/go/test/endtoend/preparestmt/main_test.go index f3e32f5c35a..9bac2e4346a 100644 --- a/go/test/endtoend/preparestmt/main_test.go +++ b/go/test/endtoend/preparestmt/main_test.go @@ -28,7 +28,7 @@ import ( "github.com/go-sql-driver/mysql" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) // tableData is a temporary structure to hold selected data. diff --git a/go/test/endtoend/preparestmt/stmt_methods_test.go b/go/test/endtoend/preparestmt/stmt_methods_test.go index 10a0ba34417..b06a68237b3 100644 --- a/go/test/endtoend/preparestmt/stmt_methods_test.go +++ b/go/test/endtoend/preparestmt/stmt_methods_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) // TestSelect simple select the data without any condition. diff --git a/go/test/endtoend/recovery/pitr/binlog_server.go b/go/test/endtoend/recovery/pitr/binlog_server.go index d6757d268ba..0c26b6bb1ea 100644 --- a/go/test/endtoend/recovery/pitr/binlog_server.go +++ b/go/test/endtoend/recovery/pitr/binlog_server.go @@ -25,7 +25,7 @@ import ( "syscall" "time" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) const ( diff --git a/go/test/endtoend/recovery/pitr/shardedpitr_test.go b/go/test/endtoend/recovery/pitr/shardedpitr_test.go index 6bfdd4fd097..e0f4801b4aa 100644 --- a/go/test/endtoend/recovery/pitr/shardedpitr_test.go +++ b/go/test/endtoend/recovery/pitr/shardedpitr_test.go @@ -29,14 +29,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/log" - - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/vt/log" + + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/test/endtoend/recovery/recovery_util.go b/go/test/endtoend/recovery/recovery_util.go index 5ebd8f6a6ed..744df3385b0 100644 --- a/go/test/endtoend/recovery/recovery_util.go +++ b/go/test/endtoend/recovery/recovery_util.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" ) var ( diff --git a/go/test/endtoend/recovery/unshardedrecovery/recovery.go b/go/test/endtoend/recovery/unshardedrecovery/recovery.go index ba675715409..3d0f7d05d27 100644 --- a/go/test/endtoend/recovery/unshardedrecovery/recovery.go +++ b/go/test/endtoend/recovery/unshardedrecovery/recovery.go @@ -29,11 +29,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/recovery" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/recovery" + "github.com/vitess/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" ) var ( diff --git a/go/test/endtoend/recovery/unshardedrecovery/recovery_test.go b/go/test/endtoend/recovery/unshardedrecovery/recovery_test.go index 03443d010c5..a1c14db131e 100644 --- a/go/test/endtoend/recovery/unshardedrecovery/recovery_test.go +++ b/go/test/endtoend/recovery/unshardedrecovery/recovery_test.go @@ -19,7 +19,7 @@ package unshardedrecovery import ( "testing" - _ "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateconn" + _ "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateconn" ) func TestMain(m *testing.M) { diff --git a/go/test/endtoend/recovery/xtrabackup/recovery_test.go b/go/test/endtoend/recovery/xtrabackup/recovery_test.go index b314ab99b4f..5a962691947 100644 --- a/go/test/endtoend/recovery/xtrabackup/recovery_test.go +++ b/go/test/endtoend/recovery/xtrabackup/recovery_test.go @@ -19,9 +19,9 @@ package xtrabackup import ( "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/recovery" - "github.com/mdibaiee/vitess/go/test/endtoend/recovery/unshardedrecovery" - _ "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateconn" + "github.com/vitess/vitess/go/test/endtoend/recovery" + "github.com/vitess/vitess/go/test/endtoend/recovery/unshardedrecovery" + _ "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateconn" ) func TestMain(m *testing.M) { diff --git a/go/test/endtoend/reparent/emergencyreparent/ers_test.go b/go/test/endtoend/reparent/emergencyreparent/ers_test.go index 4378e2b341d..e4b72c14869 100644 --- a/go/test/endtoend/reparent/emergencyreparent/ers_test.go +++ b/go/test/endtoend/reparent/emergencyreparent/ers_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/reparent/utils" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/reparent/utils" + "github.com/vitess/vitess/go/vt/log" ) func TestTrivialERS(t *testing.T) { diff --git a/go/test/endtoend/reparent/newfeaturetest/reparent_test.go b/go/test/endtoend/reparent/newfeaturetest/reparent_test.go index c1abb645274..5ec8a817b45 100644 --- a/go/test/endtoend/reparent/newfeaturetest/reparent_test.go +++ b/go/test/endtoend/reparent/newfeaturetest/reparent_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/reparent/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/reparent/utils" ) // TestRecoverWithMultipleVttabletFailures tests that ERS succeeds with the default values diff --git a/go/test/endtoend/reparent/plannedreparent/reparent_range_based_test.go b/go/test/endtoend/reparent/plannedreparent/reparent_range_based_test.go index 5334a974d21..5ea3669c6b9 100644 --- a/go/test/endtoend/reparent/plannedreparent/reparent_range_based_test.go +++ b/go/test/endtoend/reparent/plannedreparent/reparent_range_based_test.go @@ -20,11 +20,11 @@ import ( "context" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/reparent/utils" + "github.com/vitess/vitess/go/test/endtoend/reparent/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) func TestReparentGracefulRangeBased(t *testing.T) { diff --git a/go/test/endtoend/reparent/plannedreparent/reparent_test.go b/go/test/endtoend/reparent/plannedreparent/reparent_test.go index 44b6386c120..0eeadcf3ac3 100644 --- a/go/test/endtoend/reparent/plannedreparent/reparent_test.go +++ b/go/test/endtoend/reparent/plannedreparent/reparent_test.go @@ -28,11 +28,11 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/encoding/protojson" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/reparent/utils" - "github.com/mdibaiee/vitess/go/vt/log" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/reparent/utils" + "github.com/vitess/vitess/go/vt/log" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" ) func TestPrimaryToSpareStateChangeImpossible(t *testing.T) { diff --git a/go/test/endtoend/reparent/prscomplex/main_test.go b/go/test/endtoend/reparent/prscomplex/main_test.go index dc2d70c450d..7bc5d2b2728 100644 --- a/go/test/endtoend/reparent/prscomplex/main_test.go +++ b/go/test/endtoend/reparent/prscomplex/main_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - rutils "github.com/mdibaiee/vitess/go/test/endtoend/reparent/utils" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + rutils "github.com/vitess/vitess/go/test/endtoend/reparent/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" ) var ( diff --git a/go/test/endtoend/reparent/prssettingspool/main_test.go b/go/test/endtoend/reparent/prssettingspool/main_test.go index 32e7f4e4392..a42da1fe615 100644 --- a/go/test/endtoend/reparent/prssettingspool/main_test.go +++ b/go/test/endtoend/reparent/prssettingspool/main_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - rutils "github.com/mdibaiee/vitess/go/test/endtoend/reparent/utils" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + rutils "github.com/vitess/vitess/go/test/endtoend/reparent/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" ) var ( diff --git a/go/test/endtoend/reparent/utils/utils.go b/go/test/endtoend/reparent/utils/utils.go index 7c186f6ef85..32bf0d1815c 100644 --- a/go/test/endtoend/reparent/utils/utils.go +++ b/go/test/endtoend/reparent/utils/utils.go @@ -31,14 +31,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/log" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/log" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/test/endtoend/schemadiff/vrepl/schemadiff_vrepl_suite_test.go b/go/test/endtoend/schemadiff/vrepl/schemadiff_vrepl_suite_test.go index b822111d250..2a99caf6d0b 100644 --- a/go/test/endtoend/schemadiff/vrepl/schemadiff_vrepl_suite_test.go +++ b/go/test/endtoend/schemadiff/vrepl/schemadiff_vrepl_suite_test.go @@ -30,13 +30,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/onlineddl" - "github.com/mdibaiee/vitess/go/test/endtoend/throttler" - "github.com/mdibaiee/vitess/go/vt/schemadiff" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/onlineddl" + "github.com/vitess/vitess/go/test/endtoend/throttler" + "github.com/vitess/vitess/go/vt/schemadiff" + "github.com/vitess/vitess/go/vt/sqlparser" ) var ( diff --git a/go/test/endtoend/sharded/sharded_keyspace_test.go b/go/test/endtoend/sharded/sharded_keyspace_test.go index 6ec744b4ed5..922a12ea76b 100644 --- a/go/test/endtoend/sharded/sharded_keyspace_test.go +++ b/go/test/endtoend/sharded/sharded_keyspace_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/test/endtoend/stress/stress_test.go b/go/test/endtoend/stress/stress_test.go index eab87ede931..048236b49d4 100644 --- a/go/test/endtoend/stress/stress_test.go +++ b/go/test/endtoend/stress/stress_test.go @@ -21,10 +21,10 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/stress" + "github.com/vitess/vitess/go/test/stress" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/tabletgateway/buffer/buffer_test_helpers.go b/go/test/endtoend/tabletgateway/buffer/buffer_test_helpers.go index 99803283b10..9d25bbabfef 100644 --- a/go/test/endtoend/tabletgateway/buffer/buffer_test_helpers.go +++ b/go/test/endtoend/tabletgateway/buffer/buffer_test_helpers.go @@ -39,15 +39,15 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) const ( diff --git a/go/test/endtoend/tabletgateway/buffer/reparent/failover_buffer_test.go b/go/test/endtoend/tabletgateway/buffer/reparent/failover_buffer_test.go index 4fd932fae3a..4cbe81e25f3 100644 --- a/go/test/endtoend/tabletgateway/buffer/reparent/failover_buffer_test.go +++ b/go/test/endtoend/tabletgateway/buffer/reparent/failover_buffer_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/tabletgateway/buffer" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/tabletgateway/buffer" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/test/endtoend/tabletgateway/buffer/reshard/sharded_buffer_test.go b/go/test/endtoend/tabletgateway/buffer/reshard/sharded_buffer_test.go index 75000b52c63..47aa7382ee8 100644 --- a/go/test/endtoend/tabletgateway/buffer/reshard/sharded_buffer_test.go +++ b/go/test/endtoend/tabletgateway/buffer/reshard/sharded_buffer_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/tabletgateway/buffer" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/tabletgateway/buffer" + "github.com/vitess/vitess/go/vt/log" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) const ( diff --git a/go/test/endtoend/tabletgateway/main_test.go b/go/test/endtoend/tabletgateway/main_test.go index f4a45254d95..cd89eccbacf 100644 --- a/go/test/endtoend/tabletgateway/main_test.go +++ b/go/test/endtoend/tabletgateway/main_test.go @@ -22,8 +22,8 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/tabletgateway/vtgate_test.go b/go/test/endtoend/tabletgateway/vtgate_test.go index 39369379382..35336d7176d 100644 --- a/go/test/endtoend/tabletgateway/vtgate_test.go +++ b/go/test/endtoend/tabletgateway/vtgate_test.go @@ -31,12 +31,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - vtorcutils "github.com/mdibaiee/vitess/go/test/endtoend/vtorc/utils" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" + vtorcutils "github.com/vitess/vitess/go/test/endtoend/vtorc/utils" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestVtgateHealthCheck(t *testing.T) { diff --git a/go/test/endtoend/tabletmanager/commands_test.go b/go/test/endtoend/tabletmanager/commands_test.go index e6a40cd1ab8..0bea8c3f5ed 100644 --- a/go/test/endtoend/tabletmanager/commands_test.go +++ b/go/test/endtoend/tabletmanager/commands_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/require" "github.com/tidwall/gjson" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/test/endtoend/tabletmanager/custom_rule_topo_test.go b/go/test/endtoend/tabletmanager/custom_rule_topo_test.go index 30878e7c09a..92a8c34ad56 100644 --- a/go/test/endtoend/tabletmanager/custom_rule_topo_test.go +++ b/go/test/endtoend/tabletmanager/custom_rule_topo_test.go @@ -21,14 +21,14 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/require" "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) func TestTopoCustomRule(t *testing.T) { diff --git a/go/test/endtoend/tabletmanager/lock_unlock_test.go b/go/test/endtoend/tabletmanager/lock_unlock_test.go index e8357520d85..1e1b68ddb74 100644 --- a/go/test/endtoend/tabletmanager/lock_unlock_test.go +++ b/go/test/endtoend/tabletmanager/lock_unlock_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/require" "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) // TestLockAndUnlock tests the lock ability by locking a replica and asserting it does not see changes diff --git a/go/test/endtoend/tabletmanager/main_test.go b/go/test/endtoend/tabletmanager/main_test.go index cbc8e378a33..6f5915e2cb5 100644 --- a/go/test/endtoend/tabletmanager/main_test.go +++ b/go/test/endtoend/tabletmanager/main_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - tabletpb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - tmc "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmclient" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + tabletpb "github.com/vitess/vitess/go/vt/proto/topodata" + tmc "github.com/vitess/vitess/go/vt/vttablet/grpctmclient" ) var ( diff --git a/go/test/endtoend/tabletmanager/primary/tablet_test.go b/go/test/endtoend/tabletmanager/primary/tablet_test.go index ef42b056cd7..ef97e0f6274 100644 --- a/go/test/endtoend/tabletmanager/primary/tablet_test.go +++ b/go/test/endtoend/tabletmanager/primary/tablet_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/test/endtoend/tabletmanager/qps_test.go b/go/test/endtoend/tabletmanager/qps_test.go index c3c72088d4c..d54ac320299 100644 --- a/go/test/endtoend/tabletmanager/qps_test.go +++ b/go/test/endtoend/tabletmanager/qps_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func TestQPS(t *testing.T) { diff --git a/go/test/endtoend/tabletmanager/replication_manager/tablet_test.go b/go/test/endtoend/tabletmanager/replication_manager/tablet_test.go index 0cbf5b26485..b9fe5fa94a1 100644 --- a/go/test/endtoend/tabletmanager/replication_manager/tablet_test.go +++ b/go/test/endtoend/tabletmanager/replication_manager/tablet_test.go @@ -24,14 +24,14 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/sidecardb" + "github.com/vitess/vitess/go/vt/sidecardb" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - tabletpb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - tmc "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmclient" + "github.com/vitess/vitess/go/test/endtoend/cluster" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + tabletpb "github.com/vitess/vitess/go/vt/proto/topodata" + tmc "github.com/vitess/vitess/go/vt/vttablet/grpctmclient" ) var ( diff --git a/go/test/endtoend/tabletmanager/tablegc/tablegc_test.go b/go/test/endtoend/tabletmanager/tablegc/tablegc_test.go index 351942e404d..1261f3b5363 100644 --- a/go/test/endtoend/tabletmanager/tablegc/tablegc_test.go +++ b/go/test/endtoend/tabletmanager/tablegc/tablegc_test.go @@ -24,14 +24,14 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/gc" - - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/onlineddl" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/gc" + + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/onlineddl" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/go/test/endtoend/tabletmanager/tablet_health_test.go b/go/test/endtoend/tabletmanager/tablet_health_test.go index 9efd01a4ba6..15bd67c4733 100644 --- a/go/test/endtoend/tabletmanager/tablet_health_test.go +++ b/go/test/endtoend/tabletmanager/tablet_health_test.go @@ -30,11 +30,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // TabletReshuffle test if a vttablet can be pointed at an existing mysql diff --git a/go/test/endtoend/tabletmanager/tablet_security_policy_test.go b/go/test/endtoend/tabletmanager/tablet_security_policy_test.go index 6a9e79fe771..85a95571a04 100644 --- a/go/test/endtoend/tabletmanager/tablet_security_policy_test.go +++ b/go/test/endtoend/tabletmanager/tablet_security_policy_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) func TestFallbackSecurityPolicy(t *testing.T) { diff --git a/go/test/endtoend/tabletmanager/tablet_test.go b/go/test/endtoend/tabletmanager/tablet_test.go index ba562feda7d..1e563da7050 100644 --- a/go/test/endtoend/tabletmanager/tablet_test.go +++ b/go/test/endtoend/tabletmanager/tablet_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/log" ) // TestEnsureDB tests that vttablet creates the db as needed diff --git a/go/test/endtoend/tabletmanager/throttler_topo/throttler_test.go b/go/test/endtoend/tabletmanager/throttler_topo/throttler_test.go index e139bab68ea..bd027ad9295 100644 --- a/go/test/endtoend/tabletmanager/throttler_topo/throttler_test.go +++ b/go/test/endtoend/tabletmanager/throttler_topo/throttler_test.go @@ -26,14 +26,14 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/throttler" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/base" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/throttler" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/base" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/go/test/endtoend/throttler/util.go b/go/test/endtoend/throttler/util.go index c85c16afc4c..8dbcbb743e2 100644 --- a/go/test/endtoend/throttler/util.go +++ b/go/test/endtoend/throttler/util.go @@ -30,14 +30,14 @@ import ( "github.com/stretchr/testify/require" "github.com/tidwall/gjson" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/base" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/base" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) type Config struct { diff --git a/go/test/endtoend/topoconncache/main_test.go b/go/test/endtoend/topoconncache/main_test.go index 09e761fbd8c..9f394df8fec 100644 --- a/go/test/endtoend/topoconncache/main_test.go +++ b/go/test/endtoend/topoconncache/main_test.go @@ -29,7 +29,7 @@ import ( "os/exec" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/topoconncache/topo_conn_cache_test.go b/go/test/endtoend/topoconncache/topo_conn_cache_test.go index 8f32b993da5..4641a6a73ae 100644 --- a/go/test/endtoend/topoconncache/topo_conn_cache_test.go +++ b/go/test/endtoend/topoconncache/topo_conn_cache_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) /* diff --git a/go/test/endtoend/topotest/consul/main_test.go b/go/test/endtoend/topotest/consul/main_test.go index 49400d97339..f827577182f 100644 --- a/go/test/endtoend/topotest/consul/main_test.go +++ b/go/test/endtoend/topotest/consul/main_test.go @@ -24,16 +24,16 @@ import ( "testing" "time" - topoutils "github.com/mdibaiee/vitess/go/test/endtoend/topotest/utils" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" + topoutils "github.com/vitess/vitess/go/test/endtoend/topotest/utils" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/topotest/etcd2/main_test.go b/go/test/endtoend/topotest/etcd2/main_test.go index a1a20fb8730..5af4a620f33 100644 --- a/go/test/endtoend/topotest/etcd2/main_test.go +++ b/go/test/endtoend/topotest/etcd2/main_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - topoutils "github.com/mdibaiee/vitess/go/test/endtoend/topotest/utils" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/topo" + topoutils "github.com/vitess/vitess/go/test/endtoend/topotest/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/topotest/zk2/main_test.go b/go/test/endtoend/topotest/zk2/main_test.go index c37adb722cd..77c23a0d231 100644 --- a/go/test/endtoend/topotest/zk2/main_test.go +++ b/go/test/endtoend/topotest/zk2/main_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - topoutils "github.com/mdibaiee/vitess/go/test/endtoend/topotest/utils" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/topo" + topoutils "github.com/vitess/vitess/go/test/endtoend/topotest/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/utils/cmp.go b/go/test/endtoend/utils/cmp.go index 6d5b8427fd4..e525207ef94 100644 --- a/go/test/endtoend/utils/cmp.go +++ b/go/test/endtoend/utils/cmp.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" ) type TestingT interface { diff --git a/go/test/endtoend/utils/mysql.go b/go/test/endtoend/utils/mysql.go index 0589f56b453..45b73a0b39f 100644 --- a/go/test/endtoend/utils/mysql.go +++ b/go/test/endtoend/utils/mysql.go @@ -28,14 +28,14 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/mysqlctl" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" ) const mysqlShutdownTimeout = 1 * time.Minute diff --git a/go/test/endtoend/utils/mysql_test.go b/go/test/endtoend/utils/mysql_test.go index 1a832d485ad..210cd7b5ce1 100644 --- a/go/test/endtoend/utils/mysql_test.go +++ b/go/test/endtoend/utils/mysql_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/mysqlctl" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var ( diff --git a/go/test/endtoend/utils/mysqlvsvitess/main_test.go b/go/test/endtoend/utils/mysqlvsvitess/main_test.go index 81782a931b0..880525c0c9f 100644 --- a/go/test/endtoend/utils/mysqlvsvitess/main_test.go +++ b/go/test/endtoend/utils/mysqlvsvitess/main_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) var ( diff --git a/go/test/endtoend/utils/utils.go b/go/test/endtoend/utils/utils.go index 1da547c255f..f148b44b432 100644 --- a/go/test/endtoend/utils/utils.go +++ b/go/test/endtoend/utils/utils.go @@ -29,9 +29,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) // AssertContains ensures the given query result contains the expected results. diff --git a/go/test/endtoend/vault/vault_server.go b/go/test/endtoend/vault/vault_server.go index fe9165a1dd3..cd1c0ec7c0c 100644 --- a/go/test/endtoend/vault/vault_server.go +++ b/go/test/endtoend/vault/vault_server.go @@ -28,7 +28,7 @@ import ( "syscall" "time" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) const ( diff --git a/go/test/endtoend/vault/vault_test.go b/go/test/endtoend/vault/vault_test.go index 652b686d86c..d864ed553d7 100644 --- a/go/test/endtoend/vault/vault_test.go +++ b/go/test/endtoend/vault/vault_test.go @@ -31,10 +31,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/test/endtoend/versionupgrade/upgrade_test.go b/go/test/endtoend/versionupgrade/upgrade_test.go index 07b6bac476c..1d8a98aca01 100644 --- a/go/test/endtoend/versionupgrade/upgrade_test.go +++ b/go/test/endtoend/versionupgrade/upgrade_test.go @@ -43,8 +43,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vreplication/cluster_test.go b/go/test/endtoend/vreplication/cluster_test.go index 9d2a39ab66f..b47d048194f 100644 --- a/go/test/endtoend/vreplication/cluster_test.go +++ b/go/test/endtoend/vreplication/cluster_test.go @@ -30,19 +30,19 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/vttablet" + "github.com/vitess/vitess/go/vt/vttablet" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/throttler" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/throttler" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/test/endtoend/vreplication/fk_ext_load_generator_test.go b/go/test/endtoend/vreplication/fk_ext_load_generator_test.go index dd749cef356..e2b59b253f6 100644 --- a/go/test/endtoend/vreplication/fk_ext_load_generator_test.go +++ b/go/test/endtoend/vreplication/fk_ext_load_generator_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/log" ) const ( diff --git a/go/test/endtoend/vreplication/fk_ext_test.go b/go/test/endtoend/vreplication/fk_ext_test.go index acb4f8b7623..41438043132 100644 --- a/go/test/endtoend/vreplication/fk_ext_test.go +++ b/go/test/endtoend/vreplication/fk_ext_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) var ( diff --git a/go/test/endtoend/vreplication/fk_test.go b/go/test/endtoend/vreplication/fk_test.go index 5b277088633..2399aab4281 100644 --- a/go/test/endtoend/vreplication/fk_test.go +++ b/go/test/endtoend/vreplication/fk_test.go @@ -26,12 +26,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vttablet" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vttablet" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) const testWorkflowFlavor = workflowFlavorRandom diff --git a/go/test/endtoend/vreplication/helper_test.go b/go/test/endtoend/vreplication/helper_test.go index 84c8943bdd0..09e681dfad2 100644 --- a/go/test/endtoend/vreplication/helper_test.go +++ b/go/test/endtoend/vreplication/helper_test.go @@ -39,20 +39,20 @@ import ( "github.com/stretchr/testify/require" "github.com/tidwall/gjson" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/test/endtoend/vreplication/initial_data_test.go b/go/test/endtoend/vreplication/initial_data_test.go index a980c1da582..cdb8c1fdb63 100644 --- a/go/test/endtoend/vreplication/initial_data_test.go +++ b/go/test/endtoend/vreplication/initial_data_test.go @@ -22,7 +22,7 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) func insertInitialData(t *testing.T) { diff --git a/go/test/endtoend/vreplication/migrate_test.go b/go/test/endtoend/vreplication/migrate_test.go index 903006ca212..e979299bb61 100644 --- a/go/test/endtoend/vreplication/migrate_test.go +++ b/go/test/endtoend/vreplication/migrate_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + "github.com/vitess/vitess/go/mysql" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) func insertInitialDataIntoExternalCluster(t *testing.T, conn *mysql.Conn) { diff --git a/go/test/endtoend/vreplication/movetables_buffering_test.go b/go/test/endtoend/vreplication/movetables_buffering_test.go index bc8bdecafd1..6b628f62f2f 100644 --- a/go/test/endtoend/vreplication/movetables_buffering_test.go +++ b/go/test/endtoend/vreplication/movetables_buffering_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) func TestMoveTablesBuffering(t *testing.T) { diff --git a/go/test/endtoend/vreplication/multi_tenant_test.go b/go/test/endtoend/vreplication/multi_tenant_test.go index b97b192db8f..080cdc02d42 100644 --- a/go/test/endtoend/vreplication/multi_tenant_test.go +++ b/go/test/endtoend/vreplication/multi_tenant_test.go @@ -40,11 +40,11 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/encoding/protojson" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/vtctldata" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) type tenantMigrationStatus int diff --git a/go/test/endtoend/vreplication/partial_movetables_seq_test.go b/go/test/endtoend/vreplication/partial_movetables_seq_test.go index 952ffeb3da6..7f2bd6936b7 100644 --- a/go/test/endtoend/vreplication/partial_movetables_seq_test.go +++ b/go/test/endtoend/vreplication/partial_movetables_seq_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/require" "github.com/tidwall/gjson" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) /* diff --git a/go/test/endtoend/vreplication/partial_movetables_test.go b/go/test/endtoend/vreplication/partial_movetables_test.go index f9e141d4696..f66d664e79b 100644 --- a/go/test/endtoend/vreplication/partial_movetables_test.go +++ b/go/test/endtoend/vreplication/partial_movetables_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" "github.com/stretchr/testify/require" "github.com/tidwall/gjson" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // testCancel() starts and cancels a partial MoveTables for one of the shards which will be actually moved later on. diff --git a/go/test/endtoend/vreplication/performance_test.go b/go/test/endtoend/vreplication/performance_test.go index 0ccffad7e96..a3a377eca52 100644 --- a/go/test/endtoend/vreplication/performance_test.go +++ b/go/test/endtoend/vreplication/performance_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) func TestReplicationStress(t *testing.T) { diff --git a/go/test/endtoend/vreplication/resharding_workflows_v2_test.go b/go/test/endtoend/vreplication/resharding_workflows_v2_test.go index 2132bcf85ed..513cb90085c 100644 --- a/go/test/endtoend/vreplication/resharding_workflows_v2_test.go +++ b/go/test/endtoend/vreplication/resharding_workflows_v2_test.go @@ -32,13 +32,13 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/encoding/protojson" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/throttler" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/throttler" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/wrangler" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) const ( diff --git a/go/test/endtoend/vreplication/sidecardb_test.go b/go/test/endtoend/vreplication/sidecardb_test.go index eae154d197f..1387c0e2e6e 100644 --- a/go/test/endtoend/vreplication/sidecardb_test.go +++ b/go/test/endtoend/vreplication/sidecardb_test.go @@ -5,7 +5,7 @@ import ( "strconv" "testing" - "github.com/mdibaiee/vitess/go/vt/sidecardb" + "github.com/vitess/vitess/go/vt/sidecardb" "github.com/stretchr/testify/require" "github.com/tidwall/gjson" diff --git a/go/test/endtoend/vreplication/time_zone_test.go b/go/test/endtoend/vreplication/time_zone_test.go index 45d718cd69e..c3d70eae782 100644 --- a/go/test/endtoend/vreplication/time_zone_test.go +++ b/go/test/endtoend/vreplication/time_zone_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" ) // TestMoveTablesTZ tests the conversion of datetime based on the source timezone passed to the MoveTables workflow diff --git a/go/test/endtoend/vreplication/vdiff2_test.go b/go/test/endtoend/vreplication/vdiff2_test.go index acdd22f5b9f..682124be990 100644 --- a/go/test/endtoend/vreplication/vdiff2_test.go +++ b/go/test/endtoend/vreplication/vdiff2_test.go @@ -32,13 +32,13 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) type testCase struct { diff --git a/go/test/endtoend/vreplication/vdiff_helper_test.go b/go/test/endtoend/vreplication/vdiff_helper_test.go index c807a503644..07f307ca182 100644 --- a/go/test/endtoend/vreplication/vdiff_helper_test.go +++ b/go/test/endtoend/vreplication/vdiff_helper_test.go @@ -26,12 +26,12 @@ import ( "github.com/stretchr/testify/require" "github.com/tidwall/gjson" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - vdiff2 "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vdiff" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + vdiff2 "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vdiff" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) const ( diff --git a/go/test/endtoend/vreplication/vdiff_multiple_movetables_test.go b/go/test/endtoend/vreplication/vdiff_multiple_movetables_test.go index 83cacd3a214..503ddcb7ba5 100644 --- a/go/test/endtoend/vreplication/vdiff_multiple_movetables_test.go +++ b/go/test/endtoend/vreplication/vdiff_multiple_movetables_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + "github.com/vitess/vitess/go/vt/log" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) func TestMultipleConcurrentVDiffs(t *testing.T) { diff --git a/go/test/endtoend/vreplication/vdiff_online_ddl_test.go b/go/test/endtoend/vreplication/vdiff_online_ddl_test.go index c89e101e486..bd52d309a5e 100644 --- a/go/test/endtoend/vreplication/vdiff_online_ddl_test.go +++ b/go/test/endtoend/vreplication/vdiff_online_ddl_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/encoding/protojson" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/vtctldata" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) // TestOnlineDDLVDiff is to run a vdiff on a table that is part of an OnlineDDL workflow. diff --git a/go/test/endtoend/vreplication/vreplication_test.go b/go/test/endtoend/vreplication/vreplication_test.go index 4727d0968fe..3bfa742d0ee 100644 --- a/go/test/endtoend/vreplication/vreplication_test.go +++ b/go/test/endtoend/vreplication/vreplication_test.go @@ -33,21 +33,21 @@ import ( "github.com/stretchr/testify/require" "github.com/tidwall/gjson" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/vstreamer" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - throttlebase "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/base" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/vstreamer" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + throttlebase "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/base" ) var ( diff --git a/go/test/endtoend/vreplication/vreplication_vtctldclient_cli_test.go b/go/test/endtoend/vreplication/vreplication_vtctldclient_cli_test.go index 67569f3729d..382339ded82 100644 --- a/go/test/endtoend/vreplication/vreplication_vtctldclient_cli_test.go +++ b/go/test/endtoend/vreplication/vreplication_vtctldclient_cli_test.go @@ -28,14 +28,14 @@ import ( "golang.org/x/exp/maps" "google.golang.org/protobuf/encoding/protojson" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/test/endtoend/cluster" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // TestVtctldclientCLI tests the vreplication vtctldclient CLI commands, primarily to check that non-standard flags diff --git a/go/test/endtoend/vreplication/vschema_load_test.go b/go/test/endtoend/vreplication/vschema_load_test.go index e343c5d26ef..743a80a2775 100644 --- a/go/test/endtoend/vreplication/vschema_load_test.go +++ b/go/test/endtoend/vreplication/vschema_load_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/vt/log" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" ) // TestVSchemaChangesUnderLoad tests vstreamer under a load of high binlog events and simultaneous multiple vschema changes diff --git a/go/test/endtoend/vreplication/vstream_test.go b/go/test/endtoend/vreplication/vstream_test.go index 9db5243b89b..4b73670def4 100644 --- a/go/test/endtoend/vreplication/vstream_test.go +++ b/go/test/endtoend/vreplication/vstream_test.go @@ -27,14 +27,14 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - _ "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctlclient" - _ "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateconn" - - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/vt/log" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + _ "github.com/vitess/vitess/go/vt/vtctl/grpcvtctlclient" + _ "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateconn" + + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" ) // Validates that we have a working VStream API diff --git a/go/test/endtoend/vreplication/wrappers_test.go b/go/test/endtoend/vreplication/wrappers_test.go index 6635bfccd17..75e03a61d65 100644 --- a/go/test/endtoend/vreplication/wrappers_test.go +++ b/go/test/endtoend/vreplication/wrappers_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + "github.com/vitess/vitess/go/vt/log" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) type iWorkflow interface { diff --git a/go/test/endtoend/vtcombo/recreate/recreate_test.go b/go/test/endtoend/vtcombo/recreate/recreate_test.go index 4e16f834051..a8682f0f54d 100644 --- a/go/test/endtoend/vtcombo/recreate/recreate_test.go +++ b/go/test/endtoend/vtcombo/recreate/recreate_test.go @@ -28,11 +28,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" - "github.com/mdibaiee/vitess/go/vt/vttest" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/vt/vttest" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" ) var ( diff --git a/go/test/endtoend/vtcombo/vttest_sample_test.go b/go/test/endtoend/vtcombo/vttest_sample_test.go index 582a1b55005..44cf07512ff 100644 --- a/go/test/endtoend/vtcombo/vttest_sample_test.go +++ b/go/test/endtoend/vtcombo/vttest_sample_test.go @@ -34,12 +34,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" - "github.com/mdibaiee/vitess/go/vt/vttest" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/vt/vttest" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" ) var ( diff --git a/go/test/endtoend/vtctldclient/cli_test.go b/go/test/endtoend/vtctldclient/cli_test.go index 34fe2cec9d7..e95b7b15ff9 100644 --- a/go/test/endtoend/vtctldclient/cli_test.go +++ b/go/test/endtoend/vtctldclient/cli_test.go @@ -26,12 +26,12 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/command" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/vtctl/localvtctldclient" + "github.com/vitess/vitess/go/cmd/vtctldclient/command" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/vtctl/localvtctldclient" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) type fakeServer struct { diff --git a/go/test/endtoend/vtgate/concurrentdml/main_test.go b/go/test/endtoend/vtgate/concurrentdml/main_test.go index d90f487e7c2..072beec49e9 100644 --- a/go/test/endtoend/vtgate/concurrentdml/main_test.go +++ b/go/test/endtoend/vtgate/concurrentdml/main_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/consolidator/main_test.go b/go/test/endtoend/vtgate/consolidator/main_test.go index 4849bdf0382..cbdbec2ea0a 100644 --- a/go/test/endtoend/vtgate/consolidator/main_test.go +++ b/go/test/endtoend/vtgate/consolidator/main_test.go @@ -26,10 +26,10 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) type consolidatorTestCase struct { diff --git a/go/test/endtoend/vtgate/createdb_plugin/main_test.go b/go/test/endtoend/vtgate/createdb_plugin/main_test.go index 1b06e464b00..c2056029ca4 100644 --- a/go/test/endtoend/vtgate/createdb_plugin/main_test.go +++ b/go/test/endtoend/vtgate/createdb_plugin/main_test.go @@ -24,14 +24,14 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/errors_as_warnings/main_test.go b/go/test/endtoend/vtgate/errors_as_warnings/main_test.go index 2c1d2e0ad86..6d7405ccee7 100644 --- a/go/test/endtoend/vtgate/errors_as_warnings/main_test.go +++ b/go/test/endtoend/vtgate/errors_as_warnings/main_test.go @@ -24,13 +24,13 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/foreignkey/fk_fuzz_test.go b/go/test/endtoend/vtgate/foreignkey/fk_fuzz_test.go index 24a6f17dfb6..d034b684632 100644 --- a/go/test/endtoend/vtgate/foreignkey/fk_fuzz_test.go +++ b/go/test/endtoend/vtgate/foreignkey/fk_fuzz_test.go @@ -28,10 +28,10 @@ import ( _ "github.com/go-sql-driver/mysql" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" ) type QueryFormat string diff --git a/go/test/endtoend/vtgate/foreignkey/fk_test.go b/go/test/endtoend/vtgate/foreignkey/fk_test.go index 40d36dd66f5..99423fa4182 100644 --- a/go/test/endtoend/vtgate/foreignkey/fk_test.go +++ b/go/test/endtoend/vtgate/foreignkey/fk_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/vt/log" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" ) // TestInsertWithFK tests that insertions work as expected when foreign key management is enabled in Vitess. diff --git a/go/test/endtoend/vtgate/foreignkey/main_test.go b/go/test/endtoend/vtgate/foreignkey/main_test.go index 30e3c4f7b9b..436c60f71c1 100644 --- a/go/test/endtoend/vtgate/foreignkey/main_test.go +++ b/go/test/endtoend/vtgate/foreignkey/main_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) var ( diff --git a/go/test/endtoend/vtgate/foreignkey/stress/fk_stress_test.go b/go/test/endtoend/vtgate/foreignkey/stress/fk_stress_test.go index a7da3f4fcbe..94fba40e075 100644 --- a/go/test/endtoend/vtgate/foreignkey/stress/fk_stress_test.go +++ b/go/test/endtoend/vtgate/foreignkey/stress/fk_stress_test.go @@ -33,17 +33,17 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/exp/slices" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/onlineddl" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/onlineddl" + "github.com/vitess/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" ) // This endtoend test is designd to validate VTGate's FOREIGN KEY implementation for unsharded/single-sharded/shard-scope, meaning diff --git a/go/test/endtoend/vtgate/foreignkey/utils_test.go b/go/test/endtoend/vtgate/foreignkey/utils_test.go index e592c9e32ab..1a3e7f162b5 100644 --- a/go/test/endtoend/vtgate/foreignkey/utils_test.go +++ b/go/test/endtoend/vtgate/foreignkey/utils_test.go @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) var supportedOpps = []string{"*", "+", "-"} diff --git a/go/test/endtoend/vtgate/gen4/column_name_test.go b/go/test/endtoend/vtgate/gen4/column_name_test.go index be4d718e1c5..ab176419b6b 100644 --- a/go/test/endtoend/vtgate/gen4/column_name_test.go +++ b/go/test/endtoend/vtgate/gen4/column_name_test.go @@ -20,13 +20,13 @@ import ( "context" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) func TestColumnNames(t *testing.T) { diff --git a/go/test/endtoend/vtgate/gen4/gen4_test.go b/go/test/endtoend/vtgate/gen4/gen4_test.go index 21b76b8431d..eec7200b469 100644 --- a/go/test/endtoend/vtgate/gen4/gen4_test.go +++ b/go/test/endtoend/vtgate/gen4/gen4_test.go @@ -22,13 +22,13 @@ import ( "strconv" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" ) func TestOrderBy(t *testing.T) { diff --git a/go/test/endtoend/vtgate/gen4/main_test.go b/go/test/endtoend/vtgate/gen4/main_test.go index 6c977b82369..b6e49fcea2f 100644 --- a/go/test/endtoend/vtgate/gen4/main_test.go +++ b/go/test/endtoend/vtgate/gen4/main_test.go @@ -25,12 +25,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/gen4/system_schema_test.go b/go/test/endtoend/vtgate/gen4/system_schema_test.go index 338bb462965..ccba750322f 100644 --- a/go/test/endtoend/vtgate/gen4/system_schema_test.go +++ b/go/test/endtoend/vtgate/gen4/system_schema_test.go @@ -21,14 +21,14 @@ import ( "fmt" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) func TestDbNameOverride(t *testing.T) { diff --git a/go/test/endtoend/vtgate/godriver/main_test.go b/go/test/endtoend/vtgate/godriver/main_test.go index ab5607c919b..e7205fc68ee 100644 --- a/go/test/endtoend/vtgate/godriver/main_test.go +++ b/go/test/endtoend/vtgate/godriver/main_test.go @@ -29,10 +29,10 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/keepalive" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vitessdriver" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vitessdriver" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/grpc_api/acl_test.go b/go/test/endtoend/vtgate/grpc_api/acl_test.go index ebc69fbfedd..bcfef387113 100644 --- a/go/test/endtoend/vtgate/grpc_api/acl_test.go +++ b/go/test/endtoend/vtgate/grpc_api/acl_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/callerid" ) // TestEffectiveCallerIDWithAccess verifies that an authenticated gRPC static user with an effectiveCallerID that has ACL access can execute queries diff --git a/go/test/endtoend/vtgate/grpc_api/execute_test.go b/go/test/endtoend/vtgate/grpc_api/execute_test.go index 2609f4599a2..d8eb5ee1111 100644 --- a/go/test/endtoend/vtgate/grpc_api/execute_test.go +++ b/go/test/endtoend/vtgate/grpc_api/execute_test.go @@ -25,11 +25,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" ) // TestTransactionsWithGRPCAPI test the transaction queries through vtgate grpc apis. diff --git a/go/test/endtoend/vtgate/grpc_api/main_test.go b/go/test/endtoend/vtgate/grpc_api/main_test.go index ed776657f24..642744b8338 100644 --- a/go/test/endtoend/vtgate/grpc_api/main_test.go +++ b/go/test/endtoend/vtgate/grpc_api/main_test.go @@ -23,7 +23,7 @@ import ( "path" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/keyspace_watches/keyspace_watch_test.go b/go/test/endtoend/vtgate/keyspace_watches/keyspace_watch_test.go index 91ae867bb29..71e8f0242cd 100644 --- a/go/test/endtoend/vtgate/keyspace_watches/keyspace_watch_test.go +++ b/go/test/endtoend/vtgate/keyspace_watches/keyspace_watch_test.go @@ -29,8 +29,8 @@ import ( _ "github.com/go-sql-driver/mysql" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/lookup_test.go b/go/test/endtoend/vtgate/lookup_test.go index b3492ec667e..00fa06c7b82 100644 --- a/go/test/endtoend/vtgate/lookup_test.go +++ b/go/test/endtoend/vtgate/lookup_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func TestUnownedLookupInsertNull(t *testing.T) { diff --git a/go/test/endtoend/vtgate/main_test.go b/go/test/endtoend/vtgate/main_test.go index 4687741cddb..73df34ab0e9 100644 --- a/go/test/endtoend/vtgate/main_test.go +++ b/go/test/endtoend/vtgate/main_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/misc_test.go b/go/test/endtoend/vtgate/misc_test.go index 53fb4154802..35b94b88e28 100644 --- a/go/test/endtoend/vtgate/misc_test.go +++ b/go/test/endtoend/vtgate/misc_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func TestInsertOnDuplicateKey(t *testing.T) { diff --git a/go/test/endtoend/vtgate/mysql80/main_test.go b/go/test/endtoend/vtgate/mysql80/main_test.go index 0db73452e67..25449f6c25f 100644 --- a/go/test/endtoend/vtgate/mysql80/main_test.go +++ b/go/test/endtoend/vtgate/mysql80/main_test.go @@ -21,10 +21,10 @@ import ( "os" "testing" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/mysql80/misc_test.go b/go/test/endtoend/vtgate/mysql80/misc_test.go index df5dc7c787e..7bdb5c827e7 100644 --- a/go/test/endtoend/vtgate/mysql80/misc_test.go +++ b/go/test/endtoend/vtgate/mysql80/misc_test.go @@ -21,13 +21,13 @@ import ( "fmt" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" ) func TestFunctionInDefault(t *testing.T) { diff --git a/go/test/endtoend/vtgate/partialfailure/main_test.go b/go/test/endtoend/vtgate/partialfailure/main_test.go index f73d27605b6..d45e2515c52 100644 --- a/go/test/endtoend/vtgate/partialfailure/main_test.go +++ b/go/test/endtoend/vtgate/partialfailure/main_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) var ( diff --git a/go/test/endtoend/vtgate/prefixfanout/main_test.go b/go/test/endtoend/vtgate/prefixfanout/main_test.go index 61dbc55375e..a7680569397 100644 --- a/go/test/endtoend/vtgate/prefixfanout/main_test.go +++ b/go/test/endtoend/vtgate/prefixfanout/main_test.go @@ -21,13 +21,13 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/queries/aggregation/aggregation_test.go b/go/test/endtoend/vtgate/queries/aggregation/aggregation_test.go index 912093d1d40..b4641fcf38f 100644 --- a/go/test/endtoend/vtgate/queries/aggregation/aggregation_test.go +++ b/go/test/endtoend/vtgate/queries/aggregation/aggregation_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func start(t *testing.T) (utils.MySQLCompare, func()) { diff --git a/go/test/endtoend/vtgate/queries/aggregation/distinct_test.go b/go/test/endtoend/vtgate/queries/aggregation/distinct_test.go index edd42836372..20012da0d6a 100644 --- a/go/test/endtoend/vtgate/queries/aggregation/distinct_test.go +++ b/go/test/endtoend/vtgate/queries/aggregation/distinct_test.go @@ -19,7 +19,7 @@ package aggregation import ( "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func TestDistinct(t *testing.T) { diff --git a/go/test/endtoend/vtgate/queries/aggregation/main_test.go b/go/test/endtoend/vtgate/queries/aggregation/main_test.go index f4aea390700..29f26b77aa8 100644 --- a/go/test/endtoend/vtgate/queries/aggregation/main_test.go +++ b/go/test/endtoend/vtgate/queries/aggregation/main_test.go @@ -23,10 +23,10 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/queries/benchmark/benchmark_test.go b/go/test/endtoend/vtgate/queries/benchmark/benchmark_test.go index c7a7cffbcce..b93ec3a1962 100644 --- a/go/test/endtoend/vtgate/queries/benchmark/benchmark_test.go +++ b/go/test/endtoend/vtgate/queries/benchmark/benchmark_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" ) type testQuery struct { diff --git a/go/test/endtoend/vtgate/queries/benchmark/main_test.go b/go/test/endtoend/vtgate/queries/benchmark/main_test.go index dee99c5cff7..c0fee3df6c1 100644 --- a/go/test/endtoend/vtgate/queries/benchmark/main_test.go +++ b/go/test/endtoend/vtgate/queries/benchmark/main_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) var ( diff --git a/go/test/endtoend/vtgate/queries/derived/cte_test.go b/go/test/endtoend/vtgate/queries/derived/cte_test.go index 2275287cdd3..36c8b37131a 100644 --- a/go/test/endtoend/vtgate/queries/derived/cte_test.go +++ b/go/test/endtoend/vtgate/queries/derived/cte_test.go @@ -19,7 +19,7 @@ package misc import ( "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func TestCTEWithOrderByLimit(t *testing.T) { diff --git a/go/test/endtoend/vtgate/queries/derived/derived_test.go b/go/test/endtoend/vtgate/queries/derived/derived_test.go index f831eadae54..c6654402619 100644 --- a/go/test/endtoend/vtgate/queries/derived/derived_test.go +++ b/go/test/endtoend/vtgate/queries/derived/derived_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func start(t *testing.T) (utils.MySQLCompare, func()) { diff --git a/go/test/endtoend/vtgate/queries/derived/main_test.go b/go/test/endtoend/vtgate/queries/derived/main_test.go index 2e155e7d7a1..9cdf53bfa88 100644 --- a/go/test/endtoend/vtgate/queries/derived/main_test.go +++ b/go/test/endtoend/vtgate/queries/derived/main_test.go @@ -23,10 +23,10 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/queries/dml/dml_test.go b/go/test/endtoend/vtgate/queries/dml/dml_test.go index be81d75a4ce..3dd96847cd5 100644 --- a/go/test/endtoend/vtgate/queries/dml/dml_test.go +++ b/go/test/endtoend/vtgate/queries/dml/dml_test.go @@ -19,9 +19,9 @@ package dml import ( "testing" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/go/test/endtoend/vtgate/queries/dml/insert_test.go b/go/test/endtoend/vtgate/queries/dml/insert_test.go index 60aae752a60..1fda045625e 100644 --- a/go/test/endtoend/vtgate/queries/dml/insert_test.go +++ b/go/test/endtoend/vtgate/queries/dml/insert_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func TestSimpleInsertSelect(t *testing.T) { diff --git a/go/test/endtoend/vtgate/queries/dml/main_test.go b/go/test/endtoend/vtgate/queries/dml/main_test.go index 17d662aaf80..5d43a084910 100644 --- a/go/test/endtoend/vtgate/queries/dml/main_test.go +++ b/go/test/endtoend/vtgate/queries/dml/main_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder" ) var ( diff --git a/go/test/endtoend/vtgate/queries/foundrows/found_rows_test.go b/go/test/endtoend/vtgate/queries/foundrows/found_rows_test.go index 7f9ed9df968..1c1e451e1ec 100644 --- a/go/test/endtoend/vtgate/queries/foundrows/found_rows_test.go +++ b/go/test/endtoend/vtgate/queries/foundrows/found_rows_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func TestFoundRows(t *testing.T) { diff --git a/go/test/endtoend/vtgate/queries/foundrows/main_test.go b/go/test/endtoend/vtgate/queries/foundrows/main_test.go index c54ee8c7f8c..a8721d5c036 100644 --- a/go/test/endtoend/vtgate/queries/foundrows/main_test.go +++ b/go/test/endtoend/vtgate/queries/foundrows/main_test.go @@ -23,10 +23,10 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/queries/informationschema/informationschema_test.go b/go/test/endtoend/vtgate/queries/informationschema/informationschema_test.go index 6a725edb391..a1cbcc76166 100644 --- a/go/test/endtoend/vtgate/queries/informationschema/informationschema_test.go +++ b/go/test/endtoend/vtgate/queries/informationschema/informationschema_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func start(t *testing.T) (utils.MySQLCompare, func()) { diff --git a/go/test/endtoend/vtgate/queries/informationschema/main_test.go b/go/test/endtoend/vtgate/queries/informationschema/main_test.go index 23ca654eb4c..b44cb168cd9 100644 --- a/go/test/endtoend/vtgate/queries/informationschema/main_test.go +++ b/go/test/endtoend/vtgate/queries/informationschema/main_test.go @@ -23,10 +23,10 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/queries/kill/kill_test.go b/go/test/endtoend/vtgate/queries/kill/kill_test.go index c9899cda615..58ad3c5e61a 100644 --- a/go/test/endtoend/vtgate/queries/kill/kill_test.go +++ b/go/test/endtoend/vtgate/queries/kill/kill_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/utils" ) // TestKillConnection kills its own connection and checks the error message received. diff --git a/go/test/endtoend/vtgate/queries/kill/main_test.go b/go/test/endtoend/vtgate/queries/kill/main_test.go index bc027a9d674..dc85c7c4bdd 100644 --- a/go/test/endtoend/vtgate/queries/kill/main_test.go +++ b/go/test/endtoend/vtgate/queries/kill/main_test.go @@ -29,10 +29,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder" ) var ( diff --git a/go/test/endtoend/vtgate/queries/lookup_queries/main_test.go b/go/test/endtoend/vtgate/queries/lookup_queries/main_test.go index 253ddeeb79a..566ff371756 100644 --- a/go/test/endtoend/vtgate/queries/lookup_queries/main_test.go +++ b/go/test/endtoend/vtgate/queries/lookup_queries/main_test.go @@ -25,12 +25,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/queries/misc/main_test.go b/go/test/endtoend/vtgate/queries/misc/main_test.go index 58553004798..7837bbe5966 100644 --- a/go/test/endtoend/vtgate/queries/misc/main_test.go +++ b/go/test/endtoend/vtgate/queries/misc/main_test.go @@ -23,10 +23,10 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/queries/misc/misc_test.go b/go/test/endtoend/vtgate/queries/misc/misc_test.go index 83565cb6161..b9ce7a386d9 100644 --- a/go/test/endtoend/vtgate/queries/misc/misc_test.go +++ b/go/test/endtoend/vtgate/queries/misc/misc_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func start(t *testing.T) (utils.MySQLCompare, func()) { diff --git a/go/test/endtoend/vtgate/queries/no_scatter/main_test.go b/go/test/endtoend/vtgate/queries/no_scatter/main_test.go index 7b5f0d96a4e..f0b31a658b5 100644 --- a/go/test/endtoend/vtgate/queries/no_scatter/main_test.go +++ b/go/test/endtoend/vtgate/queries/no_scatter/main_test.go @@ -22,8 +22,8 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/queries/no_scatter/queries_test.go b/go/test/endtoend/vtgate/queries/no_scatter/queries_test.go index fea12782645..f07214ca400 100644 --- a/go/test/endtoend/vtgate/queries/no_scatter/queries_test.go +++ b/go/test/endtoend/vtgate/queries/no_scatter/queries_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func start(t *testing.T) (*mysql.Conn, func()) { diff --git a/go/test/endtoend/vtgate/queries/normalize/main_test.go b/go/test/endtoend/vtgate/queries/normalize/main_test.go index 16296be5a97..08c4724bf0c 100644 --- a/go/test/endtoend/vtgate/queries/normalize/main_test.go +++ b/go/test/endtoend/vtgate/queries/normalize/main_test.go @@ -22,8 +22,8 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/queries/normalize/normalize_test.go b/go/test/endtoend/vtgate/queries/normalize/normalize_test.go index e06dba53bd4..91ca5ab0245 100644 --- a/go/test/endtoend/vtgate/queries/normalize/normalize_test.go +++ b/go/test/endtoend/vtgate/queries/normalize/normalize_test.go @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" ) func TestNormalizeAllFields(t *testing.T) { diff --git a/go/test/endtoend/vtgate/queries/orderby/main_test.go b/go/test/endtoend/vtgate/queries/orderby/main_test.go index aa2e0679ffc..de9070fb10b 100644 --- a/go/test/endtoend/vtgate/queries/orderby/main_test.go +++ b/go/test/endtoend/vtgate/queries/orderby/main_test.go @@ -23,10 +23,10 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/queries/orderby/orderby_test.go b/go/test/endtoend/vtgate/queries/orderby/orderby_test.go index c91ddd34c4e..f488d66ce5e 100644 --- a/go/test/endtoend/vtgate/queries/orderby/orderby_test.go +++ b/go/test/endtoend/vtgate/queries/orderby/orderby_test.go @@ -19,11 +19,11 @@ package orderby import ( "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) func start(t *testing.T) (utils.MySQLCompare, func()) { diff --git a/go/test/endtoend/vtgate/queries/orderby/without_schematracker/main_test.go b/go/test/endtoend/vtgate/queries/orderby/without_schematracker/main_test.go index 01f44eefb00..26e74e48c96 100644 --- a/go/test/endtoend/vtgate/queries/orderby/without_schematracker/main_test.go +++ b/go/test/endtoend/vtgate/queries/orderby/without_schematracker/main_test.go @@ -23,10 +23,10 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/queries/orderby/without_schematracker/orderby_test.go b/go/test/endtoend/vtgate/queries/orderby/without_schematracker/orderby_test.go index be2cebd28a2..69d4cf2eec0 100644 --- a/go/test/endtoend/vtgate/queries/orderby/without_schematracker/orderby_test.go +++ b/go/test/endtoend/vtgate/queries/orderby/without_schematracker/orderby_test.go @@ -19,11 +19,11 @@ package orderby import ( "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) func start(t *testing.T) (utils.MySQLCompare, func()) { diff --git a/go/test/endtoend/vtgate/queries/random/main_test.go b/go/test/endtoend/vtgate/queries/random/main_test.go index 011243ef9b9..fbca978e606 100644 --- a/go/test/endtoend/vtgate/queries/random/main_test.go +++ b/go/test/endtoend/vtgate/queries/random/main_test.go @@ -23,10 +23,10 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/queries/random/query_gen.go b/go/test/endtoend/vtgate/queries/random/query_gen.go index 0d1cd0c0c1e..779cf772366 100644 --- a/go/test/endtoend/vtgate/queries/random/query_gen.go +++ b/go/test/endtoend/vtgate/queries/random/query_gen.go @@ -21,9 +21,9 @@ import ( "math/rand/v2" "slices" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" ) // this file contains the structs and functions to generate random queries diff --git a/go/test/endtoend/vtgate/queries/random/random_expr_test.go b/go/test/endtoend/vtgate/queries/random/random_expr_test.go index 338f7d2100f..c0157f6556a 100644 --- a/go/test/endtoend/vtgate/queries/random/random_expr_test.go +++ b/go/test/endtoend/vtgate/queries/random/random_expr_test.go @@ -19,8 +19,8 @@ package random import ( "testing" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" ) // This test tests that generating random expressions with a schema does not panic diff --git a/go/test/endtoend/vtgate/queries/random/random_test.go b/go/test/endtoend/vtgate/queries/random/random_test.go index 16d6ce0e080..e58d602230b 100644 --- a/go/test/endtoend/vtgate/queries/random/random_test.go +++ b/go/test/endtoend/vtgate/queries/random/random_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/vt/sqlparser" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) // this test uses the AST defined in the sqlparser package to randomly generate queries diff --git a/go/test/endtoend/vtgate/queries/random/simplifier_test.go b/go/test/endtoend/vtgate/queries/random/simplifier_test.go index ee8a161d8fc..6afc2df0af5 100644 --- a/go/test/endtoend/vtgate/queries/random/simplifier_test.go +++ b/go/test/endtoend/vtgate/queries/random/simplifier_test.go @@ -21,16 +21,16 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/test/vschemawrapper" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/test/vschemawrapper" + "github.com/vitess/vitess/go/vt/vtenv" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder" - "github.com/mdibaiee/vitess/go/vt/vtgate/simplifier" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder" + "github.com/vitess/vitess/go/vt/vtgate/simplifier" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func TestSimplifyResultsMismatchedQuery(t *testing.T) { diff --git a/go/test/endtoend/vtgate/queries/reference/main_test.go b/go/test/endtoend/vtgate/queries/reference/main_test.go index 917d209b65d..875153131c3 100644 --- a/go/test/endtoend/vtgate/queries/reference/main_test.go +++ b/go/test/endtoend/vtgate/queries/reference/main_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/queries/reference/reference_test.go b/go/test/endtoend/vtgate/queries/reference/reference_test.go index 99e9612c046..477ffa62318 100644 --- a/go/test/endtoend/vtgate/queries/reference/reference_test.go +++ b/go/test/endtoend/vtgate/queries/reference/reference_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) func start(t *testing.T) (*mysql.Conn, func()) { diff --git a/go/test/endtoend/vtgate/queries/subquery/main_test.go b/go/test/endtoend/vtgate/queries/subquery/main_test.go index 2537591260c..f74fa0fab17 100644 --- a/go/test/endtoend/vtgate/queries/subquery/main_test.go +++ b/go/test/endtoend/vtgate/queries/subquery/main_test.go @@ -23,10 +23,10 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/queries/subquery/subquery_test.go b/go/test/endtoend/vtgate/queries/subquery/subquery_test.go index 955b0857f3c..6bca13da742 100644 --- a/go/test/endtoend/vtgate/queries/subquery/subquery_test.go +++ b/go/test/endtoend/vtgate/queries/subquery/subquery_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func start(t *testing.T) (utils.MySQLCompare, func()) { diff --git a/go/test/endtoend/vtgate/queries/timeout/main_test.go b/go/test/endtoend/vtgate/queries/timeout/main_test.go index 2ba889a29b5..b30c69d9901 100644 --- a/go/test/endtoend/vtgate/queries/timeout/main_test.go +++ b/go/test/endtoend/vtgate/queries/timeout/main_test.go @@ -23,10 +23,10 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/queries/timeout/timeout_test.go b/go/test/endtoend/vtgate/queries/timeout/timeout_test.go index 46249c3ec56..c0b090d008f 100644 --- a/go/test/endtoend/vtgate/queries/timeout/timeout_test.go +++ b/go/test/endtoend/vtgate/queries/timeout/timeout_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func start(t *testing.T) (utils.MySQLCompare, func()) { diff --git a/go/test/endtoend/vtgate/queries/tpch/main_test.go b/go/test/endtoend/vtgate/queries/tpch/main_test.go index a7596ff77e7..deeb728c8b1 100644 --- a/go/test/endtoend/vtgate/queries/tpch/main_test.go +++ b/go/test/endtoend/vtgate/queries/tpch/main_test.go @@ -23,9 +23,9 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) var ( diff --git a/go/test/endtoend/vtgate/queries/tpch/tpch_test.go b/go/test/endtoend/vtgate/queries/tpch/tpch_test.go index 4a9dd0d1117..ed975271975 100644 --- a/go/test/endtoend/vtgate/queries/tpch/tpch_test.go +++ b/go/test/endtoend/vtgate/queries/tpch/tpch_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func start(t *testing.T) (utils.MySQLCompare, func()) { diff --git a/go/test/endtoend/vtgate/queries/union/main_test.go b/go/test/endtoend/vtgate/queries/union/main_test.go index b02e09ed5af..0b7e81e83ac 100644 --- a/go/test/endtoend/vtgate/queries/union/main_test.go +++ b/go/test/endtoend/vtgate/queries/union/main_test.go @@ -23,9 +23,9 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) var ( diff --git a/go/test/endtoend/vtgate/queries/union/union_test.go b/go/test/endtoend/vtgate/queries/union/union_test.go index 12807e05d87..1d43c02f910 100644 --- a/go/test/endtoend/vtgate/queries/union/union_test.go +++ b/go/test/endtoend/vtgate/queries/union/union_test.go @@ -19,8 +19,8 @@ package union import ( "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/go/test/endtoend/vtgate/queries/vexplain/main_test.go b/go/test/endtoend/vtgate/queries/vexplain/main_test.go index 25e773c4744..028068a7506 100644 --- a/go/test/endtoend/vtgate/queries/vexplain/main_test.go +++ b/go/test/endtoend/vtgate/queries/vexplain/main_test.go @@ -22,10 +22,10 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/queries/vexplain/vexplain_test.go b/go/test/endtoend/vtgate/queries/vexplain/vexplain_test.go index da5ddab795f..bab1754a1ab 100644 --- a/go/test/endtoend/vtgate/queries/vexplain/vexplain_test.go +++ b/go/test/endtoend/vtgate/queries/vexplain/vexplain_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func start(t *testing.T) (*mysql.Conn, func()) { diff --git a/go/test/endtoend/vtgate/readafterwrite/raw_test.go b/go/test/endtoend/vtgate/readafterwrite/raw_test.go index 738d4035c48..448328f7a1f 100644 --- a/go/test/endtoend/vtgate/readafterwrite/raw_test.go +++ b/go/test/endtoend/vtgate/readafterwrite/raw_test.go @@ -22,12 +22,12 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/reservedconn/get_lock_test.go b/go/test/endtoend/vtgate/reservedconn/get_lock_test.go index bcf34d3d1b9..8f2dde9c3e3 100644 --- a/go/test/endtoend/vtgate/reservedconn/get_lock_test.go +++ b/go/test/endtoend/vtgate/reservedconn/get_lock_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" ) func TestLockUnlock(t *testing.T) { diff --git a/go/test/endtoend/vtgate/reservedconn/main_test.go b/go/test/endtoend/vtgate/reservedconn/main_test.go index f71bb13b826..ace2b4c2b00 100644 --- a/go/test/endtoend/vtgate/reservedconn/main_test.go +++ b/go/test/endtoend/vtgate/reservedconn/main_test.go @@ -22,13 +22,13 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/test/endtoend/utils" + querypb "github.com/vitess/vitess/go/vt/proto/query" "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/reservedconn/reconnect1/main_test.go b/go/test/endtoend/vtgate/reservedconn/reconnect1/main_test.go index e3fd17c64d9..186106df343 100644 --- a/go/test/endtoend/vtgate/reservedconn/reconnect1/main_test.go +++ b/go/test/endtoend/vtgate/reservedconn/reconnect1/main_test.go @@ -22,14 +22,14 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/reservedconn/reconnect2/main_test.go b/go/test/endtoend/vtgate/reservedconn/reconnect2/main_test.go index 3a9d9673f3b..81e06ca1010 100644 --- a/go/test/endtoend/vtgate/reservedconn/reconnect2/main_test.go +++ b/go/test/endtoend/vtgate/reservedconn/reconnect2/main_test.go @@ -23,14 +23,14 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/reservedconn/reconnect3/main_test.go b/go/test/endtoend/vtgate/reservedconn/reconnect3/main_test.go index 8185499ddae..9259b07dc56 100644 --- a/go/test/endtoend/vtgate/reservedconn/reconnect3/main_test.go +++ b/go/test/endtoend/vtgate/reservedconn/reconnect3/main_test.go @@ -22,12 +22,12 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/reservedconn/reconnect4/main_test.go b/go/test/endtoend/vtgate/reservedconn/reconnect4/main_test.go index 22c18b21a3d..64957dc00d1 100644 --- a/go/test/endtoend/vtgate/reservedconn/reconnect4/main_test.go +++ b/go/test/endtoend/vtgate/reservedconn/reconnect4/main_test.go @@ -22,12 +22,12 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/reservedconn/sysvar_test.go b/go/test/endtoend/vtgate/reservedconn/sysvar_test.go index e88c30f0e2a..a8e45844d84 100644 --- a/go/test/endtoend/vtgate/reservedconn/sysvar_test.go +++ b/go/test/endtoend/vtgate/reservedconn/sysvar_test.go @@ -22,14 +22,14 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) func TestSetSysVarSingle(t *testing.T) { diff --git a/go/test/endtoend/vtgate/reservedconn/udv_test.go b/go/test/endtoend/vtgate/reservedconn/udv_test.go index a66c7c23809..59aaebf4171 100644 --- a/go/test/endtoend/vtgate/reservedconn/udv_test.go +++ b/go/test/endtoend/vtgate/reservedconn/udv_test.go @@ -21,17 +21,17 @@ import ( "fmt" "testing" - utils2 "github.com/mdibaiee/vitess/go/test/endtoend/utils" + utils2 "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) func TestSetUDV(t *testing.T) { diff --git a/go/test/endtoend/vtgate/schema/schema_test.go b/go/test/endtoend/vtgate/schema/schema_test.go index aa3e3b39000..3a4fddfb3b7 100644 --- a/go/test/endtoend/vtgate/schema/schema_test.go +++ b/go/test/endtoend/vtgate/schema/schema_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/schematracker/loadkeyspace/schema_load_keyspace_test.go b/go/test/endtoend/vtgate/schematracker/loadkeyspace/schema_load_keyspace_test.go index c7c7107a3df..4e04f24ed2d 100644 --- a/go/test/endtoend/vtgate/schematracker/loadkeyspace/schema_load_keyspace_test.go +++ b/go/test/endtoend/vtgate/schematracker/loadkeyspace/schema_load_keyspace_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/schematracker/restarttablet/schema_restart_test.go b/go/test/endtoend/vtgate/schematracker/restarttablet/schema_restart_test.go index 9bf9cb5b684..07c91805a5a 100644 --- a/go/test/endtoend/vtgate/schematracker/restarttablet/schema_restart_test.go +++ b/go/test/endtoend/vtgate/schematracker/restarttablet/schema_restart_test.go @@ -26,14 +26,14 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/require" "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/schematracker/sharded/st_sharded_test.go b/go/test/endtoend/vtgate/schematracker/sharded/st_sharded_test.go index 316f0941d5d..237881f739c 100644 --- a/go/test/endtoend/vtgate/schematracker/sharded/st_sharded_test.go +++ b/go/test/endtoend/vtgate/schematracker/sharded/st_sharded_test.go @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) var ( diff --git a/go/test/endtoend/vtgate/schematracker/sharded_prs/st_sharded_test.go b/go/test/endtoend/vtgate/schematracker/sharded_prs/st_sharded_test.go index 4eaf447f84d..9d60d268b1d 100644 --- a/go/test/endtoend/vtgate/schematracker/sharded_prs/st_sharded_test.go +++ b/go/test/endtoend/vtgate/schematracker/sharded_prs/st_sharded_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/schematracker/unsharded/st_unsharded_test.go b/go/test/endtoend/vtgate/schematracker/unsharded/st_unsharded_test.go index 436449b0697..ff0fecbd92c 100644 --- a/go/test/endtoend/vtgate/schematracker/unsharded/st_unsharded_test.go +++ b/go/test/endtoend/vtgate/schematracker/unsharded/st_unsharded_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/sec_vind/main_test.go b/go/test/endtoend/vtgate/sec_vind/main_test.go index 9348285a563..1f995b95a8f 100644 --- a/go/test/endtoend/vtgate/sec_vind/main_test.go +++ b/go/test/endtoend/vtgate/sec_vind/main_test.go @@ -23,12 +23,12 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/sequence/seq_test.go b/go/test/endtoend/vtgate/sequence/seq_test.go index 7cc578afe41..51a1c772979 100644 --- a/go/test/endtoend/vtgate/sequence/seq_test.go +++ b/go/test/endtoend/vtgate/sequence/seq_test.go @@ -24,15 +24,15 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/tablet_healthcheck/reparent_test.go b/go/test/endtoend/vtgate/tablet_healthcheck/reparent_test.go index 0403bd4cfdd..669328f467f 100644 --- a/go/test/endtoend/vtgate/tablet_healthcheck/reparent_test.go +++ b/go/test/endtoend/vtgate/tablet_healthcheck/reparent_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/tablet_healthcheck_cache/correctness_test.go b/go/test/endtoend/vtgate/tablet_healthcheck_cache/correctness_test.go index d549cc510e9..86d8d2bfab7 100644 --- a/go/test/endtoend/vtgate/tablet_healthcheck_cache/correctness_test.go +++ b/go/test/endtoend/vtgate/tablet_healthcheck_cache/correctness_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/transaction/restart/main_test.go b/go/test/endtoend/vtgate/transaction/restart/main_test.go index 4985d2e0ba6..8bd5d9713d1 100644 --- a/go/test/endtoend/vtgate/transaction/restart/main_test.go +++ b/go/test/endtoend/vtgate/transaction/restart/main_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" ) var ( diff --git a/go/test/endtoend/vtgate/transaction/rollback/txn_rollback_shutdown_test.go b/go/test/endtoend/vtgate/transaction/rollback/txn_rollback_shutdown_test.go index 84424b43137..5618e9a1952 100644 --- a/go/test/endtoend/vtgate/transaction/rollback/txn_rollback_shutdown_test.go +++ b/go/test/endtoend/vtgate/transaction/rollback/txn_rollback_shutdown_test.go @@ -23,14 +23,14 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/require" "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/transaction/single/main_test.go b/go/test/endtoend/vtgate/transaction/single/main_test.go index ff5c6bc4b83..b49edf32d58 100644 --- a/go/test/endtoend/vtgate/transaction/single/main_test.go +++ b/go/test/endtoend/vtgate/transaction/single/main_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder" ) var ( diff --git a/go/test/endtoend/vtgate/transaction/twopc/main_test.go b/go/test/endtoend/vtgate/transaction/twopc/main_test.go index 302196b703b..4c1ed43c2fc 100644 --- a/go/test/endtoend/vtgate/transaction/twopc/main_test.go +++ b/go/test/endtoend/vtgate/transaction/twopc/main_test.go @@ -30,14 +30,14 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" ) var ( diff --git a/go/test/endtoend/vtgate/transaction/twopc/twopc_test.go b/go/test/endtoend/vtgate/transaction/twopc/twopc_test.go index 456f1c662cf..790e0c0690a 100644 --- a/go/test/endtoend/vtgate/transaction/twopc/twopc_test.go +++ b/go/test/endtoend/vtgate/transaction/twopc/twopc_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/utils" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // TestDTCommit tests distributed transaction commit for insert, update and delete operations diff --git a/go/test/endtoend/vtgate/transaction/tx_test.go b/go/test/endtoend/vtgate/transaction/tx_test.go index 52670faf3d8..f68fe001116 100644 --- a/go/test/endtoend/vtgate/transaction/tx_test.go +++ b/go/test/endtoend/vtgate/transaction/tx_test.go @@ -24,12 +24,12 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/unsharded/main_test.go b/go/test/endtoend/vtgate/unsharded/main_test.go index c0f6bf67d05..26692efca42 100644 --- a/go/test/endtoend/vtgate/unsharded/main_test.go +++ b/go/test/endtoend/vtgate/unsharded/main_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/log" + querypb "github.com/vitess/vitess/go/vt/proto/query" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/vindex_bindvars/main_test.go b/go/test/endtoend/vtgate/vindex_bindvars/main_test.go index 9dd9dbf6045..24aff9e40fd 100644 --- a/go/test/endtoend/vtgate/vindex_bindvars/main_test.go +++ b/go/test/endtoend/vtgate/vindex_bindvars/main_test.go @@ -23,13 +23,13 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtgate/vschema/vschema_test.go b/go/test/endtoend/vtgate/vschema/vschema_test.go index e25310733ca..6ce528f35ec 100644 --- a/go/test/endtoend/vtgate/vschema/vschema_test.go +++ b/go/test/endtoend/vtgate/vschema/vschema_test.go @@ -23,12 +23,12 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/test/endtoend/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" ) var ( diff --git a/go/test/endtoend/vtorc/api/api_test.go b/go/test/endtoend/vtorc/api/api_test.go index 07fa4e867ea..40103ba3057 100644 --- a/go/test/endtoend/vtorc/api/api_test.go +++ b/go/test/endtoend/vtorc/api/api_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/vtorc/utils" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/vtorc/utils" ) // TestAPIEndpoints tests the various API endpoints that VTOrc offers. diff --git a/go/test/endtoend/vtorc/api/main_test.go b/go/test/endtoend/vtorc/api/main_test.go index f7c9eefdde0..eb5087d08e8 100644 --- a/go/test/endtoend/vtorc/api/main_test.go +++ b/go/test/endtoend/vtorc/api/main_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/vtorc/utils" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/vtorc/utils" ) var clusterInfo *utils.VTOrcClusterInfo diff --git a/go/test/endtoend/vtorc/general/main_test.go b/go/test/endtoend/vtorc/general/main_test.go index 9556cce0186..28c224bb472 100644 --- a/go/test/endtoend/vtorc/general/main_test.go +++ b/go/test/endtoend/vtorc/general/main_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/vtorc/utils" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/vtorc/utils" ) var clusterInfo *utils.VTOrcClusterInfo diff --git a/go/test/endtoend/vtorc/general/vtorc_test.go b/go/test/endtoend/vtorc/general/vtorc_test.go index 2b2eea0eec1..866847d3cc2 100644 --- a/go/test/endtoend/vtorc/general/vtorc_test.go +++ b/go/test/endtoend/vtorc/general/vtorc_test.go @@ -25,12 +25,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/vtorc/utils" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtorc/inst" - "github.com/mdibaiee/vitess/go/vt/vtorc/logic" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/vtorc/utils" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtorc/inst" + "github.com/vitess/vitess/go/vt/vtorc/logic" ) // Cases to test: diff --git a/go/test/endtoend/vtorc/primaryfailure/main_test.go b/go/test/endtoend/vtorc/primaryfailure/main_test.go index 1a8d8945668..488c74638af 100644 --- a/go/test/endtoend/vtorc/primaryfailure/main_test.go +++ b/go/test/endtoend/vtorc/primaryfailure/main_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/vtorc/utils" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/vtorc/utils" ) var clusterInfo *utils.VTOrcClusterInfo diff --git a/go/test/endtoend/vtorc/primaryfailure/primary_failure_test.go b/go/test/endtoend/vtorc/primaryfailure/primary_failure_test.go index 10725535609..176768ffdf6 100644 --- a/go/test/endtoend/vtorc/primaryfailure/primary_failure_test.go +++ b/go/test/endtoend/vtorc/primaryfailure/primary_failure_test.go @@ -29,9 +29,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/vtorc/utils" - "github.com/mdibaiee/vitess/go/vt/vtorc/logic" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/vtorc/utils" + "github.com/vitess/vitess/go/vt/vtorc/logic" ) // bring down primary, let orc promote replica diff --git a/go/test/endtoend/vtorc/readtopologyinstance/main_test.go b/go/test/endtoend/vtorc/readtopologyinstance/main_test.go index 4cfbe7f4d07..95c362485a4 100644 --- a/go/test/endtoend/vtorc/readtopologyinstance/main_test.go +++ b/go/test/endtoend/vtorc/readtopologyinstance/main_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/test/endtoend/vtorc/utils" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" - "github.com/mdibaiee/vitess/go/vt/vtorc/inst" - "github.com/mdibaiee/vitess/go/vt/vtorc/logic" - "github.com/mdibaiee/vitess/go/vt/vtorc/server" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/test/endtoend/vtorc/utils" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/inst" + "github.com/vitess/vitess/go/vt/vtorc/logic" + "github.com/vitess/vitess/go/vt/vtorc/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/go/test/endtoend/vtorc/utils/utils.go b/go/test/endtoend/vtorc/utils/utils.go index 74b31967459..70ad1c16841 100644 --- a/go/test/endtoend/vtorc/utils/utils.go +++ b/go/test/endtoend/vtorc/utils/utils.go @@ -33,18 +33,18 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/endtoend/cluster" - "github.com/mdibaiee/vitess/go/vt/log" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/endtoend/cluster" + "github.com/vitess/vitess/go/vt/log" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" // Register topo implementations. - _ "github.com/mdibaiee/vitess/go/vt/topo/consultopo" - _ "github.com/mdibaiee/vitess/go/vt/topo/etcd2topo" - _ "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + _ "github.com/vitess/vitess/go/vt/topo/consultopo" + _ "github.com/vitess/vitess/go/vt/topo/etcd2topo" + _ "github.com/vitess/vitess/go/vt/topo/zk2topo" ) const ( diff --git a/go/test/fuzzing/ast_fuzzer.go b/go/test/fuzzing/ast_fuzzer.go index 64cb71e3fd4..e7bca64d995 100644 --- a/go/test/fuzzing/ast_fuzzer.go +++ b/go/test/fuzzing/ast_fuzzer.go @@ -19,7 +19,7 @@ package fuzzing import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) // FuzzEqualsSQLNode implements the fuzzer diff --git a/go/test/fuzzing/autogenerate/convert_grep_to_fuzzer.go b/go/test/fuzzing/autogenerate/convert_grep_to_fuzzer.go index a39746157d8..6d132379fde 100644 --- a/go/test/fuzzing/autogenerate/convert_grep_to_fuzzer.go +++ b/go/test/fuzzing/autogenerate/convert_grep_to_fuzzer.go @@ -23,7 +23,7 @@ go run convert_grep_to_fuzzer.go # The fuzzer has now been built. # To instruct OSS-fuzz to build the autogenerated fuzzer: mv api_marshal_fuzzer.go ../ -compile_go_fuzzer github.com/mdibaiee/vitess/go/test/fuzzing FuzzAPIMarshal api_marshal_fuzzer +compile_go_fuzzer github.com/vitess/vitess/go/test/fuzzing FuzzAPIMarshal api_marshal_fuzzer */ package main @@ -37,47 +37,47 @@ import ( // importPathShort is a map to convert import paths to import aliases var importPathShort = map[string]string{ - "github.com/mdibaiee/vitess/go/vt/proto/query": "query", - "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata": "tabletmanagerdata", - "github.com/mdibaiee/vitess/go/vt/proto/binlogdata": "binlogdata", - "github.com/mdibaiee/vitess/go/vt/proto/vtgate": "vtgate", - "github.com/mdibaiee/vitess/go/vt/proto/automation": "automation", - "github.com/mdibaiee/vitess/go/vt/proto/tableacl": "tableacl", - "github.com/mdibaiee/vitess/go/vt/proto/logutil": "logutil", - "github.com/mdibaiee/vitess/go/vt/proto/vttest": "vttest", - "github.com/mdibaiee/vitess/go/vt/proto/vttime": "vttime", - "github.com/mdibaiee/vitess/go/vt/proto/workflow": "workflow", - "github.com/mdibaiee/vitess/go/vt/proto/replicationdata": "replicationdata", - "github.com/mdibaiee/vitess/go/vt/proto/vtctldata": "vtctldata", - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc": "vtrpc", - "github.com/mdibaiee/vitess/go/vt/proto/vschema": "vschema", - "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl": "mysqlctl", - "github.com/mdibaiee/vitess/go/vt/proto/vtadmin": "vtadmin", - "github.com/mdibaiee/vitess/go/vt/proto/throttlerdata": "throttlerdata", - "github.com/mdibaiee/vitess/go/vt/proto/topodata": "topodata", + "github.com/vitess/vitess/go/vt/proto/query": "query", + "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata": "tabletmanagerdata", + "github.com/vitess/vitess/go/vt/proto/binlogdata": "binlogdata", + "github.com/vitess/vitess/go/vt/proto/vtgate": "vtgate", + "github.com/vitess/vitess/go/vt/proto/automation": "automation", + "github.com/vitess/vitess/go/vt/proto/tableacl": "tableacl", + "github.com/vitess/vitess/go/vt/proto/logutil": "logutil", + "github.com/vitess/vitess/go/vt/proto/vttest": "vttest", + "github.com/vitess/vitess/go/vt/proto/vttime": "vttime", + "github.com/vitess/vitess/go/vt/proto/workflow": "workflow", + "github.com/vitess/vitess/go/vt/proto/replicationdata": "replicationdata", + "github.com/vitess/vitess/go/vt/proto/vtctldata": "vtctldata", + "github.com/vitess/vitess/go/vt/proto/vtrpc": "vtrpc", + "github.com/vitess/vitess/go/vt/proto/vschema": "vschema", + "github.com/vitess/vitess/go/vt/proto/mysqlctl": "mysqlctl", + "github.com/vitess/vitess/go/vt/proto/vtadmin": "vtadmin", + "github.com/vitess/vitess/go/vt/proto/throttlerdata": "throttlerdata", + "github.com/vitess/vitess/go/vt/proto/topodata": "topodata", } // pathToImportPath is a map to convert filepaths to import paths. // the filepaths are available in the grep results. var pathToImportPath = map[string]string{ - "./proto/query/query_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/query", - "./proto/tabletmanagerdata/tabletmanagerdata_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata", - "./proto/binlogdata/binlogdata_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/binlogdata", - "./proto/vtgate/vtgate_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/vtgate", - "./proto/automation/automation_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/automation", - "./proto/tableacl/tableacl_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/tableacl", - "./proto/logutil/logutil_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/logutil", - "./proto/vttest/vttest_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/vttest", - "./proto/vttime/vttime_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/vttime", - "./proto/workflow/workflow_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/workflow", - "./proto/replicationdata/replicationdata_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/replicationdata", - "./proto/vtctldata/vtctldata_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/vtctldata", - "./proto/vtrpc/vtrpc_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/vtrpc", - "./proto/vschema/vschema_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/vschema", - "./proto/mysqlctl/mysqlctl_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl", - "./proto/vtadmin/vtadmin_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/vtadmin", - "./proto/throttlerdata/throttlerdata_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/throttlerdata", - "./proto/topodata/topodata_vtproto.pb.go": "github.com/mdibaiee/vitess/go/vt/proto/topodata", + "./proto/query/query_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/query", + "./proto/tabletmanagerdata/tabletmanagerdata_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata", + "./proto/binlogdata/binlogdata_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/binlogdata", + "./proto/vtgate/vtgate_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/vtgate", + "./proto/automation/automation_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/automation", + "./proto/tableacl/tableacl_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/tableacl", + "./proto/logutil/logutil_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/logutil", + "./proto/vttest/vttest_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/vttest", + "./proto/vttime/vttime_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/vttime", + "./proto/workflow/workflow_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/workflow", + "./proto/replicationdata/replicationdata_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/replicationdata", + "./proto/vtctldata/vtctldata_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/vtctldata", + "./proto/vtrpc/vtrpc_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/vtrpc", + "./proto/vschema/vschema_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/vschema", + "./proto/mysqlctl/mysqlctl_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/mysqlctl", + "./proto/vtadmin/vtadmin_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/vtadmin", + "./proto/throttlerdata/throttlerdata_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/throttlerdata", + "./proto/topodata/topodata_vtproto.pb.go": "github.com/vitess/vitess/go/vt/proto/topodata", } // contains checks if a string is present in a string slice diff --git a/go/test/fuzzing/oss_fuzz_build.sh b/go/test/fuzzing/oss_fuzz_build.sh index e8c1eca81f2..2f85e389fce 100755 --- a/go/test/fuzzing/oss_fuzz_build.sh +++ b/go/test/fuzzing/oss_fuzz_build.sh @@ -51,52 +51,52 @@ grep -r ') Unmarshal' .>>/tmp/marshal_targets.txt cd $SRC/vitess/go/test/fuzzing/autogenerate go run convert_grep_to_fuzzer.go mv api_marshal_fuzzer.go $SRC/vitess/go/test/fuzzing/ -compile_go_fuzzer github.com/mdibaiee/vitess/go/test/fuzzing FuzzAPIMarshal api_marshal_fuzzer +compile_go_fuzzer github.com/vitess/vitess/go/test/fuzzing FuzzAPIMarshal api_marshal_fuzzer # collation fuzzer mv ./go/mysql/collations/uca_test.go \ ./go/mysql/collations/uca_test_fuzz.go -compile_go_fuzzer github.com/mdibaiee/vitess/go/mysql/collations FuzzCollations fuzz_collations +compile_go_fuzzer github.com/vitess/vitess/go/mysql/collations FuzzCollations fuzz_collations -compile_go_fuzzer github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder FuzzTestBuilder fuzz_test_builder gofuzz -compile_go_fuzzer github.com/mdibaiee/vitess/go/vt/vtgate/vindexes FuzzVindex fuzz_vindex -compile_go_fuzzer github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication FuzzEngine fuzz_replication_engine -compile_go_fuzzer github.com/mdibaiee/vitess/go/vt/vtgate/engine FuzzEngine engine_fuzzer +compile_go_fuzzer github.com/vitess/vitess/go/vt/vtgate/planbuilder FuzzTestBuilder fuzz_test_builder gofuzz +compile_go_fuzzer github.com/vitess/vitess/go/vt/vtgate/vindexes FuzzVindex fuzz_vindex +compile_go_fuzzer github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication FuzzEngine fuzz_replication_engine +compile_go_fuzzer github.com/vitess/vitess/go/vt/vtgate/engine FuzzEngine engine_fuzzer -compile_go_fuzzer github.com/mdibaiee/vitess/go/test/fuzzing Fuzz vtctl_fuzzer -compile_go_fuzzer github.com/mdibaiee/vitess/go/test/fuzzing FuzzIsDML is_dml_fuzzer -compile_go_fuzzer github.com/mdibaiee/vitess/go/test/fuzzing FuzzNormalizer normalizer_fuzzer -compile_go_fuzzer github.com/mdibaiee/vitess/go/test/fuzzing FuzzParser parser_fuzzer -compile_go_fuzzer github.com/mdibaiee/vitess/go/test/fuzzing FuzzNodeFormat fuzz_node_format -compile_go_fuzzer github.com/mdibaiee/vitess/go/test/fuzzing FuzzGRPCTMServer fuzz_grpc_tm_server -compile_go_fuzzer github.com/mdibaiee/vitess/go/test/fuzzing FuzzOnlineDDLFromCommentedStatement fuzz_online_ddl_from_commented_statement -compile_go_fuzzer github.com/mdibaiee/vitess/go/test/fuzzing FuzzNewOnlineDDLs fuzz_new_online_ddls -compile_go_fuzzer github.com/mdibaiee/vitess/go/test/fuzzing FuzzEqualsSQLNode fuzz_equals_sql_node -compile_go_fuzzer github.com/mdibaiee/vitess/go/test/fuzzing FuzzSplitStatementToPieces fuzz_split_statement_to_pieces -compile_go_fuzzer github.com/mdibaiee/vitess/go/test/fuzzing FuzzTabletManager_ExecuteFetchAsDba fuzz_tablet_manager_execute_fetch_as_dba -compile_go_fuzzer github.com/mdibaiee/vitess/go/test/fuzzing FuzzUnmarshalJSON fuzz_tabletserver_rules_unmarshal_json -compile_go_fuzzer github.com/mdibaiee/vitess/go/test/fuzzing FuzzLoadTable fuzz_load_table +compile_go_fuzzer github.com/vitess/vitess/go/test/fuzzing Fuzz vtctl_fuzzer +compile_go_fuzzer github.com/vitess/vitess/go/test/fuzzing FuzzIsDML is_dml_fuzzer +compile_go_fuzzer github.com/vitess/vitess/go/test/fuzzing FuzzNormalizer normalizer_fuzzer +compile_go_fuzzer github.com/vitess/vitess/go/test/fuzzing FuzzParser parser_fuzzer +compile_go_fuzzer github.com/vitess/vitess/go/test/fuzzing FuzzNodeFormat fuzz_node_format +compile_go_fuzzer github.com/vitess/vitess/go/test/fuzzing FuzzGRPCTMServer fuzz_grpc_tm_server +compile_go_fuzzer github.com/vitess/vitess/go/test/fuzzing FuzzOnlineDDLFromCommentedStatement fuzz_online_ddl_from_commented_statement +compile_go_fuzzer github.com/vitess/vitess/go/test/fuzzing FuzzNewOnlineDDLs fuzz_new_online_ddls +compile_go_fuzzer github.com/vitess/vitess/go/test/fuzzing FuzzEqualsSQLNode fuzz_equals_sql_node +compile_go_fuzzer github.com/vitess/vitess/go/test/fuzzing FuzzSplitStatementToPieces fuzz_split_statement_to_pieces +compile_go_fuzzer github.com/vitess/vitess/go/test/fuzzing FuzzTabletManager_ExecuteFetchAsDba fuzz_tablet_manager_execute_fetch_as_dba +compile_go_fuzzer github.com/vitess/vitess/go/test/fuzzing FuzzUnmarshalJSON fuzz_tabletserver_rules_unmarshal_json +compile_go_fuzzer github.com/vitess/vitess/go/test/fuzzing FuzzLoadTable fuzz_load_table -compile_go_fuzzer github.com/mdibaiee/vitess/go/mysql FuzzWritePacket write_packet_fuzzer -compile_go_fuzzer github.com/mdibaiee/vitess/go/mysql FuzzHandleNextCommand handle_next_command_fuzzer -compile_go_fuzzer github.com/mdibaiee/vitess/go/mysql FuzzReadQueryResults read_query_results_fuzzer -compile_go_fuzzer github.com/mdibaiee/vitess/go/mysql FuzzTLSServer fuzz_tls +compile_go_fuzzer github.com/vitess/vitess/go/mysql FuzzWritePacket write_packet_fuzzer +compile_go_fuzzer github.com/vitess/vitess/go/mysql FuzzHandleNextCommand handle_next_command_fuzzer +compile_go_fuzzer github.com/vitess/vitess/go/mysql FuzzReadQueryResults read_query_results_fuzzer +compile_go_fuzzer github.com/vitess/vitess/go/mysql FuzzTLSServer fuzz_tls -compile_go_fuzzer github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/vstreamer Fuzz vstreamer_planbuilder_fuzzer -compile_go_fuzzer github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver FuzzGetPlan fuzz_get_plan +compile_go_fuzzer github.com/vitess/vitess/go/vt/vttablet/tabletserver/vstreamer Fuzz vstreamer_planbuilder_fuzzer +compile_go_fuzzer github.com/vitess/vitess/go/vt/vttablet/tabletserver FuzzGetPlan fuzz_get_plan # Several test utils are needed from suite_test.go: mv ./go/vt/vtgate/grpcvtgateconn/suite_test.go \ ./go/vt/vtgate/grpcvtgateconn/suite_test_fuzz.go mv ./go/vt/vtgate/grpcvtgateconn/fuzz_flaky_test.go \ ./go/vt/vtgate/grpcvtgateconn/fuzz.go -compile_go_fuzzer github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateconn Fuzz grpc_vtgate_fuzzer +compile_go_fuzzer github.com/vitess/vitess/go/vt/vtgate/grpcvtgateconn Fuzz grpc_vtgate_fuzzer -compile_go_fuzzer github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/abstract FuzzAnalyse fuzz_analyse gofuzz +compile_go_fuzzer github.com/vitess/vitess/go/vt/vtgate/planbuilder/abstract FuzzAnalyse fuzz_analyse gofuzz diff --git a/go/test/fuzzing/parser_fuzzer.go b/go/test/fuzzing/parser_fuzzer.go index dd56d4bc09e..7b0a2d8f603 100644 --- a/go/test/fuzzing/parser_fuzzer.go +++ b/go/test/fuzzing/parser_fuzzer.go @@ -20,8 +20,8 @@ limitations under the License. package fuzzing import ( - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" fuzz "github.com/AdaLogics/go-fuzz-headers" ) diff --git a/go/test/fuzzing/tablet_manager_fuzzer.go b/go/test/fuzzing/tablet_manager_fuzzer.go index 460ee125739..e41136bd95c 100644 --- a/go/test/fuzzing/tablet_manager_fuzzer.go +++ b/go/test/fuzzing/tablet_manager_fuzzer.go @@ -18,15 +18,15 @@ import ( "sync" "testing" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletservermock" - - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager" + "github.com/vitess/vitess/go/vt/vttablet/tabletservermock" + + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) var fuzzInitter sync.Once diff --git a/go/test/fuzzing/tabletserver_rules_fuzzer.go b/go/test/fuzzing/tabletserver_rules_fuzzer.go index f6136c7d6ba..019dbbfc39f 100644 --- a/go/test/fuzzing/tabletserver_rules_fuzzer.go +++ b/go/test/fuzzing/tabletserver_rules_fuzzer.go @@ -14,7 +14,7 @@ limitations under the License. package fuzzing import ( - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules" ) func FuzzUnmarshalJSON(data []byte) int { diff --git a/go/test/fuzzing/tabletserver_schema_fuzzer.go b/go/test/fuzzing/tabletserver_schema_fuzzer.go index 515b1934891..f00d7115cf8 100644 --- a/go/test/fuzzing/tabletserver_schema_fuzzer.go +++ b/go/test/fuzzing/tabletserver_schema_fuzzer.go @@ -19,14 +19,14 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" fuzz "github.com/AdaLogics/go-fuzz-headers" ) diff --git a/go/test/fuzzing/vt_schema_fuzzer.go b/go/test/fuzzing/vt_schema_fuzzer.go index ce803e132c3..c1c90deb29c 100644 --- a/go/test/fuzzing/vt_schema_fuzzer.go +++ b/go/test/fuzzing/vt_schema_fuzzer.go @@ -19,8 +19,8 @@ package fuzzing import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" ) // FuzzOnlineDDLFromCommentedStatement implements a fuzzer diff --git a/go/test/fuzzing/vtctl_fuzzer.go b/go/test/fuzzing/vtctl_fuzzer.go index da1f525d752..e409e9f7ded 100644 --- a/go/test/fuzzing/vtctl_fuzzer.go +++ b/go/test/fuzzing/vtctl_fuzzer.go @@ -20,14 +20,14 @@ import ( "context" "strings" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtctl" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclienttest" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtctl" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/vttablet/tmclienttest" + "github.com/vitess/vitess/go/vt/wrangler" ) func init() { diff --git a/go/test/fuzzing/vttablet_fuzzer.go b/go/test/fuzzing/vttablet_fuzzer.go index 430af935fb5..0239fac1dfa 100644 --- a/go/test/fuzzing/vttablet_fuzzer.go +++ b/go/test/fuzzing/vttablet_fuzzer.go @@ -24,13 +24,13 @@ import ( "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmclient" - "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmserver" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmrpctest" + "github.com/vitess/vitess/go/vt/vttablet/grpctmclient" + "github.com/vitess/vitess/go/vt/vttablet/grpctmserver" + "github.com/vitess/vitess/go/vt/vttablet/tmrpctest" fuzz "github.com/AdaLogics/go-fuzz-headers" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func onceInit() { diff --git a/go/test/stress/stress.go b/go/test/stress/stress.go index 4b211337e0e..55715e64d41 100644 --- a/go/test/stress/stress.go +++ b/go/test/stress/stress.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" ) const ( diff --git a/go/test/stress/utils.go b/go/test/stress/utils.go index 7188f254564..be20b6dd302 100644 --- a/go/test/stress/utils.go +++ b/go/test/stress/utils.go @@ -23,8 +23,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" ) func (s *Stresser) assertLength(conn *mysql.Conn, query string, expectedLength int) bool { diff --git a/go/test/utils/noleak.go b/go/test/utils/noleak.go index 542a362a601..addb0311402 100644 --- a/go/test/utils/noleak.go +++ b/go/test/utils/noleak.go @@ -74,13 +74,13 @@ func ensureNoGoroutines() error { var ignored = []goleak.Option{ goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), - goleak.IgnoreTopFunction("github.com/mdibaiee/vitess/go/vt/dbconfigs.init.0.func1"), - goleak.IgnoreTopFunction("github.com/mdibaiee/vitess/go/vt/vtgate.resetAggregators"), - goleak.IgnoreTopFunction("github.com/mdibaiee/vitess/go/vt/vtgate.processQueryInfo"), + goleak.IgnoreTopFunction("github.com/vitess/vitess/go/vt/dbconfigs.init.0.func1"), + goleak.IgnoreTopFunction("github.com/vitess/vitess/go/vt/vtgate.resetAggregators"), + goleak.IgnoreTopFunction("github.com/vitess/vitess/go/vt/vtgate.processQueryInfo"), goleak.IgnoreTopFunction("github.com/patrickmn/go-cache.(*janitor).Run"), - goleak.IgnoreTopFunction("github.com/mdibaiee/vitess/go/vt/logutil.(*ThrottledLogger).log.func1"), - goleak.IgnoreTopFunction("github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle.initThrottleTicker.func1.1"), - goleak.IgnoreTopFunction("github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle.NewBackgroundClient.initThrottleTicker.func1.1"), + goleak.IgnoreTopFunction("github.com/vitess/vitess/go/vt/logutil.(*ThrottledLogger).log.func1"), + goleak.IgnoreTopFunction("github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle.initThrottleTicker.func1.1"), + goleak.IgnoreTopFunction("github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle.NewBackgroundClient.initThrottleTicker.func1.1"), goleak.IgnoreTopFunction("testing.tRunner.func1"), } diff --git a/go/test/vschemawrapper/vschema_wrapper.go b/go/test/vschemawrapper/vschema_wrapper.go index 8cc098b3b72..a3171d053d3 100644 --- a/go/test/vschemawrapper/vschema_wrapper.go +++ b/go/test/vschemawrapper/vschema_wrapper.go @@ -21,21 +21,21 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var _ plancontext.VSchema = (*VSchemaWrapper)(nil) diff --git a/go/textutil/strings.go b/go/textutil/strings.go index d17d67adbf4..4efb343183b 100644 --- a/go/textutil/strings.go +++ b/go/textutil/strings.go @@ -23,10 +23,10 @@ import ( "strings" "unicode" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) type TruncationLocation int diff --git a/go/textutil/strings_test.go b/go/textutil/strings_test.go index c9be9de247b..5375664d93e 100644 --- a/go/textutil/strings_test.go +++ b/go/textutil/strings_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestSplitDelimitedList(t *testing.T) { diff --git a/go/tools/astfmtgen/main.go b/go/tools/astfmtgen/main.go index 0668d66af2e..58a455228d9 100644 --- a/go/tools/astfmtgen/main.go +++ b/go/tools/astfmtgen/main.go @@ -32,7 +32,7 @@ import ( "golang.org/x/tools/go/ast/astutil" "golang.org/x/tools/go/packages" - "github.com/mdibaiee/vitess/go/tools/codegen" + "github.com/vitess/vitess/go/tools/codegen" ) func main() { diff --git a/go/tools/asthelpergen/asthelpergen.go b/go/tools/asthelpergen/asthelpergen.go index e96a815ab9b..224cb0a6f7a 100644 --- a/go/tools/asthelpergen/asthelpergen.go +++ b/go/tools/asthelpergen/asthelpergen.go @@ -28,8 +28,8 @@ import ( "github.com/dave/jennifer/jen" "golang.org/x/tools/go/packages" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/tools/codegen" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/tools/codegen" ) const licenseFileHeader = `Copyright 2023 The Vitess Authors. @@ -78,7 +78,7 @@ type ( ) // exprInterfacePath is the path of the sqlparser.Expr interface. -const exprInterfacePath = "github.com/mdibaiee/vitess/go/vt/sqlparser.Expr" +const exprInterfacePath = "github.com/vitess/vitess/go/vt/sqlparser.Expr" func (gen *astHelperGen) iface() *types.Interface { return gen._iface diff --git a/go/tools/asthelpergen/asthelpergen_test.go b/go/tools/asthelpergen/asthelpergen_test.go index 8e712b7ad4d..12928e67ea6 100644 --- a/go/tools/asthelpergen/asthelpergen_test.go +++ b/go/tools/asthelpergen/asthelpergen_test.go @@ -27,7 +27,7 @@ import ( func TestFullGeneration(t *testing.T) { result, err := GenerateASTHelpers(&Options{ Packages: []string{"./integration/..."}, - RootInterface: "github.com/mdibaiee/vitess/go/tools/asthelpergen/integration.AST", + RootInterface: "github.com/vitess/vitess/go/tools/asthelpergen/integration.AST", Clone: CloneOptions{ Exclude: []string{"*NoCloneType"}, }, diff --git a/go/tools/asthelpergen/integration/types.go b/go/tools/asthelpergen/integration/types.go index 81e43653fc9..517f56322ff 100644 --- a/go/tools/asthelpergen/integration/types.go +++ b/go/tools/asthelpergen/integration/types.go @@ -22,7 +22,7 @@ import ( "strings" ) -//go:generate go run ../main --in . --iface github.com/mdibaiee/vitess/go/tools/asthelpergen/integration.AST --clone_exclude "*NoCloneType" +//go:generate go run ../main --in . --iface github.com/vitess/vitess/go/tools/asthelpergen/integration.AST --clone_exclude "*NoCloneType" // AST is the interface all interface types implement type AST interface { diff --git a/go/tools/asthelpergen/main/main.go b/go/tools/asthelpergen/main/main.go index 044f7622594..ffe15e57ba0 100644 --- a/go/tools/asthelpergen/main/main.go +++ b/go/tools/asthelpergen/main/main.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/tools/asthelpergen" - "github.com/mdibaiee/vitess/go/tools/codegen" + "github.com/vitess/vitess/go/tools/asthelpergen" + "github.com/vitess/vitess/go/tools/codegen" ) func main() { diff --git a/go/tools/ci-config/main.go b/go/tools/ci-config/main.go index bfa539e25b8..ef98898c8e7 100644 --- a/go/tools/ci-config/main.go +++ b/go/tools/ci-config/main.go @@ -50,10 +50,10 @@ func main() { continue } path := test.Args[0] - if !strings.HasPrefix(path, "github.com/mdibaiee/vitess/") { + if !strings.HasPrefix(path, "github.com/vitess/vitess/") { continue } - path = path[len("github.com/mdibaiee/vitess/"):] + path = path[len("github.com/vitess/vitess/"):] stat, err := os.Stat(path) if err != nil || !stat.IsDir() { diff --git a/go/tools/codegen/goimports.go b/go/tools/codegen/goimports.go index cbb27e022f7..efdcae6b73a 100644 --- a/go/tools/codegen/goimports.go +++ b/go/tools/codegen/goimports.go @@ -54,7 +54,7 @@ func GoImports(fullPath string) error { return err } - cmd = exec.Command("goimports", "-local", "github.com/mdibaiee/vitess", "-w", fullPath) + cmd = exec.Command("goimports", "-local", "github.com/vitess/vitess", "-w", fullPath) cmd.Stderr = os.Stderr if err := cmd.Run(); err != nil { return err diff --git a/go/tools/release-notes/release_notes_test.go b/go/tools/release-notes/release_notes_test.go index 669945cb145..0a69fe19c6c 100644 --- a/go/tools/release-notes/release_notes_test.go +++ b/go/tools/release-notes/release_notes_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" ) func Test_groupPRs(t *testing.T) { diff --git a/go/tools/sizegen/integration/cached_size.go b/go/tools/sizegen/integration/cached_size.go index 3a0816c5db5..89ebe963398 100644 --- a/go/tools/sizegen/integration/cached_size.go +++ b/go/tools/sizegen/integration/cached_size.go @@ -22,7 +22,7 @@ import ( "reflect" "unsafe" - hack "github.com/mdibaiee/vitess/go/hack" + hack "github.com/vitess/vitess/go/hack" ) type cachedObject interface { @@ -57,7 +57,7 @@ func (cached *C) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field field1 github.com/mdibaiee/vitess/go/tools/sizegen/integration.B + // field field1 github.com/vitess/vitess/go/tools/sizegen/integration.B if cc, ok := cached.field1.(cachedObject); ok { size += cc.CachedSize(true) } @@ -71,7 +71,7 @@ func (cached *D) CachedSize(alloc bool) int64 { if alloc { size += int64(8) } - // field field1 *github.com/mdibaiee/vitess/go/tools/sizegen/integration.Bimpl + // field field1 *github.com/vitess/vitess/go/tools/sizegen/integration.Bimpl if cached.field1 != nil { size += hack.RuntimeAllocSize(int64(8)) } @@ -110,7 +110,7 @@ func (cached *Map2) CachedSize(alloc bool) int64 { if alloc { size += int64(8) } - // field field1 map[uint64]github.com/mdibaiee/vitess/go/tools/sizegen/integration.A + // field field1 map[uint64]github.com/vitess/vitess/go/tools/sizegen/integration.A if cached.field1 != nil { size += int64(48) hmap := reflect.ValueOf(cached.field1) @@ -133,7 +133,7 @@ func (cached *Map3) CachedSize(alloc bool) int64 { if alloc { size += int64(8) } - // field field1 map[uint64]github.com/mdibaiee/vitess/go/tools/sizegen/integration.B + // field field1 map[uint64]github.com/vitess/vitess/go/tools/sizegen/integration.B if cached.field1 != nil { size += int64(48) hmap := reflect.ValueOf(cached.field1) @@ -169,7 +169,7 @@ func (cached *Slice1) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field field1 []github.com/mdibaiee/vitess/go/tools/sizegen/integration.A + // field field1 []github.com/vitess/vitess/go/tools/sizegen/integration.A { size += hack.RuntimeAllocSize(int64(cap(cached.field1)) * int64(16)) } @@ -183,7 +183,7 @@ func (cached *Slice2) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field field1 []github.com/mdibaiee/vitess/go/tools/sizegen/integration.B + // field field1 []github.com/vitess/vitess/go/tools/sizegen/integration.B { size += hack.RuntimeAllocSize(int64(cap(cached.field1)) * int64(16)) for _, elem := range cached.field1 { @@ -202,7 +202,7 @@ func (cached *Slice3) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field field1 []*github.com/mdibaiee/vitess/go/tools/sizegen/integration.Bimpl + // field field1 []*github.com/vitess/vitess/go/tools/sizegen/integration.Bimpl { size += hack.RuntimeAllocSize(int64(cap(cached.field1)) * int64(8)) for _, elem := range cached.field1 { diff --git a/go/tools/sizegen/integration/integration_test.go b/go/tools/sizegen/integration/integration_test.go index 35a15189331..c2784624879 100644 --- a/go/tools/sizegen/integration/integration_test.go +++ b/go/tools/sizegen/integration/integration_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/mdibaiee/vitess/go/hack" + "github.com/vitess/vitess/go/hack" ) func TestTypeSizes(t *testing.T) { diff --git a/go/tools/sizegen/sizegen.go b/go/tools/sizegen/sizegen.go index e35839d9a3d..7cd65d0c134 100644 --- a/go/tools/sizegen/sizegen.go +++ b/go/tools/sizegen/sizegen.go @@ -30,8 +30,8 @@ import ( "github.com/spf13/pflag" "golang.org/x/tools/go/packages" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/tools/codegen" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/tools/codegen" ) const licenseFileHeader = `Copyright 2021 The Vitess Authors. @@ -323,7 +323,7 @@ func (sizegen *sizegen) sizeStmtForMap(fieldName *jen.Statement, m *types.Map) [ func mallocsize(sizeStmt *jen.Statement) func(*jen.Statement) { return func(parent *jen.Statement) { - parent.Qual("github.com/mdibaiee/vitess/go/hack", "RuntimeAllocSize").Call(sizeStmt) + parent.Qual("github.com/vitess/vitess/go/hack", "RuntimeAllocSize").Call(sizeStmt) } } @@ -488,11 +488,11 @@ func (sizegen *sizegen) sizeStmtForType(fieldName *jen.Statement, field types.Ty } var defaultGenTypes = []string{ - "github.com/mdibaiee/vitess/go/pools/smartconnpool.Setting", - "github.com/mdibaiee/vitess/go/vt/schema.DDLStrategySetting", - "github.com/mdibaiee/vitess/go/vt/vtgate/engine.Plan", - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver.TabletPlan", - "github.com/mdibaiee/vitess/go/sqltypes.Result", + "github.com/vitess/vitess/go/pools/smartconnpool.Setting", + "github.com/vitess/vitess/go/vt/schema.DDLStrategySetting", + "github.com/vitess/vitess/go/vt/vtgate/engine.Plan", + "github.com/vitess/vitess/go/vt/vttablet/tabletserver.TabletPlan", + "github.com/vitess/vitess/go/sqltypes.Result", } func main() { diff --git a/go/tools/sizegen/sizegen_test.go b/go/tools/sizegen/sizegen_test.go index 3bee5c6f778..62f31f2dc36 100644 --- a/go/tools/sizegen/sizegen_test.go +++ b/go/tools/sizegen/sizegen_test.go @@ -24,7 +24,7 @@ import ( ) func TestFullGeneration(t *testing.T) { - result, err := GenerateSizeHelpers([]string{"./integration/..."}, []string{"github.com/mdibaiee/vitess/go/tools/sizegen/integration.*"}) + result, err := GenerateSizeHelpers([]string{"./integration/..."}, []string{"github.com/vitess/vitess/go/tools/sizegen/integration.*"}) require.NoError(t, err) verifyErrors := VerifyFilesOnDisk(result) diff --git a/go/trace/logger.go b/go/trace/logger.go index b9f793796c2..681531fcd24 100644 --- a/go/trace/logger.go +++ b/go/trace/logger.go @@ -16,7 +16,7 @@ limitations under the License. package trace -import "github.com/mdibaiee/vitess/go/vt/log" +import "github.com/vitess/vitess/go/vt/log" // traceLogger wraps the standard vitess log package to satisfy the datadog and // jaeger logger interfaces. diff --git a/go/trace/opentracing.go b/go/trace/opentracing.go index 4ab4330141f..74fa8d33c51 100644 --- a/go/trace/opentracing.go +++ b/go/trace/opentracing.go @@ -25,7 +25,7 @@ import ( "github.com/opentracing/opentracing-go" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" ) var _ Span = (*openTracingSpan)(nil) diff --git a/go/trace/plugin_datadog.go b/go/trace/plugin_datadog.go index 49424b6098a..869622ffa31 100644 --- a/go/trace/plugin_datadog.go +++ b/go/trace/plugin_datadog.go @@ -10,7 +10,7 @@ import ( "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/opentracer" ddtracer "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer" - "github.com/mdibaiee/vitess/go/viperutil" + "github.com/vitess/vitess/go/viperutil" ) var ( diff --git a/go/trace/plugin_jaeger.go b/go/trace/plugin_jaeger.go index b680b81607c..dfae7a12f8a 100644 --- a/go/trace/plugin_jaeger.go +++ b/go/trace/plugin_jaeger.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/pflag" "github.com/uber/jaeger-client-go/config" - "github.com/mdibaiee/vitess/go/viperutil" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/viperutil" + "github.com/vitess/vitess/go/vt/log" ) /* diff --git a/go/trace/trace.go b/go/trace/trace.go index 6ab5245ecf2..5ba7bdf35fa 100644 --- a/go/trace/trace.go +++ b/go/trace/trace.go @@ -28,9 +28,9 @@ import ( "github.com/spf13/pflag" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/viperutil" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/viperutil" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vterrors" ) // Span represents a unit of work within a trace. After creating a Span with diff --git a/go/trace/trace_test.go b/go/trace/trace_test.go index 378f17f0b82..a1c07ba12c3 100644 --- a/go/trace/trace_test.go +++ b/go/trace/trace_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/viperutil/vipertest" + "github.com/vitess/vitess/go/viperutil/vipertest" ) func TestFakeSpan(t *testing.T) { diff --git a/go/trace/utils.go b/go/trace/utils.go index 7a0d74facf0..578f1f5c476 100644 --- a/go/trace/utils.go +++ b/go/trace/utils.go @@ -19,7 +19,7 @@ package trace import ( "io" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // LogErrorsWhenClosing will close the provided Closer, and log any errors it generates diff --git a/go/viperutil/config.go b/go/viperutil/config.go index e04e7a42df8..67dc5c772f8 100644 --- a/go/viperutil/config.go +++ b/go/viperutil/config.go @@ -29,10 +29,10 @@ import ( "github.com/spf13/pflag" "github.com/spf13/viper" - "github.com/mdibaiee/vitess/go/viperutil/funcs" - "github.com/mdibaiee/vitess/go/viperutil/internal/log" - "github.com/mdibaiee/vitess/go/viperutil/internal/registry" - "github.com/mdibaiee/vitess/go/viperutil/internal/value" + "github.com/vitess/vitess/go/viperutil/funcs" + "github.com/vitess/vitess/go/viperutil/internal/log" + "github.com/vitess/vitess/go/viperutil/internal/registry" + "github.com/vitess/vitess/go/viperutil/internal/value" ) var ( diff --git a/go/viperutil/debug/debug.go b/go/viperutil/debug/debug.go index 4f70a19958a..f1097b135f6 100644 --- a/go/viperutil/debug/debug.go +++ b/go/viperutil/debug/debug.go @@ -17,7 +17,7 @@ limitations under the License. package debug import ( - "github.com/mdibaiee/vitess/go/viperutil/internal/registry" + "github.com/vitess/vitess/go/viperutil/internal/registry" ) // Debug provides the Debug functionality normally accessible to a given viper diff --git a/go/viperutil/debug/handler.go b/go/viperutil/debug/handler.go index 5ca6c2776ae..6c65e763cc2 100644 --- a/go/viperutil/debug/handler.go +++ b/go/viperutil/debug/handler.go @@ -25,9 +25,9 @@ import ( "github.com/spf13/viper" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/viperutil/internal/registry" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/viperutil/internal/registry" ) // HandlerFunc provides an http.HandlerFunc that renders the combined config diff --git a/go/viperutil/errors.go b/go/viperutil/errors.go index eeff0a96518..93e97dfc52b 100644 --- a/go/viperutil/errors.go +++ b/go/viperutil/errors.go @@ -17,8 +17,8 @@ limitations under the License. package viperutil import ( - "github.com/mdibaiee/vitess/go/viperutil/internal/sync" - "github.com/mdibaiee/vitess/go/viperutil/internal/value" + "github.com/vitess/vitess/go/viperutil/internal/sync" + "github.com/vitess/vitess/go/viperutil/internal/value" ) var ( diff --git a/go/viperutil/funcs/get_test.go b/go/viperutil/funcs/get_test.go index 924cda04137..4fcef88eee1 100644 --- a/go/viperutil/funcs/get_test.go +++ b/go/viperutil/funcs/get_test.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/viper" - "github.com/mdibaiee/vitess/go/viperutil" - "github.com/mdibaiee/vitess/go/viperutil/funcs" - "github.com/mdibaiee/vitess/go/viperutil/internal/value" + "github.com/vitess/vitess/go/viperutil" + "github.com/vitess/vitess/go/viperutil/funcs" + "github.com/vitess/vitess/go/viperutil/internal/value" ) func ExampleGetPath() { diff --git a/go/viperutil/internal/log/log.go b/go/viperutil/internal/log/log.go index 92a7de1e7de..993fbd2eeb2 100644 --- a/go/viperutil/internal/log/log.go +++ b/go/viperutil/internal/log/log.go @@ -23,7 +23,7 @@ package log import ( jww "github.com/spf13/jwalterweatherman" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/viperutil/internal/registry/registry.go b/go/viperutil/internal/registry/registry.go index 355a854a17c..5d90b01c366 100644 --- a/go/viperutil/internal/registry/registry.go +++ b/go/viperutil/internal/registry/registry.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/pflag" "github.com/spf13/viper" - "github.com/mdibaiee/vitess/go/viperutil/internal/sync" + "github.com/vitess/vitess/go/viperutil/internal/sync" ) var ( diff --git a/go/viperutil/internal/sync/sync.go b/go/viperutil/internal/sync/sync.go index 2c623eb8502..95e2e444f0c 100644 --- a/go/viperutil/internal/sync/sync.go +++ b/go/viperutil/internal/sync/sync.go @@ -27,9 +27,9 @@ import ( "github.com/spf13/pflag" "github.com/spf13/viper" - "github.com/mdibaiee/vitess/go/viperutil/internal/log" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/viperutil/internal/log" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // Viper is a wrapper around a pair of viper.Viper instances to provide config- diff --git a/go/viperutil/internal/sync/sync_test.go b/go/viperutil/internal/sync/sync_test.go index 618a70ba80f..6bdf6de78a5 100644 --- a/go/viperutil/internal/sync/sync_test.go +++ b/go/viperutil/internal/sync/sync_test.go @@ -29,9 +29,9 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/viperutil" - vipersync "github.com/mdibaiee/vitess/go/viperutil/internal/sync" - "github.com/mdibaiee/vitess/go/viperutil/internal/value" + "github.com/vitess/vitess/go/viperutil" + vipersync "github.com/vitess/vitess/go/viperutil/internal/sync" + "github.com/vitess/vitess/go/viperutil/internal/value" ) func TestWatchConfig(t *testing.T) { diff --git a/go/viperutil/internal/value/value.go b/go/viperutil/internal/value/value.go index ee3269f5860..092a14122c6 100644 --- a/go/viperutil/internal/value/value.go +++ b/go/viperutil/internal/value/value.go @@ -22,10 +22,10 @@ import ( "github.com/spf13/pflag" "github.com/spf13/viper" - "github.com/mdibaiee/vitess/go/viperutil/internal/registry" - "github.com/mdibaiee/vitess/go/viperutil/internal/sync" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/viperutil/internal/registry" + "github.com/vitess/vitess/go/viperutil/internal/sync" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // Registerable is the subset of the interface exposed by Values (which is diff --git a/go/viperutil/value.go b/go/viperutil/value.go index dfd81e88f33..62d1281a802 100644 --- a/go/viperutil/value.go +++ b/go/viperutil/value.go @@ -19,7 +19,7 @@ package viperutil import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/viperutil/internal/value" + "github.com/vitess/vitess/go/viperutil/internal/value" ) var ( diff --git a/go/viperutil/viper.go b/go/viperutil/viper.go index dfd84bcc819..4473cce59b3 100644 --- a/go/viperutil/viper.go +++ b/go/viperutil/viper.go @@ -23,7 +23,7 @@ variables that are the result of calling Configure, for example in package trace package trace - import "github.com/mdibaiee/vitess/go/viperutil" + import "github.com/vitess/vitess/go/viperutil" var ( modulePrefix = viperutil.KeyPrefixFunc("trace") @@ -51,8 +51,8 @@ to those flags, as appropriate: import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/viperutil" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/viperutil" + "github.com/vitess/vitess/go/vt/servenv" ) func init() { @@ -77,7 +77,7 @@ import ( "github.com/spf13/viper" - "github.com/mdibaiee/vitess/go/viperutil/internal/value" + "github.com/vitess/vitess/go/viperutil/internal/value" ) // Options represents the various options used to control how Values are diff --git a/go/viperutil/vipertest/stub.go b/go/viperutil/vipertest/stub.go index 0d89849bdcf..7f90ee6a02f 100644 --- a/go/viperutil/vipertest/stub.go +++ b/go/viperutil/vipertest/stub.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/viperutil" - "github.com/mdibaiee/vitess/go/viperutil/internal/value" + "github.com/vitess/vitess/go/viperutil" + "github.com/vitess/vitess/go/viperutil/internal/value" ) // Stub stubs out a given value to use the passed-in viper to retrieve its diff --git a/go/vt/binlog/binlog_connection.go b/go/vt/binlog/binlog_connection.go index 315f17d13d1..850e8b4cab5 100644 --- a/go/vt/binlog/binlog_connection.go +++ b/go/vt/binlog/binlog_connection.go @@ -24,12 +24,12 @@ import ( "math/big" "sync" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/pools" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/pools" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/vt/binlog/binlog_streamer.go b/go/vt/binlog/binlog_streamer.go index abd4a571a6c..93c20fc3121 100644 --- a/go/vt/binlog/binlog_streamer.go +++ b/go/vt/binlog/binlog_streamer.go @@ -25,19 +25,19 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/mysql/replication" - - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/binlog" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql/replication" + + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/binlog" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var ( diff --git a/go/vt/binlog/binlog_streamer_rbr_test.go b/go/vt/binlog/binlog_streamer_rbr_test.go index d161ccf94d9..cc33385701d 100644 --- a/go/vt/binlog/binlog_streamer_rbr_test.go +++ b/go/vt/binlog/binlog_streamer_rbr_test.go @@ -22,16 +22,16 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/binlog" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/binlog" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // This file tests the RBR events are parsed correctly. diff --git a/go/vt/binlog/binlog_streamer_test.go b/go/vt/binlog/binlog_streamer_test.go index cf384a910b5..d7345ec1c43 100644 --- a/go/vt/binlog/binlog_streamer_test.go +++ b/go/vt/binlog/binlog_streamer_test.go @@ -27,14 +27,14 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/dbconfigs" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // fullBinlogTransaction is a helper type for tests. diff --git a/go/vt/binlog/binlogplayer/binlog_player.go b/go/vt/binlog/binlogplayer/binlog_player.go index 9b8c279db4d..9e29517b309 100644 --- a/go/vt/binlog/binlogplayer/binlog_player.go +++ b/go/vt/binlog/binlogplayer/binlog_player.go @@ -36,21 +36,21 @@ import ( "github.com/spf13/pflag" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/history" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/throttler" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/history" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/throttler" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/vt/binlog/binlogplayer/binlog_player_test.go b/go/vt/binlog/binlogplayer/binlog_player_test.go index a2efe85cc55..85109c8955c 100644 --- a/go/vt/binlog/binlogplayer/binlog_player_test.go +++ b/go/vt/binlog/binlogplayer/binlog_player_test.go @@ -22,15 +22,15 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + querypb "github.com/vitess/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/throttler" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/throttler" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/vt/binlog/binlogplayer/client.go b/go/vt/binlog/binlogplayer/client.go index 36c07f1715d..e67891d5acc 100644 --- a/go/vt/binlog/binlogplayer/client.go +++ b/go/vt/binlog/binlogplayer/client.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/log" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/servenv" ) /* diff --git a/go/vt/binlog/binlogplayer/dbclient.go b/go/vt/binlog/binlogplayer/dbclient.go index 2dd1a5af0c1..6137189de35 100644 --- a/go/vt/binlog/binlogplayer/dbclient.go +++ b/go/vt/binlog/binlogplayer/dbclient.go @@ -21,14 +21,14 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" ) // DBClient is a high level interface to the database. diff --git a/go/vt/binlog/binlogplayer/fake_dbclient.go b/go/vt/binlog/binlogplayer/fake_dbclient.go index f506fc0cfc5..93ef94ad3c4 100644 --- a/go/vt/binlog/binlogplayer/fake_dbclient.go +++ b/go/vt/binlog/binlogplayer/fake_dbclient.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) type fakeDBClient struct { diff --git a/go/vt/binlog/binlogplayer/framework_test.go b/go/vt/binlog/binlogplayer/framework_test.go index d459b7cbdf1..7ef9df2f593 100644 --- a/go/vt/binlog/binlogplayer/framework_test.go +++ b/go/vt/binlog/binlogplayer/framework_test.go @@ -23,9 +23,9 @@ import ( "google.golang.org/protobuf/proto" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // This partially duplicates code from vreplication/framework_test.go. diff --git a/go/vt/binlog/binlogplayer/mock_dbclient.go b/go/vt/binlog/binlogplayer/mock_dbclient.go index 6698db6fa19..abd10d9026c 100644 --- a/go/vt/binlog/binlogplayer/mock_dbclient.go +++ b/go/vt/binlog/binlogplayer/mock_dbclient.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" ) const mockClientUNameFiltered = "Filtered" diff --git a/go/vt/binlog/binlogplayertest/player.go b/go/vt/binlog/binlogplayertest/player.go index b383dca4880..a4ded4843e3 100644 --- a/go/vt/binlog/binlogplayertest/player.go +++ b/go/vt/binlog/binlogplayertest/player.go @@ -25,12 +25,12 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/key" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // keyRangeRequest is used to make a request for StreamKeyRange. diff --git a/go/vt/binlog/eventtoken/compare.go b/go/vt/binlog/eventtoken/compare.go index 7bd55ff62b0..9835ea7f60c 100644 --- a/go/vt/binlog/eventtoken/compare.go +++ b/go/vt/binlog/eventtoken/compare.go @@ -19,8 +19,8 @@ limitations under the License. package eventtoken import ( - "github.com/mdibaiee/vitess/go/mysql/replication" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql/replication" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // Fresher compares two event tokens. It returns a negative number if diff --git a/go/vt/binlog/eventtoken/compare_test.go b/go/vt/binlog/eventtoken/compare_test.go index 141fed2fea3..4703e37e0a3 100644 --- a/go/vt/binlog/eventtoken/compare_test.go +++ b/go/vt/binlog/eventtoken/compare_test.go @@ -19,7 +19,7 @@ package eventtoken import ( "testing" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestFresher(t *testing.T) { diff --git a/go/vt/binlog/grpcbinlogplayer/player.go b/go/vt/binlog/grpcbinlogplayer/player.go index 348f3311f90..3db916e7af5 100644 --- a/go/vt/binlog/grpcbinlogplayer/player.go +++ b/go/vt/binlog/grpcbinlogplayer/player.go @@ -22,13 +22,13 @@ import ( "github.com/spf13/pflag" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - binlogservicepb "github.com/mdibaiee/vitess/go/vt/proto/binlogservice" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/grpcclient" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + binlogservicepb "github.com/vitess/vitess/go/vt/proto/binlogservice" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/servenv" ) var cert, key, ca, crl, name string diff --git a/go/vt/binlog/grpcbinlogplayer/player_test.go b/go/vt/binlog/grpcbinlogplayer/player_test.go index 220fb8d747c..71a5e0e4518 100644 --- a/go/vt/binlog/grpcbinlogplayer/player_test.go +++ b/go/vt/binlog/grpcbinlogplayer/player_test.go @@ -23,11 +23,11 @@ import ( "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayertest" - "github.com/mdibaiee/vitess/go/vt/binlog/grpcbinlogstreamer" + "github.com/vitess/vitess/go/vt/binlog/binlogplayertest" + "github.com/vitess/vitess/go/vt/binlog/grpcbinlogstreamer" - binlogservicepb "github.com/mdibaiee/vitess/go/vt/proto/binlogservice" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + binlogservicepb "github.com/vitess/vitess/go/vt/proto/binlogservice" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // the test here creates a fake server implementation, a fake client diff --git a/go/vt/binlog/grpcbinlogstreamer/streamer.go b/go/vt/binlog/grpcbinlogstreamer/streamer.go index 34c1fd4e020..f3a1a7fac33 100644 --- a/go/vt/binlog/grpcbinlogstreamer/streamer.go +++ b/go/vt/binlog/grpcbinlogstreamer/streamer.go @@ -19,11 +19,11 @@ limitations under the License. package grpcbinlogstreamer import ( - "github.com/mdibaiee/vitess/go/vt/binlog" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/binlog" + "github.com/vitess/vitess/go/vt/servenv" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - binlogservicepb "github.com/mdibaiee/vitess/go/vt/proto/binlogservice" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + binlogservicepb "github.com/vitess/vitess/go/vt/proto/binlogservice" ) // UpdateStream is the gRPC UpdateStream server diff --git a/go/vt/binlog/keyrange_filter.go b/go/vt/binlog/keyrange_filter.go index 934f72beedf..80b3bafb2d3 100644 --- a/go/vt/binlog/keyrange_filter.go +++ b/go/vt/binlog/keyrange_filter.go @@ -19,12 +19,12 @@ package binlog import ( "fmt" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // keyRangeFilterFunc returns a function that calls callback only if statements diff --git a/go/vt/binlog/keyspace_id_resolver.go b/go/vt/binlog/keyspace_id_resolver.go index e0a47758b85..f1f6ddc23b4 100644 --- a/go/vt/binlog/keyspace_id_resolver.go +++ b/go/vt/binlog/keyspace_id_resolver.go @@ -21,12 +21,12 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" ) // keyspaceIDResolver is constructed for a tableMap entry in RBR. It diff --git a/go/vt/binlog/tables_filter.go b/go/vt/binlog/tables_filter.go index 38c58c0bf5e..9f2c163daed 100644 --- a/go/vt/binlog/tables_filter.go +++ b/go/vt/binlog/tables_filter.go @@ -19,10 +19,10 @@ package binlog import ( "strings" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) const ( diff --git a/go/vt/binlog/tables_filter_test.go b/go/vt/binlog/tables_filter_test.go index 62d8ee5d85e..f959c10970a 100644 --- a/go/vt/binlog/tables_filter_test.go +++ b/go/vt/binlog/tables_filter_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var testTables = []string{ diff --git a/go/vt/binlog/updatestream.go b/go/vt/binlog/updatestream.go index f86d6a9a90a..016b3a62e13 100644 --- a/go/vt/binlog/updatestream.go +++ b/go/vt/binlog/updatestream.go @@ -19,8 +19,8 @@ package binlog import ( "context" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // UpdateStream is the interface for the binlog server diff --git a/go/vt/binlog/updatestreamctl.go b/go/vt/binlog/updatestreamctl.go index 1df55b19b72..2931f7a6c56 100644 --- a/go/vt/binlog/updatestreamctl.go +++ b/go/vt/binlog/updatestreamctl.go @@ -22,17 +22,17 @@ import ( "sync" "sync/atomic" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/tb" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/tb" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) /* API and config for UpdateStream Service */ diff --git a/go/vt/callerid/callerid.go b/go/vt/callerid/callerid.go index 67e2735a2e3..9b2ac890143 100644 --- a/go/vt/callerid/callerid.go +++ b/go/vt/callerid/callerid.go @@ -21,8 +21,8 @@ package callerid import ( "context" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // The datatype for CallerID Context Keys diff --git a/go/vt/callerid/testsuite/callerid_test.go b/go/vt/callerid/testsuite/callerid_test.go index 89b325f49a2..92a70f5c7cd 100644 --- a/go/vt/callerid/testsuite/callerid_test.go +++ b/go/vt/callerid/testsuite/callerid_test.go @@ -19,9 +19,9 @@ package testsuite import ( "testing" - "github.com/mdibaiee/vitess/go/vt/callerid" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/callerid" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func TestFakeCallerID(t *testing.T) { diff --git a/go/vt/callerid/testsuite/testsuite.go b/go/vt/callerid/testsuite/testsuite.go index efe7f2489b2..6df42e4b32d 100644 --- a/go/vt/callerid/testsuite/testsuite.go +++ b/go/vt/callerid/testsuite/testsuite.go @@ -23,10 +23,10 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/callerid" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const ( diff --git a/go/vt/callinfo/callinfo_test.go b/go/vt/callinfo/callinfo_test.go index 8cf50b1e20c..2443ef6565d 100644 --- a/go/vt/callinfo/callinfo_test.go +++ b/go/vt/callinfo/callinfo_test.go @@ -23,7 +23,7 @@ import ( "github.com/google/safehtml" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/callinfo/fakecallinfo" + "github.com/vitess/vitess/go/vt/callinfo/fakecallinfo" ) var fci fakecallinfo.FakeCallInfo = fakecallinfo.FakeCallInfo{ diff --git a/go/vt/callinfo/plugin_mysql.go b/go/vt/callinfo/plugin_mysql.go index 27a4a9c49ca..776e430376c 100644 --- a/go/vt/callinfo/plugin_mysql.go +++ b/go/vt/callinfo/plugin_mysql.go @@ -25,7 +25,7 @@ import ( "github.com/google/safehtml" "github.com/google/safehtml/template" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" ) // MysqlCallInfo returns an augmented context with a CallInfo structure, diff --git a/go/vt/concurrency/error_recorder.go b/go/vt/concurrency/error_recorder.go index 4a26391a4ee..f7cd09d7aca 100644 --- a/go/vt/concurrency/error_recorder.go +++ b/go/vt/concurrency/error_recorder.go @@ -21,7 +21,7 @@ import ( "strings" "sync" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // ErrorRecorder offers a way to record errors during complex diff --git a/go/vt/dbconfigs/credentials.go b/go/vt/dbconfigs/credentials.go index f65f2c4c683..9b7f13fe4c3 100644 --- a/go/vt/dbconfigs/credentials.go +++ b/go/vt/dbconfigs/credentials.go @@ -34,9 +34,9 @@ import ( vaultapi "github.com/aquarapid/vaultlib" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/go/vt/dbconfigs/dbconfigs.go b/go/vt/dbconfigs/dbconfigs.go index fd2b15233f8..4f0ddf1dd4a 100644 --- a/go/vt/dbconfigs/dbconfigs.go +++ b/go/vt/dbconfigs/dbconfigs.go @@ -26,14 +26,14 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/log" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttls" - "github.com/mdibaiee/vitess/go/yaml2" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/log" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttls" + "github.com/vitess/vitess/go/yaml2" ) // config flags diff --git a/go/vt/dbconfigs/dbconfigs_test.go b/go/vt/dbconfigs/dbconfigs_test.go index ed40fc14e5d..5ebbcee7b37 100644 --- a/go/vt/dbconfigs/dbconfigs_test.go +++ b/go/vt/dbconfigs/dbconfigs_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/yaml2" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/yaml2" ) func TestInit(t *testing.T) { diff --git a/go/vt/dbconnpool/connection.go b/go/vt/dbconnpool/connection.go index f62114d9d04..8700f8726bc 100644 --- a/go/vt/dbconnpool/connection.go +++ b/go/vt/dbconnpool/connection.go @@ -21,11 +21,11 @@ import ( "errors" "fmt" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/pools/smartconnpool" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/pools/smartconnpool" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" ) type PooledDBConnection = smartconnpool.Pooled[*DBConnection] diff --git a/go/vt/dbconnpool/connection_pool.go b/go/vt/dbconnpool/connection_pool.go index 0236822a25d..b7d35b531e4 100644 --- a/go/vt/dbconnpool/connection_pool.go +++ b/go/vt/dbconnpool/connection_pool.go @@ -26,10 +26,10 @@ import ( "net" "time" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/pools/smartconnpool" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/pools/smartconnpool" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/servenv" ) // ConnectionPool re-exposes ResourcePool as a pool of diff --git a/go/vt/discovery/fake_healthcheck.go b/go/vt/discovery/fake_healthcheck.go index a8a926eda3b..a63cd4ceecb 100644 --- a/go/vt/discovery/fake_healthcheck.go +++ b/go/vt/discovery/fake_healthcheck.go @@ -24,15 +24,15 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/sandboxconn" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/sandboxconn" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // This file contains the definitions for a FakeHealthCheck class to diff --git a/go/vt/discovery/healthcheck.go b/go/vt/discovery/healthcheck.go index 9d9989e2e73..8ff78d2e04b 100644 --- a/go/vt/discovery/healthcheck.go +++ b/go/vt/discovery/healthcheck.go @@ -48,19 +48,19 @@ import ( "github.com/spf13/pflag" "golang.org/x/sync/semaphore" - "github.com/mdibaiee/vitess/go/flagutil" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/flagutil" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" ) var ( diff --git a/go/vt/discovery/healthcheck_test.go b/go/vt/discovery/healthcheck_test.go index 9ccfc0517eb..c0262aeb5e7 100644 --- a/go/vt/discovery/healthcheck_test.go +++ b/go/vt/discovery/healthcheck_test.go @@ -30,18 +30,18 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice/fakes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconntest" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/queryservice/fakes" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletconntest" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/vt/discovery/keyspace_events.go b/go/vt/discovery/keyspace_events.go index 2ce149390d6..b499787d37c 100644 --- a/go/vt/discovery/keyspace_events.go +++ b/go/vt/discovery/keyspace_events.go @@ -24,17 +24,17 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sidecardb" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sidecardb" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) // KeyspaceEventWatcher is an auxiliary watcher that watches all availability incidents diff --git a/go/vt/discovery/keyspace_events_test.go b/go/vt/discovery/keyspace_events_test.go index 891f856512d..9a1f1205aae 100644 --- a/go/vt/discovery/keyspace_events_test.go +++ b/go/vt/discovery/keyspace_events_test.go @@ -26,13 +26,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/faketopo" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/faketopo" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) func TestSrvKeyspaceWithNilNewKeyspace(t *testing.T) { diff --git a/go/vt/discovery/replicationlag.go b/go/vt/discovery/replicationlag.go index 412b3445ef0..55013b1be22 100644 --- a/go/vt/discovery/replicationlag.go +++ b/go/vt/discovery/replicationlag.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/viperutil" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/viperutil" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/go/vt/discovery/replicationlag_test.go b/go/vt/discovery/replicationlag_test.go index 62068e250f6..b97858d0373 100644 --- a/go/vt/discovery/replicationlag_test.go +++ b/go/vt/discovery/replicationlag_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/topo" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/topo" ) func init() { diff --git a/go/vt/discovery/tablet_health.go b/go/vt/discovery/tablet_health.go index 01157e1d7a8..d4e90e4995a 100644 --- a/go/vt/discovery/tablet_health.go +++ b/go/vt/discovery/tablet_health.go @@ -21,13 +21,13 @@ import ( "encoding/json" "strings" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/proto/topodata" ) // TabletHealth represents simple tablet health data that is returned to users of healthcheck. diff --git a/go/vt/discovery/tablet_health_check.go b/go/vt/discovery/tablet_health_check.go index 445a6173e04..2e33f270c09 100644 --- a/go/vt/discovery/tablet_health_check.go +++ b/go/vt/discovery/tablet_health_check.go @@ -25,20 +25,20 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" "google.golang.org/grpc" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/proto/topodata" ) // withDialerContextOnce ensures grpc.WithDialContext() is added once to the options. diff --git a/go/vt/discovery/tablet_picker.go b/go/vt/discovery/tablet_picker.go index 014451ca7e5..037f0a228f1 100644 --- a/go/vt/discovery/tablet_picker.go +++ b/go/vt/discovery/tablet_picker.go @@ -26,18 +26,18 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) type TabletPickerCellPreference int diff --git a/go/vt/discovery/tablet_picker_test.go b/go/vt/discovery/tablet_picker_test.go index 5e821a67dd7..ca432ed766d 100644 --- a/go/vt/discovery/tablet_picker_test.go +++ b/go/vt/discovery/tablet_picker_test.go @@ -22,13 +22,13 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/discovery/tablets_cache_status.go b/go/vt/discovery/tablets_cache_status.go index 3d1fa1a9da3..61eaa986dcf 100644 --- a/go/vt/discovery/tablets_cache_status.go +++ b/go/vt/discovery/tablets_cache_status.go @@ -9,9 +9,9 @@ import ( "google.golang.org/protobuf/proto" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo/topoproto" ) // TabletsCacheStatus is the current tablets for a cell/target. diff --git a/go/vt/discovery/topology_watcher.go b/go/vt/discovery/topology_watcher.go index 7d9c70e9f15..f094bdd7cea 100644 --- a/go/vt/discovery/topology_watcher.go +++ b/go/vt/discovery/topology_watcher.go @@ -26,16 +26,16 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/trace" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" ) const ( diff --git a/go/vt/discovery/topology_watcher_test.go b/go/vt/discovery/topology_watcher_test.go index ecd6678fe3c..487899e12d1 100644 --- a/go/vt/discovery/topology_watcher_test.go +++ b/go/vt/discovery/topology_watcher_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/logutil" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/logutil" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" ) func checkOpCounts(t *testing.T, prevCounts, deltas map[string]int64) map[string]int64 { diff --git a/go/vt/discovery/utils.go b/go/vt/discovery/utils.go index f77c95a77d8..a266470d51b 100644 --- a/go/vt/discovery/utils.go +++ b/go/vt/discovery/utils.go @@ -19,8 +19,8 @@ package discovery import ( "strings" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo/topoproto" ) // This file contains helper filter methods to process the unfiltered list of diff --git a/go/vt/dtids/dtids.go b/go/vt/dtids/dtids.go index 4303ea1c6e7..926bedef880 100644 --- a/go/vt/dtids/dtids.go +++ b/go/vt/dtids/dtids.go @@ -22,12 +22,12 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // New generates a dtid based on Session_ShardSession. diff --git a/go/vt/dtids/dtids_test.go b/go/vt/dtids/dtids_test.go index 8ff58b37485..a2e01b79ced 100644 --- a/go/vt/dtids/dtids_test.go +++ b/go/vt/dtids/dtids_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) func TestDTID(t *testing.T) { diff --git a/go/vt/events/status_test.go b/go/vt/events/status_test.go index 7cf6f0f16e8..592b1aa623f 100644 --- a/go/vt/events/status_test.go +++ b/go/vt/events/status_test.go @@ -19,7 +19,7 @@ package events import ( "testing" - "github.com/mdibaiee/vitess/go/event" + "github.com/vitess/vitess/go/event" ) type testEvent struct { diff --git a/go/vt/external/golib/sqlutils/sqlutils.go b/go/vt/external/golib/sqlutils/sqlutils.go index 3ffa11ae2d9..68cf9782dd5 100644 --- a/go/vt/external/golib/sqlutils/sqlutils.go +++ b/go/vt/external/golib/sqlutils/sqlutils.go @@ -30,7 +30,7 @@ import ( _ "modernc.org/sqlite" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) const DateTimeFormat = "2006-01-02 15:04:05.999999" diff --git a/go/vt/grpcclient/client.go b/go/vt/grpcclient/client.go index 91d7a37df6e..5af04aaa871 100644 --- a/go/vt/grpcclient/client.go +++ b/go/vt/grpcclient/client.go @@ -32,11 +32,11 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/keepalive" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/grpccommon" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vttls" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/grpccommon" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vttls" ) var ( diff --git a/go/vt/grpcclient/client_auth_static.go b/go/vt/grpcclient/client_auth_static.go index eb66e1aae7c..7d0b013035d 100644 --- a/go/vt/grpcclient/client_auth_static.go +++ b/go/vt/grpcclient/client_auth_static.go @@ -27,7 +27,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/go/vt/grpcclient/client_test.go b/go/vt/grpcclient/client_test.go index 44634b67cb2..6d34168d69d 100644 --- a/go/vt/grpcclient/client_test.go +++ b/go/vt/grpcclient/client_test.go @@ -29,8 +29,8 @@ import ( "google.golang.org/grpc" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtgateservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtgateservice" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtgateservicepb "github.com/vitess/vitess/go/vt/proto/vtgateservice" ) func TestDialErrors(t *testing.T) { diff --git a/go/vt/grpcclient/glogger.go b/go/vt/grpcclient/glogger.go index 7d7051ffd23..e508f8df7c6 100644 --- a/go/vt/grpcclient/glogger.go +++ b/go/vt/grpcclient/glogger.go @@ -21,7 +21,7 @@ import ( "google.golang.org/grpc/grpclog" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // grpc doesn't return underlying errors. So, we have diff --git a/go/vt/grpccommon/options.go b/go/vt/grpccommon/options.go index b80529a97cf..0e8fe46e78c 100644 --- a/go/vt/grpccommon/options.go +++ b/go/vt/grpccommon/options.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/pflag" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) var ( diff --git a/go/vt/grpcoptionaltls/server_test.go b/go/vt/grpcoptionaltls/server_test.go index e9f33baed44..3420c0f2685 100755 --- a/go/vt/grpcoptionaltls/server_test.go +++ b/go/vt/grpcoptionaltls/server_test.go @@ -27,7 +27,7 @@ import ( "google.golang.org/grpc/credentials" pb "google.golang.org/grpc/examples/helloworld/helloworld" - "github.com/mdibaiee/vitess/go/vt/tlstest" + "github.com/vitess/vitess/go/vt/tlstest" ) // server is used to implement helloworld.GreeterServer. diff --git a/go/vt/hook/hook.go b/go/vt/hook/hook.go index cbed51da612..4876956e10a 100644 --- a/go/vt/hook/hook.go +++ b/go/vt/hook/hook.go @@ -28,8 +28,8 @@ import ( "syscall" "time" - vtenv "github.com/mdibaiee/vitess/go/vt/env" - "github.com/mdibaiee/vitess/go/vt/log" + vtenv "github.com/vitess/vitess/go/vt/env" + "github.com/vitess/vitess/go/vt/log" ) // Hook is the input structure for this library. diff --git a/go/vt/hook/hook_test.go b/go/vt/hook/hook_test.go index 97f4e8ea339..0e6a0fb9327 100644 --- a/go/vt/hook/hook_test.go +++ b/go/vt/hook/hook_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - vtenv "github.com/mdibaiee/vitess/go/vt/env" + vtenv "github.com/vitess/vitess/go/vt/env" ) func TestExecuteContext(t *testing.T) { diff --git a/go/vt/key/cached_size.go b/go/vt/key/cached_size.go index eef7158dc7a..043e010e0e6 100644 --- a/go/vt/key/cached_size.go +++ b/go/vt/key/cached_size.go @@ -25,7 +25,7 @@ func (cached *DestinationExactKeyRange) CachedSize(alloc bool) int64 { if alloc { size += int64(8) } - // field KeyRange *github.com/mdibaiee/vitess/go/vt/proto/topodata.KeyRange + // field KeyRange *github.com/vitess/vitess/go/vt/proto/topodata.KeyRange size += cached.KeyRange.CachedSize(true) return size } @@ -37,7 +37,7 @@ func (cached *DestinationKeyRange) CachedSize(alloc bool) int64 { if alloc { size += int64(8) } - // field KeyRange *github.com/mdibaiee/vitess/go/vt/proto/topodata.KeyRange + // field KeyRange *github.com/vitess/vitess/go/vt/proto/topodata.KeyRange size += cached.KeyRange.CachedSize(true) return size } diff --git a/go/vt/key/destination.go b/go/vt/key/destination.go index ec826bf2a9d..918153bc7ca 100644 --- a/go/vt/key/destination.go +++ b/go/vt/key/destination.go @@ -22,10 +22,10 @@ import ( "sort" "strings" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // AnyShardPicker makes a choice on what shard to use when any shard will do. Used for testing. diff --git a/go/vt/key/destination_test.go b/go/vt/key/destination_test.go index 8bd5328d6dc..d7e9b8df26b 100644 --- a/go/vt/key/destination_test.go +++ b/go/vt/key/destination_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // initShardArray returns the ShardReference array for the provided diff --git a/go/vt/key/key.go b/go/vt/key/key.go index bb7517f688f..676aca98ae3 100644 --- a/go/vt/key/key.go +++ b/go/vt/key/key.go @@ -26,7 +26,7 @@ import ( "regexp" "strings" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/vt/key/key_test.go b/go/vt/key/key_test.go index f8f499dc48c..480b1408cf1 100644 --- a/go/vt/key/key_test.go +++ b/go/vt/key/key_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestNormalize(t *testing.T) { diff --git a/go/vt/logutil/console_logger.go b/go/vt/logutil/console_logger.go index 75b059ea1ef..748a955cfc2 100644 --- a/go/vt/logutil/console_logger.go +++ b/go/vt/logutil/console_logger.go @@ -19,7 +19,7 @@ package logutil import ( "fmt" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // ConsoleLogger is a Logger that uses glog directly to log, at the right level. diff --git a/go/vt/logutil/flush.go b/go/vt/logutil/flush.go index 0cf21b67baa..d06b6ef06f3 100644 --- a/go/vt/logutil/flush.go +++ b/go/vt/logutil/flush.go @@ -17,7 +17,7 @@ limitations under the License. package logutil import ( - "github.com/mdibaiee/vitess/go/event" + "github.com/vitess/vitess/go/event" ) var ( diff --git a/go/vt/logutil/flush_glog.go b/go/vt/logutil/flush_glog.go index 57e0a04aa71..b44329a8290 100644 --- a/go/vt/logutil/flush_glog.go +++ b/go/vt/logutil/flush_glog.go @@ -17,7 +17,7 @@ limitations under the License. package logutil import ( - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) func init() { diff --git a/go/vt/logutil/level.go b/go/vt/logutil/level.go index d26db687527..b4bf10df880 100644 --- a/go/vt/logutil/level.go +++ b/go/vt/logutil/level.go @@ -17,7 +17,7 @@ limitations under the License. package logutil import ( - _flag "github.com/mdibaiee/vitess/go/internal/flag" + _flag "github.com/vitess/vitess/go/internal/flag" ) func init() { diff --git a/go/vt/logutil/logger.go b/go/vt/logutil/logger.go index 7d26036b616..18e39125c0a 100644 --- a/go/vt/logutil/logger.go +++ b/go/vt/logutil/logger.go @@ -24,8 +24,8 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/protoutil" - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" + "github.com/vitess/vitess/go/protoutil" + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" ) // Logger defines the interface to use for our logging interface. diff --git a/go/vt/logutil/logger_test.go b/go/vt/logutil/logger_test.go index c9a61788692..c98637f4f1b 100644 --- a/go/vt/logutil/logger_test.go +++ b/go/vt/logutil/logger_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/race" - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/race" + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" ) func TestLogEvent(t *testing.T) { diff --git a/go/vt/logutil/logutil.go b/go/vt/logutil/logutil.go index 9d393ca0d9a..fe223cf2c0e 100644 --- a/go/vt/logutil/logutil.go +++ b/go/vt/logutil/logutil.go @@ -22,7 +22,7 @@ package logutil import ( stdlog "log" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) type logShim struct{} diff --git a/go/vt/logutil/proto3.go b/go/vt/logutil/proto3.go index 0e2a600cefb..f7d5cb1905a 100644 --- a/go/vt/logutil/proto3.go +++ b/go/vt/logutil/proto3.go @@ -17,7 +17,7 @@ limitations under the License. package logutil import ( - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" ) // This file contains a few functions to help with proto3. diff --git a/go/vt/logutil/purge.go b/go/vt/logutil/purge.go index 679b57047e0..f906a53f461 100644 --- a/go/vt/logutil/purge.go +++ b/go/vt/logutil/purge.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/pflag" - _flag "github.com/mdibaiee/vitess/go/internal/flag" + _flag "github.com/vitess/vitess/go/internal/flag" ) var ( diff --git a/go/vt/logutil/throttled.go b/go/vt/logutil/throttled.go index 24517bab08c..0446afc6cd3 100644 --- a/go/vt/logutil/throttled.go +++ b/go/vt/logutil/throttled.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // ThrottledLogger will allow logging of messages but won't spam the diff --git a/go/vt/mysqlctl/azblobbackupstorage/azblob.go b/go/vt/mysqlctl/azblobbackupstorage/azblob.go index a265cc4b7b4..3921b15c648 100644 --- a/go/vt/mysqlctl/azblobbackupstorage/azblob.go +++ b/go/vt/mysqlctl/azblobbackupstorage/azblob.go @@ -32,11 +32,11 @@ import ( "github.com/Azure/azure-storage-blob-go/azblob" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/viperutil" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/viperutil" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/go/vt/mysqlctl/backup.go b/go/vt/mysqlctl/backup.go index 3df0ebd66dd..adae0dc37ad 100644 --- a/go/vt/mysqlctl/backup.go +++ b/go/vt/mysqlctl/backup.go @@ -27,16 +27,16 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstats" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstats" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // This file handles the backup and restore related code diff --git a/go/vt/mysqlctl/backup_blackbox_test.go b/go/vt/mysqlctl/backup_blackbox_test.go index da5f0439595..e0584b9aba0 100644 --- a/go/vt/mysqlctl/backup_blackbox_test.go +++ b/go/vt/mysqlctl/backup_blackbox_test.go @@ -29,23 +29,23 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/utils" - - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/mysql/replication" - - "github.com/mdibaiee/vitess/go/sqltypes" - - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstats" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/filebackupstorage" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/test/utils" + + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/mysql/replication" + + "github.com/vitess/vitess/go/sqltypes" + + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstats" + "github.com/vitess/vitess/go/vt/mysqlctl/filebackupstorage" + "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" ) const mysqlShutdownTimeout = 1 * time.Minute diff --git a/go/vt/mysqlctl/backup_test.go b/go/vt/mysqlctl/backup_test.go index 8722b383445..85c846cdba7 100644 --- a/go/vt/mysqlctl/backup_test.go +++ b/go/vt/mysqlctl/backup_test.go @@ -32,16 +32,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstats" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstats" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" ) const mysqlShutdownTimeout = 1 * time.Minute diff --git a/go/vt/mysqlctl/backupengine.go b/go/vt/mysqlctl/backupengine.go index 9d8b4011c8c..8d6476626af 100644 --- a/go/vt/mysqlctl/backupengine.go +++ b/go/vt/mysqlctl/backupengine.go @@ -28,16 +28,16 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstats" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstats" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vterrors" ) var ( diff --git a/go/vt/mysqlctl/backupstats/deprecated.go b/go/vt/mysqlctl/backupstats/deprecated.go index 8757eb6b479..1dc425f9f26 100644 --- a/go/vt/mysqlctl/backupstats/deprecated.go +++ b/go/vt/mysqlctl/backupstats/deprecated.go @@ -16,7 +16,7 @@ limitations under the License. package backupstats -import "github.com/mdibaiee/vitess/go/stats" +import "github.com/vitess/vitess/go/stats" var ( // DeprecatedBackupDurationS is a deprecated statistic that will be removed diff --git a/go/vt/mysqlctl/backupstats/stats.go b/go/vt/mysqlctl/backupstats/stats.go index 04510aa3752..90e2db06e61 100644 --- a/go/vt/mysqlctl/backupstats/stats.go +++ b/go/vt/mysqlctl/backupstats/stats.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) // Stats is a reporting interface meant to be shared among backup and restore diff --git a/go/vt/mysqlctl/backupstats/stats_test.go b/go/vt/mysqlctl/backupstats/stats_test.go index 00ac66144d9..e28823d5977 100644 --- a/go/vt/mysqlctl/backupstats/stats_test.go +++ b/go/vt/mysqlctl/backupstats/stats_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) func TestBackupStats(t *testing.T) { diff --git a/go/vt/mysqlctl/backupstorage/interface.go b/go/vt/mysqlctl/backupstorage/interface.go index ade97a31d3d..5916e2efa03 100644 --- a/go/vt/mysqlctl/backupstorage/interface.go +++ b/go/vt/mysqlctl/backupstorage/interface.go @@ -25,8 +25,8 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/go/vt/mysqlctl/backupstorage/params.go b/go/vt/mysqlctl/backupstorage/params.go index efdbd45924e..5cffcfb5207 100644 --- a/go/vt/mysqlctl/backupstorage/params.go +++ b/go/vt/mysqlctl/backupstorage/params.go @@ -17,9 +17,9 @@ limitations under the License. package backupstorage import ( - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstats" - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstats" + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" ) // Params contains common utilities that may be used by BackupStorage and FileHandle components. diff --git a/go/vt/mysqlctl/binlogs_gtid.go b/go/vt/mysqlctl/binlogs_gtid.go index ee402fd633f..c20dd2d9ac1 100644 --- a/go/vt/mysqlctl/binlogs_gtid.go +++ b/go/vt/mysqlctl/binlogs_gtid.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) type BackupManifestPath []*BackupManifest diff --git a/go/vt/mysqlctl/binlogs_gtid_test.go b/go/vt/mysqlctl/binlogs_gtid_test.go index 65721b13dc9..837de883010 100644 --- a/go/vt/mysqlctl/binlogs_gtid_test.go +++ b/go/vt/mysqlctl/binlogs_gtid_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/replication" ) func TestChooseBinlogsForIncrementalBackup(t *testing.T) { diff --git a/go/vt/mysqlctl/builtinbackupengine.go b/go/vt/mysqlctl/builtinbackupengine.go index 0bbe2b13b68..6bee75ee076 100644 --- a/go/vt/mysqlctl/builtinbackupengine.go +++ b/go/vt/mysqlctl/builtinbackupengine.go @@ -36,24 +36,24 @@ import ( "github.com/spf13/pflag" "golang.org/x/sync/semaphore" - "github.com/mdibaiee/vitess/go/ioutil" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - stats "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstats" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - mysqlctlpb "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/ioutil" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + stats "github.com/vitess/vitess/go/vt/mysqlctl/backupstats" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + mysqlctlpb "github.com/vitess/vitess/go/vt/proto/mysqlctl" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const ( diff --git a/go/vt/mysqlctl/builtinbackupengine_test.go b/go/vt/mysqlctl/builtinbackupengine_test.go index 7dafae834f1..b413a7c753f 100644 --- a/go/vt/mysqlctl/builtinbackupengine_test.go +++ b/go/vt/mysqlctl/builtinbackupengine_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) func TestGetIncrementalFromPosGTIDSet(t *testing.T) { diff --git a/go/vt/mysqlctl/cephbackupstorage/ceph.go b/go/vt/mysqlctl/cephbackupstorage/ceph.go index cfb3d91e391..aa3a13f136e 100644 --- a/go/vt/mysqlctl/cephbackupstorage/ceph.go +++ b/go/vt/mysqlctl/cephbackupstorage/ceph.go @@ -32,10 +32,10 @@ import ( minio "github.com/minio/minio-go" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/go/vt/mysqlctl/cmd.go b/go/vt/mysqlctl/cmd.go index 580b0766b3d..3687d3f3c8f 100644 --- a/go/vt/mysqlctl/cmd.go +++ b/go/vt/mysqlctl/cmd.go @@ -23,8 +23,8 @@ package mysqlctl import ( "fmt" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/dbconfigs" ) // CreateMysqldAndMycnf returns a Mysqld and a Mycnf object to use for working with a MySQL diff --git a/go/vt/mysqlctl/compression.go b/go/vt/mysqlctl/compression.go index 0a9db6a3a68..27412f77d5f 100644 --- a/go/vt/mysqlctl/compression.go +++ b/go/vt/mysqlctl/compression.go @@ -31,9 +31,9 @@ import ( "github.com/planetscale/pargzip" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vterrors" ) const ( diff --git a/go/vt/mysqlctl/compression_benchmark_test.go b/go/vt/mysqlctl/compression_benchmark_test.go index 00fb51e0309..849373a3bbd 100644 --- a/go/vt/mysqlctl/compression_benchmark_test.go +++ b/go/vt/mysqlctl/compression_benchmark_test.go @@ -19,9 +19,9 @@ import ( "github.com/klauspost/compress/zstd" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/hack" + "github.com/vitess/vitess/go/hack" - "github.com/mdibaiee/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/logutil" ) type ( diff --git a/go/vt/mysqlctl/compression_test.go b/go/vt/mysqlctl/compression_test.go index 075f3f35279..6e40b553605 100644 --- a/go/vt/mysqlctl/compression_test.go +++ b/go/vt/mysqlctl/compression_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/logutil" ) func TestGetExtensionFromEngine(t *testing.T) { diff --git a/go/vt/mysqlctl/fakebackupengine.go b/go/vt/mysqlctl/fakebackupengine.go index 23bcf9726c8..251ae1a04b5 100644 --- a/go/vt/mysqlctl/fakebackupengine.go +++ b/go/vt/mysqlctl/fakebackupengine.go @@ -20,8 +20,8 @@ import ( "context" "time" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) type FakeBackupEngine struct { diff --git a/go/vt/mysqlctl/fakebackupstorage.go b/go/vt/mysqlctl/fakebackupstorage.go index a10b07e2c92..662cef0903a 100644 --- a/go/vt/mysqlctl/fakebackupstorage.go +++ b/go/vt/mysqlctl/fakebackupstorage.go @@ -21,8 +21,8 @@ import ( "fmt" "io" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" ) type FakeBackupHandle struct { diff --git a/go/vt/mysqlctl/fakemysqldaemon.go b/go/vt/mysqlctl/fakemysqldaemon.go index ee9aa14672b..e27277eb3b0 100644 --- a/go/vt/mysqlctl/fakemysqldaemon.go +++ b/go/vt/mysqlctl/fakemysqldaemon.go @@ -26,18 +26,18 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/dbconnpool" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - - mysqlctlpb "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/dbconnpool" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/proto/replicationdata" + + mysqlctlpb "github.com/vitess/vitess/go/vt/proto/mysqlctl" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) // FakeMysqlDaemon implements MysqlDaemon and allows the user to fake diff --git a/go/vt/mysqlctl/filebackupstorage/file.go b/go/vt/mysqlctl/filebackupstorage/file.go index e839429c71b..c8fa1901ac9 100644 --- a/go/vt/mysqlctl/filebackupstorage/file.go +++ b/go/vt/mysqlctl/filebackupstorage/file.go @@ -27,11 +27,11 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/ioutil" - "github.com/mdibaiee/vitess/go/vt/concurrency" - stats "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstats" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/ioutil" + "github.com/vitess/vitess/go/vt/concurrency" + stats "github.com/vitess/vitess/go/vt/mysqlctl/backupstats" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/go/vt/mysqlctl/filebackupstorage/file_test.go b/go/vt/mysqlctl/filebackupstorage/file_test.go index 964a6edceb3..68352dc06d1 100644 --- a/go/vt/mysqlctl/filebackupstorage/file_test.go +++ b/go/vt/mysqlctl/filebackupstorage/file_test.go @@ -21,7 +21,7 @@ import ( "io" "testing" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" ) // This file tests the file BackupStorage engine. diff --git a/go/vt/mysqlctl/gcsbackupstorage/gcs.go b/go/vt/mysqlctl/gcsbackupstorage/gcs.go index 28cfc6fdf45..aa7a2cc709e 100644 --- a/go/vt/mysqlctl/gcsbackupstorage/gcs.go +++ b/go/vt/mysqlctl/gcsbackupstorage/gcs.go @@ -32,10 +32,10 @@ import ( "google.golang.org/api/iterator" "google.golang.org/api/option" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/go/vt/mysqlctl/grpcmysqlctlclient/client.go b/go/vt/mysqlctl/grpcmysqlctlclient/client.go index 67a26161003..c6bdfb71a1c 100644 --- a/go/vt/mysqlctl/grpcmysqlctlclient/client.go +++ b/go/vt/mysqlctl/grpcmysqlctlclient/client.go @@ -29,10 +29,10 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/status" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/mysqlctlclient" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/mysqlctl/mysqlctlclient" - mysqlctlpb "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" + mysqlctlpb "github.com/vitess/vitess/go/vt/proto/mysqlctl" ) type client struct { diff --git a/go/vt/mysqlctl/grpcmysqlctlserver/server.go b/go/vt/mysqlctl/grpcmysqlctlserver/server.go index a0bf12b5e47..4f5d0d2d506 100644 --- a/go/vt/mysqlctl/grpcmysqlctlserver/server.go +++ b/go/vt/mysqlctl/grpcmysqlctlserver/server.go @@ -25,9 +25,9 @@ import ( "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - mysqlctlpb "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + mysqlctlpb "github.com/vitess/vitess/go/vt/proto/mysqlctl" ) // server is our gRPC server. diff --git a/go/vt/mysqlctl/mycnf_flag.go b/go/vt/mysqlctl/mycnf_flag.go index 6c1885b771e..03d85fadfc1 100644 --- a/go/vt/mysqlctl/mycnf_flag.go +++ b/go/vt/mysqlctl/mycnf_flag.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" ) // This file handles using command line flags to create a Mycnf object. diff --git a/go/vt/mysqlctl/mycnf_gen.go b/go/vt/mysqlctl/mycnf_gen.go index 45f04065829..f9c8bd8edf0 100644 --- a/go/vt/mysqlctl/mycnf_gen.go +++ b/go/vt/mysqlctl/mycnf_gen.go @@ -28,8 +28,8 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/env" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/env" + "github.com/vitess/vitess/go/vt/servenv" ) // This files handles the creation of Mycnf objects for the default 'vt' diff --git a/go/vt/mysqlctl/mycnf_test.go b/go/vt/mysqlctl/mycnf_test.go index a9ef2d5c830..e9a2b6fc8ae 100644 --- a/go/vt/mysqlctl/mycnf_test.go +++ b/go/vt/mysqlctl/mycnf_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/servenv" ) var MycnfPath = "/tmp/my.cnf" diff --git a/go/vt/mysqlctl/mysql_daemon.go b/go/vt/mysqlctl/mysql_daemon.go index f5c8b5f614b..069e25389b0 100644 --- a/go/vt/mysqlctl/mysql_daemon.go +++ b/go/vt/mysqlctl/mysql_daemon.go @@ -20,16 +20,16 @@ import ( "context" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconnpool" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - - mysqlctlpb "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconnpool" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/proto/replicationdata" + + mysqlctlpb "github.com/vitess/vitess/go/vt/proto/mysqlctl" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) // MysqlDaemon is the interface we use for abstracting Mysqld. diff --git a/go/vt/mysqlctl/mysqlctlclient/interface.go b/go/vt/mysqlctl/mysqlctlclient/interface.go index c3760c1dafd..514e269b41e 100644 --- a/go/vt/mysqlctl/mysqlctlclient/interface.go +++ b/go/vt/mysqlctl/mysqlctlclient/interface.go @@ -24,9 +24,9 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" - mysqlctlpb "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/log" + mysqlctlpb "github.com/vitess/vitess/go/vt/proto/mysqlctl" + "github.com/vitess/vitess/go/vt/servenv" ) var protocol = "grpc" diff --git a/go/vt/mysqlctl/mysqlctlproto/backup.go b/go/vt/mysqlctl/mysqlctlproto/backup.go index 0021d634c39..1b8b93d1108 100644 --- a/go/vt/mysqlctl/mysqlctlproto/backup.go +++ b/go/vt/mysqlctl/mysqlctlproto/backup.go @@ -17,11 +17,11 @@ limitations under the License. package mysqlctlproto import ( - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" - mysqlctlpb "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" + mysqlctlpb "github.com/vitess/vitess/go/vt/proto/mysqlctl" ) // BackupHandleToProto returns a BackupInfo proto from a BackupHandle. diff --git a/go/vt/mysqlctl/mysqlctlproto/backup_test.go b/go/vt/mysqlctl/mysqlctlproto/backup_test.go index 11ba0d0e803..9e600ca7094 100644 --- a/go/vt/mysqlctl/mysqlctlproto/backup_test.go +++ b/go/vt/mysqlctl/mysqlctlproto/backup_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" - mysqlctlpb "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + mysqlctlpb "github.com/vitess/vitess/go/vt/proto/mysqlctl" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) type backupHandle struct { diff --git a/go/vt/mysqlctl/mysqld.go b/go/vt/mysqlctl/mysqld.go index ebc4a09a3c3..f05e3978dba 100644 --- a/go/vt/mysqlctl/mysqld.go +++ b/go/vt/mysqlctl/mysqld.go @@ -43,22 +43,22 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/config" - - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/dbconnpool" - vtenv "github.com/mdibaiee/vitess/go/vt/env" - "github.com/mdibaiee/vitess/go/vt/hook" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/mysqlctlclient" - mysqlctlpb "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/config" + + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/dbconnpool" + vtenv "github.com/vitess/vitess/go/vt/env" + "github.com/vitess/vitess/go/vt/hook" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl/mysqlctlclient" + mysqlctlpb "github.com/vitess/vitess/go/vt/proto/mysqlctl" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vterrors" ) // The string we expect before the MySQL version number diff --git a/go/vt/mysqlctl/mysqld_test.go b/go/vt/mysqlctl/mysqld_test.go index 001dc0a9599..723db9eccef 100644 --- a/go/vt/mysqlctl/mysqld_test.go +++ b/go/vt/mysqlctl/mysqld_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" ) type testcase struct { diff --git a/go/vt/mysqlctl/permissions.go b/go/vt/mysqlctl/permissions.go index 30db719540a..2ee79f537de 100644 --- a/go/vt/mysqlctl/permissions.go +++ b/go/vt/mysqlctl/permissions.go @@ -19,8 +19,8 @@ package mysqlctl import ( "context" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) // GetPermissions lists the permissions on the mysqld. diff --git a/go/vt/mysqlctl/permissions_test.go b/go/vt/mysqlctl/permissions_test.go index 700b7a02a6a..23ea4202b40 100644 --- a/go/vt/mysqlctl/permissions_test.go +++ b/go/vt/mysqlctl/permissions_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" ) func TestGetPermissions(t *testing.T) { diff --git a/go/vt/mysqlctl/plugin_grpcmysqlctlclient.go b/go/vt/mysqlctl/plugin_grpcmysqlctlclient.go index 0286f6da2a1..e8b0e1320ad 100644 --- a/go/vt/mysqlctl/plugin_grpcmysqlctlclient.go +++ b/go/vt/mysqlctl/plugin_grpcmysqlctlclient.go @@ -18,5 +18,5 @@ package mysqlctl import ( // Register the gRPC mysqlctl client. - _ "github.com/mdibaiee/vitess/go/vt/mysqlctl/grpcmysqlctlclient" + _ "github.com/vitess/vitess/go/vt/mysqlctl/grpcmysqlctlclient" ) diff --git a/go/vt/mysqlctl/query.go b/go/vt/mysqlctl/query.go index c7edfb19594..9cc9821c7e1 100644 --- a/go/vt/mysqlctl/query.go +++ b/go/vt/mysqlctl/query.go @@ -22,10 +22,10 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconnpool" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconnpool" + "github.com/vitess/vitess/go/vt/log" ) // getPoolReconnect gets a connection from a pool, tests it, and reconnects if diff --git a/go/vt/mysqlctl/redo_log_test.go b/go/vt/mysqlctl/redo_log_test.go index ce08a539856..43d2d4f03ed 100644 --- a/go/vt/mysqlctl/redo_log_test.go +++ b/go/vt/mysqlctl/redo_log_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" ) func TestProcessCanDisableRedoLog(t *testing.T) { diff --git a/go/vt/mysqlctl/reparent.go b/go/vt/mysqlctl/reparent.go index c3915b77f44..2df5fcf0468 100644 --- a/go/vt/mysqlctl/reparent.go +++ b/go/vt/mysqlctl/reparent.go @@ -24,11 +24,11 @@ import ( "context" "time" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // GenerateInitialBinlogEntry is used to create a binlog entry when diff --git a/go/vt/mysqlctl/reparent_test.go b/go/vt/mysqlctl/reparent_test.go index 0d66ac79dee..77e03ccfb9b 100644 --- a/go/vt/mysqlctl/reparent_test.go +++ b/go/vt/mysqlctl/reparent_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/logutil" ) func TestPopulateReparentJournal(t *testing.T) { diff --git a/go/vt/mysqlctl/replication.go b/go/vt/mysqlctl/replication.go index c891b86ccd5..7e2c8c7c21d 100644 --- a/go/vt/mysqlctl/replication.go +++ b/go/vt/mysqlctl/replication.go @@ -29,16 +29,16 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/hook" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/hook" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/replicationdata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) const ( diff --git a/go/vt/mysqlctl/replication_test.go b/go/vt/mysqlctl/replication_test.go index 7c28ada420c..110cad1ad32 100644 --- a/go/vt/mysqlctl/replication_test.go +++ b/go/vt/mysqlctl/replication_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" ) func testRedacted(t *testing.T, source, expected string) { diff --git a/go/vt/mysqlctl/s3backupstorage/s3.go b/go/vt/mysqlctl/s3backupstorage/s3.go index 4193848fcac..64eddfe4716 100644 --- a/go/vt/mysqlctl/s3backupstorage/s3.go +++ b/go/vt/mysqlctl/s3backupstorage/s3.go @@ -47,11 +47,11 @@ import ( "github.com/aws/aws-sdk-go/service/s3/s3manager" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" - stats "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstats" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" + stats "github.com/vitess/vitess/go/vt/mysqlctl/backupstats" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/go/vt/mysqlctl/s3backupstorage/s3_test.go b/go/vt/mysqlctl/s3backupstorage/s3_test.go index 79b89793d68..69af594e59d 100644 --- a/go/vt/mysqlctl/s3backupstorage/s3_test.go +++ b/go/vt/mysqlctl/s3backupstorage/s3_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/logutil" - stats "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstats" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/vt/logutil" + stats "github.com/vitess/vitess/go/vt/mysqlctl/backupstats" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" ) type s3FakeClient struct { diff --git a/go/vt/mysqlctl/schema.go b/go/vt/mysqlctl/schema.go index 0ad18e17178..ad7927f5923 100644 --- a/go/vt/mysqlctl/schema.go +++ b/go/vt/mysqlctl/schema.go @@ -25,17 +25,17 @@ import ( "golang.org/x/sync/errgroup" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/vterrors" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const ( diff --git a/go/vt/mysqlctl/schema_test.go b/go/vt/mysqlctl/schema_test.go index af8c37c453a..c8bfdf52245 100644 --- a/go/vt/mysqlctl/schema_test.go +++ b/go/vt/mysqlctl/schema_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) var queryMap map[string]*sqltypes.Result diff --git a/go/vt/mysqlctl/tabledefinitions_test.go b/go/vt/mysqlctl/tabledefinitions_test.go index f3b61d844ab..eee6eb17a05 100644 --- a/go/vt/mysqlctl/tabledefinitions_test.go +++ b/go/vt/mysqlctl/tabledefinitions_test.go @@ -20,7 +20,7 @@ import ( "sort" "testing" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" ) func TestTableDefinitionsAreSorted(t *testing.T) { diff --git a/go/vt/mysqlctl/tmutils/permissions.go b/go/vt/mysqlctl/tmutils/permissions.go index 5fa39f67473..785f338de26 100644 --- a/go/vt/mysqlctl/tmutils/permissions.go +++ b/go/vt/mysqlctl/tmutils/permissions.go @@ -24,11 +24,11 @@ import ( "sort" "strings" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/concurrency" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/concurrency" + querypb "github.com/vitess/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) // This file contains helper methods to deal with Permissions. diff --git a/go/vt/mysqlctl/tmutils/permissions_test.go b/go/vt/mysqlctl/tmutils/permissions_test.go index 3f42f278142..878d65c9e85 100644 --- a/go/vt/mysqlctl/tmutils/permissions_test.go +++ b/go/vt/mysqlctl/tmutils/permissions_test.go @@ -19,10 +19,10 @@ package tmutils import ( "testing" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) func mapToSQLResults(row map[string]string) ([]*querypb.Field, []sqltypes.Value) { diff --git a/go/vt/mysqlctl/tmutils/schema.go b/go/vt/mysqlctl/tmutils/schema.go index 76ebdfdae78..c9def2a69c3 100644 --- a/go/vt/mysqlctl/tmutils/schema.go +++ b/go/vt/mysqlctl/tmutils/schema.go @@ -23,12 +23,12 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/schema" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) // This file contains helper methods to deal with Schema information. diff --git a/go/vt/mysqlctl/tmutils/schema_test.go b/go/vt/mysqlctl/tmutils/schema_test.go index deedd6e44b1..ce5d12f7871 100644 --- a/go/vt/mysqlctl/tmutils/schema_test.go +++ b/go/vt/mysqlctl/tmutils/schema_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) var basicTable1 = &tabletmanagerdatapb.TableDefinition{ diff --git a/go/vt/mysqlctl/xtrabackupengine.go b/go/vt/mysqlctl/xtrabackupengine.go index cc015ffd12d..e7bbd1c9e9e 100644 --- a/go/vt/mysqlctl/xtrabackupengine.go +++ b/go/vt/mysqlctl/xtrabackupengine.go @@ -32,14 +32,14 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/ioutil" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/ioutil" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vterrors" ) // XtrabackupEngine encapsulates the logic of the xtrabackup engine diff --git a/go/vt/mysqlctl/xtrabackupengine_test.go b/go/vt/mysqlctl/xtrabackupengine_test.go index 0952511c4b7..d34008c8963 100644 --- a/go/vt/mysqlctl/xtrabackupengine_test.go +++ b/go/vt/mysqlctl/xtrabackupengine_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/logutil" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/vt/logutil" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) func TestFindReplicationPosition(t *testing.T) { diff --git a/go/vt/proto/binlogdata/binlogdata.pb.go b/go/vt/proto/binlogdata/binlogdata.pb.go index 3d63233cfad..f95580a7b14 100644 --- a/go/vt/proto/binlogdata/binlogdata.pb.go +++ b/go/vt/proto/binlogdata/binlogdata.pb.go @@ -28,9 +28,9 @@ package binlogdata import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - query "github.com/mdibaiee/vitess/go/vt/proto/query" - topodata "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpc "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + query "github.com/vitess/vitess/go/vt/proto/query" + topodata "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpc "github.com/vitess/vitess/go/vt/proto/vtrpc" reflect "reflect" sync "sync" ) diff --git a/go/vt/proto/binlogdata/binlogdata_vtproto.pb.go b/go/vt/proto/binlogdata/binlogdata_vtproto.pb.go index 0bf2b64be22..a063cc742ec 100644 --- a/go/vt/proto/binlogdata/binlogdata_vtproto.pb.go +++ b/go/vt/proto/binlogdata/binlogdata_vtproto.pb.go @@ -10,9 +10,9 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" io "io" bits "math/bits" - query "github.com/mdibaiee/vitess/go/vt/proto/query" - topodata "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpc "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + query "github.com/vitess/vitess/go/vt/proto/query" + topodata "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpc "github.com/vitess/vitess/go/vt/proto/vtrpc" sync "sync" ) diff --git a/go/vt/proto/binlogservice/binlogservice.pb.go b/go/vt/proto/binlogservice/binlogservice.pb.go index 2f53a843ab0..eaea17cbad7 100644 --- a/go/vt/proto/binlogservice/binlogservice.pb.go +++ b/go/vt/proto/binlogservice/binlogservice.pb.go @@ -28,7 +28,7 @@ package binlogservice import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - binlogdata "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdata "github.com/vitess/vitess/go/vt/proto/binlogdata" reflect "reflect" ) diff --git a/go/vt/proto/binlogservice/binlogservice_grpc.pb.go b/go/vt/proto/binlogservice/binlogservice_grpc.pb.go index 85750a6f543..355ac7c2f69 100644 --- a/go/vt/proto/binlogservice/binlogservice_grpc.pb.go +++ b/go/vt/proto/binlogservice/binlogservice_grpc.pb.go @@ -11,7 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - binlogdata "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdata "github.com/vitess/vitess/go/vt/proto/binlogdata" ) // This is a compile-time assertion to ensure that this generated file diff --git a/go/vt/proto/logutil/logutil.pb.go b/go/vt/proto/logutil/logutil.pb.go index 8ed872a32af..4f49d92f5d9 100644 --- a/go/vt/proto/logutil/logutil.pb.go +++ b/go/vt/proto/logutil/logutil.pb.go @@ -26,7 +26,7 @@ package logutil import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - vttime "github.com/mdibaiee/vitess/go/vt/proto/vttime" + vttime "github.com/vitess/vitess/go/vt/proto/vttime" reflect "reflect" sync "sync" ) diff --git a/go/vt/proto/logutil/logutil_vtproto.pb.go b/go/vt/proto/logutil/logutil_vtproto.pb.go index cd87faa3224..e7f33e30b5e 100644 --- a/go/vt/proto/logutil/logutil_vtproto.pb.go +++ b/go/vt/proto/logutil/logutil_vtproto.pb.go @@ -10,7 +10,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" io "io" bits "math/bits" - vttime "github.com/mdibaiee/vitess/go/vt/proto/vttime" + vttime "github.com/vitess/vitess/go/vt/proto/vttime" ) const ( diff --git a/go/vt/proto/mysqlctl/mysqlctl.pb.go b/go/vt/proto/mysqlctl/mysqlctl.pb.go index 8823c090268..647a915f3b7 100644 --- a/go/vt/proto/mysqlctl/mysqlctl.pb.go +++ b/go/vt/proto/mysqlctl/mysqlctl.pb.go @@ -27,8 +27,8 @@ package mysqlctl import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - topodata "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vttime "github.com/mdibaiee/vitess/go/vt/proto/vttime" + topodata "github.com/vitess/vitess/go/vt/proto/topodata" + vttime "github.com/vitess/vitess/go/vt/proto/vttime" reflect "reflect" sync "sync" ) diff --git a/go/vt/proto/mysqlctl/mysqlctl_vtproto.pb.go b/go/vt/proto/mysqlctl/mysqlctl_vtproto.pb.go index f925e36b93f..317971c9ad4 100644 --- a/go/vt/proto/mysqlctl/mysqlctl_vtproto.pb.go +++ b/go/vt/proto/mysqlctl/mysqlctl_vtproto.pb.go @@ -10,8 +10,8 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" io "io" bits "math/bits" - topodata "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vttime "github.com/mdibaiee/vitess/go/vt/proto/vttime" + topodata "github.com/vitess/vitess/go/vt/proto/topodata" + vttime "github.com/vitess/vitess/go/vt/proto/vttime" ) const ( diff --git a/go/vt/proto/query/cached_size.go b/go/vt/proto/query/cached_size.go index 75fa339b6fd..69054546800 100644 --- a/go/vt/proto/query/cached_size.go +++ b/go/vt/proto/query/cached_size.go @@ -17,7 +17,7 @@ limitations under the License. package query -import hack "github.com/mdibaiee/vitess/go/hack" +import hack "github.com/vitess/vitess/go/hack" func (cached *BindVariable) CachedSize(alloc bool) int64 { if cached == nil { @@ -35,7 +35,7 @@ func (cached *BindVariable) CachedSize(alloc bool) int64 { { size += hack.RuntimeAllocSize(int64(cap(cached.Value))) } - // field Values []*github.com/mdibaiee/vitess/go/vt/proto/query.Value + // field Values []*github.com/vitess/vitess/go/vt/proto/query.Value { size += hack.RuntimeAllocSize(int64(cap(cached.Values)) * int64(8)) for _, elem := range cached.Values { diff --git a/go/vt/proto/query/query.pb.go b/go/vt/proto/query/query.pb.go index cb25da56974..99fa808ba99 100644 --- a/go/vt/proto/query/query.pb.go +++ b/go/vt/proto/query/query.pb.go @@ -27,8 +27,8 @@ package query import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - topodata "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpc "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + topodata "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpc "github.com/vitess/vitess/go/vt/proto/vtrpc" reflect "reflect" sync "sync" ) diff --git a/go/vt/proto/query/query_vtproto.pb.go b/go/vt/proto/query/query_vtproto.pb.go index de46dd0b711..2462d59ef11 100644 --- a/go/vt/proto/query/query_vtproto.pb.go +++ b/go/vt/proto/query/query_vtproto.pb.go @@ -12,8 +12,8 @@ import ( io "io" math "math" bits "math/bits" - topodata "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpc "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + topodata "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpc "github.com/vitess/vitess/go/vt/proto/vtrpc" sync "sync" ) diff --git a/go/vt/proto/queryservice/queryservice.pb.go b/go/vt/proto/queryservice/queryservice.pb.go index d5d910f0ae6..9007c1f9fb4 100644 --- a/go/vt/proto/queryservice/queryservice.pb.go +++ b/go/vt/proto/queryservice/queryservice.pb.go @@ -26,8 +26,8 @@ package queryservice import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - binlogdata "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - query "github.com/mdibaiee/vitess/go/vt/proto/query" + binlogdata "github.com/vitess/vitess/go/vt/proto/binlogdata" + query "github.com/vitess/vitess/go/vt/proto/query" reflect "reflect" ) diff --git a/go/vt/proto/queryservice/queryservice_grpc.pb.go b/go/vt/proto/queryservice/queryservice_grpc.pb.go index 68b4a72f3ae..07b36366818 100644 --- a/go/vt/proto/queryservice/queryservice_grpc.pb.go +++ b/go/vt/proto/queryservice/queryservice_grpc.pb.go @@ -11,8 +11,8 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - binlogdata "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - query "github.com/mdibaiee/vitess/go/vt/proto/query" + binlogdata "github.com/vitess/vitess/go/vt/proto/binlogdata" + query "github.com/vitess/vitess/go/vt/proto/query" ) // This is a compile-time assertion to ensure that this generated file diff --git a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go index 9658bbf0837..b892b7cac8e 100644 --- a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go +++ b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go @@ -27,13 +27,13 @@ package tabletmanagerdata import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - binlogdata "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - logutil "github.com/mdibaiee/vitess/go/vt/proto/logutil" - query "github.com/mdibaiee/vitess/go/vt/proto/query" - replicationdata "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - topodata "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpc "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - vttime "github.com/mdibaiee/vitess/go/vt/proto/vttime" + binlogdata "github.com/vitess/vitess/go/vt/proto/binlogdata" + logutil "github.com/vitess/vitess/go/vt/proto/logutil" + query "github.com/vitess/vitess/go/vt/proto/query" + replicationdata "github.com/vitess/vitess/go/vt/proto/replicationdata" + topodata "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpc "github.com/vitess/vitess/go/vt/proto/vtrpc" + vttime "github.com/vitess/vitess/go/vt/proto/vttime" reflect "reflect" sync "sync" ) diff --git a/go/vt/proto/tabletmanagerdata/tabletmanagerdata_vtproto.pb.go b/go/vt/proto/tabletmanagerdata/tabletmanagerdata_vtproto.pb.go index 904b8a6f108..1874fe43524 100644 --- a/go/vt/proto/tabletmanagerdata/tabletmanagerdata_vtproto.pb.go +++ b/go/vt/proto/tabletmanagerdata/tabletmanagerdata_vtproto.pb.go @@ -12,13 +12,13 @@ import ( io "io" math "math" bits "math/bits" - binlogdata "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - logutil "github.com/mdibaiee/vitess/go/vt/proto/logutil" - query "github.com/mdibaiee/vitess/go/vt/proto/query" - replicationdata "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - topodata "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpc "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - vttime "github.com/mdibaiee/vitess/go/vt/proto/vttime" + binlogdata "github.com/vitess/vitess/go/vt/proto/binlogdata" + logutil "github.com/vitess/vitess/go/vt/proto/logutil" + query "github.com/vitess/vitess/go/vt/proto/query" + replicationdata "github.com/vitess/vitess/go/vt/proto/replicationdata" + topodata "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpc "github.com/vitess/vitess/go/vt/proto/vtrpc" + vttime "github.com/vitess/vitess/go/vt/proto/vttime" ) const ( diff --git a/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go b/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go index 164a5223117..02c9af65d5b 100644 --- a/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go +++ b/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go @@ -27,7 +27,7 @@ package tabletmanagerservice import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - tabletmanagerdata "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + tabletmanagerdata "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" reflect "reflect" ) diff --git a/go/vt/proto/tabletmanagerservice/tabletmanagerservice_grpc.pb.go b/go/vt/proto/tabletmanagerservice/tabletmanagerservice_grpc.pb.go index b7a6d123c0e..0c60fa1eee1 100644 --- a/go/vt/proto/tabletmanagerservice/tabletmanagerservice_grpc.pb.go +++ b/go/vt/proto/tabletmanagerservice/tabletmanagerservice_grpc.pb.go @@ -11,7 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - tabletmanagerdata "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + tabletmanagerdata "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) // This is a compile-time assertion to ensure that this generated file diff --git a/go/vt/proto/throttlerservice/throttlerservice.pb.go b/go/vt/proto/throttlerservice/throttlerservice.pb.go index b303461f6f4..60dbabab870 100644 --- a/go/vt/proto/throttlerservice/throttlerservice.pb.go +++ b/go/vt/proto/throttlerservice/throttlerservice.pb.go @@ -27,7 +27,7 @@ package throttlerservice import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - throttlerdata "github.com/mdibaiee/vitess/go/vt/proto/throttlerdata" + throttlerdata "github.com/vitess/vitess/go/vt/proto/throttlerdata" reflect "reflect" ) diff --git a/go/vt/proto/throttlerservice/throttlerservice_grpc.pb.go b/go/vt/proto/throttlerservice/throttlerservice_grpc.pb.go index 6652ef78940..37beb381344 100644 --- a/go/vt/proto/throttlerservice/throttlerservice_grpc.pb.go +++ b/go/vt/proto/throttlerservice/throttlerservice_grpc.pb.go @@ -11,7 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - throttlerdata "github.com/mdibaiee/vitess/go/vt/proto/throttlerdata" + throttlerdata "github.com/vitess/vitess/go/vt/proto/throttlerdata" ) // This is a compile-time assertion to ensure that this generated file diff --git a/go/vt/proto/topodata/cached_size.go b/go/vt/proto/topodata/cached_size.go index eff367ebb16..7c563a452c7 100644 --- a/go/vt/proto/topodata/cached_size.go +++ b/go/vt/proto/topodata/cached_size.go @@ -17,7 +17,7 @@ limitations under the License. package topodata -import hack "github.com/mdibaiee/vitess/go/hack" +import hack "github.com/vitess/vitess/go/hack" func (cached *KeyRange) CachedSize(alloc bool) int64 { if cached == nil { @@ -55,7 +55,7 @@ func (cached *ThrottledAppRule) CachedSize(alloc bool) int64 { } // field Name string size += hack.RuntimeAllocSize(int64(len(cached.Name))) - // field ExpiresAt *github.com/mdibaiee/vitess/go/vt/proto/vttime.Time + // field ExpiresAt *github.com/vitess/vitess/go/vt/proto/vttime.Time size += cached.ExpiresAt.CachedSize(true) return size } diff --git a/go/vt/proto/topodata/topodata.pb.go b/go/vt/proto/topodata/topodata.pb.go index 2e754ffeccb..6fa9cd5a781 100644 --- a/go/vt/proto/topodata/topodata.pb.go +++ b/go/vt/proto/topodata/topodata.pb.go @@ -29,7 +29,7 @@ package topodata import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - vttime "github.com/mdibaiee/vitess/go/vt/proto/vttime" + vttime "github.com/vitess/vitess/go/vt/proto/vttime" reflect "reflect" sync "sync" ) diff --git a/go/vt/proto/topodata/topodata_vtproto.pb.go b/go/vt/proto/topodata/topodata_vtproto.pb.go index 0902bb41f7e..bf087fa6cb0 100644 --- a/go/vt/proto/topodata/topodata_vtproto.pb.go +++ b/go/vt/proto/topodata/topodata_vtproto.pb.go @@ -12,7 +12,7 @@ import ( io "io" math "math" bits "math/bits" - vttime "github.com/mdibaiee/vitess/go/vt/proto/vttime" + vttime "github.com/vitess/vitess/go/vt/proto/vttime" ) const ( diff --git a/go/vt/proto/vschema/vschema.pb.go b/go/vt/proto/vschema/vschema.pb.go index fd2f5de123a..abbf99f4576 100644 --- a/go/vt/proto/vschema/vschema.pb.go +++ b/go/vt/proto/vschema/vschema.pb.go @@ -26,7 +26,7 @@ package vschema import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - query "github.com/mdibaiee/vitess/go/vt/proto/query" + query "github.com/vitess/vitess/go/vt/proto/query" reflect "reflect" sync "sync" ) diff --git a/go/vt/proto/vschema/vschema_vtproto.pb.go b/go/vt/proto/vschema/vschema_vtproto.pb.go index 5e127c92806..e91036f5bcc 100644 --- a/go/vt/proto/vschema/vschema_vtproto.pb.go +++ b/go/vt/proto/vschema/vschema_vtproto.pb.go @@ -10,7 +10,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" io "io" bits "math/bits" - query "github.com/mdibaiee/vitess/go/vt/proto/query" + query "github.com/vitess/vitess/go/vt/proto/query" ) const ( diff --git a/go/vt/proto/vtadmin/vtadmin.pb.go b/go/vt/proto/vtadmin/vtadmin.pb.go index 210026e64cc..abb4fd2443f 100644 --- a/go/vt/proto/vtadmin/vtadmin.pb.go +++ b/go/vt/proto/vtadmin/vtadmin.pb.go @@ -26,12 +26,12 @@ package vtadmin import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - logutil "github.com/mdibaiee/vitess/go/vt/proto/logutil" - mysqlctl "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" - tabletmanagerdata "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodata "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschema "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldata "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + logutil "github.com/vitess/vitess/go/vt/proto/logutil" + mysqlctl "github.com/vitess/vitess/go/vt/proto/mysqlctl" + tabletmanagerdata "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodata "github.com/vitess/vitess/go/vt/proto/topodata" + vschema "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldata "github.com/vitess/vitess/go/vt/proto/vtctldata" reflect "reflect" sync "sync" ) diff --git a/go/vt/proto/vtadmin/vtadmin_grpc.pb.go b/go/vt/proto/vtadmin/vtadmin_grpc.pb.go index f2ec3df780b..42ddacdc981 100644 --- a/go/vt/proto/vtadmin/vtadmin_grpc.pb.go +++ b/go/vt/proto/vtadmin/vtadmin_grpc.pb.go @@ -11,7 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - vtctldata "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldata "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // This is a compile-time assertion to ensure that this generated file diff --git a/go/vt/proto/vtadmin/vtadmin_vtproto.pb.go b/go/vt/proto/vtadmin/vtadmin_vtproto.pb.go index f353b56cea2..fd41faa0611 100644 --- a/go/vt/proto/vtadmin/vtadmin_vtproto.pb.go +++ b/go/vt/proto/vtadmin/vtadmin_vtproto.pb.go @@ -10,12 +10,12 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" io "io" bits "math/bits" - logutil "github.com/mdibaiee/vitess/go/vt/proto/logutil" - mysqlctl "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" - tabletmanagerdata "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodata "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschema "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldata "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + logutil "github.com/vitess/vitess/go/vt/proto/logutil" + mysqlctl "github.com/vitess/vitess/go/vt/proto/mysqlctl" + tabletmanagerdata "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodata "github.com/vitess/vitess/go/vt/proto/topodata" + vschema "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldata "github.com/vitess/vitess/go/vt/proto/vtctldata" ) const ( diff --git a/go/vt/proto/vtctldata/vtctldata.pb.go b/go/vt/proto/vtctldata/vtctldata.pb.go index a9127422f6c..3b6887f380d 100644 --- a/go/vt/proto/vtctldata/vtctldata.pb.go +++ b/go/vt/proto/vtctldata/vtctldata.pb.go @@ -27,16 +27,16 @@ package vtctldata import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - binlogdata "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - logutil "github.com/mdibaiee/vitess/go/vt/proto/logutil" - mysqlctl "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" - query "github.com/mdibaiee/vitess/go/vt/proto/query" - replicationdata "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - tabletmanagerdata "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodata "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschema "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtrpc "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - vttime "github.com/mdibaiee/vitess/go/vt/proto/vttime" + binlogdata "github.com/vitess/vitess/go/vt/proto/binlogdata" + logutil "github.com/vitess/vitess/go/vt/proto/logutil" + mysqlctl "github.com/vitess/vitess/go/vt/proto/mysqlctl" + query "github.com/vitess/vitess/go/vt/proto/query" + replicationdata "github.com/vitess/vitess/go/vt/proto/replicationdata" + tabletmanagerdata "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodata "github.com/vitess/vitess/go/vt/proto/topodata" + vschema "github.com/vitess/vitess/go/vt/proto/vschema" + vtrpc "github.com/vitess/vitess/go/vt/proto/vtrpc" + vttime "github.com/vitess/vitess/go/vt/proto/vttime" reflect "reflect" sync "sync" ) diff --git a/go/vt/proto/vtctldata/vtctldata_vtproto.pb.go b/go/vt/proto/vtctldata/vtctldata_vtproto.pb.go index 83744384419..dddf6e08932 100644 --- a/go/vt/proto/vtctldata/vtctldata_vtproto.pb.go +++ b/go/vt/proto/vtctldata/vtctldata_vtproto.pb.go @@ -12,16 +12,16 @@ import ( io "io" math "math" bits "math/bits" - binlogdata "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - logutil "github.com/mdibaiee/vitess/go/vt/proto/logutil" - mysqlctl "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" - query "github.com/mdibaiee/vitess/go/vt/proto/query" - replicationdata "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - tabletmanagerdata "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodata "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschema "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtrpc "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - vttime "github.com/mdibaiee/vitess/go/vt/proto/vttime" + binlogdata "github.com/vitess/vitess/go/vt/proto/binlogdata" + logutil "github.com/vitess/vitess/go/vt/proto/logutil" + mysqlctl "github.com/vitess/vitess/go/vt/proto/mysqlctl" + query "github.com/vitess/vitess/go/vt/proto/query" + replicationdata "github.com/vitess/vitess/go/vt/proto/replicationdata" + tabletmanagerdata "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodata "github.com/vitess/vitess/go/vt/proto/topodata" + vschema "github.com/vitess/vitess/go/vt/proto/vschema" + vtrpc "github.com/vitess/vitess/go/vt/proto/vtrpc" + vttime "github.com/vitess/vitess/go/vt/proto/vttime" ) const ( diff --git a/go/vt/proto/vtctlservice/vtctlservice.pb.go b/go/vt/proto/vtctlservice/vtctlservice.pb.go index a38c14bca12..659cfaccf99 100644 --- a/go/vt/proto/vtctlservice/vtctlservice.pb.go +++ b/go/vt/proto/vtctlservice/vtctlservice.pb.go @@ -27,7 +27,7 @@ package vtctlservice import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - vtctldata "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldata "github.com/vitess/vitess/go/vt/proto/vtctldata" reflect "reflect" ) diff --git a/go/vt/proto/vtctlservice/vtctlservice_grpc.pb.go b/go/vt/proto/vtctlservice/vtctlservice_grpc.pb.go index 8856d923c67..df8dc3dba44 100644 --- a/go/vt/proto/vtctlservice/vtctlservice_grpc.pb.go +++ b/go/vt/proto/vtctlservice/vtctlservice_grpc.pb.go @@ -11,7 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - vtctldata "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldata "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // This is a compile-time assertion to ensure that this generated file diff --git a/go/vt/proto/vtgate/vtgate.pb.go b/go/vt/proto/vtgate/vtgate.pb.go index d65caa55148..1d11d11e0a9 100644 --- a/go/vt/proto/vtgate/vtgate.pb.go +++ b/go/vt/proto/vtgate/vtgate.pb.go @@ -26,10 +26,10 @@ package vtgate import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - binlogdata "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - query "github.com/mdibaiee/vitess/go/vt/proto/query" - topodata "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpc "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + binlogdata "github.com/vitess/vitess/go/vt/proto/binlogdata" + query "github.com/vitess/vitess/go/vt/proto/query" + topodata "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpc "github.com/vitess/vitess/go/vt/proto/vtrpc" reflect "reflect" sync "sync" ) diff --git a/go/vt/proto/vtgate/vtgate_vtproto.pb.go b/go/vt/proto/vtgate/vtgate_vtproto.pb.go index 4ca3203febb..9ca8f3b0684 100644 --- a/go/vt/proto/vtgate/vtgate_vtproto.pb.go +++ b/go/vt/proto/vtgate/vtgate_vtproto.pb.go @@ -12,10 +12,10 @@ import ( io "io" math "math" bits "math/bits" - binlogdata "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - query "github.com/mdibaiee/vitess/go/vt/proto/query" - topodata "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpc "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + binlogdata "github.com/vitess/vitess/go/vt/proto/binlogdata" + query "github.com/vitess/vitess/go/vt/proto/query" + topodata "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpc "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const ( diff --git a/go/vt/proto/vtgateservice/vtgateservice.pb.go b/go/vt/proto/vtgateservice/vtgateservice.pb.go index 188313a8bc4..2862bff44ba 100644 --- a/go/vt/proto/vtgateservice/vtgateservice.pb.go +++ b/go/vt/proto/vtgateservice/vtgateservice.pb.go @@ -27,7 +27,7 @@ package vtgateservice import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - vtgate "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + vtgate "github.com/vitess/vitess/go/vt/proto/vtgate" reflect "reflect" ) diff --git a/go/vt/proto/vtgateservice/vtgateservice_grpc.pb.go b/go/vt/proto/vtgateservice/vtgateservice_grpc.pb.go index 360708865ab..fd843a229b7 100644 --- a/go/vt/proto/vtgateservice/vtgateservice_grpc.pb.go +++ b/go/vt/proto/vtgateservice/vtgateservice_grpc.pb.go @@ -11,7 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - vtgate "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + vtgate "github.com/vitess/vitess/go/vt/proto/vtgate" ) // This is a compile-time assertion to ensure that this generated file diff --git a/go/vt/proto/vttest/vttest.pb.go b/go/vt/proto/vttest/vttest.pb.go index 2bd1b9d7466..a8d435eecd7 100644 --- a/go/vt/proto/vttest/vttest.pb.go +++ b/go/vt/proto/vttest/vttest.pb.go @@ -50,7 +50,7 @@ package vttest import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - vschema "github.com/mdibaiee/vitess/go/vt/proto/vschema" + vschema "github.com/vitess/vitess/go/vt/proto/vschema" reflect "reflect" sync "sync" ) diff --git a/go/vt/proto/vttest/vttest_vtproto.pb.go b/go/vt/proto/vttest/vttest_vtproto.pb.go index a93bbd1044c..37f1570514b 100644 --- a/go/vt/proto/vttest/vttest_vtproto.pb.go +++ b/go/vt/proto/vttest/vttest_vtproto.pb.go @@ -10,7 +10,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" io "io" bits "math/bits" - vschema "github.com/mdibaiee/vitess/go/vt/proto/vschema" + vschema "github.com/vitess/vitess/go/vt/proto/vschema" ) const ( diff --git a/go/vt/proto/vttime/cached_size.go b/go/vt/proto/vttime/cached_size.go index b905877b319..693274f5405 100644 --- a/go/vt/proto/vttime/cached_size.go +++ b/go/vt/proto/vttime/cached_size.go @@ -17,7 +17,7 @@ limitations under the License. package vttime -import hack "github.com/mdibaiee/vitess/go/hack" +import hack "github.com/vitess/vitess/go/hack" func (cached *Time) CachedSize(alloc bool) int64 { if cached == nil { diff --git a/go/vt/schema/cached_size.go b/go/vt/schema/cached_size.go index 80756a48396..70ed3588817 100644 --- a/go/vt/schema/cached_size.go +++ b/go/vt/schema/cached_size.go @@ -17,7 +17,7 @@ limitations under the License. package schema -import hack "github.com/mdibaiee/vitess/go/hack" +import hack "github.com/vitess/vitess/go/hack" func (cached *DDLStrategySetting) CachedSize(alloc bool) int64 { if cached == nil { @@ -27,7 +27,7 @@ func (cached *DDLStrategySetting) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Strategy github.com/mdibaiee/vitess/go/vt/schema.DDLStrategy + // field Strategy github.com/vitess/vitess/go/vt/schema.DDLStrategy size += hack.RuntimeAllocSize(int64(len(cached.Strategy))) // field Options string size += hack.RuntimeAllocSize(int64(len(cached.Options))) diff --git a/go/vt/schema/online_ddl.go b/go/vt/schema/online_ddl.go index b23dae0e38d..98ee29b8ba2 100644 --- a/go/vt/schema/online_ddl.go +++ b/go/vt/schema/online_ddl.go @@ -25,9 +25,9 @@ import ( "strconv" "strings" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) var ( diff --git a/go/vt/schema/online_ddl_test.go b/go/vt/schema/online_ddl_test.go index 03eeed587c4..bfa5d451720 100644 --- a/go/vt/schema/online_ddl_test.go +++ b/go/vt/schema/online_ddl_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) func TestCreateUUID(t *testing.T) { diff --git a/go/vt/schema/parser.go b/go/vt/schema/parser.go index 8a8db37c5a9..be65647a391 100644 --- a/go/vt/schema/parser.go +++ b/go/vt/schema/parser.go @@ -21,8 +21,8 @@ import ( "regexp" "strings" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" ) // NormalizedDDLQuery contains a query which is online-ddl -normalized diff --git a/go/vt/schema/tablegc.go b/go/vt/schema/tablegc.go index f580d39eba2..4ae6779d055 100644 --- a/go/vt/schema/tablegc.go +++ b/go/vt/schema/tablegc.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/textutil" + "github.com/vitess/vitess/go/textutil" ) // TableGCState provides a state for the type of GC table: HOLD? PURGE? EVAC? DROP? See details below diff --git a/go/vt/schemadiff/analysis.go b/go/vt/schemadiff/analysis.go index ae6126bbdda..dea4fed824f 100644 --- a/go/vt/schemadiff/analysis.go +++ b/go/vt/schemadiff/analysis.go @@ -17,7 +17,7 @@ limitations under the License. package schemadiff import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) // AlterTableRotatesRangePartition answers `true` when the given ALTER TABLE statement performs any sort diff --git a/go/vt/schemadiff/analysis_test.go b/go/vt/schemadiff/analysis_test.go index 5870984c6d6..c357f785448 100644 --- a/go/vt/schemadiff/analysis_test.go +++ b/go/vt/schemadiff/analysis_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) // AnalyzePartitionRotation analyzes a given AlterTable statement to see whether it has partition rotation diff --git a/go/vt/schemadiff/annotations_test.go b/go/vt/schemadiff/annotations_test.go index d09a053f02b..fc7597f411b 100644 --- a/go/vt/schemadiff/annotations_test.go +++ b/go/vt/schemadiff/annotations_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) func TestAnnotateAll(t *testing.T) { diff --git a/go/vt/schemadiff/capability.go b/go/vt/schemadiff/capability.go index b97690793ff..2d3454b6ae7 100644 --- a/go/vt/schemadiff/capability.go +++ b/go/vt/schemadiff/capability.go @@ -3,8 +3,8 @@ package schemadiff import ( "strings" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/vt/sqlparser" ) const ( diff --git a/go/vt/schemadiff/capability_test.go b/go/vt/schemadiff/capability_test.go index 7270b36e5c3..5b14eb4a4f9 100644 --- a/go/vt/schemadiff/capability_test.go +++ b/go/vt/schemadiff/capability_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/vt/sqlparser" ) func TestAlterTableCapableOfInstantDDL(t *testing.T) { diff --git a/go/vt/schemadiff/column.go b/go/vt/schemadiff/column.go index 48f7371c865..d03692c7530 100644 --- a/go/vt/schemadiff/column.go +++ b/go/vt/schemadiff/column.go @@ -19,8 +19,8 @@ package schemadiff import ( "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/sqlparser" ) // columnDetails decorates a column with more details, used by diffing logic diff --git a/go/vt/schemadiff/diff.go b/go/vt/schemadiff/diff.go index 2288974b5bf..7c50b6ed288 100644 --- a/go/vt/schemadiff/diff.go +++ b/go/vt/schemadiff/diff.go @@ -1,7 +1,7 @@ package schemadiff import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) // DDLActionStr returns the action implied by the given diff: CREATE", "DROP", "ALTER" or empty diff --git a/go/vt/schemadiff/diff_test.go b/go/vt/schemadiff/diff_test.go index 7e1a30ba370..4aaae28ad62 100644 --- a/go/vt/schemadiff/diff_test.go +++ b/go/vt/schemadiff/diff_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" ) func TestDiffTables(t *testing.T) { diff --git a/go/vt/schemadiff/env.go b/go/vt/schemadiff/env.go index a49697f4a17..81154f042fb 100644 --- a/go/vt/schemadiff/env.go +++ b/go/vt/schemadiff/env.go @@ -1,8 +1,8 @@ package schemadiff import ( - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/vtenv" ) type Environment struct { diff --git a/go/vt/schemadiff/errors.go b/go/vt/schemadiff/errors.go index 3a2d5458d51..94946f09485 100644 --- a/go/vt/schemadiff/errors.go +++ b/go/vt/schemadiff/errors.go @@ -21,8 +21,8 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/vt/sqlparser" ) var ( diff --git a/go/vt/schemadiff/schema.go b/go/vt/schemadiff/schema.go index 0b19ff03f03..56da83274cf 100644 --- a/go/vt/schemadiff/schema.go +++ b/go/vt/schemadiff/schema.go @@ -21,9 +21,9 @@ import ( "sort" "strings" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) // Schema represents a database schema, which may contain entities such as tables and views. diff --git a/go/vt/schemadiff/schema_diff.go b/go/vt/schemadiff/schema_diff.go index b8faaa8783d..246c26590b1 100644 --- a/go/vt/schemadiff/schema_diff.go +++ b/go/vt/schemadiff/schema_diff.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "github.com/mdibaiee/vitess/go/mathutil" + "github.com/vitess/vitess/go/mathutil" ) type DiffDependencyType int diff --git a/go/vt/schemadiff/schema_diff_test.go b/go/vt/schemadiff/schema_diff_test.go index 37c75c5efb5..b7b0d26574f 100644 --- a/go/vt/schemadiff/schema_diff_test.go +++ b/go/vt/schemadiff/schema_diff_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/vtenv" ) func TestPermutations(t *testing.T) { diff --git a/go/vt/schemadiff/schema_test.go b/go/vt/schemadiff/schema_test.go index b158af51690..05291847fdc 100644 --- a/go/vt/schemadiff/schema_test.go +++ b/go/vt/schemadiff/schema_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - vterrors "github.com/mdibaiee/vitess/go/errors" + vterrors "github.com/vitess/vitess/go/errors" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) var schemaTestCreateQueries = []string{ diff --git a/go/vt/schemadiff/semantics.go b/go/vt/schemadiff/semantics.go index 2df601e1a7c..8ee5416d5d2 100644 --- a/go/vt/schemadiff/semantics.go +++ b/go/vt/schemadiff/semantics.go @@ -17,14 +17,14 @@ limitations under the License. package schemadiff import ( - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // semanticKS is a bogus keyspace, used for consistency purposes. The name is not important diff --git a/go/vt/schemadiff/table.go b/go/vt/schemadiff/table.go index 33e3bbc183f..7ca059662b7 100644 --- a/go/vt/schemadiff/table.go +++ b/go/vt/schemadiff/table.go @@ -26,8 +26,8 @@ import ( golcs "github.com/yudai/golcs" - "github.com/mdibaiee/vitess/go/ptr" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/ptr" + "github.com/vitess/vitess/go/vt/sqlparser" ) type charsetCollate struct { diff --git a/go/vt/schemadiff/table_test.go b/go/vt/schemadiff/table_test.go index 0db00142b7b..9a3ac95b4eb 100644 --- a/go/vt/schemadiff/table_test.go +++ b/go/vt/schemadiff/table_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) func TestCreateTableDiff(t *testing.T) { diff --git a/go/vt/schemadiff/types.go b/go/vt/schemadiff/types.go index ddebdc69665..8c3acb214c9 100644 --- a/go/vt/schemadiff/types.go +++ b/go/vt/schemadiff/types.go @@ -19,8 +19,8 @@ package schemadiff import ( "strings" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/vt/sqlparser" ) type InstantDDLCapability int diff --git a/go/vt/schemadiff/view.go b/go/vt/schemadiff/view.go index 03533629733..c88a13baf1d 100644 --- a/go/vt/schemadiff/view.go +++ b/go/vt/schemadiff/view.go @@ -19,7 +19,7 @@ package schemadiff import ( "strings" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) type AlterViewEntityDiff struct { diff --git a/go/vt/schemadiff/view_test.go b/go/vt/schemadiff/view_test.go index 869cdbd32d2..dc2c2d57be2 100644 --- a/go/vt/schemadiff/view_test.go +++ b/go/vt/schemadiff/view_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) func TestCreateViewDiff(t *testing.T) { diff --git a/go/vt/schemamanager/local_controller.go b/go/vt/schemamanager/local_controller.go index 3528bcdbb20..c9998ebb027 100644 --- a/go/vt/schemamanager/local_controller.go +++ b/go/vt/schemamanager/local_controller.go @@ -25,7 +25,7 @@ import ( "context" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // LocalController listens to the specified schema change dir and applies schema changes. diff --git a/go/vt/schemamanager/local_controller_test.go b/go/vt/schemamanager/local_controller_test.go index c09e2846004..0b87051e1f5 100644 --- a/go/vt/schemamanager/local_controller_test.go +++ b/go/vt/schemamanager/local_controller_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestLocalControllerNoSchemaChanges(t *testing.T) { diff --git a/go/vt/schemamanager/plain_controller.go b/go/vt/schemamanager/plain_controller.go index fa224c44c29..74729a5e50c 100644 --- a/go/vt/schemamanager/plain_controller.go +++ b/go/vt/schemamanager/plain_controller.go @@ -22,7 +22,7 @@ import ( "context" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // PlainController implements Controller interface. diff --git a/go/vt/schemamanager/schemamanager.go b/go/vt/schemamanager/schemamanager.go index 25c8b28bb23..51e1116ca7a 100644 --- a/go/vt/schemamanager/schemamanager.go +++ b/go/vt/schemamanager/schemamanager.go @@ -23,8 +23,8 @@ import ( "context" - "github.com/mdibaiee/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/log" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) const ( diff --git a/go/vt/schemamanager/schemamanager_test.go b/go/vt/schemamanager/schemamanager_test.go index dfc82f69968..4da224c0469 100644 --- a/go/vt/schemamanager/schemamanager_test.go +++ b/go/vt/schemamanager/schemamanager_test.go @@ -25,23 +25,23 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vttablet/faketmclient" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclienttest" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vttablet/faketmclient" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/vttablet/tmclienttest" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" // import the gRPC client implementation for tablet manager - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmclient" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctmclient" ) var ( diff --git a/go/vt/schemamanager/tablet_executor.go b/go/vt/schemamanager/tablet_executor.go index f720a4c3e20..5a99d9c9a12 100644 --- a/go/vt/schemamanager/tablet_executor.go +++ b/go/vt/schemamanager/tablet_executor.go @@ -26,23 +26,23 @@ import ( "golang.org/x/sync/semaphore" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtctl/schematools" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtctl/schematools" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // TabletExecutor applies schema changes to all tablets. diff --git a/go/vt/schemamanager/tablet_executor_test.go b/go/vt/schemamanager/tablet_executor_test.go index a30f44b1a3d..f4715252ba5 100644 --- a/go/vt/schemamanager/tablet_executor_test.go +++ b/go/vt/schemamanager/tablet_executor_test.go @@ -25,14 +25,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" ) var ( diff --git a/go/vt/schemamanager/ui_controller.go b/go/vt/schemamanager/ui_controller.go index 8982838f47f..a662700f6e2 100644 --- a/go/vt/schemamanager/ui_controller.go +++ b/go/vt/schemamanager/ui_controller.go @@ -24,7 +24,7 @@ import ( "context" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // UIController handles schema events. diff --git a/go/vt/servenv/buildinfo.go b/go/vt/servenv/buildinfo.go index b9854735623..5a944f83726 100644 --- a/go/vt/servenv/buildinfo.go +++ b/go/vt/servenv/buildinfo.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) var ( diff --git a/go/vt/servenv/exporter.go b/go/vt/servenv/exporter.go index ad29eff4833..5cc66661f8f 100644 --- a/go/vt/servenv/exporter.go +++ b/go/vt/servenv/exporter.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) // varType is used to specify what type of var to create. diff --git a/go/vt/servenv/exporter_test.go b/go/vt/servenv/exporter_test.go index e16df54f159..98ee8b3e807 100644 --- a/go/vt/servenv/exporter_test.go +++ b/go/vt/servenv/exporter_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) func TestURLPrefix(t *testing.T) { diff --git a/go/vt/servenv/flush_logutil.go b/go/vt/servenv/flush_logutil.go index f697413c505..aa54ce1fbc5 100644 --- a/go/vt/servenv/flush_logutil.go +++ b/go/vt/servenv/flush_logutil.go @@ -17,7 +17,7 @@ limitations under the License. package servenv import ( - "github.com/mdibaiee/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/logutil" ) func init() { diff --git a/go/vt/servenv/flushlogs.go b/go/vt/servenv/flushlogs.go index 868bff6637c..0b4409c9612 100644 --- a/go/vt/servenv/flushlogs.go +++ b/go/vt/servenv/flushlogs.go @@ -20,7 +20,7 @@ import ( "fmt" "net/http" - "github.com/mdibaiee/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/logutil" ) func init() { diff --git a/go/vt/servenv/grpc_auth.go b/go/vt/servenv/grpc_auth.go index 0539c404f7c..0f3b53b3ac6 100644 --- a/go/vt/servenv/grpc_auth.go +++ b/go/vt/servenv/grpc_auth.go @@ -25,7 +25,7 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) var grpcAuthServerFlagHooks []func(*pflag.FlagSet) diff --git a/go/vt/servenv/grpc_server.go b/go/vt/servenv/grpc_server.go index 3ab0d6fb273..a6677401b2a 100644 --- a/go/vt/servenv/grpc_server.go +++ b/go/vt/servenv/grpc_server.go @@ -34,11 +34,11 @@ import ( "google.golang.org/grpc/keepalive" "google.golang.org/grpc/reflection" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/grpccommon" - "github.com/mdibaiee/vitess/go/vt/grpcoptionaltls" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vttls" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/grpccommon" + "github.com/vitess/vitess/go/vt/grpcoptionaltls" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vttls" ) // This file handles gRPC server, on its own port. diff --git a/go/vt/servenv/grpc_server_auth_mtls.go b/go/vt/servenv/grpc_server_auth_mtls.go index 8b49df2e1ea..ea92cd95880 100644 --- a/go/vt/servenv/grpc_server_auth_mtls.go +++ b/go/vt/servenv/grpc_server_auth_mtls.go @@ -26,7 +26,7 @@ import ( "google.golang.org/grpc/peer" "google.golang.org/grpc/status" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/vt/servenv/grpc_server_auth_static.go b/go/vt/servenv/grpc_server_auth_static.go index 33c171de384..04efe1483f8 100644 --- a/go/vt/servenv/grpc_server_auth_static.go +++ b/go/vt/servenv/grpc_server_auth_static.go @@ -27,7 +27,7 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/vt/servenv/http.go b/go/vt/servenv/http.go index 0e795baeff5..f7d69607f78 100644 --- a/go/vt/servenv/http.go +++ b/go/vt/servenv/http.go @@ -22,7 +22,7 @@ import ( "net/http" "net/http/pprof" - "github.com/mdibaiee/vitess/go/vt/servenv/internal/mux" + "github.com/vitess/vitess/go/vt/servenv/internal/mux" ) // HTTPHandle registers the given handler for the internal servenv mux. diff --git a/go/vt/servenv/liveness_test.go b/go/vt/servenv/liveness_test.go index 5f5b6eca621..1c212b449dd 100644 --- a/go/vt/servenv/liveness_test.go +++ b/go/vt/servenv/liveness_test.go @@ -21,7 +21,7 @@ import ( "net/http" "testing" - "github.com/mdibaiee/vitess/go/vt/servenv/testutils" + "github.com/vitess/vitess/go/vt/servenv/testutils" ) func TestLivenessHandler(t *testing.T) { diff --git a/go/vt/servenv/mysql.go b/go/vt/servenv/mysql.go index 516de360a10..6caee9213d3 100644 --- a/go/vt/servenv/mysql.go +++ b/go/vt/servenv/mysql.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/mysql/config" + "github.com/vitess/vitess/go/mysql/config" ) // mySQLServerVersion is what Vitess will present as it's version during the connection handshake, diff --git a/go/vt/servenv/pid_file.go b/go/vt/servenv/pid_file.go index 29ec06c2c10..b32ecfaffaf 100644 --- a/go/vt/servenv/pid_file.go +++ b/go/vt/servenv/pid_file.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) var pidFile string // registered in RegisterFlags as --pid_file diff --git a/go/vt/servenv/pprof.go b/go/vt/servenv/pprof.go index 932688f9b22..bc2c354acf5 100644 --- a/go/vt/servenv/pprof.go +++ b/go/vt/servenv/pprof.go @@ -30,7 +30,7 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/vt/servenv/pprof_unix.go b/go/vt/servenv/pprof_unix.go index a4a33ebbea3..95cc3cd772b 100644 --- a/go/vt/servenv/pprof_unix.go +++ b/go/vt/servenv/pprof_unix.go @@ -23,7 +23,7 @@ import ( "os/signal" "syscall" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) func pprofInit() { diff --git a/go/vt/servenv/pprof_windows.go b/go/vt/servenv/pprof_windows.go index 63c2d945a9e..b0deb3542a2 100644 --- a/go/vt/servenv/pprof_windows.go +++ b/go/vt/servenv/pprof_windows.go @@ -19,7 +19,7 @@ limitations under the License. package servenv import ( - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) func pprofInit() { diff --git a/go/vt/servenv/rpc_utils.go b/go/vt/servenv/rpc_utils.go index a20651c2a5d..5cb0d9af616 100644 --- a/go/vt/servenv/rpc_utils.go +++ b/go/vt/servenv/rpc_utils.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/tb" + "github.com/vitess/vitess/go/tb" ) // HandlePanic should be called using 'defer' in the RPC code that executes the command. diff --git a/go/vt/servenv/run.go b/go/vt/servenv/run.go index 30cb9d904cd..9deacaa5e07 100644 --- a/go/vt/servenv/run.go +++ b/go/vt/servenv/run.go @@ -25,8 +25,8 @@ import ( "syscall" "time" - "github.com/mdibaiee/vitess/go/event" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/event" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/vt/servenv/servenv.go b/go/vt/servenv/servenv.go index fec1e7a0e8b..6732e49df07 100644 --- a/go/vt/servenv/servenv.go +++ b/go/vt/servenv/servenv.go @@ -40,19 +40,19 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/event" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/viperutil" - viperdebug "github.com/mdibaiee/vitess/go/viperutil/debug" - "github.com/mdibaiee/vitess/go/vt/grpccommon" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/event" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/viperutil" + viperdebug "github.com/vitess/vitess/go/viperutil/debug" + "github.com/vitess/vitess/go/vt/grpccommon" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/vterrors" // Include deprecation warnings for soon-to-be-unsupported flag invocations. - _flag "github.com/mdibaiee/vitess/go/internal/flag" + _flag "github.com/vitess/vitess/go/internal/flag" ) var ( diff --git a/go/vt/servenv/servenv_test.go b/go/vt/servenv/servenv_test.go index a848a186930..26a7c48c4a6 100644 --- a/go/vt/servenv/servenv_test.go +++ b/go/vt/servenv/servenv_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/event" + "github.com/vitess/vitess/go/event" ) func TestFireOnTermSyncHooksFinished(t *testing.T) { diff --git a/go/vt/servenv/servenv_unix.go b/go/vt/servenv/servenv_unix.go index 267a9623609..5aafd9a9f6f 100644 --- a/go/vt/servenv/servenv_unix.go +++ b/go/vt/servenv/servenv_unix.go @@ -25,8 +25,8 @@ import ( "syscall" "time" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/log" ) // Init is the first phase of the server startup. diff --git a/go/vt/servenv/service_map.go b/go/vt/servenv/service_map.go index c074fb55ad6..023e056e7dd 100644 --- a/go/vt/servenv/service_map.go +++ b/go/vt/servenv/service_map.go @@ -19,7 +19,7 @@ package servenv import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/vt/servenv/status.go b/go/vt/servenv/status.go index dc2c1e5bcca..881d6e52628 100644 --- a/go/vt/servenv/status.go +++ b/go/vt/servenv/status.go @@ -34,8 +34,8 @@ import ( "github.com/google/safehtml/template" "github.com/google/safehtml/template/uncheckedconversions" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/log" ) // AddStatusPart adds a new section to status. fragment is used as a diff --git a/go/vt/servenv/status_test.go b/go/vt/servenv/status_test.go index 0380b08292b..fd2f9fdcb90 100644 --- a/go/vt/servenv/status_test.go +++ b/go/vt/servenv/status_test.go @@ -26,7 +26,7 @@ import ( "github.com/google/safehtml/template" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/servenv/testutils" + "github.com/vitess/vitess/go/vt/servenv/testutils" ) func init() { diff --git a/go/vt/servenv/testutils/testutils.go b/go/vt/servenv/testutils/testutils.go index 7333713a16f..8f5ab89a072 100644 --- a/go/vt/servenv/testutils/testutils.go +++ b/go/vt/servenv/testutils/testutils.go @@ -19,7 +19,7 @@ package testutils import ( "net/http/httptest" - "github.com/mdibaiee/vitess/go/vt/servenv/internal/mux" + "github.com/vitess/vitess/go/vt/servenv/internal/mux" ) // HTTPTestServer returns a httptest.Server for the internal servenv mux. diff --git a/go/vt/servenv/unix_socket.go b/go/vt/servenv/unix_socket.go index ec349c14f2d..fc123230182 100644 --- a/go/vt/servenv/unix_socket.go +++ b/go/vt/servenv/unix_socket.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/vt/sidecardb/identifier_cache.go b/go/vt/sidecardb/identifier_cache.go index de6a8ec4aa8..35c3485669e 100644 --- a/go/vt/sidecardb/identifier_cache.go +++ b/go/vt/sidecardb/identifier_cache.go @@ -22,10 +22,10 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/constants/sidecar" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/constants/sidecar" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) // IdentifierCache provides a read through cache of sidecar database diff --git a/go/vt/sidecardb/identifier_cache_test.go b/go/vt/sidecardb/identifier_cache_test.go index 7182524febc..7c3cba96876 100644 --- a/go/vt/sidecardb/identifier_cache_test.go +++ b/go/vt/sidecardb/identifier_cache_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) func TestIdentifierCache(t *testing.T) { diff --git a/go/vt/sidecardb/sidecardb.go b/go/vt/sidecardb/sidecardb.go index 86cbeb632f1..6bdfb81d17e 100644 --- a/go/vt/sidecardb/sidecardb.go +++ b/go/vt/sidecardb/sidecardb.go @@ -27,24 +27,24 @@ import ( "strings" "sync" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/history" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/config" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/history" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/config" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/mysql/fakesqldb" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/schemadiff" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/schemadiff" ) const ( diff --git a/go/vt/sidecardb/sidecardb_test.go b/go/vt/sidecardb/sidecardb_test.go index ae92deee6e8..b8ae86ebfef 100644 --- a/go/vt/sidecardb/sidecardb_test.go +++ b/go/vt/sidecardb/sidecardb_test.go @@ -24,17 +24,17 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" ) // TestInitErrors validates that the schema init error stats are being correctly set diff --git a/go/vt/sqlparser/ast.go b/go/vt/sqlparser/ast.go index 79967a6da17..de6a7c33f06 100644 --- a/go/vt/sqlparser/ast.go +++ b/go/vt/sqlparser/ast.go @@ -17,8 +17,8 @@ limitations under the License. package sqlparser import ( - "github.com/mdibaiee/vitess/go/mysql/datetime" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql/datetime" + "github.com/vitess/vitess/go/sqltypes" ) /* diff --git a/go/vt/sqlparser/ast_format.go b/go/vt/sqlparser/ast_format.go index d5431be8ede..76e6b0f2d1c 100644 --- a/go/vt/sqlparser/ast_format.go +++ b/go/vt/sqlparser/ast_format.go @@ -17,7 +17,7 @@ limitations under the License. package sqlparser import ( - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) // Format formats the node. diff --git a/go/vt/sqlparser/ast_format_fast.go b/go/vt/sqlparser/ast_format_fast.go index 1f2ca77fbac..aee0db6d412 100644 --- a/go/vt/sqlparser/ast_format_fast.go +++ b/go/vt/sqlparser/ast_format_fast.go @@ -20,7 +20,7 @@ package sqlparser import ( "fmt" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) // FormatFast formats the node. diff --git a/go/vt/sqlparser/ast_funcs.go b/go/vt/sqlparser/ast_funcs.go index eedbe1721d6..83fc08393f7 100644 --- a/go/vt/sqlparser/ast_funcs.go +++ b/go/vt/sqlparser/ast_funcs.go @@ -24,13 +24,13 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/mysql/datetime" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/datetime" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // Walk calls postVisit on every node. diff --git a/go/vt/sqlparser/ast_funcs_test.go b/go/vt/sqlparser/ast_funcs_test.go index 0fda57f7658..357b7090baf 100644 --- a/go/vt/sqlparser/ast_funcs_test.go +++ b/go/vt/sqlparser/ast_funcs_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestAddQueryHint(t *testing.T) { diff --git a/go/vt/sqlparser/ast_rewriting.go b/go/vt/sqlparser/ast_rewriting.go index e55fa9652b3..9cf6edf327a 100644 --- a/go/vt/sqlparser/ast_rewriting.go +++ b/go/vt/sqlparser/ast_rewriting.go @@ -20,10 +20,10 @@ import ( "strconv" "strings" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sysvars" - "github.com/mdibaiee/vitess/go/vt/vterrors" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sysvars" + "github.com/vitess/vitess/go/vt/vterrors" ) var HasValueSubQueryBaseName = []byte("__sq_has_values") diff --git a/go/vt/sqlparser/ast_rewriting_test.go b/go/vt/sqlparser/ast_rewriting_test.go index 3ea4c85e524..9a1693ac528 100644 --- a/go/vt/sqlparser/ast_rewriting_test.go +++ b/go/vt/sqlparser/ast_rewriting_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/sysvars" + "github.com/vitess/vitess/go/vt/sysvars" "github.com/stretchr/testify/require" ) diff --git a/go/vt/sqlparser/cached_size.go b/go/vt/sqlparser/cached_size.go index 98431c1d3ea..43024a42453 100644 --- a/go/vt/sqlparser/cached_size.go +++ b/go/vt/sqlparser/cached_size.go @@ -22,7 +22,7 @@ import ( "reflect" "unsafe" - hack "github.com/mdibaiee/vitess/go/hack" + hack "github.com/vitess/vitess/go/hack" ) type cachedObject interface { @@ -37,14 +37,14 @@ func (cached *AddColumns) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Columns []*github.com/mdibaiee/vitess/go/vt/sqlparser.ColumnDefinition + // field Columns []*github.com/vitess/vitess/go/vt/sqlparser.ColumnDefinition { size += hack.RuntimeAllocSize(int64(cap(cached.Columns)) * int64(8)) for _, elem := range cached.Columns { size += elem.CachedSize(true) } } - // field After *github.com/mdibaiee/vitess/go/vt/sqlparser.ColName + // field After *github.com/vitess/vitess/go/vt/sqlparser.ColName size += cached.After.CachedSize(true) return size } @@ -56,7 +56,7 @@ func (cached *AddConstraintDefinition) CachedSize(alloc bool) int64 { if alloc { size += int64(8) } - // field ConstraintDefinition *github.com/mdibaiee/vitess/go/vt/sqlparser.ConstraintDefinition + // field ConstraintDefinition *github.com/vitess/vitess/go/vt/sqlparser.ConstraintDefinition size += cached.ConstraintDefinition.CachedSize(true) return size } @@ -68,7 +68,7 @@ func (cached *AddIndexDefinition) CachedSize(alloc bool) int64 { if alloc { size += int64(8) } - // field IndexDefinition *github.com/mdibaiee/vitess/go/vt/sqlparser.IndexDefinition + // field IndexDefinition *github.com/vitess/vitess/go/vt/sqlparser.IndexDefinition size += cached.IndexDefinition.CachedSize(true) return size } @@ -80,11 +80,11 @@ func (cached *AliasedExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field As github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field As github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.As.CachedSize(false) return size } @@ -96,27 +96,27 @@ func (cached *AliasedTableExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(112) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.SimpleTableExpr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.SimpleTableExpr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field Partitions github.com/mdibaiee/vitess/go/vt/sqlparser.Partitions + // field Partitions github.com/vitess/vitess/go/vt/sqlparser.Partitions { size += hack.RuntimeAllocSize(int64(cap(cached.Partitions)) * int64(32)) for _, elem := range cached.Partitions { size += elem.CachedSize(false) } } - // field As github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCS + // field As github.com/vitess/vitess/go/vt/sqlparser.IdentifierCS size += cached.As.CachedSize(false) - // field Hints github.com/mdibaiee/vitess/go/vt/sqlparser.IndexHints + // field Hints github.com/vitess/vitess/go/vt/sqlparser.IndexHints { size += hack.RuntimeAllocSize(int64(cap(cached.Hints)) * int64(8)) for _, elem := range cached.Hints { size += elem.CachedSize(true) } } - // field Columns github.com/mdibaiee/vitess/go/vt/sqlparser.Columns + // field Columns github.com/vitess/vitess/go/vt/sqlparser.Columns { size += hack.RuntimeAllocSize(int64(cap(cached.Columns)) * int64(32)) for _, elem := range cached.Columns { @@ -147,7 +147,7 @@ func (cached *AlterCheck) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) return size } @@ -159,9 +159,9 @@ func (cached *AlterColumn) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Column *github.com/mdibaiee/vitess/go/vt/sqlparser.ColName + // field Column *github.com/vitess/vitess/go/vt/sqlparser.ColName size += cached.Column.CachedSize(true) - // field DefaultVal github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field DefaultVal github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.DefaultVal.(cachedObject); ok { size += cc.CachedSize(true) } @@ -177,9 +177,9 @@ func (cached *AlterDatabase) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field DBName github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCS + // field DBName github.com/vitess/vitess/go/vt/sqlparser.IdentifierCS size += cached.DBName.CachedSize(false) - // field AlterOptions []github.com/mdibaiee/vitess/go/vt/sqlparser.DatabaseOption + // field AlterOptions []github.com/vitess/vitess/go/vt/sqlparser.DatabaseOption { size += hack.RuntimeAllocSize(int64(cap(cached.AlterOptions)) * int64(24)) for _, elem := range cached.AlterOptions { @@ -196,7 +196,7 @@ func (cached *AlterIndex) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) return size } @@ -212,7 +212,7 @@ func (cached *AlterMigration) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(len(cached.UUID))) // field Expire string size += hack.RuntimeAllocSize(int64(len(cached.Expire))) - // field Ratio *github.com/mdibaiee/vitess/go/vt/sqlparser.Literal + // field Ratio *github.com/vitess/vitess/go/vt/sqlparser.Literal size += cached.Ratio.CachedSize(true) // field Shards string size += hack.RuntimeAllocSize(int64(len(cached.Shards))) @@ -226,9 +226,9 @@ func (cached *AlterTable) CachedSize(alloc bool) int64 { if alloc { size += int64(96) } - // field Table github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field Table github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.Table.CachedSize(false) - // field AlterOptions []github.com/mdibaiee/vitess/go/vt/sqlparser.AlterOption + // field AlterOptions []github.com/vitess/vitess/go/vt/sqlparser.AlterOption { size += hack.RuntimeAllocSize(int64(cap(cached.AlterOptions)) * int64(16)) for _, elem := range cached.AlterOptions { @@ -237,11 +237,11 @@ func (cached *AlterTable) CachedSize(alloc bool) int64 { } } } - // field PartitionSpec *github.com/mdibaiee/vitess/go/vt/sqlparser.PartitionSpec + // field PartitionSpec *github.com/vitess/vitess/go/vt/sqlparser.PartitionSpec size += cached.PartitionSpec.CachedSize(true) - // field PartitionOption *github.com/mdibaiee/vitess/go/vt/sqlparser.PartitionOption + // field PartitionOption *github.com/vitess/vitess/go/vt/sqlparser.PartitionOption size += cached.PartitionOption.CachedSize(true) - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) return size } @@ -253,28 +253,28 @@ func (cached *AlterView) CachedSize(alloc bool) int64 { if alloc { size += int64(144) } - // field ViewName github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field ViewName github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.ViewName.CachedSize(false) // field Algorithm string size += hack.RuntimeAllocSize(int64(len(cached.Algorithm))) - // field Definer *github.com/mdibaiee/vitess/go/vt/sqlparser.Definer + // field Definer *github.com/vitess/vitess/go/vt/sqlparser.Definer size += cached.Definer.CachedSize(true) // field Security string size += hack.RuntimeAllocSize(int64(len(cached.Security))) - // field Columns github.com/mdibaiee/vitess/go/vt/sqlparser.Columns + // field Columns github.com/vitess/vitess/go/vt/sqlparser.Columns { size += hack.RuntimeAllocSize(int64(cap(cached.Columns)) * int64(32)) for _, elem := range cached.Columns { size += elem.CachedSize(false) } } - // field Select github.com/mdibaiee/vitess/go/vt/sqlparser.SelectStatement + // field Select github.com/vitess/vitess/go/vt/sqlparser.SelectStatement if cc, ok := cached.Select.(cachedObject); ok { size += cc.CachedSize(true) } // field CheckOption string size += hack.RuntimeAllocSize(int64(len(cached.CheckOption))) - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) return size } @@ -286,18 +286,18 @@ func (cached *AlterVschema) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field Table github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field Table github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.Table.CachedSize(false) - // field VindexSpec *github.com/mdibaiee/vitess/go/vt/sqlparser.VindexSpec + // field VindexSpec *github.com/vitess/vitess/go/vt/sqlparser.VindexSpec size += cached.VindexSpec.CachedSize(true) - // field VindexCols []github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field VindexCols []github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI { size += hack.RuntimeAllocSize(int64(cap(cached.VindexCols)) * int64(32)) for _, elem := range cached.VindexCols { size += elem.CachedSize(false) } } - // field AutoIncSpec *github.com/mdibaiee/vitess/go/vt/sqlparser.AutoIncSpec + // field AutoIncSpec *github.com/vitess/vitess/go/vt/sqlparser.AutoIncSpec size += cached.AutoIncSpec.CachedSize(true) return size } @@ -309,7 +309,7 @@ func (cached *Analyze) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Table github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field Table github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.Table.CachedSize(false) return size } @@ -321,11 +321,11 @@ func (cached *AndExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Left github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Left github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Left.(cachedObject); ok { size += cc.CachedSize(true) } - // field Right github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Right github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Right.(cachedObject); ok { size += cc.CachedSize(true) } @@ -339,7 +339,7 @@ func (cached *AnyValue) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field Arg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Arg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Arg.(cachedObject); ok { size += cc.CachedSize(true) } @@ -365,7 +365,7 @@ func (cached *ArgumentLessWindowExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -377,11 +377,11 @@ func (cached *AssignmentExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Left github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Left github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Left.(cachedObject); ok { size += cc.CachedSize(true) } - // field Right github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Right github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Right.(cachedObject); ok { size += cc.CachedSize(true) } @@ -395,9 +395,9 @@ func (cached *AutoIncSpec) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Column github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Column github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Column.CachedSize(false) - // field Sequence github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field Sequence github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.Sequence.CachedSize(false) return size } @@ -409,11 +409,11 @@ func (cached *Avg) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Arg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Arg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Arg.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -425,7 +425,7 @@ func (cached *Begin) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field TxAccessModes []github.com/mdibaiee/vitess/go/vt/sqlparser.TxAccessMode + // field TxAccessModes []github.com/vitess/vitess/go/vt/sqlparser.TxAccessMode { size += hack.RuntimeAllocSize(int64(cap(cached.TxAccessModes))) } @@ -439,15 +439,15 @@ func (cached *BetweenExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Left github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Left github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Left.(cachedObject); ok { size += cc.CachedSize(true) } - // field From github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field From github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.From.(cachedObject); ok { size += cc.CachedSize(true) } - // field To github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field To github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.To.(cachedObject); ok { size += cc.CachedSize(true) } @@ -461,11 +461,11 @@ func (cached *BinaryExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Left github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Left github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Left.(cachedObject); ok { size += cc.CachedSize(true) } - // field Right github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Right github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Right.(cachedObject); ok { size += cc.CachedSize(true) } @@ -510,11 +510,11 @@ func (cached *BitAnd) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Arg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Arg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Arg.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -526,11 +526,11 @@ func (cached *BitOr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Arg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Arg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Arg.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -542,11 +542,11 @@ func (cached *BitXor) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Arg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Arg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Arg.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -558,9 +558,9 @@ func (cached *CallProc) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field Name github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.Name.CachedSize(false) - // field Params github.com/mdibaiee/vitess/go/vt/sqlparser.Exprs + // field Params github.com/vitess/vitess/go/vt/sqlparser.Exprs { size += hack.RuntimeAllocSize(int64(cap(cached.Params)) * int64(16)) for _, elem := range cached.Params { @@ -579,18 +579,18 @@ func (cached *CaseExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field Whens []*github.com/mdibaiee/vitess/go/vt/sqlparser.When + // field Whens []*github.com/vitess/vitess/go/vt/sqlparser.When { size += hack.RuntimeAllocSize(int64(cap(cached.Whens)) * int64(8)) for _, elem := range cached.Whens { size += elem.CachedSize(true) } } - // field Else github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Else github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Else.(cachedObject); ok { size += cc.CachedSize(true) } @@ -604,11 +604,11 @@ func (cached *CastExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field Type *github.com/mdibaiee/vitess/go/vt/sqlparser.ConvertType + // field Type *github.com/vitess/vitess/go/vt/sqlparser.ConvertType size += cached.Type.CachedSize(true) return size } @@ -620,11 +620,11 @@ func (cached *ChangeColumn) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field OldColumn *github.com/mdibaiee/vitess/go/vt/sqlparser.ColName + // field OldColumn *github.com/vitess/vitess/go/vt/sqlparser.ColName size += cached.OldColumn.CachedSize(true) - // field NewColDefinition *github.com/mdibaiee/vitess/go/vt/sqlparser.ColumnDefinition + // field NewColDefinition *github.com/vitess/vitess/go/vt/sqlparser.ColumnDefinition size += cached.NewColDefinition.CachedSize(true) - // field After *github.com/mdibaiee/vitess/go/vt/sqlparser.ColName + // field After *github.com/vitess/vitess/go/vt/sqlparser.ColName size += cached.After.CachedSize(true) return size } @@ -636,7 +636,7 @@ func (cached *CharExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Exprs github.com/mdibaiee/vitess/go/vt/sqlparser.Exprs + // field Exprs github.com/vitess/vitess/go/vt/sqlparser.Exprs { size += hack.RuntimeAllocSize(int64(cap(cached.Exprs)) * int64(16)) for _, elem := range cached.Exprs { @@ -657,7 +657,7 @@ func (cached *CheckConstraintDefinition) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -671,9 +671,9 @@ func (cached *ColName) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) - // field Qualifier github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field Qualifier github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.Qualifier.CachedSize(false) return size } @@ -685,7 +685,7 @@ func (cached *CollateExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -713,9 +713,9 @@ func (cached *ColumnDefinition) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) - // field Type *github.com/mdibaiee/vitess/go/vt/sqlparser.ColumnType + // field Type *github.com/vitess/vitess/go/vt/sqlparser.ColumnType size += cached.Type.CachedSize(true) return size } @@ -729,13 +729,13 @@ func (cached *ColumnType) CachedSize(alloc bool) int64 { } // field Type string size += hack.RuntimeAllocSize(int64(len(cached.Type))) - // field Options *github.com/mdibaiee/vitess/go/vt/sqlparser.ColumnTypeOptions + // field Options *github.com/vitess/vitess/go/vt/sqlparser.ColumnTypeOptions size += cached.Options.CachedSize(true) // field Length *int size += hack.RuntimeAllocSize(int64(8)) // field Scale *int size += hack.RuntimeAllocSize(int64(8)) - // field Charset github.com/mdibaiee/vitess/go/vt/sqlparser.ColumnCharset + // field Charset github.com/vitess/vitess/go/vt/sqlparser.ColumnCharset size += cached.Charset.CachedSize(false) // field EnumValues []string { @@ -756,31 +756,31 @@ func (cached *ColumnTypeOptions) CachedSize(alloc bool) int64 { } // field Null *bool size += hack.RuntimeAllocSize(int64(1)) - // field Default github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Default github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Default.(cachedObject); ok { size += cc.CachedSize(true) } - // field OnUpdate github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field OnUpdate github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.OnUpdate.(cachedObject); ok { size += cc.CachedSize(true) } - // field As github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field As github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.As.(cachedObject); ok { size += cc.CachedSize(true) } - // field Comment *github.com/mdibaiee/vitess/go/vt/sqlparser.Literal + // field Comment *github.com/vitess/vitess/go/vt/sqlparser.Literal size += cached.Comment.CachedSize(true) // field Collate string size += hack.RuntimeAllocSize(int64(len(cached.Collate))) - // field Reference *github.com/mdibaiee/vitess/go/vt/sqlparser.ReferenceDefinition + // field Reference *github.com/vitess/vitess/go/vt/sqlparser.ReferenceDefinition size += cached.Reference.CachedSize(true) // field Invisible *bool size += hack.RuntimeAllocSize(int64(1)) - // field EngineAttribute *github.com/mdibaiee/vitess/go/vt/sqlparser.Literal + // field EngineAttribute *github.com/vitess/vitess/go/vt/sqlparser.Literal size += cached.EngineAttribute.CachedSize(true) - // field SecondaryEngineAttribute *github.com/mdibaiee/vitess/go/vt/sqlparser.Literal + // field SecondaryEngineAttribute *github.com/vitess/vitess/go/vt/sqlparser.Literal size += cached.SecondaryEngineAttribute.CachedSize(true) - // field SRID *github.com/mdibaiee/vitess/go/vt/sqlparser.Literal + // field SRID *github.com/vitess/vitess/go/vt/sqlparser.Literal size += cached.SRID.CachedSize(true) return size } @@ -836,16 +836,16 @@ func (cached *CommonTableExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field ID github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCS + // field ID github.com/vitess/vitess/go/vt/sqlparser.IdentifierCS size += cached.ID.CachedSize(false) - // field Columns github.com/mdibaiee/vitess/go/vt/sqlparser.Columns + // field Columns github.com/vitess/vitess/go/vt/sqlparser.Columns { size += hack.RuntimeAllocSize(int64(cap(cached.Columns)) * int64(32)) for _, elem := range cached.Columns { size += elem.CachedSize(false) } } - // field Subquery *github.com/mdibaiee/vitess/go/vt/sqlparser.Subquery + // field Subquery *github.com/vitess/vitess/go/vt/sqlparser.Subquery size += cached.Subquery.CachedSize(true) return size } @@ -857,15 +857,15 @@ func (cached *ComparisonExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Left github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Left github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Left.(cachedObject); ok { size += cc.CachedSize(true) } - // field Right github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Right github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Right.(cachedObject); ok { size += cc.CachedSize(true) } - // field Escape github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Escape github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Escape.(cachedObject); ok { size += cc.CachedSize(true) } @@ -879,9 +879,9 @@ func (cached *ConstraintDefinition) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) - // field Details github.com/mdibaiee/vitess/go/vt/sqlparser.ConstraintInfo + // field Details github.com/vitess/vitess/go/vt/sqlparser.ConstraintInfo if cc, ok := cached.Details.(cachedObject); ok { size += cc.CachedSize(true) } @@ -895,11 +895,11 @@ func (cached *ConvertExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field Type *github.com/mdibaiee/vitess/go/vt/sqlparser.ConvertType + // field Type *github.com/vitess/vitess/go/vt/sqlparser.ConvertType size += cached.Type.CachedSize(true) return size } @@ -917,7 +917,7 @@ func (cached *ConvertType) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(8)) // field Scale *int size += hack.RuntimeAllocSize(int64(8)) - // field Charset github.com/mdibaiee/vitess/go/vt/sqlparser.ColumnCharset + // field Charset github.com/vitess/vitess/go/vt/sqlparser.ColumnCharset size += cached.Charset.CachedSize(false) return size } @@ -929,7 +929,7 @@ func (cached *ConvertUsingExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -945,7 +945,7 @@ func (cached *Count) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Args github.com/mdibaiee/vitess/go/vt/sqlparser.Exprs + // field Args github.com/vitess/vitess/go/vt/sqlparser.Exprs { size += hack.RuntimeAllocSize(int64(cap(cached.Args)) * int64(16)) for _, elem := range cached.Args { @@ -954,7 +954,7 @@ func (cached *Count) CachedSize(alloc bool) int64 { } } } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -966,7 +966,7 @@ func (cached *CountStar) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -978,11 +978,11 @@ func (cached *CreateDatabase) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) - // field DBName github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCS + // field DBName github.com/vitess/vitess/go/vt/sqlparser.IdentifierCS size += cached.DBName.CachedSize(false) - // field CreateOptions []github.com/mdibaiee/vitess/go/vt/sqlparser.DatabaseOption + // field CreateOptions []github.com/vitess/vitess/go/vt/sqlparser.DatabaseOption { size += hack.RuntimeAllocSize(int64(cap(cached.CreateOptions)) * int64(24)) for _, elem := range cached.CreateOptions { @@ -999,13 +999,13 @@ func (cached *CreateTable) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field Table github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field Table github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.Table.CachedSize(false) - // field TableSpec *github.com/mdibaiee/vitess/go/vt/sqlparser.TableSpec + // field TableSpec *github.com/vitess/vitess/go/vt/sqlparser.TableSpec size += cached.TableSpec.CachedSize(true) - // field OptLike *github.com/mdibaiee/vitess/go/vt/sqlparser.OptLike + // field OptLike *github.com/vitess/vitess/go/vt/sqlparser.OptLike size += cached.OptLike.CachedSize(true) - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) return size } @@ -1017,28 +1017,28 @@ func (cached *CreateView) CachedSize(alloc bool) int64 { if alloc { size += int64(144) } - // field ViewName github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field ViewName github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.ViewName.CachedSize(false) // field Algorithm string size += hack.RuntimeAllocSize(int64(len(cached.Algorithm))) - // field Definer *github.com/mdibaiee/vitess/go/vt/sqlparser.Definer + // field Definer *github.com/vitess/vitess/go/vt/sqlparser.Definer size += cached.Definer.CachedSize(true) // field Security string size += hack.RuntimeAllocSize(int64(len(cached.Security))) - // field Columns github.com/mdibaiee/vitess/go/vt/sqlparser.Columns + // field Columns github.com/vitess/vitess/go/vt/sqlparser.Columns { size += hack.RuntimeAllocSize(int64(cap(cached.Columns)) * int64(32)) for _, elem := range cached.Columns { size += elem.CachedSize(false) } } - // field Select github.com/mdibaiee/vitess/go/vt/sqlparser.SelectStatement + // field Select github.com/vitess/vitess/go/vt/sqlparser.SelectStatement if cc, ok := cached.Select.(cachedObject); ok { size += cc.CachedSize(true) } // field CheckOption string size += hack.RuntimeAllocSize(int64(len(cached.CheckOption))) - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) return size } @@ -1050,7 +1050,7 @@ func (cached *CurTimeFuncExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) return size } @@ -1074,9 +1074,9 @@ func (cached *DeallocateStmt) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) return size } @@ -1114,11 +1114,11 @@ func (cached *Delete) CachedSize(alloc bool) int64 { if alloc { size += int64(144) } - // field With *github.com/mdibaiee/vitess/go/vt/sqlparser.With + // field With *github.com/vitess/vitess/go/vt/sqlparser.With size += cached.With.CachedSize(true) - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) - // field TableExprs []github.com/mdibaiee/vitess/go/vt/sqlparser.TableExpr + // field TableExprs []github.com/vitess/vitess/go/vt/sqlparser.TableExpr { size += hack.RuntimeAllocSize(int64(cap(cached.TableExprs)) * int64(16)) for _, elem := range cached.TableExprs { @@ -1127,30 +1127,30 @@ func (cached *Delete) CachedSize(alloc bool) int64 { } } } - // field Targets github.com/mdibaiee/vitess/go/vt/sqlparser.TableNames + // field Targets github.com/vitess/vitess/go/vt/sqlparser.TableNames { size += hack.RuntimeAllocSize(int64(cap(cached.Targets)) * int64(32)) for _, elem := range cached.Targets { size += elem.CachedSize(false) } } - // field Partitions github.com/mdibaiee/vitess/go/vt/sqlparser.Partitions + // field Partitions github.com/vitess/vitess/go/vt/sqlparser.Partitions { size += hack.RuntimeAllocSize(int64(cap(cached.Partitions)) * int64(32)) for _, elem := range cached.Partitions { size += elem.CachedSize(false) } } - // field Where *github.com/mdibaiee/vitess/go/vt/sqlparser.Where + // field Where *github.com/vitess/vitess/go/vt/sqlparser.Where size += cached.Where.CachedSize(true) - // field OrderBy github.com/mdibaiee/vitess/go/vt/sqlparser.OrderBy + // field OrderBy github.com/vitess/vitess/go/vt/sqlparser.OrderBy { size += hack.RuntimeAllocSize(int64(cap(cached.OrderBy)) * int64(8)) for _, elem := range cached.OrderBy { size += elem.CachedSize(true) } } - // field Limit *github.com/mdibaiee/vitess/go/vt/sqlparser.Limit + // field Limit *github.com/vitess/vitess/go/vt/sqlparser.Limit size += cached.Limit.CachedSize(true) return size } @@ -1162,7 +1162,7 @@ func (cached *DerivedTable) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Select github.com/mdibaiee/vitess/go/vt/sqlparser.SelectStatement + // field Select github.com/vitess/vitess/go/vt/sqlparser.SelectStatement if cc, ok := cached.Select.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1176,7 +1176,7 @@ func (cached *DropColumn) CachedSize(alloc bool) int64 { if alloc { size += int64(8) } - // field Name *github.com/mdibaiee/vitess/go/vt/sqlparser.ColName + // field Name *github.com/vitess/vitess/go/vt/sqlparser.ColName size += cached.Name.CachedSize(true) return size } @@ -1188,9 +1188,9 @@ func (cached *DropDatabase) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) - // field DBName github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCS + // field DBName github.com/vitess/vitess/go/vt/sqlparser.IdentifierCS size += cached.DBName.CachedSize(false) return size } @@ -1202,7 +1202,7 @@ func (cached *DropKey) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) return size } @@ -1214,14 +1214,14 @@ func (cached *DropTable) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field FromTables github.com/mdibaiee/vitess/go/vt/sqlparser.TableNames + // field FromTables github.com/vitess/vitess/go/vt/sqlparser.TableNames { size += hack.RuntimeAllocSize(int64(cap(cached.FromTables)) * int64(32)) for _, elem := range cached.FromTables { size += elem.CachedSize(false) } } - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) return size } @@ -1233,14 +1233,14 @@ func (cached *DropView) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field FromTables github.com/mdibaiee/vitess/go/vt/sqlparser.TableNames + // field FromTables github.com/vitess/vitess/go/vt/sqlparser.TableNames { size += hack.RuntimeAllocSize(int64(cap(cached.FromTables)) * int64(32)) for _, elem := range cached.FromTables { size += elem.CachedSize(false) } } - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) return size } @@ -1252,11 +1252,11 @@ func (cached *ExecuteStmt) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) - // field Arguments []*github.com/mdibaiee/vitess/go/vt/sqlparser.Variable + // field Arguments []*github.com/vitess/vitess/go/vt/sqlparser.Variable { size += hack.RuntimeAllocSize(int64(cap(cached.Arguments)) * int64(8)) for _, elem := range cached.Arguments { @@ -1273,7 +1273,7 @@ func (cached *ExistsExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(8) } - // field Subquery *github.com/mdibaiee/vitess/go/vt/sqlparser.Subquery + // field Subquery *github.com/vitess/vitess/go/vt/sqlparser.Subquery size += cached.Subquery.CachedSize(true) return size } @@ -1285,11 +1285,11 @@ func (cached *ExplainStmt) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Statement github.com/mdibaiee/vitess/go/vt/sqlparser.Statement + // field Statement github.com/vitess/vitess/go/vt/sqlparser.Statement if cc, ok := cached.Statement.(cachedObject); ok { size += cc.CachedSize(true) } - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) return size } @@ -1301,7 +1301,7 @@ func (cached *ExplainTab) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Table github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field Table github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.Table.CachedSize(false) // field Wild string size += hack.RuntimeAllocSize(int64(len(cached.Wild))) @@ -1315,7 +1315,7 @@ func (cached *ExtractFuncExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1329,11 +1329,11 @@ func (cached *ExtractValueExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Fragment github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Fragment github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Fragment.(cachedObject); ok { size += cc.CachedSize(true) } - // field XPathExpr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field XPathExpr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.XPathExpr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1347,15 +1347,15 @@ func (cached *FirstOrLastValueExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field NullTreatmentClause *github.com/mdibaiee/vitess/go/vt/sqlparser.NullTreatmentClause + // field NullTreatmentClause *github.com/vitess/vitess/go/vt/sqlparser.NullTreatmentClause if cached.NullTreatmentClause != nil { size += hack.RuntimeAllocSize(int64(1)) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -1374,7 +1374,7 @@ func (cached *Flush) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(len(elem))) } } - // field TableNames github.com/mdibaiee/vitess/go/vt/sqlparser.TableNames + // field TableNames github.com/vitess/vitess/go/vt/sqlparser.TableNames { size += hack.RuntimeAllocSize(int64(cap(cached.TableNames)) * int64(32)) for _, elem := range cached.TableNames { @@ -1391,16 +1391,16 @@ func (cached *ForeignKeyDefinition) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Source github.com/mdibaiee/vitess/go/vt/sqlparser.Columns + // field Source github.com/vitess/vitess/go/vt/sqlparser.Columns { size += hack.RuntimeAllocSize(int64(cap(cached.Source)) * int64(32)) for _, elem := range cached.Source { size += elem.CachedSize(false) } } - // field IndexName github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field IndexName github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.IndexName.CachedSize(false) - // field ReferenceDefinition *github.com/mdibaiee/vitess/go/vt/sqlparser.ReferenceDefinition + // field ReferenceDefinition *github.com/vitess/vitess/go/vt/sqlparser.ReferenceDefinition size += cached.ReferenceDefinition.CachedSize(true) return size } @@ -1412,9 +1412,9 @@ func (cached *FrameClause) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Start *github.com/mdibaiee/vitess/go/vt/sqlparser.FramePoint + // field Start *github.com/vitess/vitess/go/vt/sqlparser.FramePoint size += cached.Start.CachedSize(true) - // field End *github.com/mdibaiee/vitess/go/vt/sqlparser.FramePoint + // field End *github.com/vitess/vitess/go/vt/sqlparser.FramePoint size += cached.End.CachedSize(true) return size } @@ -1426,7 +1426,7 @@ func (cached *FramePoint) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1440,11 +1440,11 @@ func (cached *FuncExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field Qualifier github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCS + // field Qualifier github.com/vitess/vitess/go/vt/sqlparser.IdentifierCS size += cached.Qualifier.CachedSize(false) - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) - // field Exprs github.com/mdibaiee/vitess/go/vt/sqlparser.Exprs + // field Exprs github.com/vitess/vitess/go/vt/sqlparser.Exprs { size += hack.RuntimeAllocSize(int64(cap(cached.Exprs)) * int64(16)) for _, elem := range cached.Exprs { @@ -1463,19 +1463,19 @@ func (cached *GTIDFuncExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field Set1 github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Set1 github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Set1.(cachedObject); ok { size += cc.CachedSize(true) } - // field Set2 github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Set2 github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Set2.(cachedObject); ok { size += cc.CachedSize(true) } - // field Timeout github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Timeout github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Timeout.(cachedObject); ok { size += cc.CachedSize(true) } - // field Channel github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Channel github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Channel.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1489,15 +1489,15 @@ func (cached *GeoHashFromLatLongExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Latitude github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Latitude github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Latitude.(cachedObject); ok { size += cc.CachedSize(true) } - // field Longitude github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Longitude github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Longitude.(cachedObject); ok { size += cc.CachedSize(true) } - // field MaxLength github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field MaxLength github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.MaxLength.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1511,11 +1511,11 @@ func (cached *GeoHashFromPointExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Point github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Point github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Point.(cachedObject); ok { size += cc.CachedSize(true) } - // field MaxLength github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field MaxLength github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.MaxLength.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1529,15 +1529,15 @@ func (cached *GeoJSONFromGeomExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Geom github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Geom github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Geom.(cachedObject); ok { size += cc.CachedSize(true) } - // field MaxDecimalDigits github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field MaxDecimalDigits github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.MaxDecimalDigits.(cachedObject); ok { size += cc.CachedSize(true) } - // field Bitmask github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Bitmask github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Bitmask.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1551,11 +1551,11 @@ func (cached *GeomCollPropertyFuncExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field GeomColl github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field GeomColl github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.GeomColl.(cachedObject); ok { size += cc.CachedSize(true) } - // field PropertyDefArg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field PropertyDefArg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.PropertyDefArg.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1569,11 +1569,11 @@ func (cached *GeomFormatExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Geom github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Geom github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Geom.(cachedObject); ok { size += cc.CachedSize(true) } - // field AxisOrderOpt github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field AxisOrderOpt github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.AxisOrderOpt.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1587,11 +1587,11 @@ func (cached *GeomFromGeoHashExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field GeoHash github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field GeoHash github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.GeoHash.(cachedObject); ok { size += cc.CachedSize(true) } - // field SridOpt github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field SridOpt github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.SridOpt.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1605,15 +1605,15 @@ func (cached *GeomFromGeoJSONExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field GeoJSON github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field GeoJSON github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.GeoJSON.(cachedObject); ok { size += cc.CachedSize(true) } - // field HigherDimHandlerOpt github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field HigherDimHandlerOpt github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.HigherDimHandlerOpt.(cachedObject); ok { size += cc.CachedSize(true) } - // field Srid github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Srid github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Srid.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1627,15 +1627,15 @@ func (cached *GeomFromTextExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field WktText github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field WktText github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.WktText.(cachedObject); ok { size += cc.CachedSize(true) } - // field Srid github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Srid github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Srid.(cachedObject); ok { size += cc.CachedSize(true) } - // field AxisOrderOpt github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field AxisOrderOpt github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.AxisOrderOpt.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1649,15 +1649,15 @@ func (cached *GeomFromWKBExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field WkbBlob github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field WkbBlob github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.WkbBlob.(cachedObject); ok { size += cc.CachedSize(true) } - // field Srid github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Srid github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Srid.(cachedObject); ok { size += cc.CachedSize(true) } - // field AxisOrderOpt github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field AxisOrderOpt github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.AxisOrderOpt.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1671,7 +1671,7 @@ func (cached *GeomPropertyFuncExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Geom github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Geom github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Geom.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1685,7 +1685,7 @@ func (cached *GroupBy) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Exprs []github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Exprs []github.com/vitess/vitess/go/vt/sqlparser.Expr { size += hack.RuntimeAllocSize(int64(cap(cached.Exprs)) * int64(16)) for _, elem := range cached.Exprs { @@ -1704,7 +1704,7 @@ func (cached *GroupConcatExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field Exprs github.com/mdibaiee/vitess/go/vt/sqlparser.Exprs + // field Exprs github.com/vitess/vitess/go/vt/sqlparser.Exprs { size += hack.RuntimeAllocSize(int64(cap(cached.Exprs)) * int64(16)) for _, elem := range cached.Exprs { @@ -1713,7 +1713,7 @@ func (cached *GroupConcatExpr) CachedSize(alloc bool) int64 { } } } - // field OrderBy github.com/mdibaiee/vitess/go/vt/sqlparser.OrderBy + // field OrderBy github.com/vitess/vitess/go/vt/sqlparser.OrderBy { size += hack.RuntimeAllocSize(int64(cap(cached.OrderBy)) * int64(8)) for _, elem := range cached.OrderBy { @@ -1722,7 +1722,7 @@ func (cached *GroupConcatExpr) CachedSize(alloc bool) int64 { } // field Separator string size += hack.RuntimeAllocSize(int64(len(cached.Separator))) - // field Limit *github.com/mdibaiee/vitess/go/vt/sqlparser.Limit + // field Limit *github.com/vitess/vitess/go/vt/sqlparser.Limit size += cached.Limit.CachedSize(true) return size } @@ -1760,11 +1760,11 @@ func (cached *IndexColumn) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Column github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Column github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Column.CachedSize(false) // field Length *int size += hack.RuntimeAllocSize(int64(8)) - // field Expression github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expression github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expression.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1778,16 +1778,16 @@ func (cached *IndexDefinition) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Info *github.com/mdibaiee/vitess/go/vt/sqlparser.IndexInfo + // field Info *github.com/vitess/vitess/go/vt/sqlparser.IndexInfo size += cached.Info.CachedSize(true) - // field Columns []*github.com/mdibaiee/vitess/go/vt/sqlparser.IndexColumn + // field Columns []*github.com/vitess/vitess/go/vt/sqlparser.IndexColumn { size += hack.RuntimeAllocSize(int64(cap(cached.Columns)) * int64(8)) for _, elem := range cached.Columns { size += elem.CachedSize(true) } } - // field Options []*github.com/mdibaiee/vitess/go/vt/sqlparser.IndexOption + // field Options []*github.com/vitess/vitess/go/vt/sqlparser.IndexOption { size += hack.RuntimeAllocSize(int64(cap(cached.Options)) * int64(8)) for _, elem := range cached.Options { @@ -1804,7 +1804,7 @@ func (cached *IndexHint) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Indexes []github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Indexes []github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI { size += hack.RuntimeAllocSize(int64(cap(cached.Indexes)) * int64(32)) for _, elem := range cached.Indexes { @@ -1821,9 +1821,9 @@ func (cached *IndexInfo) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) - // field ConstraintName github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field ConstraintName github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.ConstraintName.CachedSize(false) return size } @@ -1837,7 +1837,7 @@ func (cached *IndexOption) CachedSize(alloc bool) int64 { } // field Name string size += hack.RuntimeAllocSize(int64(len(cached.Name))) - // field Value *github.com/mdibaiee/vitess/go/vt/sqlparser.Literal + // field Value *github.com/vitess/vitess/go/vt/sqlparser.Literal size += cached.Value.CachedSize(true) // field String string size += hack.RuntimeAllocSize(int64(len(cached.String))) @@ -1851,31 +1851,31 @@ func (cached *Insert) CachedSize(alloc bool) int64 { if alloc { size += int64(128) } - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) - // field Table *github.com/mdibaiee/vitess/go/vt/sqlparser.AliasedTableExpr + // field Table *github.com/vitess/vitess/go/vt/sqlparser.AliasedTableExpr size += cached.Table.CachedSize(true) - // field Partitions github.com/mdibaiee/vitess/go/vt/sqlparser.Partitions + // field Partitions github.com/vitess/vitess/go/vt/sqlparser.Partitions { size += hack.RuntimeAllocSize(int64(cap(cached.Partitions)) * int64(32)) for _, elem := range cached.Partitions { size += elem.CachedSize(false) } } - // field Columns github.com/mdibaiee/vitess/go/vt/sqlparser.Columns + // field Columns github.com/vitess/vitess/go/vt/sqlparser.Columns { size += hack.RuntimeAllocSize(int64(cap(cached.Columns)) * int64(32)) for _, elem := range cached.Columns { size += elem.CachedSize(false) } } - // field Rows github.com/mdibaiee/vitess/go/vt/sqlparser.InsertRows + // field Rows github.com/vitess/vitess/go/vt/sqlparser.InsertRows if cc, ok := cached.Rows.(cachedObject); ok { size += cc.CachedSize(true) } - // field RowAlias *github.com/mdibaiee/vitess/go/vt/sqlparser.RowAlias + // field RowAlias *github.com/vitess/vitess/go/vt/sqlparser.RowAlias size += cached.RowAlias.CachedSize(true) - // field OnDup github.com/mdibaiee/vitess/go/vt/sqlparser.OnDup + // field OnDup github.com/vitess/vitess/go/vt/sqlparser.OnDup { size += hack.RuntimeAllocSize(int64(cap(cached.OnDup)) * int64(8)) for _, elem := range cached.OnDup { @@ -1892,19 +1892,19 @@ func (cached *InsertExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Str github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Str github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Str.(cachedObject); ok { size += cc.CachedSize(true) } - // field Pos github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Pos github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Pos.(cachedObject); ok { size += cc.CachedSize(true) } - // field Len github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Len github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Len.(cachedObject); ok { size += cc.CachedSize(true) } - // field NewStr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field NewStr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.NewStr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1918,11 +1918,11 @@ func (cached *IntervalDateExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Date github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Date github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Date.(cachedObject); ok { size += cc.CachedSize(true) } - // field Interval github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Interval github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Interval.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1936,11 +1936,11 @@ func (cached *IntervalFuncExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field Exprs github.com/mdibaiee/vitess/go/vt/sqlparser.Exprs + // field Exprs github.com/vitess/vitess/go/vt/sqlparser.Exprs { size += hack.RuntimeAllocSize(int64(cap(cached.Exprs)) * int64(16)) for _, elem := range cached.Exprs { @@ -1961,7 +1961,7 @@ func (cached *IntroducerExpr) CachedSize(alloc bool) int64 { } // field CharacterSet string size += hack.RuntimeAllocSize(int64(len(cached.CharacterSet))) - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1975,7 +1975,7 @@ func (cached *IsExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Left github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Left github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Left.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1989,7 +1989,7 @@ func (cached *JSONArrayExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Params github.com/mdibaiee/vitess/go/vt/sqlparser.Exprs + // field Params github.com/vitess/vitess/go/vt/sqlparser.Exprs { size += hack.RuntimeAllocSize(int64(cap(cached.Params)) * int64(16)) for _, elem := range cached.Params { @@ -2008,11 +2008,11 @@ func (cached *JSONAttributesExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field JSONDoc github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field JSONDoc github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.JSONDoc.(cachedObject); ok { size += cc.CachedSize(true) } - // field Path github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Path github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Path.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2026,15 +2026,15 @@ func (cached *JSONContainsExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Target github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Target github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Target.(cachedObject); ok { size += cc.CachedSize(true) } - // field Candidate github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Candidate github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Candidate.(cachedObject); ok { size += cc.CachedSize(true) } - // field PathList []github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field PathList []github.com/vitess/vitess/go/vt/sqlparser.Expr { size += hack.RuntimeAllocSize(int64(cap(cached.PathList)) * int64(16)) for _, elem := range cached.PathList { @@ -2053,15 +2053,15 @@ func (cached *JSONContainsPathExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field JSONDoc github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field JSONDoc github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.JSONDoc.(cachedObject); ok { size += cc.CachedSize(true) } - // field OneOrAll github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field OneOrAll github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.OneOrAll.(cachedObject); ok { size += cc.CachedSize(true) } - // field PathList []github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field PathList []github.com/vitess/vitess/go/vt/sqlparser.Expr { size += hack.RuntimeAllocSize(int64(cap(cached.PathList)) * int64(16)) for _, elem := range cached.PathList { @@ -2080,11 +2080,11 @@ func (cached *JSONExtractExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field JSONDoc github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field JSONDoc github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.JSONDoc.(cachedObject); ok { size += cc.CachedSize(true) } - // field PathList []github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field PathList []github.com/vitess/vitess/go/vt/sqlparser.Expr { size += hack.RuntimeAllocSize(int64(cap(cached.PathList)) * int64(16)) for _, elem := range cached.PathList { @@ -2103,11 +2103,11 @@ func (cached *JSONKeysExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field JSONDoc github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field JSONDoc github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.JSONDoc.(cachedObject); ok { size += cc.CachedSize(true) } - // field Path github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Path github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Path.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2121,7 +2121,7 @@ func (cached *JSONObjectExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Params []*github.com/mdibaiee/vitess/go/vt/sqlparser.JSONObjectParam + // field Params []*github.com/vitess/vitess/go/vt/sqlparser.JSONObjectParam { size += hack.RuntimeAllocSize(int64(cap(cached.Params)) * int64(8)) for _, elem := range cached.Params { @@ -2138,11 +2138,11 @@ func (cached *JSONObjectParam) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Key github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Key github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Key.(cachedObject); ok { size += cc.CachedSize(true) } - // field Value github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Value github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Value.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2156,11 +2156,11 @@ func (cached *JSONOverlapsExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field JSONDoc1 github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field JSONDoc1 github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.JSONDoc1.(cachedObject); ok { size += cc.CachedSize(true) } - // field JSONDoc2 github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field JSONDoc2 github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.JSONDoc2.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2174,7 +2174,7 @@ func (cached *JSONPrettyExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field JSONVal github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field JSONVal github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.JSONVal.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2188,7 +2188,7 @@ func (cached *JSONQuoteExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field StringArg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field StringArg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.StringArg.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2202,11 +2202,11 @@ func (cached *JSONRemoveExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field JSONDoc github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field JSONDoc github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.JSONDoc.(cachedObject); ok { size += cc.CachedSize(true) } - // field PathList github.com/mdibaiee/vitess/go/vt/sqlparser.Exprs + // field PathList github.com/vitess/vitess/go/vt/sqlparser.Exprs { size += hack.RuntimeAllocSize(int64(cap(cached.PathList)) * int64(16)) for _, elem := range cached.PathList { @@ -2225,11 +2225,11 @@ func (cached *JSONSchemaValidFuncExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Schema github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Schema github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Schema.(cachedObject); ok { size += cc.CachedSize(true) } - // field Document github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Document github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Document.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2243,11 +2243,11 @@ func (cached *JSONSchemaValidationReportFuncExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Schema github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Schema github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Schema.(cachedObject); ok { size += cc.CachedSize(true) } - // field Document github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Document github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Document.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2261,23 +2261,23 @@ func (cached *JSONSearchExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(96) } - // field JSONDoc github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field JSONDoc github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.JSONDoc.(cachedObject); ok { size += cc.CachedSize(true) } - // field OneOrAll github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field OneOrAll github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.OneOrAll.(cachedObject); ok { size += cc.CachedSize(true) } - // field SearchStr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field SearchStr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.SearchStr.(cachedObject); ok { size += cc.CachedSize(true) } - // field EscapeChar github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field EscapeChar github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.EscapeChar.(cachedObject); ok { size += cc.CachedSize(true) } - // field PathList []github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field PathList []github.com/vitess/vitess/go/vt/sqlparser.Expr { size += hack.RuntimeAllocSize(int64(cap(cached.PathList)) * int64(16)) for _, elem := range cached.PathList { @@ -2296,7 +2296,7 @@ func (cached *JSONStorageFreeExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field JSONVal github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field JSONVal github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.JSONVal.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2310,7 +2310,7 @@ func (cached *JSONStorageSizeExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field JSONVal github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field JSONVal github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.JSONVal.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2324,17 +2324,17 @@ func (cached *JSONTableExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field Alias github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCS + // field Alias github.com/vitess/vitess/go/vt/sqlparser.IdentifierCS size += cached.Alias.CachedSize(false) - // field Filter github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Filter github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Filter.(cachedObject); ok { size += cc.CachedSize(true) } - // field Columns []*github.com/mdibaiee/vitess/go/vt/sqlparser.JtColumnDefinition + // field Columns []*github.com/vitess/vitess/go/vt/sqlparser.JtColumnDefinition { size += hack.RuntimeAllocSize(int64(cap(cached.Columns)) * int64(8)) for _, elem := range cached.Columns { @@ -2351,7 +2351,7 @@ func (cached *JSONUnquoteExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field JSONValue github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field JSONValue github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.JSONValue.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2365,19 +2365,19 @@ func (cached *JSONValueExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field JSONDoc github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field JSONDoc github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.JSONDoc.(cachedObject); ok { size += cc.CachedSize(true) } - // field Path github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Path github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Path.(cachedObject); ok { size += cc.CachedSize(true) } - // field ReturningType *github.com/mdibaiee/vitess/go/vt/sqlparser.ConvertType + // field ReturningType *github.com/vitess/vitess/go/vt/sqlparser.ConvertType size += cached.ReturningType.CachedSize(true) - // field EmptyOnResponse *github.com/mdibaiee/vitess/go/vt/sqlparser.JtOnResponse + // field EmptyOnResponse *github.com/vitess/vitess/go/vt/sqlparser.JtOnResponse size += cached.EmptyOnResponse.CachedSize(true) - // field ErrorOnResponse *github.com/mdibaiee/vitess/go/vt/sqlparser.JtOnResponse + // field ErrorOnResponse *github.com/vitess/vitess/go/vt/sqlparser.JtOnResponse size += cached.ErrorOnResponse.CachedSize(true) return size } @@ -2389,11 +2389,11 @@ func (cached *JSONValueMergeExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field JSONDoc github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field JSONDoc github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.JSONDoc.(cachedObject); ok { size += cc.CachedSize(true) } - // field JSONDocList github.com/mdibaiee/vitess/go/vt/sqlparser.Exprs + // field JSONDocList github.com/vitess/vitess/go/vt/sqlparser.Exprs { size += hack.RuntimeAllocSize(int64(cap(cached.JSONDocList)) * int64(16)) for _, elem := range cached.JSONDocList { @@ -2412,11 +2412,11 @@ func (cached *JSONValueModifierExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field JSONDoc github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field JSONDoc github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.JSONDoc.(cachedObject); ok { size += cc.CachedSize(true) } - // field Params []*github.com/mdibaiee/vitess/go/vt/sqlparser.JSONObjectParam + // field Params []*github.com/vitess/vitess/go/vt/sqlparser.JSONObjectParam { size += hack.RuntimeAllocSize(int64(cap(cached.Params)) * int64(8)) for _, elem := range cached.Params { @@ -2433,11 +2433,11 @@ func (cached *JoinCondition) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field On github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field On github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.On.(cachedObject); ok { size += cc.CachedSize(true) } - // field Using github.com/mdibaiee/vitess/go/vt/sqlparser.Columns + // field Using github.com/vitess/vitess/go/vt/sqlparser.Columns { size += hack.RuntimeAllocSize(int64(cap(cached.Using)) * int64(32)) for _, elem := range cached.Using { @@ -2454,15 +2454,15 @@ func (cached *JoinTableExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field LeftExpr github.com/mdibaiee/vitess/go/vt/sqlparser.TableExpr + // field LeftExpr github.com/vitess/vitess/go/vt/sqlparser.TableExpr if cc, ok := cached.LeftExpr.(cachedObject); ok { size += cc.CachedSize(true) } - // field RightExpr github.com/mdibaiee/vitess/go/vt/sqlparser.TableExpr + // field RightExpr github.com/vitess/vitess/go/vt/sqlparser.TableExpr if cc, ok := cached.RightExpr.(cachedObject); ok { size += cc.CachedSize(true) } - // field Condition *github.com/mdibaiee/vitess/go/vt/sqlparser.JoinCondition + // field Condition *github.com/vitess/vitess/go/vt/sqlparser.JoinCondition size += cached.Condition.CachedSize(true) return size } @@ -2474,11 +2474,11 @@ func (cached *JtColumnDefinition) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field JtOrdinal *github.com/mdibaiee/vitess/go/vt/sqlparser.JtOrdinalColDef + // field JtOrdinal *github.com/vitess/vitess/go/vt/sqlparser.JtOrdinalColDef size += cached.JtOrdinal.CachedSize(true) - // field JtPath *github.com/mdibaiee/vitess/go/vt/sqlparser.JtPathColDef + // field JtPath *github.com/vitess/vitess/go/vt/sqlparser.JtPathColDef size += cached.JtPath.CachedSize(true) - // field JtNestedPath *github.com/mdibaiee/vitess/go/vt/sqlparser.JtNestedPathColDef + // field JtNestedPath *github.com/vitess/vitess/go/vt/sqlparser.JtNestedPathColDef size += cached.JtNestedPath.CachedSize(true) return size } @@ -2490,11 +2490,11 @@ func (cached *JtNestedPathColDef) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Path github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Path github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Path.(cachedObject); ok { size += cc.CachedSize(true) } - // field Columns []*github.com/mdibaiee/vitess/go/vt/sqlparser.JtColumnDefinition + // field Columns []*github.com/vitess/vitess/go/vt/sqlparser.JtColumnDefinition { size += hack.RuntimeAllocSize(int64(cap(cached.Columns)) * int64(8)) for _, elem := range cached.Columns { @@ -2511,7 +2511,7 @@ func (cached *JtOnResponse) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2525,7 +2525,7 @@ func (cached *JtOrdinalColDef) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) return size } @@ -2537,17 +2537,17 @@ func (cached *JtPathColDef) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) - // field Type *github.com/mdibaiee/vitess/go/vt/sqlparser.ColumnType + // field Type *github.com/vitess/vitess/go/vt/sqlparser.ColumnType size += cached.Type.CachedSize(true) - // field Path github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Path github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Path.(cachedObject); ok { size += cc.CachedSize(true) } - // field EmptyOnResponse *github.com/mdibaiee/vitess/go/vt/sqlparser.JtOnResponse + // field EmptyOnResponse *github.com/vitess/vitess/go/vt/sqlparser.JtOnResponse size += cached.EmptyOnResponse.CachedSize(true) - // field ErrorOnResponse *github.com/mdibaiee/vitess/go/vt/sqlparser.JtOnResponse + // field ErrorOnResponse *github.com/vitess/vitess/go/vt/sqlparser.JtOnResponse size += cached.ErrorOnResponse.CachedSize(true) return size } @@ -2579,21 +2579,21 @@ func (cached *LagLeadExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field N github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field N github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.N.(cachedObject); ok { size += cc.CachedSize(true) } - // field Default github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Default github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Default.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) - // field NullTreatmentClause *github.com/mdibaiee/vitess/go/vt/sqlparser.NullTreatmentClause + // field NullTreatmentClause *github.com/vitess/vitess/go/vt/sqlparser.NullTreatmentClause if cached.NullTreatmentClause != nil { size += hack.RuntimeAllocSize(int64(1)) } @@ -2607,11 +2607,11 @@ func (cached *Limit) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Offset github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Offset github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Offset.(cachedObject); ok { size += cc.CachedSize(true) } - // field Rowcount github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Rowcount github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Rowcount.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2625,7 +2625,7 @@ func (cached *LineStringExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field PointParams github.com/mdibaiee/vitess/go/vt/sqlparser.Exprs + // field PointParams github.com/vitess/vitess/go/vt/sqlparser.Exprs { size += hack.RuntimeAllocSize(int64(cap(cached.PointParams)) * int64(16)) for _, elem := range cached.PointParams { @@ -2644,11 +2644,11 @@ func (cached *LinestrPropertyFuncExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Linestring github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Linestring github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Linestring.(cachedObject); ok { size += cc.CachedSize(true) } - // field PropertyDefArg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field PropertyDefArg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.PropertyDefArg.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2674,15 +2674,15 @@ func (cached *LocateExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field SubStr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field SubStr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.SubStr.(cachedObject); ok { size += cc.CachedSize(true) } - // field Str github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Str github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Str.(cachedObject); ok { size += cc.CachedSize(true) } - // field Pos github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Pos github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Pos.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2706,7 +2706,7 @@ func (cached *LockTables) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Tables github.com/mdibaiee/vitess/go/vt/sqlparser.TableAndLockTypes + // field Tables github.com/vitess/vitess/go/vt/sqlparser.TableAndLockTypes { size += hack.RuntimeAllocSize(int64(cap(cached.Tables)) * int64(8)) for _, elem := range cached.Tables { @@ -2723,11 +2723,11 @@ func (cached *LockingFunc) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Name github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Name.(cachedObject); ok { size += cc.CachedSize(true) } - // field Timeout github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Timeout github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Timeout.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2741,14 +2741,14 @@ func (cached *MatchExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Columns []*github.com/mdibaiee/vitess/go/vt/sqlparser.ColName + // field Columns []*github.com/vitess/vitess/go/vt/sqlparser.ColName { size += hack.RuntimeAllocSize(int64(cap(cached.Columns)) * int64(8)) for _, elem := range cached.Columns { size += elem.CachedSize(true) } } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2762,11 +2762,11 @@ func (cached *Max) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Arg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Arg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Arg.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -2778,11 +2778,11 @@ func (cached *MemberOfExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Value github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Value github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Value.(cachedObject); ok { size += cc.CachedSize(true) } - // field JSONArr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field JSONArr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.JSONArr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2796,11 +2796,11 @@ func (cached *Min) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Arg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Arg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Arg.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -2812,9 +2812,9 @@ func (cached *ModifyColumn) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field NewColDefinition *github.com/mdibaiee/vitess/go/vt/sqlparser.ColumnDefinition + // field NewColDefinition *github.com/vitess/vitess/go/vt/sqlparser.ColumnDefinition size += cached.NewColDefinition.CachedSize(true) - // field After *github.com/mdibaiee/vitess/go/vt/sqlparser.ColName + // field After *github.com/vitess/vitess/go/vt/sqlparser.ColName size += cached.After.CachedSize(true) return size } @@ -2826,7 +2826,7 @@ func (cached *MultiLinestringExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field LinestringParams github.com/mdibaiee/vitess/go/vt/sqlparser.Exprs + // field LinestringParams github.com/vitess/vitess/go/vt/sqlparser.Exprs { size += hack.RuntimeAllocSize(int64(cap(cached.LinestringParams)) * int64(16)) for _, elem := range cached.LinestringParams { @@ -2845,7 +2845,7 @@ func (cached *MultiPointExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field PointParams github.com/mdibaiee/vitess/go/vt/sqlparser.Exprs + // field PointParams github.com/vitess/vitess/go/vt/sqlparser.Exprs { size += hack.RuntimeAllocSize(int64(cap(cached.PointParams)) * int64(16)) for _, elem := range cached.PointParams { @@ -2864,7 +2864,7 @@ func (cached *MultiPolygonExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field PolygonParams github.com/mdibaiee/vitess/go/vt/sqlparser.Exprs + // field PolygonParams github.com/vitess/vitess/go/vt/sqlparser.Exprs { size += hack.RuntimeAllocSize(int64(cap(cached.PolygonParams)) * int64(16)) for _, elem := range cached.PolygonParams { @@ -2883,21 +2883,21 @@ func (cached *NTHValueExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field N github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field N github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.N.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) - // field FromFirstLastClause *github.com/mdibaiee/vitess/go/vt/sqlparser.FromFirstLastClause + // field FromFirstLastClause *github.com/vitess/vitess/go/vt/sqlparser.FromFirstLastClause if cached.FromFirstLastClause != nil { size += hack.RuntimeAllocSize(int64(1)) } - // field NullTreatmentClause *github.com/mdibaiee/vitess/go/vt/sqlparser.NullTreatmentClause + // field NullTreatmentClause *github.com/vitess/vitess/go/vt/sqlparser.NullTreatmentClause if cached.NullTreatmentClause != nil { size += hack.RuntimeAllocSize(int64(1)) } @@ -2911,7 +2911,7 @@ func (cached *NamedWindow) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Windows github.com/mdibaiee/vitess/go/vt/sqlparser.WindowDefinitions + // field Windows github.com/vitess/vitess/go/vt/sqlparser.WindowDefinitions { size += hack.RuntimeAllocSize(int64(cap(cached.Windows)) * int64(8)) for _, elem := range cached.Windows { @@ -2928,7 +2928,7 @@ func (cached *Nextval) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2942,7 +2942,7 @@ func (cached *NotExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2956,11 +2956,11 @@ func (cached *NtileExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field N github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field N github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.N.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -2972,7 +2972,7 @@ func (cached *Offset) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Original github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Original github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Original.(cachedObject); ok { size += cc.CachedSize(true) } @@ -2986,7 +2986,7 @@ func (cached *OptLike) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field LikeTable github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field LikeTable github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.LikeTable.CachedSize(false) return size } @@ -2998,11 +2998,11 @@ func (cached *OrExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Left github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Left github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Left.(cachedObject); ok { size += cc.CachedSize(true) } - // field Right github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Right github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Right.(cachedObject); ok { size += cc.CachedSize(true) } @@ -3016,7 +3016,7 @@ func (cached *Order) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -3030,7 +3030,7 @@ func (cached *OrderByOption) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Cols github.com/mdibaiee/vitess/go/vt/sqlparser.Columns + // field Cols github.com/vitess/vitess/go/vt/sqlparser.Columns { size += hack.RuntimeAllocSize(int64(cap(cached.Cols)) * int64(32)) for _, elem := range cached.Cols { @@ -3047,9 +3047,9 @@ func (cached *OverClause) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field WindowName github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field WindowName github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.WindowName.CachedSize(false) - // field WindowSpec *github.com/mdibaiee/vitess/go/vt/sqlparser.WindowSpecification + // field WindowSpec *github.com/vitess/vitess/go/vt/sqlparser.WindowSpecification size += cached.WindowSpec.CachedSize(true) return size } @@ -3061,7 +3061,7 @@ func (cached *ParenTableExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Exprs github.com/mdibaiee/vitess/go/vt/sqlparser.TableExprs + // field Exprs github.com/vitess/vitess/go/vt/sqlparser.TableExprs { size += hack.RuntimeAllocSize(int64(cap(cached.Exprs)) * int64(16)) for _, elem := range cached.Exprs { @@ -3080,14 +3080,14 @@ func (cached *ParsedComments) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field comments github.com/mdibaiee/vitess/go/vt/sqlparser.Comments + // field comments github.com/vitess/vitess/go/vt/sqlparser.Comments { size += hack.RuntimeAllocSize(int64(cap(cached.comments)) * int64(16)) for _, elem := range cached.comments { size += hack.RuntimeAllocSize(int64(len(elem))) } } - // field _directives *github.com/mdibaiee/vitess/go/vt/sqlparser.CommentDirectives + // field _directives *github.com/vitess/vitess/go/vt/sqlparser.CommentDirectives size += cached._directives.CachedSize(true) return size } @@ -3101,7 +3101,7 @@ func (cached *ParsedQuery) CachedSize(alloc bool) int64 { } // field Query string size += hack.RuntimeAllocSize(int64(len(cached.Query))) - // field bindLocations []github.com/mdibaiee/vitess/go/vt/sqlparser.BindLocation + // field bindLocations []github.com/vitess/vitess/go/vt/sqlparser.BindLocation { size += hack.RuntimeAllocSize(int64(cap(cached.bindLocations)) * int64(16)) } @@ -3127,9 +3127,9 @@ func (cached *PartitionDefinition) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) - // field Options *github.com/mdibaiee/vitess/go/vt/sqlparser.PartitionDefinitionOptions + // field Options *github.com/vitess/vitess/go/vt/sqlparser.PartitionDefinitionOptions size += cached.Options.CachedSize(true) return size } @@ -3141,15 +3141,15 @@ func (cached *PartitionDefinitionOptions) CachedSize(alloc bool) int64 { if alloc { size += int64(96) } - // field ValueRange *github.com/mdibaiee/vitess/go/vt/sqlparser.PartitionValueRange + // field ValueRange *github.com/vitess/vitess/go/vt/sqlparser.PartitionValueRange size += cached.ValueRange.CachedSize(true) - // field Comment *github.com/mdibaiee/vitess/go/vt/sqlparser.Literal + // field Comment *github.com/vitess/vitess/go/vt/sqlparser.Literal size += cached.Comment.CachedSize(true) - // field Engine *github.com/mdibaiee/vitess/go/vt/sqlparser.PartitionEngine + // field Engine *github.com/vitess/vitess/go/vt/sqlparser.PartitionEngine size += cached.Engine.CachedSize(true) - // field DataDirectory *github.com/mdibaiee/vitess/go/vt/sqlparser.Literal + // field DataDirectory *github.com/vitess/vitess/go/vt/sqlparser.Literal size += cached.DataDirectory.CachedSize(true) - // field IndexDirectory *github.com/mdibaiee/vitess/go/vt/sqlparser.Literal + // field IndexDirectory *github.com/vitess/vitess/go/vt/sqlparser.Literal size += cached.IndexDirectory.CachedSize(true) // field MaxRows *int size += hack.RuntimeAllocSize(int64(8)) @@ -3157,7 +3157,7 @@ func (cached *PartitionDefinitionOptions) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(8)) // field TableSpace string size += hack.RuntimeAllocSize(int64(len(cached.TableSpace))) - // field SubPartitionDefinitions github.com/mdibaiee/vitess/go/vt/sqlparser.SubPartitionDefinitions + // field SubPartitionDefinitions github.com/vitess/vitess/go/vt/sqlparser.SubPartitionDefinitions { size += hack.RuntimeAllocSize(int64(cap(cached.SubPartitionDefinitions)) * int64(8)) for _, elem := range cached.SubPartitionDefinitions { @@ -3186,20 +3186,20 @@ func (cached *PartitionOption) CachedSize(alloc bool) int64 { if alloc { size += int64(96) } - // field ColList github.com/mdibaiee/vitess/go/vt/sqlparser.Columns + // field ColList github.com/vitess/vitess/go/vt/sqlparser.Columns { size += hack.RuntimeAllocSize(int64(cap(cached.ColList)) * int64(32)) for _, elem := range cached.ColList { size += elem.CachedSize(false) } } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field SubPartition *github.com/mdibaiee/vitess/go/vt/sqlparser.SubPartition + // field SubPartition *github.com/vitess/vitess/go/vt/sqlparser.SubPartition size += cached.SubPartition.CachedSize(true) - // field Definitions []*github.com/mdibaiee/vitess/go/vt/sqlparser.PartitionDefinition + // field Definitions []*github.com/vitess/vitess/go/vt/sqlparser.PartitionDefinition { size += hack.RuntimeAllocSize(int64(cap(cached.Definitions)) * int64(8)) for _, elem := range cached.Definitions { @@ -3216,18 +3216,18 @@ func (cached *PartitionSpec) CachedSize(alloc bool) int64 { if alloc { size += int64(112) } - // field Names github.com/mdibaiee/vitess/go/vt/sqlparser.Partitions + // field Names github.com/vitess/vitess/go/vt/sqlparser.Partitions { size += hack.RuntimeAllocSize(int64(cap(cached.Names)) * int64(32)) for _, elem := range cached.Names { size += elem.CachedSize(false) } } - // field Number *github.com/mdibaiee/vitess/go/vt/sqlparser.Literal + // field Number *github.com/vitess/vitess/go/vt/sqlparser.Literal size += cached.Number.CachedSize(true) - // field TableName github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field TableName github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.TableName.CachedSize(false) - // field Definitions []*github.com/mdibaiee/vitess/go/vt/sqlparser.PartitionDefinition + // field Definitions []*github.com/vitess/vitess/go/vt/sqlparser.PartitionDefinition { size += hack.RuntimeAllocSize(int64(cap(cached.Definitions)) * int64(8)) for _, elem := range cached.Definitions { @@ -3244,7 +3244,7 @@ func (cached *PartitionValueRange) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Range github.com/mdibaiee/vitess/go/vt/sqlparser.ValTuple + // field Range github.com/vitess/vitess/go/vt/sqlparser.ValTuple { size += hack.RuntimeAllocSize(int64(cap(cached.Range)) * int64(16)) for _, elem := range cached.Range { @@ -3263,7 +3263,7 @@ func (cached *PerformanceSchemaFuncExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Argument github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Argument github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Argument.(cachedObject); ok { size += cc.CachedSize(true) } @@ -3277,11 +3277,11 @@ func (cached *PointExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field XCordinate github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field XCordinate github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.XCordinate.(cachedObject); ok { size += cc.CachedSize(true) } - // field YCordinate github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field YCordinate github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.YCordinate.(cachedObject); ok { size += cc.CachedSize(true) } @@ -3295,11 +3295,11 @@ func (cached *PointPropertyFuncExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Point github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Point github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Point.(cachedObject); ok { size += cc.CachedSize(true) } - // field ValueToSet github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field ValueToSet github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.ValueToSet.(cachedObject); ok { size += cc.CachedSize(true) } @@ -3313,7 +3313,7 @@ func (cached *PolygonExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field LinestringParams github.com/mdibaiee/vitess/go/vt/sqlparser.Exprs + // field LinestringParams github.com/vitess/vitess/go/vt/sqlparser.Exprs { size += hack.RuntimeAllocSize(int64(cap(cached.LinestringParams)) * int64(16)) for _, elem := range cached.LinestringParams { @@ -3332,11 +3332,11 @@ func (cached *PolygonPropertyFuncExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Polygon github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Polygon github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Polygon.(cachedObject); ok { size += cc.CachedSize(true) } - // field PropertyDefArg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field PropertyDefArg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.PropertyDefArg.(cachedObject); ok { size += cc.CachedSize(true) } @@ -3350,13 +3350,13 @@ func (cached *PrepareStmt) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) - // field Statement github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Statement github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Statement.(cachedObject); ok { size += cc.CachedSize(true) } - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) return size } @@ -3382,9 +3382,9 @@ func (cached *ReferenceDefinition) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field ReferencedTable github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field ReferencedTable github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.ReferencedTable.CachedSize(false) - // field ReferencedColumns github.com/mdibaiee/vitess/go/vt/sqlparser.Columns + // field ReferencedColumns github.com/vitess/vitess/go/vt/sqlparser.Columns { size += hack.RuntimeAllocSize(int64(cap(cached.ReferencedColumns)) * int64(32)) for _, elem := range cached.ReferencedColumns { @@ -3401,27 +3401,27 @@ func (cached *RegexpInstrExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(96) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field Pattern github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Pattern github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Pattern.(cachedObject); ok { size += cc.CachedSize(true) } - // field Position github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Position github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Position.(cachedObject); ok { size += cc.CachedSize(true) } - // field Occurrence github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Occurrence github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Occurrence.(cachedObject); ok { size += cc.CachedSize(true) } - // field ReturnOption github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field ReturnOption github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.ReturnOption.(cachedObject); ok { size += cc.CachedSize(true) } - // field MatchType github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field MatchType github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.MatchType.(cachedObject); ok { size += cc.CachedSize(true) } @@ -3435,15 +3435,15 @@ func (cached *RegexpLikeExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field Pattern github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Pattern github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Pattern.(cachedObject); ok { size += cc.CachedSize(true) } - // field MatchType github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field MatchType github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.MatchType.(cachedObject); ok { size += cc.CachedSize(true) } @@ -3457,27 +3457,27 @@ func (cached *RegexpReplaceExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(96) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field Pattern github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Pattern github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Pattern.(cachedObject); ok { size += cc.CachedSize(true) } - // field Repl github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Repl github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Repl.(cachedObject); ok { size += cc.CachedSize(true) } - // field Occurrence github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Occurrence github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Occurrence.(cachedObject); ok { size += cc.CachedSize(true) } - // field Position github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Position github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Position.(cachedObject); ok { size += cc.CachedSize(true) } - // field MatchType github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field MatchType github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.MatchType.(cachedObject); ok { size += cc.CachedSize(true) } @@ -3491,23 +3491,23 @@ func (cached *RegexpSubstrExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field Pattern github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Pattern github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Pattern.(cachedObject); ok { size += cc.CachedSize(true) } - // field Occurrence github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Occurrence github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Occurrence.(cachedObject); ok { size += cc.CachedSize(true) } - // field Position github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Position github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Position.(cachedObject); ok { size += cc.CachedSize(true) } - // field MatchType github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field MatchType github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.MatchType.(cachedObject); ok { size += cc.CachedSize(true) } @@ -3521,7 +3521,7 @@ func (cached *Release) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) return size } @@ -3533,9 +3533,9 @@ func (cached *RenameColumn) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field OldName *github.com/mdibaiee/vitess/go/vt/sqlparser.ColName + // field OldName *github.com/vitess/vitess/go/vt/sqlparser.ColName size += cached.OldName.CachedSize(true) - // field NewName *github.com/mdibaiee/vitess/go/vt/sqlparser.ColName + // field NewName *github.com/vitess/vitess/go/vt/sqlparser.ColName size += cached.NewName.CachedSize(true) return size } @@ -3547,9 +3547,9 @@ func (cached *RenameIndex) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field OldName github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field OldName github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.OldName.CachedSize(false) - // field NewName github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field NewName github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.NewName.CachedSize(false) return size } @@ -3561,7 +3561,7 @@ func (cached *RenameTable) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field TablePairs []*github.com/mdibaiee/vitess/go/vt/sqlparser.RenameTablePair + // field TablePairs []*github.com/vitess/vitess/go/vt/sqlparser.RenameTablePair { size += hack.RuntimeAllocSize(int64(cap(cached.TablePairs)) * int64(8)) for _, elem := range cached.TablePairs { @@ -3578,7 +3578,7 @@ func (cached *RenameTableName) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Table github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field Table github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.Table.CachedSize(false) return size } @@ -3590,9 +3590,9 @@ func (cached *RenameTablePair) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field FromTable github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field FromTable github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.FromTable.CachedSize(false) - // field ToTable github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field ToTable github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.ToTable.CachedSize(false) return size } @@ -3606,7 +3606,7 @@ func (cached *RevertMigration) CachedSize(alloc bool) int64 { } // field UUID string size += hack.RuntimeAllocSize(int64(len(cached.UUID))) - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) return size } @@ -3618,9 +3618,9 @@ func (cached *RowAlias) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field TableName github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCS + // field TableName github.com/vitess/vitess/go/vt/sqlparser.IdentifierCS size += cached.TableName.CachedSize(false) - // field Columns github.com/mdibaiee/vitess/go/vt/sqlparser.Columns + // field Columns github.com/vitess/vitess/go/vt/sqlparser.Columns { size += hack.RuntimeAllocSize(int64(cap(cached.Columns)) * int64(32)) for _, elem := range cached.Columns { @@ -3637,7 +3637,7 @@ func (cached *SRollback) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) return size } @@ -3649,7 +3649,7 @@ func (cached *Savepoint) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) return size } @@ -3663,9 +3663,9 @@ func (cached *Select) CachedSize(alloc bool) int64 { } // field Cache *bool size += hack.RuntimeAllocSize(int64(1)) - // field With *github.com/mdibaiee/vitess/go/vt/sqlparser.With + // field With *github.com/vitess/vitess/go/vt/sqlparser.With size += cached.With.CachedSize(true) - // field From []github.com/mdibaiee/vitess/go/vt/sqlparser.TableExpr + // field From []github.com/vitess/vitess/go/vt/sqlparser.TableExpr { size += hack.RuntimeAllocSize(int64(cap(cached.From)) * int64(16)) for _, elem := range cached.From { @@ -3674,9 +3674,9 @@ func (cached *Select) CachedSize(alloc bool) int64 { } } } - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) - // field SelectExprs github.com/mdibaiee/vitess/go/vt/sqlparser.SelectExprs + // field SelectExprs github.com/vitess/vitess/go/vt/sqlparser.SelectExprs { size += hack.RuntimeAllocSize(int64(cap(cached.SelectExprs)) * int64(16)) for _, elem := range cached.SelectExprs { @@ -3685,29 +3685,29 @@ func (cached *Select) CachedSize(alloc bool) int64 { } } } - // field Where *github.com/mdibaiee/vitess/go/vt/sqlparser.Where + // field Where *github.com/vitess/vitess/go/vt/sqlparser.Where size += cached.Where.CachedSize(true) - // field GroupBy *github.com/mdibaiee/vitess/go/vt/sqlparser.GroupBy + // field GroupBy *github.com/vitess/vitess/go/vt/sqlparser.GroupBy size += cached.GroupBy.CachedSize(true) - // field Having *github.com/mdibaiee/vitess/go/vt/sqlparser.Where + // field Having *github.com/vitess/vitess/go/vt/sqlparser.Where size += cached.Having.CachedSize(true) - // field Windows github.com/mdibaiee/vitess/go/vt/sqlparser.NamedWindows + // field Windows github.com/vitess/vitess/go/vt/sqlparser.NamedWindows { size += hack.RuntimeAllocSize(int64(cap(cached.Windows)) * int64(8)) for _, elem := range cached.Windows { size += elem.CachedSize(true) } } - // field OrderBy github.com/mdibaiee/vitess/go/vt/sqlparser.OrderBy + // field OrderBy github.com/vitess/vitess/go/vt/sqlparser.OrderBy { size += hack.RuntimeAllocSize(int64(cap(cached.OrderBy)) * int64(8)) for _, elem := range cached.OrderBy { size += elem.CachedSize(true) } } - // field Limit *github.com/mdibaiee/vitess/go/vt/sqlparser.Limit + // field Limit *github.com/vitess/vitess/go/vt/sqlparser.Limit size += cached.Limit.CachedSize(true) - // field Into *github.com/mdibaiee/vitess/go/vt/sqlparser.SelectInto + // field Into *github.com/vitess/vitess/go/vt/sqlparser.SelectInto size += cached.Into.CachedSize(true) return size } @@ -3721,7 +3721,7 @@ func (cached *SelectInto) CachedSize(alloc bool) int64 { } // field FileName string size += hack.RuntimeAllocSize(int64(len(cached.FileName))) - // field Charset github.com/mdibaiee/vitess/go/vt/sqlparser.ColumnCharset + // field Charset github.com/vitess/vitess/go/vt/sqlparser.ColumnCharset size += cached.Charset.CachedSize(false) // field FormatOption string size += hack.RuntimeAllocSize(int64(len(cached.FormatOption))) @@ -3741,9 +3741,9 @@ func (cached *Set) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) - // field Exprs github.com/mdibaiee/vitess/go/vt/sqlparser.SetExprs + // field Exprs github.com/vitess/vitess/go/vt/sqlparser.SetExprs { size += hack.RuntimeAllocSize(int64(cap(cached.Exprs)) * int64(8)) for _, elem := range cached.Exprs { @@ -3760,9 +3760,9 @@ func (cached *SetExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Var *github.com/mdibaiee/vitess/go/vt/sqlparser.Variable + // field Var *github.com/vitess/vitess/go/vt/sqlparser.Variable size += cached.Var.CachedSize(true) - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -3776,7 +3776,7 @@ func (cached *Show) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field Internal github.com/mdibaiee/vitess/go/vt/sqlparser.ShowInternal + // field Internal github.com/vitess/vitess/go/vt/sqlparser.ShowInternal if cc, ok := cached.Internal.(cachedObject); ok { size += cc.CachedSize(true) } @@ -3790,11 +3790,11 @@ func (cached *ShowBasic) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Tbl github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field Tbl github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.Tbl.CachedSize(false) - // field DbName github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCS + // field DbName github.com/vitess/vitess/go/vt/sqlparser.IdentifierCS size += cached.DbName.CachedSize(false) - // field Filter *github.com/mdibaiee/vitess/go/vt/sqlparser.ShowFilter + // field Filter *github.com/vitess/vitess/go/vt/sqlparser.ShowFilter size += cached.Filter.CachedSize(true) return size } @@ -3806,7 +3806,7 @@ func (cached *ShowCreate) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Op github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field Op github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.Op.CachedSize(false) return size } @@ -3820,7 +3820,7 @@ func (cached *ShowFilter) CachedSize(alloc bool) int64 { } // field Like string size += hack.RuntimeAllocSize(int64(len(cached.Like))) - // field Filter github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Filter github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Filter.(cachedObject); ok { size += cc.CachedSize(true) } @@ -3836,7 +3836,7 @@ func (cached *ShowMigrationLogs) CachedSize(alloc bool) int64 { } // field UUID string size += hack.RuntimeAllocSize(int64(len(cached.UUID))) - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) return size } @@ -3860,7 +3860,7 @@ func (cached *ShowThrottledApps) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Comments github.com/mdibaiee/vitess/go/vt/sqlparser.Comments + // field Comments github.com/vitess/vitess/go/vt/sqlparser.Comments { size += hack.RuntimeAllocSize(int64(cap(cached.Comments)) * int64(16)) for _, elem := range cached.Comments { @@ -3877,7 +3877,7 @@ func (cached *ShowThrottlerStatus) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Comments github.com/mdibaiee/vitess/go/vt/sqlparser.Comments + // field Comments github.com/vitess/vitess/go/vt/sqlparser.Comments { size += hack.RuntimeAllocSize(int64(cap(cached.Comments)) * int64(16)) for _, elem := range cached.Comments { @@ -3894,7 +3894,7 @@ func (cached *StarExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field TableName github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field TableName github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.TableName.CachedSize(false) return size } @@ -3906,11 +3906,11 @@ func (cached *Std) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Arg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Arg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Arg.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -3922,11 +3922,11 @@ func (cached *StdDev) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Arg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Arg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Arg.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -3938,11 +3938,11 @@ func (cached *StdPop) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Arg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Arg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Arg.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -3954,11 +3954,11 @@ func (cached *StdSamp) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Arg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Arg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Arg.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -3970,13 +3970,13 @@ func (cached *Stream) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) - // field SelectExpr github.com/mdibaiee/vitess/go/vt/sqlparser.SelectExpr + // field SelectExpr github.com/vitess/vitess/go/vt/sqlparser.SelectExpr if cc, ok := cached.SelectExpr.(cachedObject); ok { size += cc.CachedSize(true) } - // field Table github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field Table github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.Table.CachedSize(false) return size } @@ -3988,14 +3988,14 @@ func (cached *SubPartition) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field ColList github.com/mdibaiee/vitess/go/vt/sqlparser.Columns + // field ColList github.com/vitess/vitess/go/vt/sqlparser.Columns { size += hack.RuntimeAllocSize(int64(cap(cached.ColList)) * int64(32)) for _, elem := range cached.ColList { size += elem.CachedSize(false) } } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -4009,9 +4009,9 @@ func (cached *SubPartitionDefinition) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) - // field Options *github.com/mdibaiee/vitess/go/vt/sqlparser.SubPartitionDefinitionOptions + // field Options *github.com/vitess/vitess/go/vt/sqlparser.SubPartitionDefinitionOptions size += cached.Options.CachedSize(true) return size } @@ -4023,13 +4023,13 @@ func (cached *SubPartitionDefinitionOptions) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Comment *github.com/mdibaiee/vitess/go/vt/sqlparser.Literal + // field Comment *github.com/vitess/vitess/go/vt/sqlparser.Literal size += cached.Comment.CachedSize(true) - // field Engine *github.com/mdibaiee/vitess/go/vt/sqlparser.PartitionEngine + // field Engine *github.com/vitess/vitess/go/vt/sqlparser.PartitionEngine size += cached.Engine.CachedSize(true) - // field DataDirectory *github.com/mdibaiee/vitess/go/vt/sqlparser.Literal + // field DataDirectory *github.com/vitess/vitess/go/vt/sqlparser.Literal size += cached.DataDirectory.CachedSize(true) - // field IndexDirectory *github.com/mdibaiee/vitess/go/vt/sqlparser.Literal + // field IndexDirectory *github.com/vitess/vitess/go/vt/sqlparser.Literal size += cached.IndexDirectory.CachedSize(true) // field MaxRows *int size += hack.RuntimeAllocSize(int64(8)) @@ -4047,7 +4047,7 @@ func (cached *Subquery) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field Select github.com/mdibaiee/vitess/go/vt/sqlparser.SelectStatement + // field Select github.com/vitess/vitess/go/vt/sqlparser.SelectStatement if cc, ok := cached.Select.(cachedObject); ok { size += cc.CachedSize(true) } @@ -4061,15 +4061,15 @@ func (cached *SubstrExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Name github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Name.(cachedObject); ok { size += cc.CachedSize(true) } - // field From github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field From github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.From.(cachedObject); ok { size += cc.CachedSize(true) } - // field To github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field To github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.To.(cachedObject); ok { size += cc.CachedSize(true) } @@ -4083,11 +4083,11 @@ func (cached *Sum) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Arg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Arg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Arg.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -4099,7 +4099,7 @@ func (cached *TableAndLockType) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Table github.com/mdibaiee/vitess/go/vt/sqlparser.TableExpr + // field Table github.com/vitess/vitess/go/vt/sqlparser.TableExpr if cc, ok := cached.Table.(cachedObject); ok { size += cc.CachedSize(true) } @@ -4113,9 +4113,9 @@ func (cached *TableName) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCS + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCS size += cached.Name.CachedSize(false) - // field Qualifier github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCS + // field Qualifier github.com/vitess/vitess/go/vt/sqlparser.IdentifierCS size += cached.Qualifier.CachedSize(false) return size } @@ -4129,11 +4129,11 @@ func (cached *TableOption) CachedSize(alloc bool) int64 { } // field Name string size += hack.RuntimeAllocSize(int64(len(cached.Name))) - // field Value *github.com/mdibaiee/vitess/go/vt/sqlparser.Literal + // field Value *github.com/vitess/vitess/go/vt/sqlparser.Literal size += cached.Value.CachedSize(true) // field String string size += hack.RuntimeAllocSize(int64(len(cached.String))) - // field Tables github.com/mdibaiee/vitess/go/vt/sqlparser.TableNames + // field Tables github.com/vitess/vitess/go/vt/sqlparser.TableNames { size += hack.RuntimeAllocSize(int64(cap(cached.Tables)) * int64(32)) for _, elem := range cached.Tables { @@ -4150,35 +4150,35 @@ func (cached *TableSpec) CachedSize(alloc bool) int64 { if alloc { size += int64(112) } - // field Columns []*github.com/mdibaiee/vitess/go/vt/sqlparser.ColumnDefinition + // field Columns []*github.com/vitess/vitess/go/vt/sqlparser.ColumnDefinition { size += hack.RuntimeAllocSize(int64(cap(cached.Columns)) * int64(8)) for _, elem := range cached.Columns { size += elem.CachedSize(true) } } - // field Indexes []*github.com/mdibaiee/vitess/go/vt/sqlparser.IndexDefinition + // field Indexes []*github.com/vitess/vitess/go/vt/sqlparser.IndexDefinition { size += hack.RuntimeAllocSize(int64(cap(cached.Indexes)) * int64(8)) for _, elem := range cached.Indexes { size += elem.CachedSize(true) } } - // field Constraints []*github.com/mdibaiee/vitess/go/vt/sqlparser.ConstraintDefinition + // field Constraints []*github.com/vitess/vitess/go/vt/sqlparser.ConstraintDefinition { size += hack.RuntimeAllocSize(int64(cap(cached.Constraints)) * int64(8)) for _, elem := range cached.Constraints { size += elem.CachedSize(true) } } - // field Options github.com/mdibaiee/vitess/go/vt/sqlparser.TableOptions + // field Options github.com/vitess/vitess/go/vt/sqlparser.TableOptions { size += hack.RuntimeAllocSize(int64(cap(cached.Options)) * int64(8)) for _, elem := range cached.Options { size += elem.CachedSize(true) } } - // field PartitionOption *github.com/mdibaiee/vitess/go/vt/sqlparser.PartitionOption + // field PartitionOption *github.com/vitess/vitess/go/vt/sqlparser.PartitionOption size += cached.PartitionOption.CachedSize(true) return size } @@ -4200,11 +4200,11 @@ func (cached *TimestampDiffExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Expr1 github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr1 github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr1.(cachedObject); ok { size += cc.CachedSize(true) } - // field Expr2 github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr2 github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr2.(cachedObject); ok { size += cc.CachedSize(true) } @@ -4218,11 +4218,11 @@ func (cached *TrimFuncExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field TrimArg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field TrimArg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.TrimArg.(cachedObject); ok { size += cc.CachedSize(true) } - // field StringArg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field StringArg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.StringArg.(cachedObject); ok { size += cc.CachedSize(true) } @@ -4236,7 +4236,7 @@ func (cached *TruncateTable) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Table github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field Table github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.Table.CachedSize(false) return size } @@ -4248,7 +4248,7 @@ func (cached *UnaryExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -4262,26 +4262,26 @@ func (cached *Union) CachedSize(alloc bool) int64 { if alloc { size += int64(96) } - // field With *github.com/mdibaiee/vitess/go/vt/sqlparser.With + // field With *github.com/vitess/vitess/go/vt/sqlparser.With size += cached.With.CachedSize(true) - // field Left github.com/mdibaiee/vitess/go/vt/sqlparser.SelectStatement + // field Left github.com/vitess/vitess/go/vt/sqlparser.SelectStatement if cc, ok := cached.Left.(cachedObject); ok { size += cc.CachedSize(true) } - // field Right github.com/mdibaiee/vitess/go/vt/sqlparser.SelectStatement + // field Right github.com/vitess/vitess/go/vt/sqlparser.SelectStatement if cc, ok := cached.Right.(cachedObject); ok { size += cc.CachedSize(true) } - // field OrderBy github.com/mdibaiee/vitess/go/vt/sqlparser.OrderBy + // field OrderBy github.com/vitess/vitess/go/vt/sqlparser.OrderBy { size += hack.RuntimeAllocSize(int64(cap(cached.OrderBy)) * int64(8)) for _, elem := range cached.OrderBy { size += elem.CachedSize(true) } } - // field Limit *github.com/mdibaiee/vitess/go/vt/sqlparser.Limit + // field Limit *github.com/vitess/vitess/go/vt/sqlparser.Limit size += cached.Limit.CachedSize(true) - // field Into *github.com/mdibaiee/vitess/go/vt/sqlparser.SelectInto + // field Into *github.com/vitess/vitess/go/vt/sqlparser.SelectInto size += cached.Into.CachedSize(true) return size } @@ -4293,11 +4293,11 @@ func (cached *Update) CachedSize(alloc bool) int64 { if alloc { size += int64(112) } - // field With *github.com/mdibaiee/vitess/go/vt/sqlparser.With + // field With *github.com/vitess/vitess/go/vt/sqlparser.With size += cached.With.CachedSize(true) - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) - // field TableExprs []github.com/mdibaiee/vitess/go/vt/sqlparser.TableExpr + // field TableExprs []github.com/vitess/vitess/go/vt/sqlparser.TableExpr { size += hack.RuntimeAllocSize(int64(cap(cached.TableExprs)) * int64(16)) for _, elem := range cached.TableExprs { @@ -4306,23 +4306,23 @@ func (cached *Update) CachedSize(alloc bool) int64 { } } } - // field Exprs github.com/mdibaiee/vitess/go/vt/sqlparser.UpdateExprs + // field Exprs github.com/vitess/vitess/go/vt/sqlparser.UpdateExprs { size += hack.RuntimeAllocSize(int64(cap(cached.Exprs)) * int64(8)) for _, elem := range cached.Exprs { size += elem.CachedSize(true) } } - // field Where *github.com/mdibaiee/vitess/go/vt/sqlparser.Where + // field Where *github.com/vitess/vitess/go/vt/sqlparser.Where size += cached.Where.CachedSize(true) - // field OrderBy github.com/mdibaiee/vitess/go/vt/sqlparser.OrderBy + // field OrderBy github.com/vitess/vitess/go/vt/sqlparser.OrderBy { size += hack.RuntimeAllocSize(int64(cap(cached.OrderBy)) * int64(8)) for _, elem := range cached.OrderBy { size += elem.CachedSize(true) } } - // field Limit *github.com/mdibaiee/vitess/go/vt/sqlparser.Limit + // field Limit *github.com/vitess/vitess/go/vt/sqlparser.Limit size += cached.Limit.CachedSize(true) return size } @@ -4334,9 +4334,9 @@ func (cached *UpdateExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Name *github.com/mdibaiee/vitess/go/vt/sqlparser.ColName + // field Name *github.com/vitess/vitess/go/vt/sqlparser.ColName size += cached.Name.CachedSize(true) - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -4350,15 +4350,15 @@ func (cached *UpdateXMLExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Target github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Target github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Target.(cachedObject); ok { size += cc.CachedSize(true) } - // field XPathExpr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field XPathExpr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.XPathExpr.(cachedObject); ok { size += cc.CachedSize(true) } - // field NewXML github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field NewXML github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.NewXML.(cachedObject); ok { size += cc.CachedSize(true) } @@ -4372,7 +4372,7 @@ func (cached *Use) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field DBName github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCS + // field DBName github.com/vitess/vitess/go/vt/sqlparser.IdentifierCS size += cached.DBName.CachedSize(false) return size } @@ -4384,11 +4384,11 @@ func (cached *VExplainStmt) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Statement github.com/mdibaiee/vitess/go/vt/sqlparser.Statement + // field Statement github.com/vitess/vitess/go/vt/sqlparser.Statement if cc, ok := cached.Statement.(cachedObject); ok { size += cc.CachedSize(true) } - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) return size } @@ -4400,17 +4400,17 @@ func (cached *VStream) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field Comments *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedComments + // field Comments *github.com/vitess/vitess/go/vt/sqlparser.ParsedComments size += cached.Comments.CachedSize(true) - // field SelectExpr github.com/mdibaiee/vitess/go/vt/sqlparser.SelectExpr + // field SelectExpr github.com/vitess/vitess/go/vt/sqlparser.SelectExpr if cc, ok := cached.SelectExpr.(cachedObject); ok { size += cc.CachedSize(true) } - // field Table github.com/mdibaiee/vitess/go/vt/sqlparser.TableName + // field Table github.com/vitess/vitess/go/vt/sqlparser.TableName size += cached.Table.CachedSize(false) - // field Where *github.com/mdibaiee/vitess/go/vt/sqlparser.Where + // field Where *github.com/vitess/vitess/go/vt/sqlparser.Where size += cached.Where.CachedSize(true) - // field Limit *github.com/mdibaiee/vitess/go/vt/sqlparser.Limit + // field Limit *github.com/vitess/vitess/go/vt/sqlparser.Limit size += cached.Limit.CachedSize(true) return size } @@ -4432,7 +4432,7 @@ func (cached *ValuesFuncExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(8) } - // field Name *github.com/mdibaiee/vitess/go/vt/sqlparser.ColName + // field Name *github.com/vitess/vitess/go/vt/sqlparser.ColName size += cached.Name.CachedSize(true) return size } @@ -4444,11 +4444,11 @@ func (cached *VarPop) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Arg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Arg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Arg.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -4460,11 +4460,11 @@ func (cached *VarSamp) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Arg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Arg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Arg.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -4476,7 +4476,7 @@ func (cached *Variable) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) return size } @@ -4488,11 +4488,11 @@ func (cached *Variance) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Arg github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Arg github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Arg.(cachedObject); ok { size += cc.CachedSize(true) } - // field OverClause *github.com/mdibaiee/vitess/go/vt/sqlparser.OverClause + // field OverClause *github.com/vitess/vitess/go/vt/sqlparser.OverClause size += cached.OverClause.CachedSize(true) return size } @@ -4504,7 +4504,7 @@ func (cached *VindexParam) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Key github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Key github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Key.CachedSize(false) // field Val string size += hack.RuntimeAllocSize(int64(len(cached.Val))) @@ -4518,11 +4518,11 @@ func (cached *VindexSpec) CachedSize(alloc bool) int64 { if alloc { size += int64(96) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) - // field Type github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Type github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Type.CachedSize(false) - // field Params []github.com/mdibaiee/vitess/go/vt/sqlparser.VindexParam + // field Params []github.com/vitess/vitess/go/vt/sqlparser.VindexParam { size += hack.RuntimeAllocSize(int64(cap(cached.Params)) * int64(48)) for _, elem := range cached.Params { @@ -4539,11 +4539,11 @@ func (cached *WeightStringFuncExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field As *github.com/mdibaiee/vitess/go/vt/sqlparser.ConvertType + // field As *github.com/vitess/vitess/go/vt/sqlparser.ConvertType size += cached.As.CachedSize(true) return size } @@ -4555,11 +4555,11 @@ func (cached *When) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Cond github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Cond github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Cond.(cachedObject); ok { size += cc.CachedSize(true) } - // field Val github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Val github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Val.(cachedObject); ok { size += cc.CachedSize(true) } @@ -4573,7 +4573,7 @@ func (cached *Where) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -4587,9 +4587,9 @@ func (cached *WindowDefinition) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) - // field WindowSpec *github.com/mdibaiee/vitess/go/vt/sqlparser.WindowSpecification + // field WindowSpec *github.com/vitess/vitess/go/vt/sqlparser.WindowSpecification size += cached.WindowSpec.CachedSize(true) return size } @@ -4601,9 +4601,9 @@ func (cached *WindowSpecification) CachedSize(alloc bool) int64 { if alloc { size += int64(96) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI size += cached.Name.CachedSize(false) - // field PartitionClause github.com/mdibaiee/vitess/go/vt/sqlparser.Exprs + // field PartitionClause github.com/vitess/vitess/go/vt/sqlparser.Exprs { size += hack.RuntimeAllocSize(int64(cap(cached.PartitionClause)) * int64(16)) for _, elem := range cached.PartitionClause { @@ -4612,14 +4612,14 @@ func (cached *WindowSpecification) CachedSize(alloc bool) int64 { } } } - // field OrderClause github.com/mdibaiee/vitess/go/vt/sqlparser.OrderBy + // field OrderClause github.com/vitess/vitess/go/vt/sqlparser.OrderBy { size += hack.RuntimeAllocSize(int64(cap(cached.OrderClause)) * int64(8)) for _, elem := range cached.OrderClause { size += elem.CachedSize(true) } } - // field FrameClause *github.com/mdibaiee/vitess/go/vt/sqlparser.FrameClause + // field FrameClause *github.com/vitess/vitess/go/vt/sqlparser.FrameClause size += cached.FrameClause.CachedSize(true) return size } @@ -4631,7 +4631,7 @@ func (cached *With) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field CTEs []*github.com/mdibaiee/vitess/go/vt/sqlparser.CommonTableExpr + // field CTEs []*github.com/vitess/vitess/go/vt/sqlparser.CommonTableExpr { size += hack.RuntimeAllocSize(int64(cap(cached.CTEs)) * int64(8)) for _, elem := range cached.CTEs { @@ -4648,11 +4648,11 @@ func (cached *XorExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Left github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Left github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Left.(cachedObject); ok { size += cc.CachedSize(true) } - // field Right github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Right github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Right.(cachedObject); ok { size += cc.CachedSize(true) } diff --git a/go/vt/sqlparser/comments.go b/go/vt/sqlparser/comments.go index 0aa284be43c..46a8845e0e3 100644 --- a/go/vt/sqlparser/comments.go +++ b/go/vt/sqlparser/comments.go @@ -22,11 +22,11 @@ import ( "strings" "unicode" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sysvars" - "github.com/mdibaiee/vitess/go/vt/vterrors" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sysvars" + "github.com/vitess/vitess/go/vt/vterrors" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) const ( diff --git a/go/vt/sqlparser/comments_test.go b/go/vt/sqlparser/comments_test.go index d76a00dfe96..2070d740ba6 100644 --- a/go/vt/sqlparser/comments_test.go +++ b/go/vt/sqlparser/comments_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sysvars" + "github.com/vitess/vitess/go/vt/sysvars" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestSplitComments(t *testing.T) { diff --git a/go/vt/sqlparser/constants.go b/go/vt/sqlparser/constants.go index 63d7c6c28a9..df52da1df5d 100644 --- a/go/vt/sqlparser/constants.go +++ b/go/vt/sqlparser/constants.go @@ -16,7 +16,7 @@ limitations under the License. package sqlparser -import "github.com/mdibaiee/vitess/go/mysql/datetime" +import "github.com/vitess/vitess/go/mysql/datetime" // String constants to be used in ast. const ( diff --git a/go/vt/sqlparser/encodable.go b/go/vt/sqlparser/encodable.go index 6204e2ae2c2..80e685c930b 100644 --- a/go/vt/sqlparser/encodable.go +++ b/go/vt/sqlparser/encodable.go @@ -19,7 +19,7 @@ package sqlparser import ( "strings" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) // This file contains types that are 'Encodable'. diff --git a/go/vt/sqlparser/encodable_test.go b/go/vt/sqlparser/encodable_test.go index 4d4a84bc6bf..0041b1e4b7d 100644 --- a/go/vt/sqlparser/encodable_test.go +++ b/go/vt/sqlparser/encodable_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) func TestEncodable(t *testing.T) { diff --git a/go/vt/sqlparser/generate.go b/go/vt/sqlparser/generate.go index e036bd5ecc2..506f3ce8a5c 100644 --- a/go/vt/sqlparser/generate.go +++ b/go/vt/sqlparser/generate.go @@ -19,5 +19,5 @@ package sqlparser // Generate all the AST helpers using the tooling in `go/tools` //go:generate go run ./goyacc -fo sql.go sql.y -//go:generate go run ../../tools/asthelpergen/main --in . --iface github.com/mdibaiee/vitess/go/vt/sqlparser.SQLNode --clone_exclude "*ColName" --equals_custom "*ColName" -//go:generate go run ../../tools/astfmtgen github.com/mdibaiee/vitess/go/vt/sqlparser/... +//go:generate go run ../../tools/asthelpergen/main --in . --iface github.com/vitess/vitess/go/vt/sqlparser.SQLNode --clone_exclude "*ColName" --equals_custom "*ColName" +//go:generate go run ../../tools/astfmtgen github.com/vitess/vitess/go/vt/sqlparser/... diff --git a/go/vt/sqlparser/goyacc/goyacc.go b/go/vt/sqlparser/goyacc/goyacc.go index e568c7e2733..da95ddcfdc0 100644 --- a/go/vt/sqlparser/goyacc/goyacc.go +++ b/go/vt/sqlparser/goyacc/goyacc.go @@ -58,7 +58,7 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/tools/codegen" + "github.com/vitess/vitess/go/tools/codegen" ) // the following are adjustable diff --git a/go/vt/sqlparser/literal.go b/go/vt/sqlparser/literal.go index f722b1764b2..a19d205371b 100644 --- a/go/vt/sqlparser/literal.go +++ b/go/vt/sqlparser/literal.go @@ -22,12 +22,12 @@ import ( "math" "math/big" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/mysql/datetime" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/mysql/fastparse" - "github.com/mdibaiee/vitess/go/mysql/hex" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/mysql/datetime" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/fastparse" + "github.com/vitess/vitess/go/mysql/hex" + "github.com/vitess/vitess/go/sqltypes" ) func LiteralToValue(lit *Literal) (sqltypes.Value, error) { diff --git a/go/vt/sqlparser/normalizer.go b/go/vt/sqlparser/normalizer.go index 6b0f2c52cb6..b3990ca156b 100644 --- a/go/vt/sqlparser/normalizer.go +++ b/go/vt/sqlparser/normalizer.go @@ -19,12 +19,12 @@ package sqlparser import ( "bytes" - "github.com/mdibaiee/vitess/go/mysql/datetime" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/datetime" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // BindVars is a set of reserved bind variables from a SQL statement diff --git a/go/vt/sqlparser/normalizer_test.go b/go/vt/sqlparser/normalizer_test.go index a503e9312a3..08e4c5ac674 100644 --- a/go/vt/sqlparser/normalizer_test.go +++ b/go/vt/sqlparser/normalizer_test.go @@ -29,10 +29,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) func TestNormalize(t *testing.T) { diff --git a/go/vt/sqlparser/parse_table.go b/go/vt/sqlparser/parse_table.go index c82d285e26f..d595154f9d8 100644 --- a/go/vt/sqlparser/parse_table.go +++ b/go/vt/sqlparser/parse_table.go @@ -17,8 +17,8 @@ limitations under the License. package sqlparser import ( - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // ParseTable parses the input as a qualified table name. diff --git a/go/vt/sqlparser/parse_test.go b/go/vt/sqlparser/parse_test.go index d84e60053d6..c0b6c1d27cd 100644 --- a/go/vt/sqlparser/parse_test.go +++ b/go/vt/sqlparser/parse_test.go @@ -32,7 +32,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" ) var ( diff --git a/go/vt/sqlparser/parsed_query.go b/go/vt/sqlparser/parsed_query.go index 251e8be7371..6571a2d81d8 100644 --- a/go/vt/sqlparser/parsed_query.go +++ b/go/vt/sqlparser/parsed_query.go @@ -21,8 +21,8 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // ParsedQuery represents a parsed query where diff --git a/go/vt/sqlparser/parsed_query_test.go b/go/vt/sqlparser/parsed_query_test.go index e24d2be4beb..fabd86a4038 100644 --- a/go/vt/sqlparser/parsed_query_test.go +++ b/go/vt/sqlparser/parsed_query_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" "github.com/stretchr/testify/assert" ) diff --git a/go/vt/sqlparser/parser.go b/go/vt/sqlparser/parser.go index bd03bf607a9..e9e271cb0a6 100644 --- a/go/vt/sqlparser/parser.go +++ b/go/vt/sqlparser/parser.go @@ -24,11 +24,11 @@ import ( "strings" "sync" - "github.com/mdibaiee/vitess/go/mysql/config" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/config" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vterrors" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // parserPool is a pool for parser objects. diff --git a/go/vt/sqlparser/redact_query.go b/go/vt/sqlparser/redact_query.go index 799d9bb877f..d0f88a0109b 100644 --- a/go/vt/sqlparser/redact_query.go +++ b/go/vt/sqlparser/redact_query.go @@ -16,7 +16,7 @@ limitations under the License. package sqlparser -import querypb "github.com/mdibaiee/vitess/go/vt/proto/query" +import querypb "github.com/vitess/vitess/go/vt/proto/query" // RedactSQLQuery returns a sql string with the params stripped out for display func (p *Parser) RedactSQLQuery(sql string) (string, error) { diff --git a/go/vt/sqlparser/sql.go b/go/vt/sqlparser/sql.go index fe98db79fc8..bc2cbb86201 100644 --- a/go/vt/sqlparser/sql.go +++ b/go/vt/sqlparser/sql.go @@ -7,7 +7,7 @@ import ( __yyfmt__ "fmt" __yyunsafe__ "unsafe" - "github.com/mdibaiee/vitess/go/ptr" + "github.com/vitess/vitess/go/ptr" ) //line sql.y:17 diff --git a/go/vt/sqlparser/sql.y b/go/vt/sqlparser/sql.y index 32f5c25e16b..1b9ded1661f 100644 --- a/go/vt/sqlparser/sql.y +++ b/go/vt/sqlparser/sql.y @@ -16,7 +16,7 @@ limitations under the License. %{ package sqlparser -import "github.com/mdibaiee/vitess/go/ptr" +import "github.com/vitess/vitess/go/ptr" func setParseTree(yylex yyLexer, stmt Statement) { yylex.(*Tokenizer).ParseTree = stmt diff --git a/go/vt/sqlparser/token.go b/go/vt/sqlparser/token.go index 2070778d578..538ad25ac64 100644 --- a/go/vt/sqlparser/token.go +++ b/go/vt/sqlparser/token.go @@ -21,7 +21,7 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) const ( diff --git a/go/vt/sqlparser/utils.go b/go/vt/sqlparser/utils.go index c99e1bdea05..86007056606 100644 --- a/go/vt/sqlparser/utils.go +++ b/go/vt/sqlparser/utils.go @@ -21,7 +21,7 @@ import ( "sort" "strings" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // QueryMatchesTemplates sees if the given query has the same fingerprint as one of the given templates diff --git a/go/vt/srvtopo/cached_size.go b/go/vt/srvtopo/cached_size.go index d7d20331cc0..d0a55367fff 100644 --- a/go/vt/srvtopo/cached_size.go +++ b/go/vt/srvtopo/cached_size.go @@ -29,9 +29,9 @@ func (cached *ResolvedShard) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Target *github.com/mdibaiee/vitess/go/vt/proto/query.Target + // field Target *github.com/vitess/vitess/go/vt/proto/query.Target size += cached.Target.CachedSize(true) - // field Gateway github.com/mdibaiee/vitess/go/vt/srvtopo.Gateway + // field Gateway github.com/vitess/vitess/go/vt/srvtopo.Gateway if cc, ok := cached.Gateway.(cachedObject); ok { size += cc.CachedSize(true) } diff --git a/go/vt/srvtopo/discover.go b/go/vt/srvtopo/discover.go index d5e20cf5493..faf52875a77 100644 --- a/go/vt/srvtopo/discover.go +++ b/go/vt/srvtopo/discover.go @@ -21,12 +21,12 @@ import ( "context" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // FindAllTargets goes through all serving shards in the topology for the provided keyspaces diff --git a/go/vt/srvtopo/discover_test.go b/go/vt/srvtopo/discover_test.go index 703ddbe8228..49d07053a65 100644 --- a/go/vt/srvtopo/discover_test.go +++ b/go/vt/srvtopo/discover_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/topo/memorytopo" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // To sort []*querypb.Target for comparison. diff --git a/go/vt/srvtopo/keyspace_filtering_server.go b/go/vt/srvtopo/keyspace_filtering_server.go index f9a7c38c14e..ffad9f0c7a9 100644 --- a/go/vt/srvtopo/keyspace_filtering_server.go +++ b/go/vt/srvtopo/keyspace_filtering_server.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/topo" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/topo" ) var ( diff --git a/go/vt/srvtopo/keyspace_filtering_server_test.go b/go/vt/srvtopo/keyspace_filtering_server_test.go index 9b471129adb..88f1c53f692 100644 --- a/go/vt/srvtopo/keyspace_filtering_server_test.go +++ b/go/vt/srvtopo/keyspace_filtering_server_test.go @@ -23,11 +23,11 @@ import ( "sync" "testing" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/srvtopo/srvtopotest" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/srvtopo/srvtopotest" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" ) var ( diff --git a/go/vt/srvtopo/query.go b/go/vt/srvtopo/query.go index 49cc48465c3..7c23260b89c 100644 --- a/go/vt/srvtopo/query.go +++ b/go/vt/srvtopo/query.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/log" ) type queryEntry struct { diff --git a/go/vt/srvtopo/query_srvkeyspacenames.go b/go/vt/srvtopo/query_srvkeyspacenames.go index 6db230b42df..3e6edf4e9ba 100644 --- a/go/vt/srvtopo/query_srvkeyspacenames.go +++ b/go/vt/srvtopo/query_srvkeyspacenames.go @@ -20,8 +20,8 @@ import ( "context" "time" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/topo" ) type SrvKeyspaceNamesQuery struct { diff --git a/go/vt/srvtopo/query_test.go b/go/vt/srvtopo/query_test.go index 57f0480e93d..199a92cd86c 100644 --- a/go/vt/srvtopo/query_test.go +++ b/go/vt/srvtopo/query_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) // TestResilientQueryGetCurrentValueInitialization tests that the resilient query returns the correct results when it has been diff --git a/go/vt/srvtopo/read_only_server.go b/go/vt/srvtopo/read_only_server.go index 3ececafd9ce..a306fe97157 100644 --- a/go/vt/srvtopo/read_only_server.go +++ b/go/vt/srvtopo/read_only_server.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/topo" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/topo" ) // NewReadOnlyServer wraps the topo server passed by the provided implementation diff --git a/go/vt/srvtopo/resilient_server.go b/go/vt/srvtopo/resilient_server.go index d5a64771794..4084a519227 100644 --- a/go/vt/srvtopo/resilient_server.go +++ b/go/vt/srvtopo/resilient_server.go @@ -22,10 +22,10 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" ) var ( diff --git a/go/vt/srvtopo/resilient_server_test.go b/go/vt/srvtopo/resilient_server_test.go index 079fecb4662..12845d0c834 100644 --- a/go/vt/srvtopo/resilient_server_test.go +++ b/go/vt/srvtopo/resilient_server_test.go @@ -28,18 +28,18 @@ import ( "github.com/google/safehtml/template" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/key" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) // TestGetSrvKeyspace will test we properly return updated SrvKeyspace. diff --git a/go/vt/srvtopo/resolver.go b/go/vt/srvtopo/resolver.go index 3e9b7304631..9da8979424a 100644 --- a/go/vt/srvtopo/resolver.go +++ b/go/vt/srvtopo/resolver.go @@ -20,18 +20,18 @@ import ( "context" "sort" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // A Gateway is the query processing module for each shard, diff --git a/go/vt/srvtopo/resolver_test.go b/go/vt/srvtopo/resolver_test.go index 3b30bc07b1e..401362bc2a4 100644 --- a/go/vt/srvtopo/resolver_test.go +++ b/go/vt/srvtopo/resolver_test.go @@ -22,16 +22,16 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconntest" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vttablet/tabletconntest" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func initResolver(t *testing.T, ctx context.Context) *Resolver { diff --git a/go/vt/srvtopo/server.go b/go/vt/srvtopo/server.go index 1a49c5c1839..0489738b06b 100644 --- a/go/vt/srvtopo/server.go +++ b/go/vt/srvtopo/server.go @@ -23,9 +23,9 @@ package srvtopo import ( "context" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/topo" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/topo" ) // Server is a subset of the topo.Server API that only contains diff --git a/go/vt/srvtopo/srvtopotest/passthrough.go b/go/vt/srvtopo/srvtopotest/passthrough.go index 9b8f3438621..5a94bd55c47 100644 --- a/go/vt/srvtopo/srvtopotest/passthrough.go +++ b/go/vt/srvtopo/srvtopotest/passthrough.go @@ -19,9 +19,9 @@ package srvtopotest import ( "context" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/topo" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/topo" ) // PassthroughSrvTopoServer is a bare implementation of srvtopo.Server for use in tests diff --git a/go/vt/srvtopo/status.go b/go/vt/srvtopo/status.go index 251bda8b542..a490d6a8df6 100644 --- a/go/vt/srvtopo/status.go +++ b/go/vt/srvtopo/status.go @@ -24,7 +24,7 @@ import ( "github.com/google/safehtml" "github.com/google/safehtml/template" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // TopoTemplate is the HTML to use to display the diff --git a/go/vt/srvtopo/watch.go b/go/vt/srvtopo/watch.go index ba72c234d17..6793c39c09c 100644 --- a/go/vt/srvtopo/watch.go +++ b/go/vt/srvtopo/watch.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" ) type watchState int diff --git a/go/vt/srvtopo/watch_srvkeyspace.go b/go/vt/srvtopo/watch_srvkeyspace.go index 1f583349b5b..52715d61653 100644 --- a/go/vt/srvtopo/watch_srvkeyspace.go +++ b/go/vt/srvtopo/watch_srvkeyspace.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" ) type SrvKeyspaceWatcher struct { diff --git a/go/vt/srvtopo/watch_srvvschema.go b/go/vt/srvtopo/watch_srvvschema.go index fdeeb4edac5..c64897c2b11 100644 --- a/go/vt/srvtopo/watch_srvvschema.go +++ b/go/vt/srvtopo/watch_srvvschema.go @@ -20,10 +20,10 @@ import ( "context" "time" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/topo" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) type SrvVSchemaWatcher struct { diff --git a/go/vt/tableacl/acl/acl.go b/go/vt/tableacl/acl/acl.go index d45deb0e525..ff0cbb09d13 100644 --- a/go/vt/tableacl/acl/acl.go +++ b/go/vt/tableacl/acl/acl.go @@ -17,7 +17,7 @@ limitations under the License. package acl import ( - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // ACL is an interface for Access Control List. diff --git a/go/vt/tableacl/cached_size.go b/go/vt/tableacl/cached_size.go index 0bb1b59e6aa..e04994c9883 100644 --- a/go/vt/tableacl/cached_size.go +++ b/go/vt/tableacl/cached_size.go @@ -17,7 +17,7 @@ limitations under the License. package tableacl -import hack "github.com/mdibaiee/vitess/go/hack" +import hack "github.com/vitess/vitess/go/hack" type cachedObject interface { CachedSize(alloc bool) int64 @@ -31,7 +31,7 @@ func (cached *ACLResult) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field ACL github.com/mdibaiee/vitess/go/vt/tableacl/acl.ACL + // field ACL github.com/vitess/vitess/go/vt/tableacl/acl.ACL if cc, ok := cached.ACL.(cachedObject); ok { size += cc.CachedSize(true) } diff --git a/go/vt/tableacl/simpleacl/simpleacl.go b/go/vt/tableacl/simpleacl/simpleacl.go index 017176ead35..6e8122569bb 100644 --- a/go/vt/tableacl/simpleacl/simpleacl.go +++ b/go/vt/tableacl/simpleacl/simpleacl.go @@ -17,8 +17,8 @@ limitations under the License. package simpleacl import ( - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/tableacl/acl" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/tableacl/acl" ) // SimpleACL keeps all entries in a unique in-memory list diff --git a/go/vt/tableacl/simpleacl/simpleacl_test.go b/go/vt/tableacl/simpleacl/simpleacl_test.go index 647aa48a3b9..43bde689484 100644 --- a/go/vt/tableacl/simpleacl/simpleacl_test.go +++ b/go/vt/tableacl/simpleacl/simpleacl_test.go @@ -19,7 +19,7 @@ package simpleacl import ( "testing" - "github.com/mdibaiee/vitess/go/vt/tableacl/testlib" + "github.com/vitess/vitess/go/vt/tableacl/testlib" ) func TestSimpleAcl(t *testing.T) { diff --git a/go/vt/tableacl/tableacl.go b/go/vt/tableacl/tableacl.go index 36b217d0a8a..506484e55c3 100644 --- a/go/vt/tableacl/tableacl.go +++ b/go/vt/tableacl/tableacl.go @@ -27,10 +27,10 @@ import ( "github.com/tchap/go-patricia/patricia" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/vt/log" - tableaclpb "github.com/mdibaiee/vitess/go/vt/proto/tableacl" - "github.com/mdibaiee/vitess/go/vt/tableacl/acl" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/vt/log" + tableaclpb "github.com/vitess/vitess/go/vt/proto/tableacl" + "github.com/vitess/vitess/go/vt/tableacl/acl" ) // ACLResult embeds an acl.ACL and also tell which table group it belongs to. diff --git a/go/vt/tableacl/tableacl_test.go b/go/vt/tableacl/tableacl_test.go index 8b12b5cae05..93c4e0af08c 100644 --- a/go/vt/tableacl/tableacl_test.go +++ b/go/vt/tableacl/tableacl_test.go @@ -25,11 +25,11 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/tableacl/acl" - "github.com/mdibaiee/vitess/go/vt/tableacl/simpleacl" + "github.com/vitess/vitess/go/vt/tableacl/acl" + "github.com/vitess/vitess/go/vt/tableacl/simpleacl" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tableaclpb "github.com/mdibaiee/vitess/go/vt/proto/tableacl" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tableaclpb "github.com/vitess/vitess/go/vt/proto/tableacl" ) type fakeACLFactory struct{} diff --git a/go/vt/tableacl/testlib/testlib.go b/go/vt/tableacl/testlib/testlib.go index 1d5c747a2fb..dcb5e64623e 100644 --- a/go/vt/tableacl/testlib/testlib.go +++ b/go/vt/tableacl/testlib/testlib.go @@ -22,10 +22,10 @@ import ( "math/rand/v2" "testing" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tableaclpb "github.com/mdibaiee/vitess/go/vt/proto/tableacl" - "github.com/mdibaiee/vitess/go/vt/tableacl" - "github.com/mdibaiee/vitess/go/vt/tableacl/acl" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tableaclpb "github.com/vitess/vitess/go/vt/proto/tableacl" + "github.com/vitess/vitess/go/vt/tableacl" + "github.com/vitess/vitess/go/vt/tableacl/acl" ) // TestSuite tests a concrete acl.Factory implementation. diff --git a/go/vt/throttler/demo/throttler_demo.go b/go/vt/throttler/demo/throttler_demo.go index fe12e9cfa9a..ec638784952 100644 --- a/go/vt/throttler/demo/throttler_demo.go +++ b/go/vt/throttler/demo/throttler_demo.go @@ -26,22 +26,22 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/vtenv" - - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/throttler" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vttablet/grpcqueryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice/fakes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" - "github.com/mdibaiee/vitess/go/vt/wrangler/testlib" + "github.com/vitess/vitess/go/vt/vtenv" + + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/throttler" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vttablet/grpcqueryservice" + "github.com/vitess/vitess/go/vt/vttablet/queryservice/fakes" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/vt/wrangler/testlib" ) // This file contains a demo binary that demonstrates how the resharding diff --git a/go/vt/throttler/grpcthrottlerserver/grpcthrottlerserver.go b/go/vt/throttler/grpcthrottlerserver/grpcthrottlerserver.go index 7e4f25d0177..c6b899c40f4 100644 --- a/go/vt/throttler/grpcthrottlerserver/grpcthrottlerserver.go +++ b/go/vt/throttler/grpcthrottlerserver/grpcthrottlerserver.go @@ -23,11 +23,11 @@ import ( "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/throttler" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/throttler" - throttlerdatapb "github.com/mdibaiee/vitess/go/vt/proto/throttlerdata" - throttlerservicepb "github.com/mdibaiee/vitess/go/vt/proto/throttlerservice" + throttlerdatapb "github.com/vitess/vitess/go/vt/proto/throttlerdata" + throttlerservicepb "github.com/vitess/vitess/go/vt/proto/throttlerservice" ) // Server is the gRPC server implementation of the Throttler service. diff --git a/go/vt/throttler/manager.go b/go/vt/throttler/manager.go index c4a2b1bc763..c41c7d2f5a8 100644 --- a/go/vt/throttler/manager.go +++ b/go/vt/throttler/manager.go @@ -21,9 +21,9 @@ import ( "sort" "sync" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" - throttlerdatapb "github.com/mdibaiee/vitess/go/vt/proto/throttlerdata" + throttlerdatapb "github.com/vitess/vitess/go/vt/proto/throttlerdata" ) // GlobalManager is the per-process manager which manages all active throttlers. diff --git a/go/vt/throttler/manager_test.go b/go/vt/throttler/manager_test.go index 4da627aac5f..bcbc86286e2 100644 --- a/go/vt/throttler/manager_test.go +++ b/go/vt/throttler/manager_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - throttlerdatapb "github.com/mdibaiee/vitess/go/vt/proto/throttlerdata" + throttlerdatapb "github.com/vitess/vitess/go/vt/proto/throttlerdata" ) // We base our test data on these defaults. diff --git a/go/vt/throttler/max_replication_lag_module.go b/go/vt/throttler/max_replication_lag_module.go index 0a384c5fe4e..cbe6c7f673e 100644 --- a/go/vt/throttler/max_replication_lag_module.go +++ b/go/vt/throttler/max_replication_lag_module.go @@ -25,12 +25,12 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo/topoproto" - throttlerdatapb "github.com/mdibaiee/vitess/go/vt/proto/throttlerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + throttlerdatapb "github.com/vitess/vitess/go/vt/proto/throttlerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) type state string diff --git a/go/vt/throttler/max_replication_lag_module_config.go b/go/vt/throttler/max_replication_lag_module_config.go index f9b5686987a..769bbb81149 100644 --- a/go/vt/throttler/max_replication_lag_module_config.go +++ b/go/vt/throttler/max_replication_lag_module_config.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - throttlerdatapb "github.com/mdibaiee/vitess/go/vt/proto/throttlerdata" + throttlerdatapb "github.com/vitess/vitess/go/vt/proto/throttlerdata" ) // MaxReplicationLagModuleConfig stores all configuration parameters for diff --git a/go/vt/throttler/max_replication_lag_module_test.go b/go/vt/throttler/max_replication_lag_module_test.go index 454de95404f..5004627b893 100644 --- a/go/vt/throttler/max_replication_lag_module_test.go +++ b/go/vt/throttler/max_replication_lag_module_test.go @@ -25,11 +25,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // The tests below tests the heuristic of the MaxReplicationLagModule. diff --git a/go/vt/throttler/replication_lag_cache.go b/go/vt/throttler/replication_lag_cache.go index f051e0637b5..9dd909d87f1 100644 --- a/go/vt/throttler/replication_lag_cache.go +++ b/go/vt/throttler/replication_lag_cache.go @@ -20,7 +20,7 @@ import ( "sort" "time" - "github.com/mdibaiee/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/discovery" ) // replicationLagCache caches for each replica a bounded list of historic diff --git a/go/vt/throttler/replication_lag_cache_test.go b/go/vt/throttler/replication_lag_cache_test.go index 4cb42b8d5cc..55b19e698a2 100644 --- a/go/vt/throttler/replication_lag_cache_test.go +++ b/go/vt/throttler/replication_lag_cache_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/discovery" ) // TestReplicationLagCache tests that the ring buffer in "replicationLagHistory" diff --git a/go/vt/throttler/replication_lag_record.go b/go/vt/throttler/replication_lag_record.go index 8875c337aa3..72992483aba 100644 --- a/go/vt/throttler/replication_lag_record.go +++ b/go/vt/throttler/replication_lag_record.go @@ -19,7 +19,7 @@ package throttler import ( "time" - "github.com/mdibaiee/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/discovery" ) // replicationLagRecord stores the tablet health data for a given point in time. diff --git a/go/vt/throttler/result.go b/go/vt/throttler/result.go index 9ed37a1f490..ac06c74739f 100644 --- a/go/vt/throttler/result.go +++ b/go/vt/throttler/result.go @@ -23,7 +23,7 @@ import ( "text/template" "time" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topo/topoproto" ) type rateChange string diff --git a/go/vt/throttler/throttler.go b/go/vt/throttler/throttler.go index a9f94c39473..6d1a3d6aba2 100644 --- a/go/vt/throttler/throttler.go +++ b/go/vt/throttler/throttler.go @@ -33,11 +33,11 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/topodata" - throttlerdatapb "github.com/mdibaiee/vitess/go/vt/proto/throttlerdata" + throttlerdatapb "github.com/vitess/vitess/go/vt/proto/throttlerdata" ) const ( diff --git a/go/vt/throttler/throttler_test.go b/go/vt/throttler/throttler_test.go index 46c04362b0f..32620346d4e 100644 --- a/go/vt/throttler/throttler_test.go +++ b/go/vt/throttler/throttler_test.go @@ -41,7 +41,7 @@ import ( // BenchmarkThrottlerParallel_10kQPS-4 500000 100060 ns/op // BenchmarkThrottlerParallel_100kQPS-4 5000000 9999 ns/op // BenchmarkThrottlerDisabled-4 500000000 94.9 ns/op -// ok github.com/mdibaiee/vitess/go/vt/throttler 448.282 +// ok github.com/vitess/vitess/go/vt/throttler 448.282 func BenchmarkThrottler_1kQPS(b *testing.B) { benchmarkThrottler(b, 1*1000) diff --git a/go/vt/throttler/throttlerlogz.go b/go/vt/throttler/throttlerlogz.go index 89a58650864..3089a811486 100644 --- a/go/vt/throttler/throttlerlogz.go +++ b/go/vt/throttler/throttlerlogz.go @@ -26,8 +26,8 @@ import ( "github.com/google/safehtml/template" - "github.com/mdibaiee/vitess/go/vt/logz" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/logz" + "github.com/vitess/vitess/go/vt/servenv" ) const logHeaderHTML = ` diff --git a/go/vt/throttler/throttlerz.go b/go/vt/throttler/throttlerz.go index 2fef9ed7492..7b95110e08e 100644 --- a/go/vt/throttler/throttlerz.go +++ b/go/vt/throttler/throttlerz.go @@ -23,8 +23,8 @@ import ( "github.com/google/safehtml/template" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" ) const listHTML = ` diff --git a/go/vt/tlstest/tlstest.go b/go/vt/tlstest/tlstest.go index 557185cf121..2ea09de8135 100644 --- a/go/vt/tlstest/tlstest.go +++ b/go/vt/tlstest/tlstest.go @@ -36,7 +36,7 @@ import ( "strconv" "time" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) const ( diff --git a/go/vt/tlstest/tlstest_test.go b/go/vt/tlstest/tlstest_test.go index 054072c991c..5af13d643a2 100644 --- a/go/vt/tlstest/tlstest_test.go +++ b/go/vt/tlstest/tlstest_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/sync/errgroup" - "github.com/mdibaiee/vitess/go/vt/vttls" + "github.com/vitess/vitess/go/vt/vttls" ) func TestClientServerWithoutCombineCerts(t *testing.T) { diff --git a/go/vt/topo/cell_info.go b/go/vt/topo/cell_info.go index f710fef3f0e..e837dc7f193 100644 --- a/go/vt/topo/cell_info.go +++ b/go/vt/topo/cell_info.go @@ -21,11 +21,11 @@ import ( "path" "strings" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/vt/vterrors" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // This file provides the utility methods to save / retrieve CellInfo diff --git a/go/vt/topo/cells_aliases.go b/go/vt/topo/cells_aliases.go index 9b848061102..a1cb955a5d0 100644 --- a/go/vt/topo/cells_aliases.go +++ b/go/vt/topo/cells_aliases.go @@ -22,7 +22,7 @@ import ( "context" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // This file provides the utility methods to save / retrieve CellsAliases diff --git a/go/vt/topo/cells_aliases_test.go b/go/vt/topo/cells_aliases_test.go index f36056a9497..4e015a77c95 100644 --- a/go/vt/topo/cells_aliases_test.go +++ b/go/vt/topo/cells_aliases_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestValidateAlias(t *testing.T) { diff --git a/go/vt/topo/consultopo/directory.go b/go/vt/topo/consultopo/directory.go index 5401b48116f..5dc576b53f2 100644 --- a/go/vt/topo/consultopo/directory.go +++ b/go/vt/topo/consultopo/directory.go @@ -22,7 +22,7 @@ import ( "context" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // ListDir is part of the topo.Conn interface. diff --git a/go/vt/topo/consultopo/election.go b/go/vt/topo/consultopo/election.go index 3e933aadf0b..c72034674e7 100644 --- a/go/vt/topo/consultopo/election.go +++ b/go/vt/topo/consultopo/election.go @@ -22,8 +22,8 @@ import ( "github.com/hashicorp/consul/api" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" ) // NewLeaderParticipation is part of the topo.Server interface diff --git a/go/vt/topo/consultopo/error.go b/go/vt/topo/consultopo/error.go index ff8d07f6905..05162a96c00 100644 --- a/go/vt/topo/consultopo/error.go +++ b/go/vt/topo/consultopo/error.go @@ -22,7 +22,7 @@ import ( "context" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // Errors specific to this package. diff --git a/go/vt/topo/consultopo/file.go b/go/vt/topo/consultopo/file.go index e694860b6ee..1f0b94c3930 100644 --- a/go/vt/topo/consultopo/file.go +++ b/go/vt/topo/consultopo/file.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/consul/api" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // Create is part of the topo.Conn interface. diff --git a/go/vt/topo/consultopo/lock.go b/go/vt/topo/consultopo/lock.go index c2efbd75c98..f15ac595c24 100644 --- a/go/vt/topo/consultopo/lock.go +++ b/go/vt/topo/consultopo/lock.go @@ -23,11 +23,11 @@ import ( "github.com/hashicorp/consul/api" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" ) // consulLockDescriptor implements topo.LockDescriptor. diff --git a/go/vt/topo/consultopo/server.go b/go/vt/topo/consultopo/server.go index 5e75dafc8ac..93c560e0a58 100644 --- a/go/vt/topo/consultopo/server.go +++ b/go/vt/topo/consultopo/server.go @@ -29,10 +29,10 @@ import ( "github.com/hashicorp/consul/api" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vterrors" ) var ( diff --git a/go/vt/topo/consultopo/server_flaky_test.go b/go/vt/topo/consultopo/server_flaky_test.go index 1a4f58fb88f..3b445d28181 100644 --- a/go/vt/topo/consultopo/server_flaky_test.go +++ b/go/vt/topo/consultopo/server_flaky_test.go @@ -26,15 +26,15 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" "github.com/hashicorp/consul/api" - "github.com/mdibaiee/vitess/go/testfiles" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/test" + "github.com/vitess/vitess/go/testfiles" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/test" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // startConsul starts a consul subprocess, and waits for it to be ready. diff --git a/go/vt/topo/consultopo/watch.go b/go/vt/topo/consultopo/watch.go index 9a7a9a455fa..eb4dc3f1be7 100644 --- a/go/vt/topo/consultopo/watch.go +++ b/go/vt/topo/consultopo/watch.go @@ -24,8 +24,8 @@ import ( "github.com/hashicorp/consul/api" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" ) var ( diff --git a/go/vt/topo/decode.go b/go/vt/topo/decode.go index 68477419f44..11033542da4 100644 --- a/go/vt/topo/decode.go +++ b/go/vt/topo/decode.go @@ -24,8 +24,8 @@ import ( "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) // DecodeContent uses the filename to imply a type, and proto-decodes diff --git a/go/vt/topo/etcd2topo/directory.go b/go/vt/topo/etcd2topo/directory.go index 848401944cc..703006607fb 100644 --- a/go/vt/topo/etcd2topo/directory.go +++ b/go/vt/topo/etcd2topo/directory.go @@ -24,7 +24,7 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // ListDir is part of the topo.Conn interface. diff --git a/go/vt/topo/etcd2topo/election.go b/go/vt/topo/etcd2topo/election.go index 563e3656e55..376224ccc8a 100644 --- a/go/vt/topo/etcd2topo/election.go +++ b/go/vt/topo/etcd2topo/election.go @@ -22,8 +22,8 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" ) // NewLeaderParticipation is part of the topo.Server interface diff --git a/go/vt/topo/etcd2topo/error.go b/go/vt/topo/etcd2topo/error.go index 1445b72bb00..c080df47d43 100644 --- a/go/vt/topo/etcd2topo/error.go +++ b/go/vt/topo/etcd2topo/error.go @@ -25,7 +25,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // Errors specific to this package. diff --git a/go/vt/topo/etcd2topo/file.go b/go/vt/topo/etcd2topo/file.go index 84bcd654a6c..8222f5b3fc7 100644 --- a/go/vt/topo/etcd2topo/file.go +++ b/go/vt/topo/etcd2topo/file.go @@ -23,7 +23,7 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // Create is part of the topo.Conn interface. diff --git a/go/vt/topo/etcd2topo/lock.go b/go/vt/topo/etcd2topo/lock.go index 93f994aaed0..de9c872475e 100644 --- a/go/vt/topo/etcd2topo/lock.go +++ b/go/vt/topo/etcd2topo/lock.go @@ -26,11 +26,11 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" clientv3 "go.etcd.io/etcd/client/v3" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vterrors" ) var ( diff --git a/go/vt/topo/etcd2topo/server.go b/go/vt/topo/etcd2topo/server.go index 8e2b00421d8..fc99ef494b4 100644 --- a/go/vt/topo/etcd2topo/server.go +++ b/go/vt/topo/etcd2topo/server.go @@ -45,8 +45,8 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" ) var ( diff --git a/go/vt/topo/etcd2topo/server_test.go b/go/vt/topo/etcd2topo/server_test.go index 9f2afc8bcc8..ee461362ea6 100644 --- a/go/vt/topo/etcd2topo/server_test.go +++ b/go/vt/topo/etcd2topo/server_test.go @@ -28,12 +28,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/testfiles" - "github.com/mdibaiee/vitess/go/vt/log" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/tlstest" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/test" + "github.com/vitess/vitess/go/testfiles" + "github.com/vitess/vitess/go/vt/log" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/tlstest" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/test" clientv3 "go.etcd.io/etcd/client/v3" ) diff --git a/go/vt/topo/etcd2topo/watch.go b/go/vt/topo/etcd2topo/watch.go index 614d04c8a46..894a8366fc4 100644 --- a/go/vt/topo/etcd2topo/watch.go +++ b/go/vt/topo/etcd2topo/watch.go @@ -25,11 +25,11 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" clientv3 "go.etcd.io/etcd/client/v3" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" ) // Watch is part of the topo.Conn interface. diff --git a/go/vt/topo/etcd2topo/watch_test.go b/go/vt/topo/etcd2topo/watch_test.go index 17c69433abb..cf1085729fc 100644 --- a/go/vt/topo/etcd2topo/watch_test.go +++ b/go/vt/topo/etcd2topo/watch_test.go @@ -28,8 +28,8 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/topo" ) // TestWatchTopoVersion tests how the topo.Version values work within the etcd2topo diff --git a/go/vt/topo/events/external_cluster_change.go b/go/vt/topo/events/external_cluster_change.go index 1862b166932..0ca9b3c047a 100644 --- a/go/vt/topo/events/external_cluster_change.go +++ b/go/vt/topo/events/external_cluster_change.go @@ -17,7 +17,7 @@ limitations under the License. package events import ( - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // ExternalVitessClusterChange is an event that describes changes to a vitess cluster. diff --git a/go/vt/topo/events/keyspace_change.go b/go/vt/topo/events/keyspace_change.go index 311fbc38e5b..0d110897386 100644 --- a/go/vt/topo/events/keyspace_change.go +++ b/go/vt/topo/events/keyspace_change.go @@ -17,7 +17,7 @@ limitations under the License. package events import ( - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // KeyspaceChange is an event that describes changes to a keyspace. diff --git a/go/vt/topo/events/keyspace_change_syslog.go b/go/vt/topo/events/keyspace_change_syslog.go index 8e9c878ca01..6f224201468 100644 --- a/go/vt/topo/events/keyspace_change_syslog.go +++ b/go/vt/topo/events/keyspace_change_syslog.go @@ -22,7 +22,7 @@ import ( "fmt" "log/syslog" - "github.com/mdibaiee/vitess/go/event/syslogger" + "github.com/vitess/vitess/go/event/syslogger" ) // Syslog writes the event to syslog. diff --git a/go/vt/topo/events/keyspace_change_syslog_test.go b/go/vt/topo/events/keyspace_change_syslog_test.go index f6ea5616b2b..be545fb488d 100644 --- a/go/vt/topo/events/keyspace_change_syslog_test.go +++ b/go/vt/topo/events/keyspace_change_syslog_test.go @@ -22,7 +22,7 @@ import ( "log/syslog" "testing" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestKeyspaceChangeSyslog(t *testing.T) { diff --git a/go/vt/topo/events/shard_change.go b/go/vt/topo/events/shard_change.go index bf130a07ed1..a37c508851c 100644 --- a/go/vt/topo/events/shard_change.go +++ b/go/vt/topo/events/shard_change.go @@ -17,7 +17,7 @@ limitations under the License. package events import ( - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // ShardChange is an event that describes changes to a shard. diff --git a/go/vt/topo/events/shard_change_syslog.go b/go/vt/topo/events/shard_change_syslog.go index 8ebb00b9645..53e5698b0aa 100644 --- a/go/vt/topo/events/shard_change_syslog.go +++ b/go/vt/topo/events/shard_change_syslog.go @@ -22,7 +22,7 @@ import ( "fmt" "log/syslog" - "github.com/mdibaiee/vitess/go/event/syslogger" + "github.com/vitess/vitess/go/event/syslogger" ) // Syslog writes the event to syslog. diff --git a/go/vt/topo/events/shard_change_syslog_test.go b/go/vt/topo/events/shard_change_syslog_test.go index e361ebca683..31df0c11fcb 100644 --- a/go/vt/topo/events/shard_change_syslog_test.go +++ b/go/vt/topo/events/shard_change_syslog_test.go @@ -22,9 +22,9 @@ import ( "log/syslog" "testing" - "github.com/mdibaiee/vitess/go/hack" + "github.com/vitess/vitess/go/hack" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func init() { diff --git a/go/vt/topo/events/tablet_change.go b/go/vt/topo/events/tablet_change.go index 394a741d518..3d7aa71dd4d 100644 --- a/go/vt/topo/events/tablet_change.go +++ b/go/vt/topo/events/tablet_change.go @@ -17,7 +17,7 @@ limitations under the License. package events import ( - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // TabletChange is an event that describes changes to a tablet's topo record. diff --git a/go/vt/topo/events/tablet_change_syslog.go b/go/vt/topo/events/tablet_change_syslog.go index 2909a835da0..f7d17ea784e 100644 --- a/go/vt/topo/events/tablet_change_syslog.go +++ b/go/vt/topo/events/tablet_change_syslog.go @@ -22,8 +22,8 @@ import ( "fmt" "log/syslog" - "github.com/mdibaiee/vitess/go/event/syslogger" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/event/syslogger" + "github.com/vitess/vitess/go/vt/topo/topoproto" ) // Syslog writes the event to syslog. diff --git a/go/vt/topo/events/tablet_change_syslog_test.go b/go/vt/topo/events/tablet_change_syslog_test.go index e3a1f7d9175..ccf3e8195ad 100644 --- a/go/vt/topo/events/tablet_change_syslog_test.go +++ b/go/vt/topo/events/tablet_change_syslog_test.go @@ -22,7 +22,7 @@ import ( "log/syslog" "testing" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestTabletChangeSyslog(t *testing.T) { diff --git a/go/vt/topo/external_vitess_cluster.go b/go/vt/topo/external_vitess_cluster.go index 8e1832c5b8d..5ce94d4b4db 100644 --- a/go/vt/topo/external_vitess_cluster.go +++ b/go/vt/topo/external_vitess_cluster.go @@ -20,10 +20,10 @@ import ( "context" "path" - "github.com/mdibaiee/vitess/go/event" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo/events" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/event" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo/events" + "github.com/vitess/vitess/go/vt/vterrors" ) // ExternalVitessClusterInfo is a meta struct that contains metadata to give the diff --git a/go/vt/topo/faketopo/faketopo.go b/go/vt/topo/faketopo/faketopo.go index 1f69f3fdb98..62d71140680 100644 --- a/go/vt/topo/faketopo/faketopo.go +++ b/go/vt/topo/faketopo/faketopo.go @@ -21,11 +21,11 @@ import ( "strings" "sync" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // FakeFactory implements the Factory interface. This is supposed to be used only for testing diff --git a/go/vt/topo/helpers/compare.go b/go/vt/topo/helpers/compare.go index 5e7f9dad6b7..a0c74816d75 100644 --- a/go/vt/topo/helpers/compare.go +++ b/go/vt/topo/helpers/compare.go @@ -25,9 +25,9 @@ import ( "context" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vterrors" ) // CompareKeyspaces will compare the keyspaces in the destination topo. diff --git a/go/vt/topo/helpers/compare_test.go b/go/vt/topo/helpers/compare_test.go index 90f765259cd..1b2071bfa04 100644 --- a/go/vt/topo/helpers/compare_test.go +++ b/go/vt/topo/helpers/compare_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) func TestBasicCompare(t *testing.T) { diff --git a/go/vt/topo/helpers/copy.go b/go/vt/topo/helpers/copy.go index bcf5227d4ab..a84554704a2 100644 --- a/go/vt/topo/helpers/copy.go +++ b/go/vt/topo/helpers/copy.go @@ -24,13 +24,13 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // CopyKeyspaces will create the keyspaces in the destination topo. diff --git a/go/vt/topo/helpers/copy_test.go b/go/vt/topo/helpers/copy_test.go index 1e47d23b091..a4c070d6ba8 100644 --- a/go/vt/topo/helpers/copy_test.go +++ b/go/vt/topo/helpers/copy_test.go @@ -22,13 +22,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) func createSetup(ctx context.Context, t *testing.T) (*topo.Server, *topo.Server) { diff --git a/go/vt/topo/keyspace.go b/go/vt/topo/keyspace.go index a325d98133b..13fb1c3ee8b 100755 --- a/go/vt/topo/keyspace.go +++ b/go/vt/topo/keyspace.go @@ -25,18 +25,18 @@ import ( "github.com/spf13/pflag" "golang.org/x/sync/errgroup" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - "github.com/mdibaiee/vitess/go/event" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo/events" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vterrors" + + "github.com/vitess/vitess/go/event" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo/events" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // This file contains keyspace utility functions. diff --git a/go/vt/topo/keyspace_external_test.go b/go/vt/topo/keyspace_external_test.go index 4bb97c81751..40e41afc2fa 100644 --- a/go/vt/topo/keyspace_external_test.go +++ b/go/vt/topo/keyspace_external_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestServerFindAllShardsInKeyspace(t *testing.T) { diff --git a/go/vt/topo/keyspace_lock_test.go b/go/vt/topo/keyspace_lock_test.go index 5cff3acdfe2..d3c1b28816d 100644 --- a/go/vt/topo/keyspace_lock_test.go +++ b/go/vt/topo/keyspace_lock_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" ) // TestTopoKeyspaceLock tests keyspace lock operations. diff --git a/go/vt/topo/locks.go b/go/vt/topo/locks.go index ec15e7b4a6b..5a13579810b 100644 --- a/go/vt/topo/locks.go +++ b/go/vt/topo/locks.go @@ -26,11 +26,11 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vterrors" ) // This file contains utility methods and definitions to lock resources using topology server. diff --git a/go/vt/topo/memorytopo/directory.go b/go/vt/topo/memorytopo/directory.go index c0aa5ef9537..c8567614a7f 100644 --- a/go/vt/topo/memorytopo/directory.go +++ b/go/vt/topo/memorytopo/directory.go @@ -19,10 +19,10 @@ package memorytopo import ( "context" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // ListDir is part of the topo.Conn interface. diff --git a/go/vt/topo/memorytopo/election.go b/go/vt/topo/memorytopo/election.go index 92b53cd5184..d8ee81452b2 100644 --- a/go/vt/topo/memorytopo/election.go +++ b/go/vt/topo/memorytopo/election.go @@ -20,8 +20,8 @@ import ( "context" "path" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" ) // NewLeaderParticipation is part of the topo.Conn interface. diff --git a/go/vt/topo/memorytopo/file.go b/go/vt/topo/memorytopo/file.go index 4a398f0586e..4823a2277be 100644 --- a/go/vt/topo/memorytopo/file.go +++ b/go/vt/topo/memorytopo/file.go @@ -22,10 +22,10 @@ import ( "path" "strings" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // Create is part of topo.Conn interface. diff --git a/go/vt/topo/memorytopo/lock.go b/go/vt/topo/memorytopo/lock.go index ad5f6d966e7..29ebbed79af 100644 --- a/go/vt/topo/memorytopo/lock.go +++ b/go/vt/topo/memorytopo/lock.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // convertError converts a context error into a topo error. diff --git a/go/vt/topo/memorytopo/memorytopo.go b/go/vt/topo/memorytopo/memorytopo.go index 148162a523b..204961a2ec0 100644 --- a/go/vt/topo/memorytopo/memorytopo.go +++ b/go/vt/topo/memorytopo/memorytopo.go @@ -28,11 +28,11 @@ import ( "sync" "sync/atomic" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/topo/memorytopo/server_test.go b/go/vt/topo/memorytopo/server_test.go index 9e116b3a596..c87eafdf2c8 100644 --- a/go/vt/topo/memorytopo/server_test.go +++ b/go/vt/topo/memorytopo/server_test.go @@ -20,8 +20,8 @@ import ( "context" "testing" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/test" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/test" ) func TestMemoryTopo(t *testing.T) { diff --git a/go/vt/topo/memorytopo/watch.go b/go/vt/topo/memorytopo/watch.go index 82b90f3b0e7..5db1d3954dd 100644 --- a/go/vt/topo/memorytopo/watch.go +++ b/go/vt/topo/memorytopo/watch.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // Watch is part of the topo.Conn interface. diff --git a/go/vt/topo/metadata.go b/go/vt/topo/metadata.go index 12a0a6bdb7e..2c3e99f27d6 100644 --- a/go/vt/topo/metadata.go +++ b/go/vt/topo/metadata.go @@ -20,10 +20,10 @@ import ( "context" "path" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/event" - "github.com/mdibaiee/vitess/go/vt/topo/events" + "github.com/vitess/vitess/go/event" + "github.com/vitess/vitess/go/vt/topo/events" ) // UpsertMetadata sets the key/value in the metadata if it doesn't exist, otherwise it updates the content diff --git a/go/vt/topo/replication.go b/go/vt/topo/replication.go index 88c09ee1c63..d04ab980be7 100644 --- a/go/vt/topo/replication.go +++ b/go/vt/topo/replication.go @@ -22,13 +22,13 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // ShardReplicationInfo is the companion structure for ShardReplication. diff --git a/go/vt/topo/routing_rules_lock_test.go b/go/vt/topo/routing_rules_lock_test.go index 5dd5d396849..cc610c87c74 100644 --- a/go/vt/topo/routing_rules_lock_test.go +++ b/go/vt/topo/routing_rules_lock_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) // lower the lock timeout for testing diff --git a/go/vt/topo/server.go b/go/vt/topo/server.go index 3f18cccd2da..f5b7a3ff62e 100644 --- a/go/vt/topo/server.go +++ b/go/vt/topo/server.go @@ -50,10 +50,10 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vterrors" ) const ( diff --git a/go/vt/topo/shard.go b/go/vt/topo/shard.go index 6afb87e196c..17a25678a1e 100644 --- a/go/vt/topo/shard.go +++ b/go/vt/topo/shard.go @@ -27,20 +27,20 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - "github.com/mdibaiee/vitess/go/event" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo/events" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + + "github.com/vitess/vitess/go/event" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo/events" + "github.com/vitess/vitess/go/vt/topo/topoproto" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/topo/shard_lock_test.go b/go/vt/topo/shard_lock_test.go index ad5db6286fc..ed27cc4ccc5 100644 --- a/go/vt/topo/shard_lock_test.go +++ b/go/vt/topo/shard_lock_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" ) // TestTopoShardLock tests shard lock operations. diff --git a/go/vt/topo/shard_test.go b/go/vt/topo/shard_test.go index fff09e874fe..cb8d7c32ade 100644 --- a/go/vt/topo/shard_test.go +++ b/go/vt/topo/shard_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // This file tests the shard related object functionnalities. diff --git a/go/vt/topo/srv_keyspace.go b/go/vt/topo/srv_keyspace.go index 88db2502cd7..8f6c62d584b 100644 --- a/go/vt/topo/srv_keyspace.go +++ b/go/vt/topo/srv_keyspace.go @@ -23,13 +23,13 @@ import ( "path" "sync" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/topo/topoproto" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // This file contains the utility methods to manage SrvKeyspace objects. diff --git a/go/vt/topo/srv_vschema.go b/go/vt/topo/srv_vschema.go index 1930b3986b9..bc821002902 100644 --- a/go/vt/topo/srv_vschema.go +++ b/go/vt/topo/srv_vschema.go @@ -21,10 +21,10 @@ import ( "fmt" "sync" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vterrors" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) // This file contains the utility methods to manage SrvVSchema objects. diff --git a/go/vt/topo/stats_conn.go b/go/vt/topo/stats_conn.go index ab80889bbfc..d29e3fe884b 100644 --- a/go/vt/topo/stats_conn.go +++ b/go/vt/topo/stats_conn.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) var _ Conn = (*StatsConn)(nil) diff --git a/go/vt/topo/stats_conn_test.go b/go/vt/topo/stats_conn_test.go index ed32e6429d5..0eb238216d8 100644 --- a/go/vt/topo/stats_conn_test.go +++ b/go/vt/topo/stats_conn_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // The fakeConn is a wrapper for a Conn that emits stats for every operation diff --git a/go/vt/topo/tablet.go b/go/vt/topo/tablet.go index f1f952abb34..160edf00e73 100644 --- a/go/vt/topo/tablet.go +++ b/go/vt/topo/tablet.go @@ -26,19 +26,19 @@ import ( "golang.org/x/sync/semaphore" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/key" - - "github.com/mdibaiee/vitess/go/event" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo/events" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/key" + + "github.com/vitess/vitess/go/event" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo/events" + "github.com/vitess/vitess/go/vt/topo/topoproto" ) // IsTrivialTypeChange returns if this db type be trivially reassigned diff --git a/go/vt/topo/tablet_test.go b/go/vt/topo/tablet_test.go index fd327b8b476..235cc291185 100644 --- a/go/vt/topo/tablet_test.go +++ b/go/vt/topo/tablet_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" ) // Test various cases of calls to GetTabletsByCell. diff --git a/go/vt/topo/test/directory.go b/go/vt/topo/test/directory.go index ebdd30951a0..18a0cff6355 100644 --- a/go/vt/topo/test/directory.go +++ b/go/vt/topo/test/directory.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // checkDirectory tests the directory part of the topo.Conn API. diff --git a/go/vt/topo/test/election.go b/go/vt/topo/test/election.go index 5832e2ae745..4c0cba0ef77 100644 --- a/go/vt/topo/test/election.go +++ b/go/vt/topo/test/election.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) func waitForLeaderID(t *testing.T, mp topo.LeaderParticipation, expected string) { diff --git a/go/vt/topo/test/file.go b/go/vt/topo/test/file.go index 583b27377b4..40dbfff625b 100644 --- a/go/vt/topo/test/file.go +++ b/go/vt/topo/test/file.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // checkFile tests the file part of the Conn API. diff --git a/go/vt/topo/test/keyspace.go b/go/vt/topo/test/keyspace.go index 2bb94b3f89c..49cfad88fb9 100644 --- a/go/vt/topo/test/keyspace.go +++ b/go/vt/topo/test/keyspace.go @@ -20,9 +20,9 @@ import ( "context" "testing" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // checkKeyspace tests the keyspace part of the API diff --git a/go/vt/topo/test/lock.go b/go/vt/topo/test/lock.go index 8165bb60a43..a4a81a962ad 100644 --- a/go/vt/topo/test/lock.go +++ b/go/vt/topo/test/lock.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // timeUntilLockIsTaken is the time to wait until a lock is taken. diff --git a/go/vt/topo/test/replication.go b/go/vt/topo/test/replication.go index ebbc3e61b1d..de3f1c4eebf 100644 --- a/go/vt/topo/test/replication.go +++ b/go/vt/topo/test/replication.go @@ -22,9 +22,9 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // checkShardReplication tests ShardReplication objects diff --git a/go/vt/topo/test/serving.go b/go/vt/topo/test/serving.go index 2688dd7ab65..4463fcf3559 100644 --- a/go/vt/topo/test/serving.go +++ b/go/vt/topo/test/serving.go @@ -22,10 +22,10 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) // checkSrvKeyspace tests the SrvKeyspace methods (other than watch). diff --git a/go/vt/topo/test/shard.go b/go/vt/topo/test/shard.go index 6165489e41a..d56cb877951 100644 --- a/go/vt/topo/test/shard.go +++ b/go/vt/topo/test/shard.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // checkShard verifies the Shard operations work correctly diff --git a/go/vt/topo/test/tablet.go b/go/vt/topo/test/tablet.go index eb551a7f181..d89307600fd 100644 --- a/go/vt/topo/test/tablet.go +++ b/go/vt/topo/test/tablet.go @@ -22,9 +22,9 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // checkTablet verifies the topo server API is correct for managing tablets. diff --git a/go/vt/topo/test/testing.go b/go/vt/topo/test/testing.go index 1575b2ef650..efd880bb2d6 100644 --- a/go/vt/topo/test/testing.go +++ b/go/vt/topo/test/testing.go @@ -18,16 +18,16 @@ limitations under the License. // implementations. If you are testing your implementation, you will // want to call TopoServerTestSuite in your test method. For an // example, look at the tests in -// github.com/mdibaiee/vitess/go/vt/topo/memorytopo. +// github.com/vitess/vitess/go/vt/topo/memorytopo. package test import ( "context" "testing" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // LocalCellName is the cell name used by this test suite. diff --git a/go/vt/topo/test/trylock.go b/go/vt/topo/test/trylock.go index 219d4796255..179c72a05a1 100644 --- a/go/vt/topo/test/trylock.go +++ b/go/vt/topo/test/trylock.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // checkTryLock checks if we can lock / unlock as expected. It's using a keyspace diff --git a/go/vt/topo/test/vschema.go b/go/vt/topo/test/vschema.go index 812c9489cee..5383e704b7e 100644 --- a/go/vt/topo/test/vschema.go +++ b/go/vt/topo/test/vschema.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) // checkVSchema runs the tests on the VSchema part of the API diff --git a/go/vt/topo/test/watch.go b/go/vt/topo/test/watch.go index d4496b03fc3..9b4a4dacf67 100644 --- a/go/vt/topo/test/watch.go +++ b/go/vt/topo/test/watch.go @@ -21,13 +21,13 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/key" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // waitForInitialValue waits for the initial value of diff --git a/go/vt/topo/topoproto/destination.go b/go/vt/topo/topoproto/destination.go index 14ca2b5b07a..4fbbf75ddac 100644 --- a/go/vt/topo/topoproto/destination.go +++ b/go/vt/topo/topoproto/destination.go @@ -20,11 +20,11 @@ import ( "encoding/hex" "strings" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/vterrors" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // ParseDestination parses the string representation of a Destination diff --git a/go/vt/topo/topoproto/destination_test.go b/go/vt/topo/topoproto/destination_test.go index 9e08769e3fc..b967b6ad4ec 100644 --- a/go/vt/topo/topoproto/destination_test.go +++ b/go/vt/topo/topoproto/destination_test.go @@ -21,9 +21,9 @@ import ( "reflect" "testing" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestParseDestination(t *testing.T) { diff --git a/go/vt/topo/topoproto/flag.go b/go/vt/topo/topoproto/flag.go index 5b27d18ea4b..e7e49c08281 100644 --- a/go/vt/topo/topoproto/flag.go +++ b/go/vt/topo/topoproto/flag.go @@ -19,7 +19,7 @@ package topoproto import ( "strings" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // TabletTypeListFlag implements the pflag.Value interface, for parsing a command-line comma-separated diff --git a/go/vt/topo/topoproto/keyspace.go b/go/vt/topo/topoproto/keyspace.go index 476ba14d8de..400fe2712fd 100644 --- a/go/vt/topo/topoproto/keyspace.go +++ b/go/vt/topo/topoproto/keyspace.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // ParseKeyspaceType parses a string into a KeyspaceType. diff --git a/go/vt/topo/topoproto/replication.go b/go/vt/topo/topoproto/replication.go index 4f516154598..8b596b7b6ef 100644 --- a/go/vt/topo/topoproto/replication.go +++ b/go/vt/topo/topoproto/replication.go @@ -16,7 +16,7 @@ limitations under the License. package topoproto -import topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" +import topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" var shardReplicationErrorTypeName map[int32]string diff --git a/go/vt/topo/topoproto/srvkeyspace.go b/go/vt/topo/topoproto/srvkeyspace.go index d43aa7a5e10..a06132f07d5 100644 --- a/go/vt/topo/topoproto/srvkeyspace.go +++ b/go/vt/topo/topoproto/srvkeyspace.go @@ -19,9 +19,9 @@ package topoproto import ( "sort" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // ShardReferenceArray is used for sorting ShardReference arrays diff --git a/go/vt/topo/topoproto/tablet.go b/go/vt/topo/topoproto/tablet.go index 21fcd0dde14..76f01ea45b8 100644 --- a/go/vt/topo/topoproto/tablet.go +++ b/go/vt/topo/topoproto/tablet.go @@ -28,11 +28,11 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/vt/vterrors" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // This file contains the topodata.Tablet utility functions. diff --git a/go/vt/topo/topoproto/tablet_test.go b/go/vt/topo/topoproto/tablet_test.go index 06ff485898f..184492b74cc 100644 --- a/go/vt/topo/topoproto/tablet_test.go +++ b/go/vt/topo/topoproto/tablet_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestParseTabletAlias(t *testing.T) { diff --git a/go/vt/topo/topotests/cell_info_test.go b/go/vt/topo/topotests/cell_info_test.go index cc906c11d23..d3b34f383e4 100644 --- a/go/vt/topo/topotests/cell_info_test.go +++ b/go/vt/topo/topotests/cell_info_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // This file tests the CellInfo part of the topo.Server API. diff --git a/go/vt/topo/topotests/cells_aliases_test.go b/go/vt/topo/topotests/cells_aliases_test.go index 002cbabb67e..cc44ca4c238 100644 --- a/go/vt/topo/topotests/cells_aliases_test.go +++ b/go/vt/topo/topotests/cells_aliases_test.go @@ -22,9 +22,9 @@ import ( "sort" "testing" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // This file tests the CellsAliases part of the topo.Server API. diff --git a/go/vt/topo/topotests/keyspace_test.go b/go/vt/topo/topotests/keyspace_test.go index cfb99f679c1..7744e4dc057 100644 --- a/go/vt/topo/topotests/keyspace_test.go +++ b/go/vt/topo/topotests/keyspace_test.go @@ -23,11 +23,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vterrors" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func TestCreateKeyspace(t *testing.T) { diff --git a/go/vt/topo/topotests/replication_test.go b/go/vt/topo/topotests/replication_test.go index 9e36fa2d180..ba1c816fa03 100644 --- a/go/vt/topo/topotests/replication_test.go +++ b/go/vt/topo/topotests/replication_test.go @@ -23,12 +23,12 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // This file contains tests for the replication.go file. diff --git a/go/vt/topo/topotests/shard_watch_test.go b/go/vt/topo/topotests/shard_watch_test.go index 573b18de260..0d12301795e 100644 --- a/go/vt/topo/topotests/shard_watch_test.go +++ b/go/vt/topo/topotests/shard_watch_test.go @@ -24,10 +24,10 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // waitForInitialShard waits for the initial Shard to appear. diff --git a/go/vt/topo/topotests/srv_keyspace_test.go b/go/vt/topo/topotests/srv_keyspace_test.go index 7ceba6d40ed..a0b3deeea46 100644 --- a/go/vt/topo/topotests/srv_keyspace_test.go +++ b/go/vt/topo/topotests/srv_keyspace_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // waitForInitialSrvKeyspace waits for the initial SrvKeyspace to diff --git a/go/vt/topo/topotests/srv_vschema_test.go b/go/vt/topo/topotests/srv_vschema_test.go index e5565da5d57..f9ae67f4384 100644 --- a/go/vt/topo/topotests/srv_vschema_test.go +++ b/go/vt/topo/topotests/srv_vschema_test.go @@ -21,10 +21,10 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) func TestRebuildVSchema(t *testing.T) { diff --git a/go/vt/topo/topotests/tablet_test.go b/go/vt/topo/topotests/tablet_test.go index 2443429cf02..88b8ee39a1f 100644 --- a/go/vt/topo/topotests/tablet_test.go +++ b/go/vt/topo/topotests/tablet_test.go @@ -22,9 +22,9 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // This file contains tests for the tablet.go file. diff --git a/go/vt/topo/topotests/wildcards_test.go b/go/vt/topo/topotests/wildcards_test.go index 9ed88df6a3c..dbf2e466683 100644 --- a/go/vt/topo/topotests/wildcards_test.go +++ b/go/vt/topo/topotests/wildcards_test.go @@ -20,10 +20,10 @@ import ( "context" "testing" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) type topoLayout struct { diff --git a/go/vt/topo/validator.go b/go/vt/topo/validator.go index 4b8d3622ae3..ef9e0c098a3 100644 --- a/go/vt/topo/validator.go +++ b/go/vt/topo/validator.go @@ -1,8 +1,8 @@ package topo import ( - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // ValidateObjectName checks that the name is a valid object name. diff --git a/go/vt/topo/vschema.go b/go/vt/topo/vschema.go index ba2ab3590ef..0460105eae1 100644 --- a/go/vt/topo/vschema.go +++ b/go/vt/topo/vschema.go @@ -22,10 +22,10 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vterrors" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) // SaveVSchema saves a Vschema. A valid Vschema should be passed in. It does not verify its correctness. diff --git a/go/vt/topo/wildcards.go b/go/vt/topo/wildcards.go index 2610e2bba2a..88f42d60610 100644 --- a/go/vt/topo/wildcards.go +++ b/go/vt/topo/wildcards.go @@ -23,11 +23,11 @@ import ( "context" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/fileutil" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/fileutil" + "github.com/vitess/vitess/go/vt/log" ) // ResolveKeyspaceWildcard will resolve keyspace wildcards. diff --git a/go/vt/topo/workflow.go b/go/vt/topo/workflow.go index 9f4c61a6168..4ce3c4c60d0 100644 --- a/go/vt/topo/workflow.go +++ b/go/vt/topo/workflow.go @@ -21,7 +21,7 @@ import ( "context" - workflowpb "github.com/mdibaiee/vitess/go/vt/proto/workflow" + workflowpb "github.com/vitess/vitess/go/vt/proto/workflow" ) // This file provides the utility methods to save / retrieve workflows diff --git a/go/vt/topo/zk2topo/directory.go b/go/vt/topo/zk2topo/directory.go index 85163f2405c..4f25437be3c 100644 --- a/go/vt/topo/zk2topo/directory.go +++ b/go/vt/topo/zk2topo/directory.go @@ -23,7 +23,7 @@ import ( "context" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // ListDir is part of the topo.Conn interface. diff --git a/go/vt/topo/zk2topo/election.go b/go/vt/topo/zk2topo/election.go index 39606d6fee7..a216646c3fd 100644 --- a/go/vt/topo/zk2topo/election.go +++ b/go/vt/topo/zk2topo/election.go @@ -23,10 +23,10 @@ import ( "github.com/z-division/go-zookeeper/zk" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" ) // This file contains the primary election code for zk2topo.Server. diff --git a/go/vt/topo/zk2topo/error.go b/go/vt/topo/zk2topo/error.go index b3cc7a300a8..c6782a65492 100644 --- a/go/vt/topo/zk2topo/error.go +++ b/go/vt/topo/zk2topo/error.go @@ -22,7 +22,7 @@ import ( "github.com/z-division/go-zookeeper/zk" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // Error codes returned by the zookeeper Go client: diff --git a/go/vt/topo/zk2topo/file.go b/go/vt/topo/zk2topo/file.go index 9a7215fab6e..f4cf3905e93 100644 --- a/go/vt/topo/zk2topo/file.go +++ b/go/vt/topo/zk2topo/file.go @@ -25,7 +25,7 @@ import ( "github.com/z-division/go-zookeeper/zk" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // Create is part of the topo.Conn interface. diff --git a/go/vt/topo/zk2topo/lock.go b/go/vt/topo/zk2topo/lock.go index f9f562ec3ed..16701a116f7 100644 --- a/go/vt/topo/zk2topo/lock.go +++ b/go/vt/topo/zk2topo/lock.go @@ -23,10 +23,10 @@ import ( "github.com/z-division/go-zookeeper/zk" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" ) // This file contains the lock management code for zktopo.Server. diff --git a/go/vt/topo/zk2topo/server.go b/go/vt/topo/zk2topo/server.go index 655c3709f21..50cc5ab4674 100644 --- a/go/vt/topo/zk2topo/server.go +++ b/go/vt/topo/zk2topo/server.go @@ -19,7 +19,7 @@ package zk2topo import ( "strings" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) const ( diff --git a/go/vt/topo/zk2topo/server_test.go b/go/vt/topo/zk2topo/server_test.go index 3ca87f6b7a5..374dfc92aec 100644 --- a/go/vt/topo/zk2topo/server_test.go +++ b/go/vt/topo/zk2topo/server_test.go @@ -25,12 +25,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/testfiles" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/test" - "github.com/mdibaiee/vitess/go/vt/zkctl" + "github.com/vitess/vitess/go/testfiles" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/test" + "github.com/vitess/vitess/go/vt/zkctl" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestZk2Topo(t *testing.T) { diff --git a/go/vt/topo/zk2topo/utils.go b/go/vt/topo/zk2topo/utils.go index fda16dc3456..fd23c9118d2 100644 --- a/go/vt/topo/zk2topo/utils.go +++ b/go/vt/topo/zk2topo/utils.go @@ -27,10 +27,10 @@ import ( "github.com/z-division/go-zookeeper/zk" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/fileutil" + "github.com/vitess/vitess/go/fileutil" ) // CreateRecursive is a helper function on top of Create. It will diff --git a/go/vt/topo/zk2topo/version.go b/go/vt/topo/zk2topo/version.go index 388da317f1c..b358d9652bd 100644 --- a/go/vt/topo/zk2topo/version.go +++ b/go/vt/topo/zk2topo/version.go @@ -19,7 +19,7 @@ package zk2topo import ( "fmt" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // ZKVersion is zookeeper's idea of a version. diff --git a/go/vt/topo/zk2topo/watch.go b/go/vt/topo/zk2topo/watch.go index efeaeffeb0a..bd22e878048 100644 --- a/go/vt/topo/zk2topo/watch.go +++ b/go/vt/topo/zk2topo/watch.go @@ -21,9 +21,9 @@ import ( "fmt" "path" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // Watch is part of the topo.Conn interface. diff --git a/go/vt/topo/zk2topo/zk_conn.go b/go/vt/topo/zk2topo/zk_conn.go index f2dd041d27d..93702003203 100644 --- a/go/vt/topo/zk2topo/zk_conn.go +++ b/go/vt/topo/zk2topo/zk_conn.go @@ -32,8 +32,8 @@ import ( "github.com/z-division/go-zookeeper/zk" "golang.org/x/sync/semaphore" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" ) const ( diff --git a/go/vt/topotools/events/reparent.go b/go/vt/topotools/events/reparent.go index ea6ec9be597..1cd1a3f6c48 100644 --- a/go/vt/topotools/events/reparent.go +++ b/go/vt/topotools/events/reparent.go @@ -19,10 +19,10 @@ limitations under the License. package events import ( - base "github.com/mdibaiee/vitess/go/vt/events" - "github.com/mdibaiee/vitess/go/vt/topo" + base "github.com/vitess/vitess/go/vt/events" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // Reparent is an event that describes a single step in the reparent process. diff --git a/go/vt/topotools/events/reparent_syslog.go b/go/vt/topotools/events/reparent_syslog.go index a4e7702cdeb..545eaeaad68 100644 --- a/go/vt/topotools/events/reparent_syslog.go +++ b/go/vt/topotools/events/reparent_syslog.go @@ -22,10 +22,10 @@ import ( "fmt" "log/syslog" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/event/syslogger" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/event/syslogger" + "github.com/vitess/vitess/go/vt/topo/topoproto" ) // Syslog writes a Reparent event to syslog. diff --git a/go/vt/topotools/events/reparent_syslog_test.go b/go/vt/topotools/events/reparent_syslog_test.go index a4fe92c692e..f325e4e534a 100644 --- a/go/vt/topotools/events/reparent_syslog_test.go +++ b/go/vt/topotools/events/reparent_syslog_test.go @@ -22,10 +22,10 @@ import ( "log/syslog" "testing" - base "github.com/mdibaiee/vitess/go/vt/events" - "github.com/mdibaiee/vitess/go/vt/topo" + base "github.com/vitess/vitess/go/vt/events" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestReparentSyslog(t *testing.T) { diff --git a/go/vt/topotools/keyspace.go b/go/vt/topotools/keyspace.go index b917aa71af4..4edba4301d2 100644 --- a/go/vt/topotools/keyspace.go +++ b/go/vt/topotools/keyspace.go @@ -23,11 +23,11 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // RefreshTabletsByShard calls RefreshState on all the tablets in a given shard. diff --git a/go/vt/topotools/rebuild_keyspace.go b/go/vt/topotools/rebuild_keyspace.go index fed5c2a253e..4098b620e73 100644 --- a/go/vt/topotools/rebuild_keyspace.go +++ b/go/vt/topotools/rebuild_keyspace.go @@ -21,12 +21,12 @@ import ( "fmt" "sync" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // RebuildKeyspace rebuilds the serving graph data while locking out other changes. diff --git a/go/vt/topotools/routing_rules.go b/go/vt/topotools/routing_rules.go index 0cd43b6cafa..654d9ddaa62 100644 --- a/go/vt/topotools/routing_rules.go +++ b/go/vt/topotools/routing_rules.go @@ -21,10 +21,10 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) // region routing rules diff --git a/go/vt/topotools/routing_rules_test.go b/go/vt/topotools/routing_rules_test.go index efd9b6c0aba..9ca853eed6a 100644 --- a/go/vt/topotools/routing_rules_test.go +++ b/go/vt/topotools/routing_rules_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" ) func TestRoutingRulesRoundTrip(t *testing.T) { diff --git a/go/vt/topotools/shard_test.go b/go/vt/topotools/shard_test.go index a05ad07e35d..146c0f3de2a 100644 --- a/go/vt/topotools/shard_test.go +++ b/go/vt/topotools/shard_test.go @@ -23,8 +23,8 @@ import ( "sync" "testing" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo/memorytopo" ) // TestCreateShard tests a few cases for topo.CreateShard diff --git a/go/vt/topotools/split.go b/go/vt/topotools/split.go index 01bd9634682..d817e072505 100644 --- a/go/vt/topotools/split.go +++ b/go/vt/topotools/split.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" ) // ValidateForReshard returns an error if sourceShards cannot reshard into diff --git a/go/vt/topotools/split_test.go b/go/vt/topotools/split_test.go index 27f1ce5d76e..02fac7c5d07 100644 --- a/go/vt/topotools/split_test.go +++ b/go/vt/topotools/split_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestValidateForReshard(t *testing.T) { diff --git a/go/vt/topotools/tablet.go b/go/vt/topotools/tablet.go index aa3cd6a5c08..390b2e85e54 100644 --- a/go/vt/topotools/tablet.go +++ b/go/vt/topotools/tablet.go @@ -39,15 +39,15 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/hook" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/vt/hook" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/proto/vttime" ) // ConfigureTabletHook configures the right parameters for a hook diff --git a/go/vt/topotools/tablet_test.go b/go/vt/topotools/tablet_test.go index 4130081f751..74e9ead5ca4 100644 --- a/go/vt/topotools/tablet_test.go +++ b/go/vt/topotools/tablet_test.go @@ -19,7 +19,7 @@ package topotools import ( "testing" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestCheckOwnership(t *testing.T) { diff --git a/go/vt/topotools/utils.go b/go/vt/topotools/utils.go index c254c55f308..0fedbd526b2 100644 --- a/go/vt/topotools/utils.go +++ b/go/vt/topotools/utils.go @@ -20,9 +20,9 @@ import ( "context" "sync" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // FindTabletByHostAndPort searches within a tablet map for tablets. diff --git a/go/vt/topotools/vschema_ddl.go b/go/vt/topotools/vschema_ddl.go index 00fdee40755..55ff22e09fe 100644 --- a/go/vt/topotools/vschema_ddl.go +++ b/go/vt/topotools/vschema_ddl.go @@ -19,11 +19,11 @@ package topotools import ( "reflect" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // ApplyVSchemaDDL applies the given DDL statement to the vschema diff --git a/go/vt/vitessdriver/README.md b/go/vt/vitessdriver/README.md index dd9d2c9a84a..dd7b807a94d 100644 --- a/go/vt/vitessdriver/README.md +++ b/go/vt/vitessdriver/README.md @@ -10,12 +10,12 @@ For more information, visit www.vitess.io. For more information on this driver, please see its godoc page: -https://godoc.org/github.com/mdibaiee/vitess/go/vt/vitessdriver +https://godoc.org/github.com/vitess/vitess/go/vt/vitessdriver ## Installation ```sh -go get github.com/mdibaiee/vitess/go/vt/vitessdriver +go get github.com/vitess/vitess/go/vt/vitessdriver ``` See the documentation link above for examples. diff --git a/go/vt/vitessdriver/convert.go b/go/vt/vitessdriver/convert.go index ce08d70f000..967141ce179 100644 --- a/go/vt/vitessdriver/convert.go +++ b/go/vt/vitessdriver/convert.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) type converter struct { diff --git a/go/vt/vitessdriver/convert_test.go b/go/vt/vitessdriver/convert_test.go index c880847eb72..96029357fd8 100644 --- a/go/vt/vitessdriver/convert_test.go +++ b/go/vt/vitessdriver/convert_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) func TestToNative(t *testing.T) { diff --git a/go/vt/vitessdriver/doc.go b/go/vt/vitessdriver/doc.go index e4aad58da8c..0bc07126cd1 100644 --- a/go/vt/vitessdriver/doc.go +++ b/go/vt/vitessdriver/doc.go @@ -28,7 +28,7 @@ Example Using this SQL driver is as simple as: import ( - "github.com/mdibaiee/vitess/go/vt/vitessdriver" + "github.com/vitess/vitess/go/vt/vitessdriver" ) func main() { diff --git a/go/vt/vitessdriver/driver.go b/go/vt/vitessdriver/driver.go index 972778600b7..f2d64b4a178 100644 --- a/go/vt/vitessdriver/driver.go +++ b/go/vt/vitessdriver/driver.go @@ -27,11 +27,11 @@ import ( "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateconn" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateconn" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" ) var ( diff --git a/go/vt/vitessdriver/driver_test.go b/go/vt/vitessdriver/driver_test.go index 6861c0407a5..25eebb055ac 100644 --- a/go/vt/vitessdriver/driver_test.go +++ b/go/vt/vitessdriver/driver_test.go @@ -33,9 +33,9 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateservice" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateservice" ) var testAddress string diff --git a/go/vt/vitessdriver/fakeserver_test.go b/go/vt/vitessdriver/fakeserver_test.go index a38411ed0f8..aa3eddb2961 100644 --- a/go/vt/vitessdriver/fakeserver_test.go +++ b/go/vt/vitessdriver/fakeserver_test.go @@ -24,12 +24,12 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/sqltypes" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateservice" + "github.com/vitess/vitess/go/sqltypes" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/vt/vtgate/vtgateservice" ) // fakeVTGateService has the server side of this fake diff --git a/go/vt/vitessdriver/plugin_grpcvtgateconn.go b/go/vt/vitessdriver/plugin_grpcvtgateconn.go index 11bf6700129..6bbaf3eec60 100644 --- a/go/vt/vitessdriver/plugin_grpcvtgateconn.go +++ b/go/vt/vitessdriver/plugin_grpcvtgateconn.go @@ -21,5 +21,5 @@ package vitessdriver import ( // Import the gRPC vtgateconn client and make it part of the Vitess // Go SQL driver. This way, users do not have to do this. - _ "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateconn" + _ "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateconn" ) diff --git a/go/vt/vitessdriver/rows.go b/go/vt/vitessdriver/rows.go index 1eb48a66ca5..c0f69849c87 100644 --- a/go/vt/vitessdriver/rows.go +++ b/go/vt/vitessdriver/rows.go @@ -23,8 +23,8 @@ import ( "reflect" "time" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/proto/query" ) // rows creates a database/sql/driver compliant Row iterator diff --git a/go/vt/vitessdriver/rows_test.go b/go/vt/vitessdriver/rows_test.go index 3b53e104c9f..61d375630d7 100644 --- a/go/vt/vitessdriver/rows_test.go +++ b/go/vt/vitessdriver/rows_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var rowsResult1 = sqltypes.Result{ diff --git a/go/vt/vitessdriver/streaming_rows.go b/go/vt/vitessdriver/streaming_rows.go index 7616bbf058f..49b9f55184f 100644 --- a/go/vt/vitessdriver/streaming_rows.go +++ b/go/vt/vitessdriver/streaming_rows.go @@ -20,9 +20,9 @@ import ( "database/sql/driver" "errors" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // streamingRows creates a database/sql/driver compliant Row iterator diff --git a/go/vt/vitessdriver/streaming_rows_test.go b/go/vt/vitessdriver/streaming_rows_test.go index bcbc92e49ce..74df68ef6e0 100644 --- a/go/vt/vitessdriver/streaming_rows_test.go +++ b/go/vt/vitessdriver/streaming_rows_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var packet1 = sqltypes.Result{ diff --git a/go/vt/vitessdriver/time.go b/go/vt/vitessdriver/time.go index 3f634db26af..9c7d4478955 100644 --- a/go/vt/vitessdriver/time.go +++ b/go/vt/vitessdriver/time.go @@ -20,7 +20,7 @@ import ( "errors" "time" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) // ErrInvalidTime is returned when we fail to parse a datetime diff --git a/go/vt/vitessdriver/time_test.go b/go/vt/vitessdriver/time_test.go index a45820549a4..1bedc5bda37 100644 --- a/go/vt/vitessdriver/time_test.go +++ b/go/vt/vitessdriver/time_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) var randomLocation = time.FixedZone("Nowhere", 3*60*60) diff --git a/go/vt/vtaclcheck/vtaclcheck.go b/go/vt/vtaclcheck/vtaclcheck.go index 356bb5e2f68..46318f6b35a 100644 --- a/go/vt/vtaclcheck/vtaclcheck.go +++ b/go/vt/vtaclcheck/vtaclcheck.go @@ -22,9 +22,9 @@ package vtaclcheck import ( "fmt" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/tableacl" - "github.com/mdibaiee/vitess/go/vt/tableacl/simpleacl" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/tableacl" + "github.com/vitess/vitess/go/vt/tableacl/simpleacl" ) // Options to control the explain process diff --git a/go/vt/vtadmin/api.go b/go/vt/vtadmin/api.go index 4601479b2fb..a78305578f7 100644 --- a/go/vt/vtadmin/api.go +++ b/go/vt/vtadmin/api.go @@ -32,34 +32,34 @@ import ( "github.com/gorilla/mux" "github.com/patrickmn/go-cache" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/vtenv" - - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/dynamic" - "github.com/mdibaiee/vitess/go/vt/vtadmin/errors" - "github.com/mdibaiee/vitess/go/vt/vtadmin/grpcserver" - vtadminhttp "github.com/mdibaiee/vitess/go/vt/vtadmin/http" - "github.com/mdibaiee/vitess/go/vt/vtadmin/http/debug" - "github.com/mdibaiee/vitess/go/vt/vtadmin/http/experimental" - vthandlers "github.com/mdibaiee/vitess/go/vt/vtadmin/http/handlers" - "github.com/mdibaiee/vitess/go/vt/vtadmin/rbac" - "github.com/mdibaiee/vitess/go/vt/vtadmin/sort" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtadminproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtexplain" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/vtenv" + + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtadmin/cluster" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/dynamic" + "github.com/vitess/vitess/go/vt/vtadmin/errors" + "github.com/vitess/vitess/go/vt/vtadmin/grpcserver" + vtadminhttp "github.com/vitess/vitess/go/vt/vtadmin/http" + "github.com/vitess/vitess/go/vt/vtadmin/http/debug" + "github.com/vitess/vitess/go/vt/vtadmin/http/experimental" + vthandlers "github.com/vitess/vitess/go/vt/vtadmin/http/handlers" + "github.com/vitess/vitess/go/vt/vtadmin/rbac" + "github.com/vitess/vitess/go/vt/vtadmin/sort" + "github.com/vitess/vitess/go/vt/vtadmin/vtadminproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtexplain" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // API is the main entrypoint for the vtadmin server. It implements diff --git a/go/vt/vtadmin/api_authz_test.go b/go/vt/vtadmin/api_authz_test.go index 449c12add33..456ece1f95b 100644 --- a/go/vt/vtadmin/api_authz_test.go +++ b/go/vt/vtadmin/api_authz_test.go @@ -27,21 +27,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtadmin" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster" - "github.com/mdibaiee/vitess/go/vt/vtadmin/rbac" - "github.com/mdibaiee/vitess/go/vt/vtadmin/testutil" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtctldclient/fakevtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtenv" - - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - mysqlctlpb "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtadmin" + "github.com/vitess/vitess/go/vt/vtadmin/cluster" + "github.com/vitess/vitess/go/vt/vtadmin/rbac" + "github.com/vitess/vitess/go/vt/vtadmin/testutil" + "github.com/vitess/vitess/go/vt/vtadmin/vtctldclient/fakevtctldclient" + "github.com/vitess/vitess/go/vt/vtenv" + + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + mysqlctlpb "github.com/vitess/vitess/go/vt/proto/mysqlctl" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) func TestApplySchema(t *testing.T) { diff --git a/go/vt/vtadmin/api_test.go b/go/vt/vtadmin/api_test.go index bbd8a67d9b9..7923dc7f784 100644 --- a/go/vt/vtadmin/api_test.go +++ b/go/vt/vtadmin/api_test.go @@ -32,32 +32,32 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/vtenv" - - _flag "github.com/mdibaiee/vitess/go/internal/flag" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/discovery/fakediscovery" - vtadminerrors "github.com/mdibaiee/vitess/go/vt/vtadmin/errors" - vtadmintestutil "github.com/mdibaiee/vitess/go/vt/vtadmin/testutil" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtctldclient/fakevtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver/testutil" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctldclient" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclienttest" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/vt/vtenv" + + _flag "github.com/vitess/vitess/go/internal/flag" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtadmin/cluster" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/discovery/fakediscovery" + vtadminerrors "github.com/vitess/vitess/go/vt/vtadmin/errors" + vtadmintestutil "github.com/vitess/vitess/go/vt/vtadmin/testutil" + "github.com/vitess/vitess/go/vt/vtadmin/vtctldclient/fakevtctldclient" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver/testutil" + "github.com/vitess/vitess/go/vt/vtctl/vtctldclient" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/vttablet/tmclienttest" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" + "github.com/vitess/vitess/go/vt/proto/vttime" ) func TestMain(m *testing.M) { diff --git a/go/vt/vtadmin/cache/cache.go b/go/vt/vtadmin/cache/cache.go index b34d76b5058..df5a741f460 100644 --- a/go/vt/vtadmin/cache/cache.go +++ b/go/vt/vtadmin/cache/cache.go @@ -25,7 +25,7 @@ import ( "github.com/patrickmn/go-cache" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // Keyer is the interface cache keys implement to turn themselves into string diff --git a/go/vt/vtadmin/cache/cache_test.go b/go/vt/vtadmin/cache/cache_test.go index 59508e4edc1..387de794bfe 100644 --- a/go/vt/vtadmin/cache/cache_test.go +++ b/go/vt/vtadmin/cache/cache_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cache" + "github.com/vitess/vitess/go/vt/vtadmin/cache" ) type testkey string diff --git a/go/vt/vtadmin/cache/refresh.go b/go/vt/vtadmin/cache/refresh.go index 7a051aaaf65..dda9e9b904b 100644 --- a/go/vt/vtadmin/cache/refresh.go +++ b/go/vt/vtadmin/cache/refresh.go @@ -25,7 +25,7 @@ import ( "google.golang.org/grpc/metadata" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/vt/vtadmin/cache/refresh_test.go b/go/vt/vtadmin/cache/refresh_test.go index a5a218b38fc..a62987a42a0 100644 --- a/go/vt/vtadmin/cache/refresh_test.go +++ b/go/vt/vtadmin/cache/refresh_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/grpc/metadata" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cache" + "github.com/vitess/vitess/go/vt/vtadmin/cache" ) const refreshKey = "cache_test" diff --git a/go/vt/vtadmin/cluster/cluster.go b/go/vt/vtadmin/cluster/cluster.go index 3fb238a2279..5be90b09cc7 100644 --- a/go/vt/vtadmin/cluster/cluster.go +++ b/go/vt/vtadmin/cluster/cluster.go @@ -30,28 +30,28 @@ import ( "text/template" "time" - "github.com/mdibaiee/vitess/go/pools" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cache" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/discovery" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/internal/caches/schemacache" - "github.com/mdibaiee/vitess/go/vt/vtadmin/debug" - "github.com/mdibaiee/vitess/go/vt/vtadmin/errors" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtadminproto" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtsql" - "github.com/mdibaiee/vitess/go/vt/vtctl/schematools" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/pools" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtadmin/cache" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/discovery" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/internal/caches/schemacache" + "github.com/vitess/vitess/go/vt/vtadmin/debug" + "github.com/vitess/vitess/go/vt/vtadmin/errors" + "github.com/vitess/vitess/go/vt/vtadmin/vtadminproto" + "github.com/vitess/vitess/go/vt/vtadmin/vtctldclient" + "github.com/vitess/vitess/go/vt/vtadmin/vtsql" + "github.com/vitess/vitess/go/vt/vtctl/schematools" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // Cluster is the self-contained unit of services required for vtadmin to talk diff --git a/go/vt/vtadmin/cluster/cluster_internal_test.go b/go/vt/vtadmin/cluster/cluster_internal_test.go index dc80f37a7c0..16b7d1ee241 100644 --- a/go/vt/vtadmin/cluster/cluster_internal_test.go +++ b/go/vt/vtadmin/cluster/cluster_internal_test.go @@ -27,22 +27,22 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/pools" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vitessdriver" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/resolver" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtctldclient/fakevtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtsql" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtsql/fakevtsql" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctldclient" - - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/pools" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vitessdriver" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/resolver" + "github.com/vitess/vitess/go/vt/vtadmin/vtctldclient/fakevtctldclient" + "github.com/vitess/vitess/go/vt/vtadmin/vtsql" + "github.com/vitess/vitess/go/vt/vtadmin/vtsql/fakevtsql" + "github.com/vitess/vitess/go/vt/vtctl/vtctldclient" + + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) type vtctldProxy struct { diff --git a/go/vt/vtadmin/cluster/cluster_test.go b/go/vt/vtadmin/cluster/cluster_test.go index fd9be4c8065..14f4131147f 100644 --- a/go/vt/vtadmin/cluster/cluster_test.go +++ b/go/vt/vtadmin/cluster/cluster_test.go @@ -28,23 +28,23 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster" - vtadminerrors "github.com/mdibaiee/vitess/go/vt/vtadmin/errors" - "github.com/mdibaiee/vitess/go/vt/vtadmin/testutil" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtctldclient/fakevtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctldclient" - - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtadmin/cluster" + vtadminerrors "github.com/vitess/vitess/go/vt/vtadmin/errors" + "github.com/vitess/vitess/go/vt/vtadmin/testutil" + "github.com/vitess/vitess/go/vt/vtadmin/vtctldclient/fakevtctldclient" + "github.com/vitess/vitess/go/vt/vtctl/vtctldclient" + + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) func TestCreateKeyspace(t *testing.T) { diff --git a/go/vt/vtadmin/cluster/config.go b/go/vt/vtadmin/cluster/config.go index 556e8478910..73eba7f2f49 100644 --- a/go/vt/vtadmin/cluster/config.go +++ b/go/vt/vtadmin/cluster/config.go @@ -27,12 +27,12 @@ import ( "github.com/spf13/viper" - "github.com/mdibaiee/vitess/go/pools" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cache" - "github.com/mdibaiee/vitess/go/vt/vtadmin/errors" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtsql" + "github.com/vitess/vitess/go/pools" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtadmin/cache" + "github.com/vitess/vitess/go/vt/vtadmin/errors" + "github.com/vitess/vitess/go/vt/vtadmin/vtctldclient" + "github.com/vitess/vitess/go/vt/vtadmin/vtsql" ) var ( diff --git a/go/vt/vtadmin/cluster/discovery/discovery.go b/go/vt/vtadmin/cluster/discovery/discovery.go index c4a5fb5d520..330cac6681d 100644 --- a/go/vt/vtadmin/cluster/discovery/discovery.go +++ b/go/vt/vtadmin/cluster/discovery/discovery.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/pflag" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) var ( diff --git a/go/vt/vtadmin/cluster/discovery/discovery_consul.go b/go/vt/vtadmin/cluster/discovery/discovery_consul.go index 497b65dac59..e196908f87b 100644 --- a/go/vt/vtadmin/cluster/discovery/discovery_consul.go +++ b/go/vt/vtadmin/cluster/discovery/discovery_consul.go @@ -27,10 +27,10 @@ import ( consul "github.com/hashicorp/consul/api" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/trace" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/trace" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // ConsulDiscovery implements the Discovery interface for consul. diff --git a/go/vt/vtadmin/cluster/discovery/discovery_consul_test.go b/go/vt/vtadmin/cluster/discovery/discovery_consul_test.go index 6f83be82ac4..48d0b91ea45 100644 --- a/go/vt/vtadmin/cluster/discovery/discovery_consul_test.go +++ b/go/vt/vtadmin/cluster/discovery/discovery_consul_test.go @@ -25,7 +25,7 @@ import ( consul "github.com/hashicorp/consul/api" "github.com/stretchr/testify/assert" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) type fakeConsulClient struct { diff --git a/go/vt/vtadmin/cluster/discovery/discovery_dynamic.go b/go/vt/vtadmin/cluster/discovery/discovery_dynamic.go index 45f502daff4..147ec97af05 100644 --- a/go/vt/vtadmin/cluster/discovery/discovery_dynamic.go +++ b/go/vt/vtadmin/cluster/discovery/discovery_dynamic.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/pflag" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // DynamicDiscovery implements the Discovery interface for "discovering" diff --git a/go/vt/vtadmin/cluster/discovery/discovery_dynamic_test.go b/go/vt/vtadmin/cluster/discovery/discovery_dynamic_test.go index 0b02c64faea..c25e453bc25 100644 --- a/go/vt/vtadmin/cluster/discovery/discovery_dynamic_test.go +++ b/go/vt/vtadmin/cluster/discovery/discovery_dynamic_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) func TestDynamicDiscoverVTGate(t *testing.T) { diff --git a/go/vt/vtadmin/cluster/discovery/discovery_json.go b/go/vt/vtadmin/cluster/discovery/discovery_json.go index 5088ea5939e..bc33accbd23 100644 --- a/go/vt/vtadmin/cluster/discovery/discovery_json.go +++ b/go/vt/vtadmin/cluster/discovery/discovery_json.go @@ -22,9 +22,9 @@ import ( "fmt" "math/rand/v2" - "github.com/mdibaiee/vitess/go/trace" + "github.com/vitess/vitess/go/trace" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // JSONDiscovery implements the Discovery interface for "discovering" diff --git a/go/vt/vtadmin/cluster/discovery/discovery_static_file.go b/go/vt/vtadmin/cluster/discovery/discovery_static_file.go index 04d01d94690..4af8b8b59a1 100644 --- a/go/vt/vtadmin/cluster/discovery/discovery_static_file.go +++ b/go/vt/vtadmin/cluster/discovery/discovery_static_file.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/pflag" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // StaticFileDiscovery implements the Discovery interface for "discovering" diff --git a/go/vt/vtadmin/cluster/discovery/discovery_static_file_test.go b/go/vt/vtadmin/cluster/discovery/discovery_static_file_test.go index 2b03cca36b3..5056660baff 100644 --- a/go/vt/vtadmin/cluster/discovery/discovery_static_file_test.go +++ b/go/vt/vtadmin/cluster/discovery/discovery_static_file_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) func TestDiscoverVTGate(t *testing.T) { diff --git a/go/vt/vtadmin/cluster/discovery/discovery_test.go b/go/vt/vtadmin/cluster/discovery/discovery_test.go index e73b58de3ab..b7037150afc 100644 --- a/go/vt/vtadmin/cluster/discovery/discovery_test.go +++ b/go/vt/vtadmin/cluster/discovery/discovery_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) func TestNew(t *testing.T) { diff --git a/go/vt/vtadmin/cluster/discovery/fakediscovery/discovery.go b/go/vt/vtadmin/cluster/discovery/fakediscovery/discovery.go index bc82cd159a9..fe454b16c3a 100644 --- a/go/vt/vtadmin/cluster/discovery/fakediscovery/discovery.go +++ b/go/vt/vtadmin/cluster/discovery/fakediscovery/discovery.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/discovery" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/discovery" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) type vtctlds struct { diff --git a/go/vt/vtadmin/cluster/discovery/fakediscovery/discovery_test.go b/go/vt/vtadmin/cluster/discovery/fakediscovery/discovery_test.go index fcfe6922593..290a47ec301 100644 --- a/go/vt/vtadmin/cluster/discovery/fakediscovery/discovery_test.go +++ b/go/vt/vtadmin/cluster/discovery/fakediscovery/discovery_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) func TestDiscoverVTGates(t *testing.T) { diff --git a/go/vt/vtadmin/cluster/dynamic/api.go b/go/vt/vtadmin/cluster/dynamic/api.go index 63a9bc54252..07cb3b019ec 100644 --- a/go/vt/vtadmin/cluster/dynamic/api.go +++ b/go/vt/vtadmin/cluster/dynamic/api.go @@ -3,9 +3,9 @@ package dynamic import ( "net/http" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster" + "github.com/vitess/vitess/go/vt/vtadmin/cluster" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // API is the interface dynamic APIs must implement. diff --git a/go/vt/vtadmin/cluster/dynamic/cluster.go b/go/vt/vtadmin/cluster/dynamic/cluster.go index 61ac0ea6ca7..0f9d713dd5d 100644 --- a/go/vt/vtadmin/cluster/dynamic/cluster.go +++ b/go/vt/vtadmin/cluster/dynamic/cluster.go @@ -5,7 +5,7 @@ import ( "encoding/base64" "strings" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster" + "github.com/vitess/vitess/go/vt/vtadmin/cluster" ) // ClusterFromString returns a cluster ID and possibly fully-usable Cluster diff --git a/go/vt/vtadmin/cluster/dynamic/interceptors.go b/go/vt/vtadmin/cluster/dynamic/interceptors.go index 4cc4dbaddeb..92e005ff0db 100644 --- a/go/vt/vtadmin/cluster/dynamic/interceptors.go +++ b/go/vt/vtadmin/cluster/dynamic/interceptors.go @@ -8,10 +8,10 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtadmin/cluster" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // StreamServerInterceptor returns a StreamServerInterceptor that redirects a diff --git a/go/vt/vtadmin/cluster/flags.go b/go/vt/vtadmin/cluster/flags.go index 6b0835c29fe..cebbace3b24 100644 --- a/go/vt/vtadmin/cluster/flags.go +++ b/go/vt/vtadmin/cluster/flags.go @@ -21,8 +21,8 @@ import ( "regexp" "strings" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cache" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtadmin/cache" ) // FlagsByImpl groups a set of flags by discovery implementation. Its mapping is diff --git a/go/vt/vtadmin/cluster/internal/caches/schemacache/cache.go b/go/vt/vtadmin/cluster/internal/caches/schemacache/cache.go index a6e28676d80..a6a07dd1edf 100644 --- a/go/vt/vtadmin/cluster/internal/caches/schemacache/cache.go +++ b/go/vt/vtadmin/cluster/internal/caches/schemacache/cache.go @@ -22,15 +22,15 @@ import ( "fmt" "time" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cache" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/vtadmin/cache" + "github.com/vitess/vitess/go/vt/vterrors" + + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // Key is the cache key for vtadmin's schema caches. diff --git a/go/vt/vtadmin/cluster/internal/caches/schemacache/cache_test.go b/go/vt/vtadmin/cluster/internal/caches/schemacache/cache_test.go index 335d4a58c4a..bc0c3ec2d4f 100644 --- a/go/vt/vtadmin/cluster/internal/caches/schemacache/cache_test.go +++ b/go/vt/vtadmin/cluster/internal/caches/schemacache/cache_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) func TestLoadOptions(t *testing.T) { diff --git a/go/vt/vtadmin/cluster/resolver/resolver.go b/go/vt/vtadmin/cluster/resolver/resolver.go index 03a74d5e304..5320f281f4a 100644 --- a/go/vt/vtadmin/cluster/resolver/resolver.go +++ b/go/vt/vtadmin/cluster/resolver/resolver.go @@ -38,11 +38,11 @@ import ( grpcresolver "google.golang.org/grpc/resolver" "google.golang.org/grpc/serviceconfig" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/discovery" - "github.com/mdibaiee/vitess/go/vt/vtadmin/debug" - "github.com/mdibaiee/vitess/go/vt/vtadmin/internal/backoff" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/discovery" + "github.com/vitess/vitess/go/vt/vtadmin/debug" + "github.com/vitess/vitess/go/vt/vtadmin/internal/backoff" ) const logPrefix = "[vtadmin.cluster.resolver]" diff --git a/go/vt/vtadmin/cluster/resolver/resolver_test.go b/go/vt/vtadmin/cluster/resolver/resolver_test.go index defee161e3a..032596c371f 100644 --- a/go/vt/vtadmin/cluster/resolver/resolver_test.go +++ b/go/vt/vtadmin/cluster/resolver/resolver_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/require" grpcresolver "google.golang.org/grpc/resolver" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/discovery/fakediscovery" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/discovery/fakediscovery" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) type mockClientConn struct { diff --git a/go/vt/vtadmin/cluster/trace.go b/go/vt/vtadmin/cluster/trace.go index 684b066eb49..c66275cac0c 100644 --- a/go/vt/vtadmin/cluster/trace.go +++ b/go/vt/vtadmin/cluster/trace.go @@ -19,11 +19,11 @@ package cluster import ( "strings" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtadminproto" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtadmin/vtadminproto" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // AnnotateSpan adds the cluster_id and cluster_name to a span. diff --git a/go/vt/vtadmin/credentials/credentials.go b/go/vt/vtadmin/credentials/credentials.go index fa69a3132c0..693ba0856f3 100644 --- a/go/vt/vtadmin/credentials/credentials.go +++ b/go/vt/vtadmin/credentials/credentials.go @@ -22,7 +22,7 @@ import ( "os" "text/template" - "github.com/mdibaiee/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/grpcclient" ) // LoadFromTemplate renders a template string into a path, using the data diff --git a/go/vt/vtadmin/credentials/credentials_test.go b/go/vt/vtadmin/credentials/credentials_test.go index fadb2492a93..1213df01f70 100644 --- a/go/vt/vtadmin/credentials/credentials_test.go +++ b/go/vt/vtadmin/credentials/credentials_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/grpcclient" ) func Test_loadCredentials(t *testing.T) { diff --git a/go/vt/vtadmin/debug.go b/go/vt/vtadmin/debug.go index 37cf81416b8..17ce4ad45f0 100644 --- a/go/vt/vtadmin/debug.go +++ b/go/vt/vtadmin/debug.go @@ -16,7 +16,7 @@ limitations under the License. package vtadmin -import "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster" +import "github.com/vitess/vitess/go/vt/vtadmin/cluster" // debugAPI wraps a vtadmin API for use in the vtadmin/http/debug package // endpoints. diff --git a/go/vt/vtadmin/grpcserver/server.go b/go/vt/vtadmin/grpcserver/server.go index 1060c46d3bd..43442cfffca 100644 --- a/go/vt/vtadmin/grpcserver/server.go +++ b/go/vt/vtadmin/grpcserver/server.go @@ -41,12 +41,12 @@ import ( "google.golang.org/grpc/health" "google.golang.org/grpc/reflection" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vterrors" healthpb "google.golang.org/grpc/health/grpc_health_v1" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // Options defines the set of configurations for a gRPC server. diff --git a/go/vt/vtadmin/http/api.go b/go/vt/vtadmin/http/api.go index ff947a6f50b..6d4916ca3c2 100644 --- a/go/vt/vtadmin/http/api.go +++ b/go/vt/vtadmin/http/api.go @@ -20,13 +20,13 @@ import ( "context" "net/http" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cache" - "github.com/mdibaiee/vitess/go/vt/vtadmin/rbac" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtadmin/cache" + "github.com/vitess/vitess/go/vt/vtadmin/rbac" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // Options defines the set of configurations for an HTTP API server. diff --git a/go/vt/vtadmin/http/backups.go b/go/vt/vtadmin/http/backups.go index cc346d22c91..3fb04fac7d3 100644 --- a/go/vt/vtadmin/http/backups.go +++ b/go/vt/vtadmin/http/backups.go @@ -19,10 +19,10 @@ package http import ( "context" - "github.com/mdibaiee/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/concurrency" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // GetBackups implements the http wrapper for /backups[?cluster_id=[&cluster_id=]]. diff --git a/go/vt/vtadmin/http/cells.go b/go/vt/vtadmin/http/cells.go index 7eaa3923b2a..f5cedbadd07 100644 --- a/go/vt/vtadmin/http/cells.go +++ b/go/vt/vtadmin/http/cells.go @@ -19,7 +19,7 @@ package http import ( "context" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // GetCellInfos implements the http wrapper for the diff --git a/go/vt/vtadmin/http/clusters.go b/go/vt/vtadmin/http/clusters.go index 3fca7965f0b..a48d36aeca3 100644 --- a/go/vt/vtadmin/http/clusters.go +++ b/go/vt/vtadmin/http/clusters.go @@ -22,8 +22,8 @@ import ( "github.com/gorilla/mux" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - "github.com/mdibaiee/vitess/go/vt/vtadmin/errors" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + "github.com/vitess/vitess/go/vt/vtadmin/errors" ) // GetClusters implements the http wrapper for /clusters diff --git a/go/vt/vtadmin/http/debug/debug.go b/go/vt/vtadmin/http/debug/debug.go index 4fdbcfbe062..a3a756ed243 100644 --- a/go/vt/vtadmin/http/debug/debug.go +++ b/go/vt/vtadmin/http/debug/debug.go @@ -16,7 +16,7 @@ limitations under the License. package debug -import "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster" +import "github.com/vitess/vitess/go/vt/vtadmin/cluster" // API defines the interface needed to provide debug info for a vtadmin.API. // This is implemented by a private wrapper struct in package vtadmin, to diff --git a/go/vt/vtadmin/http/debug/env.go b/go/vt/vtadmin/http/debug/env.go index d18f9087954..db716fc5e78 100644 --- a/go/vt/vtadmin/http/debug/env.go +++ b/go/vt/vtadmin/http/debug/env.go @@ -23,8 +23,8 @@ import ( "sort" "strings" - "github.com/mdibaiee/vitess/go/flagutil" - vtadmindebug "github.com/mdibaiee/vitess/go/vt/vtadmin/debug" + "github.com/vitess/vitess/go/flagutil" + vtadmindebug "github.com/vitess/vitess/go/vt/vtadmin/debug" ) var ( diff --git a/go/vt/vtadmin/http/experimental/tablets.go b/go/vt/vtadmin/http/experimental/tablets.go index 128d8325dbd..b42e0114acb 100644 --- a/go/vt/vtadmin/http/experimental/tablets.go +++ b/go/vt/vtadmin/http/experimental/tablets.go @@ -24,9 +24,9 @@ import ( "net/http" "text/template" - vtadminhttp "github.com/mdibaiee/vitess/go/vt/vtadmin/http" + vtadminhttp "github.com/vitess/vitess/go/vt/vtadmin/http" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // TabletDebugVarsPassthrough makes a passthrough request to a tablet's diff --git a/go/vt/vtadmin/http/experimental/whoami.go b/go/vt/vtadmin/http/experimental/whoami.go index 05070fdc21c..f4b1a47319a 100644 --- a/go/vt/vtadmin/http/experimental/whoami.go +++ b/go/vt/vtadmin/http/experimental/whoami.go @@ -3,8 +3,8 @@ package experimental import ( "context" - vtadminhttp "github.com/mdibaiee/vitess/go/vt/vtadmin/http" - "github.com/mdibaiee/vitess/go/vt/vtadmin/rbac" + vtadminhttp "github.com/vitess/vitess/go/vt/vtadmin/http" + "github.com/vitess/vitess/go/vt/vtadmin/rbac" ) // WhoAmI is an experimental route for extracting authenticated Actors from diff --git a/go/vt/vtadmin/http/gates.go b/go/vt/vtadmin/http/gates.go index 61d87c54184..8443b1d7ff2 100644 --- a/go/vt/vtadmin/http/gates.go +++ b/go/vt/vtadmin/http/gates.go @@ -19,7 +19,7 @@ package http import ( "context" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // GetGates implements the http wrapper for /gates[?cluster_id=[&cluster_id=]]. diff --git a/go/vt/vtadmin/http/handlers/authentication.go b/go/vt/vtadmin/http/handlers/authentication.go index d8b4e4413b3..11828fa95b8 100644 --- a/go/vt/vtadmin/http/handlers/authentication.go +++ b/go/vt/vtadmin/http/handlers/authentication.go @@ -19,7 +19,7 @@ package handlers import ( "net/http" - "github.com/mdibaiee/vitess/go/vt/vtadmin/rbac" + "github.com/vitess/vitess/go/vt/vtadmin/rbac" ) // NewAuthenticationHandler returns an http middleware that invokes the given diff --git a/go/vt/vtadmin/http/handlers/panic_recovery.go b/go/vt/vtadmin/http/handlers/panic_recovery.go index 1a832a7c4c4..52217b5a539 100644 --- a/go/vt/vtadmin/http/handlers/panic_recovery.go +++ b/go/vt/vtadmin/http/handlers/panic_recovery.go @@ -22,7 +22,7 @@ import ( "github.com/gorilla/mux" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // PanicRecoveryHandler is a mux.MiddlewareFunc which recovers from any uncaught diff --git a/go/vt/vtadmin/http/handlers/trace.go b/go/vt/vtadmin/http/handlers/trace.go index 0eab961a656..a6a4dd30ed3 100644 --- a/go/vt/vtadmin/http/handlers/trace.go +++ b/go/vt/vtadmin/http/handlers/trace.go @@ -21,7 +21,7 @@ import ( "github.com/gorilla/mux" - "github.com/mdibaiee/vitess/go/trace" + "github.com/vitess/vitess/go/trace" ) // TraceHandler is a mux.MiddlewareFunc which creates a span with the route's diff --git a/go/vt/vtadmin/http/keyspaces.go b/go/vt/vtadmin/http/keyspaces.go index fd859c541ba..78de2a95a8c 100644 --- a/go/vt/vtadmin/http/keyspaces.go +++ b/go/vt/vtadmin/http/keyspaces.go @@ -23,10 +23,10 @@ import ( "github.com/gorilla/mux" - "github.com/mdibaiee/vitess/go/vt/vtadmin/errors" + "github.com/vitess/vitess/go/vt/vtadmin/errors" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // CreateKeyspace implements the http wrapper for POST /keyspace/{cluster_id}. diff --git a/go/vt/vtadmin/http/replication.go b/go/vt/vtadmin/http/replication.go index b3a9ca0dab2..f5174ba9c25 100644 --- a/go/vt/vtadmin/http/replication.go +++ b/go/vt/vtadmin/http/replication.go @@ -19,7 +19,7 @@ package http import ( "context" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // GetShardReplicationPositions implements the http wrapper for /shard_replication_positions. diff --git a/go/vt/vtadmin/http/request.go b/go/vt/vtadmin/http/request.go index b85d8855d0f..e07ebb4ba38 100644 --- a/go/vt/vtadmin/http/request.go +++ b/go/vt/vtadmin/http/request.go @@ -23,10 +23,10 @@ import ( "github.com/gorilla/mux" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtadmin/errors" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtadmin/errors" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // Request wraps an *http.Request to provide some convenience functions for diff --git a/go/vt/vtadmin/http/response.go b/go/vt/vtadmin/http/response.go index ec0f5f70509..c4e1a5de9d7 100644 --- a/go/vt/vtadmin/http/response.go +++ b/go/vt/vtadmin/http/response.go @@ -21,8 +21,8 @@ import ( "fmt" "net/http" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtadmin/errors" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtadmin/errors" ) // JSONResponse represents a generic response object. diff --git a/go/vt/vtadmin/http/schema_migrations.go b/go/vt/vtadmin/http/schema_migrations.go index 55cae17ce6f..e8fba268ebc 100644 --- a/go/vt/vtadmin/http/schema_migrations.go +++ b/go/vt/vtadmin/http/schema_migrations.go @@ -23,10 +23,10 @@ import ( "github.com/gorilla/mux" - "github.com/mdibaiee/vitess/go/vt/vtadmin/errors" + "github.com/vitess/vitess/go/vt/vtadmin/errors" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // ApplySchema implements the http wrapper for POST /migration/{cluster_id}/{keyspace}/. diff --git a/go/vt/vtadmin/http/schemas.go b/go/vt/vtadmin/http/schemas.go index 6800966b97b..096198b5928 100644 --- a/go/vt/vtadmin/http/schemas.go +++ b/go/vt/vtadmin/http/schemas.go @@ -20,10 +20,10 @@ import ( "context" "fmt" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtadmin/errors" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtadmin/errors" ) // FindSchema implements the http wrapper for the diff --git a/go/vt/vtadmin/http/shards.go b/go/vt/vtadmin/http/shards.go index 573b7fe41be..8c45679f97b 100644 --- a/go/vt/vtadmin/http/shards.go +++ b/go/vt/vtadmin/http/shards.go @@ -23,13 +23,13 @@ import ( "github.com/gorilla/mux" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtadmin/errors" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtadmin/errors" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // CreateShard implements the http wrapper for POST /shards/{cluster_id}. diff --git a/go/vt/vtadmin/http/srvkeyspaces.go b/go/vt/vtadmin/http/srvkeyspaces.go index 2125938fd2a..18f84e57e12 100644 --- a/go/vt/vtadmin/http/srvkeyspaces.go +++ b/go/vt/vtadmin/http/srvkeyspaces.go @@ -21,7 +21,7 @@ import ( "github.com/gorilla/mux" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // GetSrvKeyspaces implements the http wrapper for the /api/srvkeyspaces route. diff --git a/go/vt/vtadmin/http/srvvschemas.go b/go/vt/vtadmin/http/srvvschemas.go index 372ed69155e..cc2c8277b39 100644 --- a/go/vt/vtadmin/http/srvvschemas.go +++ b/go/vt/vtadmin/http/srvvschemas.go @@ -19,7 +19,7 @@ package http import ( "context" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // GetSrvVSchema implements the http wrapper for the /api/srvvschema/{cluster_id}/{cell} route. diff --git a/go/vt/vtadmin/http/tablets.go b/go/vt/vtadmin/http/tablets.go index ac52124c365..178a1255698 100644 --- a/go/vt/vtadmin/http/tablets.go +++ b/go/vt/vtadmin/http/tablets.go @@ -19,7 +19,7 @@ package http import ( "context" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // GetFullStatus implements the http wrapper for /tablets/{tablet}/full_status diff --git a/go/vt/vtadmin/http/vschemas.go b/go/vt/vtadmin/http/vschemas.go index 830421aa142..a706f600479 100644 --- a/go/vt/vtadmin/http/vschemas.go +++ b/go/vt/vtadmin/http/vschemas.go @@ -19,7 +19,7 @@ package http import ( "context" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // GetVSchema implements the http wrapper for the diff --git a/go/vt/vtadmin/http/vtctlds.go b/go/vt/vtadmin/http/vtctlds.go index f21374d016e..803e7a3def4 100644 --- a/go/vt/vtadmin/http/vtctlds.go +++ b/go/vt/vtadmin/http/vtctlds.go @@ -19,7 +19,7 @@ package http import ( "context" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // GetVtctlds implements the http wrapper for /vtctlds[?cluster_id=[&cluster_id=]]. diff --git a/go/vt/vtadmin/http/vtexplain.go b/go/vt/vtadmin/http/vtexplain.go index 55ac6630fcc..7bbce2efaf7 100644 --- a/go/vt/vtadmin/http/vtexplain.go +++ b/go/vt/vtadmin/http/vtexplain.go @@ -19,7 +19,7 @@ package http import ( "context" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // VTExplain implements the http wrapper for /vtexplain?cluster_id=&keyspace=&sql= diff --git a/go/vt/vtadmin/http/workflows.go b/go/vt/vtadmin/http/workflows.go index d6cfa713c9f..8f999701384 100644 --- a/go/vt/vtadmin/http/workflows.go +++ b/go/vt/vtadmin/http/workflows.go @@ -19,7 +19,7 @@ package http import ( "context" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // GetWorkflow implements the http wrapper for the VTAdminServer.GetWorkflow diff --git a/go/vt/vtadmin/internal/backoff/backoff.go b/go/vt/vtadmin/internal/backoff/backoff.go index 3f48f77d2ab..4c2faad8a85 100644 --- a/go/vt/vtadmin/internal/backoff/backoff.go +++ b/go/vt/vtadmin/internal/backoff/backoff.go @@ -33,7 +33,7 @@ import ( grpcbackoff "google.golang.org/grpc/backoff" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // Strategy defines the interface for different backoff strategies. diff --git a/go/vt/vtadmin/rbac/authentication.go b/go/vt/vtadmin/rbac/authentication.go index 2af2fd79a74..3e0234dd404 100644 --- a/go/vt/vtadmin/rbac/authentication.go +++ b/go/vt/vtadmin/rbac/authentication.go @@ -27,8 +27,8 @@ import ( grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // Authenticator defines the interface vtadmin authentication plugins must diff --git a/go/vt/vtadmin/rbac/config.go b/go/vt/vtadmin/rbac/config.go index f3f9a10be8b..f4fe7bc0d11 100644 --- a/go/vt/vtadmin/rbac/config.go +++ b/go/vt/vtadmin/rbac/config.go @@ -22,9 +22,9 @@ import ( "github.com/spf13/viper" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" ) // Config is the RBAC configuration representation. The public fields are diff --git a/go/vt/vtadmin/rbac/example/main.go b/go/vt/vtadmin/rbac/example/main.go index ff1a2471184..f878f381342 100644 --- a/go/vt/vtadmin/rbac/example/main.go +++ b/go/vt/vtadmin/rbac/example/main.go @@ -21,7 +21,7 @@ import ( "flag" "fmt" - "github.com/mdibaiee/vitess/go/vt/vtadmin/rbac" + "github.com/vitess/vitess/go/vt/vtadmin/rbac" ) func main() { diff --git a/go/vt/vtadmin/rbac/rule.go b/go/vt/vtadmin/rbac/rule.go index fdf2a60ce26..d72993310c3 100644 --- a/go/vt/vtadmin/rbac/rule.go +++ b/go/vt/vtadmin/rbac/rule.go @@ -19,7 +19,7 @@ package rbac import ( "fmt" - "github.com/mdibaiee/vitess/go/sets" + "github.com/vitess/vitess/go/sets" ) // Rule is a single rule governing access to a particular resource. diff --git a/go/vt/vtadmin/sort/clusters.go b/go/vt/vtadmin/sort/clusters.go index 185763abb4c..9f9edc418c2 100644 --- a/go/vt/vtadmin/sort/clusters.go +++ b/go/vt/vtadmin/sort/clusters.go @@ -19,7 +19,7 @@ package sort import ( "sort" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster" + "github.com/vitess/vitess/go/vt/vtadmin/cluster" ) // ClustersBy provides an interface to sort Clusters by arbitrary comparison. diff --git a/go/vt/vtadmin/testutil/authztestgen/functions.go b/go/vt/vtadmin/testutil/authztestgen/functions.go index 12026f9918c..6c066bff1fb 100644 --- a/go/vt/vtadmin/testutil/authztestgen/functions.go +++ b/go/vt/vtadmin/testutil/authztestgen/functions.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/vt/vtadmin/rbac" + "github.com/vitess/vitess/go/vt/vtadmin/rbac" ) func formatDocRow(m *DocMethod) string { diff --git a/go/vt/vtadmin/testutil/authztestgen/main.go b/go/vt/vtadmin/testutil/authztestgen/main.go index a7c3d2ddfd2..a6ac2f30781 100644 --- a/go/vt/vtadmin/testutil/authztestgen/main.go +++ b/go/vt/vtadmin/testutil/authztestgen/main.go @@ -25,9 +25,9 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/vtadmin/rbac" + "github.com/vitess/vitess/go/vt/vtadmin/rbac" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) type Config struct { diff --git a/go/vt/vtadmin/testutil/authztestgen/template.go b/go/vt/vtadmin/testutil/authztestgen/template.go index d733f944578..9a40b66d733 100644 --- a/go/vt/vtadmin/testutil/authztestgen/template.go +++ b/go/vt/vtadmin/testutil/authztestgen/template.go @@ -45,21 +45,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtadmin" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster" - "github.com/mdibaiee/vitess/go/vt/vtadmin/rbac" - "github.com/mdibaiee/vitess/go/vt/vtadmin/testutil" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtctldclient/fakevtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtenv" - - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - mysqlctlpb "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtadmin" + "github.com/vitess/vitess/go/vt/vtadmin/cluster" + "github.com/vitess/vitess/go/vt/vtadmin/rbac" + "github.com/vitess/vitess/go/vt/vtadmin/testutil" + "github.com/vitess/vitess/go/vt/vtadmin/vtctldclient/fakevtctldclient" + "github.com/vitess/vitess/go/vt/vtenv" + + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + mysqlctlpb "github.com/vitess/vitess/go/vt/proto/mysqlctl" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) {{ range .Tests }} diff --git a/go/vt/vtadmin/testutil/cluster.go b/go/vt/vtadmin/testutil/cluster.go index fb656b82873..455e28972cd 100644 --- a/go/vt/vtadmin/testutil/cluster.go +++ b/go/vt/vtadmin/testutil/cluster.go @@ -27,24 +27,24 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vitessdriver" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/discovery" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/discovery/fakediscovery" - vtadminvtctldclient "github.com/mdibaiee/vitess/go/vt/vtadmin/vtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtsql" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtsql/fakevtsql" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver" - grpcvtctldtestutil "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver/testutil" - "github.com/mdibaiee/vitess/go/vt/vtctl/localvtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtenv" - - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vitessdriver" + "github.com/vitess/vitess/go/vt/vtadmin/cluster" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/discovery" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/discovery/fakediscovery" + vtadminvtctldclient "github.com/vitess/vitess/go/vt/vtadmin/vtctldclient" + "github.com/vitess/vitess/go/vt/vtadmin/vtsql" + "github.com/vitess/vitess/go/vt/vtadmin/vtsql/fakevtsql" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver" + grpcvtctldtestutil "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver/testutil" + "github.com/vitess/vitess/go/vt/vtctl/localvtctldclient" + "github.com/vitess/vitess/go/vt/vtctl/vtctldclient" + "github.com/vitess/vitess/go/vt/vtenv" + + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) // Dbcfg is a test utility for controlling the behavior of the cluster's DB diff --git a/go/vt/vtadmin/testutil/proto_compare.go b/go/vt/vtadmin/testutil/proto_compare.go index 2f588fea4f3..e61ce2547d8 100644 --- a/go/vt/vtadmin/testutil/proto_compare.go +++ b/go/vt/vtadmin/testutil/proto_compare.go @@ -21,9 +21,9 @@ import ( "sort" "testing" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // AssertKeyspaceSlicesEqual is a convenience function to assert that two diff --git a/go/vt/vtadmin/testutil/tablets.go b/go/vt/vtadmin/testutil/tablets.go index d2cbba8d52e..3e1370c93eb 100644 --- a/go/vt/vtadmin/testutil/tablets.go +++ b/go/vt/vtadmin/testutil/tablets.go @@ -17,8 +17,8 @@ limitations under the License. package testutil import ( - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // TopodataTabletsFromVTAdminTablets returns a slice of topodatapb.Tablet diff --git a/go/vt/vtadmin/testutil/workflows.go b/go/vt/vtadmin/testutil/workflows.go index b2c11860178..3f964f8b447 100644 --- a/go/vt/vtadmin/testutil/workflows.go +++ b/go/vt/vtadmin/testutil/workflows.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // AssertClusterWorkflowsEqual is a test helper for asserting that two diff --git a/go/vt/vtadmin/vtadminproto/tablet.go b/go/vt/vtadmin/vtadminproto/tablet.go index 29001bb1f3a..16eecfe3342 100644 --- a/go/vt/vtadmin/vtadminproto/tablet.go +++ b/go/vt/vtadmin/vtadminproto/tablet.go @@ -17,9 +17,9 @@ limitations under the License. package vtadminproto import ( - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topo/topoproto" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // Tablets is a list of Tablet protobuf objects. diff --git a/go/vt/vtadmin/vtadminproto/trace.go b/go/vt/vtadmin/vtadminproto/trace.go index b7643123290..b33b63e3a14 100644 --- a/go/vt/vtadmin/vtadminproto/trace.go +++ b/go/vt/vtadmin/vtadminproto/trace.go @@ -17,9 +17,9 @@ limitations under the License. package vtadminproto import ( - "github.com/mdibaiee/vitess/go/trace" + "github.com/vitess/vitess/go/trace" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // AnnotateClusterSpan adds the cluster_id and cluster_name to a span. diff --git a/go/vt/vtadmin/vtctldclient/config.go b/go/vt/vtadmin/vtctldclient/config.go index fdaa421fbb4..017cc1ab76b 100644 --- a/go/vt/vtadmin/vtctldclient/config.go +++ b/go/vt/vtadmin/vtctldclient/config.go @@ -23,13 +23,13 @@ import ( "github.com/spf13/pflag" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/discovery" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/resolver" - "github.com/mdibaiee/vitess/go/vt/vtadmin/credentials" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctldclient" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/discovery" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/resolver" + "github.com/vitess/vitess/go/vt/vtadmin/credentials" + "github.com/vitess/vitess/go/vt/vtctl/vtctldclient" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // Config represents the options that modify the behavior of a Proxy. diff --git a/go/vt/vtadmin/vtctldclient/config_test.go b/go/vt/vtadmin/vtctldclient/config_test.go index 91eb930cfb0..958665d3cd2 100644 --- a/go/vt/vtadmin/vtctldclient/config_test.go +++ b/go/vt/vtadmin/vtctldclient/config_test.go @@ -29,10 +29,10 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/backoff" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/resolver" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/resolver" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) func withTempFile(t *testing.T, tmpdir string, name string, f func(*testing.T, *os.File)) { diff --git a/go/vt/vtadmin/vtctldclient/fakevtctldclient/vtctldclient.go b/go/vt/vtadmin/vtctldclient/fakevtctldclient/vtctldclient.go index a301e13b4fb..f3f745b40ff 100644 --- a/go/vt/vtadmin/vtctldclient/fakevtctldclient/vtctldclient.go +++ b/go/vt/vtadmin/vtctldclient/fakevtctldclient/vtctldclient.go @@ -25,12 +25,12 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctldclient" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/vtctldclient" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // VtctldClient provides a partial mock implementation of the diff --git a/go/vt/vtadmin/vtctldclient/proxy.go b/go/vt/vtadmin/vtctldclient/proxy.go index 2b0105a2164..ed79845ebfe 100644 --- a/go/vt/vtadmin/vtctldclient/proxy.go +++ b/go/vt/vtadmin/vtctldclient/proxy.go @@ -26,17 +26,17 @@ import ( "google.golang.org/grpc" grpcresolver "google.golang.org/grpc/resolver" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/resolver" - "github.com/mdibaiee/vitess/go/vt/vtadmin/debug" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtadminproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctldclient" - - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/resolver" + "github.com/vitess/vitess/go/vt/vtadmin/debug" + "github.com/vitess/vitess/go/vt/vtadmin/vtadminproto" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldclient" + "github.com/vitess/vitess/go/vt/vtctl/vtctldclient" + + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) // Proxy defines the connection interface of a proxied vtctldclient used by diff --git a/go/vt/vtadmin/vtctldclient/proxy_test.go b/go/vt/vtadmin/vtctldclient/proxy_test.go index 9adc78526a2..e4ee3c98696 100644 --- a/go/vt/vtadmin/vtctldclient/proxy_test.go +++ b/go/vt/vtadmin/vtctldclient/proxy_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/discovery/fakediscovery" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/resolver" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/discovery/fakediscovery" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/resolver" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) type fakeVtctld struct { diff --git a/go/vt/vtadmin/vtsql/config.go b/go/vt/vtadmin/vtsql/config.go index 93fc32ec123..7383b25204a 100644 --- a/go/vt/vtadmin/vtsql/config.go +++ b/go/vt/vtadmin/vtsql/config.go @@ -22,13 +22,13 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/vitessdriver" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/discovery" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/resolver" - "github.com/mdibaiee/vitess/go/vt/vtadmin/credentials" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/vitessdriver" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/discovery" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/resolver" + "github.com/vitess/vitess/go/vt/vtadmin/credentials" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // Config represents the options that modify the behavior of a vtqsl.VTGateProxy. diff --git a/go/vt/vtadmin/vtsql/config_test.go b/go/vt/vtadmin/vtsql/config_test.go index cb969012543..22932a1351a 100644 --- a/go/vt/vtadmin/vtsql/config_test.go +++ b/go/vt/vtadmin/vtsql/config_test.go @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/backoff" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/resolver" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/resolver" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) func TestConfigParse(t *testing.T) { diff --git a/go/vt/vtadmin/vtsql/credentials.go b/go/vt/vtadmin/vtsql/credentials.go index 65acea3bd7c..99fd5aec714 100644 --- a/go/vt/vtadmin/vtsql/credentials.go +++ b/go/vt/vtadmin/vtsql/credentials.go @@ -19,7 +19,7 @@ package vtsql import ( "google.golang.org/grpc/credentials" - "github.com/mdibaiee/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/grpcclient" ) // Credentials defines the interface needed for vtsql properly connect to and diff --git a/go/vt/vtadmin/vtsql/fakevtsql/conn.go b/go/vt/vtadmin/vtsql/fakevtsql/conn.go index 2ac4321d48c..018cebe7b6b 100644 --- a/go/vt/vtadmin/vtsql/fakevtsql/conn.go +++ b/go/vt/vtadmin/vtsql/fakevtsql/conn.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtadminproto" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtadmin/vtadminproto" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) var ( diff --git a/go/vt/vtadmin/vtsql/fakevtsql/driver.go b/go/vt/vtadmin/vtsql/fakevtsql/driver.go index 3a87ed731f3..52d57c603ea 100644 --- a/go/vt/vtadmin/vtsql/fakevtsql/driver.go +++ b/go/vt/vtadmin/vtsql/fakevtsql/driver.go @@ -20,7 +20,7 @@ import ( "context" "database/sql/driver" - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) type fakedriver struct { diff --git a/go/vt/vtadmin/vtsql/vtsql.go b/go/vt/vtadmin/vtsql/vtsql.go index 36fd6a39090..d52b75a5146 100644 --- a/go/vt/vtadmin/vtsql/vtsql.go +++ b/go/vt/vtadmin/vtsql/vtsql.go @@ -28,15 +28,15 @@ import ( "google.golang.org/grpc" grpcresolver "google.golang.org/grpc/resolver" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vitessdriver" - "github.com/mdibaiee/vitess/go/vt/vtadmin/cluster/resolver" - "github.com/mdibaiee/vitess/go/vt/vtadmin/debug" - "github.com/mdibaiee/vitess/go/vt/vtadmin/vtadminproto" - - vtadminpb "github.com/mdibaiee/vitess/go/vt/proto/vtadmin" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vitessdriver" + "github.com/vitess/vitess/go/vt/vtadmin/cluster/resolver" + "github.com/vitess/vitess/go/vt/vtadmin/debug" + "github.com/vitess/vitess/go/vt/vtadmin/vtadminproto" + + vtadminpb "github.com/vitess/vitess/go/vt/proto/vtadmin" ) // DB defines the connection and query interface of vitess SQL queries used by diff --git a/go/vt/vtadmin/vtsql/vtsql_test.go b/go/vt/vtadmin/vtsql/vtsql_test.go index bba0dcd7fc6..b3760fb89c0 100644 --- a/go/vt/vtadmin/vtsql/vtsql_test.go +++ b/go/vt/vtadmin/vtsql/vtsql_test.go @@ -23,11 +23,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/grpcclient" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func assertImmediateCaller(t *testing.T, im *querypb.VTGateCallerID, expected string) { diff --git a/go/vt/vtcombo/tablet_map.go b/go/vt/vtcombo/tablet_map.go index 748db68acaf..41982a63b27 100644 --- a/go/vt/vtcombo/tablet_map.go +++ b/go/vt/vtcombo/tablet_map.go @@ -23,36 +23,36 @@ import ( "path" "time" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/hook" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/hook" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" ) // tablet contains all the data for an individual tablet. diff --git a/go/vt/vtctl/backup.go b/go/vt/vtctl/backup.go index 33bd1500cca..b7b8e180cbc 100644 --- a/go/vt/vtctl/backup.go +++ b/go/vt/vtctl/backup.go @@ -24,16 +24,16 @@ import ( "github.com/spf13/pflag" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/wrangler" - - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/wrangler" + + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func init() { diff --git a/go/vt/vtctl/cell_info.go b/go/vt/vtctl/cell_info.go index bcb7552b505..98cece5cd58 100644 --- a/go/vt/vtctl/cell_info.go +++ b/go/vt/vtctl/cell_info.go @@ -23,10 +23,10 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/vt/wrangler" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // This file contains the Cells command group for vtctl. diff --git a/go/vt/vtctl/cells_aliases.go b/go/vt/vtctl/cells_aliases.go index fe2e353870b..17a8eedf286 100644 --- a/go/vt/vtctl/cells_aliases.go +++ b/go/vt/vtctl/cells_aliases.go @@ -23,10 +23,10 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/vt/wrangler" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // This file contains the CellsAliases command group for vtctl. diff --git a/go/vt/vtctl/endtoend/get_schema_test.go b/go/vt/vtctl/endtoend/get_schema_test.go index c04a87cbd45..34250804e3b 100644 --- a/go/vt/vtctl/endtoend/get_schema_test.go +++ b/go/vt/vtctl/endtoend/get_schema_test.go @@ -4,26 +4,26 @@ import ( "context" "testing" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/vtenv" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver/testutil" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclienttest" - "github.com/mdibaiee/vitess/go/vt/wrangler" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver/testutil" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/vttablet/tmclienttest" + "github.com/vitess/vitess/go/vt/wrangler" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestGetSchema(t *testing.T) { diff --git a/go/vt/vtctl/endtoend/onlineddl_show_test.go b/go/vt/vtctl/endtoend/onlineddl_show_test.go index 01bce7548dd..25cbc54040d 100644 --- a/go/vt/vtctl/endtoend/onlineddl_show_test.go +++ b/go/vt/vtctl/endtoend/onlineddl_show_test.go @@ -9,16 +9,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtctl" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver/testutil" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclienttest" - "github.com/mdibaiee/vitess/go/vt/wrangler" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtctl" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver/testutil" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/vttablet/tmclienttest" + "github.com/vitess/vitess/go/vt/wrangler" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestShowOnlineDDL_All(t *testing.T) { diff --git a/go/vt/vtctl/grpcclientcommon/dial_option.go b/go/vt/vtctl/grpcclientcommon/dial_option.go index 0b3e80459ac..895c4474fad 100644 --- a/go/vt/vtctl/grpcclientcommon/dial_option.go +++ b/go/vt/vtctl/grpcclientcommon/dial_option.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/pflag" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/servenv" ) var cert, key, ca, crl, name string diff --git a/go/vt/vtctl/grpcvtctlclient/client.go b/go/vt/vtctl/grpcvtctlclient/client.go index cf8bb41ee59..b2a300aaf38 100644 --- a/go/vt/vtctl/grpcvtctlclient/client.go +++ b/go/vt/vtctl/grpcvtctlclient/client.go @@ -23,14 +23,14 @@ import ( "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcclientcommon" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctlclient" - - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/vtctl/grpcclientcommon" + "github.com/vitess/vitess/go/vt/vtctl/vtctlclient" + + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) type gRPCVtctlClient struct { diff --git a/go/vt/vtctl/grpcvtctlclient/client_test.go b/go/vt/vtctl/grpcvtctlclient/client_test.go index 15690301958..16d4d76a472 100644 --- a/go/vt/vtctl/grpcvtctlclient/client_test.go +++ b/go/vt/vtctl/grpcvtctlclient/client_test.go @@ -28,13 +28,13 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctlserver" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctlclienttest" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctlserver" + "github.com/vitess/vitess/go/vt/vtctl/vtctlclienttest" + "github.com/vitess/vitess/go/vt/vtenv" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) // the test here creates a fake server implementation, a fake client diff --git a/go/vt/vtctl/grpcvtctldclient/client.go b/go/vt/vtctl/grpcvtctldclient/client.go index 2a4040dab5e..73564d5152f 100644 --- a/go/vt/vtctl/grpcvtctldclient/client.go +++ b/go/vt/vtctl/grpcvtctldclient/client.go @@ -26,11 +26,11 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/connectivity" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcclientcommon" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctldclient" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/vtctl/grpcclientcommon" + "github.com/vitess/vitess/go/vt/vtctl/vtctldclient" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) var ( diff --git a/go/vt/vtctl/grpcvtctldclient/client_gen.go b/go/vt/vtctl/grpcvtctldclient/client_gen.go index fd993c377c4..9c851c5df26 100644 --- a/go/vt/vtctl/grpcvtctldclient/client_gen.go +++ b/go/vt/vtctl/grpcvtctldclient/client_gen.go @@ -25,8 +25,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) // AddCellInfo is part of the vtctlservicepb.VtctldClient interface. diff --git a/go/vt/vtctl/grpcvtctldclient/client_test.go b/go/vt/vtctl/grpcvtctldclient/client_test.go index 45de32b794d..dcaaa57a3b6 100644 --- a/go/vt/vtctl/grpcvtctldclient/client_test.go +++ b/go/vt/vtctl/grpcvtctldclient/client_test.go @@ -23,17 +23,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver/testutil" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtenv" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver/testutil" + "github.com/vitess/vitess/go/vt/vtctl/vtctldclient" + "github.com/vitess/vitess/go/vt/vtenv" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) func TestFindAllShardsInKeyspace(t *testing.T) { diff --git a/go/vt/vtctl/grpcvtctldserver/endtoend/init_shard_primary_test.go b/go/vt/vtctl/grpcvtctldserver/endtoend/init_shard_primary_test.go index d5a12881cf7..68523645e86 100644 --- a/go/vt/vtctl/grpcvtctldserver/endtoend/init_shard_primary_test.go +++ b/go/vt/vtctl/grpcvtctldserver/endtoend/init_shard_primary_test.go @@ -21,25 +21,25 @@ import ( "fmt" "testing" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/vtenv" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletservermock" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" - "github.com/mdibaiee/vitess/go/vt/wrangler/testlib" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver" + "github.com/vitess/vitess/go/vt/vttablet/tabletservermock" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/vt/wrangler/testlib" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) func TestInitShardPrimary(t *testing.T) { diff --git a/go/vt/vtctl/grpcvtctldserver/log.go b/go/vt/vtctl/grpcvtctldserver/log.go index e79acb556b6..d87f1e6d904 100644 --- a/go/vt/vtctl/grpcvtctldserver/log.go +++ b/go/vt/vtctl/grpcvtctldserver/log.go @@ -19,9 +19,9 @@ package grpcvtctldserver import ( "sync" - "github.com/mdibaiee/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/logutil" - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" ) func eventStreamLogger() (logutil.Logger, func() []*logutilpb.Event) { diff --git a/go/vt/vtctl/grpcvtctldserver/query.go b/go/vt/vtctl/grpcvtctldserver/query.go index 0adaf3d33f8..e857f1dbbb8 100644 --- a/go/vt/vtctl/grpcvtctldserver/query.go +++ b/go/vt/vtctl/grpcvtctldserver/query.go @@ -20,16 +20,16 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/schematools" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/schematools" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/vt/proto/vttime" ) const ( diff --git a/go/vt/vtctl/grpcvtctldserver/query_test.go b/go/vt/vtctl/grpcvtctldserver/query_test.go index 1868f691f8e..f6d2a73508d 100644 --- a/go/vt/vtctl/grpcvtctldserver/query_test.go +++ b/go/vt/vtctl/grpcvtctldserver/query_test.go @@ -23,13 +23,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/vtctl/schematools" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/vtctl/schematools" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vttimepb "github.com/mdibaiee/vitess/go/vt/proto/vttime" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vttimepb "github.com/vitess/vitess/go/vt/proto/vttime" ) var now = time.Now() diff --git a/go/vt/vtctl/grpcvtctldserver/server.go b/go/vt/vtctl/grpcvtctldserver/server.go index 0c05ada47ba..52ae1042da3 100644 --- a/go/vt/vtctl/grpcvtctldserver/server.go +++ b/go/vt/vtctl/grpcvtctldserver/server.go @@ -34,48 +34,48 @@ import ( "golang.org/x/sync/semaphore" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/event" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/concurrency" - hk "github.com/mdibaiee/vitess/go/vt/hook" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/mysqlctlproto" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/schemamanager" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/topotools/events" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil" - "github.com/mdibaiee/vitess/go/vt/vtctl/schematools" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - mysqlctlpb "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/event" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/concurrency" + hk "github.com/vitess/vitess/go/vt/hook" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/vt/mysqlctl/mysqlctlproto" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/schemamanager" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/topotools/events" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil" + "github.com/vitess/vitess/go/vt/vtctl/schematools" + "github.com/vitess/vitess/go/vt/vtctl/workflow" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + mysqlctlpb "github.com/vitess/vitess/go/vt/proto/mysqlctl" + querypb "github.com/vitess/vitess/go/vt/proto/query" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const ( diff --git a/go/vt/vtctl/grpcvtctldserver/server_slow_test.go b/go/vt/vtctl/grpcvtctldserver/server_slow_test.go index e9a0e30398a..5079ee1e6e3 100644 --- a/go/vt/vtctl/grpcvtctldserver/server_slow_test.go +++ b/go/vt/vtctl/grpcvtctldserver/server_slow_test.go @@ -24,21 +24,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/replication" - - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver/testutil" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/mysql/replication" + + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver/testutil" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" + "github.com/vitess/vitess/go/vt/proto/vttime" ) func TestEmergencyReparentShardSlow(t *testing.T) { diff --git a/go/vt/vtctl/grpcvtctldserver/server_test.go b/go/vt/vtctl/grpcvtctldserver/server_test.go index aa37a717a2f..5615a086eca 100644 --- a/go/vt/vtctl/grpcvtctldserver/server_test.go +++ b/go/vt/vtctl/grpcvtctldserver/server_test.go @@ -28,38 +28,38 @@ import ( "testing" "time" - _flag "github.com/mdibaiee/vitess/go/internal/flag" + _flag "github.com/vitess/vitess/go/internal/flag" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - hk "github.com/mdibaiee/vitess/go/vt/hook" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver/testutil" - "github.com/mdibaiee/vitess/go/vt/vtctl/localvtctldclient" - "github.com/mdibaiee/vitess/go/vt/vtctl/schematools" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclienttest" - - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - mysqlctlpb "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + hk "github.com/vitess/vitess/go/vt/hook" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver/testutil" + "github.com/vitess/vitess/go/vt/vtctl/localvtctldclient" + "github.com/vitess/vitess/go/vt/vtctl/schematools" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/vttablet/tmclienttest" + + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + mysqlctlpb "github.com/vitess/vitess/go/vt/proto/mysqlctl" + querypb "github.com/vitess/vitess/go/vt/proto/query" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) func init() { diff --git a/go/vt/vtctl/grpcvtctldserver/testutil/proto_compare.go b/go/vt/vtctl/grpcvtctldserver/testutil/proto_compare.go index b7d8772a8ef..fd2645998f2 100644 --- a/go/vt/vtctl/grpcvtctldserver/testutil/proto_compare.go +++ b/go/vt/vtctl/grpcvtctldserver/testutil/proto_compare.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/test/utils" - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/test/utils" + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // AssertEmergencyReparentShardResponsesEqual asserts that two diff --git a/go/vt/vtctl/grpcvtctldserver/testutil/srv_keyspace.go b/go/vt/vtctl/grpcvtctldserver/testutil/srv_keyspace.go index 0ca4fade0b3..569b5f1ffca 100644 --- a/go/vt/vtctl/grpcvtctldserver/testutil/srv_keyspace.go +++ b/go/vt/vtctl/grpcvtctldserver/testutil/srv_keyspace.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // SrvKeyspace groups a topodatapb.SrvKeyspace together with a keyspace and diff --git a/go/vt/vtctl/grpcvtctldserver/testutil/test_backupstorage.go b/go/vt/vtctl/grpcvtctldserver/testutil/test_backupstorage.go index c4f641cca8a..463357be5bd 100644 --- a/go/vt/vtctl/grpcvtctldserver/testutil/test_backupstorage.go +++ b/go/vt/vtctl/grpcvtctldserver/testutil/test_backupstorage.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" ) type backupStorage struct { diff --git a/go/vt/vtctl/grpcvtctldserver/testutil/test_tmclient.go b/go/vt/vtctl/grpcvtctldserver/testutil/test_tmclient.go index b4460880066..16026ad2137 100644 --- a/go/vt/vtctl/grpcvtctldserver/testutil/test_tmclient.go +++ b/go/vt/vtctl/grpcvtctldserver/testutil/test_tmclient.go @@ -28,25 +28,25 @@ import ( "github.com/spf13/pflag" "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/timer" - hk "github.com/mdibaiee/vitess/go/vt/hook" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtctl/internal/grpcshim" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/timer" + hk "github.com/vitess/vitess/go/vt/hook" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtctl/internal/grpcshim" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + querypb "github.com/vitess/vitess/go/vt/proto/query" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" + "github.com/vitess/vitess/go/vt/proto/vttime" ) var ( diff --git a/go/vt/vtctl/grpcvtctldserver/testutil/util.go b/go/vt/vtctl/grpcvtctldserver/testutil/util.go index ec21adea2a0..163d9e978bc 100644 --- a/go/vt/vtctl/grpcvtctldserver/testutil/util.go +++ b/go/vt/vtctl/grpcvtctldserver/testutil/util.go @@ -28,13 +28,13 @@ import ( "golang.org/x/net/nettest" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctldclient" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/vtctldclient" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) // WithTestServer creates a gRPC server listening locally with the given RPC diff --git a/go/vt/vtctl/grpcvtctldserver/topo.go b/go/vt/vtctl/grpcvtctldserver/topo.go index 5710c5b9a00..42eb4b76f5b 100644 --- a/go/vt/vtctl/grpcvtctldserver/topo.go +++ b/go/vt/vtctl/grpcvtctldserver/topo.go @@ -21,15 +21,15 @@ import ( "fmt" "time" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vterrors" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func deleteShard(ctx context.Context, ts *topo.Server, keyspace string, shard string, recursive bool, evenIfServing bool, force bool) (err error) { diff --git a/go/vt/vtctl/grpcvtctlserver/server.go b/go/vt/vtctl/grpcvtctlserver/server.go index 28995946109..e37398c0bca 100644 --- a/go/vt/vtctl/grpcvtctlserver/server.go +++ b/go/vt/vtctl/grpcvtctlserver/server.go @@ -25,18 +25,18 @@ import ( "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/vtenv" - - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtctl" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" - - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + "github.com/vitess/vitess/go/vt/vtenv" + + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtctl" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" + + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) // VtctlServer is our RPC server diff --git a/go/vt/vtctl/localvtctldclient/client.go b/go/vt/vtctl/localvtctldclient/client.go index 33bf1a60610..30d42adc74b 100644 --- a/go/vt/vtctl/localvtctldclient/client.go +++ b/go/vt/vtctl/localvtctldclient/client.go @@ -21,9 +21,9 @@ import ( "errors" "sync" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctldclient" + "github.com/vitess/vitess/go/vt/vtctl/vtctldclient" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) var ( diff --git a/go/vt/vtctl/localvtctldclient/client_gen.go b/go/vt/vtctl/localvtctldclient/client_gen.go index da48edf5e1f..a61a0fa9695 100644 --- a/go/vt/vtctl/localvtctldclient/client_gen.go +++ b/go/vt/vtctl/localvtctldclient/client_gen.go @@ -23,10 +23,10 @@ import ( "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/vtctl/internal/grpcshim" + "github.com/vitess/vitess/go/vt/vtctl/internal/grpcshim" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) // AddCellInfo is part of the vtctlservicepb.VtctldClient interface. diff --git a/go/vt/vtctl/plugin_consultopo.go b/go/vt/vtctl/plugin_consultopo.go index d4641671aa8..1650583f1d1 100644 --- a/go/vt/vtctl/plugin_consultopo.go +++ b/go/vt/vtctl/plugin_consultopo.go @@ -19,5 +19,5 @@ package vtctl import ( // Imports consultopo to register the consul implementation of // TopoServer. - _ "github.com/mdibaiee/vitess/go/vt/topo/consultopo" + _ "github.com/vitess/vitess/go/vt/topo/consultopo" ) diff --git a/go/vt/vtctl/plugin_etcd2topo.go b/go/vt/vtctl/plugin_etcd2topo.go index 472aa682c2f..dfeabd970d1 100644 --- a/go/vt/vtctl/plugin_etcd2topo.go +++ b/go/vt/vtctl/plugin_etcd2topo.go @@ -19,5 +19,5 @@ package vtctl import ( // Imports etcd2topo to register the etcd2 implementation of // TopoServer. - _ "github.com/mdibaiee/vitess/go/vt/topo/etcd2topo" + _ "github.com/vitess/vitess/go/vt/topo/etcd2topo" ) diff --git a/go/vt/vtctl/plugin_zk2topo.go b/go/vt/vtctl/plugin_zk2topo.go index 6df8cd4ce34..d89b9fe248c 100644 --- a/go/vt/vtctl/plugin_zk2topo.go +++ b/go/vt/vtctl/plugin_zk2topo.go @@ -18,5 +18,5 @@ package vtctl import ( // This plugin imports zk2topo to register the zk2 implementation of TopoServer. - _ "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" + _ "github.com/vitess/vitess/go/vt/topo/zk2topo" ) diff --git a/go/vt/vtctl/reparent.go b/go/vt/vtctl/reparent.go index 5e5252eb4c1..8ecd827a7c4 100644 --- a/go/vt/vtctl/reparent.go +++ b/go/vt/vtctl/reparent.go @@ -22,13 +22,13 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil" + "github.com/vitess/vitess/go/vt/wrangler" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func init() { diff --git a/go/vt/vtctl/reparentutil/durability.go b/go/vt/vtctl/reparentutil/durability.go index 362a28dbf35..f263ffb0304 100644 --- a/go/vt/vtctl/reparentutil/durability.go +++ b/go/vt/vtctl/reparentutil/durability.go @@ -19,10 +19,10 @@ package reparentutil import ( "fmt" - "github.com/mdibaiee/vitess/go/vt/log" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil/promotionrule" + "github.com/vitess/vitess/go/vt/log" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil/promotionrule" ) //======================================================================= diff --git a/go/vt/vtctl/reparentutil/durability_funcs.go b/go/vt/vtctl/reparentutil/durability_funcs.go index e2c2fb78534..1177eeaf9e0 100644 --- a/go/vt/vtctl/reparentutil/durability_funcs.go +++ b/go/vt/vtctl/reparentutil/durability_funcs.go @@ -17,9 +17,9 @@ limitations under the License. package reparentutil import ( - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil/promotionrule" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil/promotionrule" ) // SemiSyncAckersForPrimary returns the list of tablets which are capable of sending Semi-Sync Acks for the given primary tablet diff --git a/go/vt/vtctl/reparentutil/durability_funcs_test.go b/go/vt/vtctl/reparentutil/durability_funcs_test.go index 5dffc404895..1589b90c053 100644 --- a/go/vt/vtctl/reparentutil/durability_funcs_test.go +++ b/go/vt/vtctl/reparentutil/durability_funcs_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/vt/vtctl/reparentutil/durability_test.go b/go/vt/vtctl/reparentutil/durability_test.go index 07d6df69710..20071fc620d 100644 --- a/go/vt/vtctl/reparentutil/durability_test.go +++ b/go/vt/vtctl/reparentutil/durability_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil/promotionrule" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil/promotionrule" ) func TestDurabilityNone(t *testing.T) { diff --git a/go/vt/vtctl/reparentutil/emergency_reparenter.go b/go/vt/vtctl/reparentutil/emergency_reparenter.go index c57ff661ca6..f79c47826d9 100644 --- a/go/vt/vtctl/reparentutil/emergency_reparenter.go +++ b/go/vt/vtctl/reparentutil/emergency_reparenter.go @@ -22,24 +22,24 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/mysql/replication" - - "github.com/mdibaiee/vitess/go/event" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools/events" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil/promotionrule" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/replication" + + "github.com/vitess/vitess/go/event" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools/events" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil/promotionrule" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // EmergencyReparenter performs EmergencyReparentShard operations. diff --git a/go/vt/vtctl/reparentutil/emergency_reparenter_test.go b/go/vt/vtctl/reparentutil/emergency_reparenter_test.go index 74b946a7483..4dd7595c3b4 100644 --- a/go/vt/vtctl/reparentutil/emergency_reparenter_test.go +++ b/go/vt/vtctl/reparentutil/emergency_reparenter_test.go @@ -25,21 +25,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools/events" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver/testutil" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil/reparenttestutil" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools/events" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver/testutil" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil/reparenttestutil" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) func TestNewEmergencyReparenter(t *testing.T) { diff --git a/go/vt/vtctl/reparentutil/planned_reparenter.go b/go/vt/vtctl/reparentutil/planned_reparenter.go index d0b217d1a41..b79dee7a0d6 100644 --- a/go/vt/vtctl/reparentutil/planned_reparenter.go +++ b/go/vt/vtctl/reparentutil/planned_reparenter.go @@ -24,19 +24,19 @@ import ( "golang.org/x/sync/errgroup" - "github.com/mdibaiee/vitess/go/event" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/logutil" - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools/events" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/event" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/logutil" + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools/events" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" ) // counters for Planned Reparent Shard diff --git a/go/vt/vtctl/reparentutil/planned_reparenter_flaky_test.go b/go/vt/vtctl/reparentutil/planned_reparenter_flaky_test.go index d01d62b6028..df23c7e379f 100644 --- a/go/vt/vtctl/reparentutil/planned_reparenter_flaky_test.go +++ b/go/vt/vtctl/reparentutil/planned_reparenter_flaky_test.go @@ -24,24 +24,24 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topotools/events" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver/testutil" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topotools/events" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver/testutil" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/vt/proto/vttime" ) func TestNewPlannedReparenter(t *testing.T) { diff --git a/go/vt/vtctl/reparentutil/reparent_sorter.go b/go/vt/vtctl/reparentutil/reparent_sorter.go index fcb4a7cb961..5cd0345a5d5 100644 --- a/go/vt/vtctl/reparentutil/reparent_sorter.go +++ b/go/vt/vtctl/reparentutil/reparent_sorter.go @@ -19,11 +19,11 @@ package reparentutil import ( "sort" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/vt/vterrors" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // reparentSorter sorts tablets by GTID positions and Promotion rules aimed at finding the best diff --git a/go/vt/vtctl/reparentutil/reparent_sorter_test.go b/go/vt/vtctl/reparentutil/reparent_sorter_test.go index d4d4dbe34e4..59af4c70812 100644 --- a/go/vt/vtctl/reparentutil/reparent_sorter_test.go +++ b/go/vt/vtctl/reparentutil/reparent_sorter_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/replication" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // TestReparentSorter tests that the sorting for tablets works correctly diff --git a/go/vt/vtctl/reparentutil/reparenttestutil/util.go b/go/vt/vtctl/reparentutil/reparenttestutil/util.go index f14aea68ff5..31815430bf0 100644 --- a/go/vt/vtctl/reparentutil/reparenttestutil/util.go +++ b/go/vt/vtctl/reparentutil/reparenttestutil/util.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // SetKeyspaceDurability sets the durability policy of a given keyspace. This function should only be used in test code diff --git a/go/vt/vtctl/reparentutil/replication.go b/go/vt/vtctl/reparentutil/replication.go index 4fe6da735ee..1ffee1c7790 100644 --- a/go/vt/vtctl/reparentutil/replication.go +++ b/go/vt/vtctl/reparentutil/replication.go @@ -21,22 +21,22 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/event" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/topotools/events" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/event" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/topotools/events" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" ) // FindValidEmergencyReparentCandidates will find candidates for an emergency diff --git a/go/vt/vtctl/reparentutil/replication_test.go b/go/vt/vtctl/reparentutil/replication_test.go index 3d9ac5bad55..09147c3de53 100644 --- a/go/vt/vtctl/reparentutil/replication_test.go +++ b/go/vt/vtctl/reparentutil/replication_test.go @@ -25,20 +25,20 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/replication" - _flag "github.com/mdibaiee/vitess/go/internal/flag" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools/events" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + _flag "github.com/vitess/vitess/go/internal/flag" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools/events" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestMain(m *testing.M) { diff --git a/go/vt/vtctl/reparentutil/util.go b/go/vt/vtctl/reparentutil/util.go index e2948e8fc2e..488c76b986b 100644 --- a/go/vt/vtctl/reparentutil/util.go +++ b/go/vt/vtctl/reparentutil/util.go @@ -26,21 +26,21 @@ import ( "golang.org/x/exp/maps" "golang.org/x/sync/errgroup" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil/promotionrule" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil/promotionrule" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var ( diff --git a/go/vt/vtctl/reparentutil/util_test.go b/go/vt/vtctl/reparentutil/util_test.go index 339a66b02a4..8d68712f8c0 100644 --- a/go/vt/vtctl/reparentutil/util_test.go +++ b/go/vt/vtctl/reparentutil/util_test.go @@ -25,21 +25,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver/testutil" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil/promotionrule" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver/testutil" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil/promotionrule" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/vt/topo/topoproto" ) type chooseNewPrimaryTestTMClient struct { diff --git a/go/vt/vtctl/schematools/diff.go b/go/vt/vtctl/schematools/diff.go index 8ef273be61a..a2d3f98dfed 100644 --- a/go/vt/vtctl/schematools/diff.go +++ b/go/vt/vtctl/schematools/diff.go @@ -20,12 +20,12 @@ import ( "context" "fmt" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // CompareSchemas returns (nil, nil) if the schema of the two tablets match. If diff --git a/go/vt/vtctl/schematools/marshal.go b/go/vt/vtctl/schematools/marshal.go index 69b85a1f404..ece2766b626 100644 --- a/go/vt/vtctl/schematools/marshal.go +++ b/go/vt/vtctl/schematools/marshal.go @@ -17,12 +17,12 @@ limitations under the License. package schematools import ( - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/topo/topoproto" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/vt/proto/vttime" ) type tSchemaMigration struct { diff --git a/go/vt/vtctl/schematools/marshal_test.go b/go/vt/vtctl/schematools/marshal_test.go index ade75b8fd2d..3665c55b99a 100644 --- a/go/vt/vtctl/schematools/marshal_test.go +++ b/go/vt/vtctl/schematools/marshal_test.go @@ -23,11 +23,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sqltypes" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) func TestMarshalResult(t *testing.T) { diff --git a/go/vt/vtctl/schematools/reload.go b/go/vt/vtctl/schematools/reload.go index 87503a6d1a7..13be24b605b 100644 --- a/go/vt/vtctl/schematools/reload.go +++ b/go/vt/vtctl/schematools/reload.go @@ -22,12 +22,12 @@ import ( "golang.org/x/sync/semaphore" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // ReloadShard reloads the schema for all replica tablets in a shard, after diff --git a/go/vt/vtctl/schematools/reload_test.go b/go/vt/vtctl/schematools/reload_test.go index 9f709218562..99922922212 100644 --- a/go/vt/vtctl/schematools/reload_test.go +++ b/go/vt/vtctl/schematools/reload_test.go @@ -25,13 +25,13 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/sync/semaphore" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver/testutil" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver/testutil" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) type reloadSchemaTMC struct { diff --git a/go/vt/vtctl/schematools/schematools.go b/go/vt/vtctl/schematools/schematools.go index dcface92e40..4626cc0ebfb 100644 --- a/go/vt/vtctl/schematools/schematools.go +++ b/go/vt/vtctl/schematools/schematools.go @@ -21,14 +21,14 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // GetSchema makes an RPC to get the schema from a remote tablet, after diff --git a/go/vt/vtctl/schematools/schematools_test.go b/go/vt/vtctl/schematools/schematools_test.go index 26c1c4bd3d9..e5578b844ad 100644 --- a/go/vt/vtctl/schematools/schematools_test.go +++ b/go/vt/vtctl/schematools/schematools_test.go @@ -19,7 +19,7 @@ package schematools import ( "testing" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" "github.com/stretchr/testify/assert" ) diff --git a/go/vt/vtctl/topo.go b/go/vt/vtctl/topo.go index 62200c2384d..3551a006482 100644 --- a/go/vt/vtctl/topo.go +++ b/go/vt/vtctl/topo.go @@ -24,8 +24,8 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/wrangler" ) // This file contains the topo command group for vtctl. diff --git a/go/vt/vtctl/vdiff2.go b/go/vt/vtctl/vdiff2.go index f3cc222694c..e6000b7d9ac 100644 --- a/go/vt/vtctl/vdiff2.go +++ b/go/vt/vtctl/vdiff2.go @@ -34,14 +34,14 @@ import ( "github.com/google/uuid" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vdiff" - "github.com/mdibaiee/vitess/go/vt/wrangler" - - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vdiff" + "github.com/vitess/vitess/go/vt/wrangler" + + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func commandVDiff2(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error { diff --git a/go/vt/vtctl/vdiff2_test.go b/go/vt/vtctl/vdiff2_test.go index 1b7fc6ef4ac..9b01e11b062 100644 --- a/go/vt/vtctl/vdiff2_test.go +++ b/go/vt/vtctl/vdiff2_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vdiff" + "github.com/vitess/vitess/go/sqltypes" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vdiff" ) var ( diff --git a/go/vt/vtctl/vdiff_env_test.go b/go/vt/vtctl/vdiff_env_test.go index 58d69d7add7..258edc57435 100644 --- a/go/vt/vtctl/vdiff_env_test.go +++ b/go/vt/vtctl/vdiff_env_test.go @@ -23,22 +23,22 @@ import ( "sync" "testing" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice/fakes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconntest" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/queryservice/fakes" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletconntest" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/vtctl/vtctl.go b/go/vt/vtctl/vtctl.go index 08499a4a8ef..fb066b98105 100644 --- a/go/vt/vtctl/vtctl.go +++ b/go/vt/vtctl/vtctl.go @@ -97,39 +97,39 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/mysql/collations" - - "github.com/mdibaiee/vitess/go/cmd/vtctldclient/cli" - "github.com/mdibaiee/vitess/go/flagutil" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/discovery" - hk "github.com/mdibaiee/vitess/go/vt/hook" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/mysql/collations" + + "github.com/vitess/vitess/go/cmd/vtctldclient/cli" + "github.com/vitess/vitess/go/flagutil" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/discovery" + hk "github.com/vitess/vitess/go/vt/hook" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver" + "github.com/vitess/vitess/go/vt/vtctl/workflow" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle" + "github.com/vitess/vitess/go/vt/wrangler" ) // ErrUnknownCommand is returned for an unknown command. diff --git a/go/vt/vtctl/vtctl_env_test.go b/go/vt/vtctl/vtctl_env_test.go index 7a9e4d60811..434b2f20083 100644 --- a/go/vt/vtctl/vtctl_env_test.go +++ b/go/vt/vtctl/vtctl_env_test.go @@ -21,22 +21,22 @@ import ( "fmt" "sync" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice/fakes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconntest" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/queryservice/fakes" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletconntest" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) type testVTCtlEnv struct { diff --git a/go/vt/vtctl/vtctl_test.go b/go/vt/vtctl/vtctl_test.go index 6615ef6c774..4007d6a2f71 100644 --- a/go/vt/vtctl/vtctl_test.go +++ b/go/vt/vtctl/vtctl_test.go @@ -29,10 +29,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/sqltypes" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/wrangler" ) var ( diff --git a/go/vt/vtctl/vtctlclient/interface.go b/go/vt/vtctl/vtctlclient/interface.go index 97e7b21298f..46bfb195777 100644 --- a/go/vt/vtctl/vtctlclient/interface.go +++ b/go/vt/vtctl/vtctlclient/interface.go @@ -24,9 +24,9 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" ) // vtctlClientProtocol specifics which RPC client implementation should be used. diff --git a/go/vt/vtctl/vtctlclient/wrapper.go b/go/vt/vtctl/vtctlclient/wrapper.go index aba43570213..f56e599f065 100644 --- a/go/vt/vtctl/vtctlclient/wrapper.go +++ b/go/vt/vtctl/vtctlclient/wrapper.go @@ -23,7 +23,7 @@ import ( "io" "time" - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" ) var ( diff --git a/go/vt/vtctl/vtctlclienttest/client.go b/go/vt/vtctl/vtctlclienttest/client.go index f179f87fb5a..348df3e9e11 100644 --- a/go/vt/vtctl/vtctlclienttest/client.go +++ b/go/vt/vtctl/vtctlclienttest/client.go @@ -31,17 +31,17 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctlclient" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclienttest" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtctl/vtctlclient" + "github.com/vitess/vitess/go/vt/vttablet/tmclienttest" // import the gRPC client implementation for tablet manager - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmclient" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctmclient" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func init() { diff --git a/go/vt/vtctl/vtctldclient/client.go b/go/vt/vtctl/vtctldclient/client.go index fc3d6d125d7..e864ba777d1 100644 --- a/go/vt/vtctl/vtctldclient/client.go +++ b/go/vt/vtctl/vtctldclient/client.go @@ -7,7 +7,7 @@ import ( "fmt" "log" - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) type VtctldClient interface { diff --git a/go/vt/vtctl/vtctldclient/codegen/template.go b/go/vt/vtctl/vtctldclient/codegen/template.go index c5e7b69b8e4..11db17d154e 100644 --- a/go/vt/vtctl/vtctldclient/codegen/template.go +++ b/go/vt/vtctl/vtctldclient/codegen/template.go @@ -50,7 +50,7 @@ import ( "google.golang.org/grpc/status" {{- end }} {{ if .NeedsGRPCShim -}} - "github.com/mdibaiee/vitess/go/vt/vtctl/internal/grpcshim" + "github.com/vitess/vitess/go/vt/vtctl/internal/grpcshim" {{- end }} {{ range .Imports -}} diff --git a/go/vt/vtctl/workflow/common/utils.go b/go/vt/vtctl/workflow/common/utils.go index 3a7698640a6..b45896a129d 100644 --- a/go/vt/vtctl/workflow/common/utils.go +++ b/go/vt/vtctl/workflow/common/utils.go @@ -20,8 +20,8 @@ import ( "context" "fmt" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" ) // GetShards returns a subset of shards in a keyspace. If no subset is provided, all shards are returned. diff --git a/go/vt/vtctl/workflow/framework_test.go b/go/vt/vtctl/workflow/framework_test.go index 3c0d0702c5c..2f117a1af8d 100644 --- a/go/vt/vtctl/workflow/framework_test.go +++ b/go/vt/vtctl/workflow/framework_test.go @@ -31,22 +31,22 @@ import ( "golang.org/x/exp/maps" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - _flag "github.com/mdibaiee/vitess/go/internal/flag" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + _flag "github.com/vitess/vitess/go/internal/flag" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const ( diff --git a/go/vt/vtctl/workflow/materializer.go b/go/vt/vtctl/workflow/materializer.go index a0891537c10..3025c42df1c 100644 --- a/go/vt/vtctl/workflow/materializer.go +++ b/go/vt/vtctl/workflow/materializer.go @@ -24,27 +24,27 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/schemadiff" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtctl/schematools" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/schemadiff" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtctl/schematools" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) const ( diff --git a/go/vt/vtctl/workflow/materializer_env_test.go b/go/vt/vtctl/workflow/materializer_env_test.go index 2be3c0b194d..f14cc8f0ff5 100644 --- a/go/vt/vtctl/workflow/materializer_env_test.go +++ b/go/vt/vtctl/workflow/materializer_env_test.go @@ -27,21 +27,21 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) type testMaterializerEnv struct { diff --git a/go/vt/vtctl/workflow/materializer_test.go b/go/vt/vtctl/workflow/materializer_test.go index 93dd9ffe952..6c77a7cad65 100644 --- a/go/vt/vtctl/workflow/materializer_test.go +++ b/go/vt/vtctl/workflow/materializer_test.go @@ -28,19 +28,19 @@ import ( "golang.org/x/exp/maps" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) const ( diff --git a/go/vt/vtctl/workflow/mount.go b/go/vt/vtctl/workflow/mount.go index f49c5f1da2a..0bd1feac4f7 100644 --- a/go/vt/vtctl/workflow/mount.go +++ b/go/vt/vtctl/workflow/mount.go @@ -19,11 +19,11 @@ package workflow import ( "context" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vterrors" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func notExistsError(name string) error { diff --git a/go/vt/vtctl/workflow/resharder.go b/go/vt/vtctl/workflow/resharder.go index 176ad2a1b43..3034a77dbe3 100644 --- a/go/vt/vtctl/workflow/resharder.go +++ b/go/vt/vtctl/workflow/resharder.go @@ -24,21 +24,21 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) type resharder struct { diff --git a/go/vt/vtctl/workflow/server.go b/go/vt/vtctl/workflow/server.go index bac28243291..fa39828a6aa 100644 --- a/go/vt/vtctl/workflow/server.go +++ b/go/vt/vtctl/workflow/server.go @@ -35,42 +35,42 @@ import ( "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtctl/schematools" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow/common" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow/vexec" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vdiff" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - vttimepb "github.com/mdibaiee/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtctl/schematools" + "github.com/vitess/vitess/go/vt/vtctl/workflow/common" + "github.com/vitess/vitess/go/vt/vtctl/workflow/vexec" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vdiff" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + vttimepb "github.com/vitess/vitess/go/vt/proto/vttime" ) const ( diff --git a/go/vt/vtctl/workflow/server_test.go b/go/vt/vtctl/workflow/server_test.go index 1772d9d2743..350f5f7d189 100644 --- a/go/vt/vtctl/workflow/server_test.go +++ b/go/vt/vtctl/workflow/server_test.go @@ -29,19 +29,19 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) type fakeTMC struct { diff --git a/go/vt/vtctl/workflow/stream_migrator.go b/go/vt/vtctl/workflow/stream_migrator.go index 2a88035244e..5850b698849 100644 --- a/go/vt/vtctl/workflow/stream_migrator.go +++ b/go/vt/vtctl/workflow/stream_migrator.go @@ -29,24 +29,24 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) /* diff --git a/go/vt/vtctl/workflow/stream_migrator_test.go b/go/vt/vtctl/workflow/stream_migrator_test.go index 821686fadbf..4667b7818d6 100644 --- a/go/vt/vtctl/workflow/stream_migrator_test.go +++ b/go/vt/vtctl/workflow/stream_migrator_test.go @@ -24,13 +24,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) func TestTemplatize(t *testing.T) { diff --git a/go/vt/vtctl/workflow/switcher.go b/go/vt/vtctl/workflow/switcher.go index ef281942b31..462fabc2449 100644 --- a/go/vt/vtctl/workflow/switcher.go +++ b/go/vt/vtctl/workflow/switcher.go @@ -20,7 +20,7 @@ import ( "context" "time" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var _ iswitcher = (*switcher)(nil) diff --git a/go/vt/vtctl/workflow/switcher_dry_run.go b/go/vt/vtctl/workflow/switcher_dry_run.go index ec98305b788..0b18a194f48 100644 --- a/go/vt/vtctl/workflow/switcher_dry_run.go +++ b/go/vt/vtctl/workflow/switcher_dry_run.go @@ -26,10 +26,10 @@ import ( "golang.org/x/exp/maps" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/replication" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var _ iswitcher = (*switcherDryRun)(nil) diff --git a/go/vt/vtctl/workflow/switcher_interface.go b/go/vt/vtctl/workflow/switcher_interface.go index f839e091aa1..81b97c9a0fe 100644 --- a/go/vt/vtctl/workflow/switcher_interface.go +++ b/go/vt/vtctl/workflow/switcher_interface.go @@ -20,7 +20,7 @@ import ( "context" "time" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) type iswitcher interface { diff --git a/go/vt/vtctl/workflow/traffic_switcher.go b/go/vt/vtctl/workflow/traffic_switcher.go index 8587e08d8e5..0665b93e9e3 100644 --- a/go/vt/vtctl/workflow/traffic_switcher.go +++ b/go/vt/vtctl/workflow/traffic_switcher.go @@ -29,31 +29,31 @@ import ( "golang.org/x/exp/maps" "golang.org/x/sync/errgroup" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const ( diff --git a/go/vt/vtctl/workflow/traffic_switcher_test.go b/go/vt/vtctl/workflow/traffic_switcher_test.go index c8ea69647af..2de72e86ef9 100644 --- a/go/vt/vtctl/workflow/traffic_switcher_test.go +++ b/go/vt/vtctl/workflow/traffic_switcher_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) type testTrafficSwitcher struct { diff --git a/go/vt/vtctl/workflow/utils.go b/go/vt/vtctl/workflow/utils.go index 59f1ecf3fe3..2c36d51c8f6 100644 --- a/go/vt/vtctl/workflow/utils.go +++ b/go/vt/vtctl/workflow/utils.go @@ -28,31 +28,31 @@ import ( "strings" "sync" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const reverseSuffix = "_reverse" diff --git a/go/vt/vtctl/workflow/utils_test.go b/go/vt/vtctl/workflow/utils_test.go index 5b7e412b5bd..27b50a7a5e3 100644 --- a/go/vt/vtctl/workflow/utils_test.go +++ b/go/vt/vtctl/workflow/utils_test.go @@ -14,12 +14,12 @@ import ( "github.com/stretchr/testify/require" clientv3 "go.etcd.io/etcd/client/v3" - "github.com/mdibaiee/vitess/go/testfiles" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/etcd2topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/testfiles" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/etcd2topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topotools" ) // TestUpdateKeyspaceRoutingRule confirms that the keyspace routing rules are updated correctly. diff --git a/go/vt/vtctl/workflow/vexec/query_plan.go b/go/vt/vtctl/workflow/vexec/query_plan.go index 504e59beb2d..a3e60ce796f 100644 --- a/go/vt/vtctl/workflow/vexec/query_plan.go +++ b/go/vt/vtctl/workflow/vexec/query_plan.go @@ -21,14 +21,14 @@ import ( "fmt" "sync" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // QueryPlan defines the interface to executing a prepared vexec query on one diff --git a/go/vt/vtctl/workflow/vexec/query_plan_test.go b/go/vt/vtctl/workflow/vexec/query_plan_test.go index 099a51b3f5a..8b395295c6f 100644 --- a/go/vt/vtctl/workflow/vexec/query_plan_test.go +++ b/go/vt/vtctl/workflow/vexec/query_plan_test.go @@ -21,16 +21,16 @@ import ( "errors" "testing" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver/testutil" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver/testutil" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestQueryPlanExecute(t *testing.T) { diff --git a/go/vt/vtctl/workflow/vexec/query_planner.go b/go/vt/vtctl/workflow/vexec/query_planner.go index 0ba982d528b..dd9ec815670 100644 --- a/go/vt/vtctl/workflow/vexec/query_planner.go +++ b/go/vt/vtctl/workflow/vexec/query_planner.go @@ -20,8 +20,8 @@ import ( "errors" "fmt" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" ) var ( // Query planning errors. diff --git a/go/vt/vtctl/workflow/vexec/query_planner_test.go b/go/vt/vtctl/workflow/vexec/query_planner_test.go index 2b0bb18f8cc..a48fc915565 100644 --- a/go/vt/vtctl/workflow/vexec/query_planner_test.go +++ b/go/vt/vtctl/workflow/vexec/query_planner_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow/vexec/testutil" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtctl/workflow/vexec/testutil" ) func TestVReplicationQueryPlanner_PlanQuery(t *testing.T) { diff --git a/go/vt/vtctl/workflow/vexec/testutil/query.go b/go/vt/vtctl/workflow/vexec/testutil/query.go index f1111832502..407e8baf79c 100644 --- a/go/vt/vtctl/workflow/vexec/testutil/query.go +++ b/go/vt/vtctl/workflow/vexec/testutil/query.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) // ParsedQueryFromString is a test helper that returns a *sqlparser.ParsedQuery diff --git a/go/vt/vtctl/workflow/vexec/vexec.go b/go/vt/vtctl/workflow/vexec/vexec.go index ff3946168c8..dc4a035e6b2 100644 --- a/go/vt/vtctl/workflow/vexec/vexec.go +++ b/go/vt/vtctl/workflow/vexec/vexec.go @@ -22,17 +22,17 @@ import ( "fmt" "sync" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow/common" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/workflow/common" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + querypb "github.com/vitess/vitess/go/vt/proto/query" ) const ( diff --git a/go/vt/vtctl/workflow/vreplication_stream.go b/go/vt/vtctl/workflow/vreplication_stream.go index 6684adfe7a3..49b230176f7 100644 --- a/go/vt/vtctl/workflow/vreplication_stream.go +++ b/go/vt/vtctl/workflow/vreplication_stream.go @@ -21,9 +21,9 @@ import ( "sort" "strings" - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/replication" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) // VReplicationStream represents a single stream of a vreplication workflow. diff --git a/go/vt/vtctld/action_repository.go b/go/vt/vtctld/action_repository.go index f606fc2a4fb..85484973a27 100644 --- a/go/vt/vtctld/action_repository.go +++ b/go/vt/vtctld/action_repository.go @@ -23,17 +23,17 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/vt/vtctld/api.go b/go/vt/vtctld/api.go index 1361f8a4bbe..63e6c823822 100644 --- a/go/vt/vtctld/api.go +++ b/go/vt/vtctld/api.go @@ -28,23 +28,23 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/schemamanager" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" - - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/schemamanager" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" + + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/vt/vtctld/api_test.go b/go/vt/vtctld/api_test.go index 2397598230f..cb1af91aff6 100644 --- a/go/vt/vtctld/api_test.go +++ b/go/vt/vtctld/api_test.go @@ -27,13 +27,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/servenv/testutils" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/vt/servenv/testutils" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/wrangler" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) func compactJSON(in []byte) string { diff --git a/go/vt/vtctld/debug_health.go b/go/vt/vtctld/debug_health.go index c60cf75bed2..fdf75df6b14 100644 --- a/go/vt/vtctld/debug_health.go +++ b/go/vt/vtctld/debug_health.go @@ -23,9 +23,9 @@ import ( "context" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" ) // RegisterDebugHealthHandler register a debug health http endpoint for a vtcld server diff --git a/go/vt/vtctld/explorer.go b/go/vt/vtctld/explorer.go index 4933ff3148b..39e99e83020 100644 --- a/go/vt/vtctld/explorer.go +++ b/go/vt/vtctld/explorer.go @@ -25,7 +25,7 @@ import ( "context" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" ) // backendExplorer is a class that uses the Backend interface of a diff --git a/go/vt/vtctld/explorer_test.go b/go/vt/vtctld/explorer_test.go index 8836045be93..bb289f85879 100644 --- a/go/vt/vtctld/explorer_test.go +++ b/go/vt/vtctld/explorer_test.go @@ -22,10 +22,10 @@ import ( "reflect" "testing" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // Test the explorer using MemoryTopo as a backend. diff --git a/go/vt/vtctld/tablet_data.go b/go/vt/vtctld/tablet_data.go index 59f6cb5d8ff..56c3f8f4fff 100644 --- a/go/vt/vtctld/tablet_data.go +++ b/go/vt/vtctld/tablet_data.go @@ -24,15 +24,15 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // This file maintains a tablet health cache. It establishes streaming diff --git a/go/vt/vtctld/tablet_data_test.go b/go/vt/vtctld/tablet_data_test.go index 310c1a123ee..a0aaf4ea170 100644 --- a/go/vt/vtctld/tablet_data_test.go +++ b/go/vt/vtctld/tablet_data_test.go @@ -25,17 +25,17 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/logutil" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/grpcqueryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice/fakes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" - "github.com/mdibaiee/vitess/go/vt/wrangler/testlib" + "github.com/vitess/vitess/go/vt/logutil" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/grpcqueryservice" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/queryservice/fakes" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/vt/wrangler/testlib" ) // streamHealthTabletServer is a local QueryService implementation to support the tests diff --git a/go/vt/vtctld/vtctld.go b/go/vt/vtctld/vtctld.go index be6b706b6ef..4a96492360a 100644 --- a/go/vt/vtctld/vtctld.go +++ b/go/vt/vtctld/vtctld.go @@ -23,16 +23,16 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/wrangler" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) var ( diff --git a/go/vt/vtenv/cached_size.go b/go/vt/vtenv/cached_size.go index 695e277e97e..de2e049bf06 100644 --- a/go/vt/vtenv/cached_size.go +++ b/go/vt/vtenv/cached_size.go @@ -17,7 +17,7 @@ limitations under the License. package vtenv -import hack "github.com/mdibaiee/vitess/go/hack" +import hack "github.com/vitess/vitess/go/hack" func (cached *Environment) CachedSize(alloc bool) int64 { if cached == nil { @@ -27,9 +27,9 @@ func (cached *Environment) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field collationEnv *github.com/mdibaiee/vitess/go/mysql/collations.Environment + // field collationEnv *github.com/vitess/vitess/go/mysql/collations.Environment size += cached.collationEnv.CachedSize(true) - // field parser *github.com/mdibaiee/vitess/go/vt/sqlparser.Parser + // field parser *github.com/vitess/vitess/go/vt/sqlparser.Parser size += cached.parser.CachedSize(true) // field mysqlVersion string size += hack.RuntimeAllocSize(int64(len(cached.mysqlVersion))) diff --git a/go/vt/vtenv/vtenv.go b/go/vt/vtenv/vtenv.go index 20043d6b7c1..a9da60738b0 100644 --- a/go/vt/vtenv/vtenv.go +++ b/go/vt/vtenv/vtenv.go @@ -17,9 +17,9 @@ limitations under the License. package vtenv import ( - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/config" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/config" + "github.com/vitess/vitess/go/vt/sqlparser" ) type Environment struct { diff --git a/go/vt/vtenv/vtenv_test.go b/go/vt/vtenv/vtenv_test.go index 21992fbb99f..d8561d02917 100644 --- a/go/vt/vtenv/vtenv_test.go +++ b/go/vt/vtenv/vtenv_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/config" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/config" + "github.com/vitess/vitess/go/vt/sqlparser" ) func TestNewDefaults(t *testing.T) { diff --git a/go/vt/vterrors/aggregate.go b/go/vt/vterrors/aggregate.go index f37900aa162..77d54744c23 100644 --- a/go/vt/vterrors/aggregate.go +++ b/go/vt/vterrors/aggregate.go @@ -20,7 +20,7 @@ import ( "sort" "strings" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // A list of all vtrpcpb.Code, ordered by priority. These priorities are diff --git a/go/vt/vterrors/aggregate_test.go b/go/vt/vterrors/aggregate_test.go index c08fa2494f2..88682bfb255 100644 --- a/go/vt/vterrors/aggregate_test.go +++ b/go/vt/vterrors/aggregate_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var errGeneric = "generic error" diff --git a/go/vt/vterrors/code.go b/go/vt/vterrors/code.go index 304a431ad65..4ca79d39cdf 100644 --- a/go/vt/vterrors/code.go +++ b/go/vt/vterrors/code.go @@ -19,7 +19,7 @@ package vterrors import ( "fmt" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // Errors added to the list of variables below must be added to the Errors slice a little below in this same file. diff --git a/go/vt/vterrors/errors_test.go b/go/vt/vterrors/errors_test.go index 0eda2024698..68d77a3c058 100644 --- a/go/vt/vterrors/errors_test.go +++ b/go/vt/vterrors/errors_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func TestWrapNil(t *testing.T) { diff --git a/go/vt/vterrors/grpc.go b/go/vt/vterrors/grpc.go index ad4039e3e11..3ac3a6b332f 100644 --- a/go/vt/vterrors/grpc.go +++ b/go/vt/vterrors/grpc.go @@ -23,7 +23,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // This file contains functions to convert errors to and from gRPC codes. diff --git a/go/vt/vterrors/last_error.go b/go/vt/vterrors/last_error.go index 25ae53efdd4..d5dbffbbaa9 100644 --- a/go/vt/vterrors/last_error.go +++ b/go/vt/vterrors/last_error.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) /* diff --git a/go/vt/vterrors/proto3.go b/go/vt/vterrors/proto3.go index e103bb9a5ed..5eefa6d34a2 100644 --- a/go/vt/vterrors/proto3.go +++ b/go/vt/vterrors/proto3.go @@ -17,7 +17,7 @@ limitations under the License. package vterrors import ( - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // This file contains the necessary methods to send and receive errors diff --git a/go/vt/vterrors/proto3_test.go b/go/vt/vterrors/proto3_test.go index 1646695156a..e6d0802b452 100644 --- a/go/vt/vterrors/proto3_test.go +++ b/go/vt/vterrors/proto3_test.go @@ -21,7 +21,7 @@ import ( "google.golang.org/protobuf/proto" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func TestFromVtRPCError(t *testing.T) { diff --git a/go/vt/vterrors/state.go b/go/vt/vterrors/state.go index 90382e9e25f..e886a35dffa 100644 --- a/go/vt/vterrors/state.go +++ b/go/vt/vterrors/state.go @@ -16,7 +16,7 @@ limitations under the License. package vterrors -import vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" +import vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" // State is error state type State int diff --git a/go/vt/vterrors/vterrors.go b/go/vt/vterrors/vterrors.go index df1488bdf7b..a99daa22302 100644 --- a/go/vt/vterrors/vterrors.go +++ b/go/vt/vterrors/vterrors.go @@ -95,7 +95,7 @@ import ( "github.com/spf13/pflag" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // logErrStacks controls whether printing errors includes the diff --git a/go/vt/vterrors/vterrorsgen/main.go b/go/vt/vterrors/vterrorsgen/main.go index a6120b31e79..bff5823c860 100644 --- a/go/vt/vterrors/vterrorsgen/main.go +++ b/go/vt/vterrors/vterrorsgen/main.go @@ -22,9 +22,9 @@ import ( "strings" "text/template" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" ) const ( @@ -38,7 +38,7 @@ const ( ` ) -// This program reads the errors located in the `github.com/mdibaiee/vitess/go/vt/vterrors` package +// This program reads the errors located in the `github.com/vitess/vitess/go/vt/vterrors` package // and prints on the standard output a table, in Markdown format, that lists all the // errors with their code, description, error content, mysql error code and the SQL state. func main() { diff --git a/go/vt/vtexplain/vtexplain.go b/go/vt/vtexplain/vtexplain.go index fcf40450c4e..748b7187092 100644 --- a/go/vt/vtexplain/vtexplain.go +++ b/go/vt/vtexplain/vtexplain.go @@ -28,22 +28,22 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtgate" - - "github.com/mdibaiee/vitess/go/jsonutil" - "github.com/mdibaiee/vitess/go/sync2" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtenv" + + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtgate" + + "github.com/vitess/vitess/go/jsonutil" + "github.com/vitess/vitess/go/sync2" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/engine" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) var batchInterval = 10 * time.Millisecond diff --git a/go/vt/vtexplain/vtexplain_test.go b/go/vt/vtexplain/vtexplain_test.go index c518449166a..8c3efaa8b4a 100644 --- a/go/vt/vtexplain/vtexplain_test.go +++ b/go/vt/vtexplain/vtexplain_test.go @@ -28,17 +28,17 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv/tabletenvtest" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv/tabletenvtest" ) func defaultTestOpts() *Options { diff --git a/go/vt/vtexplain/vtexplain_topo.go b/go/vt/vtexplain/vtexplain_topo.go index 465ce7355f4..6c309de6280 100644 --- a/go/vt/vtexplain/vtexplain_topo.go +++ b/go/vt/vtexplain/vtexplain_topo.go @@ -21,10 +21,10 @@ import ( "fmt" "sync" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) // ExplainTopo satisfies the srvtopo.Server interface. diff --git a/go/vt/vtexplain/vtexplain_vtgate.go b/go/vt/vtexplain/vtexplain_vtgate.go index e27da27403e..61f14b67f8f 100644 --- a/go/vt/vtexplain/vtexplain_vtgate.go +++ b/go/vt/vtexplain/vtexplain_vtgate.go @@ -26,26 +26,26 @@ import ( "sort" "strings" - "github.com/mdibaiee/vitess/go/cache/theine" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/logstats" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/cache/theine" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/logstats" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) func (vte *VTExplain) initVtgateExecutor(ctx context.Context, ts *topo.Server, vSchemaStr, ksShardMapStr string, opts *Options, srvTopoCounts *stats.CountersWithSingleLabel) error { diff --git a/go/vt/vtexplain/vtexplain_vttablet.go b/go/vt/vtexplain/vtexplain_vttablet.go index 60bfca95fff..f7c3329c505 100644 --- a/go/vt/vtexplain/vtexplain_vttablet.go +++ b/go/vt/vtexplain/vtexplain_vttablet.go @@ -23,29 +23,29 @@ import ( "strings" "sync" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/sidecardb" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/sidecardb" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtenv" + + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) type tabletEnv struct { diff --git a/go/vt/vtexplain/vtexplain_vttablet_test.go b/go/vt/vtexplain/vtexplain_vttablet_test.go index 6214ffb951b..7ed7a30ec7e 100644 --- a/go/vt/vtexplain/vtexplain_vttablet_test.go +++ b/go/vt/vtexplain/vtexplain_vttablet_test.go @@ -25,14 +25,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestRun(t *testing.T) { diff --git a/go/vt/vtgate/api.go b/go/vt/vtgate/api.go index 9f6cb791ab6..51a46de8b39 100644 --- a/go/vt/vtgate/api.go +++ b/go/vt/vtgate/api.go @@ -22,9 +22,9 @@ import ( "net/http" "strings" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" ) // This file implements a REST-style API for the vtgate web interface. diff --git a/go/vt/vtgate/autocommit_test.go b/go/vt/vtgate/autocommit_test.go index 3195e289ef2..8426e1be5f4 100644 --- a/go/vt/vtgate/autocommit_test.go +++ b/go/vt/vtgate/autocommit_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // This file contains tests for all the autocommit code paths diff --git a/go/vt/vtgate/bench_test.go b/go/vt/vtgate/bench_test.go index dba71f95408..42d60a97c71 100644 --- a/go/vt/vtgate/bench_test.go +++ b/go/vt/vtgate/bench_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) // Benchmark run on 6/27/17, with optimized byte-level operations diff --git a/go/vt/vtgate/buffer/buffer.go b/go/vt/vtgate/buffer/buffer.go index 0104dc63b3b..9f1cd3589c5 100644 --- a/go/vt/vtgate/buffer/buffer.go +++ b/go/vt/vtgate/buffer/buffer.go @@ -33,12 +33,12 @@ import ( "golang.org/x/sync/semaphore" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var ( diff --git a/go/vt/vtgate/buffer/buffer_helper_test.go b/go/vt/vtgate/buffer/buffer_helper_test.go index 407a640c911..e7f32f966f1 100644 --- a/go/vt/vtgate/buffer/buffer_helper_test.go +++ b/go/vt/vtgate/buffer/buffer_helper_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) type failover func(buf *Buffer, tablet *topodatapb.Tablet, keyspace, shard string, now time.Time) diff --git a/go/vt/vtgate/buffer/buffer_test.go b/go/vt/vtgate/buffer/buffer_test.go index 06a92ee242f..0b222be53e1 100644 --- a/go/vt/vtgate/buffer/buffer_test.go +++ b/go/vt/vtgate/buffer/buffer_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const ( diff --git a/go/vt/vtgate/buffer/flags.go b/go/vt/vtgate/buffer/flags.go index f2fe4b890e6..bed48296f27 100644 --- a/go/vt/vtgate/buffer/flags.go +++ b/go/vt/vtgate/buffer/flags.go @@ -24,9 +24,9 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo/topoproto" ) var ( diff --git a/go/vt/vtgate/buffer/shard_buffer.go b/go/vt/vtgate/buffer/shard_buffer.go index 47fa296ddb3..36122f85e2e 100644 --- a/go/vt/vtgate/buffer/shard_buffer.go +++ b/go/vt/vtgate/buffer/shard_buffer.go @@ -24,14 +24,14 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/errorsanitizer" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/errorsanitizer" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // bufferState represents the different states a shardBuffer object can be in. diff --git a/go/vt/vtgate/buffer/variables.go b/go/vt/vtgate/buffer/variables.go index 3964629cacd..fa970df59be 100644 --- a/go/vt/vtgate/buffer/variables.go +++ b/go/vt/vtgate/buffer/variables.go @@ -17,7 +17,7 @@ limitations under the License. package buffer import ( - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) // This file contains all status variables which can be used to monitor the diff --git a/go/vt/vtgate/buffer/variables_test.go b/go/vt/vtgate/buffer/variables_test.go index bdbfbf678bf..75b023830b7 100644 --- a/go/vt/vtgate/buffer/variables_test.go +++ b/go/vt/vtgate/buffer/variables_test.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) func TestVariables(t *testing.T) { diff --git a/go/vt/vtgate/debugenv.go b/go/vt/vtgate/debugenv.go index 321869dbc03..6c9f27701f5 100644 --- a/go/vt/vtgate/debugenv.go +++ b/go/vt/vtgate/debugenv.go @@ -25,9 +25,9 @@ import ( "text/template" "time" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/vt/vtgate/endtoend/aggr_test.go b/go/vt/vtgate/endtoend/aggr_test.go index 2d383329579..6d493e29e47 100644 --- a/go/vt/vtgate/endtoend/aggr_test.go +++ b/go/vt/vtgate/endtoend/aggr_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" ) func TestAggregateTypes(t *testing.T) { diff --git a/go/vt/vtgate/endtoend/deletetest/delete_test.go b/go/vt/vtgate/endtoend/deletetest/delete_test.go index dcc6c56ec0c..ad1a38bef1e 100644 --- a/go/vt/vtgate/endtoend/deletetest/delete_test.go +++ b/go/vt/vtgate/endtoend/deletetest/delete_test.go @@ -23,13 +23,13 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" - "github.com/mdibaiee/vitess/go/vt/vttest" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" + "github.com/vitess/vitess/go/vt/vttest" ) var ( diff --git a/go/vt/vtgate/endtoend/last_insert_id_test.go b/go/vt/vtgate/endtoend/last_insert_id_test.go index e895e48502b..c38ccc93963 100644 --- a/go/vt/vtgate/endtoend/last_insert_id_test.go +++ b/go/vt/vtgate/endtoend/last_insert_id_test.go @@ -24,8 +24,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func TestLastInsertId(t *testing.T) { diff --git a/go/vt/vtgate/endtoend/lookup_test.go b/go/vt/vtgate/endtoend/lookup_test.go index a6e4d458a7e..e8f19dcfc2c 100644 --- a/go/vt/vtgate/endtoend/lookup_test.go +++ b/go/vt/vtgate/endtoend/lookup_test.go @@ -23,12 +23,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/mysql/sqlerror" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" ) func TestConsistentLookup(t *testing.T) { diff --git a/go/vt/vtgate/endtoend/main_test.go b/go/vt/vtgate/endtoend/main_test.go index 3f4102bb201..842509c652a 100644 --- a/go/vt/vtgate/endtoend/main_test.go +++ b/go/vt/vtgate/endtoend/main_test.go @@ -23,12 +23,12 @@ import ( "os" "testing" - _flag "github.com/mdibaiee/vitess/go/internal/flag" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" - "github.com/mdibaiee/vitess/go/vt/vttest" + _flag "github.com/vitess/vitess/go/internal/flag" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" + "github.com/vitess/vitess/go/vt/vttest" ) var ( diff --git a/go/vt/vtgate/endtoend/misc_test.go b/go/vt/vtgate/endtoend/misc_test.go index cebe3987bd6..dc7c396ca8d 100644 --- a/go/vt/vtgate/endtoend/misc_test.go +++ b/go/vt/vtgate/endtoend/misc_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" ) var ctx = context.Background() diff --git a/go/vt/vtgate/endtoend/oltp_test.go b/go/vt/vtgate/endtoend/oltp_test.go index b493d7edfc5..cdcb5ee059c 100644 --- a/go/vt/vtgate/endtoend/oltp_test.go +++ b/go/vt/vtgate/endtoend/oltp_test.go @@ -8,7 +8,7 @@ import ( "sync" "testing" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" ) // 10 groups, 119 characters diff --git a/go/vt/vtgate/endtoend/row_count_test.go b/go/vt/vtgate/endtoend/row_count_test.go index 39bca779dda..d1b778a083f 100644 --- a/go/vt/vtgate/endtoend/row_count_test.go +++ b/go/vt/vtgate/endtoend/row_count_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/utils" ) func TestRowCount(t *testing.T) { diff --git a/go/vt/vtgate/endtoend/update/lookup_unique_test.go b/go/vt/vtgate/endtoend/update/lookup_unique_test.go index 6e9207793a7..8717d02305c 100644 --- a/go/vt/vtgate/endtoend/update/lookup_unique_test.go +++ b/go/vt/vtgate/endtoend/update/lookup_unique_test.go @@ -24,14 +24,14 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/internal/flag" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/endtoend/utils" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vttest" - - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" + "github.com/vitess/vitess/go/internal/flag" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/endtoend/utils" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vttest" + + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" ) var ( diff --git a/go/vt/vtgate/endtoend/vstream_test.go b/go/vt/vtgate/endtoend/vstream_test.go index 7b5b9768dc7..2439051f649 100644 --- a/go/vt/vtgate/endtoend/vstream_test.go +++ b/go/vt/vtgate/endtoend/vstream_test.go @@ -28,16 +28,16 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) func initialize(ctx context.Context, t *testing.T) (*vtgateconn.VTGateConn, *mysql.Conn, *mysql.Conn, func()) { diff --git a/go/vt/vtgate/engine/aggregations.go b/go/vt/vtgate/engine/aggregations.go index 0a43b3d5166..caed56ecb3c 100644 --- a/go/vt/vtgate/engine/aggregations.go +++ b/go/vt/vtgate/engine/aggregations.go @@ -20,15 +20,15 @@ import ( "fmt" "strconv" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/sqltypes" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - . "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/sqltypes" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + . "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) // AggregateParams specify the parameters for each aggregation. diff --git a/go/vt/vtgate/engine/aggregations_test.go b/go/vt/vtgate/engine/aggregations_test.go index 0d5b24c976a..08c3bb5b081 100644 --- a/go/vt/vtgate/engine/aggregations_test.go +++ b/go/vt/vtgate/engine/aggregations_test.go @@ -25,9 +25,9 @@ import ( "github.com/google/uuid" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - . "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + . "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" ) func makeTestResults(fields []*querypb.Field, gen []sqltypes.RandomGenerator, N int) []*sqltypes.Result { diff --git a/go/vt/vtgate/engine/cached_size.go b/go/vt/vtgate/engine/cached_size.go index c78e76f710f..b71e7900e24 100644 --- a/go/vt/vtgate/engine/cached_size.go +++ b/go/vt/vtgate/engine/cached_size.go @@ -22,7 +22,7 @@ import ( "reflect" "unsafe" - hack "github.com/mdibaiee/vitess/go/hack" + hack "github.com/vitess/vitess/go/hack" ) type cachedObject interface { @@ -37,17 +37,17 @@ func (cached *AggregateParams) CachedSize(alloc bool) int64 { if alloc { size += int64(112) } - // field Type github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Type + // field Type github.com/vitess/vitess/go/vt/vtgate/evalengine.Type size += cached.Type.CachedSize(false) // field Alias string size += hack.RuntimeAllocSize(int64(len(cached.Alias))) - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field Original *github.com/mdibaiee/vitess/go/vt/sqlparser.AliasedExpr + // field Original *github.com/vitess/vitess/go/vt/sqlparser.AliasedExpr size += cached.Original.CachedSize(true) - // field CollationEnv *github.com/mdibaiee/vitess/go/mysql/collations.Environment + // field CollationEnv *github.com/vitess/vitess/go/mysql/collations.Environment size += cached.CollationEnv.CachedSize(true) return size } @@ -59,9 +59,9 @@ func (cached *AlterVSchema) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field Keyspace *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Keyspace + // field Keyspace *github.com/vitess/vitess/go/vt/vtgate/vindexes.Keyspace size += cached.Keyspace.CachedSize(true) - // field AlterVschemaDDL *github.com/mdibaiee/vitess/go/vt/sqlparser.AlterVschema + // field AlterVschemaDDL *github.com/vitess/vitess/go/vt/sqlparser.AlterVschema size += cached.AlterVschemaDDL.CachedSize(true) return size } @@ -75,9 +75,9 @@ func (cached *CheckCol) CachedSize(alloc bool) int64 { } // field WsCol *int size += hack.RuntimeAllocSize(int64(8)) - // field Type github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Type + // field Type github.com/vitess/vitess/go/vt/vtgate/evalengine.Type size += cached.Type.CachedSize(false) - // field CollationEnv *github.com/mdibaiee/vitess/go/mysql/collations.Environment + // field CollationEnv *github.com/vitess/vitess/go/mysql/collations.Environment size += cached.CollationEnv.CachedSize(true) return size } @@ -91,7 +91,7 @@ func (cached *Concatenate) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Sources []github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Sources []github.com/vitess/vitess/go/vt/vtgate/engine.Primitive { size += hack.RuntimeAllocSize(int64(cap(cached.Sources)) * int64(16)) for _, elem := range cached.Sources { @@ -133,17 +133,17 @@ func (cached *DDL) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Keyspace *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Keyspace + // field Keyspace *github.com/vitess/vitess/go/vt/vtgate/vindexes.Keyspace size += cached.Keyspace.CachedSize(true) // field SQL string size += hack.RuntimeAllocSize(int64(len(cached.SQL))) - // field DDL github.com/mdibaiee/vitess/go/vt/sqlparser.DDLStatement + // field DDL github.com/vitess/vitess/go/vt/sqlparser.DDLStatement if cc, ok := cached.DDL.(cachedObject); ok { size += cc.CachedSize(true) } - // field NormalDDL *github.com/mdibaiee/vitess/go/vt/vtgate/engine.Send + // field NormalDDL *github.com/vitess/vitess/go/vt/vtgate/engine.Send size += cached.NormalDDL.CachedSize(true) - // field OnlineDDL *github.com/mdibaiee/vitess/go/vt/vtgate/engine.OnlineDDL + // field OnlineDDL *github.com/vitess/vitess/go/vt/vtgate/engine.OnlineDDL size += cached.OnlineDDL.CachedSize(true) return size } @@ -157,7 +157,7 @@ func (cached *DML) CachedSize(alloc bool) int64 { } // field Query string size += hack.RuntimeAllocSize(int64(len(cached.Query))) - // field KsidVindex github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Vindex + // field KsidVindex github.com/vitess/vitess/go/vt/vtgate/vindexes.Vindex if cc, ok := cached.KsidVindex.(cachedObject); ok { size += cc.CachedSize(true) } @@ -168,7 +168,7 @@ func (cached *DML) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(len(elem))) } } - // field Vindexes []*github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.ColumnVindex + // field Vindexes []*github.com/vitess/vitess/go/vt/vtgate/vindexes.ColumnVindex { size += hack.RuntimeAllocSize(int64(cap(cached.Vindexes)) * int64(8)) for _, elem := range cached.Vindexes { @@ -177,7 +177,7 @@ func (cached *DML) CachedSize(alloc bool) int64 { } // field OwnedVindexQuery string size += hack.RuntimeAllocSize(int64(len(cached.OwnedVindexQuery))) - // field RoutingParameters *github.com/mdibaiee/vitess/go/vt/vtgate/engine.RoutingParameters + // field RoutingParameters *github.com/vitess/vitess/go/vt/vtgate/engine.RoutingParameters size += cached.RoutingParameters.CachedSize(true) return size } @@ -191,11 +191,11 @@ func (cached *DMLWithInput) CachedSize(alloc bool) int64 { if alloc { size += int64(96) } - // field Input github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Input github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Input.(cachedObject); ok { size += cc.CachedSize(true) } - // field DMLs []github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field DMLs []github.com/vitess/vitess/go/vt/vtgate/engine.Primitive { size += hack.RuntimeAllocSize(int64(cap(cached.DMLs)) * int64(16)) for _, elem := range cached.DMLs { @@ -242,7 +242,7 @@ func (cached *Delete) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field DML *github.com/mdibaiee/vitess/go/vt/vtgate/engine.DML + // field DML *github.com/vitess/vitess/go/vt/vtgate/engine.DML size += cached.DML.CachedSize(true) return size } @@ -254,11 +254,11 @@ func (cached *Distinct) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Source github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Source github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Source.(cachedObject); ok { size += cc.CachedSize(true) } - // field CheckCols []github.com/mdibaiee/vitess/go/vt/vtgate/engine.CheckCol + // field CheckCols []github.com/vitess/vitess/go/vt/vtgate/engine.CheckCol { size += hack.RuntimeAllocSize(int64(cap(cached.CheckCols)) * int64(48)) for _, elem := range cached.CheckCols { @@ -275,14 +275,14 @@ func (cached *ExecStmt) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Params []*github.com/mdibaiee/vitess/go/vt/sqlparser.Variable + // field Params []*github.com/vitess/vitess/go/vt/sqlparser.Variable { size += hack.RuntimeAllocSize(int64(cap(cached.Params)) * int64(8)) for _, elem := range cached.Params { size += elem.CachedSize(true) } } - // field Input github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Input github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Input.(cachedObject); ok { size += cc.CachedSize(true) } @@ -296,15 +296,15 @@ func (cached *Filter) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Predicate github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field Predicate github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr if cc, ok := cached.Predicate.(cachedObject); ok { size += cc.CachedSize(true) } - // field ASTPredicate github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field ASTPredicate github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.ASTPredicate.(cachedObject); ok { size += cc.CachedSize(true) } - // field Input github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Input github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Input.(cachedObject); ok { size += cc.CachedSize(true) } @@ -318,18 +318,18 @@ func (cached *FkCascade) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Selection github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Selection github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Selection.(cachedObject); ok { size += cc.CachedSize(true) } - // field Children []*github.com/mdibaiee/vitess/go/vt/vtgate/engine.FkChild + // field Children []*github.com/vitess/vitess/go/vt/vtgate/engine.FkChild { size += hack.RuntimeAllocSize(int64(cap(cached.Children)) * int64(8)) for _, elem := range cached.Children { size += elem.CachedSize(true) } } - // field Parent github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Parent github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Parent.(cachedObject); ok { size += cc.CachedSize(true) } @@ -349,14 +349,14 @@ func (cached *FkChild) CachedSize(alloc bool) int64 { { size += hack.RuntimeAllocSize(int64(cap(cached.Cols)) * int64(8)) } - // field NonLiteralInfo []github.com/mdibaiee/vitess/go/vt/vtgate/engine.NonLiteralUpdateInfo + // field NonLiteralInfo []github.com/vitess/vitess/go/vt/vtgate/engine.NonLiteralUpdateInfo { size += hack.RuntimeAllocSize(int64(cap(cached.NonLiteralInfo)) * int64(32)) for _, elem := range cached.NonLiteralInfo { size += elem.CachedSize(false) } } - // field Exec github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Exec github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Exec.(cachedObject); ok { size += cc.CachedSize(true) } @@ -370,14 +370,14 @@ func (cached *FkVerify) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Verify []*github.com/mdibaiee/vitess/go/vt/vtgate/engine.Verify + // field Verify []*github.com/vitess/vitess/go/vt/vtgate/engine.Verify { size += hack.RuntimeAllocSize(int64(cap(cached.Verify)) * int64(8)) for _, elem := range cached.Verify { size += elem.CachedSize(true) } } - // field Exec github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Exec github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Exec.(cachedObject); ok { size += cc.CachedSize(true) } @@ -391,11 +391,11 @@ func (cached *Generate) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Keyspace *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Keyspace + // field Keyspace *github.com/vitess/vitess/go/vt/vtgate/vindexes.Keyspace size += cached.Keyspace.CachedSize(true) // field Query string size += hack.RuntimeAllocSize(int64(len(cached.Query))) - // field Values github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field Values github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr if cc, ok := cached.Values.(cachedObject); ok { size += cc.CachedSize(true) } @@ -409,13 +409,13 @@ func (cached *GroupByParams) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field Expr github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Expr github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } - // field Type github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Type + // field Type github.com/vitess/vitess/go/vt/vtgate/evalengine.Type size += cached.Type.CachedSize(false) - // field CollationEnv *github.com/mdibaiee/vitess/go/mysql/collations.Environment + // field CollationEnv *github.com/vitess/vitess/go/mysql/collations.Environment size += cached.CollationEnv.CachedSize(true) return size } @@ -427,11 +427,11 @@ func (cached *HashJoin) CachedSize(alloc bool) int64 { if alloc { size += int64(128) } - // field Left github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Left github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Left.(cachedObject); ok { size += cc.CachedSize(true) } - // field Right github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Right github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Right.(cachedObject); ok { size += cc.CachedSize(true) } @@ -439,13 +439,13 @@ func (cached *HashJoin) CachedSize(alloc bool) int64 { { size += hack.RuntimeAllocSize(int64(cap(cached.Cols)) * int64(8)) } - // field ASTPred github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field ASTPred github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.ASTPred.(cachedObject); ok { size += cc.CachedSize(true) } - // field CollationEnv *github.com/mdibaiee/vitess/go/mysql/collations.Environment + // field CollationEnv *github.com/vitess/vitess/go/mysql/collations.Environment size += cached.CollationEnv.CachedSize(true) - // field Values *github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.EnumSetValues + // field Values *github.com/vitess/vitess/go/vt/vtgate/evalengine.EnumSetValues if cached.Values != nil { size += int64(24) size += hack.RuntimeAllocSize(int64(cap(*cached.Values)) * int64(16)) @@ -463,11 +463,11 @@ func (cached *Insert) CachedSize(alloc bool) int64 { if alloc { size += int64(224) } - // field InsertCommon github.com/mdibaiee/vitess/go/vt/vtgate/engine.InsertCommon + // field InsertCommon github.com/vitess/vitess/go/vt/vtgate/engine.InsertCommon size += cached.InsertCommon.CachedSize(false) // field Query string size += hack.RuntimeAllocSize(int64(len(cached.Query))) - // field VindexValues [][][]github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field VindexValues [][][]github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr { size += hack.RuntimeAllocSize(int64(cap(cached.VindexValues)) * int64(24)) for _, elem := range cached.VindexValues { @@ -486,7 +486,7 @@ func (cached *Insert) CachedSize(alloc bool) int64 { } } } - // field Mid github.com/mdibaiee/vitess/go/vt/sqlparser.Values + // field Mid github.com/vitess/vitess/go/vt/sqlparser.Values { size += hack.RuntimeAllocSize(int64(cap(cached.Mid)) * int64(24)) for _, elem := range cached.Mid { @@ -512,13 +512,13 @@ func (cached *InsertCommon) CachedSize(alloc bool) int64 { if alloc { size += int64(144) } - // field Keyspace *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Keyspace + // field Keyspace *github.com/vitess/vitess/go/vt/vtgate/vindexes.Keyspace size += cached.Keyspace.CachedSize(true) // field TableName string size += hack.RuntimeAllocSize(int64(len(cached.TableName))) - // field Generate *github.com/mdibaiee/vitess/go/vt/vtgate/engine.Generate + // field Generate *github.com/vitess/vitess/go/vt/vtgate/engine.Generate size += cached.Generate.CachedSize(true) - // field ColVindexes []*github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.ColumnVindex + // field ColVindexes []*github.com/vitess/vitess/go/vt/vtgate/vindexes.ColumnVindex { size += hack.RuntimeAllocSize(int64(cap(cached.ColVindexes)) * int64(8)) for _, elem := range cached.ColVindexes { @@ -527,7 +527,7 @@ func (cached *InsertCommon) CachedSize(alloc bool) int64 { } // field Prefix string size += hack.RuntimeAllocSize(int64(len(cached.Prefix))) - // field Suffix github.com/mdibaiee/vitess/go/vt/sqlparser.OnDup + // field Suffix github.com/vitess/vitess/go/vt/sqlparser.OnDup { size += hack.RuntimeAllocSize(int64(cap(cached.Suffix)) * int64(8)) for _, elem := range cached.Suffix { @@ -544,9 +544,9 @@ func (cached *InsertSelect) CachedSize(alloc bool) int64 { if alloc { size += int64(176) } - // field InsertCommon github.com/mdibaiee/vitess/go/vt/vtgate/engine.InsertCommon + // field InsertCommon github.com/vitess/vitess/go/vt/vtgate/engine.InsertCommon size += cached.InsertCommon.CachedSize(false) - // field Input github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Input github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Input.(cachedObject); ok { size += cc.CachedSize(true) } @@ -571,11 +571,11 @@ func (cached *Join) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field Left github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Left github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Left.(cachedObject); ok { size += cc.CachedSize(true) } - // field Right github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Right github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Right.(cachedObject); ok { size += cc.CachedSize(true) } @@ -607,15 +607,15 @@ func (cached *Limit) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Count github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field Count github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr if cc, ok := cached.Count.(cachedObject); ok { size += cc.CachedSize(true) } - // field Offset github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field Offset github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr if cc, ok := cached.Offset.(cachedObject); ok { size += cc.CachedSize(true) } - // field Input github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Input github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Input.(cachedObject); ok { size += cc.CachedSize(true) } @@ -629,15 +629,15 @@ func (cached *Lock) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Keyspace *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Keyspace + // field Keyspace *github.com/vitess/vitess/go/vt/vtgate/vindexes.Keyspace size += cached.Keyspace.CachedSize(true) - // field TargetDestination github.com/mdibaiee/vitess/go/vt/key.Destination + // field TargetDestination github.com/vitess/vitess/go/vt/key.Destination if cc, ok := cached.TargetDestination.(cachedObject); ok { size += cc.CachedSize(true) } // field FieldQuery string size += hack.RuntimeAllocSize(int64(len(cached.FieldQuery))) - // field LockFunctions []*github.com/mdibaiee/vitess/go/vt/vtgate/engine.LockFunc + // field LockFunctions []*github.com/vitess/vitess/go/vt/vtgate/engine.LockFunc { size += hack.RuntimeAllocSize(int64(cap(cached.LockFunctions)) * int64(8)) for _, elem := range cached.LockFunctions { @@ -654,9 +654,9 @@ func (cached *LockFunc) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Typ *github.com/mdibaiee/vitess/go/vt/sqlparser.LockingFunc + // field Typ *github.com/vitess/vitess/go/vt/sqlparser.LockingFunc size += cached.Typ.CachedSize(true) - // field Name github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field Name github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr if cc, ok := cached.Name.(cachedObject); ok { size += cc.CachedSize(true) } @@ -670,9 +670,9 @@ func (cached *MStream) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Keyspace *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Keyspace + // field Keyspace *github.com/vitess/vitess/go/vt/vtgate/vindexes.Keyspace size += cached.Keyspace.CachedSize(true) - // field TargetDestination github.com/mdibaiee/vitess/go/vt/key.Destination + // field TargetDestination github.com/vitess/vitess/go/vt/key.Destination if cc, ok := cached.TargetDestination.(cachedObject); ok { size += cc.CachedSize(true) } @@ -688,18 +688,18 @@ func (cached *MemorySort) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field UpperLimit github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field UpperLimit github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr if cc, ok := cached.UpperLimit.(cachedObject); ok { size += cc.CachedSize(true) } - // field OrderBy github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Comparison + // field OrderBy github.com/vitess/vitess/go/vt/vtgate/evalengine.Comparison { size += hack.RuntimeAllocSize(int64(cap(cached.OrderBy)) * int64(56)) for _, elem := range cached.OrderBy { size += elem.CachedSize(false) } } - // field Input github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Input github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Input.(cachedObject); ok { size += cc.CachedSize(true) } @@ -713,7 +713,7 @@ func (cached *MergeSort) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Primitives []github.com/mdibaiee/vitess/go/vt/vtgate/engine.StreamExecutor + // field Primitives []github.com/vitess/vitess/go/vt/vtgate/engine.StreamExecutor { size += hack.RuntimeAllocSize(int64(cap(cached.Primitives)) * int64(16)) for _, elem := range cached.Primitives { @@ -722,7 +722,7 @@ func (cached *MergeSort) CachedSize(alloc bool) int64 { } } } - // field OrderBy github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Comparison + // field OrderBy github.com/vitess/vitess/go/vt/vtgate/evalengine.Comparison { size += hack.RuntimeAllocSize(int64(cap(cached.OrderBy)) * int64(56)) for _, elem := range cached.OrderBy { @@ -751,17 +751,17 @@ func (cached *OnlineDDL) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Keyspace *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Keyspace + // field Keyspace *github.com/vitess/vitess/go/vt/vtgate/vindexes.Keyspace size += cached.Keyspace.CachedSize(true) - // field DDL github.com/mdibaiee/vitess/go/vt/sqlparser.DDLStatement + // field DDL github.com/vitess/vitess/go/vt/sqlparser.DDLStatement if cc, ok := cached.DDL.(cachedObject); ok { size += cc.CachedSize(true) } // field SQL string size += hack.RuntimeAllocSize(int64(len(cached.SQL))) - // field DDLStrategySetting *github.com/mdibaiee/vitess/go/vt/schema.DDLStrategySetting + // field DDLStrategySetting *github.com/vitess/vitess/go/vt/schema.DDLStrategySetting size += cached.DDLStrategySetting.CachedSize(true) - // field TargetDestination github.com/mdibaiee/vitess/go/vt/key.Destination + // field TargetDestination github.com/vitess/vitess/go/vt/key.Destination if cc, ok := cached.TargetDestination.(cachedObject); ok { size += cc.CachedSize(true) } @@ -775,21 +775,21 @@ func (cached *OrderedAggregate) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field Aggregates []*github.com/mdibaiee/vitess/go/vt/vtgate/engine.AggregateParams + // field Aggregates []*github.com/vitess/vitess/go/vt/vtgate/engine.AggregateParams { size += hack.RuntimeAllocSize(int64(cap(cached.Aggregates)) * int64(8)) for _, elem := range cached.Aggregates { size += elem.CachedSize(true) } } - // field GroupByKeys []*github.com/mdibaiee/vitess/go/vt/vtgate/engine.GroupByParams + // field GroupByKeys []*github.com/vitess/vitess/go/vt/vtgate/engine.GroupByParams { size += hack.RuntimeAllocSize(int64(cap(cached.GroupByKeys)) * int64(8)) for _, elem := range cached.GroupByKeys { size += elem.CachedSize(true) } } - // field Input github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Input github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Input.(cachedObject); ok { size += cc.CachedSize(true) } @@ -805,13 +805,13 @@ func (cached *Plan) CachedSize(alloc bool) int64 { } // field Original string size += hack.RuntimeAllocSize(int64(len(cached.Original))) - // field Instructions github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Instructions github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Instructions.(cachedObject); ok { size += cc.CachedSize(true) } - // field BindVarNeeds *github.com/mdibaiee/vitess/go/vt/sqlparser.BindVarNeeds + // field BindVarNeeds *github.com/vitess/vitess/go/vt/sqlparser.BindVarNeeds size += cached.BindVarNeeds.CachedSize(true) - // field Warnings []*github.com/mdibaiee/vitess/go/vt/proto/query.QueryWarning + // field Warnings []*github.com/vitess/vitess/go/vt/proto/query.QueryWarning { size += hack.RuntimeAllocSize(int64(cap(cached.Warnings)) * int64(8)) for _, elem := range cached.Warnings { @@ -842,7 +842,7 @@ func (cached *Projection) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(len(elem))) } } - // field Exprs []github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field Exprs []github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr { size += hack.RuntimeAllocSize(int64(cap(cached.Exprs)) * int64(16)) for _, elem := range cached.Exprs { @@ -851,7 +851,7 @@ func (cached *Projection) CachedSize(alloc bool) int64 { } } } - // field Input github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Input github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Input.(cachedObject); ok { size += cc.CachedSize(true) } @@ -876,7 +876,7 @@ func (cached *RenameFields) CachedSize(alloc bool) int64 { { size += hack.RuntimeAllocSize(int64(cap(cached.Indices)) * int64(8)) } - // field Input github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Input github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Input.(cachedObject); ok { size += cc.CachedSize(true) } @@ -890,7 +890,7 @@ func (cached *ReplaceVariables) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field Input github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Input github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Input.(cachedObject); ok { size += cc.CachedSize(true) } @@ -904,13 +904,13 @@ func (cached *RevertMigration) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Keyspace *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Keyspace + // field Keyspace *github.com/vitess/vitess/go/vt/vtgate/vindexes.Keyspace size += cached.Keyspace.CachedSize(true) - // field Stmt *github.com/mdibaiee/vitess/go/vt/sqlparser.RevertMigration + // field Stmt *github.com/vitess/vitess/go/vt/sqlparser.RevertMigration size += cached.Stmt.CachedSize(true) // field Query string size += hack.RuntimeAllocSize(int64(len(cached.Query))) - // field TargetDestination github.com/mdibaiee/vitess/go/vt/key.Destination + // field TargetDestination github.com/vitess/vitess/go/vt/key.Destination if cc, ok := cached.TargetDestination.(cachedObject); ok { size += cc.CachedSize(true) } @@ -930,14 +930,14 @@ func (cached *Route) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(len(cached.TableName))) // field FieldQuery string size += hack.RuntimeAllocSize(int64(len(cached.FieldQuery))) - // field OrderBy github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Comparison + // field OrderBy github.com/vitess/vitess/go/vt/vtgate/evalengine.Comparison { size += hack.RuntimeAllocSize(int64(cap(cached.OrderBy)) * int64(56)) for _, elem := range cached.OrderBy { size += elem.CachedSize(false) } } - // field RoutingParameters *github.com/mdibaiee/vitess/go/vt/vtgate/engine.RoutingParameters + // field RoutingParameters *github.com/vitess/vitess/go/vt/vtgate/engine.RoutingParameters size += cached.RoutingParameters.CachedSize(true) return size } @@ -951,9 +951,9 @@ func (cached *RoutingParameters) CachedSize(alloc bool) int64 { if alloc { size += int64(112) } - // field Keyspace *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Keyspace + // field Keyspace *github.com/vitess/vitess/go/vt/vtgate/vindexes.Keyspace size += cached.Keyspace.CachedSize(true) - // field SysTableTableSchema []github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field SysTableTableSchema []github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr { size += hack.RuntimeAllocSize(int64(cap(cached.SysTableTableSchema)) * int64(16)) for _, elem := range cached.SysTableTableSchema { @@ -962,7 +962,7 @@ func (cached *RoutingParameters) CachedSize(alloc bool) int64 { } } } - // field SysTableTableName map[string]github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field SysTableTableName map[string]github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr if cached.SysTableTableName != nil { size += int64(48) hmap := reflect.ValueOf(cached.SysTableTableName) @@ -979,15 +979,15 @@ func (cached *RoutingParameters) CachedSize(alloc bool) int64 { } } } - // field TargetDestination github.com/mdibaiee/vitess/go/vt/key.Destination + // field TargetDestination github.com/vitess/vitess/go/vt/key.Destination if cc, ok := cached.TargetDestination.(cachedObject); ok { size += cc.CachedSize(true) } - // field Vindex github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Vindex + // field Vindex github.com/vitess/vitess/go/vt/vtgate/vindexes.Vindex if cc, ok := cached.Vindex.(cachedObject); ok { size += cc.CachedSize(true) } - // field Values []github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field Values []github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr { size += hack.RuntimeAllocSize(int64(cap(cached.Values)) * int64(16)) for _, elem := range cached.Values { @@ -1006,7 +1006,7 @@ func (cached *Rows) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field rows [][]github.com/mdibaiee/vitess/go/sqltypes.Value + // field rows [][]github.com/vitess/vitess/go/sqltypes.Value { size += hack.RuntimeAllocSize(int64(cap(cached.rows)) * int64(24)) for _, elem := range cached.rows { @@ -1018,7 +1018,7 @@ func (cached *Rows) CachedSize(alloc bool) int64 { } } } - // field fields []*github.com/mdibaiee/vitess/go/vt/proto/query.Field + // field fields []*github.com/vitess/vitess/go/vt/proto/query.Field { size += hack.RuntimeAllocSize(int64(cap(cached.fields)) * int64(8)) for _, elem := range cached.fields { @@ -1035,11 +1035,11 @@ func (cached *SQLCalcFoundRows) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field LimitPrimitive github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field LimitPrimitive github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.LimitPrimitive.(cachedObject); ok { size += cc.CachedSize(true) } - // field CountPrimitive github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field CountPrimitive github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.CountPrimitive.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1053,14 +1053,14 @@ func (cached *ScalarAggregate) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Aggregates []*github.com/mdibaiee/vitess/go/vt/vtgate/engine.AggregateParams + // field Aggregates []*github.com/vitess/vitess/go/vt/vtgate/engine.AggregateParams { size += hack.RuntimeAllocSize(int64(cap(cached.Aggregates)) * int64(8)) for _, elem := range cached.Aggregates { size += elem.CachedSize(true) } } - // field Input github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Input github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Input.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1076,11 +1076,11 @@ func (cached *SemiJoin) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Left github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Left github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Left.(cachedObject); ok { size += cc.CachedSize(true) } - // field Right github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Right github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Right.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1108,9 +1108,9 @@ func (cached *Send) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Keyspace *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Keyspace + // field Keyspace *github.com/vitess/vitess/go/vt/vtgate/vindexes.Keyspace size += cached.Keyspace.CachedSize(true) - // field TargetDestination github.com/mdibaiee/vitess/go/vt/key.Destination + // field TargetDestination github.com/vitess/vitess/go/vt/key.Destination if cc, ok := cached.TargetDestination.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1126,7 +1126,7 @@ func (cached *Sequential) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Sources []github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Sources []github.com/vitess/vitess/go/vt/vtgate/engine.Primitive { size += hack.RuntimeAllocSize(int64(cap(cached.Sources)) * int64(16)) for _, elem := range cached.Sources { @@ -1157,7 +1157,7 @@ func (cached *Set) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Ops []github.com/mdibaiee/vitess/go/vt/vtgate/engine.SetOp + // field Ops []github.com/vitess/vitess/go/vt/vtgate/engine.SetOp { size += hack.RuntimeAllocSize(int64(cap(cached.Ops)) * int64(16)) for _, elem := range cached.Ops { @@ -1166,7 +1166,7 @@ func (cached *Set) CachedSize(alloc bool) int64 { } } } - // field Input github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Input github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Input.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1180,7 +1180,7 @@ func (cached *ShowExec) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field ShowFilter *github.com/mdibaiee/vitess/go/vt/sqlparser.ShowFilter + // field ShowFilter *github.com/vitess/vitess/go/vt/sqlparser.ShowFilter size += cached.ShowFilter.CachedSize(true) return size } @@ -1203,7 +1203,7 @@ func (cached *SimpleProjection) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(len(elem))) } } - // field Input github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Input github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Input.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1219,9 +1219,9 @@ func (cached *SysVarCheckAndIgnore) CachedSize(alloc bool) int64 { } // field Name string size += hack.RuntimeAllocSize(int64(len(cached.Name))) - // field Keyspace *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Keyspace + // field Keyspace *github.com/vitess/vitess/go/vt/vtgate/vindexes.Keyspace size += cached.Keyspace.CachedSize(true) - // field TargetDestination github.com/mdibaiee/vitess/go/vt/key.Destination + // field TargetDestination github.com/vitess/vitess/go/vt/key.Destination if cc, ok := cached.TargetDestination.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1253,9 +1253,9 @@ func (cached *SysVarReservedConn) CachedSize(alloc bool) int64 { } // field Name string size += hack.RuntimeAllocSize(int64(len(cached.Name))) - // field Keyspace *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Keyspace + // field Keyspace *github.com/vitess/vitess/go/vt/vtgate/vindexes.Keyspace size += cached.Keyspace.CachedSize(true) - // field TargetDestination github.com/mdibaiee/vitess/go/vt/key.Destination + // field TargetDestination github.com/vitess/vitess/go/vt/key.Destination if cc, ok := cached.TargetDestination.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1273,7 +1273,7 @@ func (cached *SysVarSetAware) CachedSize(alloc bool) int64 { } // field Name string size += hack.RuntimeAllocSize(int64(len(cached.Name))) - // field Expr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field Expr github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1287,9 +1287,9 @@ func (cached *ThrottleApp) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field Keyspace *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Keyspace + // field Keyspace *github.com/vitess/vitess/go/vt/vtgate/vindexes.Keyspace size += cached.Keyspace.CachedSize(true) - // field ThrottledAppRule *github.com/mdibaiee/vitess/go/vt/proto/topodata.ThrottledAppRule + // field ThrottledAppRule *github.com/vitess/vitess/go/vt/proto/topodata.ThrottledAppRule size += cached.ThrottledAppRule.CachedSize(true) return size } @@ -1305,11 +1305,11 @@ func (cached *UncorrelatedSubquery) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(len(cached.SubqueryResult))) // field HasValues string size += hack.RuntimeAllocSize(int64(len(cached.HasValues))) - // field Subquery github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Subquery github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Subquery.(cachedObject); ok { size += cc.CachedSize(true) } - // field Outer github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Outer github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Outer.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1325,9 +1325,9 @@ func (cached *Update) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field DML *github.com/mdibaiee/vitess/go/vt/vtgate/engine.DML + // field DML *github.com/vitess/vitess/go/vt/vtgate/engine.DML size += cached.DML.CachedSize(true) - // field ChangedVindexValues map[string]*github.com/mdibaiee/vitess/go/vt/vtgate/engine.VindexValues + // field ChangedVindexValues map[string]*github.com/vitess/vitess/go/vt/vtgate/engine.VindexValues if cached.ChangedVindexValues != nil { size += int64(48) hmap := reflect.ValueOf(cached.ChangedVindexValues) @@ -1364,7 +1364,7 @@ func (cached *Upsert) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Upserts []github.com/mdibaiee/vitess/go/vt/vtgate/engine.upsert + // field Upserts []github.com/vitess/vitess/go/vt/vtgate/engine.upsert { size += hack.RuntimeAllocSize(int64(cap(cached.Upserts)) * int64(32)) for _, elem := range cached.Upserts { @@ -1383,7 +1383,7 @@ func (cached *UserDefinedVariable) CachedSize(alloc bool) int64 { } // field Name string size += hack.RuntimeAllocSize(int64(len(cached.Name))) - // field Expr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field Expr github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr if cc, ok := cached.Expr.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1397,7 +1397,7 @@ func (cached *VExplain) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field Input github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Input github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Input.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1411,9 +1411,9 @@ func (cached *VStream) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Keyspace *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Keyspace + // field Keyspace *github.com/vitess/vitess/go/vt/vtgate/vindexes.Keyspace size += cached.Keyspace.CachedSize(true) - // field TargetDestination github.com/mdibaiee/vitess/go/vt/key.Destination + // field TargetDestination github.com/vitess/vitess/go/vt/key.Destination if cc, ok := cached.TargetDestination.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1431,7 +1431,7 @@ func (cached *Verify) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Exec github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Exec github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Exec.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1447,7 +1447,7 @@ func (cached *VindexFunc) CachedSize(alloc bool) int64 { if alloc { size += int64(96) } - // field Fields []*github.com/mdibaiee/vitess/go/vt/proto/query.Field + // field Fields []*github.com/vitess/vitess/go/vt/proto/query.Field { size += hack.RuntimeAllocSize(int64(cap(cached.Fields)) * int64(8)) for _, elem := range cached.Fields { @@ -1458,11 +1458,11 @@ func (cached *VindexFunc) CachedSize(alloc bool) int64 { { size += hack.RuntimeAllocSize(int64(cap(cached.Cols)) * int64(8)) } - // field Vindex github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.SingleColumn + // field Vindex github.com/vitess/vitess/go/vt/vtgate/vindexes.SingleColumn if cc, ok := cached.Vindex.(cachedObject); ok { size += cc.CachedSize(true) } - // field Value github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field Value github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr if cc, ok := cached.Value.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1476,11 +1476,11 @@ func (cached *VindexLookup) CachedSize(alloc bool) int64 { if alloc { size += int64(112) } - // field Vindex github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.LookupPlanable + // field Vindex github.com/vitess/vitess/go/vt/vtgate/vindexes.LookupPlanable if cc, ok := cached.Vindex.(cachedObject); ok { size += cc.CachedSize(true) } - // field Keyspace *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Keyspace + // field Keyspace *github.com/vitess/vitess/go/vt/vtgate/vindexes.Keyspace size += cached.Keyspace.CachedSize(true) // field Arguments []string { @@ -1489,7 +1489,7 @@ func (cached *VindexLookup) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(len(elem))) } } - // field Values []github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field Values []github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr { size += hack.RuntimeAllocSize(int64(cap(cached.Values)) * int64(16)) for _, elem := range cached.Values { @@ -1498,11 +1498,11 @@ func (cached *VindexLookup) CachedSize(alloc bool) int64 { } } } - // field Lookup github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Lookup github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Lookup.(cachedObject); ok { size += cc.CachedSize(true) } - // field SendTo *github.com/mdibaiee/vitess/go/vt/vtgate/engine.Route + // field SendTo *github.com/vitess/vitess/go/vt/vtgate/engine.Route size += cached.SendTo.CachedSize(true) return size } @@ -1516,7 +1516,7 @@ func (cached *VindexValues) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field EvalExprMap map[string]github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field EvalExprMap map[string]github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr if cached.EvalExprMap != nil { size += int64(48) hmap := reflect.ValueOf(cached.EvalExprMap) @@ -1561,9 +1561,9 @@ func (cached *shardRoute) CachedSize(alloc bool) int64 { } // field query string size += hack.RuntimeAllocSize(int64(len(cached.query))) - // field rs *github.com/mdibaiee/vitess/go/vt/srvtopo.ResolvedShard + // field rs *github.com/vitess/vitess/go/vt/srvtopo.ResolvedShard size += cached.rs.CachedSize(true) - // field bv map[string]*github.com/mdibaiee/vitess/go/vt/proto/query.BindVariable + // field bv map[string]*github.com/vitess/vitess/go/vt/proto/query.BindVariable if cached.bv != nil { size += int64(48) hmap := reflect.ValueOf(cached.bv) @@ -1578,7 +1578,7 @@ func (cached *shardRoute) CachedSize(alloc bool) int64 { size += v.CachedSize(true) } } - // field primitive github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field primitive github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.primitive.(cachedObject); ok { size += cc.CachedSize(true) } @@ -1592,11 +1592,11 @@ func (cached *upsert) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Insert github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Insert github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Insert.(cachedObject); ok { size += cc.CachedSize(true) } - // field Update github.com/mdibaiee/vitess/go/vt/vtgate/engine.Primitive + // field Update github.com/vitess/vitess/go/vt/vtgate/engine.Primitive if cc, ok := cached.Update.(cachedObject); ok { size += cc.CachedSize(true) } diff --git a/go/vt/vtgate/engine/concatenate.go b/go/vt/vtgate/engine/concatenate.go index f61513e6e6c..0534aee08ea 100644 --- a/go/vt/vtgate/engine/concatenate.go +++ b/go/vt/vtgate/engine/concatenate.go @@ -23,11 +23,11 @@ import ( "golang.org/x/sync/errgroup" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) // Concatenate Primitive is used to concatenate results from multiple sources. diff --git a/go/vt/vtgate/engine/concatenate_test.go b/go/vt/vtgate/engine/concatenate_test.go index 8494226cd9b..66707d467c4 100644 --- a/go/vt/vtgate/engine/concatenate_test.go +++ b/go/vt/vtgate/engine/concatenate_test.go @@ -23,13 +23,13 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/test/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) func r(names, types string, rows ...string) *sqltypes.Result { diff --git a/go/vt/vtgate/engine/dbddl.go b/go/vt/vtgate/engine/dbddl.go index 12956558c34..23f6322eebd 100644 --- a/go/vt/vtgate/engine/dbddl.go +++ b/go/vt/vtgate/engine/dbddl.go @@ -22,17 +22,17 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var _ Primitive = (*DBDDL)(nil) diff --git a/go/vt/vtgate/engine/dbddl_plugin.go b/go/vt/vtgate/engine/dbddl_plugin.go index e10a331a438..b1378ad11ff 100644 --- a/go/vt/vtgate/engine/dbddl_plugin.go +++ b/go/vt/vtgate/engine/dbddl_plugin.go @@ -19,7 +19,7 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" ) type failDBDDL struct{} diff --git a/go/vt/vtgate/engine/ddl.go b/go/vt/vtgate/engine/ddl.go index 195e445cebd..09daef20b81 100644 --- a/go/vt/vtgate/engine/ddl.go +++ b/go/vt/vtgate/engine/ddl.go @@ -19,13 +19,13 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var _ Primitive = (*DDL)(nil) diff --git a/go/vt/vtgate/engine/ddl_test.go b/go/vt/vtgate/engine/ddl_test.go index ece534d0fc8..8edad0a6942 100644 --- a/go/vt/vtgate/engine/ddl_test.go +++ b/go/vt/vtgate/engine/ddl_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func TestDDL(t *testing.T) { diff --git a/go/vt/vtgate/engine/delete.go b/go/vt/vtgate/engine/delete.go index e14cefdc74c..8abdba2d2be 100644 --- a/go/vt/vtgate/engine/delete.go +++ b/go/vt/vtgate/engine/delete.go @@ -20,14 +20,14 @@ import ( "context" "fmt" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var _ Primitive = (*Delete)(nil) diff --git a/go/vt/vtgate/engine/delete_test.go b/go/vt/vtgate/engine/delete_test.go index 55af4ca3152..625d3612998 100644 --- a/go/vt/vtgate/engine/delete_test.go +++ b/go/vt/vtgate/engine/delete_test.go @@ -21,14 +21,14 @@ import ( "errors" "testing" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestDeleteUnsharded(t *testing.T) { diff --git a/go/vt/vtgate/engine/distinct.go b/go/vt/vtgate/engine/distinct.go index 777cbe490b0..2241dc88f51 100644 --- a/go/vt/vtgate/engine/distinct.go +++ b/go/vt/vtgate/engine/distinct.go @@ -21,12 +21,12 @@ import ( "fmt" "sync" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vthash" ) // Distinct Primitive is used to uniqueify results diff --git a/go/vt/vtgate/engine/distinct_test.go b/go/vt/vtgate/engine/distinct_test.go index d4f3a5b29cb..23def77c334 100644 --- a/go/vt/vtgate/engine/distinct_test.go +++ b/go/vt/vtgate/engine/distinct_test.go @@ -21,15 +21,15 @@ import ( "fmt" "testing" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) func TestDistinct(t *testing.T) { diff --git a/go/vt/vtgate/engine/dml.go b/go/vt/vtgate/engine/dml.go index fc880cb1ac6..f53e76f0702 100644 --- a/go/vt/vtgate/engine/dml.go +++ b/go/vt/vtgate/engine/dml.go @@ -22,16 +22,16 @@ import ( "sort" "strings" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // DML contains the common elements between Update and Delete plans diff --git a/go/vt/vtgate/engine/dml_with_input.go b/go/vt/vtgate/engine/dml_with_input.go index 5dc58cd3ec6..93f5f8ecb99 100644 --- a/go/vt/vtgate/engine/dml_with_input.go +++ b/go/vt/vtgate/engine/dml_with_input.go @@ -20,11 +20,11 @@ import ( "context" "fmt" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vterrors" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var _ Primitive = (*DMLWithInput)(nil) diff --git a/go/vt/vtgate/engine/dml_with_input_test.go b/go/vt/vtgate/engine/dml_with_input_test.go index 0d2b34101ae..f5fca1b2308 100644 --- a/go/vt/vtgate/engine/dml_with_input_test.go +++ b/go/vt/vtgate/engine/dml_with_input_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func TestDeleteWithInputSingleOffset(t *testing.T) { diff --git a/go/vt/vtgate/engine/exec_prepared_statement.go b/go/vt/vtgate/engine/exec_prepared_statement.go index 6b2895053dd..9ab1c4da100 100644 --- a/go/vt/vtgate/engine/exec_prepared_statement.go +++ b/go/vt/vtgate/engine/exec_prepared_statement.go @@ -20,10 +20,10 @@ import ( "context" "strconv" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) var _ Primitive = (*ExecStmt)(nil) diff --git a/go/vt/vtgate/engine/fake_primitive_test.go b/go/vt/vtgate/engine/fake_primitive_test.go index c5645394261..f02b378ede7 100644 --- a/go/vt/vtgate/engine/fake_primitive_test.go +++ b/go/vt/vtgate/engine/fake_primitive_test.go @@ -25,8 +25,8 @@ import ( "golang.org/x/sync/errgroup" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // fakePrimitive fakes a primitive. For every call, it sends the diff --git a/go/vt/vtgate/engine/fake_vcursor_test.go b/go/vt/vtgate/engine/fake_vcursor_test.go index 80b5ace5cab..1090f8f9531 100644 --- a/go/vt/vtgate/engine/fake_vcursor_test.go +++ b/go/vt/vtgate/engine/fake_vcursor_test.go @@ -30,20 +30,20 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/config" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/config" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) var testMaxMemoryRows = 100 diff --git a/go/vt/vtgate/engine/filter.go b/go/vt/vtgate/engine/filter.go index 1f149c929a0..2c58e0d789e 100644 --- a/go/vt/vtgate/engine/filter.go +++ b/go/vt/vtgate/engine/filter.go @@ -20,10 +20,10 @@ import ( "context" "sync" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) var _ Primitive = (*Filter)(nil) diff --git a/go/vt/vtgate/engine/filter_test.go b/go/vt/vtgate/engine/filter_test.go index 01f2c8ecb42..2cd0c8f7d80 100644 --- a/go/vt/vtgate/engine/filter_test.go +++ b/go/vt/vtgate/engine/filter_test.go @@ -23,11 +23,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) func TestFilterPass(t *testing.T) { diff --git a/go/vt/vtgate/engine/fk_cascade.go b/go/vt/vtgate/engine/fk_cascade.go index 534db29ba63..66abb115880 100644 --- a/go/vt/vtgate/engine/fk_cascade.go +++ b/go/vt/vtgate/engine/fk_cascade.go @@ -21,10 +21,10 @@ import ( "fmt" "maps" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // FkChild contains the Child Primitive to be executed collecting the values from the Selection Primitive using the column indexes. diff --git a/go/vt/vtgate/engine/fk_cascade_test.go b/go/vt/vtgate/engine/fk_cascade_test.go index 2b8557b7967..e68a76f09ff 100644 --- a/go/vt/vtgate/engine/fk_cascade_test.go +++ b/go/vt/vtgate/engine/fk_cascade_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // TestDeleteCascade tests that FkCascade executes the child and parent primitives for a delete cascade. diff --git a/go/vt/vtgate/engine/fk_verify.go b/go/vt/vtgate/engine/fk_verify.go index c4fecac529b..2790f33ad1f 100644 --- a/go/vt/vtgate/engine/fk_verify.go +++ b/go/vt/vtgate/engine/fk_verify.go @@ -20,10 +20,10 @@ import ( "context" "fmt" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // Verify contains the verification primitve and its type i.e. parent or child diff --git a/go/vt/vtgate/engine/fk_verify_test.go b/go/vt/vtgate/engine/fk_verify_test.go index a501aba12ab..1aba30ddb1d 100644 --- a/go/vt/vtgate/engine/fk_verify_test.go +++ b/go/vt/vtgate/engine/fk_verify_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func TestFKVerifyUpdate(t *testing.T) { diff --git a/go/vt/vtgate/engine/fuzz.go b/go/vt/vtgate/engine/fuzz.go index ea4067059cb..0187cee6541 100644 --- a/go/vt/vtgate/engine/fuzz.go +++ b/go/vt/vtgate/engine/fuzz.go @@ -44,8 +44,8 @@ package engine import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // FuzzEngine implements the fuzzer diff --git a/go/vt/vtgate/engine/hash_join.go b/go/vt/vtgate/engine/hash_join.go index 08221d939cc..795fa126849 100644 --- a/go/vt/vtgate/engine/hash_join.go +++ b/go/vt/vtgate/engine/hash_join.go @@ -23,12 +23,12 @@ import ( "sync" "sync/atomic" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vthash" ) var _ Primitive = (*HashJoin)(nil) diff --git a/go/vt/vtgate/engine/hash_join_test.go b/go/vt/vtgate/engine/hash_join_test.go index 9c93afb85fa..a82dd574113 100644 --- a/go/vt/vtgate/engine/hash_join_test.go +++ b/go/vt/vtgate/engine/hash_join_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) func TestHashJoinVariations(t *testing.T) { diff --git a/go/vt/vtgate/engine/insert.go b/go/vt/vtgate/engine/insert.go index ba1b5e7d270..a0280044108 100644 --- a/go/vt/vtgate/engine/insert.go +++ b/go/vt/vtgate/engine/insert.go @@ -22,16 +22,16 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var _ Primitive = (*Insert)(nil) diff --git a/go/vt/vtgate/engine/insert_common.go b/go/vt/vtgate/engine/insert_common.go index 12df7ce1cf0..7c8eca28d4f 100644 --- a/go/vt/vtgate/engine/insert_common.go +++ b/go/vt/vtgate/engine/insert_common.go @@ -23,16 +23,16 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/sqlparser" + + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) type ( diff --git a/go/vt/vtgate/engine/insert_select.go b/go/vt/vtgate/engine/insert_select.go index 10c5f28405b..d6321bce248 100644 --- a/go/vt/vtgate/engine/insert_select.go +++ b/go/vt/vtgate/engine/insert_select.go @@ -23,15 +23,15 @@ import ( "strconv" "sync" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var _ Primitive = (*InsertSelect)(nil) diff --git a/go/vt/vtgate/engine/insert_test.go b/go/vt/vtgate/engine/insert_test.go index 666a1c61d4d..4e64109fbeb 100644 --- a/go/vt/vtgate/engine/insert_test.go +++ b/go/vt/vtgate/engine/insert_test.go @@ -23,13 +23,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func TestInsertUnsharded(t *testing.T) { diff --git a/go/vt/vtgate/engine/join.go b/go/vt/vtgate/engine/join.go index 0b73ffddc27..eee7fd99de6 100644 --- a/go/vt/vtgate/engine/join.go +++ b/go/vt/vtgate/engine/join.go @@ -24,8 +24,8 @@ import ( "sync" "sync/atomic" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var _ Primitive = (*Join)(nil) diff --git a/go/vt/vtgate/engine/join_test.go b/go/vt/vtgate/engine/join_test.go index fac217845b7..fca246ff7fd 100644 --- a/go/vt/vtgate/engine/join_test.go +++ b/go/vt/vtgate/engine/join_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestJoinExecute(t *testing.T) { diff --git a/go/vt/vtgate/engine/limit.go b/go/vt/vtgate/engine/limit.go index 7c807422923..cdb1f73e97b 100644 --- a/go/vt/vtgate/engine/limit.go +++ b/go/vt/vtgate/engine/limit.go @@ -23,12 +23,12 @@ import ( "strconv" "sync" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var _ Primitive = (*Limit)(nil) diff --git a/go/vt/vtgate/engine/limit_test.go b/go/vt/vtgate/engine/limit_test.go index d7c36578b89..129e4475a1e 100644 --- a/go/vt/vtgate/engine/limit_test.go +++ b/go/vt/vtgate/engine/limit_test.go @@ -23,14 +23,14 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestLimitExecute(t *testing.T) { diff --git a/go/vt/vtgate/engine/lock.go b/go/vt/vtgate/engine/lock.go index 0c6acea10e9..084a1740b7f 100644 --- a/go/vt/vtgate/engine/lock.go +++ b/go/vt/vtgate/engine/lock.go @@ -20,18 +20,18 @@ import ( "context" "fmt" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/srvtopo" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var _ Primitive = (*Lock)(nil) diff --git a/go/vt/vtgate/engine/memory_sort.go b/go/vt/vtgate/engine/memory_sort.go index 8e512cf2297..cd00b2863e5 100644 --- a/go/vt/vtgate/engine/memory_sort.go +++ b/go/vt/vtgate/engine/memory_sort.go @@ -25,9 +25,9 @@ import ( "strings" "sync" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) var _ Primitive = (*MemorySort)(nil) diff --git a/go/vt/vtgate/engine/memory_sort_test.go b/go/vt/vtgate/engine/memory_sort_test.go index b11111b349d..9fccbf63d29 100644 --- a/go/vt/vtgate/engine/memory_sort_test.go +++ b/go/vt/vtgate/engine/memory_sort_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) func TestMemorySortExecute(t *testing.T) { diff --git a/go/vt/vtgate/engine/merge_sort.go b/go/vt/vtgate/engine/merge_sort.go index e041e3708bb..f1f1418cd3c 100644 --- a/go/vt/vtgate/engine/merge_sort.go +++ b/go/vt/vtgate/engine/merge_sort.go @@ -20,14 +20,14 @@ import ( "context" "io" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // StreamExecutor is a subset of Primitive that MergeSort diff --git a/go/vt/vtgate/engine/merge_sort_test.go b/go/vt/vtgate/engine/merge_sort_test.go index 209bbfae695..88f51295042 100644 --- a/go/vt/vtgate/engine/merge_sort_test.go +++ b/go/vt/vtgate/engine/merge_sort_test.go @@ -21,16 +21,16 @@ import ( "errors" "testing" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/test/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // TestMergeSortNormal tests the normal flow of a merge diff --git a/go/vt/vtgate/engine/mstream.go b/go/vt/vtgate/engine/mstream.go index 6412deee540..c51e1478b66 100644 --- a/go/vt/vtgate/engine/mstream.go +++ b/go/vt/vtgate/engine/mstream.go @@ -19,11 +19,11 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var _ Primitive = (*MStream)(nil) diff --git a/go/vt/vtgate/engine/online_ddl.go b/go/vt/vtgate/engine/online_ddl.go index 176425247b5..f85dde4ea72 100644 --- a/go/vt/vtgate/engine/online_ddl.go +++ b/go/vt/vtgate/engine/online_ddl.go @@ -20,14 +20,14 @@ import ( "context" "fmt" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var _ Primitive = (*OnlineDDL)(nil) diff --git a/go/vt/vtgate/engine/opcode/constants.go b/go/vt/vtgate/engine/opcode/constants.go index 896aeecfbb7..36e126d2239 100644 --- a/go/vt/vtgate/engine/opcode/constants.go +++ b/go/vt/vtgate/engine/opcode/constants.go @@ -19,10 +19,10 @@ package opcode import ( "fmt" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) // PulloutOpcode is a number representing the opcode diff --git a/go/vt/vtgate/engine/opcode/constants_test.go b/go/vt/vtgate/engine/opcode/constants_test.go index 8805a4b2204..99cd0ad982d 100644 --- a/go/vt/vtgate/engine/opcode/constants_test.go +++ b/go/vt/vtgate/engine/opcode/constants_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestCheckAllAggrOpCodes(t *testing.T) { diff --git a/go/vt/vtgate/engine/ordered_aggregate.go b/go/vt/vtgate/engine/ordered_aggregate.go index 3725ba39dbc..70ba4916f15 100644 --- a/go/vt/vtgate/engine/ordered_aggregate.go +++ b/go/vt/vtgate/engine/ordered_aggregate.go @@ -21,11 +21,11 @@ import ( "fmt" "strconv" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) var _ Primitive = (*OrderedAggregate)(nil) diff --git a/go/vt/vtgate/engine/ordered_aggregate_test.go b/go/vt/vtgate/engine/ordered_aggregate_test.go index af4091b3d09..b867179e757 100644 --- a/go/vt/vtgate/engine/ordered_aggregate_test.go +++ b/go/vt/vtgate/engine/ordered_aggregate_test.go @@ -22,17 +22,17 @@ import ( "fmt" "testing" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - . "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + . "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" ) func TestOrderedAggregateExecute(t *testing.T) { diff --git a/go/vt/vtgate/engine/plan.go b/go/vt/vtgate/engine/plan.go index 89be460ebe6..c9336cbbf32 100644 --- a/go/vt/vtgate/engine/plan.go +++ b/go/vt/vtgate/engine/plan.go @@ -22,8 +22,8 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" ) // Plan represents the execution strategy for a given query. diff --git a/go/vt/vtgate/engine/plan_description.go b/go/vt/vtgate/engine/plan_description.go index d5fa397b633..08fb4b99bc6 100644 --- a/go/vt/vtgate/engine/plan_description.go +++ b/go/vt/vtgate/engine/plan_description.go @@ -23,10 +23,10 @@ import ( "sort" "strings" - "github.com/mdibaiee/vitess/go/tools/graphviz" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/tools/graphviz" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) const inputName = "InputName" diff --git a/go/vt/vtgate/engine/plan_description_test.go b/go/vt/vtgate/engine/plan_description_test.go index 17610a01e62..a9ac41d886b 100644 --- a/go/vt/vtgate/engine/plan_description_test.go +++ b/go/vt/vtgate/engine/plan_description_test.go @@ -19,13 +19,13 @@ package engine import ( "testing" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func TestCreateRoutePlanDescription(t *testing.T) { diff --git a/go/vt/vtgate/engine/primitive.go b/go/vt/vtgate/engine/primitive.go index db8b979dd7a..e63551a4f75 100644 --- a/go/vt/vtgate/engine/primitive.go +++ b/go/vt/vtgate/engine/primitive.go @@ -20,18 +20,18 @@ import ( "context" "time" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) const ( diff --git a/go/vt/vtgate/engine/projection.go b/go/vt/vtgate/engine/projection.go index 8686fbb5702..dfdb6ee1aea 100644 --- a/go/vt/vtgate/engine/projection.go +++ b/go/vt/vtgate/engine/projection.go @@ -20,12 +20,12 @@ import ( "context" "sync" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) var _ Primitive = (*Projection)(nil) diff --git a/go/vt/vtgate/engine/projection_test.go b/go/vt/vtgate/engine/projection_test.go index 0e4c447cbd5..8379eae5f2f 100644 --- a/go/vt/vtgate/engine/projection_test.go +++ b/go/vt/vtgate/engine/projection_test.go @@ -24,13 +24,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) func TestMultiply(t *testing.T) { diff --git a/go/vt/vtgate/engine/rename_fields.go b/go/vt/vtgate/engine/rename_fields.go index b51a9c08e79..47db9424cf0 100644 --- a/go/vt/vtgate/engine/rename_fields.go +++ b/go/vt/vtgate/engine/rename_fields.go @@ -19,9 +19,9 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vterrors" ) var _ Primitive = (*RenameFields)(nil) diff --git a/go/vt/vtgate/engine/replace_variables.go b/go/vt/vtgate/engine/replace_variables.go index ab8a14f3ee5..20786dce3a9 100644 --- a/go/vt/vtgate/engine/replace_variables.go +++ b/go/vt/vtgate/engine/replace_variables.go @@ -19,8 +19,8 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var _ Primitive = (*ReplaceVariables)(nil) diff --git a/go/vt/vtgate/engine/revert_migration.go b/go/vt/vtgate/engine/revert_migration.go index 9ed90f16b7a..fb08261e65a 100644 --- a/go/vt/vtgate/engine/revert_migration.go +++ b/go/vt/vtgate/engine/revert_migration.go @@ -20,14 +20,14 @@ import ( "context" "fmt" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var _ Primitive = (*RevertMigration)(nil) diff --git a/go/vt/vtgate/engine/route.go b/go/vt/vtgate/engine/route.go index 7f94407c00d..84ca4b14b6d 100644 --- a/go/vt/vtgate/engine/route.go +++ b/go/vt/vtgate/engine/route.go @@ -24,20 +24,20 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var _ Primitive = (*Route)(nil) diff --git a/go/vt/vtgate/engine/route_test.go b/go/vt/vtgate/engine/route_test.go index be986248a49..67680d5f06f 100644 --- a/go/vt/vtgate/engine/route_test.go +++ b/go/vt/vtgate/engine/route_test.go @@ -26,15 +26,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var defaultSelectResult = sqltypes.MakeTestResult( diff --git a/go/vt/vtgate/engine/routing.go b/go/vt/vtgate/engine/routing.go index 913cdff9787..9e1c0cde74d 100644 --- a/go/vt/vtgate/engine/routing.go +++ b/go/vt/vtgate/engine/routing.go @@ -21,16 +21,16 @@ import ( "encoding/json" "strconv" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // Opcode is a number representing the opcode diff --git a/go/vt/vtgate/engine/rows.go b/go/vt/vtgate/engine/rows.go index c0dc66b9a82..60a462a30e3 100644 --- a/go/vt/vtgate/engine/rows.go +++ b/go/vt/vtgate/engine/rows.go @@ -19,8 +19,8 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var _ Primitive = (*Rows)(nil) diff --git a/go/vt/vtgate/engine/scalar_aggregation.go b/go/vt/vtgate/engine/scalar_aggregation.go index 79e9a3f1ba0..14ca10797fc 100644 --- a/go/vt/vtgate/engine/scalar_aggregation.go +++ b/go/vt/vtgate/engine/scalar_aggregation.go @@ -20,8 +20,8 @@ import ( "context" "sync" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var _ Primitive = (*ScalarAggregate)(nil) diff --git a/go/vt/vtgate/engine/scalar_aggregation_test.go b/go/vt/vtgate/engine/scalar_aggregation_test.go index 3a872aeffaa..0a0a428b29e 100644 --- a/go/vt/vtgate/engine/scalar_aggregation_test.go +++ b/go/vt/vtgate/engine/scalar_aggregation_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - . "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + . "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" ) func TestEmptyRows(outer *testing.T) { diff --git a/go/vt/vtgate/engine/semi_join.go b/go/vt/vtgate/engine/semi_join.go index 6a4439c0c89..569309b6812 100644 --- a/go/vt/vtgate/engine/semi_join.go +++ b/go/vt/vtgate/engine/semi_join.go @@ -19,8 +19,8 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var _ Primitive = (*SemiJoin)(nil) diff --git a/go/vt/vtgate/engine/semi_join_test.go b/go/vt/vtgate/engine/semi_join_test.go index 25d6ffa50fc..a0d5d4016ad 100644 --- a/go/vt/vtgate/engine/semi_join_test.go +++ b/go/vt/vtgate/engine/semi_join_test.go @@ -20,13 +20,13 @@ import ( "context" "testing" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestSemiJoinExecute(t *testing.T) { diff --git a/go/vt/vtgate/engine/send.go b/go/vt/vtgate/engine/send.go index afc4cabc290..d967825a6ca 100644 --- a/go/vt/vtgate/engine/send.go +++ b/go/vt/vtgate/engine/send.go @@ -19,14 +19,14 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var _ Primitive = (*Send)(nil) diff --git a/go/vt/vtgate/engine/send_test.go b/go/vt/vtgate/engine/send_test.go index d3dd0ab7f01..32b23979630 100644 --- a/go/vt/vtgate/engine/send_test.go +++ b/go/vt/vtgate/engine/send_test.go @@ -21,13 +21,13 @@ import ( "errors" "testing" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func TestSendTable(t *testing.T) { diff --git a/go/vt/vtgate/engine/sequential.go b/go/vt/vtgate/engine/sequential.go index 800885ea555..16c4754fd8a 100644 --- a/go/vt/vtgate/engine/sequential.go +++ b/go/vt/vtgate/engine/sequential.go @@ -19,10 +19,10 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // Sequential Primitive is used to execute DML statements in a fixed order. diff --git a/go/vt/vtgate/engine/session_primitive.go b/go/vt/vtgate/engine/session_primitive.go index 5d7f7bcfaee..e38df6bb0a1 100644 --- a/go/vt/vtgate/engine/session_primitive.go +++ b/go/vt/vtgate/engine/session_primitive.go @@ -19,9 +19,9 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vterrors" ) // SessionPrimitive the session primitive is a very small primitive used diff --git a/go/vt/vtgate/engine/set.go b/go/vt/vtgate/engine/set.go index 0f702f25f27..525b62ca951 100644 --- a/go/vt/vtgate/engine/set.go +++ b/go/vt/vtgate/engine/set.go @@ -22,24 +22,24 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/sysvars" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sysvars" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) type ( diff --git a/go/vt/vtgate/engine/set_test.go b/go/vt/vtgate/engine/set_test.go index deaf1d081f5..bf22f17c61d 100644 --- a/go/vt/vtgate/engine/set_test.go +++ b/go/vt/vtgate/engine/set_test.go @@ -22,18 +22,18 @@ import ( "fmt" "testing" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/srvtopo" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestSetSystemVariableAsString(t *testing.T) { diff --git a/go/vt/vtgate/engine/shard_route.go b/go/vt/vtgate/engine/shard_route.go index 215d65de6c5..d5d3d4a00f6 100644 --- a/go/vt/vtgate/engine/shard_route.go +++ b/go/vt/vtgate/engine/shard_route.go @@ -19,10 +19,10 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vterrors" ) var _ StreamExecutor = (*shardRoute)(nil) diff --git a/go/vt/vtgate/engine/show_exec.go b/go/vt/vtgate/engine/show_exec.go index 0b94c599f08..34ca50bf258 100644 --- a/go/vt/vtgate/engine/show_exec.go +++ b/go/vt/vtgate/engine/show_exec.go @@ -19,9 +19,9 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" ) var _ Primitive = (*ShowExec)(nil) diff --git a/go/vt/vtgate/engine/simple_projection.go b/go/vt/vtgate/engine/simple_projection.go index 1a3c5f60fa0..ba91e40711b 100644 --- a/go/vt/vtgate/engine/simple_projection.go +++ b/go/vt/vtgate/engine/simple_projection.go @@ -24,9 +24,9 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var _ Primitive = (*SimpleProjection)(nil) diff --git a/go/vt/vtgate/engine/simple_projection_test.go b/go/vt/vtgate/engine/simple_projection_test.go index 593e6a8a4a0..cd5e3aa4c70 100644 --- a/go/vt/vtgate/engine/simple_projection_test.go +++ b/go/vt/vtgate/engine/simple_projection_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestSubqueryExecute(t *testing.T) { diff --git a/go/vt/vtgate/engine/singlerow.go b/go/vt/vtgate/engine/singlerow.go index 40843da718f..0e18adefc65 100644 --- a/go/vt/vtgate/engine/singlerow.go +++ b/go/vt/vtgate/engine/singlerow.go @@ -19,8 +19,8 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var _ Primitive = (*SingleRow)(nil) diff --git a/go/vt/vtgate/engine/sql_calc_found_rows.go b/go/vt/vtgate/engine/sql_calc_found_rows.go index 1b3c20f097f..7425abca9c5 100644 --- a/go/vt/vtgate/engine/sql_calc_found_rows.go +++ b/go/vt/vtgate/engine/sql_calc_found_rows.go @@ -19,10 +19,10 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) var _ Primitive = (*SQLCalcFoundRows)(nil) diff --git a/go/vt/vtgate/engine/throttle_app.go b/go/vt/vtgate/engine/throttle_app.go index ef5fb3032e5..a9b71584141 100644 --- a/go/vt/vtgate/engine/throttle_app.go +++ b/go/vt/vtgate/engine/throttle_app.go @@ -19,12 +19,12 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var _ Primitive = (*ThrottleApp)(nil) diff --git a/go/vt/vtgate/engine/uncorrelated_subquery.go b/go/vt/vtgate/engine/uncorrelated_subquery.go index 95fa7b12454..4ad53e1c9de 100644 --- a/go/vt/vtgate/engine/uncorrelated_subquery.go +++ b/go/vt/vtgate/engine/uncorrelated_subquery.go @@ -19,11 +19,11 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - . "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + . "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" ) var _ Primitive = (*UncorrelatedSubquery)(nil) diff --git a/go/vt/vtgate/engine/uncorrelated_subquery_test.go b/go/vt/vtgate/engine/uncorrelated_subquery_test.go index 69338676cad..75129a3ae19 100644 --- a/go/vt/vtgate/engine/uncorrelated_subquery_test.go +++ b/go/vt/vtgate/engine/uncorrelated_subquery_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - . "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + . "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" ) func TestPulloutSubqueryValueGood(t *testing.T) { diff --git a/go/vt/vtgate/engine/unlock.go b/go/vt/vtgate/engine/unlock.go index 8219cc3ace3..1e15b99bcc4 100644 --- a/go/vt/vtgate/engine/unlock.go +++ b/go/vt/vtgate/engine/unlock.go @@ -19,9 +19,9 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vterrors" ) var _ Primitive = (*Unlock)(nil) diff --git a/go/vt/vtgate/engine/update.go b/go/vt/vtgate/engine/update.go index cfce3b979df..e979b89b156 100644 --- a/go/vt/vtgate/engine/update.go +++ b/go/vt/vtgate/engine/update.go @@ -21,15 +21,15 @@ import ( "fmt" "sort" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var _ Primitive = (*Update)(nil) diff --git a/go/vt/vtgate/engine/update_target.go b/go/vt/vtgate/engine/update_target.go index 331b83ae748..07ed9ce9636 100644 --- a/go/vt/vtgate/engine/update_target.go +++ b/go/vt/vtgate/engine/update_target.go @@ -19,11 +19,11 @@ package engine import ( "context" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/proto/query" ) var _ Primitive = (*UpdateTarget)(nil) diff --git a/go/vt/vtgate/engine/update_target_test.go b/go/vt/vtgate/engine/update_target_test.go index 7043c8173d9..f94875ded5d 100644 --- a/go/vt/vtgate/engine/update_target_test.go +++ b/go/vt/vtgate/engine/update_target_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestUpdateTargetTable(t *testing.T) { diff --git a/go/vt/vtgate/engine/update_test.go b/go/vt/vtgate/engine/update_test.go index 66d0a3f4172..7817510da6b 100644 --- a/go/vt/vtgate/engine/update_test.go +++ b/go/vt/vtgate/engine/update_test.go @@ -21,18 +21,18 @@ import ( "errors" "testing" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) func TestUpdateUnsharded(t *testing.T) { diff --git a/go/vt/vtgate/engine/upsert.go b/go/vt/vtgate/engine/upsert.go index ec7caaf2ed6..fd6fe7c44b0 100644 --- a/go/vt/vtgate/engine/upsert.go +++ b/go/vt/vtgate/engine/upsert.go @@ -20,11 +20,11 @@ import ( "context" "fmt" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) var _ Primitive = (*Upsert)(nil) diff --git a/go/vt/vtgate/engine/vexplain.go b/go/vt/vtgate/engine/vexplain.go index 6bbd7b3d9f7..feedd1c2035 100644 --- a/go/vt/vtgate/engine/vexplain.go +++ b/go/vt/vtgate/engine/vexplain.go @@ -21,12 +21,12 @@ import ( "encoding/json" "fmt" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vterrors" ) type ( diff --git a/go/vt/vtgate/engine/vindex_func.go b/go/vt/vtgate/engine/vindex_func.go index 143bcd3a734..9ce9577e510 100644 --- a/go/vt/vtgate/engine/vindex_func.go +++ b/go/vt/vtgate/engine/vindex_func.go @@ -21,17 +21,17 @@ import ( "encoding/json" "fmt" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var _ Primitive = (*VindexFunc)(nil) diff --git a/go/vt/vtgate/engine/vindex_func_test.go b/go/vt/vtgate/engine/vindex_func_test.go index ca24a519aae..25738860575 100644 --- a/go/vt/vtgate/engine/vindex_func_test.go +++ b/go/vt/vtgate/engine/vindex_func_test.go @@ -23,13 +23,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // uvindex is Unique. diff --git a/go/vt/vtgate/engine/vindex_lookup.go b/go/vt/vtgate/engine/vindex_lookup.go index 34b53121cf1..4e60d60a8b9 100644 --- a/go/vt/vtgate/engine/vindex_lookup.go +++ b/go/vt/vtgate/engine/vindex_lookup.go @@ -19,17 +19,17 @@ package engine import ( "context" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var _ Primitive = (*VindexLookup)(nil) diff --git a/go/vt/vtgate/engine/vschema_ddl.go b/go/vt/vtgate/engine/vschema_ddl.go index 94102133d13..670b8bf297a 100644 --- a/go/vt/vtgate/engine/vschema_ddl.go +++ b/go/vt/vtgate/engine/vschema_ddl.go @@ -19,11 +19,11 @@ package engine import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var _ Primitive = (*AlterVSchema)(nil) diff --git a/go/vt/vtgate/engine/vstream.go b/go/vt/vtgate/engine/vstream.go index 2696f5891bc..ce76b885c07 100644 --- a/go/vt/vtgate/engine/vstream.go +++ b/go/vt/vtgate/engine/vstream.go @@ -21,14 +21,14 @@ import ( "fmt" "io" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var _ Primitive = (*VStream)(nil) diff --git a/go/vt/vtgate/evalengine/api_aggregation.go b/go/vt/vtgate/evalengine/api_aggregation.go index 8de5cb908b4..aa1bcc6777e 100644 --- a/go/vt/vtgate/evalengine/api_aggregation.go +++ b/go/vt/vtgate/evalengine/api_aggregation.go @@ -19,11 +19,11 @@ package evalengine import ( "strconv" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/mysql/fastparse" - "github.com/mdibaiee/vitess/go/mysql/format" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/fastparse" + "github.com/vitess/vitess/go/mysql/format" + "github.com/vitess/vitess/go/sqltypes" ) // Sum implements a SUM() aggregation diff --git a/go/vt/vtgate/evalengine/api_aggregation_test.go b/go/vt/vtgate/evalengine/api_aggregation_test.go index f8b66dcc16c..ca8cbb2fb4a 100644 --- a/go/vt/vtgate/evalengine/api_aggregation_test.go +++ b/go/vt/vtgate/evalengine/api_aggregation_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) func TestMinMax(t *testing.T) { diff --git a/go/vt/vtgate/evalengine/api_arithmetic_test.go b/go/vt/vtgate/evalengine/api_arithmetic_test.go index 58424addcc6..e96328756ba 100644 --- a/go/vt/vtgate/evalengine/api_arithmetic_test.go +++ b/go/vt/vtgate/evalengine/api_arithmetic_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/vthash" ) var ( diff --git a/go/vt/vtgate/evalengine/api_coerce.go b/go/vt/vtgate/evalengine/api_coerce.go index 1f85e9340aa..d02737443fc 100644 --- a/go/vt/vtgate/evalengine/api_coerce.go +++ b/go/vt/vtgate/evalengine/api_coerce.go @@ -17,10 +17,10 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) func CoerceTo(value sqltypes.Value, typ Type, sqlmode SQLMode) (sqltypes.Value, error) { diff --git a/go/vt/vtgate/evalengine/api_compare.go b/go/vt/vtgate/evalengine/api_compare.go index 71dba2f5604..8b440af3ec2 100644 --- a/go/vt/vtgate/evalengine/api_compare.go +++ b/go/vt/vtgate/evalengine/api_compare.go @@ -22,12 +22,12 @@ import ( "slices" "strconv" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // UnsupportedCollationError represents the error where the comparison using provided collation is unsupported on vitess diff --git a/go/vt/vtgate/evalengine/api_compare_test.go b/go/vt/vtgate/evalengine/api_compare_test.go index 0dc02d46e39..62bedbb717f 100644 --- a/go/vt/vtgate/evalengine/api_compare_test.go +++ b/go/vt/vtgate/evalengine/api_compare_test.go @@ -29,14 +29,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) type testCase struct { diff --git a/go/vt/vtgate/evalengine/api_hash.go b/go/vt/vtgate/evalengine/api_hash.go index 959b9d8bbd9..c06acc454ce 100644 --- a/go/vt/vtgate/evalengine/api_hash.go +++ b/go/vt/vtgate/evalengine/api_hash.go @@ -19,14 +19,14 @@ package evalengine import ( "math" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/mysql/fastparse" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/fastparse" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vthash" ) // HashCode is a type alias to the code easier to read diff --git a/go/vt/vtgate/evalengine/api_hash_test.go b/go/vt/vtgate/evalengine/api_hash_test.go index 907b4b1ebb3..485606cfbca 100644 --- a/go/vt/vtgate/evalengine/api_hash_test.go +++ b/go/vt/vtgate/evalengine/api_hash_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vthash" ) func TestHashCodes(t *testing.T) { diff --git a/go/vt/vtgate/evalengine/api_literal.go b/go/vt/vtgate/evalengine/api_literal.go index 543e07c95a4..f7274faaab5 100644 --- a/go/vt/vtgate/evalengine/api_literal.go +++ b/go/vt/vtgate/evalengine/api_literal.go @@ -22,15 +22,15 @@ import ( "math/big" "unicode/utf8" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/mysql/fastparse" - "github.com/mdibaiee/vitess/go/mysql/hex" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/fastparse" + "github.com/vitess/vitess/go/mysql/hex" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) // NullExpr is just what you are lead to believe diff --git a/go/vt/vtgate/evalengine/api_type_aggregation.go b/go/vt/vtgate/evalengine/api_type_aggregation.go index 74a1ab93fb6..17b9cf66fbe 100644 --- a/go/vt/vtgate/evalengine/api_type_aggregation.go +++ b/go/vt/vtgate/evalengine/api_type_aggregation.go @@ -17,9 +17,9 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/proto/query" ) type typeAggregation struct { diff --git a/go/vt/vtgate/evalengine/api_type_aggregation_test.go b/go/vt/vtgate/evalengine/api_type_aggregation_test.go index 25abca1948b..053f076a077 100644 --- a/go/vt/vtgate/evalengine/api_type_aggregation_test.go +++ b/go/vt/vtgate/evalengine/api_type_aggregation_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" ) func TestEvalengineTypeAggregations(t *testing.T) { diff --git a/go/vt/vtgate/evalengine/arena.go b/go/vt/vtgate/evalengine/arena.go index 7d735dd6312..1183a87d1e2 100644 --- a/go/vt/vtgate/evalengine/arena.go +++ b/go/vt/vtgate/evalengine/arena.go @@ -17,10 +17,10 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/datetime" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/datetime" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/sqltypes" ) // Arena is an arena memory allocator for eval types. diff --git a/go/vt/vtgate/evalengine/arithmetic.go b/go/vt/vtgate/evalengine/arithmetic.go index 7a78eb1ccea..58c654da9a0 100644 --- a/go/vt/vtgate/evalengine/arithmetic.go +++ b/go/vt/vtgate/evalengine/arithmetic.go @@ -19,10 +19,10 @@ package evalengine import ( "math" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) func dataOutOfRangeError[N1, N2 int64 | uint64 | float64](v1 N1, v2 N2, typ, sign string) error { diff --git a/go/vt/vtgate/evalengine/cached_size.go b/go/vt/vtgate/evalengine/cached_size.go index dd05155cf95..26422fc5341 100644 --- a/go/vt/vtgate/evalengine/cached_size.go +++ b/go/vt/vtgate/evalengine/cached_size.go @@ -17,7 +17,7 @@ limitations under the License. package evalengine -import hack "github.com/mdibaiee/vitess/go/hack" +import hack "github.com/vitess/vitess/go/hack" type cachedObject interface { CachedSize(alloc bool) int64 @@ -31,9 +31,9 @@ func (cached *ArithmeticExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field BinaryExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.BinaryExpr + // field BinaryExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.BinaryExpr size += cached.BinaryExpr.CachedSize(false) - // field Op github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.opArith + // field Op github.com/vitess/vitess/go/vt/vtgate/evalengine.opArith if cc, ok := cached.Op.(cachedObject); ok { size += cc.CachedSize(true) } @@ -47,11 +47,11 @@ func (cached *BinaryExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Left github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.IR + // field Left github.com/vitess/vitess/go/vt/vtgate/evalengine.IR if cc, ok := cached.Left.(cachedObject); ok { size += cc.CachedSize(true) } - // field Right github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.IR + // field Right github.com/vitess/vitess/go/vt/vtgate/evalengine.IR if cc, ok := cached.Right.(cachedObject); ok { size += cc.CachedSize(true) } @@ -77,9 +77,9 @@ func (cached *BitwiseExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field BinaryExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.BinaryExpr + // field BinaryExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.BinaryExpr size += cached.BinaryExpr.CachedSize(false) - // field Op github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.opBit + // field Op github.com/vitess/vitess/go/vt/vtgate/evalengine.opBit if cc, ok := cached.Op.(cachedObject); ok { size += cc.CachedSize(true) } @@ -93,7 +93,7 @@ func (cached *BitwiseNotExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field UnaryExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.UnaryExpr + // field UnaryExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.UnaryExpr size += cached.UnaryExpr.CachedSize(false) return size } @@ -105,7 +105,7 @@ func (cached *CallExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field Arguments github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.TupleExpr + // field Arguments github.com/vitess/vitess/go/vt/vtgate/evalengine.TupleExpr { size += hack.RuntimeAllocSize(int64(cap(cached.Arguments)) * int64(16)) for _, elem := range cached.Arguments { @@ -126,14 +126,14 @@ func (cached *CaseExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field cases []github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.WhenThen + // field cases []github.com/vitess/vitess/go/vt/vtgate/evalengine.WhenThen { size += hack.RuntimeAllocSize(int64(cap(cached.cases)) * int64(32)) for _, elem := range cached.cases { size += elem.CachedSize(false) } } - // field Else github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.IR + // field Else github.com/vitess/vitess/go/vt/vtgate/evalengine.IR if cc, ok := cached.Else.(cachedObject); ok { size += cc.CachedSize(true) } @@ -147,9 +147,9 @@ func (cached *CollateExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field UnaryExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.UnaryExpr + // field UnaryExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.UnaryExpr size += cached.UnaryExpr.CachedSize(false) - // field CollationEnv *github.com/mdibaiee/vitess/go/mysql/collations.Environment + // field CollationEnv *github.com/vitess/vitess/go/mysql/collations.Environment size += cached.CollationEnv.CachedSize(true) return size } @@ -161,11 +161,11 @@ func (cached *Column) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Original github.com/mdibaiee/vitess/go/vt/sqlparser.Expr + // field Original github.com/vitess/vitess/go/vt/sqlparser.Expr if cc, ok := cached.Original.(cachedObject); ok { size += cc.CachedSize(true) } - // field Values *github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.EnumSetValues + // field Values *github.com/vitess/vitess/go/vt/vtgate/evalengine.EnumSetValues if cached.Values != nil { size += int64(24) size += hack.RuntimeAllocSize(int64(cap(*cached.Values)) * int64(16)) @@ -183,9 +183,9 @@ func (cached *ComparisonExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field BinaryExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.BinaryExpr + // field BinaryExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.BinaryExpr size += cached.BinaryExpr.CachedSize(false) - // field Op github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.ComparisonOp + // field Op github.com/vitess/vitess/go/vt/vtgate/evalengine.ComparisonOp if cc, ok := cached.Op.(cachedObject); ok { size += cc.CachedSize(true) } @@ -199,13 +199,13 @@ func (cached *CompiledExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field code []github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.frame + // field code []github.com/vitess/vitess/go/vt/vtgate/evalengine.frame { size += hack.RuntimeAllocSize(int64(cap(cached.code)) * int64(8)) } - // field typed github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.ctype + // field typed github.com/vitess/vitess/go/vt/vtgate/evalengine.ctype size += cached.typed.CachedSize(false) - // field ir github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.IR + // field ir github.com/vitess/vitess/go/vt/vtgate/evalengine.IR if cc, ok := cached.ir.(cachedObject); ok { size += cc.CachedSize(true) } @@ -219,7 +219,7 @@ func (cached *ConvertExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field UnaryExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.UnaryExpr + // field UnaryExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.UnaryExpr size += cached.UnaryExpr.CachedSize(false) // field Type string size += hack.RuntimeAllocSize(int64(len(cached.Type))) @@ -227,7 +227,7 @@ func (cached *ConvertExpr) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(8)) // field Scale *int size += hack.RuntimeAllocSize(int64(8)) - // field CollationEnv *github.com/mdibaiee/vitess/go/mysql/collations.Environment + // field CollationEnv *github.com/vitess/vitess/go/mysql/collations.Environment size += cached.CollationEnv.CachedSize(true) return size } @@ -239,9 +239,9 @@ func (cached *ConvertUsingExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field UnaryExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.UnaryExpr + // field UnaryExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.UnaryExpr size += cached.UnaryExpr.CachedSize(false) - // field CollationEnv *github.com/mdibaiee/vitess/go/mysql/collations.Environment + // field CollationEnv *github.com/vitess/vitess/go/mysql/collations.Environment size += cached.CollationEnv.CachedSize(true) return size } @@ -253,7 +253,7 @@ func (cached *InExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field BinaryExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.BinaryExpr + // field BinaryExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.BinaryExpr size += cached.BinaryExpr.CachedSize(false) return size } @@ -265,7 +265,7 @@ func (cached *IntervalExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -277,9 +277,9 @@ func (cached *IntroducerExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field UnaryExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.UnaryExpr + // field UnaryExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.UnaryExpr size += cached.UnaryExpr.CachedSize(false) - // field CollationEnv *github.com/mdibaiee/vitess/go/mysql/collations.Environment + // field CollationEnv *github.com/vitess/vitess/go/mysql/collations.Environment size += cached.CollationEnv.CachedSize(true) return size } @@ -291,7 +291,7 @@ func (cached *IsExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field UnaryExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.UnaryExpr + // field UnaryExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.UnaryExpr size += cached.UnaryExpr.CachedSize(false) return size } @@ -303,9 +303,9 @@ func (cached *LikeExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field BinaryExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.BinaryExpr + // field BinaryExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.BinaryExpr size += cached.BinaryExpr.CachedSize(false) - // field Match github.com/mdibaiee/vitess/go/mysql/collations/colldata.WildcardPattern + // field Match github.com/vitess/vitess/go/mysql/collations/colldata.WildcardPattern if cc, ok := cached.Match.(cachedObject); ok { size += cc.CachedSize(true) } @@ -319,7 +319,7 @@ func (cached *Literal) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field inner github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.eval + // field inner github.com/vitess/vitess/go/vt/vtgate/evalengine.eval if cc, ok := cached.inner.(cachedObject); ok { size += cc.CachedSize(true) } @@ -333,9 +333,9 @@ func (cached *LogicalExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field BinaryExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.BinaryExpr + // field BinaryExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.BinaryExpr size += cached.BinaryExpr.CachedSize(false) - // field op github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.opLogical + // field op github.com/vitess/vitess/go/vt/vtgate/evalengine.opLogical if cc, ok := cached.op.(cachedObject); ok { size += cc.CachedSize(true) } @@ -349,7 +349,7 @@ func (cached *NegateExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field UnaryExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.UnaryExpr + // field UnaryExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.UnaryExpr size += cached.UnaryExpr.CachedSize(false) return size } @@ -361,7 +361,7 @@ func (cached *NotExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field UnaryExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.UnaryExpr + // field UnaryExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.UnaryExpr size += cached.UnaryExpr.CachedSize(false) return size } @@ -373,9 +373,9 @@ func (cached *OrderByParams) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field Type github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Type + // field Type github.com/vitess/vitess/go/vt/vtgate/evalengine.Type size += cached.Type.CachedSize(false) - // field CollationEnv *github.com/mdibaiee/vitess/go/mysql/collations.Environment + // field CollationEnv *github.com/vitess/vitess/go/mysql/collations.Environment size += cached.CollationEnv.CachedSize(true) return size } @@ -399,7 +399,7 @@ func (cached *Type) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field values *github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.EnumSetValues + // field values *github.com/vitess/vitess/go/vt/vtgate/evalengine.EnumSetValues if cached.values != nil { size += int64(24) size += hack.RuntimeAllocSize(int64(cap(*cached.values)) * int64(16)) @@ -417,7 +417,7 @@ func (cached *UnaryExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field Inner github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.IR + // field Inner github.com/vitess/vitess/go/vt/vtgate/evalengine.IR if cc, ok := cached.Inner.(cachedObject); ok { size += cc.CachedSize(true) } @@ -431,13 +431,13 @@ func (cached *UntypedExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(96) } - // field env *github.com/mdibaiee/vitess/go/vt/vtenv.Environment + // field env *github.com/vitess/vitess/go/vt/vtenv.Environment size += cached.env.CachedSize(true) - // field ir github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.IR + // field ir github.com/vitess/vitess/go/vt/vtgate/evalengine.IR if cc, ok := cached.ir.(cachedObject); ok { size += cc.CachedSize(true) } - // field needTypes []github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.typedIR + // field needTypes []github.com/vitess/vitess/go/vt/vtgate/evalengine.typedIR { size += hack.RuntimeAllocSize(int64(cap(cached.needTypes)) * int64(16)) for _, elem := range cached.needTypes { @@ -446,7 +446,7 @@ func (cached *UntypedExpr) CachedSize(alloc bool) int64 { } } } - // field typed []*github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.typedExpr + // field typed []*github.com/vitess/vitess/go/vt/vtgate/evalengine.typedExpr { size += hack.RuntimeAllocSize(int64(cap(cached.typed)) * int64(8)) for _, elem := range cached.typed { @@ -463,11 +463,11 @@ func (cached *WhenThen) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field when github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.IR + // field when github.com/vitess/vitess/go/vt/vtgate/evalengine.IR if cc, ok := cached.when.(cachedObject); ok { size += cc.CachedSize(true) } - // field then github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.IR + // field then github.com/vitess/vitess/go/vt/vtgate/evalengine.IR if cc, ok := cached.then.(cachedObject); ok { size += cc.CachedSize(true) } @@ -481,7 +481,7 @@ func (cached *builtinASCII) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -493,7 +493,7 @@ func (cached *builtinAbs) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -505,7 +505,7 @@ func (cached *builtinAcos) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -517,7 +517,7 @@ func (cached *builtinAsin) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -529,7 +529,7 @@ func (cached *builtinAtan) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -541,7 +541,7 @@ func (cached *builtinAtan2) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -553,7 +553,7 @@ func (cached *builtinBinToUUID) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -565,7 +565,7 @@ func (cached *builtinBitCount) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -577,7 +577,7 @@ func (cached *builtinBitLength) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -589,7 +589,7 @@ func (cached *builtinCeil) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -601,7 +601,7 @@ func (cached *builtinChangeCase) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -613,7 +613,7 @@ func (cached *builtinChar) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -625,7 +625,7 @@ func (cached *builtinCharLength) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -637,7 +637,7 @@ func (cached *builtinCoalesce) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -649,7 +649,7 @@ func (cached *builtinCollation) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -661,7 +661,7 @@ func (cached *builtinConcat) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -673,7 +673,7 @@ func (cached *builtinConcatWs) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -685,7 +685,7 @@ func (cached *builtinConv) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -697,7 +697,7 @@ func (cached *builtinConvertTz) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -709,7 +709,7 @@ func (cached *builtinCos) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -721,7 +721,7 @@ func (cached *builtinCot) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -733,7 +733,7 @@ func (cached *builtinCrc32) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -745,7 +745,7 @@ func (cached *builtinCurdate) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -757,7 +757,7 @@ func (cached *builtinDatabase) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -769,7 +769,7 @@ func (cached *builtinDate) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -781,7 +781,7 @@ func (cached *builtinDateFormat) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -793,7 +793,7 @@ func (cached *builtinDateMath) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -805,7 +805,7 @@ func (cached *builtinDayOfMonth) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -817,7 +817,7 @@ func (cached *builtinDayOfWeek) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -829,7 +829,7 @@ func (cached *builtinDayOfYear) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -841,7 +841,7 @@ func (cached *builtinDegrees) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -853,7 +853,7 @@ func (cached *builtinElt) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -865,7 +865,7 @@ func (cached *builtinExp) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -877,7 +877,7 @@ func (cached *builtinField) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -889,7 +889,7 @@ func (cached *builtinFloor) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -901,7 +901,7 @@ func (cached *builtinFromBase64) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -913,7 +913,7 @@ func (cached *builtinFromDays) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -925,7 +925,7 @@ func (cached *builtinFromUnixtime) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -937,7 +937,7 @@ func (cached *builtinHex) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -949,7 +949,7 @@ func (cached *builtinHour) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -961,7 +961,7 @@ func (cached *builtinInet6Aton) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -973,7 +973,7 @@ func (cached *builtinInet6Ntoa) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -985,7 +985,7 @@ func (cached *builtinInetAton) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -997,7 +997,7 @@ func (cached *builtinInetNtoa) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1009,7 +1009,7 @@ func (cached *builtinInsert) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1021,7 +1021,7 @@ func (cached *builtinIsIPV4) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1033,7 +1033,7 @@ func (cached *builtinIsIPV4Compat) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1045,7 +1045,7 @@ func (cached *builtinIsIPV4Mapped) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1057,7 +1057,7 @@ func (cached *builtinIsIPV6) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1069,7 +1069,7 @@ func (cached *builtinIsUUID) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1081,7 +1081,7 @@ func (cached *builtinJSONArray) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1093,7 +1093,7 @@ func (cached *builtinJSONContainsPath) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1105,7 +1105,7 @@ func (cached *builtinJSONDepth) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1117,7 +1117,7 @@ func (cached *builtinJSONExtract) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1129,7 +1129,7 @@ func (cached *builtinJSONKeys) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1141,7 +1141,7 @@ func (cached *builtinJSONLength) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1153,7 +1153,7 @@ func (cached *builtinJSONObject) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1165,7 +1165,7 @@ func (cached *builtinJSONUnquote) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1177,7 +1177,7 @@ func (cached *builtinLastDay) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1189,7 +1189,7 @@ func (cached *builtinLeftRight) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1201,7 +1201,7 @@ func (cached *builtinLength) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1213,7 +1213,7 @@ func (cached *builtinLn) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1225,7 +1225,7 @@ func (cached *builtinLocate) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1237,7 +1237,7 @@ func (cached *builtinLog) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1249,7 +1249,7 @@ func (cached *builtinLog10) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1261,7 +1261,7 @@ func (cached *builtinLog2) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1273,7 +1273,7 @@ func (cached *builtinMD5) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1285,7 +1285,7 @@ func (cached *builtinMakedate) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1297,7 +1297,7 @@ func (cached *builtinMaketime) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1309,7 +1309,7 @@ func (cached *builtinMicrosecond) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1321,7 +1321,7 @@ func (cached *builtinMinute) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1333,7 +1333,7 @@ func (cached *builtinMonth) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1345,7 +1345,7 @@ func (cached *builtinMonthName) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1357,7 +1357,7 @@ func (cached *builtinMultiComparison) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1369,7 +1369,7 @@ func (cached *builtinNow) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1381,7 +1381,7 @@ func (cached *builtinOrd) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1393,7 +1393,7 @@ func (cached *builtinPad) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1405,7 +1405,7 @@ func (cached *builtinPi) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1417,7 +1417,7 @@ func (cached *builtinPow) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1429,7 +1429,7 @@ func (cached *builtinQuarter) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1441,7 +1441,7 @@ func (cached *builtinRadians) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1453,7 +1453,7 @@ func (cached *builtinRandomBytes) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1465,7 +1465,7 @@ func (cached *builtinRegexpInstr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1477,7 +1477,7 @@ func (cached *builtinRegexpLike) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1489,7 +1489,7 @@ func (cached *builtinRegexpReplace) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1501,7 +1501,7 @@ func (cached *builtinRegexpSubstr) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1513,7 +1513,7 @@ func (cached *builtinRepeat) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1525,7 +1525,7 @@ func (cached *builtinReplace) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1537,7 +1537,7 @@ func (cached *builtinReverse) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1549,7 +1549,7 @@ func (cached *builtinRound) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1561,7 +1561,7 @@ func (cached *builtinSHA1) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1573,7 +1573,7 @@ func (cached *builtinSHA2) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1585,7 +1585,7 @@ func (cached *builtinSecToTime) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1597,7 +1597,7 @@ func (cached *builtinSecond) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1609,7 +1609,7 @@ func (cached *builtinSign) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1621,7 +1621,7 @@ func (cached *builtinSin) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1633,7 +1633,7 @@ func (cached *builtinSpace) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1645,7 +1645,7 @@ func (cached *builtinSqrt) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1657,7 +1657,7 @@ func (cached *builtinStrcmp) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1669,7 +1669,7 @@ func (cached *builtinSubstring) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1681,7 +1681,7 @@ func (cached *builtinSysdate) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1693,7 +1693,7 @@ func (cached *builtinTan) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1705,7 +1705,7 @@ func (cached *builtinTime) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1717,7 +1717,7 @@ func (cached *builtinTimeToSec) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1729,7 +1729,7 @@ func (cached *builtinToBase64) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1741,7 +1741,7 @@ func (cached *builtinToDays) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1753,7 +1753,7 @@ func (cached *builtinToSeconds) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1765,7 +1765,7 @@ func (cached *builtinTrim) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1777,7 +1777,7 @@ func (cached *builtinTruncate) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1789,7 +1789,7 @@ func (cached *builtinUUID) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1801,7 +1801,7 @@ func (cached *builtinUUIDToBin) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1813,7 +1813,7 @@ func (cached *builtinUnhex) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1825,7 +1825,7 @@ func (cached *builtinUnixTimestamp) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1837,7 +1837,7 @@ func (cached *builtinUser) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1849,7 +1849,7 @@ func (cached *builtinUtcDate) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1861,7 +1861,7 @@ func (cached *builtinVersion) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1873,7 +1873,7 @@ func (cached *builtinWeek) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1885,7 +1885,7 @@ func (cached *builtinWeekDay) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1897,7 +1897,7 @@ func (cached *builtinWeekOfYear) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1909,7 +1909,7 @@ func (cached *builtinWeightString) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) // field Cast string size += hack.RuntimeAllocSize(int64(len(cached.Cast))) @@ -1925,7 +1925,7 @@ func (cached *builtinYear) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1937,7 +1937,7 @@ func (cached *builtinYearWeek) CachedSize(alloc bool) int64 { if alloc { size += int64(48) } - // field CallExpr github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CallExpr + // field CallExpr github.com/vitess/vitess/go/vt/vtgate/evalengine.CallExpr size += cached.CallExpr.CachedSize(false) return size } @@ -1949,7 +1949,7 @@ func (cached *ctype) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field Values *github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.EnumSetValues + // field Values *github.com/vitess/vitess/go/vt/vtgate/evalengine.EnumSetValues if cached.Values != nil { size += int64(24) size += hack.RuntimeAllocSize(int64(cap(*cached.Values)) * int64(16)) @@ -1981,7 +1981,7 @@ func (cached *evalDecimal) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field dec github.com/mdibaiee/vitess/go/mysql/decimal.Decimal + // field dec github.com/vitess/vitess/go/mysql/decimal.Decimal size += cached.dec.CachedSize(false) return size } @@ -2047,7 +2047,7 @@ func (cached *evalTuple) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field t []github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.eval + // field t []github.com/vitess/vitess/go/vt/vtgate/evalengine.eval { size += hack.RuntimeAllocSize(int64(cap(cached.t)) * int64(16)) for _, elem := range cached.t { @@ -2076,14 +2076,14 @@ func (cached *typedExpr) CachedSize(alloc bool) int64 { if alloc { size += int64(64) } - // field types []github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.ctype + // field types []github.com/vitess/vitess/go/vt/vtgate/evalengine.ctype { size += hack.RuntimeAllocSize(int64(cap(cached.types)) * int64(32)) for _, elem := range cached.types { size += elem.CachedSize(false) } } - // field compiled *github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.CompiledExpr + // field compiled *github.com/vitess/vitess/go/vt/vtgate/evalengine.CompiledExpr size += cached.compiled.CachedSize(true) return size } diff --git a/go/vt/vtgate/evalengine/casting_test.go b/go/vt/vtgate/evalengine/casting_test.go index ff9984f26a1..2c906231669 100644 --- a/go/vt/vtgate/evalengine/casting_test.go +++ b/go/vt/vtgate/evalengine/casting_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations" ) func TestEvalResultToBooleanStrict(t *testing.T) { diff --git a/go/vt/vtgate/evalengine/collation.go b/go/vt/vtgate/evalengine/collation.go index f5f7cb6bce8..5642c417677 100644 --- a/go/vt/vtgate/evalengine/collation.go +++ b/go/vt/vtgate/evalengine/collation.go @@ -17,9 +17,9 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/sqltypes" ) func typedCoercionCollation(typ sqltypes.Type, id collations.ID) collations.TypedCollation { diff --git a/go/vt/vtgate/evalengine/compare.go b/go/vt/vtgate/evalengine/compare.go index 0b754a59506..bcf7fee6c6b 100644 --- a/go/vt/vtgate/evalengine/compare.go +++ b/go/vt/vtgate/evalengine/compare.go @@ -20,12 +20,12 @@ import ( "bytes" "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/mysql/json" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/json" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) func compareNumeric(left, right eval) (int, error) { diff --git a/go/vt/vtgate/evalengine/compiler.go b/go/vt/vtgate/evalengine/compiler.go index 3ce650f3bd8..530416411f7 100644 --- a/go/vt/vtgate/evalengine/compiler.go +++ b/go/vt/vtgate/evalengine/compiler.go @@ -19,16 +19,16 @@ package evalengine import ( "slices" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/mysql/json" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/mysql/json" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" ) type frame func(env *ExpressionEnv) int diff --git a/go/vt/vtgate/evalengine/compiler_asm.go b/go/vt/vtgate/evalengine/compiler_asm.go index d6bb862bc57..405d8b0e8ad 100644 --- a/go/vt/vtgate/evalengine/compiler_asm.go +++ b/go/vt/vtgate/evalengine/compiler_asm.go @@ -35,24 +35,24 @@ import ( "github.com/google/uuid" - "github.com/mdibaiee/vitess/go/mysql/collations/charset/types" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/datetime" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/mysql/fastparse" - "github.com/mdibaiee/vitess/go/mysql/hex" - "github.com/mdibaiee/vitess/go/mysql/icuregex" - "github.com/mdibaiee/vitess/go/mysql/json" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/collations/charset/types" + "github.com/vitess/vitess/go/mysql/collations/colldata" + + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/datetime" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/fastparse" + "github.com/vitess/vitess/go/mysql/hex" + "github.com/vitess/vitess/go/mysql/icuregex" + "github.com/vitess/vitess/go/mysql/json" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vthash" ) type jump struct { diff --git a/go/vt/vtgate/evalengine/compiler_asm_push.go b/go/vt/vtgate/evalengine/compiler_asm_push.go index ef2cee7bdf6..f5eb60abfce 100644 --- a/go/vt/vtgate/evalengine/compiler_asm_push.go +++ b/go/vt/vtgate/evalengine/compiler_asm_push.go @@ -17,14 +17,14 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/mysql/fastparse" - "github.com/mdibaiee/vitess/go/mysql/json" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/fastparse" + "github.com/vitess/vitess/go/mysql/json" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) func push_null(env *ExpressionEnv) int { diff --git a/go/vt/vtgate/evalengine/compiler_fn.go b/go/vt/vtgate/evalengine/compiler_fn.go index 82e688ce881..a23c29e2b7b 100644 --- a/go/vt/vtgate/evalengine/compiler_fn.go +++ b/go/vt/vtgate/evalengine/compiler_fn.go @@ -17,7 +17,7 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) func (c *compiler) compileFn_rounding(arg0 IR, asm_ins_f, asm_ins_d func()) (ctype, error) { diff --git a/go/vt/vtgate/evalengine/compiler_test.go b/go/vt/vtgate/evalengine/compiler_test.go index fa94cc208a6..d1ef452e3b1 100644 --- a/go/vt/vtgate/evalengine/compiler_test.go +++ b/go/vt/vtgate/evalengine/compiler_test.go @@ -27,13 +27,13 @@ import ( "github.com/olekukonko/tablewriter" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine/testcases" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine/testcases" ) func makeFields(values []sqltypes.Value) (fields []*querypb.Field) { diff --git a/go/vt/vtgate/evalengine/eval.go b/go/vt/vtgate/evalengine/eval.go index 0acfe378c02..949ff5c2f29 100644 --- a/go/vt/vtgate/evalengine/eval.go +++ b/go/vt/vtgate/evalengine/eval.go @@ -21,15 +21,15 @@ import ( "time" "unicode/utf8" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/mysql/fastparse" - "github.com/mdibaiee/vitess/go/mysql/format" - "github.com/mdibaiee/vitess/go/mysql/json" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/fastparse" + "github.com/vitess/vitess/go/mysql/format" + "github.com/vitess/vitess/go/mysql/json" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vthash" ) type typeFlag uint16 diff --git a/go/vt/vtgate/evalengine/eval_bytes.go b/go/vt/vtgate/evalengine/eval_bytes.go index 35d80bd5512..3863b640573 100644 --- a/go/vt/vtgate/evalengine/eval_bytes.go +++ b/go/vt/vtgate/evalengine/eval_bytes.go @@ -19,13 +19,13 @@ package evalengine import ( "encoding/binary" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/mysql/datetime" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/mysql/datetime" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vthash" ) type evalBytes struct { diff --git a/go/vt/vtgate/evalengine/eval_enum.go b/go/vt/vtgate/evalengine/eval_enum.go index ad20d617b26..85910a67c97 100644 --- a/go/vt/vtgate/evalengine/eval_enum.go +++ b/go/vt/vtgate/evalengine/eval_enum.go @@ -1,8 +1,8 @@ package evalengine import ( - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/sqltypes" ) type evalEnum struct { diff --git a/go/vt/vtgate/evalengine/eval_json.go b/go/vt/vtgate/evalengine/eval_json.go index 9398befb192..fba1591d2ae 100644 --- a/go/vt/vtgate/evalengine/eval_json.go +++ b/go/vt/vtgate/evalengine/eval_json.go @@ -21,13 +21,13 @@ import ( "errors" "fmt" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/mysql/json" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/mysql/json" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) type errJSONType string diff --git a/go/vt/vtgate/evalengine/eval_numeric.go b/go/vt/vtgate/evalengine/eval_numeric.go index 78237c74816..6a3f322833d 100644 --- a/go/vt/vtgate/evalengine/eval_numeric.go +++ b/go/vt/vtgate/evalengine/eval_numeric.go @@ -21,12 +21,12 @@ import ( "math" "strconv" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/mysql/fastparse" - "github.com/mdibaiee/vitess/go/mysql/format" - "github.com/mdibaiee/vitess/go/mysql/json" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/fastparse" + "github.com/vitess/vitess/go/mysql/format" + "github.com/vitess/vitess/go/mysql/json" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vthash" ) type ( diff --git a/go/vt/vtgate/evalengine/eval_result.go b/go/vt/vtgate/evalengine/eval_result.go index ef76cea3517..415612e16d0 100644 --- a/go/vt/vtgate/evalengine/eval_result.go +++ b/go/vt/vtgate/evalengine/eval_result.go @@ -19,12 +19,12 @@ package evalengine import ( "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) type EvalResult struct { diff --git a/go/vt/vtgate/evalengine/eval_set.go b/go/vt/vtgate/evalengine/eval_set.go index 28af90dab4c..330f7ec205e 100644 --- a/go/vt/vtgate/evalengine/eval_set.go +++ b/go/vt/vtgate/evalengine/eval_set.go @@ -3,8 +3,8 @@ package evalengine import ( "strings" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/sqltypes" ) type evalSet struct { diff --git a/go/vt/vtgate/evalengine/eval_temporal.go b/go/vt/vtgate/evalengine/eval_temporal.go index 9c6722203fc..1f907f7734b 100644 --- a/go/vt/vtgate/evalengine/eval_temporal.go +++ b/go/vt/vtgate/evalengine/eval_temporal.go @@ -3,15 +3,15 @@ package evalengine import ( "time" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/datetime" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/mysql/json" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/datetime" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/json" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vthash" ) type evalTemporal struct { diff --git a/go/vt/vtgate/evalengine/eval_tuple.go b/go/vt/vtgate/evalengine/eval_tuple.go index 0fbbc2ff687..25242c23e33 100644 --- a/go/vt/vtgate/evalengine/eval_tuple.go +++ b/go/vt/vtgate/evalengine/eval_tuple.go @@ -17,7 +17,7 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) type evalTuple struct { diff --git a/go/vt/vtgate/evalengine/expr.go b/go/vt/vtgate/evalengine/expr.go index feaedd296bc..25572540f10 100644 --- a/go/vt/vtgate/evalengine/expr.go +++ b/go/vt/vtgate/evalengine/expr.go @@ -17,7 +17,7 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) type ( diff --git a/go/vt/vtgate/evalengine/expr_arithmetic.go b/go/vt/vtgate/evalengine/expr_arithmetic.go index e8efb89d66e..433261c952a 100644 --- a/go/vt/vtgate/evalengine/expr_arithmetic.go +++ b/go/vt/vtgate/evalengine/expr_arithmetic.go @@ -17,7 +17,7 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) type ( diff --git a/go/vt/vtgate/evalengine/expr_bit.go b/go/vt/vtgate/evalengine/expr_bit.go index 1cd20a7d363..51d5264c589 100644 --- a/go/vt/vtgate/evalengine/expr_bit.go +++ b/go/vt/vtgate/evalengine/expr_bit.go @@ -17,9 +17,9 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) type ( diff --git a/go/vt/vtgate/evalengine/expr_bvar.go b/go/vt/vtgate/evalengine/expr_bvar.go index d4764854c47..6c45c1f44de 100644 --- a/go/vt/vtgate/evalengine/expr_bvar.go +++ b/go/vt/vtgate/evalengine/expr_bvar.go @@ -17,11 +17,11 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) type ( diff --git a/go/vt/vtgate/evalengine/expr_collate.go b/go/vt/vtgate/evalengine/expr_collate.go index 5a2b03132dd..24438f3d4b4 100644 --- a/go/vt/vtgate/evalengine/expr_collate.go +++ b/go/vt/vtgate/evalengine/expr_collate.go @@ -17,12 +17,12 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) var collationNull = collations.TypedCollation{ diff --git a/go/vt/vtgate/evalengine/expr_column.go b/go/vt/vtgate/evalengine/expr_column.go index 803d67364ef..7fc8d1cc070 100644 --- a/go/vt/vtgate/evalengine/expr_column.go +++ b/go/vt/vtgate/evalengine/expr_column.go @@ -17,12 +17,12 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) type ( diff --git a/go/vt/vtgate/evalengine/expr_column_test.go b/go/vt/vtgate/evalengine/expr_column_test.go index cfbb533a29b..517db9eb63f 100644 --- a/go/vt/vtgate/evalengine/expr_column_test.go +++ b/go/vt/vtgate/evalengine/expr_column_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestTypeOf(t *testing.T) { diff --git a/go/vt/vtgate/evalengine/expr_compare.go b/go/vt/vtgate/evalengine/expr_compare.go index 4ab4965b47c..a3cb48b92b8 100644 --- a/go/vt/vtgate/evalengine/expr_compare.go +++ b/go/vt/vtgate/evalengine/expr_compare.go @@ -19,12 +19,12 @@ package evalengine import ( "bytes" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vthash" ) type ( diff --git a/go/vt/vtgate/evalengine/expr_convert.go b/go/vt/vtgate/evalengine/expr_convert.go index 101bac5061f..82cda5255c2 100644 --- a/go/vt/vtgate/evalengine/expr_convert.go +++ b/go/vt/vtgate/evalengine/expr_convert.go @@ -17,12 +17,12 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/ptr" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/ptr" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) type ( diff --git a/go/vt/vtgate/evalengine/expr_env.go b/go/vt/vtgate/evalengine/expr_env.go index 11d4e4c595e..af37b3e91f3 100644 --- a/go/vt/vtgate/evalengine/expr_env.go +++ b/go/vt/vtgate/evalengine/expr_env.go @@ -21,13 +21,13 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/config" - "github.com/mdibaiee/vitess/go/mysql/datetime" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/callerid" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/config" + "github.com/vitess/vitess/go/mysql/datetime" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/callerid" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vtenv" ) type VCursor interface { diff --git a/go/vt/vtgate/evalengine/expr_env_test.go b/go/vt/vtgate/evalengine/expr_env_test.go index 180c09d9bdf..6269d11807b 100644 --- a/go/vt/vtgate/evalengine/expr_env_test.go +++ b/go/vt/vtgate/evalengine/expr_env_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" ) // TestExpressionEnvTypeOf tests the functionality of the TypeOf method on ExpressionEnv diff --git a/go/vt/vtgate/evalengine/expr_literal.go b/go/vt/vtgate/evalengine/expr_literal.go index d89199f0fa3..9188279b8c4 100644 --- a/go/vt/vtgate/evalengine/expr_literal.go +++ b/go/vt/vtgate/evalengine/expr_literal.go @@ -19,7 +19,7 @@ package evalengine import ( "math" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) type ( diff --git a/go/vt/vtgate/evalengine/expr_logical.go b/go/vt/vtgate/evalengine/expr_logical.go index 6c127562175..79efdb563d4 100644 --- a/go/vt/vtgate/evalengine/expr_logical.go +++ b/go/vt/vtgate/evalengine/expr_logical.go @@ -17,8 +17,8 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" ) type ( diff --git a/go/vt/vtgate/evalengine/expr_tuple.go b/go/vt/vtgate/evalengine/expr_tuple.go index b68f6d9f577..646c18d1de0 100644 --- a/go/vt/vtgate/evalengine/expr_tuple.go +++ b/go/vt/vtgate/evalengine/expr_tuple.go @@ -17,8 +17,8 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" ) type ( diff --git a/go/vt/vtgate/evalengine/expr_tuple_bvar.go b/go/vt/vtgate/evalengine/expr_tuple_bvar.go index 881945f7a6b..71e1e066603 100644 --- a/go/vt/vtgate/evalengine/expr_tuple_bvar.go +++ b/go/vt/vtgate/evalengine/expr_tuple_bvar.go @@ -19,10 +19,10 @@ package evalengine import ( "errors" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) type ( diff --git a/go/vt/vtgate/evalengine/expr_tuple_bvar_test.go b/go/vt/vtgate/evalengine/expr_tuple_bvar_test.go index e3a4c5d4cf6..6c76fdf7822 100644 --- a/go/vt/vtgate/evalengine/expr_tuple_bvar_test.go +++ b/go/vt/vtgate/evalengine/expr_tuple_bvar_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // TestTupleBindVarEval tests TupleBindVariable eval function. diff --git a/go/vt/vtgate/evalengine/fn_base64.go b/go/vt/vtgate/evalengine/fn_base64.go index 879e2336dd7..577ce135080 100644 --- a/go/vt/vtgate/evalengine/fn_base64.go +++ b/go/vt/vtgate/evalengine/fn_base64.go @@ -20,8 +20,8 @@ import ( "bytes" "encoding/base64" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" ) type ( diff --git a/go/vt/vtgate/evalengine/fn_bit.go b/go/vt/vtgate/evalengine/fn_bit.go index 824e9dbdd1d..cc956cf35aa 100644 --- a/go/vt/vtgate/evalengine/fn_bit.go +++ b/go/vt/vtgate/evalengine/fn_bit.go @@ -19,7 +19,7 @@ package evalengine import ( "math/bits" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) type builtinBitCount struct { diff --git a/go/vt/vtgate/evalengine/fn_compare.go b/go/vt/vtgate/evalengine/fn_compare.go index ee2e0f1f77b..ba4377cd2fd 100644 --- a/go/vt/vtgate/evalengine/fn_compare.go +++ b/go/vt/vtgate/evalengine/fn_compare.go @@ -19,12 +19,12 @@ package evalengine import ( "bytes" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) type ( diff --git a/go/vt/vtgate/evalengine/fn_crypto.go b/go/vt/vtgate/evalengine/fn_crypto.go index 17c1aed749d..0cea3c5802b 100644 --- a/go/vt/vtgate/evalengine/fn_crypto.go +++ b/go/vt/vtgate/evalengine/fn_crypto.go @@ -24,8 +24,8 @@ import ( "crypto/sha512" "encoding/hex" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" ) type builtinMD5 struct { diff --git a/go/vt/vtgate/evalengine/fn_hex.go b/go/vt/vtgate/evalengine/fn_hex.go index 35897095048..91cced48987 100644 --- a/go/vt/vtgate/evalengine/fn_hex.go +++ b/go/vt/vtgate/evalengine/fn_hex.go @@ -17,10 +17,10 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/hex" - "github.com/mdibaiee/vitess/go/mysql/json" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/hex" + "github.com/vitess/vitess/go/mysql/json" + "github.com/vitess/vitess/go/sqltypes" ) type builtinHex struct { diff --git a/go/vt/vtgate/evalengine/fn_info.go b/go/vt/vtgate/evalengine/fn_info.go index 26b935fc3a3..f9f74f66dda 100644 --- a/go/vt/vtgate/evalengine/fn_info.go +++ b/go/vt/vtgate/evalengine/fn_info.go @@ -17,7 +17,7 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) type builtinUser struct { diff --git a/go/vt/vtgate/evalengine/fn_json.go b/go/vt/vtgate/evalengine/fn_json.go index 6183e967e1d..a24f6edca92 100644 --- a/go/vt/vtgate/evalengine/fn_json.go +++ b/go/vt/vtgate/evalengine/fn_json.go @@ -17,12 +17,12 @@ limitations under the License. package evalengine import ( - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/json" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/json" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) type ( diff --git a/go/vt/vtgate/evalengine/fn_misc.go b/go/vt/vtgate/evalengine/fn_misc.go index 8ab10a8d5de..6bae1894592 100644 --- a/go/vt/vtgate/evalengine/fn_misc.go +++ b/go/vt/vtgate/evalengine/fn_misc.go @@ -23,11 +23,11 @@ import ( "github.com/google/uuid" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) type ( diff --git a/go/vt/vtgate/evalengine/fn_numeric.go b/go/vt/vtgate/evalengine/fn_numeric.go index 4344a235acf..72ed8a9cf59 100644 --- a/go/vt/vtgate/evalengine/fn_numeric.go +++ b/go/vt/vtgate/evalengine/fn_numeric.go @@ -22,12 +22,12 @@ import ( "math" "strconv" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/mysql/fastparse" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/fastparse" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) type builtinCeil struct { diff --git a/go/vt/vtgate/evalengine/fn_regexp.go b/go/vt/vtgate/evalengine/fn_regexp.go index aaf2f9cbb71..d55e857a6b8 100644 --- a/go/vt/vtgate/evalengine/fn_regexp.go +++ b/go/vt/vtgate/evalengine/fn_regexp.go @@ -20,14 +20,14 @@ import ( "errors" "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/mysql/icuregex" - icuerrors "github.com/mdibaiee/vitess/go/mysql/icuregex/errors" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/mysql/icuregex" + icuerrors "github.com/vitess/vitess/go/mysql/icuregex/errors" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) func regexpFlags(m eval, flags icuregex.RegexpFlag, f string) (icuregex.RegexpFlag, error) { diff --git a/go/vt/vtgate/evalengine/fn_string.go b/go/vt/vtgate/evalengine/fn_string.go index 5580f3a8dd1..9b1a2333e32 100644 --- a/go/vt/vtgate/evalengine/fn_string.go +++ b/go/vt/vtgate/evalengine/fn_string.go @@ -20,13 +20,13 @@ import ( "bytes" "math" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) type ( diff --git a/go/vt/vtgate/evalengine/fn_time.go b/go/vt/vtgate/evalengine/fn_time.go index ccd29529371..535ec261e95 100644 --- a/go/vt/vtgate/evalengine/fn_time.go +++ b/go/vt/vtgate/evalengine/fn_time.go @@ -20,11 +20,11 @@ import ( "math" "time" - "github.com/mdibaiee/vitess/go/hack" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/datetime" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/hack" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/datetime" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/sqltypes" ) var SystemTime = time.Now diff --git a/go/vt/vtgate/evalengine/format.go b/go/vt/vtgate/evalengine/format.go index 101f006a9b1..643ba916cce 100644 --- a/go/vt/vtgate/evalengine/format.go +++ b/go/vt/vtgate/evalengine/format.go @@ -19,9 +19,9 @@ package evalengine import ( "fmt" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" ) func precedenceFor(in IR) sqlparser.Precendence { diff --git a/go/vt/vtgate/evalengine/integration/comparison_test.go b/go/vt/vtgate/evalengine/integration/comparison_test.go index fc7874d1985..9d36865f16d 100644 --- a/go/vt/vtgate/evalengine/integration/comparison_test.go +++ b/go/vt/vtgate/evalengine/integration/comparison_test.go @@ -30,19 +30,19 @@ import ( "github.com/spf13/pflag" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/config" - "github.com/mdibaiee/vitess/go/mysql/format" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/callerid" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine/testcases" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/config" + "github.com/vitess/vitess/go/mysql/format" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/callerid" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine/testcases" ) var ( diff --git a/go/vt/vtgate/evalengine/integration/fuzz_test.go b/go/vt/vtgate/evalengine/integration/fuzz_test.go index 387381cdd64..2da9d2d3f70 100644 --- a/go/vt/vtgate/evalengine/integration/fuzz_test.go +++ b/go/vt/vtgate/evalengine/integration/fuzz_test.go @@ -30,14 +30,14 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine/testcases" - "github.com/mdibaiee/vitess/go/vt/vtgate/simplifier" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine/testcases" + "github.com/vitess/vitess/go/vt/vtgate/simplifier" ) type ( diff --git a/go/vt/vtgate/evalengine/mysql_test.go b/go/vt/vtgate/evalengine/mysql_test.go index 8c00fb2ce68..a409eb1b400 100644 --- a/go/vt/vtgate/evalengine/mysql_test.go +++ b/go/vt/vtgate/evalengine/mysql_test.go @@ -25,9 +25,9 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" ) func internalExpression(e Expr) IR { diff --git a/go/vt/vtgate/evalengine/perf_test.go b/go/vt/vtgate/evalengine/perf_test.go index 22555842760..215d537e611 100644 --- a/go/vt/vtgate/evalengine/perf_test.go +++ b/go/vt/vtgate/evalengine/perf_test.go @@ -3,10 +3,10 @@ package evalengine_test import ( "testing" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) func BenchmarkCompilerExpressions(b *testing.B) { diff --git a/go/vt/vtgate/evalengine/testcases/cases.go b/go/vt/vtgate/evalengine/testcases/cases.go index 37617fdf7c1..bef308d3111 100644 --- a/go/vt/vtgate/evalengine/testcases/cases.go +++ b/go/vt/vtgate/evalengine/testcases/cases.go @@ -24,8 +24,8 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var Cases = []TestCase{ diff --git a/go/vt/vtgate/evalengine/testcases/helpers.go b/go/vt/vtgate/evalengine/testcases/helpers.go index cbf27787882..ce24c3c9eeb 100644 --- a/go/vt/vtgate/evalengine/testcases/helpers.go +++ b/go/vt/vtgate/evalengine/testcases/helpers.go @@ -24,9 +24,9 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/mysql/datetime" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql/datetime" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) type Query func(query string, row []sqltypes.Value) diff --git a/go/vt/vtgate/evalengine/testcases/inputs.go b/go/vt/vtgate/evalengine/testcases/inputs.go index bf72f391c87..29f4244a563 100644 --- a/go/vt/vtgate/evalengine/testcases/inputs.go +++ b/go/vt/vtgate/evalengine/testcases/inputs.go @@ -20,7 +20,7 @@ import ( "math" "strconv" - "github.com/mdibaiee/vitess/go/mysql/format" + "github.com/vitess/vitess/go/mysql/format" ) var inputJSONObjects = []string{ diff --git a/go/vt/vtgate/evalengine/translate.go b/go/vt/vtgate/evalengine/translate.go index a754e3303f7..a67ca93476c 100644 --- a/go/vt/vtgate/evalengine/translate.go +++ b/go/vt/vtgate/evalengine/translate.go @@ -22,13 +22,13 @@ import ( "strings" "sync" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" ) var ErrTranslateExprNotSupported = "expr cannot be translated, not supported" diff --git a/go/vt/vtgate/evalengine/translate_builtin.go b/go/vt/vtgate/evalengine/translate_builtin.go index 0e816af19ec..dcf0b6a8623 100644 --- a/go/vt/vtgate/evalengine/translate_builtin.go +++ b/go/vt/vtgate/evalengine/translate_builtin.go @@ -20,10 +20,10 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) type argError string diff --git a/go/vt/vtgate/evalengine/translate_card.go b/go/vt/vtgate/evalengine/translate_card.go index 5176cda55cb..1c93f32186c 100644 --- a/go/vt/vtgate/evalengine/translate_card.go +++ b/go/vt/vtgate/evalengine/translate_card.go @@ -19,9 +19,9 @@ package evalengine import ( "fmt" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) func errCardinality(expected int) error { diff --git a/go/vt/vtgate/evalengine/translate_convert.go b/go/vt/vtgate/evalengine/translate_convert.go index 5db4634882f..2a028ef96f9 100644 --- a/go/vt/vtgate/evalengine/translate_convert.go +++ b/go/vt/vtgate/evalengine/translate_convert.go @@ -19,12 +19,12 @@ package evalengine import ( "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/mysql/decimal" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/mysql/decimal" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) func (ast *astCompiler) binaryCollationForCollation(collation collations.ID) collations.ID { diff --git a/go/vt/vtgate/evalengine/translate_simplify.go b/go/vt/vtgate/evalengine/translate_simplify.go index ff1fae47746..e9de04f0b6c 100644 --- a/go/vt/vtgate/evalengine/translate_simplify.go +++ b/go/vt/vtgate/evalengine/translate_simplify.go @@ -16,7 +16,7 @@ limitations under the License. package evalengine -import "github.com/mdibaiee/vitess/go/mysql/collations/colldata" +import "github.com/vitess/vitess/go/mysql/collations/colldata" func (expr *Literal) constant() bool { return true diff --git a/go/vt/vtgate/evalengine/translate_test.go b/go/vt/vtgate/evalengine/translate_test.go index 3a5f3b0603c..3e90fee2dcd 100644 --- a/go/vt/vtgate/evalengine/translate_test.go +++ b/go/vt/vtgate/evalengine/translate_test.go @@ -22,15 +22,15 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) /* diff --git a/go/vt/vtgate/evalengine/vm.go b/go/vt/vtgate/evalengine/vm.go index c3105a376bf..83daa460a2e 100644 --- a/go/vt/vtgate/evalengine/vm.go +++ b/go/vt/vtgate/evalengine/vm.go @@ -19,8 +19,8 @@ package evalengine import ( "errors" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vthash" ) var errDeoptimize = errors.New("de-optimize") diff --git a/go/vt/vtgate/evalengine/weights.go b/go/vt/vtgate/evalengine/weights.go index 46b9dd9a998..133a06e99a8 100644 --- a/go/vt/vtgate/evalengine/weights.go +++ b/go/vt/vtgate/evalengine/weights.go @@ -20,16 +20,16 @@ import ( "encoding/binary" "math" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/mysql/decimal" - "github.com/mdibaiee/vitess/go/mysql/fastparse" - "github.com/mdibaiee/vitess/go/mysql/json" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/mysql/decimal" + "github.com/vitess/vitess/go/mysql/fastparse" + "github.com/vitess/vitess/go/mysql/json" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // WeightString returns the weight string for a value. diff --git a/go/vt/vtgate/evalengine/weights_test.go b/go/vt/vtgate/evalengine/weights_test.go index 5a861efef44..f2d0b25e226 100644 --- a/go/vt/vtgate/evalengine/weights_test.go +++ b/go/vt/vtgate/evalengine/weights_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestTinyWeightStrings(t *testing.T) { diff --git a/go/vt/vtgate/executor.go b/go/vt/vtgate/executor.go index ad7a1415195..4369fab537a 100644 --- a/go/vt/vtgate/executor.go +++ b/go/vt/vtgate/executor.go @@ -30,40 +30,40 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/cache/theine" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/sysvars" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/logstats" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vtgate/vschemaacl" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateservice" - "github.com/mdibaiee/vitess/go/vt/vthash" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/cache/theine" + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/sysvars" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/logstats" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vtgate/vschemaacl" + "github.com/vitess/vitess/go/vt/vtgate/vtgateservice" + "github.com/vitess/vitess/go/vt/vthash" ) var ( diff --git a/go/vt/vtgate/executor_ddl_test.go b/go/vt/vtgate/executor_ddl_test.go index 3534fbbdfea..5a960bf0da3 100644 --- a/go/vt/vtgate/executor_ddl_test.go +++ b/go/vt/vtgate/executor_ddl_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" "github.com/stretchr/testify/require" ) diff --git a/go/vt/vtgate/executor_dml_test.go b/go/vt/vtgate/executor_dml_test.go index 8d9d0f72f05..3326895defe 100644 --- a/go/vt/vtgate/executor_dml_test.go +++ b/go/vt/vtgate/executor_dml_test.go @@ -25,16 +25,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/config" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - _ "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/sandboxconn" + "github.com/vitess/vitess/go/mysql/config" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + _ "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/sandboxconn" ) func TestUpdateEqual(t *testing.T) { diff --git a/go/vt/vtgate/executor_framework_test.go b/go/vt/vtgate/executor_framework_test.go index 329fb60d44e..858a88904ab 100644 --- a/go/vt/vtgate/executor_framework_test.go +++ b/go/vt/vtgate/executor_framework_test.go @@ -28,24 +28,24 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/cache/theine" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - "github.com/mdibaiee/vitess/go/vt/sidecardb" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/logstats" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/sandboxconn" + "github.com/vitess/vitess/go/cache/theine" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/vt/sidecardb" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/logstats" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/sandboxconn" ) //go:embed testdata/executorVSchema.json diff --git a/go/vt/vtgate/executor_scatter_stats.go b/go/vt/vtgate/executor_scatter_stats.go index 835caf6e0e9..ccc95bf9569 100644 --- a/go/vt/vtgate/executor_scatter_stats.go +++ b/go/vt/vtgate/executor_scatter_stats.go @@ -24,11 +24,11 @@ import ( "github.com/google/safehtml/template" - "github.com/mdibaiee/vitess/go/vt/logz" + "github.com/vitess/vitess/go/vt/logz" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" ) type statsResults struct { diff --git a/go/vt/vtgate/executor_scatter_stats_test.go b/go/vt/vtgate/executor_scatter_stats_test.go index 7ad397e5439..8b8d97166db 100644 --- a/go/vt/vtgate/executor_scatter_stats_test.go +++ b/go/vt/vtgate/executor_scatter_stats_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) func TestScatterStatsWithNoScatterQuery(t *testing.T) { diff --git a/go/vt/vtgate/executor_select_test.go b/go/vt/vtgate/executor_select_test.go index dbcdd0c22f7..fc15c0ad05c 100644 --- a/go/vt/vtgate/executor_select_test.go +++ b/go/vt/vtgate/executor_select_test.go @@ -30,22 +30,22 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - _flag "github.com/mdibaiee/vitess/go/internal/flag" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/discovery" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/logstats" - _ "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/sandboxconn" + _flag "github.com/vitess/vitess/go/internal/flag" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/discovery" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/logstats" + _ "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/sandboxconn" ) func TestSelectNext(t *testing.T) { diff --git a/go/vt/vtgate/executor_set_test.go b/go/vt/vtgate/executor_set_test.go index b237cf9f764..196b1b23a39 100644 --- a/go/vt/vtgate/executor_set_test.go +++ b/go/vt/vtgate/executor_set_test.go @@ -20,18 +20,18 @@ import ( "fmt" "testing" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql/sqlerror" + querypb "github.com/vitess/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vtgate/vschemaacl" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vtgate/vschemaacl" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/go/vt/vtgate/executor_stream_test.go b/go/vt/vtgate/executor_stream_test.go index 94c23dc2abc..2a7e242d796 100644 --- a/go/vt/vtgate/executor_stream_test.go +++ b/go/vt/vtgate/executor_stream_test.go @@ -23,17 +23,17 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/discovery" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/logstats" - _ "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/sandboxconn" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/discovery" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/logstats" + _ "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/sandboxconn" ) func TestStreamSQLUnsharded(t *testing.T) { diff --git a/go/vt/vtgate/executor_test.go b/go/vt/vtgate/executor_test.go index 81b37a695cc..e904b7c03d1 100644 --- a/go/vt/vtgate/executor_test.go +++ b/go/vt/vtgate/executor_test.go @@ -36,26 +36,26 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtgate/buffer" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/logstats" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vtgate/vschemaacl" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateservice" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtgate/buffer" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/logstats" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vtgate/vschemaacl" + "github.com/vitess/vitess/go/vt/vtgate/vtgateservice" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func TestExecutorResultsExceeded(t *testing.T) { diff --git a/go/vt/vtgate/executor_vschema_ddl_test.go b/go/vt/vtgate/executor_vschema_ddl_test.go index 3bdb1ccc32f..7587fdff443 100644 --- a/go/vt/vtgate/executor_vschema_ddl_test.go +++ b/go/vt/vtgate/executor_vschema_ddl_test.go @@ -25,15 +25,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/vtgate/vschemaacl" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/vtgate/vschemaacl" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func waitForVindex(t *testing.T, ks, name string, watch chan *vschemapb.SrvVSchema, executor *Executor) (*vschemapb.SrvVSchema, *vschemapb.Vindex) { diff --git a/go/vt/vtgate/executor_vstream_test.go b/go/vt/vtgate/executor_vstream_test.go index 819e5543b8c..a5c3aa09156 100644 --- a/go/vt/vtgate/executor_vstream_test.go +++ b/go/vt/vtgate/executor_vstream_test.go @@ -20,18 +20,18 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/engine" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - _ "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + _ "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // TestVStreamSQLUnsharded tests the experimental 'vstream * from' vtgate olap query diff --git a/go/vt/vtgate/fakerpcvtgateconn/conn.go b/go/vt/vtgate/fakerpcvtgateconn/conn.go index 7789c61dca5..c7be8c428d1 100644 --- a/go/vt/vtgate/fakerpcvtgateconn/conn.go +++ b/go/vt/vtgate/fakerpcvtgateconn/conn.go @@ -26,13 +26,13 @@ import ( "math/rand/v2" "reflect" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) // queryExecute contains all the fields we use to test Execute diff --git a/go/vt/vtgate/grpcvtgateconn/conn.go b/go/vt/vtgate/grpcvtgateconn/conn.go index c470cb50111..5823dc21992 100644 --- a/go/vt/vtgate/grpcvtgateconn/conn.go +++ b/go/vt/vtgate/grpcvtgateconn/conn.go @@ -23,18 +23,18 @@ import ( "github.com/spf13/pflag" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtgateservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtgateservice" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtgateservicepb "github.com/vitess/vitess/go/vt/proto/vtgateservice" ) var ( diff --git a/go/vt/vtgate/grpcvtgateconn/conn_rpc_test.go b/go/vt/vtgate/grpcvtgateconn/conn_rpc_test.go index 26a1f2c0455..d0be9760cf0 100644 --- a/go/vt/vtgate/grpcvtgateconn/conn_rpc_test.go +++ b/go/vt/vtgate/grpcvtgateconn/conn_rpc_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateservice" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateservice" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" ) // TestGRPCVTGateConn makes sure the grpc service works diff --git a/go/vt/vtgate/grpcvtgateconn/fuzz_flaky_test.go b/go/vt/vtgate/grpcvtgateconn/fuzz_flaky_test.go index 0811c90e446..cc8ef6987b6 100644 --- a/go/vt/vtgate/grpcvtgateconn/fuzz_flaky_test.go +++ b/go/vt/vtgate/grpcvtgateconn/fuzz_flaky_test.go @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateservice" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateservice" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" ) func init() { diff --git a/go/vt/vtgate/grpcvtgateconn/suite_test.go b/go/vt/vtgate/grpcvtgateconn/suite_test.go index aa289c71e2f..11216f4d5fa 100644 --- a/go/vt/vtgate/grpcvtgateconn/suite_test.go +++ b/go/vt/vtgate/grpcvtgateconn/suite_test.go @@ -32,17 +32,17 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/tb" - "github.com/mdibaiee/vitess/go/vt/callerid" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateservice" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/tb" + "github.com/vitess/vitess/go/vt/callerid" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/vt/vtgate/vtgateservice" ) // fakeVTGateService has the server side of this fake diff --git a/go/vt/vtgate/grpcvtgateservice/server.go b/go/vt/vtgate/grpcvtgateservice/server.go index 3bd64af51b3..85c7102676f 100644 --- a/go/vt/vtgate/grpcvtgateservice/server.go +++ b/go/vt/vtgate/grpcvtgateservice/server.go @@ -25,19 +25,19 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/grpc/peer" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/callinfo" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtgateservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtgateservice" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateservice" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/callinfo" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtgateservicepb "github.com/vitess/vitess/go/vt/proto/vtgateservice" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate" + "github.com/vitess/vitess/go/vt/vtgate/vtgateservice" ) const ( diff --git a/go/vt/vtgate/legacy_scatter_conn_test.go b/go/vt/vtgate/legacy_scatter_conn_test.go index 4acc702a48e..54172be1110 100644 --- a/go/vt/vtgate/legacy_scatter_conn_test.go +++ b/go/vt/vtgate/legacy_scatter_conn_test.go @@ -26,19 +26,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/collations" + + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vterrors" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // This file uses the sandbox_test framework. diff --git a/go/vt/vtgate/logstats/logstats.go b/go/vt/vtgate/logstats/logstats.go index bd7b4a5b7b9..538a1f31d32 100644 --- a/go/vt/vtgate/logstats/logstats.go +++ b/go/vt/vtgate/logstats/logstats.go @@ -24,11 +24,11 @@ import ( "github.com/google/safehtml" - "github.com/mdibaiee/vitess/go/logstats" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/callinfo" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/logstats" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/callinfo" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // LogStats records the stats for a single vtgate query diff --git a/go/vt/vtgate/logstats/logstats_test.go b/go/vt/vtgate/logstats/logstats_test.go index 494448dbad7..5de9e58d7b1 100644 --- a/go/vt/vtgate/logstats/logstats_test.go +++ b/go/vt/vtgate/logstats/logstats_test.go @@ -33,13 +33,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/hack" + "github.com/vitess/vitess/go/hack" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/callinfo" - "github.com/mdibaiee/vitess/go/vt/callinfo/fakecallinfo" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/callinfo" + "github.com/vitess/vitess/go/vt/callinfo/fakecallinfo" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestMain(m *testing.M) { diff --git a/go/vt/vtgate/plan_execute.go b/go/vt/vtgate/plan_execute.go index ee049613485..815299409e3 100644 --- a/go/vt/vtgate/plan_execute.go +++ b/go/vt/vtgate/plan_execute.go @@ -22,16 +22,16 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/logstats" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateservice" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/logstats" + "github.com/vitess/vitess/go/vt/vtgate/vtgateservice" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) type planExec func(ctx context.Context, plan *engine.Plan, vc *vcursorImpl, bindVars map[string]*querypb.BindVariable, startTime time.Time) error diff --git a/go/vt/vtgate/planbuilder/builder.go b/go/vt/vtgate/planbuilder/builder.go index bb880acc267..7d0150e561e 100644 --- a/go/vt/vtgate/planbuilder/builder.go +++ b/go/vt/vtgate/planbuilder/builder.go @@ -21,16 +21,16 @@ import ( "fmt" "sort" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/vschemawrapper" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/vschemawrapper" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) const ( diff --git a/go/vt/vtgate/planbuilder/bypass.go b/go/vt/vtgate/planbuilder/bypass.go index 80415f278bd..37ac09c773b 100644 --- a/go/vt/vtgate/planbuilder/bypass.go +++ b/go/vt/vtgate/planbuilder/bypass.go @@ -17,12 +17,12 @@ limitations under the License. package planbuilder import ( - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func buildPlanForBypass(stmt sqlparser.Statement, _ *sqlparser.ReservedVars, vschema plancontext.VSchema) (*planResult, error) { diff --git a/go/vt/vtgate/planbuilder/call_proc.go b/go/vt/vtgate/planbuilder/call_proc.go index 778aec34b40..3af857d2419 100644 --- a/go/vt/vtgate/planbuilder/call_proc.go +++ b/go/vt/vtgate/planbuilder/call_proc.go @@ -17,10 +17,10 @@ limitations under the License. package planbuilder import ( - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) func buildCallProcPlan(stmt *sqlparser.CallProc, vschema plancontext.VSchema) (*planResult, error) { diff --git a/go/vt/vtgate/planbuilder/collations_test.go b/go/vt/vtgate/planbuilder/collations_test.go index 96c1decdeef..ccdbba34b0e 100644 --- a/go/vt/vtgate/planbuilder/collations_test.go +++ b/go/vt/vtgate/planbuilder/collations_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/test/vschemawrapper" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/test/vschemawrapper" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/engine" ) // collationInTable allows us to set a collation on a column diff --git a/go/vt/vtgate/planbuilder/ddl.go b/go/vt/vtgate/planbuilder/ddl.go index c52bc3b48c0..cd28f299518 100644 --- a/go/vt/vtgate/planbuilder/ddl.go +++ b/go/vt/vtgate/planbuilder/ddl.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" - "github.com/mdibaiee/vitess/go/vt/key" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/key" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // Error messages for CreateView queries diff --git a/go/vt/vtgate/planbuilder/delete.go b/go/vt/vtgate/planbuilder/delete.go index 6a95394bba7..dd135da4d4e 100644 --- a/go/vt/vtgate/planbuilder/delete.go +++ b/go/vt/vtgate/planbuilder/delete.go @@ -17,13 +17,13 @@ limitations under the License. package planbuilder import ( - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/operators" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/operators" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func gen4DeleteStmtPlanner( diff --git a/go/vt/vtgate/planbuilder/expression_converter.go b/go/vt/vtgate/planbuilder/expression_converter.go index 9f66cfdc98b..e0191514eb4 100644 --- a/go/vt/vtgate/planbuilder/expression_converter.go +++ b/go/vt/vtgate/planbuilder/expression_converter.go @@ -20,12 +20,12 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) type expressionConverter struct { diff --git a/go/vt/vtgate/planbuilder/expression_converter_test.go b/go/vt/vtgate/planbuilder/expression_converter_test.go index 3b6f0899bee..f94d5a6e59d 100644 --- a/go/vt/vtgate/planbuilder/expression_converter_test.go +++ b/go/vt/vtgate/planbuilder/expression_converter_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) func e(in ...evalengine.Expr) []evalengine.Expr { diff --git a/go/vt/vtgate/planbuilder/fuzz.go b/go/vt/vtgate/planbuilder/fuzz.go index 0fb046fd138..1d5387ae96a 100644 --- a/go/vt/vtgate/planbuilder/fuzz.go +++ b/go/vt/vtgate/planbuilder/fuzz.go @@ -22,10 +22,10 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/sqltypes" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/sqltypes" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var initter sync.Once diff --git a/go/vt/vtgate/planbuilder/insert.go b/go/vt/vtgate/planbuilder/insert.go index b264b330995..64eff8c79c5 100644 --- a/go/vt/vtgate/planbuilder/insert.go +++ b/go/vt/vtgate/planbuilder/insert.go @@ -17,14 +17,14 @@ limitations under the License. package planbuilder import ( - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/operators" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/operators" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func gen4InsertStmtPlanner(version querypb.ExecuteOptions_PlannerVersion, insStmt *sqlparser.Insert, reservedVars *sqlparser.ReservedVars, vschema plancontext.VSchema) (*planResult, error) { diff --git a/go/vt/vtgate/planbuilder/locktables.go b/go/vt/vtgate/planbuilder/locktables.go index 5a524ac32a6..9b6deee9492 100644 --- a/go/vt/vtgate/planbuilder/locktables.go +++ b/go/vt/vtgate/planbuilder/locktables.go @@ -17,12 +17,12 @@ limitations under the License. package planbuilder import ( - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) // buildLockPlan plans lock tables statement. diff --git a/go/vt/vtgate/planbuilder/migration.go b/go/vt/vtgate/planbuilder/migration.go index ffc6acf6fd2..e91e77689a8 100644 --- a/go/vt/vtgate/planbuilder/migration.go +++ b/go/vt/vtgate/planbuilder/migration.go @@ -20,18 +20,18 @@ import ( "strconv" "time" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" ) func validateThrottleParams(alterMigrationType sqlparser.AlterMigrationType, expireString string, ratioLiteral *sqlparser.Literal) (duration time.Duration, ratio float64, err error) { diff --git a/go/vt/vtgate/planbuilder/operator_transformers.go b/go/vt/vtgate/planbuilder/operator_transformers.go index a77c047402d..81d48eadb1b 100644 --- a/go/vt/vtgate/planbuilder/operator_transformers.go +++ b/go/vt/vtgate/planbuilder/operator_transformers.go @@ -22,19 +22,19 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/sysvars" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/operators" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sysvars" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/operators" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func transformToPrimitive(ctx *plancontext.PlanningContext, op operators.Operator) (engine.Primitive, error) { diff --git a/go/vt/vtgate/planbuilder/operators/SQL_builder.go b/go/vt/vtgate/planbuilder/operators/SQL_builder.go index e116d6eef33..56d64d11190 100644 --- a/go/vt/vtgate/planbuilder/operators/SQL_builder.go +++ b/go/vt/vtgate/planbuilder/operators/SQL_builder.go @@ -21,11 +21,11 @@ import ( "slices" "sort" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/aggregation_pushing.go b/go/vt/vtgate/planbuilder/operators/aggregation_pushing.go index 0f67352bb21..2aae19b2558 100644 --- a/go/vt/vtgate/planbuilder/operators/aggregation_pushing.go +++ b/go/vt/vtgate/planbuilder/operators/aggregation_pushing.go @@ -21,10 +21,10 @@ import ( "fmt" "slices" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) func errDistinctAggrWithMultiExpr(f sqlparser.AggrFunc) { diff --git a/go/vt/vtgate/planbuilder/operators/aggregation_pushing_helper.go b/go/vt/vtgate/planbuilder/operators/aggregation_pushing_helper.go index fc45b4ffbff..0e651a69c6f 100644 --- a/go/vt/vtgate/planbuilder/operators/aggregation_pushing_helper.go +++ b/go/vt/vtgate/planbuilder/operators/aggregation_pushing_helper.go @@ -17,11 +17,11 @@ import ( "fmt" "slices" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/aggregator.go b/go/vt/vtgate/planbuilder/operators/aggregator.go index 2565871076d..bf9b660d69b 100644 --- a/go/vt/vtgate/planbuilder/operators/aggregator.go +++ b/go/vt/vtgate/planbuilder/operators/aggregator.go @@ -21,12 +21,12 @@ import ( "slices" "strings" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/apply_join.go b/go/vt/vtgate/planbuilder/operators/apply_join.go index f4fdc6da0de..37fe678c525 100644 --- a/go/vt/vtgate/planbuilder/operators/apply_join.go +++ b/go/vt/vtgate/planbuilder/operators/apply_join.go @@ -22,10 +22,10 @@ import ( "slices" "strings" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/ast_to_op.go b/go/vt/vtgate/planbuilder/operators/ast_to_op.go index 29d0eefabb1..9956a727613 100644 --- a/go/vt/vtgate/planbuilder/operators/ast_to_op.go +++ b/go/vt/vtgate/planbuilder/operators/ast_to_op.go @@ -19,11 +19,11 @@ package operators import ( "fmt" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) const foreignKeyConstraintValues = "fkc_vals" diff --git a/go/vt/vtgate/planbuilder/operators/comments.go b/go/vt/vtgate/planbuilder/operators/comments.go index 67be8429831..bbec0259b69 100644 --- a/go/vt/vtgate/planbuilder/operators/comments.go +++ b/go/vt/vtgate/planbuilder/operators/comments.go @@ -20,8 +20,8 @@ import ( "slices" "strings" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) // LockAndComment contains any comments or locking directives we want on all queries down from this operator diff --git a/go/vt/vtgate/planbuilder/operators/delete.go b/go/vt/vtgate/planbuilder/operators/delete.go index bfb1e7e242f..673a61b0b6e 100644 --- a/go/vt/vtgate/planbuilder/operators/delete.go +++ b/go/vt/vtgate/planbuilder/operators/delete.go @@ -17,13 +17,13 @@ limitations under the License. package operators import ( - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) type Delete struct { diff --git a/go/vt/vtgate/planbuilder/operators/distinct.go b/go/vt/vtgate/planbuilder/operators/distinct.go index d854267e41d..2902d96c17d 100644 --- a/go/vt/vtgate/planbuilder/operators/distinct.go +++ b/go/vt/vtgate/planbuilder/operators/distinct.go @@ -19,9 +19,9 @@ package operators import ( "slices" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/dml_planning.go b/go/vt/vtgate/planbuilder/operators/dml_planning.go index 51241ebf6a6..f06da1ca163 100644 --- a/go/vt/vtgate/planbuilder/operators/dml_planning.go +++ b/go/vt/vtgate/planbuilder/operators/dml_planning.go @@ -20,10 +20,10 @@ import ( "fmt" "sort" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) type DMLCommon struct { diff --git a/go/vt/vtgate/planbuilder/operators/dml_with_input.go b/go/vt/vtgate/planbuilder/operators/dml_with_input.go index 3ad18e7feda..3df00f9cb64 100644 --- a/go/vt/vtgate/planbuilder/operators/dml_with_input.go +++ b/go/vt/vtgate/planbuilder/operators/dml_with_input.go @@ -19,9 +19,9 @@ package operators import ( "fmt" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) // DMLWithInput is used to represent a DML Operator taking input from a Source Operator diff --git a/go/vt/vtgate/planbuilder/operators/expressions.go b/go/vt/vtgate/planbuilder/operators/expressions.go index 9b824c280d7..eecd53e9de0 100644 --- a/go/vt/vtgate/planbuilder/operators/expressions.go +++ b/go/vt/vtgate/planbuilder/operators/expressions.go @@ -17,9 +17,9 @@ limitations under the License. package operators import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) // breakExpressionInLHSandRHS takes an expression and diff --git a/go/vt/vtgate/planbuilder/operators/filter.go b/go/vt/vtgate/planbuilder/operators/filter.go index b61cf5beda9..57978f1ada9 100644 --- a/go/vt/vtgate/planbuilder/operators/filter.go +++ b/go/vt/vtgate/planbuilder/operators/filter.go @@ -20,12 +20,12 @@ import ( "slices" "strings" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) type Filter struct { diff --git a/go/vt/vtgate/planbuilder/operators/fk_cascade.go b/go/vt/vtgate/planbuilder/operators/fk_cascade.go index 163dcf9b53b..6d2efdfda17 100644 --- a/go/vt/vtgate/planbuilder/operators/fk_cascade.go +++ b/go/vt/vtgate/planbuilder/operators/fk_cascade.go @@ -19,8 +19,8 @@ package operators import ( "slices" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) // FkChild is used to represent a foreign key child table operation diff --git a/go/vt/vtgate/planbuilder/operators/fk_verify.go b/go/vt/vtgate/planbuilder/operators/fk_verify.go index 1a06a6e8ce0..eddd8c51927 100644 --- a/go/vt/vtgate/planbuilder/operators/fk_verify.go +++ b/go/vt/vtgate/planbuilder/operators/fk_verify.go @@ -17,7 +17,7 @@ limitations under the License. package operators import ( - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) // VerifyOp keeps the information about the foreign key verification operation. diff --git a/go/vt/vtgate/planbuilder/operators/fuzz.go b/go/vt/vtgate/planbuilder/operators/fuzz.go index db1052b94da..6c8d69b7b9c 100644 --- a/go/vt/vtgate/planbuilder/operators/fuzz.go +++ b/go/vt/vtgate/planbuilder/operators/fuzz.go @@ -19,8 +19,8 @@ package operators import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) // FuzzAnalyse implements the fuzzer diff --git a/go/vt/vtgate/planbuilder/operators/hash_join.go b/go/vt/vtgate/planbuilder/operators/hash_join.go index 485efa07da6..dba44b0eebe 100644 --- a/go/vt/vtgate/planbuilder/operators/hash_join.go +++ b/go/vt/vtgate/planbuilder/operators/hash_join.go @@ -21,12 +21,12 @@ import ( "slices" "strings" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/hash_join_test.go b/go/vt/vtgate/planbuilder/operators/hash_join_test.go index c5a780cd1fd..ee3efd89dc6 100644 --- a/go/vt/vtgate/planbuilder/operators/hash_join_test.go +++ b/go/vt/vtgate/planbuilder/operators/hash_join_test.go @@ -22,12 +22,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/vschemawrapper" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/test/vschemawrapper" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func TestJoinPredicates(t *testing.T) { diff --git a/go/vt/vtgate/planbuilder/operators/helpers.go b/go/vt/vtgate/planbuilder/operators/helpers.go index ff4b736c591..fc1bac1d12d 100644 --- a/go/vt/vtgate/planbuilder/operators/helpers.go +++ b/go/vt/vtgate/planbuilder/operators/helpers.go @@ -20,10 +20,10 @@ import ( "fmt" "sort" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) type compactable interface { diff --git a/go/vt/vtgate/planbuilder/operators/horizon.go b/go/vt/vtgate/planbuilder/operators/horizon.go index 2ffc6279038..5fbb3cec718 100644 --- a/go/vt/vtgate/planbuilder/operators/horizon.go +++ b/go/vt/vtgate/planbuilder/operators/horizon.go @@ -20,10 +20,10 @@ import ( "errors" "slices" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) // Horizon is an operator that allows us to postpone planning things like SELECT/GROUP BY/ORDER BY/LIMIT until later. diff --git a/go/vt/vtgate/planbuilder/operators/horizon_expanding.go b/go/vt/vtgate/planbuilder/operators/horizon_expanding.go index 58422373c0b..27584830d50 100644 --- a/go/vt/vtgate/planbuilder/operators/horizon_expanding.go +++ b/go/vt/vtgate/planbuilder/operators/horizon_expanding.go @@ -20,11 +20,11 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) func expandHorizon(ctx *plancontext.PlanningContext, horizon *Horizon) (Operator, *ApplyResult) { diff --git a/go/vt/vtgate/planbuilder/operators/info_schema_planning.go b/go/vt/vtgate/planbuilder/operators/info_schema_planning.go index dc24d44c2ea..a74a4e75a59 100644 --- a/go/vt/vtgate/planbuilder/operators/info_schema_planning.go +++ b/go/vt/vtgate/planbuilder/operators/info_schema_planning.go @@ -21,14 +21,14 @@ import ( "slices" "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // InfoSchemaRouting used for information_schema queries. diff --git a/go/vt/vtgate/planbuilder/operators/insert.go b/go/vt/vtgate/planbuilder/operators/insert.go index d9d248fd9ce..23d795f9faf 100644 --- a/go/vt/vtgate/planbuilder/operators/insert.go +++ b/go/vt/vtgate/planbuilder/operators/insert.go @@ -19,13 +19,13 @@ package operators import ( "strconv" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // Insert represents an insert operation on a table. diff --git a/go/vt/vtgate/planbuilder/operators/insert_selection.go b/go/vt/vtgate/planbuilder/operators/insert_selection.go index c6c01ba81ca..561c9d45fef 100644 --- a/go/vt/vtgate/planbuilder/operators/insert_selection.go +++ b/go/vt/vtgate/planbuilder/operators/insert_selection.go @@ -17,7 +17,7 @@ limitations under the License. package operators import ( - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) // InsertSelection operator represents an INSERT into SELECT FROM query. diff --git a/go/vt/vtgate/planbuilder/operators/join.go b/go/vt/vtgate/planbuilder/operators/join.go index 77ac9ff95b0..09739eb74f4 100644 --- a/go/vt/vtgate/planbuilder/operators/join.go +++ b/go/vt/vtgate/planbuilder/operators/join.go @@ -17,9 +17,9 @@ limitations under the License. package operators import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) // Join represents a join. If we have a predicate, this is an inner join. If no predicate exists, it is a cross join diff --git a/go/vt/vtgate/planbuilder/operators/join_merging.go b/go/vt/vtgate/planbuilder/operators/join_merging.go index a82023f97aa..f7fa9840e46 100644 --- a/go/vt/vtgate/planbuilder/operators/join_merging.go +++ b/go/vt/vtgate/planbuilder/operators/join_merging.go @@ -20,8 +20,8 @@ import ( "fmt" "reflect" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) // mergeJoinInputs checks whether two operators can be merged into a single one. diff --git a/go/vt/vtgate/planbuilder/operators/joins.go b/go/vt/vtgate/planbuilder/operators/joins.go index 6f3e5c0449b..97e9e255d11 100644 --- a/go/vt/vtgate/planbuilder/operators/joins.go +++ b/go/vt/vtgate/planbuilder/operators/joins.go @@ -17,9 +17,9 @@ limitations under the License. package operators import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) type JoinOp interface { diff --git a/go/vt/vtgate/planbuilder/operators/limit.go b/go/vt/vtgate/planbuilder/operators/limit.go index 4cb411e2d46..7d0407fd512 100644 --- a/go/vt/vtgate/planbuilder/operators/limit.go +++ b/go/vt/vtgate/planbuilder/operators/limit.go @@ -17,8 +17,8 @@ limitations under the License. package operators import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) type Limit struct { diff --git a/go/vt/vtgate/planbuilder/operators/misc_routing.go b/go/vt/vtgate/planbuilder/operators/misc_routing.go index 9f9166c317c..9d1aa4b8c84 100644 --- a/go/vt/vtgate/planbuilder/operators/misc_routing.go +++ b/go/vt/vtgate/planbuilder/operators/misc_routing.go @@ -17,11 +17,11 @@ limitations under the License. package operators import ( - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/offset_planning.go b/go/vt/vtgate/planbuilder/operators/offset_planning.go index 007e35d68b0..249f29b3a56 100644 --- a/go/vt/vtgate/planbuilder/operators/offset_planning.go +++ b/go/vt/vtgate/planbuilder/operators/offset_planning.go @@ -19,11 +19,11 @@ package operators import ( "fmt" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) // planOffsets will walk the tree top down, adding offset information to columns in the tree for use in further optimization, diff --git a/go/vt/vtgate/planbuilder/operators/operator.go b/go/vt/vtgate/planbuilder/operators/operator.go index bf335f4e4f4..1501a29a531 100644 --- a/go/vt/vtgate/planbuilder/operators/operator.go +++ b/go/vt/vtgate/planbuilder/operators/operator.go @@ -36,8 +36,8 @@ The operators go through a few phases while planning: package operators import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/ordering.go b/go/vt/vtgate/planbuilder/operators/ordering.go index af6c2c52527..2a6d59b7db3 100644 --- a/go/vt/vtgate/planbuilder/operators/ordering.go +++ b/go/vt/vtgate/planbuilder/operators/ordering.go @@ -20,9 +20,9 @@ import ( "slices" "strings" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) type Ordering struct { diff --git a/go/vt/vtgate/planbuilder/operators/phases.go b/go/vt/vtgate/planbuilder/operators/phases.go index 68f8736baf7..9aee9728098 100644 --- a/go/vt/vtgate/planbuilder/operators/phases.go +++ b/go/vt/vtgate/planbuilder/operators/phases.go @@ -19,12 +19,12 @@ package operators import ( "io" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/plan_query.go b/go/vt/vtgate/planbuilder/operators/plan_query.go index a91934cb781..a5452a571ff 100644 --- a/go/vt/vtgate/planbuilder/operators/plan_query.go +++ b/go/vt/vtgate/planbuilder/operators/plan_query.go @@ -39,10 +39,10 @@ import ( "fmt" "runtime" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/projection.go b/go/vt/vtgate/planbuilder/operators/projection.go index 04ab77dd57e..d25a9281590 100644 --- a/go/vt/vtgate/planbuilder/operators/projection.go +++ b/go/vt/vtgate/planbuilder/operators/projection.go @@ -21,12 +21,12 @@ import ( "slices" "strings" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) // Projection is used when we need to evaluate expressions on the vtgate diff --git a/go/vt/vtgate/planbuilder/operators/projection_pushing.go b/go/vt/vtgate/planbuilder/operators/projection_pushing.go index 12e3e0fca5b..9ec933d7f0c 100644 --- a/go/vt/vtgate/planbuilder/operators/projection_pushing.go +++ b/go/vt/vtgate/planbuilder/operators/projection_pushing.go @@ -20,11 +20,11 @@ import ( "fmt" "slices" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/query_planning.go b/go/vt/vtgate/planbuilder/operators/query_planning.go index 8e11653ff8d..473ca477885 100644 --- a/go/vt/vtgate/planbuilder/operators/query_planning.go +++ b/go/vt/vtgate/planbuilder/operators/query_planning.go @@ -21,12 +21,12 @@ import ( "io" "strconv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) func planQuery(ctx *plancontext.PlanningContext, root Operator) Operator { diff --git a/go/vt/vtgate/planbuilder/operators/query_planning_test.go b/go/vt/vtgate/planbuilder/operators/query_planning_test.go index d82920a3bcf..c4009664e5c 100644 --- a/go/vt/vtgate/planbuilder/operators/query_planning_test.go +++ b/go/vt/vtgate/planbuilder/operators/query_planning_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) func TestMergeOffsetExpressions(t *testing.T) { diff --git a/go/vt/vtgate/planbuilder/operators/querygraph.go b/go/vt/vtgate/planbuilder/operators/querygraph.go index 8d9d312e5c7..57161863563 100644 --- a/go/vt/vtgate/planbuilder/operators/querygraph.go +++ b/go/vt/vtgate/planbuilder/operators/querygraph.go @@ -19,9 +19,9 @@ package operators import ( "strings" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/queryprojection.go b/go/vt/vtgate/planbuilder/operators/queryprojection.go index 8f94ac24fc1..71b609ab899 100644 --- a/go/vt/vtgate/planbuilder/operators/queryprojection.go +++ b/go/vt/vtgate/planbuilder/operators/queryprojection.go @@ -24,11 +24,11 @@ import ( "sort" "strings" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/rewriters.go b/go/vt/vtgate/planbuilder/operators/rewriters.go index 62a2db02faf..3826b1f9634 100644 --- a/go/vt/vtgate/planbuilder/operators/rewriters.go +++ b/go/vt/vtgate/planbuilder/operators/rewriters.go @@ -20,8 +20,8 @@ import ( "fmt" "slices" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/route.go b/go/vt/vtgate/planbuilder/operators/route.go index afdb7da4efc..ef9d6abae41 100644 --- a/go/vt/vtgate/planbuilder/operators/route.go +++ b/go/vt/vtgate/planbuilder/operators/route.go @@ -19,18 +19,18 @@ package operators import ( "fmt" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/route_planning.go b/go/vt/vtgate/planbuilder/operators/route_planning.go index 96230b884db..f9e515e5c41 100644 --- a/go/vt/vtgate/planbuilder/operators/route_planning.go +++ b/go/vt/vtgate/planbuilder/operators/route_planning.go @@ -20,14 +20,14 @@ import ( "bytes" "io" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/sequential.go b/go/vt/vtgate/planbuilder/operators/sequential.go index 571cb174432..fb13e150ece 100644 --- a/go/vt/vtgate/planbuilder/operators/sequential.go +++ b/go/vt/vtgate/planbuilder/operators/sequential.go @@ -17,7 +17,7 @@ limitations under the License. package operators import ( - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) type Sequential struct { diff --git a/go/vt/vtgate/planbuilder/operators/sharded_routing.go b/go/vt/vtgate/planbuilder/operators/sharded_routing.go index 8ad6f537f08..990ff2349a1 100644 --- a/go/vt/vtgate/planbuilder/operators/sharded_routing.go +++ b/go/vt/vtgate/planbuilder/operators/sharded_routing.go @@ -20,15 +20,15 @@ import ( "fmt" "slices" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // ShardedRouting is what we use for all tables that exist in a sharded keyspace diff --git a/go/vt/vtgate/planbuilder/operators/subquery.go b/go/vt/vtgate/planbuilder/operators/subquery.go index a0c22404c08..4eb6efca804 100644 --- a/go/vt/vtgate/planbuilder/operators/subquery.go +++ b/go/vt/vtgate/planbuilder/operators/subquery.go @@ -21,12 +21,12 @@ import ( "maps" "slices" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) // SubQuery represents a subquery used for filtering rows in an diff --git a/go/vt/vtgate/planbuilder/operators/subquery_builder.go b/go/vt/vtgate/planbuilder/operators/subquery_builder.go index 1713da392f8..cc3ac585416 100644 --- a/go/vt/vtgate/planbuilder/operators/subquery_builder.go +++ b/go/vt/vtgate/planbuilder/operators/subquery_builder.go @@ -17,10 +17,10 @@ limitations under the License. package operators import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) type SubQueryBuilder struct { diff --git a/go/vt/vtgate/planbuilder/operators/subquery_container.go b/go/vt/vtgate/planbuilder/operators/subquery_container.go index 45c82b2d29d..8f506bd18a1 100644 --- a/go/vt/vtgate/planbuilder/operators/subquery_container.go +++ b/go/vt/vtgate/planbuilder/operators/subquery_container.go @@ -17,8 +17,8 @@ limitations under the License. package operators import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/subquery_planning.go b/go/vt/vtgate/planbuilder/operators/subquery_planning.go index e725fbc353e..8d7e58ed910 100644 --- a/go/vt/vtgate/planbuilder/operators/subquery_planning.go +++ b/go/vt/vtgate/planbuilder/operators/subquery_planning.go @@ -22,12 +22,12 @@ import ( "golang.org/x/exp/slices" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) func isMergeable(ctx *plancontext.PlanningContext, query sqlparser.SelectStatement, op Operator) bool { diff --git a/go/vt/vtgate/planbuilder/operators/table.go b/go/vt/vtgate/planbuilder/operators/table.go index 3353fe62d30..4ffe21694c7 100644 --- a/go/vt/vtgate/planbuilder/operators/table.go +++ b/go/vt/vtgate/planbuilder/operators/table.go @@ -19,12 +19,12 @@ package operators import ( "fmt" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/union.go b/go/vt/vtgate/planbuilder/operators/union.go index 82a5710e39f..89a8a32ee52 100644 --- a/go/vt/vtgate/planbuilder/operators/union.go +++ b/go/vt/vtgate/planbuilder/operators/union.go @@ -20,10 +20,10 @@ import ( "fmt" "slices" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) type Union struct { diff --git a/go/vt/vtgate/planbuilder/operators/union_merging.go b/go/vt/vtgate/planbuilder/operators/union_merging.go index 9fb72a73ac3..8a5aa8b6ee5 100644 --- a/go/vt/vtgate/planbuilder/operators/union_merging.go +++ b/go/vt/vtgate/planbuilder/operators/union_merging.go @@ -17,10 +17,10 @@ limitations under the License. package operators import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) // mergeUnionInputInAnyOrder merges sources the sources of the union in any order diff --git a/go/vt/vtgate/planbuilder/operators/update.go b/go/vt/vtgate/planbuilder/operators/update.go index 8e6bf5ad6b3..3f638f65e02 100644 --- a/go/vt/vtgate/planbuilder/operators/update.go +++ b/go/vt/vtgate/planbuilder/operators/update.go @@ -21,17 +21,17 @@ import ( "maps" "slices" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/sysvars" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sysvars" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) type ( diff --git a/go/vt/vtgate/planbuilder/operators/update_test.go b/go/vt/vtgate/planbuilder/operators/update_test.go index 2b11b335dce..f1285793c94 100644 --- a/go/vt/vtgate/planbuilder/operators/update_test.go +++ b/go/vt/vtgate/planbuilder/operators/update_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/require" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // TestGetCastTypeForColumn tests that we get the correct string value to use in a CAST function based on the type of the column. diff --git a/go/vt/vtgate/planbuilder/operators/upsert.go b/go/vt/vtgate/planbuilder/operators/upsert.go index 6333b4d3250..6ce44dcc658 100644 --- a/go/vt/vtgate/planbuilder/operators/upsert.go +++ b/go/vt/vtgate/planbuilder/operators/upsert.go @@ -17,10 +17,10 @@ limitations under the License. package operators import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var _ Operator = (*Upsert)(nil) diff --git a/go/vt/vtgate/planbuilder/operators/utils_test.go b/go/vt/vtgate/planbuilder/operators/utils_test.go index 452c01153bc..2bd36690b18 100644 --- a/go/vt/vtgate/planbuilder/operators/utils_test.go +++ b/go/vt/vtgate/planbuilder/operators/utils_test.go @@ -19,9 +19,9 @@ package operators import ( "slices" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) type fakeOp struct { diff --git a/go/vt/vtgate/planbuilder/operators/vindex.go b/go/vt/vtgate/planbuilder/operators/vindex.go index fe12df96762..ded99db17ad 100644 --- a/go/vt/vtgate/planbuilder/operators/vindex.go +++ b/go/vt/vtgate/planbuilder/operators/vindex.go @@ -17,13 +17,13 @@ limitations under the License. package operators import ( - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) type ( diff --git a/go/vt/vtgate/planbuilder/other_read.go b/go/vt/vtgate/planbuilder/other_read.go index b5c6029258a..94096b494e7 100644 --- a/go/vt/vtgate/planbuilder/other_read.go +++ b/go/vt/vtgate/planbuilder/other_read.go @@ -17,9 +17,9 @@ limitations under the License. package planbuilder import ( - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) func buildOtherReadAndAdmin(sql string, vschema plancontext.VSchema) (*planResult, error) { diff --git a/go/vt/vtgate/planbuilder/plan_test.go b/go/vt/vtgate/planbuilder/plan_test.go index e84573d2978..795295b3278 100644 --- a/go/vt/vtgate/planbuilder/plan_test.go +++ b/go/vt/vtgate/planbuilder/plan_test.go @@ -32,20 +32,20 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/test/vschemawrapper" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/sidecardb" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/operators" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/vschemawrapper" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/sidecardb" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/operators" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var expectedDir = "testdata/expected" diff --git a/go/vt/vtgate/planbuilder/plan_test_vindex.go b/go/vt/vtgate/planbuilder/plan_test_vindex.go index 4c0f0e6ee88..ccd2f8a0b1e 100644 --- a/go/vt/vtgate/planbuilder/plan_test_vindex.go +++ b/go/vt/vtgate/planbuilder/plan_test_vindex.go @@ -20,10 +20,10 @@ import ( "context" "strconv" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // hashIndex is a functional, unique Vindex. diff --git a/go/vt/vtgate/planbuilder/plancontext/planning_context.go b/go/vt/vtgate/planbuilder/plancontext/planning_context.go index 133b184a5f6..c0ef3dc59f9 100644 --- a/go/vt/vtgate/planbuilder/plancontext/planning_context.go +++ b/go/vt/vtgate/planbuilder/plancontext/planning_context.go @@ -17,11 +17,11 @@ limitations under the License. package plancontext import ( - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) type PlanningContext struct { diff --git a/go/vt/vtgate/planbuilder/plancontext/planning_context_test.go b/go/vt/vtgate/planbuilder/plancontext/planning_context_test.go index 4b340fbe01d..16d7338201f 100644 --- a/go/vt/vtgate/planbuilder/plancontext/planning_context_test.go +++ b/go/vt/vtgate/planbuilder/plancontext/planning_context_test.go @@ -22,12 +22,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) func TestOuterTableNullability(t *testing.T) { diff --git a/go/vt/vtgate/planbuilder/plancontext/vschema.go b/go/vt/vtgate/planbuilder/plancontext/vschema.go index 82823360045..7ffbe54ccfa 100644 --- a/go/vt/vtgate/planbuilder/plancontext/vschema.go +++ b/go/vt/vtgate/planbuilder/plancontext/vschema.go @@ -4,18 +4,18 @@ import ( "context" "strings" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/engine" + + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // PlannerVersion is an alias here to make the code more readable diff --git a/go/vt/vtgate/planbuilder/planner.go b/go/vt/vtgate/planbuilder/planner.go index f6f1e4a6f33..646f139010d 100644 --- a/go/vt/vtgate/planbuilder/planner.go +++ b/go/vt/vtgate/planbuilder/planner.go @@ -20,11 +20,11 @@ import ( "fmt" "strconv" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) func gen4Planner(query string, plannerVersion querypb.ExecuteOptions_PlannerVersion) stmtPlanner { diff --git a/go/vt/vtgate/planbuilder/planner_test.go b/go/vt/vtgate/planbuilder/planner_test.go index 2c338f763d1..eaf128fb339 100644 --- a/go/vt/vtgate/planbuilder/planner_test.go +++ b/go/vt/vtgate/planbuilder/planner_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func TestBindingSubquery(t *testing.T) { diff --git a/go/vt/vtgate/planbuilder/predicate_rewrite_test.go b/go/vt/vtgate/planbuilder/predicate_rewrite_test.go index 0826b7cfd93..07b32bb3c3e 100644 --- a/go/vt/vtgate/planbuilder/predicate_rewrite_test.go +++ b/go/vt/vtgate/planbuilder/predicate_rewrite_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) type testCase struct { diff --git a/go/vt/vtgate/planbuilder/prepared_statement.go b/go/vt/vtgate/planbuilder/prepared_statement.go index 8c2d7192dd1..a2e84d619b9 100644 --- a/go/vt/vtgate/planbuilder/prepared_statement.go +++ b/go/vt/vtgate/planbuilder/prepared_statement.go @@ -21,12 +21,12 @@ import ( "regexp" "strings" - "github.com/mdibaiee/vitess/go/sqltypes" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/sqltypes" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) // regexParams checks that argument names are in the form v1, v2, v3... diff --git a/go/vt/vtgate/planbuilder/rewrite.go b/go/vt/vtgate/planbuilder/rewrite.go index 2b0a070d959..214ea562f83 100644 --- a/go/vt/vtgate/planbuilder/rewrite.go +++ b/go/vt/vtgate/planbuilder/rewrite.go @@ -17,9 +17,9 @@ limitations under the License. package planbuilder import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/operators" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/operators" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) type rewriter struct { diff --git a/go/vt/vtgate/planbuilder/rewrite_test.go b/go/vt/vtgate/planbuilder/rewrite_test.go index 0af7ee0df0c..ad1aa46b3c4 100644 --- a/go/vt/vtgate/planbuilder/rewrite_test.go +++ b/go/vt/vtgate/planbuilder/rewrite_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) func TestHavingRewrite(t *testing.T) { diff --git a/go/vt/vtgate/planbuilder/route.go b/go/vt/vtgate/planbuilder/route.go index d9d20b9ca5a..085576684eb 100644 --- a/go/vt/vtgate/planbuilder/route.go +++ b/go/vt/vtgate/planbuilder/route.go @@ -17,12 +17,12 @@ limitations under the License. package planbuilder import ( - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // WireupRoute returns an engine primitive for the given route. diff --git a/go/vt/vtgate/planbuilder/select.go b/go/vt/vtgate/planbuilder/select.go index 8b99bf85be1..94d0dbac03c 100644 --- a/go/vt/vtgate/planbuilder/select.go +++ b/go/vt/vtgate/planbuilder/select.go @@ -19,15 +19,15 @@ package planbuilder import ( "fmt" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/operators" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/operators" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) func gen4SelectStmtPlanner( diff --git a/go/vt/vtgate/planbuilder/set.go b/go/vt/vtgate/planbuilder/set.go index 003093ac157..5edccfbb233 100644 --- a/go/vt/vtgate/planbuilder/set.go +++ b/go/vt/vtgate/planbuilder/set.go @@ -21,14 +21,14 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/sysvars" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sysvars" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) type ( diff --git a/go/vt/vtgate/planbuilder/show.go b/go/vt/vtgate/planbuilder/show.go index 3590f4557bd..5669ed035f4 100644 --- a/go/vt/vtgate/planbuilder/show.go +++ b/go/vt/vtgate/planbuilder/show.go @@ -24,19 +24,19 @@ import ( "strings" "sync" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - popcode "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + popcode "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) const ( diff --git a/go/vt/vtgate/planbuilder/show_test.go b/go/vt/vtgate/planbuilder/show_test.go index bcba3c1d912..15cfe3760f9 100644 --- a/go/vt/vtgate/planbuilder/show_test.go +++ b/go/vt/vtgate/planbuilder/show_test.go @@ -23,12 +23,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/vschemawrapper" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/vschemawrapper" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func TestBuildDBPlan(t *testing.T) { diff --git a/go/vt/vtgate/planbuilder/simplifier_test.go b/go/vt/vtgate/planbuilder/simplifier_test.go index d151dabfdd5..f6661468fbb 100644 --- a/go/vt/vtgate/planbuilder/simplifier_test.go +++ b/go/vt/vtgate/planbuilder/simplifier_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/vschemawrapper" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/simplifier" + "github.com/vitess/vitess/go/test/vschemawrapper" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/simplifier" ) // TestSimplifyBuggyQuery should be used to whenever we get a planner bug reported diff --git a/go/vt/vtgate/planbuilder/single_sharded_shortcut.go b/go/vt/vtgate/planbuilder/single_sharded_shortcut.go index c50fafc9d0e..e086ca4e124 100644 --- a/go/vt/vtgate/planbuilder/single_sharded_shortcut.go +++ b/go/vt/vtgate/planbuilder/single_sharded_shortcut.go @@ -20,12 +20,12 @@ import ( "sort" "strings" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/operators" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/operators" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func selectUnshardedShortcut(ctx *plancontext.PlanningContext, stmt sqlparser.SelectStatement, ks *vindexes.Keyspace) (engine.Primitive, []string, error) { diff --git a/go/vt/vtgate/planbuilder/stream.go b/go/vt/vtgate/planbuilder/stream.go index 1ed134f06fb..726e6926c92 100644 --- a/go/vt/vtgate/planbuilder/stream.go +++ b/go/vt/vtgate/planbuilder/stream.go @@ -17,12 +17,12 @@ limitations under the License. package planbuilder import ( - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) func buildStreamPlan(stmt *sqlparser.Stream, vschema plancontext.VSchema) (*planResult, error) { diff --git a/go/vt/vtgate/planbuilder/system_variables.go b/go/vt/vtgate/planbuilder/system_variables.go index 6d0b8604f78..0940e96cdb7 100644 --- a/go/vt/vtgate/planbuilder/system_variables.go +++ b/go/vt/vtgate/planbuilder/system_variables.go @@ -20,11 +20,11 @@ import ( "fmt" "sync" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/sysvars" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sysvars" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) type sysvarPlanCache struct { diff --git a/go/vt/vtgate/planbuilder/throttler.go b/go/vt/vtgate/planbuilder/throttler.go index ffcad5c5e0c..a62aa209f1a 100644 --- a/go/vt/vtgate/planbuilder/throttler.go +++ b/go/vt/vtgate/planbuilder/throttler.go @@ -17,11 +17,11 @@ limitations under the License. package planbuilder import ( - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) func buildShowThrottledAppsPlan(query string, vschema plancontext.VSchema) (*planResult, error) { diff --git a/go/vt/vtgate/planbuilder/update.go b/go/vt/vtgate/planbuilder/update.go index ff2bc7ddec4..c10377d4709 100644 --- a/go/vt/vtgate/planbuilder/update.go +++ b/go/vt/vtgate/planbuilder/update.go @@ -17,13 +17,13 @@ limitations under the License. package planbuilder import ( - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/operators" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/operators" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func gen4UpdateStmtPlanner( diff --git a/go/vt/vtgate/planbuilder/use.go b/go/vt/vtgate/planbuilder/use.go index 1490edcf59f..1361affc66b 100644 --- a/go/vt/vtgate/planbuilder/use.go +++ b/go/vt/vtgate/planbuilder/use.go @@ -17,8 +17,8 @@ limitations under the License. package planbuilder import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/engine" ) func buildUsePlan(stmt *sqlparser.Use) (*planResult, error) { diff --git a/go/vt/vtgate/planbuilder/vexplain.go b/go/vt/vtgate/planbuilder/vexplain.go index 4607a3c4ed0..ab6e85e7acb 100644 --- a/go/vt/vtgate/planbuilder/vexplain.go +++ b/go/vt/vtgate/planbuilder/vexplain.go @@ -20,16 +20,16 @@ import ( "context" "encoding/json" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/operators" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/operators" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func buildVExplainPlan(ctx context.Context, vexplainStmt *sqlparser.VExplainStmt, reservedVars *sqlparser.ReservedVars, vschema plancontext.VSchema, enableOnlineDDL, enableDirectDDL bool) (*planResult, error) { diff --git a/go/vt/vtgate/planbuilder/vindex_func.go b/go/vt/vtgate/planbuilder/vindex_func.go index ee7778f3de5..42a153bd2f3 100644 --- a/go/vt/vtgate/planbuilder/vindex_func.go +++ b/go/vt/vtgate/planbuilder/vindex_func.go @@ -19,11 +19,11 @@ package planbuilder import ( "fmt" - "github.com/mdibaiee/vitess/go/mysql/collations" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/mysql/collations" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" ) // SupplyProjection pushes the given aliased expression into the fields and cols slices of the diff --git a/go/vt/vtgate/planbuilder/vstream.go b/go/vt/vtgate/planbuilder/vstream.go index 694f7d25c0b..ec8fec6f567 100644 --- a/go/vt/vtgate/planbuilder/vstream.go +++ b/go/vt/vtgate/planbuilder/vstream.go @@ -20,12 +20,12 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" ) const defaultLimit = 100 diff --git a/go/vt/vtgate/plugin_mysql_server.go b/go/vt/vtgate/plugin_mysql_server.go index 1aaa72f8116..95bd78b8726 100644 --- a/go/vt/vtgate/plugin_mysql_server.go +++ b/go/vt/vtgate/plugin_mysql_server.go @@ -32,22 +32,22 @@ import ( "github.com/google/uuid" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/callinfo" - "github.com/mdibaiee/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttls" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/callinfo" + "github.com/vitess/vitess/go/vt/log" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttls" ) var ( diff --git a/go/vt/vtgate/plugin_mysql_server_test.go b/go/vt/vtgate/plugin_mysql_server_test.go index 2d19c0899e0..1465ba51c5f 100644 --- a/go/vt/vtgate/plugin_mysql_server_test.go +++ b/go/vt/vtgate/plugin_mysql_server_test.go @@ -30,14 +30,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/trace" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/tlstest" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/trace" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/tlstest" + "github.com/vitess/vitess/go/vt/vtenv" ) type testHandler struct { diff --git a/go/vt/vtgate/plugin_mysql_server_unix.go b/go/vt/vtgate/plugin_mysql_server_unix.go index 728780c2eeb..9e7a29d7dd3 100644 --- a/go/vt/vtgate/plugin_mysql_server_unix.go +++ b/go/vt/vtgate/plugin_mysql_server_unix.go @@ -21,7 +21,7 @@ package vtgate import ( "syscall" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" ) func setupUnixSocket(srv *mysqlServer, authServer mysql.AuthServer, path string) error { diff --git a/go/vt/vtgate/plugin_mysql_server_windows.go b/go/vt/vtgate/plugin_mysql_server_windows.go index 20c404beb96..5babd6d24a8 100644 --- a/go/vt/vtgate/plugin_mysql_server_windows.go +++ b/go/vt/vtgate/plugin_mysql_server_windows.go @@ -21,7 +21,7 @@ package vtgate import ( "errors" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" ) func setupUnixSocket(srv *mysqlServer, authServer mysql.AuthServer, path string) error { diff --git a/go/vt/vtgate/querylog.go b/go/vt/vtgate/querylog.go index b88cf8d7263..e6e2ebb3079 100644 --- a/go/vt/vtgate/querylog.go +++ b/go/vt/vtgate/querylog.go @@ -19,9 +19,9 @@ package vtgate import ( "net/http" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/logstats" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtgate/logstats" ) var ( diff --git a/go/vt/vtgate/querylogz.go b/go/vt/vtgate/querylogz.go index eddffea66b4..f40b6e35e9b 100644 --- a/go/vt/vtgate/querylogz.go +++ b/go/vt/vtgate/querylogz.go @@ -23,12 +23,12 @@ import ( "text/template" "time" - "github.com/mdibaiee/vitess/go/vt/vtgate/logstats" + "github.com/vitess/vitess/go/vt/vtgate/logstats" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logz" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logz" + "github.com/vitess/vitess/go/vt/sqlparser" ) var ( diff --git a/go/vt/vtgate/querylogz_test.go b/go/vt/vtgate/querylogz_test.go index 93deaa8875c..7436765590a 100644 --- a/go/vt/vtgate/querylogz_test.go +++ b/go/vt/vtgate/querylogz_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/logstats" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/logstats" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/callerid" ) func TestQuerylogzHandlerFormatting(t *testing.T) { diff --git a/go/vt/vtgate/queryz.go b/go/vt/vtgate/queryz.go index 5b5005ef58e..9b02914f0c1 100644 --- a/go/vt/vtgate/queryz.go +++ b/go/vt/vtgate/queryz.go @@ -24,10 +24,10 @@ import ( "github.com/google/safehtml/template" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logz" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logz" + "github.com/vitess/vitess/go/vt/vtgate/engine" ) var ( diff --git a/go/vt/vtgate/queryz_test.go b/go/vt/vtgate/queryz_test.go index 7d2fa24b892..b72db029e5e 100644 --- a/go/vt/vtgate/queryz_test.go +++ b/go/vt/vtgate/queryz_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/require" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vtgate/engine" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestQueryzHandler(t *testing.T) { diff --git a/go/vt/vtgate/resolver.go b/go/vt/vtgate/resolver.go index 75abadf8848..ce11726e7fa 100644 --- a/go/vt/vtgate/resolver.go +++ b/go/vt/vtgate/resolver.go @@ -19,10 +19,10 @@ package vtgate import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/srvtopo" ) // Resolver is the layer to resolve KeyspaceIds and KeyRanges diff --git a/go/vt/vtgate/safe_session.go b/go/vt/vtgate/safe_session.go index 05166ba9b91..abb88a8e6bc 100644 --- a/go/vt/vtgate/safe_session.go +++ b/go/vt/vtgate/safe_session.go @@ -25,18 +25,18 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/mysql/datetime" - - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/sysvars" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/datetime" + + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/sysvars" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) type ( diff --git a/go/vt/vtgate/safe_session_test.go b/go/vt/vtgate/safe_session_test.go index 49bd134f9a4..5cd6cf70a23 100644 --- a/go/vt/vtgate/safe_session_test.go +++ b/go/vt/vtgate/safe_session_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) func TestFailToMultiShardWhenSetToSingleDb(t *testing.T) { diff --git a/go/vt/vtgate/sandbox_test.go b/go/vt/vtgate/sandbox_test.go index c06ebf5f071..dba5edc9c76 100644 --- a/go/vt/vtgate/sandbox_test.go +++ b/go/vt/vtgate/sandbox_test.go @@ -23,19 +23,19 @@ import ( "strconv" "sync" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/sandboxconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconntest" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/sandboxconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletconntest" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) // sandbox_test.go provides a sandbox for unit testing VTGate. diff --git a/go/vt/vtgate/scatter_conn.go b/go/vt/vtgate/scatter_conn.go index fe62c0ad9f4..be3189f5d42 100644 --- a/go/vt/vtgate/scatter_conn.go +++ b/go/vt/vtgate/scatter_conn.go @@ -24,26 +24,26 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/vt/sqlparser" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // ScatterConn is used for executing queries across diff --git a/go/vt/vtgate/scatter_conn_test.go b/go/vt/vtgate/scatter_conn_test.go index 9a744727bf9..98e7fbae3be 100644 --- a/go/vt/vtgate/scatter_conn_test.go +++ b/go/vt/vtgate/scatter_conn_test.go @@ -20,26 +20,26 @@ import ( "fmt" "testing" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/sqlerror" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/discovery" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/discovery" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vterrors" ) // This file uses the sandbox_test framework. diff --git a/go/vt/vtgate/schema/tracker.go b/go/vt/vtgate/schema/tracker.go index 6e7f20ef87f..d5120c34084 100644 --- a/go/vt/vtgate/schema/tracker.go +++ b/go/vt/vtgate/schema/tracker.go @@ -24,13 +24,13 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/ptr" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/ptr" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" ) type ( diff --git a/go/vt/vtgate/schema/tracker_test.go b/go/vt/vtgate/schema/tracker_test.go index b8af7fb4f89..e1ad89c0709 100644 --- a/go/vt/vtgate/schema/tracker_test.go +++ b/go/vt/vtgate/schema/tracker_test.go @@ -26,18 +26,18 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/sidecardb" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/sandboxconn" + "github.com/vitess/vitess/go/sqltypes" + + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/sidecardb" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/sandboxconn" ) var ( diff --git a/go/vt/vtgate/schema/update_controller.go b/go/vt/vtgate/schema/update_controller.go index 2abeeabc949..eac37c22f7a 100644 --- a/go/vt/vtgate/schema/update_controller.go +++ b/go/vt/vtgate/schema/update_controller.go @@ -20,11 +20,11 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/mysql/sqlerror" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/discovery" ) type ( diff --git a/go/vt/vtgate/schema/update_controller_flaky_test.go b/go/vt/vtgate/schema/update_controller_flaky_test.go index 702a3aace30..d3bd7729dc6 100644 --- a/go/vt/vtgate/schema/update_controller_flaky_test.go +++ b/go/vt/vtgate/schema/update_controller_flaky_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/discovery" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/discovery" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestMultipleUpdatesFromDifferentShards(t *testing.T) { diff --git a/go/vt/vtgate/semantics/FakeSI.go b/go/vt/vtgate/semantics/FakeSI.go index 91123bbde88..d9c74c8989a 100644 --- a/go/vt/vtgate/semantics/FakeSI.go +++ b/go/vt/vtgate/semantics/FakeSI.go @@ -19,13 +19,13 @@ package semantics import ( "fmt" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var _ SchemaInformation = (*FakeSI)(nil) diff --git a/go/vt/vtgate/semantics/analyzer.go b/go/vt/vtgate/semantics/analyzer.go index 8a56d4c0b77..862ce3b23fe 100644 --- a/go/vt/vtgate/semantics/analyzer.go +++ b/go/vt/vtgate/semantics/analyzer.go @@ -17,12 +17,12 @@ limitations under the License. package semantics import ( - "github.com/mdibaiee/vitess/go/mysql/collations" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/mysql/collations" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // analyzer controls the flow of the analysis. diff --git a/go/vt/vtgate/semantics/analyzer_dml_test.go b/go/vt/vtgate/semantics/analyzer_dml_test.go index 096881c8b6f..1d033531330 100644 --- a/go/vt/vtgate/semantics/analyzer_dml_test.go +++ b/go/vt/vtgate/semantics/analyzer_dml_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) func TestUpdBindingColName(t *testing.T) { diff --git a/go/vt/vtgate/semantics/analyzer_test.go b/go/vt/vtgate/semantics/analyzer_test.go index 698288c381a..bcd1c952e46 100644 --- a/go/vt/vtgate/semantics/analyzer_test.go +++ b/go/vt/vtgate/semantics/analyzer_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var NoTables TableSet diff --git a/go/vt/vtgate/semantics/binder.go b/go/vt/vtgate/semantics/binder.go index 16602278953..6443f405958 100644 --- a/go/vt/vtgate/semantics/binder.go +++ b/go/vt/vtgate/semantics/binder.go @@ -19,9 +19,9 @@ package semantics import ( "strings" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) // binder is responsible for finding all the column references in diff --git a/go/vt/vtgate/semantics/check_invalid.go b/go/vt/vtgate/semantics/check_invalid.go index f8b70e34a79..101055a94a0 100644 --- a/go/vt/vtgate/semantics/check_invalid.go +++ b/go/vt/vtgate/semantics/check_invalid.go @@ -17,9 +17,9 @@ limitations under the License. package semantics import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func (a *analyzer) checkForInvalidConstructs(cursor *sqlparser.Cursor) error { diff --git a/go/vt/vtgate/semantics/check_invalid_test.go b/go/vt/vtgate/semantics/check_invalid_test.go index 81a125d53c1..7b23f99f174 100644 --- a/go/vt/vtgate/semantics/check_invalid_test.go +++ b/go/vt/vtgate/semantics/check_invalid_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) func TestCheckAliasedTableExpr(t *testing.T) { diff --git a/go/vt/vtgate/semantics/dependencies.go b/go/vt/vtgate/semantics/dependencies.go index b96b71f8599..848ba0df9fb 100644 --- a/go/vt/vtgate/semantics/dependencies.go +++ b/go/vt/vtgate/semantics/dependencies.go @@ -17,9 +17,9 @@ limitations under the License. package semantics import ( - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) type ( diff --git a/go/vt/vtgate/semantics/derived_table.go b/go/vt/vtgate/semantics/derived_table.go index dc5ba8be00d..463314a9c3b 100644 --- a/go/vt/vtgate/semantics/derived_table.go +++ b/go/vt/vtgate/semantics/derived_table.go @@ -19,11 +19,11 @@ package semantics import ( "strings" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // DerivedTable contains the information about the projection, tables involved in derived table. diff --git a/go/vt/vtgate/semantics/derived_test.go b/go/vt/vtgate/semantics/derived_test.go index cd9f238e69f..e40f5108060 100644 --- a/go/vt/vtgate/semantics/derived_test.go +++ b/go/vt/vtgate/semantics/derived_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func TestScopingWDerivedTables(t *testing.T) { diff --git a/go/vt/vtgate/semantics/early_rewriter.go b/go/vt/vtgate/semantics/early_rewriter.go index 2a395507768..cf776952033 100644 --- a/go/vt/vtgate/semantics/early_rewriter.go +++ b/go/vt/vtgate/semantics/early_rewriter.go @@ -20,11 +20,11 @@ import ( "fmt" "strconv" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) type earlyRewriter struct { diff --git a/go/vt/vtgate/semantics/early_rewriter_test.go b/go/vt/vtgate/semantics/early_rewriter_test.go index 9ff7918dbab..4a4c4e40cf7 100644 --- a/go/vt/vtgate/semantics/early_rewriter_test.go +++ b/go/vt/vtgate/semantics/early_rewriter_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func TestExpandStar(t *testing.T) { diff --git a/go/vt/vtgate/semantics/errors.go b/go/vt/vtgate/semantics/errors.go index dec518dfd04..85457d8a976 100644 --- a/go/vt/vtgate/semantics/errors.go +++ b/go/vt/vtgate/semantics/errors.go @@ -19,9 +19,9 @@ package semantics import ( "fmt" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) type ( diff --git a/go/vt/vtgate/semantics/foreign_keys.go b/go/vt/vtgate/semantics/foreign_keys.go index b831e2e112c..764b699fe65 100644 --- a/go/vt/vtgate/semantics/foreign_keys.go +++ b/go/vt/vtgate/semantics/foreign_keys.go @@ -17,9 +17,9 @@ limitations under the License. package semantics import ( - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) type fkManager struct { diff --git a/go/vt/vtgate/semantics/foreign_keys_test.go b/go/vt/vtgate/semantics/foreign_keys_test.go index 53a5c39159b..14534bf6ab6 100644 --- a/go/vt/vtgate/semantics/foreign_keys_test.go +++ b/go/vt/vtgate/semantics/foreign_keys_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) var parentTbl = &vindexes.Table{ diff --git a/go/vt/vtgate/semantics/info_schema.go b/go/vt/vtgate/semantics/info_schema.go index 864fa3b2ef9..901c74072c5 100644 --- a/go/vt/vtgate/semantics/info_schema.go +++ b/go/vt/vtgate/semantics/info_schema.go @@ -20,14 +20,14 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func createCol(parser *sqlparser.Parser, name string, typ int, collation string, def string, size, scale int32, notNullable bool, values string) vindexes.Column { diff --git a/go/vt/vtgate/semantics/info_schema_gen_test.go b/go/vt/vtgate/semantics/info_schema_gen_test.go index e7e58f8af51..59ee2137927 100644 --- a/go/vt/vtgate/semantics/info_schema_gen_test.go +++ b/go/vt/vtgate/semantics/info_schema_gen_test.go @@ -27,9 +27,9 @@ import ( _ "github.com/go-sql-driver/mysql" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" ) func TestGenerateInfoSchemaMap(t *testing.T) { diff --git a/go/vt/vtgate/semantics/real_table.go b/go/vt/vtgate/semantics/real_table.go index 2d98a674e9c..fd6fc5fca09 100644 --- a/go/vt/vtgate/semantics/real_table.go +++ b/go/vt/vtgate/semantics/real_table.go @@ -19,11 +19,11 @@ package semantics import ( "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/mysql/collations" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // RealTable contains the alias table expr and vindex table diff --git a/go/vt/vtgate/semantics/scoper.go b/go/vt/vtgate/semantics/scoper.go index 3f515f3c09a..18b49bcafbf 100644 --- a/go/vt/vtgate/semantics/scoper.go +++ b/go/vt/vtgate/semantics/scoper.go @@ -19,9 +19,9 @@ package semantics import ( "reflect" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) type ( diff --git a/go/vt/vtgate/semantics/semantic_state.go b/go/vt/vtgate/semantics/semantic_state.go index f28f9091928..b24aab552a9 100644 --- a/go/vt/vtgate/semantics/semantic_state.go +++ b/go/vt/vtgate/semantics/semantic_state.go @@ -19,17 +19,17 @@ package semantics import ( "fmt" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) type ( diff --git a/go/vt/vtgate/semantics/semantic_state_test.go b/go/vt/vtgate/semantics/semantic_state_test.go index 35ac5e70983..ce81459d602 100644 --- a/go/vt/vtgate/semantics/semantic_state_test.go +++ b/go/vt/vtgate/semantics/semantic_state_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func TestBindingAndExprEquality(t *testing.T) { diff --git a/go/vt/vtgate/semantics/table_collector.go b/go/vt/vtgate/semantics/table_collector.go index 6cd7a150fa2..a434e8c6b0d 100644 --- a/go/vt/vtgate/semantics/table_collector.go +++ b/go/vt/vtgate/semantics/table_collector.go @@ -19,15 +19,15 @@ package semantics import ( "fmt" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // tableCollector is responsible for gathering information about the tables listed in the FROM clause, diff --git a/go/vt/vtgate/semantics/table_set.go b/go/vt/vtgate/semantics/table_set.go index 07583bbcabb..32cde150800 100644 --- a/go/vt/vtgate/semantics/table_set.go +++ b/go/vt/vtgate/semantics/table_set.go @@ -19,7 +19,7 @@ package semantics import ( "fmt" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics/bitset" + "github.com/vitess/vitess/go/vt/vtgate/semantics/bitset" ) // TableSet is how a set of tables is expressed. diff --git a/go/vt/vtgate/semantics/typer.go b/go/vt/vtgate/semantics/typer.go index a7064cb52fe..fd427c76de2 100644 --- a/go/vt/vtgate/semantics/typer.go +++ b/go/vt/vtgate/semantics/typer.go @@ -17,10 +17,10 @@ limitations under the License. package semantics import ( - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) // typer is responsible for setting the type for expressions diff --git a/go/vt/vtgate/semantics/typer_test.go b/go/vt/vtgate/semantics/typer_test.go index 443ab71f2f9..d1401d0fa84 100644 --- a/go/vt/vtgate/semantics/typer_test.go +++ b/go/vt/vtgate/semantics/typer_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql/collations/colldata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" ) func TestNormalizerAndSemanticAnalysisIntegration(t *testing.T) { diff --git a/go/vt/vtgate/semantics/vindex_table.go b/go/vt/vtgate/semantics/vindex_table.go index 7e595c2d28f..4a59514cf2a 100644 --- a/go/vt/vtgate/semantics/vindex_table.go +++ b/go/vt/vtgate/semantics/vindex_table.go @@ -17,8 +17,8 @@ limitations under the License. package semantics import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // VindexTable contains a vindexes.Vindex and a TableInfo. The former represents the vindex diff --git a/go/vt/vtgate/semantics/vtable.go b/go/vt/vtgate/semantics/vtable.go index fcfa77f5915..12d871ecf37 100644 --- a/go/vt/vtgate/semantics/vtable.go +++ b/go/vt/vtgate/semantics/vtable.go @@ -17,10 +17,10 @@ limitations under the License. package semantics import ( - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // vTableInfo is used to represent projected results, not real tables. It is used for diff --git a/go/vt/vtgate/simplifier/expression_simplifier.go b/go/vt/vtgate/simplifier/expression_simplifier.go index 2e54391d18f..3a8a9910ab6 100644 --- a/go/vt/vtgate/simplifier/expression_simplifier.go +++ b/go/vt/vtgate/simplifier/expression_simplifier.go @@ -20,8 +20,8 @@ import ( "fmt" "strconv" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" ) // CheckF is used to see if the given expression exhibits the sought after issue diff --git a/go/vt/vtgate/simplifier/simplifier.go b/go/vt/vtgate/simplifier/simplifier.go index 8c908730150..9ace7660822 100644 --- a/go/vt/vtgate/simplifier/simplifier.go +++ b/go/vt/vtgate/simplifier/simplifier.go @@ -17,9 +17,9 @@ limitations under the License. package simplifier import ( - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/semantics" ) // SimplifyStatement simplifies the AST of a query. It basically iteratively prunes leaves of the AST, as long as the pruning diff --git a/go/vt/vtgate/simplifier/simplifier_test.go b/go/vt/vtgate/simplifier/simplifier_test.go index ff4f0f1f54e..03c04b5864a 100644 --- a/go/vt/vtgate/simplifier/simplifier_test.go +++ b/go/vt/vtgate/simplifier/simplifier_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) func TestFindAllExpressions(t *testing.T) { diff --git a/go/vt/vtgate/status.go b/go/vt/vtgate/status.go index 1adc3cc8678..5c2f3ac9d81 100644 --- a/go/vt/vtgate/status.go +++ b/go/vt/vtgate/status.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/vtgate/status_test.go b/go/vt/vtgate/status_test.go index bf4ce32b647..11157773085 100644 --- a/go/vt/vtgate/status_test.go +++ b/go/vt/vtgate/status_test.go @@ -24,7 +24,7 @@ import ( "github.com/google/safehtml/template" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestTabletStatusAggregator(t *testing.T) { diff --git a/go/vt/vtgate/tabletgateway.go b/go/vt/vtgate/tabletgateway.go index 1c96e03c38d..41b917c3956 100644 --- a/go/vt/vtgate/tabletgateway.go +++ b/go/vt/vtgate/tabletgateway.go @@ -28,21 +28,21 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/buffer" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/buffer" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var ( diff --git a/go/vt/vtgate/tabletgateway_flaky_test.go b/go/vt/vtgate/tabletgateway_flaky_test.go index b5cc0e4d443..1cc1b94de54 100644 --- a/go/vt/vtgate/tabletgateway_flaky_test.go +++ b/go/vt/vtgate/tabletgateway_flaky_test.go @@ -22,14 +22,14 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/vtgate/buffer" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/vtgate/buffer" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // TestGatewayBufferingWhenPrimarySwitchesServingState is used to test that the buffering mechanism buffers the queries when a primary goes to a non serving state and diff --git a/go/vt/vtgate/tabletgateway_test.go b/go/vt/vtgate/tabletgateway_test.go index ffbfcd48007..b477e8c34c7 100644 --- a/go/vt/vtgate/tabletgateway_test.go +++ b/go/vt/vtgate/tabletgateway_test.go @@ -25,15 +25,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/utils" - - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/discovery" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/test/utils" + + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/discovery" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vterrors" ) func TestTabletGatewayExecute(t *testing.T) { diff --git a/go/vt/vtgate/tx_conn.go b/go/vt/vtgate/tx_conn.go index 3e8b4639f33..8bf52fc37d6 100644 --- a/go/vt/vtgate/tx_conn.go +++ b/go/vt/vtgate/tx_conn.go @@ -22,18 +22,18 @@ import ( "strings" "sync" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/dtids" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/dtids" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // nonAtomicCommitWarnMaxShards limits the number of shard names reported in diff --git a/go/vt/vtgate/tx_conn_test.go b/go/vt/vtgate/tx_conn_test.go index b6b4dc4178f..a3a7715d2d7 100644 --- a/go/vt/vtgate/tx_conn_test.go +++ b/go/vt/vtgate/tx_conn_test.go @@ -24,21 +24,21 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/sandboxconn" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/sandboxconn" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var queries = []*querypb.BoundQuery{{Sql: "query1"}} diff --git a/go/vt/vtgate/vcursor_impl.go b/go/vt/vtgate/vcursor_impl.go index f34018bd7ed..e380f6ad6af 100644 --- a/go/vt/vtgate/vcursor_impl.go +++ b/go/vt/vtgate/vcursor_impl.go @@ -27,35 +27,35 @@ import ( "github.com/google/uuid" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/config" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/key" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/topo" - topoprotopb "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/buffer" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/logstats" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - "github.com/mdibaiee/vitess/go/vt/vtgate/semantics" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vtgate/vschemaacl" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateservice" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/config" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/key" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/topo" + topoprotopb "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/buffer" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/logstats" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + "github.com/vitess/vitess/go/vt/vtgate/semantics" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vtgate/vschemaacl" + "github.com/vitess/vitess/go/vt/vtgate/vtgateservice" ) var _ engine.VCursor = (*vcursorImpl)(nil) diff --git a/go/vt/vtgate/vcursor_impl_test.go b/go/vt/vtgate/vcursor_impl_test.go index 232a5682e49..0bd42782e5f 100644 --- a/go/vt/vtgate/vcursor_impl_test.go +++ b/go/vt/vtgate/vcursor_impl_test.go @@ -10,16 +10,16 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) var _ VSchemaOperator = (*fakeVSchemaOperator)(nil) diff --git a/go/vt/vtgate/vindexes/binary.go b/go/vt/vtgate/vindexes/binary.go index 72e876560ed..5723d982fc7 100644 --- a/go/vt/vtgate/vindexes/binary.go +++ b/go/vt/vtgate/vindexes/binary.go @@ -21,8 +21,8 @@ import ( "context" "fmt" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var ( diff --git a/go/vt/vtgate/vindexes/binary_test.go b/go/vt/vtgate/vindexes/binary_test.go index 1b6ea9da877..df7ae63a06b 100644 --- a/go/vt/vtgate/vindexes/binary_test.go +++ b/go/vt/vtgate/vindexes/binary_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var binOnlyVindex SingleColumn diff --git a/go/vt/vtgate/vindexes/binarymd5.go b/go/vt/vtgate/vindexes/binarymd5.go index 7e399a02b8f..d62576cde25 100644 --- a/go/vt/vtgate/vindexes/binarymd5.go +++ b/go/vt/vtgate/vindexes/binarymd5.go @@ -21,8 +21,8 @@ import ( "context" "crypto/md5" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var ( diff --git a/go/vt/vtgate/vindexes/binarymd5_test.go b/go/vt/vtgate/vindexes/binarymd5_test.go index fca0e236430..21c7570bf30 100644 --- a/go/vt/vtgate/vindexes/binarymd5_test.go +++ b/go/vt/vtgate/vindexes/binarymd5_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var binVindex SingleColumn diff --git a/go/vt/vtgate/vindexes/cached_size.go b/go/vt/vtgate/vindexes/cached_size.go index 1ef83d288ea..28786ca12a6 100644 --- a/go/vt/vtgate/vindexes/cached_size.go +++ b/go/vt/vtgate/vindexes/cached_size.go @@ -22,7 +22,7 @@ import ( "reflect" "unsafe" - hack "github.com/mdibaiee/vitess/go/hack" + hack "github.com/vitess/vitess/go/hack" ) type cachedObject interface { @@ -75,9 +75,9 @@ func (cached *CFC) CachedSize(alloc bool) int64 { if alloc { size += int64(16) } - // field cfcCommon *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.cfcCommon + // field cfcCommon *github.com/vitess/vitess/go/vt/vtgate/vindexes.cfcCommon size += cached.cfcCommon.CachedSize(true) - // field prefixCFC *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.prefixCFC + // field prefixCFC *github.com/vitess/vitess/go/vt/vtgate/vindexes.prefixCFC size += cached.prefixCFC.CachedSize(true) return size } @@ -89,7 +89,7 @@ func (cached *ColumnVindex) CachedSize(alloc bool) int64 { if alloc { size += int64(112) } - // field Columns []github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCI + // field Columns []github.com/vitess/vitess/go/vt/sqlparser.IdentifierCI { size += hack.RuntimeAllocSize(int64(cap(cached.Columns)) * int64(32)) for _, elem := range cached.Columns { @@ -100,7 +100,7 @@ func (cached *ColumnVindex) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(len(cached.Type))) // field Name string size += hack.RuntimeAllocSize(int64(len(cached.Name))) - // field Vindex github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Vindex + // field Vindex github.com/vitess/vitess/go/vt/vtgate/vindexes.Vindex if cc, ok := cached.Vindex.(cachedObject); ok { size += cc.CachedSize(true) } @@ -114,7 +114,7 @@ func (cached *ConsistentLookup) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field clCommon *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.clCommon + // field clCommon *github.com/vitess/vitess/go/vt/vtgate/vindexes.clCommon size += cached.clCommon.CachedSize(true) // field unknownParams []string { @@ -133,7 +133,7 @@ func (cached *ConsistentLookupUnique) CachedSize(alloc bool) int64 { if alloc { size += int64(32) } - // field clCommon *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.clCommon + // field clCommon *github.com/vitess/vitess/go/vt/vtgate/vindexes.clCommon size += cached.clCommon.CachedSize(true) // field unknownParams []string { @@ -185,7 +185,7 @@ func (cached *LookupHash) CachedSize(alloc bool) int64 { } // field name string size += hack.RuntimeAllocSize(int64(len(cached.name))) - // field lkp github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.lookupInternal + // field lkp github.com/vitess/vitess/go/vt/vtgate/vindexes.lookupInternal size += cached.lkp.CachedSize(false) // field unknownParams []string { @@ -206,7 +206,7 @@ func (cached *LookupHashUnique) CachedSize(alloc bool) int64 { } // field name string size += hack.RuntimeAllocSize(int64(len(cached.name))) - // field lkp github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.lookupInternal + // field lkp github.com/vitess/vitess/go/vt/vtgate/vindexes.lookupInternal size += cached.lkp.CachedSize(false) // field unknownParams []string { @@ -227,7 +227,7 @@ func (cached *LookupNonUnique) CachedSize(alloc bool) int64 { } // field name string size += hack.RuntimeAllocSize(int64(len(cached.name))) - // field lkp github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.lookupInternal + // field lkp github.com/vitess/vitess/go/vt/vtgate/vindexes.lookupInternal size += cached.lkp.CachedSize(false) // field unknownParams []string { @@ -248,7 +248,7 @@ func (cached *LookupUnicodeLooseMD5Hash) CachedSize(alloc bool) int64 { } // field name string size += hack.RuntimeAllocSize(int64(len(cached.name))) - // field lkp github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.lookupInternal + // field lkp github.com/vitess/vitess/go/vt/vtgate/vindexes.lookupInternal size += cached.lkp.CachedSize(false) // field unknownParams []string { @@ -269,7 +269,7 @@ func (cached *LookupUnicodeLooseMD5HashUnique) CachedSize(alloc bool) int64 { } // field name string size += hack.RuntimeAllocSize(int64(len(cached.name))) - // field lkp github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.lookupInternal + // field lkp github.com/vitess/vitess/go/vt/vtgate/vindexes.lookupInternal size += cached.lkp.CachedSize(false) // field unknownParams []string { @@ -290,7 +290,7 @@ func (cached *LookupUnique) CachedSize(alloc bool) int64 { } // field name string size += hack.RuntimeAllocSize(int64(len(cached.name))) - // field lkp github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.lookupInternal + // field lkp github.com/vitess/vitess/go/vt/vtgate/vindexes.lookupInternal size += cached.lkp.CachedSize(false) // field unknownParams []string { @@ -313,7 +313,7 @@ func (cached *MultiCol) CachedSize(alloc bool) int64 { } // field name string size += hack.RuntimeAllocSize(int64(len(cached.name))) - // field columnVdx map[int]github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Hashing + // field columnVdx map[int]github.com/vitess/vitess/go/vt/vtgate/vindexes.Hashing if cached.columnVdx != nil { size += int64(48) hmap := reflect.ValueOf(cached.columnVdx) @@ -392,11 +392,11 @@ func (cached *NumericStaticMap) CachedSize(alloc bool) int64 { } // field name string size += hack.RuntimeAllocSize(int64(len(cached.name))) - // field hashVdx github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.Hashing + // field hashVdx github.com/vitess/vitess/go/vt/vtgate/vindexes.Hashing if cc, ok := cached.hashVdx.(cachedObject); ok { size += cc.CachedSize(true) } - // field lookup github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.NumericLookupTable + // field lookup github.com/vitess/vitess/go/vt/vtgate/vindexes.NumericLookupTable if cached.lookup != nil { size += int64(48) hmap := reflect.ValueOf(cached.lookup) @@ -447,7 +447,7 @@ func (cached *RegionJSON) CachedSize(alloc bool) int64 { } // field name string size += hack.RuntimeAllocSize(int64(len(cached.name))) - // field regionMap github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.RegionMap + // field regionMap github.com/vitess/vitess/go/vt/vtgate/vindexes.RegionMap if cached.regionMap != nil { size += int64(48) hmap := reflect.ValueOf(cached.regionMap) @@ -579,7 +579,7 @@ func (cached *clCommon) CachedSize(alloc bool) int64 { } // field name string size += hack.RuntimeAllocSize(int64(len(cached.name))) - // field lkp github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.lookupInternal + // field lkp github.com/vitess/vitess/go/vt/vtgate/vindexes.lookupInternal size += cached.lkp.CachedSize(false) // field keyspace string size += hack.RuntimeAllocSize(int64(len(cached.keyspace))) @@ -641,7 +641,7 @@ func (cached *prefixCFC) CachedSize(alloc bool) int64 { if alloc { size += int64(8) } - // field cfcCommon *github.com/mdibaiee/vitess/go/vt/vtgate/vindexes.cfcCommon + // field cfcCommon *github.com/vitess/vitess/go/vt/vtgate/vindexes.cfcCommon size += cached.cfcCommon.CachedSize(true) return size } diff --git a/go/vt/vtgate/vindexes/cfc.go b/go/vt/vtgate/vindexes/cfc.go index a9ac86b0879..3b91a2f083d 100644 --- a/go/vt/vtgate/vindexes/cfc.go +++ b/go/vt/vtgate/vindexes/cfc.go @@ -21,11 +21,11 @@ import ( "context" "encoding/json" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) const ( diff --git a/go/vt/vtgate/vindexes/cfc_test.go b/go/vt/vtgate/vindexes/cfc_test.go index 0d7ba5101ac..0a55747cfdd 100644 --- a/go/vt/vtgate/vindexes/cfc_test.go +++ b/go/vt/vtgate/vindexes/cfc_test.go @@ -23,11 +23,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) func cfcCreateVindexTestCase( diff --git a/go/vt/vtgate/vindexes/consistent_lookup.go b/go/vt/vtgate/vindexes/consistent_lookup.go index c8aa52041db..2d360116ff3 100644 --- a/go/vt/vtgate/vindexes/consistent_lookup.go +++ b/go/vt/vtgate/vindexes/consistent_lookup.go @@ -23,16 +23,16 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) const ( diff --git a/go/vt/vtgate/vindexes/consistent_lookup_test.go b/go/vt/vtgate/vindexes/consistent_lookup_test.go index 6c03228a7a0..76ceadce47a 100644 --- a/go/vt/vtgate/vindexes/consistent_lookup_test.go +++ b/go/vt/vtgate/vindexes/consistent_lookup_test.go @@ -29,19 +29,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - - "github.com/mdibaiee/vitess/go/mysql/collations" - - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/sqlerror" + + "github.com/vitess/vitess/go/mysql/collations" + + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" ) func consistentLookupCreateVindexTestCase( diff --git a/go/vt/vtgate/vindexes/foreign_keys.go b/go/vt/vtgate/vindexes/foreign_keys.go index 8044cd2ebf9..6b4ce3e49f9 100644 --- a/go/vt/vtgate/vindexes/foreign_keys.go +++ b/go/vt/vtgate/vindexes/foreign_keys.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) // ParentFKInfo contains the parent foreign key info for the table. diff --git a/go/vt/vtgate/vindexes/fuzz.go b/go/vt/vtgate/vindexes/fuzz.go index f12e97513e3..ec36f108050 100644 --- a/go/vt/vtgate/vindexes/fuzz.go +++ b/go/vt/vtgate/vindexes/fuzz.go @@ -26,8 +26,8 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var initter sync.Once diff --git a/go/vt/vtgate/vindexes/hash.go b/go/vt/vtgate/vindexes/hash.go index e39809cb817..d189bc09fec 100644 --- a/go/vt/vtgate/vindexes/hash.go +++ b/go/vt/vtgate/vindexes/hash.go @@ -26,8 +26,8 @@ import ( "fmt" "strconv" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var ( diff --git a/go/vt/vtgate/vindexes/hash_test.go b/go/vt/vtgate/vindexes/hash_test.go index 82ae9be99ea..7d587c94372 100644 --- a/go/vt/vtgate/vindexes/hash_test.go +++ b/go/vt/vtgate/vindexes/hash_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var hashTest SingleColumn diff --git a/go/vt/vtgate/vindexes/lookup.go b/go/vt/vtgate/vindexes/lookup.go index 49a229dd06d..9cc5b00bc9d 100644 --- a/go/vt/vtgate/vindexes/lookup.go +++ b/go/vt/vtgate/vindexes/lookup.go @@ -21,10 +21,10 @@ import ( "encoding/json" "fmt" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) const ( diff --git a/go/vt/vtgate/vindexes/lookup_hash.go b/go/vt/vtgate/vindexes/lookup_hash.go index 1d14e0c5225..495f0f6ba11 100644 --- a/go/vt/vtgate/vindexes/lookup_hash.go +++ b/go/vt/vtgate/vindexes/lookup_hash.go @@ -21,11 +21,11 @@ import ( "encoding/json" "fmt" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/vt/vterrors" ) const ( diff --git a/go/vt/vtgate/vindexes/lookup_hash_test.go b/go/vt/vtgate/vindexes/lookup_hash_test.go index 79294a0fe29..6a7088e65d8 100644 --- a/go/vt/vtgate/vindexes/lookup_hash_test.go +++ b/go/vt/vtgate/vindexes/lookup_hash_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func lookupHashCreateVindexTestCase( diff --git a/go/vt/vtgate/vindexes/lookup_hash_unique_test.go b/go/vt/vtgate/vindexes/lookup_hash_unique_test.go index a229f8180b9..9b136b45704 100644 --- a/go/vt/vtgate/vindexes/lookup_hash_unique_test.go +++ b/go/vt/vtgate/vindexes/lookup_hash_unique_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func lookupHashUniqueCreateVindexTestCase( diff --git a/go/vt/vtgate/vindexes/lookup_internal.go b/go/vt/vtgate/vindexes/lookup_internal.go index d486593f70d..d92aae7f257 100644 --- a/go/vt/vtgate/vindexes/lookup_internal.go +++ b/go/vt/vtgate/vindexes/lookup_internal.go @@ -24,11 +24,11 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) const ( diff --git a/go/vt/vtgate/vindexes/lookup_test.go b/go/vt/vtgate/vindexes/lookup_test.go index 281fa2938c8..2e54598e8da 100644 --- a/go/vt/vtgate/vindexes/lookup_test.go +++ b/go/vt/vtgate/vindexes/lookup_test.go @@ -22,21 +22,21 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/test/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" ) // LookupNonUnique tests are more comprehensive than others. diff --git a/go/vt/vtgate/vindexes/lookup_unicodeloosemd5_hash.go b/go/vt/vtgate/vindexes/lookup_unicodeloosemd5_hash.go index ef784fc7965..2190f7f8deb 100644 --- a/go/vt/vtgate/vindexes/lookup_unicodeloosemd5_hash.go +++ b/go/vt/vtgate/vindexes/lookup_unicodeloosemd5_hash.go @@ -22,10 +22,10 @@ import ( "encoding/json" "fmt" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) const ( diff --git a/go/vt/vtgate/vindexes/lookup_unicodeloosemd5_hash_test.go b/go/vt/vtgate/vindexes/lookup_unicodeloosemd5_hash_test.go index 099b1eaecd1..dee7c39fe82 100644 --- a/go/vt/vtgate/vindexes/lookup_unicodeloosemd5_hash_test.go +++ b/go/vt/vtgate/vindexes/lookup_unicodeloosemd5_hash_test.go @@ -23,11 +23,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/vtgate/vindexes/lookup_unique_test.go b/go/vt/vtgate/vindexes/lookup_unique_test.go index 281f2e82e64..86ad1126794 100644 --- a/go/vt/vtgate/vindexes/lookup_unique_test.go +++ b/go/vt/vtgate/vindexes/lookup_unique_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestLookupUniqueNew(t *testing.T) { diff --git a/go/vt/vtgate/vindexes/multicol.go b/go/vt/vtgate/vindexes/multicol.go index 76c95bd42e3..8e3a5908d28 100644 --- a/go/vt/vtgate/vindexes/multicol.go +++ b/go/vt/vtgate/vindexes/multicol.go @@ -23,10 +23,10 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) var ( diff --git a/go/vt/vtgate/vindexes/multicol_test.go b/go/vt/vtgate/vindexes/multicol_test.go index c5e52247819..843964e289f 100644 --- a/go/vt/vtgate/vindexes/multicol_test.go +++ b/go/vt/vtgate/vindexes/multicol_test.go @@ -20,11 +20,11 @@ import ( "context" "testing" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/go/vt/vtgate/vindexes/null.go b/go/vt/vtgate/vindexes/null.go index 4ebc5ac4900..987817bc49f 100644 --- a/go/vt/vtgate/vindexes/null.go +++ b/go/vt/vtgate/vindexes/null.go @@ -20,8 +20,8 @@ import ( "bytes" "context" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var ( diff --git a/go/vt/vtgate/vindexes/null_test.go b/go/vt/vtgate/vindexes/null_test.go index 69a75af5856..dc4edac56c9 100644 --- a/go/vt/vtgate/vindexes/null_test.go +++ b/go/vt/vtgate/vindexes/null_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var null SingleColumn diff --git a/go/vt/vtgate/vindexes/numeric.go b/go/vt/vtgate/vindexes/numeric.go index 62566f5e99a..904a732b34a 100644 --- a/go/vt/vtgate/vindexes/numeric.go +++ b/go/vt/vtgate/vindexes/numeric.go @@ -22,8 +22,8 @@ import ( "encoding/binary" "fmt" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var ( diff --git a/go/vt/vtgate/vindexes/numeric_static_map.go b/go/vt/vtgate/vindexes/numeric_static_map.go index dec97a2abf8..b854e4ed1cc 100644 --- a/go/vt/vtgate/vindexes/numeric_static_map.go +++ b/go/vt/vtgate/vindexes/numeric_static_map.go @@ -24,10 +24,10 @@ import ( "os" "strconv" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) const ( diff --git a/go/vt/vtgate/vindexes/numeric_static_map_test.go b/go/vt/vtgate/vindexes/numeric_static_map_test.go index 9fd13165e82..517fedc14ce 100644 --- a/go/vt/vtgate/vindexes/numeric_static_map_test.go +++ b/go/vt/vtgate/vindexes/numeric_static_map_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // createVindex creates the "numeric_static_map" vindex object which is used by diff --git a/go/vt/vtgate/vindexes/numeric_test.go b/go/vt/vtgate/vindexes/numeric_test.go index bcbf2c6bb37..46ef5d846a6 100644 --- a/go/vt/vtgate/vindexes/numeric_test.go +++ b/go/vt/vtgate/vindexes/numeric_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var numeric SingleColumn diff --git a/go/vt/vtgate/vindexes/region_experimental.go b/go/vt/vtgate/vindexes/region_experimental.go index c4d0ee22375..1d562014fbb 100644 --- a/go/vt/vtgate/vindexes/region_experimental.go +++ b/go/vt/vtgate/vindexes/region_experimental.go @@ -22,10 +22,10 @@ import ( "encoding/binary" "fmt" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) const ( diff --git a/go/vt/vtgate/vindexes/region_experimental_test.go b/go/vt/vtgate/vindexes/region_experimental_test.go index bee9ad65031..349dc12e1c5 100644 --- a/go/vt/vtgate/vindexes/region_experimental_test.go +++ b/go/vt/vtgate/vindexes/region_experimental_test.go @@ -21,15 +21,15 @@ import ( "strconv" "testing" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) func regionExperimentalCreateVindexTestCase( diff --git a/go/vt/vtgate/vindexes/region_json.go b/go/vt/vtgate/vindexes/region_json.go index 21cd6ccc95f..3fc6442c4af 100644 --- a/go/vt/vtgate/vindexes/region_json.go +++ b/go/vt/vtgate/vindexes/region_json.go @@ -25,9 +25,9 @@ import ( "os" "strconv" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" ) const ( diff --git a/go/vt/vtgate/vindexes/reverse_bits.go b/go/vt/vtgate/vindexes/reverse_bits.go index efe8898229b..f68fb0e4963 100644 --- a/go/vt/vtgate/vindexes/reverse_bits.go +++ b/go/vt/vtgate/vindexes/reverse_bits.go @@ -24,8 +24,8 @@ import ( "fmt" "math/bits" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var ( diff --git a/go/vt/vtgate/vindexes/reverse_bits_test.go b/go/vt/vtgate/vindexes/reverse_bits_test.go index 7eb38c72857..ad3827ecad3 100644 --- a/go/vt/vtgate/vindexes/reverse_bits_test.go +++ b/go/vt/vtgate/vindexes/reverse_bits_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var reverseBits SingleColumn diff --git a/go/vt/vtgate/vindexes/unicode.go b/go/vt/vtgate/vindexes/unicode.go index 52668f03383..63f74d65915 100644 --- a/go/vt/vtgate/vindexes/unicode.go +++ b/go/vt/vtgate/vindexes/unicode.go @@ -25,8 +25,8 @@ import ( "github.com/cespare/xxhash/v2" - "github.com/mdibaiee/vitess/go/mysql/collations/vindex/collate" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql/collations/vindex/collate" + "github.com/vitess/vitess/go/sqltypes" ) // Shared functions for Unicode string normalization diff --git a/go/vt/vtgate/vindexes/unicode_hash_test.go b/go/vt/vtgate/vindexes/unicode_hash_test.go index 3b02be5ffc2..8e2ff36ff15 100644 --- a/go/vt/vtgate/vindexes/unicode_hash_test.go +++ b/go/vt/vtgate/vindexes/unicode_hash_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations/testutil" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql/collations/testutil" + "github.com/vitess/vitess/go/sqltypes" ) type GoldenUnicodeHash struct { diff --git a/go/vt/vtgate/vindexes/unicode_test.go b/go/vt/vtgate/vindexes/unicode_test.go index f32b67b5f53..a3d7ede2d96 100644 --- a/go/vt/vtgate/vindexes/unicode_test.go +++ b/go/vt/vtgate/vindexes/unicode_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) func TestNormalization(t *testing.T) { diff --git a/go/vt/vtgate/vindexes/unicodeloosemd5.go b/go/vt/vtgate/vindexes/unicodeloosemd5.go index 493343ca541..ef2f69d3a24 100644 --- a/go/vt/vtgate/vindexes/unicodeloosemd5.go +++ b/go/vt/vtgate/vindexes/unicodeloosemd5.go @@ -21,8 +21,8 @@ import ( "context" "fmt" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var ( diff --git a/go/vt/vtgate/vindexes/unicodeloosemd5_test.go b/go/vt/vtgate/vindexes/unicodeloosemd5_test.go index 4a340134da4..29d1a20b91d 100644 --- a/go/vt/vtgate/vindexes/unicodeloosemd5_test.go +++ b/go/vt/vtgate/vindexes/unicodeloosemd5_test.go @@ -21,8 +21,8 @@ import ( "reflect" "testing" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var charVindexMD5 SingleColumn diff --git a/go/vt/vtgate/vindexes/unicodeloosexxhash.go b/go/vt/vtgate/vindexes/unicodeloosexxhash.go index 562fa8e7909..c7c41c1e837 100644 --- a/go/vt/vtgate/vindexes/unicodeloosexxhash.go +++ b/go/vt/vtgate/vindexes/unicodeloosexxhash.go @@ -21,8 +21,8 @@ import ( "context" "fmt" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var ( diff --git a/go/vt/vtgate/vindexes/unicodeloosexxhash_test.go b/go/vt/vtgate/vindexes/unicodeloosexxhash_test.go index 103fd764015..c002574ea08 100644 --- a/go/vt/vtgate/vindexes/unicodeloosexxhash_test.go +++ b/go/vt/vtgate/vindexes/unicodeloosexxhash_test.go @@ -21,8 +21,8 @@ import ( "reflect" "testing" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var charVindexXXHash SingleColumn diff --git a/go/vt/vtgate/vindexes/vindex.go b/go/vt/vtgate/vindexes/vindex.go index 54891cf9c59..bccf6bd2316 100644 --- a/go/vt/vtgate/vindexes/vindex.go +++ b/go/vt/vtgate/vindexes/vindex.go @@ -21,16 +21,16 @@ import ( "fmt" "sort" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // This file defines interfaces and registration for vindexes. diff --git a/go/vt/vtgate/vindexes/vindex_test.go b/go/vt/vtgate/vindexes/vindex_test.go index 2bdd8d163e2..269e973ca4a 100644 --- a/go/vt/vtgate/vindexes/vindex_test.go +++ b/go/vt/vtgate/vindexes/vindex_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) type testVindex struct { diff --git a/go/vt/vtgate/vindexes/vschema.go b/go/vt/vtgate/vindexes/vschema.go index 3263e522cb9..aa4ed350b2f 100644 --- a/go/vt/vtgate/vindexes/vschema.go +++ b/go/vt/vtgate/vindexes/vschema.go @@ -25,19 +25,19 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/ptr" - - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/ptr" + + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) // TabletTypeSuffix maps the tablet type to its suffix string. diff --git a/go/vt/vtgate/vindexes/vschema_test.go b/go/vt/vtgate/vindexes/vschema_test.go index c7a881bb4d9..06763796b81 100644 --- a/go/vt/vtgate/vindexes/vschema_test.go +++ b/go/vt/vtgate/vindexes/vschema_test.go @@ -29,15 +29,15 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/sqlparser" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) // cheapVindex is a Functional, Unique Vindex. diff --git a/go/vt/vtgate/vindexes/xxhash.go b/go/vt/vtgate/vindexes/xxhash.go index 2039119bbf8..7b5706bd700 100644 --- a/go/vt/vtgate/vindexes/xxhash.go +++ b/go/vt/vtgate/vindexes/xxhash.go @@ -23,8 +23,8 @@ import ( "github.com/cespare/xxhash/v2" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var ( diff --git a/go/vt/vtgate/vindexes/xxhash_test.go b/go/vt/vtgate/vindexes/xxhash_test.go index 357a2a09ae2..38e6f06b967 100644 --- a/go/vt/vtgate/vindexes/xxhash_test.go +++ b/go/vt/vtgate/vindexes/xxhash_test.go @@ -24,8 +24,8 @@ import ( "reflect" "testing" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" ) var xxHash SingleColumn diff --git a/go/vt/vtgate/vschema_manager.go b/go/vt/vtgate/vschema_manager.go index 0c32ee3f8e9..a8c8e66d57c 100644 --- a/go/vt/vtgate/vschema_manager.go +++ b/go/vt/vtgate/vschema_manager.go @@ -20,17 +20,17 @@ import ( "context" "sync" - "github.com/mdibaiee/vitess/go/vt/graph" - "github.com/mdibaiee/vitess/go/vt/log" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/graph" + "github.com/vitess/vitess/go/vt/log" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) var _ VSchemaOperator = (*VSchemaManager)(nil) diff --git a/go/vt/vtgate/vschema_manager_test.go b/go/vt/vtgate/vschema_manager_test.go index 453c8f2da30..9dc431b48a0 100644 --- a/go/vt/vtgate/vschema_manager_test.go +++ b/go/vt/vtgate/vschema_manager_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/utils" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/test/utils" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func TestVSchemaUpdate(t *testing.T) { diff --git a/go/vt/vtgate/vschema_stats.go b/go/vt/vtgate/vschema_stats.go index cd21da0151a..242a855e68d 100644 --- a/go/vt/vtgate/vschema_stats.go +++ b/go/vt/vtgate/vschema_stats.go @@ -19,7 +19,7 @@ package vtgate import ( "sort" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // VSchemaStats contains a rollup of the VSchema stats. diff --git a/go/vt/vtgate/vschemaacl/vschemaacl.go b/go/vt/vtgate/vschemaacl/vschemaacl.go index c8056d1083d..ff6cfceda8b 100644 --- a/go/vt/vtgate/vschemaacl/vschemaacl.go +++ b/go/vt/vtgate/vschemaacl/vschemaacl.go @@ -22,9 +22,9 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/servenv" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var ( diff --git a/go/vt/vtgate/vschemaacl/vschemaacl_test.go b/go/vt/vtgate/vschemaacl/vschemaacl_test.go index 6629e0d6fe1..bceb0d45fdf 100644 --- a/go/vt/vtgate/vschemaacl/vschemaacl_test.go +++ b/go/vt/vtgate/vschemaacl/vschemaacl_test.go @@ -19,7 +19,7 @@ package vschemaacl import ( "testing" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestVschemaAcl(t *testing.T) { diff --git a/go/vt/vtgate/vstream_manager.go b/go/vt/vtgate/vstream_manager.go index 32a70fdbb0e..28bddc81434 100644 --- a/go/vt/vtgate/vstream_manager.go +++ b/go/vt/vtgate/vstream_manager.go @@ -27,21 +27,21 @@ import ( "golang.org/x/exp/maps" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // vstreamManager manages vstream requests. diff --git a/go/vt/vtgate/vstream_manager_test.go b/go/vt/vtgate/vstream_manager_test.go index df04ac6ea1c..b28f53ca7e9 100644 --- a/go/vt/vtgate/vstream_manager_test.go +++ b/go/vt/vtgate/vstream_manager_test.go @@ -29,22 +29,22 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/sandboxconn" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/sandboxconn" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var mu sync.Mutex diff --git a/go/vt/vtgate/vtgate.go b/go/vt/vtgate/vtgate.go index e6380fdc21a..ff5c4d42b5c 100644 --- a/go/vt/vtgate/vtgate.go +++ b/go/vt/vtgate/vtgate.go @@ -30,31 +30,31 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/vtenv" - - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/tb" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sidecardb" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/planbuilder/plancontext" - vtschema "github.com/mdibaiee/vitess/go/vt/vtgate/schema" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateservice" + "github.com/vitess/vitess/go/vt/vtenv" + + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/tb" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sidecardb" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/planbuilder/plancontext" + vtschema "github.com/vitess/vitess/go/vt/vtgate/schema" + "github.com/vitess/vitess/go/vt/vtgate/vtgateservice" ) var ( diff --git a/go/vt/vtgate/vtgate_test.go b/go/vt/vtgate/vtgate_test.go index 72f487b548e..6decab4d814 100644 --- a/go/vt/vtgate/vtgate_test.go +++ b/go/vt/vtgate/vtgate_test.go @@ -25,17 +25,17 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/sandboxconn" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/sandboxconn" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // This file uses the sandbox_test framework. diff --git a/go/vt/vtgate/vtgateconn/vtgateconn.go b/go/vt/vtgate/vtgateconn/vtgateconn.go index dc90e5ca223..97b2ea21ac9 100644 --- a/go/vt/vtgate/vtgateconn/vtgateconn.go +++ b/go/vt/vtgate/vtgateconn/vtgateconn.go @@ -23,14 +23,14 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) // vtgateProtocol defines the RPC implementation used for connecting to vtgate. diff --git a/go/vt/vtgate/vtgateservice/interface.go b/go/vt/vtgate/vtgateservice/interface.go index fe3a19037e5..f2d0e0848c7 100644 --- a/go/vt/vtgate/vtgateservice/interface.go +++ b/go/vt/vtgate/vtgateservice/interface.go @@ -21,11 +21,11 @@ package vtgateservice import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/sqltypes" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) // VTGateService is the interface implemented by the VTGate service, diff --git a/go/vt/vthash/hash.go b/go/vt/vthash/hash.go index 5b539d5732b..68881a3c0ad 100644 --- a/go/vt/vthash/hash.go +++ b/go/vt/vthash/hash.go @@ -17,8 +17,8 @@ limitations under the License. package vthash import ( - "github.com/mdibaiee/vitess/go/vt/vthash/highway" - "github.com/mdibaiee/vitess/go/vt/vthash/metro" + "github.com/vitess/vitess/go/vt/vthash/highway" + "github.com/vitess/vitess/go/vt/vthash/metro" ) type Hasher = metro.Metro128 diff --git a/go/vt/vtorc/collection/collection.go b/go/vt/vtorc/collection/collection.go index d962dab638f..ee6c4668a6a 100644 --- a/go/vt/vtorc/collection/collection.go +++ b/go/vt/vtorc/collection/collection.go @@ -64,9 +64,9 @@ import ( "sync" "time" - // "github.com/mdibaiee/vitess/go/vt/log" + // "github.com/vitess/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/config" ) // Metric is an interface containing a metric diff --git a/go/vt/vtorc/config/config.go b/go/vt/vtorc/config/config.go index b9fc6f78d84..c7c97e9552d 100644 --- a/go/vt/vtorc/config/config.go +++ b/go/vt/vtorc/config/config.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) var configurationLoaded = make(chan bool) diff --git a/go/vt/vtorc/db/db.go b/go/vt/vtorc/db/db.go index 311fe41bf40..2079e54fd1e 100644 --- a/go/vt/vtorc/db/db.go +++ b/go/vt/vtorc/db/db.go @@ -20,9 +20,9 @@ import ( "database/sql" "strings" - "github.com/mdibaiee/vitess/go/vt/external/golib/sqlutils" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/external/golib/sqlutils" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtorc/config" ) var ( diff --git a/go/vt/vtorc/discovery/aggregated.go b/go/vt/vtorc/discovery/aggregated.go index 8edf9bf747a..770caf8d221 100644 --- a/go/vt/vtorc/discovery/aggregated.go +++ b/go/vt/vtorc/discovery/aggregated.go @@ -21,7 +21,7 @@ import ( "github.com/montanaflynn/stats" - "github.com/mdibaiee/vitess/go/vt/vtorc/collection" + "github.com/vitess/vitess/go/vt/vtorc/collection" ) // AggregatedDiscoveryMetrics contains aggregated metrics for instance discovery. diff --git a/go/vt/vtorc/discovery/queue.go b/go/vt/vtorc/discovery/queue.go index d4d7588d759..2d06523f736 100644 --- a/go/vt/vtorc/discovery/queue.go +++ b/go/vt/vtorc/discovery/queue.go @@ -29,8 +29,8 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtorc/config" ) // QueueMetric contains the queue's active and queued sizes diff --git a/go/vt/vtorc/inst/analysis.go b/go/vt/vtorc/inst/analysis.go index 4c8137fddfe..2f994624821 100644 --- a/go/vt/vtorc/inst/analysis.go +++ b/go/vt/vtorc/inst/analysis.go @@ -20,8 +20,8 @@ import ( "encoding/json" "time" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vtorc/config" ) type AnalysisCode string diff --git a/go/vt/vtorc/inst/analysis_dao.go b/go/vt/vtorc/inst/analysis_dao.go index b8407b90ee0..23e793c4a09 100644 --- a/go/vt/vtorc/inst/analysis_dao.go +++ b/go/vt/vtorc/inst/analysis_dao.go @@ -24,16 +24,16 @@ import ( "github.com/patrickmn/go-cache" "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/external/golib/sqlutils" - "github.com/mdibaiee/vitess/go/vt/log" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" - "github.com/mdibaiee/vitess/go/vt/vtorc/util" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/external/golib/sqlutils" + "github.com/vitess/vitess/go/vt/log" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil" + "github.com/vitess/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/vt/vtorc/util" ) var analysisChangeWriteCounter = stats.NewCounter("AnalysisChangeWrite", "Number of times analysis has changed") diff --git a/go/vt/vtorc/inst/analysis_dao_test.go b/go/vt/vtorc/inst/analysis_dao_test.go index d33f5d43d29..6a07127e9cd 100644 --- a/go/vt/vtorc/inst/analysis_dao_test.go +++ b/go/vt/vtorc/inst/analysis_dao_test.go @@ -23,10 +23,10 @@ import ( "github.com/patrickmn/go-cache" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/external/golib/sqlutils" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" - "github.com/mdibaiee/vitess/go/vt/vtorc/test" + "github.com/vitess/vitess/go/vt/external/golib/sqlutils" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/vt/vtorc/test" ) var ( diff --git a/go/vt/vtorc/inst/audit_dao.go b/go/vt/vtorc/inst/audit_dao.go index 8b7ca94e336..b2babebb883 100644 --- a/go/vt/vtorc/inst/audit_dao.go +++ b/go/vt/vtorc/inst/audit_dao.go @@ -21,10 +21,10 @@ import ( "os" "time" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/db" ) var auditOperationCounter = stats.NewCounter("AuditWrite", "Number of audit operations performed") diff --git a/go/vt/vtorc/inst/audit_dao_test.go b/go/vt/vtorc/inst/audit_dao_test.go index a54a092d785..a6e29187aee 100644 --- a/go/vt/vtorc/inst/audit_dao_test.go +++ b/go/vt/vtorc/inst/audit_dao_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/external/golib/sqlutils" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/vt/external/golib/sqlutils" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/db" ) // TestAuditOperation tests that auditing a operation works as intended based on the configurations. diff --git a/go/vt/vtorc/inst/binlog_test.go b/go/vt/vtorc/inst/binlog_test.go index dba482834a0..7faa93a2a8c 100644 --- a/go/vt/vtorc/inst/binlog_test.go +++ b/go/vt/vtorc/inst/binlog_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/config" ) var testCoordinates = BinlogCoordinates{LogFile: "mysql-bin.000010", LogPos: 108} diff --git a/go/vt/vtorc/inst/instance_dao.go b/go/vt/vtorc/inst/instance_dao.go index 1d43b77f258..7fdfc91126d 100644 --- a/go/vt/vtorc/inst/instance_dao.go +++ b/go/vt/vtorc/inst/instance_dao.go @@ -31,20 +31,20 @@ import ( "github.com/patrickmn/go-cache" "github.com/sjmudd/stopwatch" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/tb" - "github.com/mdibaiee/vitess/go/vt/external/golib/sqlutils" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtorc/collection" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" - "github.com/mdibaiee/vitess/go/vt/vtorc/metrics/query" - "github.com/mdibaiee/vitess/go/vt/vtorc/util" - - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/tb" + "github.com/vitess/vitess/go/vt/external/golib/sqlutils" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtorc/collection" + "github.com/vitess/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/vt/vtorc/metrics/query" + "github.com/vitess/vitess/go/vt/vtorc/util" + + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/vtorc/inst/instance_dao_test.go b/go/vt/vtorc/inst/instance_dao_test.go index 6eb4ed840b8..1bb84d7b268 100644 --- a/go/vt/vtorc/inst/instance_dao_test.go +++ b/go/vt/vtorc/inst/instance_dao_test.go @@ -11,12 +11,12 @@ import ( "github.com/patrickmn/go-cache" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/external/golib/sqlutils" - "github.com/mdibaiee/vitess/go/vt/log" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/vt/external/golib/sqlutils" + "github.com/vitess/vitess/go/vt/log" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/db" ) var ( diff --git a/go/vt/vtorc/inst/instance_test.go b/go/vt/vtorc/inst/instance_test.go index 15acaa0c6d4..2dfd640d5e4 100644 --- a/go/vt/vtorc/inst/instance_test.go +++ b/go/vt/vtorc/inst/instance_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/config" ) func init() { diff --git a/go/vt/vtorc/inst/keyspace_dao.go b/go/vt/vtorc/inst/keyspace_dao.go index 0873d43c3f4..046f8011ef1 100644 --- a/go/vt/vtorc/inst/keyspace_dao.go +++ b/go/vt/vtorc/inst/keyspace_dao.go @@ -19,11 +19,11 @@ package inst import ( "errors" - "github.com/mdibaiee/vitess/go/vt/external/golib/sqlutils" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/vt/external/golib/sqlutils" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil" + "github.com/vitess/vitess/go/vt/vtorc/db" ) // ErrKeyspaceNotFound is a fixed error message used when a keyspace is not found in the database. diff --git a/go/vt/vtorc/inst/keyspace_dao_test.go b/go/vt/vtorc/inst/keyspace_dao_test.go index 2719c31980c..034832e2aa1 100644 --- a/go/vt/vtorc/inst/keyspace_dao_test.go +++ b/go/vt/vtorc/inst/keyspace_dao_test.go @@ -21,11 +21,11 @@ import ( "github.com/stretchr/testify/require" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil" + "github.com/vitess/vitess/go/vt/vtorc/db" ) func TestSaveAndReadKeyspace(t *testing.T) { diff --git a/go/vt/vtorc/inst/replication_thread_state.go b/go/vt/vtorc/inst/replication_thread_state.go index 409cb725669..6479709a98b 100644 --- a/go/vt/vtorc/inst/replication_thread_state.go +++ b/go/vt/vtorc/inst/replication_thread_state.go @@ -17,7 +17,7 @@ package inst import ( - "github.com/mdibaiee/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/replication" ) type ReplicationThreadState int diff --git a/go/vt/vtorc/inst/shard_dao.go b/go/vt/vtorc/inst/shard_dao.go index e721cad7da6..ad6df29759c 100644 --- a/go/vt/vtorc/inst/shard_dao.go +++ b/go/vt/vtorc/inst/shard_dao.go @@ -19,11 +19,11 @@ package inst import ( "errors" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/external/golib/sqlutils" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/external/golib/sqlutils" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtorc/db" ) // ErrShardNotFound is a fixed error message used when a shard is not found in the database. diff --git a/go/vt/vtorc/inst/shard_dao_test.go b/go/vt/vtorc/inst/shard_dao_test.go index edb91b476c3..d767ae26070 100644 --- a/go/vt/vtorc/inst/shard_dao_test.go +++ b/go/vt/vtorc/inst/shard_dao_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/protoutil" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/protoutil" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtorc/db" ) func TestSaveAndReadShard(t *testing.T) { diff --git a/go/vt/vtorc/inst/tablet_dao.go b/go/vt/vtorc/inst/tablet_dao.go index 17f42b94f38..244256e2c6a 100644 --- a/go/vt/vtorc/inst/tablet_dao.go +++ b/go/vt/vtorc/inst/tablet_dao.go @@ -22,15 +22,15 @@ import ( "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/external/golib/sqlutils" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/external/golib/sqlutils" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" ) // ErrTabletAliasNil is a fixed error message. diff --git a/go/vt/vtorc/inst/tablet_dao_test.go b/go/vt/vtorc/inst/tablet_dao_test.go index 34cf62cc162..eec63765b7f 100644 --- a/go/vt/vtorc/inst/tablet_dao_test.go +++ b/go/vt/vtorc/inst/tablet_dao_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/require" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtorc/db" ) func TestSaveAndReadTablet(t *testing.T) { diff --git a/go/vt/vtorc/logic/disable_recovery.go b/go/vt/vtorc/logic/disable_recovery.go index 3b46ff9b1b7..3591fc3979f 100644 --- a/go/vt/vtorc/logic/disable_recovery.go +++ b/go/vt/vtorc/logic/disable_recovery.go @@ -32,9 +32,9 @@ package logic import ( "fmt" - "github.com/mdibaiee/vitess/go/vt/external/golib/sqlutils" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/vt/external/golib/sqlutils" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtorc/db" ) // IsRecoveryDisabled returns true if Recoveries are disabled globally diff --git a/go/vt/vtorc/logic/keyspace_shard_discovery.go b/go/vt/vtorc/logic/keyspace_shard_discovery.go index 039b3d515a0..944f5b08714 100644 --- a/go/vt/vtorc/logic/keyspace_shard_discovery.go +++ b/go/vt/vtorc/logic/keyspace_shard_discovery.go @@ -22,10 +22,10 @@ import ( "strings" "sync" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtorc/inst" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtorc/inst" ) // RefreshAllKeyspacesAndShards reloads the keyspace and shard information for the keyspaces that vtorc is concerned with. diff --git a/go/vt/vtorc/logic/keyspace_shard_discovery_test.go b/go/vt/vtorc/logic/keyspace_shard_discovery_test.go index 2ae9263e8d3..4aeeca2cc68 100644 --- a/go/vt/vtorc/logic/keyspace_shard_discovery_test.go +++ b/go/vt/vtorc/logic/keyspace_shard_discovery_test.go @@ -24,13 +24,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil/reparenttestutil" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" - "github.com/mdibaiee/vitess/go/vt/vtorc/inst" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil/reparenttestutil" + "github.com/vitess/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/vt/vtorc/inst" ) var ( diff --git a/go/vt/vtorc/logic/tablet_discovery.go b/go/vt/vtorc/logic/tablet_discovery.go index 921ccbf7abe..6373fa08a35 100644 --- a/go/vt/vtorc/logic/tablet_discovery.go +++ b/go/vt/vtorc/logic/tablet_discovery.go @@ -31,18 +31,18 @@ import ( "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/external/golib/sqlutils" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" - "github.com/mdibaiee/vitess/go/vt/vtorc/inst" - "github.com/mdibaiee/vitess/go/vt/vtorc/process" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/external/golib/sqlutils" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/vt/vtorc/inst" + "github.com/vitess/vitess/go/vt/vtorc/process" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/vt/vtorc/logic/tablet_discovery_test.go b/go/vt/vtorc/logic/tablet_discovery_test.go index 44532fc7625..b3b987b47c0 100644 --- a/go/vt/vtorc/logic/tablet_discovery_test.go +++ b/go/vt/vtorc/logic/tablet_discovery_test.go @@ -28,16 +28,16 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/external/golib/sqlutils" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver/testutil" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" - "github.com/mdibaiee/vitess/go/vt/vtorc/inst" - "github.com/mdibaiee/vitess/go/vt/vtorc/process" + "github.com/vitess/vitess/go/vt/external/golib/sqlutils" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver/testutil" + "github.com/vitess/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/vt/vtorc/inst" + "github.com/vitess/vitess/go/vt/vtorc/process" ) var ( diff --git a/go/vt/vtorc/logic/topology_recovery.go b/go/vt/vtorc/logic/topology_recovery.go index 094064d575c..0051068200a 100644 --- a/go/vt/vtorc/logic/topology_recovery.go +++ b/go/vt/vtorc/logic/topology_recovery.go @@ -23,16 +23,16 @@ import ( "math/rand/v2" "time" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" - "github.com/mdibaiee/vitess/go/vt/vtorc/inst" - "github.com/mdibaiee/vitess/go/vt/vtorc/util" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil" + "github.com/vitess/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/inst" + "github.com/vitess/vitess/go/vt/vtorc/util" ) const ( diff --git a/go/vt/vtorc/logic/topology_recovery_dao.go b/go/vt/vtorc/logic/topology_recovery_dao.go index 7963ee80074..14025ec41f3 100644 --- a/go/vt/vtorc/logic/topology_recovery_dao.go +++ b/go/vt/vtorc/logic/topology_recovery_dao.go @@ -20,11 +20,11 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/vt/external/golib/sqlutils" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" - "github.com/mdibaiee/vitess/go/vt/vtorc/inst" + "github.com/vitess/vitess/go/vt/external/golib/sqlutils" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/vt/vtorc/inst" ) // InsertRecoveryDetection inserts the recovery analysis that has been detected. diff --git a/go/vt/vtorc/logic/topology_recovery_dao_test.go b/go/vt/vtorc/logic/topology_recovery_dao_test.go index 47d4309027a..77e735d8893 100644 --- a/go/vt/vtorc/logic/topology_recovery_dao_test.go +++ b/go/vt/vtorc/logic/topology_recovery_dao_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/external/golib/sqlutils" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" - "github.com/mdibaiee/vitess/go/vt/vtorc/inst" + "github.com/vitess/vitess/go/vt/external/golib/sqlutils" + "github.com/vitess/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/vt/vtorc/inst" ) // TestTopologyRecovery tests various operations related to topology recovery like reading from and writing it to the database. diff --git a/go/vt/vtorc/logic/topology_recovery_test.go b/go/vt/vtorc/logic/topology_recovery_test.go index 3dceb4a6b22..d1236ac6728 100644 --- a/go/vt/vtorc/logic/topology_recovery_test.go +++ b/go/vt/vtorc/logic/topology_recovery_test.go @@ -22,13 +22,13 @@ import ( "github.com/stretchr/testify/require" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" - "github.com/mdibaiee/vitess/go/vt/vtorc/inst" - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmclient" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/vt/vtorc/inst" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctmclient" ) func TestAnalysisEntriesHaveSameRecovery(t *testing.T) { diff --git a/go/vt/vtorc/logic/vtorc.go b/go/vt/vtorc/logic/vtorc.go index f6adc5c949a..25ca72b36fa 100644 --- a/go/vt/vtorc/logic/vtorc.go +++ b/go/vt/vtorc/logic/vtorc.go @@ -27,15 +27,15 @@ import ( "github.com/patrickmn/go-cache" "github.com/sjmudd/stopwatch" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtorc/collection" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" - "github.com/mdibaiee/vitess/go/vt/vtorc/discovery" - "github.com/mdibaiee/vitess/go/vt/vtorc/inst" - ometrics "github.com/mdibaiee/vitess/go/vt/vtorc/metrics" - "github.com/mdibaiee/vitess/go/vt/vtorc/util" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtorc/collection" + "github.com/vitess/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/discovery" + "github.com/vitess/vitess/go/vt/vtorc/inst" + ometrics "github.com/vitess/vitess/go/vt/vtorc/metrics" + "github.com/vitess/vitess/go/vt/vtorc/util" ) const ( diff --git a/go/vt/vtorc/metrics/metrics.go b/go/vt/vtorc/metrics/metrics.go index 5f0456a01e5..c742b22871f 100644 --- a/go/vt/vtorc/metrics/metrics.go +++ b/go/vt/vtorc/metrics/metrics.go @@ -19,7 +19,7 @@ package metrics import ( "time" - "github.com/mdibaiee/vitess/go/vt/vtorc/config" + "github.com/vitess/vitess/go/vt/vtorc/config" ) var matricTickCallbacks [](func()) diff --git a/go/vt/vtorc/process/health.go b/go/vt/vtorc/process/health.go index 7508d178721..e62ae5b7bb2 100644 --- a/go/vt/vtorc/process/health.go +++ b/go/vt/vtorc/process/health.go @@ -20,8 +20,8 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtorc/db" ) var FirstDiscoveryCycleComplete atomic.Bool diff --git a/go/vt/vtorc/server/api.go b/go/vt/vtorc/server/api.go index f0f430eb3c1..f605e731ae6 100644 --- a/go/vt/vtorc/server/api.go +++ b/go/vt/vtorc/server/api.go @@ -24,13 +24,13 @@ import ( "strconv" "time" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtorc/collection" - "github.com/mdibaiee/vitess/go/vt/vtorc/discovery" - "github.com/mdibaiee/vitess/go/vt/vtorc/inst" - "github.com/mdibaiee/vitess/go/vt/vtorc/logic" - "github.com/mdibaiee/vitess/go/vt/vtorc/process" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtorc/collection" + "github.com/vitess/vitess/go/vt/vtorc/discovery" + "github.com/vitess/vitess/go/vt/vtorc/inst" + "github.com/vitess/vitess/go/vt/vtorc/logic" + "github.com/vitess/vitess/go/vt/vtorc/process" ) // vtorcAPI struct is created to implement the Handler interface to register diff --git a/go/vt/vtorc/server/api_test.go b/go/vt/vtorc/server/api_test.go index aeb4c16c4c3..e52ef5bcd9f 100644 --- a/go/vt/vtorc/server/api_test.go +++ b/go/vt/vtorc/server/api_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/acl" + "github.com/vitess/vitess/go/acl" ) func TestGetACLPermissionLevelForAPI(t *testing.T) { diff --git a/go/vt/vtorc/server/discovery.go b/go/vt/vtorc/server/discovery.go index 5f0b118705e..7cbf5f461ea 100644 --- a/go/vt/vtorc/server/discovery.go +++ b/go/vt/vtorc/server/discovery.go @@ -17,8 +17,8 @@ limitations under the License. package server import ( - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtorc/logic" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtorc/logic" ) // StartVTOrcDiscovery starts VTOrc discovery serving diff --git a/go/vt/vtorc/test/db.go b/go/vt/vtorc/test/db.go index 5dfa2c3ba14..36940358487 100644 --- a/go/vt/vtorc/test/db.go +++ b/go/vt/vtorc/test/db.go @@ -19,9 +19,9 @@ package test import ( "fmt" - "github.com/mdibaiee/vitess/go/vt/external/golib/sqlutils" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtorc/db" + "github.com/vitess/vitess/go/vt/external/golib/sqlutils" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtorc/db" ) var _ db.DB = (*DB)(nil) diff --git a/go/vt/vtorc/test/recovery_analysis.go b/go/vt/vtorc/test/recovery_analysis.go index 78eb3761d0e..29dec21885b 100644 --- a/go/vt/vtorc/test/recovery_analysis.go +++ b/go/vt/vtorc/test/recovery_analysis.go @@ -22,9 +22,9 @@ import ( "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/vt/external/golib/sqlutils" + "github.com/vitess/vitess/go/vt/external/golib/sqlutils" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) type InfoForRecoveryAnalysis struct { diff --git a/go/vt/vttablet/customrule/filecustomrule/filecustomrule.go b/go/vt/vttablet/customrule/filecustomrule/filecustomrule.go index 1391907fbf8..426e4dc9bfc 100644 --- a/go/vt/vttablet/customrule/filecustomrule/filecustomrule.go +++ b/go/vt/vttablet/customrule/filecustomrule/filecustomrule.go @@ -25,10 +25,10 @@ import ( "github.com/fsnotify/fsnotify" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules" ) var ( diff --git a/go/vt/vttablet/customrule/filecustomrule/filecustomrule_test.go b/go/vt/vttablet/customrule/filecustomrule/filecustomrule_test.go index f9a30fa4ea4..f0af95a0a5b 100644 --- a/go/vt/vttablet/customrule/filecustomrule/filecustomrule_test.go +++ b/go/vt/vttablet/customrule/filecustomrule/filecustomrule_test.go @@ -21,8 +21,8 @@ import ( "path" "testing" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletservermock" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules" + "github.com/vitess/vitess/go/vt/vttablet/tabletservermock" ) var customRule1 = `[ diff --git a/go/vt/vttablet/customrule/topocustomrule/topocustomrule.go b/go/vt/vttablet/customrule/topocustomrule/topocustomrule.go index 520c1afbe1f..0a61eac85f2 100644 --- a/go/vt/vttablet/customrule/topocustomrule/topocustomrule.go +++ b/go/vt/vttablet/customrule/topocustomrule/topocustomrule.go @@ -29,11 +29,11 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules" ) var ( diff --git a/go/vt/vttablet/customrule/topocustomrule/topocustomrule_test.go b/go/vt/vttablet/customrule/topocustomrule/topocustomrule_test.go index 21902ff3c73..bec6231d82c 100644 --- a/go/vt/vttablet/customrule/topocustomrule/topocustomrule_test.go +++ b/go/vt/vttablet/customrule/topocustomrule/topocustomrule_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletservermock" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules" + "github.com/vitess/vitess/go/vt/vttablet/tabletservermock" ) var customRule1 = ` diff --git a/go/vt/vttablet/endtoend/acl_test.go b/go/vt/vttablet/endtoend/acl_test.go index 56b446c1ce8..f297cfccb78 100644 --- a/go/vt/vttablet/endtoend/acl_test.go +++ b/go/vt/vttablet/endtoend/acl_test.go @@ -23,11 +23,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestTableACL(t *testing.T) { diff --git a/go/vt/vttablet/endtoend/call_test.go b/go/vt/vttablet/endtoend/call_test.go index 17c06575d00..f9d5b490eb8 100644 --- a/go/vt/vttablet/endtoend/call_test.go +++ b/go/vt/vttablet/endtoend/call_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" ) var procSQL = []string{ diff --git a/go/vt/vttablet/endtoend/compatibility_test.go b/go/vt/vttablet/endtoend/compatibility_test.go index 1e3a7bc4526..1b2cbe9058b 100644 --- a/go/vt/vttablet/endtoend/compatibility_test.go +++ b/go/vt/vttablet/endtoend/compatibility_test.go @@ -21,14 +21,14 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" ) var point12 = "\x00\x00\x00\x00\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x00\x00\x00@" diff --git a/go/vt/vttablet/endtoend/config_test.go b/go/vt/vttablet/endtoend/config_test.go index fe082e92720..56a01e6630b 100644 --- a/go/vt/vttablet/endtoend/config_test.go +++ b/go/vt/vttablet/endtoend/config_test.go @@ -26,14 +26,14 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) func TestPoolSize(t *testing.T) { diff --git a/go/vt/vttablet/endtoend/connkilling/connkiller_test.go b/go/vt/vttablet/endtoend/connkilling/connkiller_test.go index f426d5e200d..43758aa6d3d 100644 --- a/go/vt/vttablet/endtoend/connkilling/connkiller_test.go +++ b/go/vt/vttablet/endtoend/connkilling/connkiller_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" ) func TestTxKillerKillsTransactionsInReservedConnections(t *testing.T) { diff --git a/go/vt/vttablet/endtoend/connkilling/main_test.go b/go/vt/vttablet/endtoend/connkilling/main_test.go index 2c1e4eb6e6f..2c35b0c7b10 100644 --- a/go/vt/vttablet/endtoend/connkilling/main_test.go +++ b/go/vt/vttablet/endtoend/connkilling/main_test.go @@ -25,14 +25,14 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/tableacl" - "github.com/mdibaiee/vitess/go/vt/tableacl/simpleacl" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttest" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/tableacl" + "github.com/vitess/vitess/go/vt/tableacl/simpleacl" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttest" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" ) var ( diff --git a/go/vt/vttablet/endtoend/endtoend.go b/go/vt/vttablet/endtoend/endtoend.go index 1f83da2b8a3..8161874a76b 100644 --- a/go/vt/vttablet/endtoend/endtoend.go +++ b/go/vt/vttablet/endtoend/endtoend.go @@ -22,8 +22,8 @@ import ( "encoding/json" "fmt" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" ) func prettyPrint(qr sqltypes.Result) string { diff --git a/go/vt/vttablet/endtoend/framework/client.go b/go/vt/vttablet/endtoend/framework/client.go index a60e6b781bd..77bd4ddd544 100644 --- a/go/vt/vttablet/endtoend/framework/client.go +++ b/go/vt/vttablet/endtoend/framework/client.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // QueryClient provides a convenient wrapper for TabletServer's query service. diff --git a/go/vt/vttablet/endtoend/framework/eventcatcher.go b/go/vt/vttablet/endtoend/framework/eventcatcher.go index dbb875abd76..550fa8da9ba 100644 --- a/go/vt/vttablet/endtoend/framework/eventcatcher.go +++ b/go/vt/vttablet/endtoend/framework/eventcatcher.go @@ -20,8 +20,8 @@ import ( "errors" "time" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) func NewQueryCatcher() *EventCatcher[*tabletenv.LogStats] { diff --git a/go/vt/vttablet/endtoend/framework/server.go b/go/vt/vttablet/endtoend/framework/server.go index ef9b30b8405..d63e79e2b03 100644 --- a/go/vt/vttablet/endtoend/framework/server.go +++ b/go/vt/vttablet/endtoend/framework/server.go @@ -23,25 +23,25 @@ import ( "net/http" "time" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/yaml2" - - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/vtgate/fakerpcvtgateconn" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/yaml2" + + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vterrors" + + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/vtgate/fakerpcvtgateconn" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/vt/vttablet/endtoend/framework/testcase.go b/go/vt/vttablet/endtoend/framework/testcase.go index d0c8e93f203..053025fbf55 100644 --- a/go/vt/vttablet/endtoend/framework/testcase.go +++ b/go/vt/vttablet/endtoend/framework/testcase.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // Testable restricts the types that can be added to diff --git a/go/vt/vttablet/endtoend/healthstream_test.go b/go/vt/vttablet/endtoend/healthstream_test.go index 391ca57d7b0..487947ca887 100644 --- a/go/vt/vttablet/endtoend/healthstream_test.go +++ b/go/vt/vttablet/endtoend/healthstream_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" ) func TestSchemaChange(t *testing.T) { diff --git a/go/vt/vttablet/endtoend/main_test.go b/go/vt/vttablet/endtoend/main_test.go index 26a6b2578a8..fc362faccb2 100644 --- a/go/vt/vttablet/endtoend/main_test.go +++ b/go/vt/vttablet/endtoend/main_test.go @@ -24,14 +24,14 @@ import ( "os" "testing" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/tableacl" - "github.com/mdibaiee/vitess/go/vt/tableacl/simpleacl" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttest" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/tableacl" + "github.com/vitess/vitess/go/vt/tableacl/simpleacl" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttest" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" ) var ( diff --git a/go/vt/vttablet/endtoend/metadata_test.go b/go/vt/vttablet/endtoend/metadata_test.go index aaf008e3f8a..0dbbc6644a1 100644 --- a/go/vt/vttablet/endtoend/metadata_test.go +++ b/go/vt/vttablet/endtoend/metadata_test.go @@ -19,12 +19,12 @@ package endtoend import ( "testing" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func getAndSetup(t *testing.T) *framework.QueryClient { diff --git a/go/vt/vttablet/endtoend/misc_test.go b/go/vt/vttablet/endtoend/misc_test.go index 14d8dfe84ee..da01239022b 100644 --- a/go/vt/vttablet/endtoend/misc_test.go +++ b/go/vt/vttablet/endtoend/misc_test.go @@ -31,14 +31,14 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/log" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" ) func TestSimpleRead(t *testing.T) { diff --git a/go/vt/vttablet/endtoend/queries_test.go b/go/vt/vttablet/endtoend/queries_test.go index de1586f174d..2cc0344b313 100644 --- a/go/vt/vttablet/endtoend/queries_test.go +++ b/go/vt/vttablet/endtoend/queries_test.go @@ -23,11 +23,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var frameworkErrors = `fail failed: diff --git a/go/vt/vttablet/endtoend/reserve_test.go b/go/vt/vttablet/endtoend/reserve_test.go index 74c6615a131..28459ae24b2 100644 --- a/go/vt/vttablet/endtoend/reserve_test.go +++ b/go/vt/vttablet/endtoend/reserve_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" ) func TestMultipleReserveHaveDifferentConnection(t *testing.T) { diff --git a/go/vt/vttablet/endtoend/rpc_test.go b/go/vt/vttablet/endtoend/rpc_test.go index f3eedce9d1b..bb5b6a02dcf 100644 --- a/go/vt/vttablet/endtoend/rpc_test.go +++ b/go/vt/vttablet/endtoend/rpc_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/callerid" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/vt/callerid" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" ) // TestGetSchemaRPC will validate GetSchema RPC. diff --git a/go/vt/vttablet/endtoend/savepoint_test.go b/go/vt/vttablet/endtoend/savepoint_test.go index 04451cfbf68..2837288c4fb 100644 --- a/go/vt/vttablet/endtoend/savepoint_test.go +++ b/go/vt/vttablet/endtoend/savepoint_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" ) func TestSavepointInTransactionWithSRollback(t *testing.T) { diff --git a/go/vt/vttablet/endtoend/sequence_test.go b/go/vt/vttablet/endtoend/sequence_test.go index 5594b253bd9..47fc84963a5 100644 --- a/go/vt/vttablet/endtoend/sequence_test.go +++ b/go/vt/vttablet/endtoend/sequence_test.go @@ -19,16 +19,16 @@ package endtoend import ( "testing" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/test/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestSequence(t *testing.T) { diff --git a/go/vt/vttablet/endtoend/settings_test.go b/go/vt/vttablet/endtoend/settings_test.go index 1efd9c05266..53ab7f8bfad 100644 --- a/go/vt/vttablet/endtoend/settings_test.go +++ b/go/vt/vttablet/endtoend/settings_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" ) func TestSelectNoConnectionReservationOnSettings(t *testing.T) { diff --git a/go/vt/vttablet/endtoend/stream_test.go b/go/vt/vttablet/endtoend/stream_test.go index 2cdb62a6033..def632c7ddf 100644 --- a/go/vt/vttablet/endtoend/stream_test.go +++ b/go/vt/vttablet/endtoend/stream_test.go @@ -30,10 +30,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" ) func TestStreamUnion(t *testing.T) { diff --git a/go/vt/vttablet/endtoend/streamtimeout/healthstream_test.go b/go/vt/vttablet/endtoend/streamtimeout/healthstream_test.go index 4cb4a82b7a0..8836b6b0a01 100644 --- a/go/vt/vttablet/endtoend/streamtimeout/healthstream_test.go +++ b/go/vt/vttablet/endtoend/streamtimeout/healthstream_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/mysql" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" ) // TestSchemaChangeTimedout ensures that the timeout functionality is working properly diff --git a/go/vt/vttablet/endtoend/streamtimeout/main_test.go b/go/vt/vttablet/endtoend/streamtimeout/main_test.go index 6cb5a4bb2db..f04491beeca 100644 --- a/go/vt/vttablet/endtoend/streamtimeout/main_test.go +++ b/go/vt/vttablet/endtoend/streamtimeout/main_test.go @@ -27,11 +27,11 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttest" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttest" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" ) var ( diff --git a/go/vt/vttablet/endtoend/transaction_test.go b/go/vt/vttablet/endtoend/transaction_test.go index aa47686a032..303148af6e6 100644 --- a/go/vt/vttablet/endtoend/transaction_test.go +++ b/go/vt/vttablet/endtoend/transaction_test.go @@ -22,20 +22,20 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv/tabletenvtest" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv/tabletenvtest" "google.golang.org/protobuf/proto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/test/utils" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/test/utils" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) func TestCommit(t *testing.T) { diff --git a/go/vt/vttablet/endtoend/udfs_test.go b/go/vt/vttablet/endtoend/udfs_test.go index 7432586e313..ef75e01185e 100644 --- a/go/vt/vttablet/endtoend/udfs_test.go +++ b/go/vt/vttablet/endtoend/udfs_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/callerid" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/vt/callerid" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" ) const ( diff --git a/go/vt/vttablet/endtoend/views_test.go b/go/vt/vttablet/endtoend/views_test.go index ac50ed39707..05ac0e20894 100644 --- a/go/vt/vttablet/endtoend/views_test.go +++ b/go/vt/vttablet/endtoend/views_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var qSelAllRows = "select table_schema, table_name, create_statement from _vt.views" diff --git a/go/vt/vttablet/endtoend/vstreamer_test.go b/go/vt/vttablet/endtoend/vstreamer_test.go index 0bf251cc98d..dfe92666fcb 100644 --- a/go/vt/vttablet/endtoend/vstreamer_test.go +++ b/go/vt/vttablet/endtoend/vstreamer_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletpb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vttablet/endtoend/framework" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletpb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vttablet/endtoend/framework" ) type test struct { diff --git a/go/vt/vttablet/faketmclient/fake_client.go b/go/vt/vttablet/faketmclient/fake_client.go index e9a2856095b..eecca5ef354 100644 --- a/go/vt/vttablet/faketmclient/fake_client.go +++ b/go/vt/vttablet/faketmclient/fake_client.go @@ -26,17 +26,17 @@ import ( "io" "time" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/hook" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/hook" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + querypb "github.com/vitess/vitess/go/vt/proto/query" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // NewFakeTabletManagerClient should be used to create a new FakeTabletManagerClient. diff --git a/go/vt/vttablet/filelogger/filelogger.go b/go/vt/vttablet/filelogger/filelogger.go index 27c11e976f4..17f18d3cb85 100644 --- a/go/vt/vttablet/filelogger/filelogger.go +++ b/go/vt/vttablet/filelogger/filelogger.go @@ -20,10 +20,10 @@ package filelogger import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) var logQueriesToFile string diff --git a/go/vt/vttablet/filelogger/filelogger_test.go b/go/vt/vttablet/filelogger/filelogger_test.go index 2c3d89aa839..ba526dca9a7 100644 --- a/go/vt/vttablet/filelogger/filelogger_test.go +++ b/go/vt/vttablet/filelogger/filelogger_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) // TestFileLog sends a stream of five query records to the plugin, and verifies that they are logged. diff --git a/go/vt/vttablet/flags.go b/go/vt/vttablet/flags.go index 55d3da6cd38..3adea0b01c1 100644 --- a/go/vt/vttablet/flags.go +++ b/go/vt/vttablet/flags.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/servenv" ) const ( diff --git a/go/vt/vttablet/grpcqueryservice/server.go b/go/vt/vttablet/grpcqueryservice/server.go index 781b877ddea..26a4635e632 100644 --- a/go/vt/vttablet/grpcqueryservice/server.go +++ b/go/vt/vttablet/grpcqueryservice/server.go @@ -21,15 +21,15 @@ import ( "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/callinfo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - queryservicepb "github.com/mdibaiee/vitess/go/vt/proto/queryservice" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/callinfo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + queryservicepb "github.com/vitess/vitess/go/vt/proto/queryservice" ) // query is the gRPC query service implementation. diff --git a/go/vt/vttablet/grpctabletconn/conn.go b/go/vt/vttablet/grpctabletconn/conn.go index 67e2d2862b4..91a9d39bd78 100644 --- a/go/vt/vttablet/grpctabletconn/conn.go +++ b/go/vt/vttablet/grpctabletconn/conn.go @@ -24,18 +24,18 @@ import ( "github.com/spf13/pflag" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - queryservicepb "github.com/mdibaiee/vitess/go/vt/proto/queryservice" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + queryservicepb "github.com/vitess/vitess/go/vt/proto/queryservice" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const protocolName = "grpc" diff --git a/go/vt/vttablet/grpctabletconn/conn_test.go b/go/vt/vttablet/grpctabletconn/conn_test.go index 212df00311f..f3e9f0b1005 100644 --- a/go/vt/vttablet/grpctabletconn/conn_test.go +++ b/go/vt/vttablet/grpctabletconn/conn_test.go @@ -28,15 +28,15 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/sqltypes" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - queryservicepb "github.com/mdibaiee/vitess/go/vt/proto/queryservice" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/grpcqueryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconntest" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/sqltypes" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + queryservicepb "github.com/vitess/vitess/go/vt/proto/queryservice" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vttablet/grpcqueryservice" + "github.com/vitess/vitess/go/vt/vttablet/tabletconntest" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // This test makes sure the go rpc service works diff --git a/go/vt/vttablet/grpctmclient/cached_client.go b/go/vt/vttablet/grpctmclient/cached_client.go index 43fefec9586..b3f62fb5bc1 100644 --- a/go/vt/vttablet/grpctmclient/cached_client.go +++ b/go/vt/vttablet/grpctmclient/cached_client.go @@ -27,14 +27,14 @@ import ( "golang.org/x/sync/semaphore" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - tabletmanagerservicepb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerservice" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + tabletmanagerservicepb "github.com/vitess/vitess/go/vt/proto/tabletmanagerservice" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var defaultPoolCapacity = 100 diff --git a/go/vt/vttablet/grpctmclient/cached_client_flaky_test.go b/go/vt/vttablet/grpctmclient/cached_client_flaky_test.go index 45876a3ecad..715b3e16b21 100644 --- a/go/vt/vttablet/grpctmclient/cached_client_flaky_test.go +++ b/go/vt/vttablet/grpctmclient/cached_client_flaky_test.go @@ -33,11 +33,11 @@ import ( "golang.org/x/net/nettest" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmserver" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmrpctest" + "github.com/vitess/vitess/go/vt/vttablet/grpctmserver" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager" + "github.com/vitess/vitess/go/vt/vttablet/tmrpctest" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func grpcTestServer(t testing.TB, tm tabletmanager.RPCTM) (*net.TCPAddr, func()) { diff --git a/go/vt/vttablet/grpctmclient/client.go b/go/vt/vttablet/grpctmclient/client.go index bef227091c2..c0bb9a47c51 100644 --- a/go/vt/vttablet/grpctmclient/client.go +++ b/go/vt/vttablet/grpctmclient/client.go @@ -26,23 +26,23 @@ import ( "github.com/spf13/pflag" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/hook" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - tabletmanagerservicepb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerservice" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/hook" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + querypb "github.com/vitess/vitess/go/vt/proto/query" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + tabletmanagerservicepb "github.com/vitess/vitess/go/vt/proto/tabletmanagerservice" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) type DialPoolGroup int diff --git a/go/vt/vttablet/grpctmclient/client_test.go b/go/vt/vttablet/grpctmclient/client_test.go index d9f91895372..e03306ea0ba 100644 --- a/go/vt/vttablet/grpctmclient/client_test.go +++ b/go/vt/vttablet/grpctmclient/client_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/connectivity" - "github.com/mdibaiee/vitess/go/netutil" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/netutil" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestDialDedicatedPool(t *testing.T) { diff --git a/go/vt/vttablet/grpctmserver/server.go b/go/vt/vttablet/grpctmserver/server.go index 6f459bf086e..829e57a8b81 100644 --- a/go/vt/vttablet/grpctmserver/server.go +++ b/go/vt/vttablet/grpctmserver/server.go @@ -22,19 +22,19 @@ import ( "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/callinfo" - "github.com/mdibaiee/vitess/go/vt/hook" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager" - - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - tabletmanagerservicepb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerservice" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/callinfo" + "github.com/vitess/vitess/go/vt/hook" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager" + + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + tabletmanagerservicepb "github.com/vitess/vitess/go/vt/proto/tabletmanagerservice" ) // server is the gRPC implementation of the RPC server diff --git a/go/vt/vttablet/grpctmserver/server_test.go b/go/vt/vttablet/grpctmserver/server_test.go index ed0fb79cddb..0a1e491c81f 100644 --- a/go/vt/vttablet/grpctmserver/server_test.go +++ b/go/vt/vttablet/grpctmserver/server_test.go @@ -22,11 +22,11 @@ import ( "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmclient" - "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmserver" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmrpctest" + "github.com/vitess/vitess/go/vt/vttablet/grpctmclient" + "github.com/vitess/vitess/go/vt/vttablet/grpctmserver" + "github.com/vitess/vitess/go/vt/vttablet/tmrpctest" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // TestGRPCTMServer creates a fake server implementation, a fake client diff --git a/go/vt/vttablet/onlineddl/analysis.go b/go/vt/vttablet/onlineddl/analysis.go index 02ab2b58162..cbbabecdb32 100644 --- a/go/vt/vttablet/onlineddl/analysis.go +++ b/go/vt/vttablet/onlineddl/analysis.go @@ -20,12 +20,12 @@ import ( "context" "encoding/json" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/schemadiff" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/capabilities" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/schemadiff" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) type specialAlterOperation string diff --git a/go/vt/vttablet/onlineddl/analysis_test.go b/go/vt/vttablet/onlineddl/analysis_test.go index 09f32e1cf86..e09953ec5db 100644 --- a/go/vt/vttablet/onlineddl/analysis_test.go +++ b/go/vt/vttablet/onlineddl/analysis_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/sqlparser" ) func TestAnalyzeInstantDDL(t *testing.T) { diff --git a/go/vt/vttablet/onlineddl/executor.go b/go/vt/vttablet/onlineddl/executor.go index 16957dd2e0d..d4ddd39d5ea 100644 --- a/go/vt/vttablet/onlineddl/executor.go +++ b/go/vt/vttablet/onlineddl/executor.go @@ -36,35 +36,35 @@ import ( "github.com/spf13/pflag" "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/syscallutil" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/dbconnpool" - "github.com/mdibaiee/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/schemadiff" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/syscallutil" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/dbconnpool" + "github.com/vitess/vitess/go/vt/log" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/schemadiff" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" ) var ( diff --git a/go/vt/vttablet/onlineddl/executor_test.go b/go/vt/vttablet/onlineddl/executor_test.go index e4a44735884..7a8a3cb0702 100644 --- a/go/vt/vttablet/onlineddl/executor_test.go +++ b/go/vt/vttablet/onlineddl/executor_test.go @@ -28,12 +28,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" ) var ( diff --git a/go/vt/vttablet/onlineddl/ghost.go b/go/vt/vttablet/onlineddl/ghost.go index 957062f784f..80fdd623fd8 100644 --- a/go/vt/vttablet/onlineddl/ghost.go +++ b/go/vt/vttablet/onlineddl/ghost.go @@ -17,7 +17,7 @@ limitations under the License. package onlineddl import ( - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) var ( diff --git a/go/vt/vttablet/onlineddl/util.go b/go/vt/vttablet/onlineddl/util.go index 30c1a4915b4..80498c943a3 100644 --- a/go/vt/vttablet/onlineddl/util.go +++ b/go/vt/vttablet/onlineddl/util.go @@ -27,7 +27,7 @@ import ( "path/filepath" "strings" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) // execCmd searches the PATH for a command and runs it, logging the output. diff --git a/go/vt/vttablet/onlineddl/vrepl.go b/go/vt/vttablet/onlineddl/vrepl.go index f7ab02440aa..4a8ad08e06b 100644 --- a/go/vt/vttablet/onlineddl/vrepl.go +++ b/go/vt/vttablet/onlineddl/vrepl.go @@ -31,22 +31,22 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/dbconnpool" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/onlineddl/vrepl" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/dbconnpool" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/onlineddl/vrepl" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // VReplStream represents a row in _vt.vreplication table diff --git a/go/vt/vttablet/onlineddl/vrepl/columns.go b/go/vt/vttablet/onlineddl/vrepl/columns.go index 7b57b6a2d79..84714ec57be 100644 --- a/go/vt/vttablet/onlineddl/vrepl/columns.go +++ b/go/vt/vttablet/onlineddl/vrepl/columns.go @@ -24,7 +24,7 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/schema" ) // expandedDataTypes maps some known and difficult-to-compute by INFORMATION_SCHEMA data types which expand other data types. diff --git a/go/vt/vttablet/onlineddl/vrepl/foreign_key.go b/go/vt/vttablet/onlineddl/vrepl/foreign_key.go index fcf75d42bec..294bdc40f6b 100644 --- a/go/vt/vttablet/onlineddl/vrepl/foreign_key.go +++ b/go/vt/vttablet/onlineddl/vrepl/foreign_key.go @@ -21,9 +21,9 @@ limitations under the License. package vrepl import ( - "github.com/mdibaiee/vitess/go/vt/schemadiff" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/schemadiff" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" ) // RemovedForeignKeyNames returns the names of removed foreign keys, ignoring mere name changes diff --git a/go/vt/vttablet/onlineddl/vrepl/foreign_key_test.go b/go/vt/vttablet/onlineddl/vrepl/foreign_key_test.go index 96d274167f1..700d337cfa4 100644 --- a/go/vt/vttablet/onlineddl/vrepl/foreign_key_test.go +++ b/go/vt/vttablet/onlineddl/vrepl/foreign_key_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtenv" ) func TestRemovedForeignKeyNames(t *testing.T) { diff --git a/go/vt/vttablet/onlineddl/vrepl/parser.go b/go/vt/vttablet/onlineddl/vrepl/parser.go index 7f257cf4fe6..8a678ec9162 100644 --- a/go/vt/vttablet/onlineddl/vrepl/parser.go +++ b/go/vt/vttablet/onlineddl/vrepl/parser.go @@ -23,9 +23,9 @@ package vrepl import ( "strings" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) // AlterTableParser is a parser tool for ALTER TABLE statements diff --git a/go/vt/vttablet/onlineddl/vrepl/parser_test.go b/go/vt/vttablet/onlineddl/vrepl/parser_test.go index b93b4571981..298e3491720 100644 --- a/go/vt/vttablet/onlineddl/vrepl/parser_test.go +++ b/go/vt/vttablet/onlineddl/vrepl/parser_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) func TestParseAlterStatement(t *testing.T) { diff --git a/go/vt/vttablet/onlineddl/vrepl/types.go b/go/vt/vttablet/onlineddl/vrepl/types.go index 82219355ebc..cbd533e8d93 100644 --- a/go/vt/vttablet/onlineddl/vrepl/types.go +++ b/go/vt/vttablet/onlineddl/vrepl/types.go @@ -28,7 +28,7 @@ import ( "reflect" "strings" - "github.com/mdibaiee/vitess/go/vt/schemadiff" + "github.com/vitess/vitess/go/vt/schemadiff" ) // ColumnType indicated some MySQL data types diff --git a/go/vt/vttablet/queryservice/fakes/error_query_service.go b/go/vt/vttablet/queryservice/fakes/error_query_service.go index e0bf89d802d..50f39532dd1 100644 --- a/go/vt/vttablet/queryservice/fakes/error_query_service.go +++ b/go/vt/vttablet/queryservice/fakes/error_query_service.go @@ -21,9 +21,9 @@ import ( "context" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // ErrorQueryService is an object that returns an error for all methods. diff --git a/go/vt/vttablet/queryservice/fakes/stream_health_query_service.go b/go/vt/vttablet/queryservice/fakes/stream_health_query_service.go index 0da5088deb4..1e6031ff731 100644 --- a/go/vt/vttablet/queryservice/fakes/stream_health_query_service.go +++ b/go/vt/vttablet/queryservice/fakes/stream_health_query_service.go @@ -19,10 +19,10 @@ package fakes import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" ) const ( diff --git a/go/vt/vttablet/queryservice/queryservice.go b/go/vt/vttablet/queryservice/queryservice.go index ea17c50d9a7..402e77b916e 100644 --- a/go/vt/vttablet/queryservice/queryservice.go +++ b/go/vt/vttablet/queryservice/queryservice.go @@ -19,14 +19,14 @@ limitations under the License. package queryservice import ( - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" "context" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // QueryService is the interface implemented by the tablet's query service. diff --git a/go/vt/vttablet/queryservice/wrapped.go b/go/vt/vttablet/queryservice/wrapped.go index b47dead144d..83a65d4f8fe 100644 --- a/go/vt/vttablet/queryservice/wrapped.go +++ b/go/vt/vttablet/queryservice/wrapped.go @@ -19,12 +19,12 @@ package queryservice import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vterrors" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var _ QueryService = &wrappedService{} diff --git a/go/vt/vttablet/sandboxconn/sandboxconn.go b/go/vt/vttablet/sandboxconn/sandboxconn.go index 13d477420c4..497efad0c22 100644 --- a/go/vt/vttablet/sandboxconn/sandboxconn.go +++ b/go/vt/vttablet/sandboxconn/sandboxconn.go @@ -25,18 +25,18 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // SandboxConn satisfies the QueryService interface diff --git a/go/vt/vttablet/sysloglogger/sysloglogger.go b/go/vt/vttablet/sysloglogger/sysloglogger.go index 1f36926c94f..90c49f75db3 100644 --- a/go/vt/vttablet/sysloglogger/sysloglogger.go +++ b/go/vt/vttablet/sysloglogger/sysloglogger.go @@ -25,9 +25,9 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) // syslogWriter is an interface that wraps syslog.Writer, so it can be mocked in unit tests. diff --git a/go/vt/vttablet/sysloglogger/sysloglogger_test.go b/go/vt/vttablet/sysloglogger/sysloglogger_test.go index 88e6640fd5a..ad5cb2d60cd 100644 --- a/go/vt/vttablet/sysloglogger/sysloglogger_test.go +++ b/go/vt/vttablet/sysloglogger/sysloglogger_test.go @@ -28,8 +28,8 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) // fakeWriter is a mock of the real syslog writer, to enable capturing and playing back of log messages in unit testing. diff --git a/go/vt/vttablet/tabletconn/grpc_error.go b/go/vt/vttablet/tabletconn/grpc_error.go index 21436bd197e..44014058eb6 100644 --- a/go/vt/vttablet/tabletconn/grpc_error.go +++ b/go/vt/vttablet/tabletconn/grpc_error.go @@ -22,9 +22,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // ErrorFromGRPC converts a GRPC error to vtError for diff --git a/go/vt/vttablet/tabletconn/grpc_error_test.go b/go/vt/vttablet/tabletconn/grpc_error_test.go index b44e2332ab3..412b70a081b 100644 --- a/go/vt/vttablet/tabletconn/grpc_error_test.go +++ b/go/vt/vttablet/tabletconn/grpc_error_test.go @@ -19,8 +19,8 @@ package tabletconn import ( "testing" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) func TestTabletErrorFromRPCError(t *testing.T) { diff --git a/go/vt/vttablet/tabletconn/tablet_conn.go b/go/vt/vttablet/tabletconn/tablet_conn.go index 343167663a8..ed949fc29ce 100644 --- a/go/vt/vttablet/tabletconn/tablet_conn.go +++ b/go/vt/vttablet/tabletconn/tablet_conn.go @@ -22,14 +22,14 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var ( diff --git a/go/vt/vttablet/tabletconntest/fakequeryservice.go b/go/vt/vttablet/tabletconntest/fakequeryservice.go index d28410090ba..9ba3d3bf8c4 100644 --- a/go/vt/vttablet/tabletconntest/fakequeryservice.go +++ b/go/vt/vttablet/tabletconntest/fakequeryservice.go @@ -23,17 +23,17 @@ import ( "io" "testing" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/callerid" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // FakeQueryService implements a programmable fake for the query service diff --git a/go/vt/vttablet/tabletconntest/tabletconntest.go b/go/vt/vttablet/tabletconntest/tabletconntest.go index 0049d964658..4b8c7ed1f84 100644 --- a/go/vt/vttablet/tabletconntest/tabletconntest.go +++ b/go/vt/vttablet/tabletconntest/tabletconntest.go @@ -30,18 +30,18 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // testErrorHelper will check one instance of each error type, diff --git a/go/vt/vttablet/tabletmanager/events/state_change.go b/go/vt/vttablet/tabletmanager/events/state_change.go index dc2db293657..095f3f43cc5 100644 --- a/go/vt/vttablet/tabletmanager/events/state_change.go +++ b/go/vt/vttablet/tabletmanager/events/state_change.go @@ -17,7 +17,7 @@ limitations under the License. // Package events contains event structs used by the tabletmanager package. package events -import topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" +import topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" // StateChange is an event that describes state changes in the tablet as seen // by the TabletManager. It is triggered after the tablet has processed a state diff --git a/go/vt/vttablet/tabletmanager/framework_test.go b/go/vt/vttablet/tabletmanager/framework_test.go index f2f874cdae9..2b73c1498d3 100644 --- a/go/vt/vttablet/tabletmanager/framework_test.go +++ b/go/vt/vttablet/tabletmanager/framework_test.go @@ -27,27 +27,27 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconntest" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclienttest" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletconntest" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/vttablet/tmclienttest" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/vttablet/tabletmanager/restore.go b/go/vt/vttablet/tabletmanager/restore.go index ca9062b03db..66ef6d9f62b 100644 --- a/go/vt/vttablet/tabletmanager/restore.go +++ b/go/vt/vttablet/tabletmanager/restore.go @@ -24,30 +24,30 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/protoutil" - - "github.com/mdibaiee/vitess/go/stats" - - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/hook" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstats" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/protoutil" + + "github.com/vitess/vitess/go/stats" + + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/hook" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstats" + "github.com/vitess/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // This file handles the initial backup restore upon startup. diff --git a/go/vt/vttablet/tabletmanager/rpc_actions.go b/go/vt/vttablet/tabletmanager/rpc_actions.go index 1782876f556..5b7d5cec176 100644 --- a/go/vt/vttablet/tabletmanager/rpc_actions.go +++ b/go/vt/vttablet/tabletmanager/rpc_actions.go @@ -21,15 +21,15 @@ import ( "fmt" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/hook" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/hook" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/topotools" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // DBAction is used to tell ChangeTabletType whether to call SetReadOnly on change to diff --git a/go/vt/vttablet/tabletmanager/rpc_agent.go b/go/vt/vttablet/tabletmanager/rpc_agent.go index fbbc0cf7164..1917f996942 100644 --- a/go/vt/vttablet/tabletmanager/rpc_agent.go +++ b/go/vt/vttablet/tabletmanager/rpc_agent.go @@ -20,14 +20,14 @@ import ( "context" "time" - "github.com/mdibaiee/vitess/go/vt/hook" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/hook" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // RPCTM defines the interface implemented by the TM for RPCs. diff --git a/go/vt/vttablet/tabletmanager/rpc_backup.go b/go/vt/vttablet/tabletmanager/rpc_backup.go index 2ae0967ace5..fdead8d6576 100644 --- a/go/vt/vttablet/tabletmanager/rpc_backup.go +++ b/go/vt/vttablet/tabletmanager/rpc_backup.go @@ -21,17 +21,17 @@ import ( "fmt" "time" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstats" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstats" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/vttablet/tabletmanager/rpc_lock_tables.go b/go/vt/vttablet/tabletmanager/rpc_lock_tables.go index 8605e0c919b..e6ffdb7b418 100644 --- a/go/vt/vttablet/tabletmanager/rpc_lock_tables.go +++ b/go/vt/vttablet/tabletmanager/rpc_lock_tables.go @@ -25,10 +25,10 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/vt/dbconnpool" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/vt/dbconnpool" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" ) var lockTablesTimeout = 1 * time.Minute diff --git a/go/vt/vttablet/tabletmanager/rpc_query.go b/go/vt/vttablet/tabletmanager/rpc_query.go index 4a8a1f0b9a5..ede27e1ff93 100644 --- a/go/vt/vttablet/tabletmanager/rpc_query.go +++ b/go/vt/vttablet/tabletmanager/rpc_query.go @@ -19,16 +19,16 @@ package tabletmanager import ( "context" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // analyzeExecuteFetchAsDbaMultiQuery reutrns 'true' when at least one of the queries diff --git a/go/vt/vttablet/tabletmanager/rpc_query_test.go b/go/vt/vttablet/tabletmanager/rpc_query_test.go index 70509846a7a..8d0eec40f91 100644 --- a/go/vt/vttablet/tabletmanager/rpc_query_test.go +++ b/go/vt/vttablet/tabletmanager/rpc_query_test.go @@ -24,16 +24,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletservermock" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletservermock" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) func TestAnalyzeExecuteFetchAsDbaMultiQuery(t *testing.T) { diff --git a/go/vt/vttablet/tabletmanager/rpc_replication.go b/go/vt/vttablet/tabletmanager/rpc_replication.go index 71d46f5715d..867d771c0e8 100644 --- a/go/vt/vttablet/tabletmanager/rpc_replication.go +++ b/go/vt/vttablet/tabletmanager/rpc_replication.go @@ -22,19 +22,19 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/protoutil" - - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/protoutil" + + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // ReplicationStatus returns the replication status diff --git a/go/vt/vttablet/tabletmanager/rpc_schema.go b/go/vt/vttablet/tabletmanager/rpc_schema.go index b5b4359ec52..9f8ec913341 100644 --- a/go/vt/vttablet/tabletmanager/rpc_schema.go +++ b/go/vt/vttablet/tabletmanager/rpc_schema.go @@ -17,16 +17,16 @@ limitations under the License. package tabletmanager import ( - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/vt/vterrors" "context" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/topo/topoproto" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) // GetSchema returns the schema. diff --git a/go/vt/vttablet/tabletmanager/rpc_server.go b/go/vt/vttablet/tabletmanager/rpc_server.go index 551bed87865..83545b4f560 100644 --- a/go/vt/vttablet/tabletmanager/rpc_server.go +++ b/go/vt/vttablet/tabletmanager/rpc_server.go @@ -19,14 +19,14 @@ package tabletmanager import ( "fmt" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" "context" - "github.com/mdibaiee/vitess/go/tb" - "github.com/mdibaiee/vitess/go/vt/callinfo" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/tb" + "github.com/vitess/vitess/go/vt/callinfo" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo/topoproto" ) // This file contains the RPC method helpers for the tablet manager. diff --git a/go/vt/vttablet/tabletmanager/rpc_throttler.go b/go/vt/vttablet/tabletmanager/rpc_throttler.go index c2fbffbd4de..47e483bced1 100644 --- a/go/vt/vttablet/tabletmanager/rpc_throttler.go +++ b/go/vt/vttablet/tabletmanager/rpc_throttler.go @@ -19,12 +19,12 @@ package tabletmanager import ( "context" - "github.com/mdibaiee/vitess/go/stats" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/stats" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" ) // CheckThrottler executes a throttler check diff --git a/go/vt/vttablet/tabletmanager/rpc_vdiff.go b/go/vt/vttablet/tabletmanager/rpc_vdiff.go index d500856f209..b9f11c8d564 100644 --- a/go/vt/vttablet/tabletmanager/rpc_vdiff.go +++ b/go/vt/vttablet/tabletmanager/rpc_vdiff.go @@ -3,7 +3,7 @@ package tabletmanager import ( "context" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) func (tm *TabletManager) VDiff(ctx context.Context, req *tabletmanagerdatapb.VDiffRequest) (*tabletmanagerdatapb.VDiffResponse, error) { diff --git a/go/vt/vttablet/tabletmanager/rpc_vreplication.go b/go/vt/vttablet/tabletmanager/rpc_vreplication.go index ae7e883aefb..4690c07d548 100644 --- a/go/vt/vttablet/tabletmanager/rpc_vreplication.go +++ b/go/vt/vttablet/tabletmanager/rpc_vreplication.go @@ -24,21 +24,21 @@ import ( "golang.org/x/exp/maps" "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/workflow" + "github.com/vitess/vitess/go/vt/vterrors" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const ( diff --git a/go/vt/vttablet/tabletmanager/rpc_vreplication_test.go b/go/vt/vttablet/tabletmanager/rpc_vreplication_test.go index 6f3b260fad0..81a9cc0fd05 100644 --- a/go/vt/vttablet/tabletmanager/rpc_vreplication_test.go +++ b/go/vt/vttablet/tabletmanager/rpc_vreplication_test.go @@ -29,28 +29,28 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vttimepb "github.com/mdibaiee/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtctl/workflow" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vttimepb "github.com/vitess/vitess/go/vt/proto/vttime" ) const ( diff --git a/go/vt/vttablet/tabletmanager/shard_sync.go b/go/vt/vttablet/tabletmanager/shard_sync.go index bb28d0ecf06..fbf5e01e737 100644 --- a/go/vt/vttablet/tabletmanager/shard_sync.go +++ b/go/vt/vttablet/tabletmanager/shard_sync.go @@ -22,15 +22,15 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var shardSyncRetryDelay = 30 * time.Second diff --git a/go/vt/vttablet/tabletmanager/shard_sync_test.go b/go/vt/vttablet/tabletmanager/shard_sync_test.go index 6c645d909d1..11a6bd53146 100644 --- a/go/vt/vttablet/tabletmanager/shard_sync_test.go +++ b/go/vt/vttablet/tabletmanager/shard_sync_test.go @@ -23,19 +23,19 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/proto/vttime" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/proto/vttime" "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" ) const ( diff --git a/go/vt/vttablet/tabletmanager/shard_watcher.go b/go/vt/vttablet/tabletmanager/shard_watcher.go index 2c5eed1c03b..99a602b6b8f 100644 --- a/go/vt/vttablet/tabletmanager/shard_watcher.go +++ b/go/vt/vttablet/tabletmanager/shard_watcher.go @@ -19,8 +19,8 @@ package tabletmanager import ( "context" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" ) type shardWatcher struct { diff --git a/go/vt/vttablet/tabletmanager/tm_init.go b/go/vt/vttablet/tabletmanager/tm_init.go index caf01b03fcb..68fb6f887f6 100644 --- a/go/vt/vttablet/tabletmanager/tm_init.go +++ b/go/vt/vttablet/tabletmanager/tm_init.go @@ -47,33 +47,33 @@ import ( "github.com/spf13/pflag" "golang.org/x/sync/semaphore" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/flagutil" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/binlog" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/dbconnpool" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vdiff" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/flagutil" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/binlog" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/dbconnpool" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vdiff" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) const ( diff --git a/go/vt/vttablet/tabletmanager/tm_init_test.go b/go/vt/vttablet/tabletmanager/tm_init_test.go index 418b99f5cb8..a278c08a45d 100644 --- a/go/vt/vttablet/tabletmanager/tm_init_test.go +++ b/go/vt/vttablet/tabletmanager/tm_init_test.go @@ -25,26 +25,26 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletservermock" - "github.com/mdibaiee/vitess/go/vt/vttest" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletservermock" + "github.com/vitess/vitess/go/vt/vttest" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) func TestStartBuildTabletFromInput(t *testing.T) { diff --git a/go/vt/vttablet/tabletmanager/tm_state.go b/go/vt/vttablet/tabletmanager/tm_state.go index 8c3bd4774fe..0f4aa92473d 100644 --- a/go/vt/vttablet/tabletmanager/tm_state.go +++ b/go/vt/vttablet/tabletmanager/tm_state.go @@ -27,19 +27,19 @@ import ( "github.com/spf13/pflag" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var publishRetryInterval = 30 * time.Second diff --git a/go/vt/vttablet/tabletmanager/tm_state_test.go b/go/vt/vttablet/tabletmanager/tm_state_test.go index 05995720464..240897e2db6 100644 --- a/go/vt/vttablet/tabletmanager/tm_state_test.go +++ b/go/vt/vttablet/tabletmanager/tm_state_test.go @@ -26,19 +26,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/faketopo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletservermock" - - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/faketopo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletservermock" + + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func TestStateOpenClose(t *testing.T) { diff --git a/go/vt/vttablet/tabletmanager/vdiff/action.go b/go/vt/vttablet/tabletmanager/vdiff/action.go index 82f80c7c948..886066c54bb 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/action.go +++ b/go/vt/vttablet/tabletmanager/vdiff/action.go @@ -26,15 +26,15 @@ import ( "github.com/google/uuid" "google.golang.org/protobuf/encoding/protojson" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) type VDiffAction string //nolint diff --git a/go/vt/vttablet/tabletmanager/vdiff/action_test.go b/go/vt/vttablet/tabletmanager/vdiff/action_test.go index 49ae964a1aa..1e2cea831c3 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/action_test.go +++ b/go/vt/vttablet/tabletmanager/vdiff/action_test.go @@ -26,12 +26,12 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vterrors" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func TestPerformVDiffAction(t *testing.T) { diff --git a/go/vt/vttablet/tabletmanager/vdiff/controller.go b/go/vt/vttablet/tabletmanager/vdiff/controller.go index 8fcf3768ea8..139cdac7851 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/controller.go +++ b/go/vt/vttablet/tabletmanager/vdiff/controller.go @@ -25,19 +25,19 @@ import ( "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // VDiff operation and table states: diff --git a/go/vt/vttablet/tabletmanager/vdiff/cursor.go b/go/vt/vttablet/tabletmanager/vdiff/cursor.go index bc941e2ce2f..d565623ac36 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/cursor.go +++ b/go/vt/vttablet/tabletmanager/vdiff/cursor.go @@ -19,10 +19,10 @@ package vdiff import ( "context" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vtgate/engine" ) // contextVCursor satisfies VCursor, but only implements Context(). diff --git a/go/vt/vttablet/tabletmanager/vdiff/engine.go b/go/vt/vttablet/tabletmanager/vdiff/engine.go index bdab44f5f1e..0519ec7b4bc 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/engine.go +++ b/go/vt/vttablet/tabletmanager/vdiff/engine.go @@ -24,18 +24,18 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" ) type Engine struct { diff --git a/go/vt/vttablet/tabletmanager/vdiff/engine_test.go b/go/vt/vttablet/tabletmanager/vdiff/engine_test.go index 90e63419620..9350d43ffd9 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/engine_test.go +++ b/go/vt/vttablet/tabletmanager/vdiff/engine_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) func TestEngineOpen(t *testing.T) { diff --git a/go/vt/vttablet/tabletmanager/vdiff/framework_test.go b/go/vt/vttablet/tabletmanager/vdiff/framework_test.go index 288aa2bda3f..bddb3006d49 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/framework_test.go +++ b/go/vt/vttablet/tabletmanager/vdiff/framework_test.go @@ -29,27 +29,27 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconntest" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/vstreamer" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/vstreamer/testenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclienttest" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletconntest" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/vstreamer" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/vstreamer/testenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/vttablet/tmclienttest" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/vttablet/tabletmanager/vdiff/primitive_executor.go b/go/vt/vttablet/tabletmanager/vdiff/primitive_executor.go index 01034563783..eee574015ee 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/primitive_executor.go +++ b/go/vt/vttablet/tabletmanager/vdiff/primitive_executor.go @@ -19,10 +19,10 @@ package vdiff import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vterrors" - vtgateEngine "github.com/mdibaiee/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vterrors" + vtgateEngine "github.com/vitess/vitess/go/vt/vtgate/engine" ) /* diff --git a/go/vt/vttablet/tabletmanager/vdiff/report.go b/go/vt/vttablet/tabletmanager/vdiff/report.go index 279c26235bc..b6c37757521 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/report.go +++ b/go/vt/vttablet/tabletmanager/vdiff/report.go @@ -21,8 +21,8 @@ import ( "sort" "strings" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" ) const ( diff --git a/go/vt/vttablet/tabletmanager/vdiff/shard_streamer.go b/go/vt/vttablet/tabletmanager/vdiff/shard_streamer.go index b519dc80648..2016d462515 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/shard_streamer.go +++ b/go/vt/vttablet/tabletmanager/vdiff/shard_streamer.go @@ -19,10 +19,10 @@ package vdiff import ( "context" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vtgate/engine" ) // shardStreamer streams rows from one shard. diff --git a/go/vt/vttablet/tabletmanager/vdiff/stats.go b/go/vt/vttablet/tabletmanager/vdiff/stats.go index 40a828f5de8..a117f5a2e2d 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/stats.go +++ b/go/vt/vttablet/tabletmanager/vdiff/stats.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) var ( diff --git a/go/vt/vttablet/tabletmanager/vdiff/stats_test.go b/go/vt/vttablet/tabletmanager/vdiff/stats_test.go index feb4f3175b5..03c9ac67613 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/stats_test.go +++ b/go/vt/vttablet/tabletmanager/vdiff/stats_test.go @@ -23,9 +23,9 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) func TestVDiffStats(t *testing.T) { diff --git a/go/vt/vttablet/tabletmanager/vdiff/table_differ.go b/go/vt/vttablet/tabletmanager/vdiff/table_differ.go index 2815ca8e90b..17bdb384802 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/table_differ.go +++ b/go/vt/vttablet/tabletmanager/vdiff/table_differ.go @@ -26,27 +26,27 @@ import ( "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) type tableDiffPhase string diff --git a/go/vt/vttablet/tabletmanager/vdiff/table_plan.go b/go/vt/vttablet/tabletmanager/vdiff/table_plan.go index 93cde11e396..5a771985cf8 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/table_plan.go +++ b/go/vt/vttablet/tabletmanager/vdiff/table_plan.go @@ -21,19 +21,19 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const sqlSelectColumnCollations = "select column_name as column_name, collation_name as collation_name from information_schema.columns where table_schema=%a and table_name=%a and column_name in %a" diff --git a/go/vt/vttablet/tabletmanager/vdiff/utils.go b/go/vt/vttablet/tabletmanager/vdiff/utils.go index 795d4275596..4913567fe0f 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/utils.go +++ b/go/vt/vttablet/tabletmanager/vdiff/utils.go @@ -21,15 +21,15 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/vtgate/engine" ) // newMergeSorter creates an engine.MergeSort based on the shard streamers and pk columns diff --git a/go/vt/vttablet/tabletmanager/vdiff/workflow_differ.go b/go/vt/vttablet/tabletmanager/vdiff/workflow_differ.go index e35fc96746d..46dd77e4098 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/workflow_differ.go +++ b/go/vt/vttablet/tabletmanager/vdiff/workflow_differ.go @@ -24,25 +24,25 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/schema" "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtctl/schematools" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtctl/schematools" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // workflowDiffer has metadata and state for the vdiff of a single workflow on this tablet diff --git a/go/vt/vttablet/tabletmanager/vdiff/workflow_differ_test.go b/go/vt/vttablet/tabletmanager/vdiff/workflow_differ_test.go index b1c50fd5c1f..900de4337e5 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/workflow_differ_test.go +++ b/go/vt/vttablet/tabletmanager/vdiff/workflow_differ_test.go @@ -26,15 +26,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) func TestBuildPlanSuccess(t *testing.T) { diff --git a/go/vt/vttablet/tabletmanager/vreplication/controller.go b/go/vt/vttablet/tabletmanager/vreplication/controller.go index 1efd080568e..075426b1782 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/controller.go +++ b/go/vt/vttablet/tabletmanager/vreplication/controller.go @@ -26,17 +26,17 @@ import ( "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/tb" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/tb" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/vttablet/tabletmanager/vreplication/controller_plan.go b/go/vt/vttablet/tabletmanager/vreplication/controller_plan.go index 8038274e26d..ab123b8eb31 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/controller_plan.go +++ b/go/vt/vttablet/tabletmanager/vreplication/controller_plan.go @@ -20,9 +20,9 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/sqlparser" ) // controllerPlan is the plan for vreplication control statements. diff --git a/go/vt/vttablet/tabletmanager/vreplication/controller_plan_test.go b/go/vt/vttablet/tabletmanager/vreplication/controller_plan_test.go index 465278f1818..d9924e5aaf7 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/controller_plan_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/controller_plan_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) type testControllerPlan struct { diff --git a/go/vt/vttablet/tabletmanager/vreplication/controller_test.go b/go/vt/vttablet/tabletmanager/vreplication/controller_test.go index 796318979f8..d3f2897d69a 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/controller_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/controller_test.go @@ -23,16 +23,16 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/vt/vttablet/tabletmanager/vreplication/engine.go b/go/vt/vttablet/tabletmanager/vreplication/engine.go index ee5c0f67a3a..81b17e48cdf 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/engine.go +++ b/go/vt/vttablet/tabletmanager/vreplication/engine.go @@ -27,24 +27,24 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const ( diff --git a/go/vt/vttablet/tabletmanager/vreplication/engine_test.go b/go/vt/vttablet/tabletmanager/vreplication/engine_test.go index f3bac772190..0dabce90659 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/engine_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/engine_test.go @@ -28,11 +28,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/mysqlctl" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) func TestEngineOpen(t *testing.T) { diff --git a/go/vt/vttablet/tabletmanager/vreplication/external_connector.go b/go/vt/vttablet/tabletmanager/vreplication/external_connector.go index 2b5b8ab3642..3be9a4a9137 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/external_connector.go +++ b/go/vt/vttablet/tabletmanager/vreplication/external_connector.go @@ -20,21 +20,21 @@ import ( "context" "sync" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/vstreamer" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/grpcclient" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/vstreamer" ) var ( diff --git a/go/vt/vttablet/tabletmanager/vreplication/external_connector_test.go b/go/vt/vttablet/tabletmanager/vreplication/external_connector_test.go index abc4a191a53..c6bb66b03e1 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/external_connector_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/external_connector_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - qh "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication/queryhistory" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + qh "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication/queryhistory" ) func TestExternalConnectorCopy(t *testing.T) { diff --git a/go/vt/vttablet/tabletmanager/vreplication/flags.go b/go/vt/vttablet/tabletmanager/vreplication/flags.go index 91f9501c531..6494cb3c96d 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/flags.go +++ b/go/vt/vttablet/tabletmanager/vreplication/flags.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/go/vt/vttablet/tabletmanager/vreplication/framework_test.go b/go/vt/vttablet/tabletmanager/vreplication/framework_test.go index b40c52d12f7..5eea6767e4e 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/framework_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/framework_test.go @@ -32,33 +32,33 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - _flag "github.com/mdibaiee/vitess/go/internal/flag" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/dbconnpool" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sidecardb" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vttablet" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice/fakes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconntest" - qh "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication/queryhistory" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/vstreamer" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/vstreamer/testenv" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + _flag "github.com/vitess/vitess/go/internal/flag" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/dbconnpool" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sidecardb" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vttablet" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/queryservice/fakes" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletconntest" + qh "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication/queryhistory" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/vstreamer" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/vstreamer/testenv" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/vt/vttablet/tabletmanager/vreplication/fuzz.go b/go/vt/vttablet/tabletmanager/vreplication/fuzz.go index 85eaf5e1858..ea59271b74e 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/fuzz.go +++ b/go/vt/vttablet/tabletmanager/vreplication/fuzz.go @@ -22,12 +22,12 @@ import ( "sync" "testing" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo/memorytopo" fuzz "github.com/AdaLogics/go-fuzz-headers" ) diff --git a/go/vt/vttablet/tabletmanager/vreplication/insert_generator.go b/go/vt/vttablet/tabletmanager/vreplication/insert_generator.go index 538d45f6672..4c01ba14018 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/insert_generator.go +++ b/go/vt/vttablet/tabletmanager/vreplication/insert_generator.go @@ -21,10 +21,10 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/vt/throttler" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/vt/throttler" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) // InsertGenerator generates a vreplication insert statement. diff --git a/go/vt/vttablet/tabletmanager/vreplication/insert_generator_test.go b/go/vt/vttablet/tabletmanager/vreplication/insert_generator_test.go index 3acf92846fe..d52048a4e4b 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/insert_generator_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/insert_generator_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) func TestInsertGenerator(t *testing.T) { diff --git a/go/vt/vttablet/tabletmanager/vreplication/journal_test.go b/go/vt/vttablet/tabletmanager/vreplication/journal_test.go index 66d9e99c2e9..b32c4226326 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/journal_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/journal_test.go @@ -20,8 +20,8 @@ import ( "fmt" "testing" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - qh "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication/queryhistory" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + qh "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication/queryhistory" ) func TestJournalOneToOne(t *testing.T) { diff --git a/go/vt/vttablet/tabletmanager/vreplication/relaylog.go b/go/vt/vttablet/tabletmanager/vreplication/relaylog.go index eec359d72b6..eb6e29d37ab 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/relaylog.go +++ b/go/vt/vttablet/tabletmanager/vreplication/relaylog.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vterrors" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) const relayLogIOStalledMsg = "relay log I/O stalled" diff --git a/go/vt/vttablet/tabletmanager/vreplication/replica_connector.go b/go/vt/vttablet/tabletmanager/vreplication/replica_connector.go index 7f35aca776e..9874798a913 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/replica_connector.go +++ b/go/vt/vttablet/tabletmanager/vreplication/replica_connector.go @@ -17,17 +17,17 @@ limitations under the License. package vreplication import ( - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" "context" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/vstreamer" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/vstreamer" ) // NewReplicaConnector returns replica connector diff --git a/go/vt/vttablet/tabletmanager/vreplication/replicator_plan.go b/go/vt/vttablet/tabletmanager/vreplication/replicator_plan.go index 69af7499a11..a33a9d0add8 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/replicator_plan.go +++ b/go/vt/vttablet/tabletmanager/vreplication/replicator_plan.go @@ -22,21 +22,21 @@ import ( "sort" "strings" - "github.com/mdibaiee/vitess/go/bytes2" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/charset" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - vjson "github.com/mdibaiee/vitess/go/mysql/json" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vttablet" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/bytes2" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/charset" + "github.com/vitess/vitess/go/mysql/collations/colldata" + vjson "github.com/vitess/vitess/go/mysql/json" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vttablet" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // ReplicatorPlan is the execution plan for the replicator. It contains diff --git a/go/vt/vttablet/tabletmanager/vreplication/replicator_plan_test.go b/go/vt/vttablet/tabletmanager/vreplication/replicator_plan_test.go index defcc81ff2f..480c8f3c839 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/replicator_plan_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/replicator_plan_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/sqlparser" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) type TestReplicatorPlan struct { diff --git a/go/vt/vttablet/tabletmanager/vreplication/stats.go b/go/vt/vttablet/tabletmanager/vreplication/stats.go index 87d2a485eb0..93cef899415 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/stats.go +++ b/go/vt/vttablet/tabletmanager/vreplication/stats.go @@ -23,12 +23,12 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/servenv" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/vt/vttablet/tabletmanager/vreplication/stats_test.go b/go/vt/vttablet/tabletmanager/vreplication/stats_test.go index a0997ac6914..186a742c534 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/stats_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/stats_test.go @@ -25,12 +25,12 @@ import ( "github.com/google/safehtml/template" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var wantOut = ` diff --git a/go/vt/vttablet/tabletmanager/vreplication/table_plan_builder.go b/go/vt/vttablet/tabletmanager/vreplication/table_plan_builder.go index 9c3408559f5..a3c20cd23d9 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/table_plan_builder.go +++ b/go/vt/vttablet/tabletmanager/vreplication/table_plan_builder.go @@ -22,18 +22,18 @@ import ( "sort" "strings" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // This file contains just the builders for ReplicatorPlan and TablePlan. diff --git a/go/vt/vttablet/tabletmanager/vreplication/table_plan_partial.go b/go/vt/vttablet/tabletmanager/vreplication/table_plan_partial.go index 8476745f25e..c2c8f45ab18 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/table_plan_partial.go +++ b/go/vt/vttablet/tabletmanager/vreplication/table_plan_partial.go @@ -19,14 +19,14 @@ package vreplication import ( "fmt" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet" ) // isBitSet returns true if the bit at index is set diff --git a/go/vt/vttablet/tabletmanager/vreplication/utils.go b/go/vt/vttablet/tabletmanager/vreplication/utils.go index b368e128ce3..db531c7073a 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/utils.go +++ b/go/vt/vttablet/tabletmanager/vreplication/utils.go @@ -21,16 +21,16 @@ import ( "fmt" "strconv" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const ( diff --git a/go/vt/vttablet/tabletmanager/vreplication/utils_test.go b/go/vt/vttablet/tabletmanager/vreplication/utils_test.go index 06f191cfe00..f21bb75dd46 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/utils_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/utils_test.go @@ -23,11 +23,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) func TestInsertLogTruncation(t *testing.T) { diff --git a/go/vt/vttablet/tabletmanager/vreplication/vcopier.go b/go/vt/vttablet/tabletmanager/vreplication/vcopier.go index 0d0214c7412..5baf680c81f 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/vcopier.go +++ b/go/vt/vttablet/tabletmanager/vreplication/vcopier.go @@ -29,20 +29,20 @@ import ( "golang.org/x/exp/maps" "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/bytes2" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/pools" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/bytes2" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/pools" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) type vcopier struct { diff --git a/go/vt/vttablet/tabletmanager/vreplication/vcopier_atomic.go b/go/vt/vttablet/tabletmanager/vreplication/vcopier_atomic.go index f84e68554f7..907c5897097 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/vcopier_atomic.go +++ b/go/vt/vttablet/tabletmanager/vreplication/vcopier_atomic.go @@ -23,18 +23,18 @@ import ( "strconv" "time" - "github.com/mdibaiee/vitess/go/vt/vttablet" + "github.com/vitess/vitess/go/vt/vttablet" "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) /* diff --git a/go/vt/vttablet/tabletmanager/vreplication/vcopier_test.go b/go/vt/vttablet/tabletmanager/vreplication/vcopier_test.go index d1f5cfd70e5..58e461a3a77 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/vcopier_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/vcopier_test.go @@ -25,19 +25,19 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/vstreamer/testenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/vstreamer/testenv" - "github.com/mdibaiee/vitess/go/vt/vttablet" + "github.com/vitess/vitess/go/vt/vttablet" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - qh "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication/queryhistory" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/vstreamer" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + qh "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication/queryhistory" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/vstreamer" ) type vcopierTestCase struct { diff --git a/go/vt/vttablet/tabletmanager/vreplication/vdbclient.go b/go/vt/vttablet/tabletmanager/vreplication/vdbclient.go index bcba80b109b..f2ef5f6ec7a 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/vdbclient.go +++ b/go/vt/vttablet/tabletmanager/vreplication/vdbclient.go @@ -22,12 +22,12 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // vdbClient is a wrapper on binlogplayer.DBClient. diff --git a/go/vt/vttablet/tabletmanager/vreplication/vplayer.go b/go/vt/vttablet/tabletmanager/vreplication/vplayer.go index 0a0fdd87270..1082b95e3d5 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/vplayer.go +++ b/go/vt/vttablet/tabletmanager/vreplication/vplayer.go @@ -26,15 +26,15 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) const failedToRecordHeartbeatMsg = "failed to record heartbeat" diff --git a/go/vt/vttablet/tabletmanager/vreplication/vplayer_flaky_test.go b/go/vt/vttablet/tabletmanager/vreplication/vplayer_flaky_test.go index 2d815d90bb4..a9bd9fc549d 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/vplayer_flaky_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/vplayer_flaky_test.go @@ -31,16 +31,16 @@ import ( "github.com/nsf/jsondiff" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/vttablet" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/vstreamer/testenv" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - qh "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication/queryhistory" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/vttablet" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/vstreamer/testenv" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + qh "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication/queryhistory" ) // TestPlayerGeneratedInvisiblePrimaryKey confirms that the gipk column is replicated by vplayer, both for target diff --git a/go/vt/vttablet/tabletmanager/vreplication/vreplicator.go b/go/vt/vttablet/tabletmanager/vreplication/vreplicator.go index 8a57e47c8d9..ca4e595f0c9 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/vreplicator.go +++ b/go/vt/vttablet/tabletmanager/vreplication/vreplicator.go @@ -26,22 +26,22 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var ( diff --git a/go/vt/vttablet/tabletmanager/vreplication/vreplicator_test.go b/go/vt/vttablet/tabletmanager/vreplication/vreplicator_test.go index 638b3117e39..6b54561b059 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/vreplicator_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/vreplicator_test.go @@ -31,13 +31,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/schemadiff" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/schemadiff" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) func TestRecalculatePKColsInfoByColumnNames(t *testing.T) { diff --git a/go/vt/vttablet/tabletmanager/vreplication/vrlog.go b/go/vt/vttablet/tabletmanager/vreplication/vrlog.go index 014e316acac..48c10213152 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/vrlog.go +++ b/go/vt/vttablet/tabletmanager/vreplication/vrlog.go @@ -26,9 +26,9 @@ import ( "text/template" "time" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" ) var ( diff --git a/go/vt/vttablet/tabletserver/bench_test.go b/go/vt/vttablet/tabletserver/bench_test.go index 9e070643622..d366cfc08e1 100644 --- a/go/vt/vttablet/tabletserver/bench_test.go +++ b/go/vt/vttablet/tabletserver/bench_test.go @@ -22,10 +22,10 @@ import ( "fmt" "testing" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // Benchmark run on 6/27/17, with optimized byte-level operations diff --git a/go/vt/vttablet/tabletserver/binlog_watcher.go b/go/vt/vttablet/tabletserver/binlog_watcher.go index c776dac31ad..90ced0f7256 100644 --- a/go/vt/vttablet/tabletserver/binlog_watcher.go +++ b/go/vt/vttablet/tabletserver/binlog_watcher.go @@ -21,11 +21,11 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) // VStreamer defines the functions of VStreamer diff --git a/go/vt/vttablet/tabletserver/cached_size.go b/go/vt/vttablet/tabletserver/cached_size.go index 0f15f209d3f..78d1f1b07b1 100644 --- a/go/vt/vttablet/tabletserver/cached_size.go +++ b/go/vt/vttablet/tabletserver/cached_size.go @@ -17,7 +17,7 @@ limitations under the License. package tabletserver -import hack "github.com/mdibaiee/vitess/go/hack" +import hack "github.com/vitess/vitess/go/hack" func (cached *TabletPlan) CachedSize(alloc bool) int64 { if cached == nil { @@ -27,13 +27,13 @@ func (cached *TabletPlan) CachedSize(alloc bool) int64 { if alloc { size += int64(112) } - // field Plan *github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder.Plan + // field Plan *github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder.Plan size += cached.Plan.CachedSize(true) // field Original string size += hack.RuntimeAllocSize(int64(len(cached.Original))) - // field Rules *github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules.Rules + // field Rules *github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules.Rules size += cached.Rules.CachedSize(true) - // field Authorized []*github.com/mdibaiee/vitess/go/vt/tableacl.ACLResult + // field Authorized []*github.com/vitess/vitess/go/vt/tableacl.ACLResult { size += hack.RuntimeAllocSize(int64(cap(cached.Authorized)) * int64(8)) for _, elem := range cached.Authorized { diff --git a/go/vt/vttablet/tabletserver/connpool/dbconn.go b/go/vt/vttablet/tabletserver/connpool/dbconn.go index 3307e62a670..dbe16f07554 100644 --- a/go/vt/vttablet/tabletserver/connpool/dbconn.go +++ b/go/vt/vttablet/tabletserver/connpool/dbconn.go @@ -25,20 +25,20 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/pools/smartconnpool" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/dbconnpool" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/pools/smartconnpool" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/dbconnpool" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const defaultKillTimeout = 5 * time.Second diff --git a/go/vt/vttablet/tabletserver/connpool/dbconn_test.go b/go/vt/vttablet/tabletserver/connpool/dbconn_test.go index e1e1519fbe5..27516ad6038 100644 --- a/go/vt/vttablet/tabletserver/connpool/dbconn_test.go +++ b/go/vt/vttablet/tabletserver/connpool/dbconn_test.go @@ -28,16 +28,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/pools/smartconnpool" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/pools/smartconnpool" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) func compareTimingCounts(t *testing.T, op string, delta int64, before, after map[string]int64) { diff --git a/go/vt/vttablet/tabletserver/connpool/pool.go b/go/vt/vttablet/tabletserver/connpool/pool.go index e1ba28de921..ce5d5950e59 100644 --- a/go/vt/vttablet/tabletserver/connpool/pool.go +++ b/go/vt/vttablet/tabletserver/connpool/pool.go @@ -23,15 +23,15 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/pools/smartconnpool" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/dbconnpool" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/pools/smartconnpool" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/dbconnpool" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) const ( diff --git a/go/vt/vttablet/tabletserver/connpool/pool_test.go b/go/vt/vttablet/tabletserver/connpool/pool_test.go index aa82c6227d2..debc4e76d9a 100644 --- a/go/vt/vttablet/tabletserver/connpool/pool_test.go +++ b/go/vt/vttablet/tabletserver/connpool/pool_test.go @@ -24,13 +24,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/pools/smartconnpool" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/pools/smartconnpool" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) func TestConnPoolGet(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/controller.go b/go/vt/vttablet/tabletserver/controller.go index 57abf4d2d1e..6d1e28edaff 100644 --- a/go/vt/vttablet/tabletserver/controller.go +++ b/go/vt/vttablet/tabletserver/controller.go @@ -20,17 +20,17 @@ import ( "context" "time" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // Controller defines the control interface for TabletServer. diff --git a/go/vt/vttablet/tabletserver/debugenv.go b/go/vt/vttablet/tabletserver/debugenv.go index 30fa5e27c67..eb6892d22d5 100644 --- a/go/vt/vttablet/tabletserver/debugenv.go +++ b/go/vt/vttablet/tabletserver/debugenv.go @@ -26,8 +26,8 @@ import ( "text/template" "time" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/vt/vttablet/tabletserver/fuzz.go b/go/vt/vttablet/tabletserver/fuzz.go index 5a1abd20579..35592ffae8f 100644 --- a/go/vt/vttablet/tabletserver/fuzz.go +++ b/go/vt/vttablet/tabletserver/fuzz.go @@ -23,12 +23,12 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) var initter sync.Once diff --git a/go/vt/vttablet/tabletserver/gc/tablegc.go b/go/vt/vttablet/tabletserver/gc/tablegc.go index e0c7706f270..fce761ff695 100644 --- a/go/vt/vttablet/tabletserver/gc/tablegc.go +++ b/go/vt/vttablet/tabletserver/gc/tablegc.go @@ -26,20 +26,20 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/dbconnpool" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/mysql/sqlerror" + + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/dbconnpool" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" ) const ( diff --git a/go/vt/vttablet/tabletserver/gc/tablegc_test.go b/go/vt/vttablet/tabletserver/gc/tablegc_test.go index 8248680caa1..ddf17e4ec84 100644 --- a/go/vt/vttablet/tabletserver/gc/tablegc_test.go +++ b/go/vt/vttablet/tabletserver/gc/tablegc_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/schema" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/go/vt/vttablet/tabletserver/health_streamer.go b/go/vt/vttablet/tabletserver/health_streamer.go index e12b6815bdc..204a80ce7e5 100644 --- a/go/vt/vttablet/tabletserver/health_streamer.go +++ b/go/vt/vttablet/tabletserver/health_streamer.go @@ -26,21 +26,21 @@ import ( "github.com/spf13/pflag" - vtschema "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/servenv" - - "github.com/mdibaiee/vitess/go/history" - "github.com/mdibaiee/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + vtschema "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/servenv" + + "github.com/vitess/vitess/go/history" + "github.com/vitess/vitess/go/vt/log" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) var ( diff --git a/go/vt/vttablet/tabletserver/health_streamer_test.go b/go/vt/vttablet/tabletserver/health_streamer_test.go index d870aa9d3df..34da05847ef 100644 --- a/go/vt/vttablet/tabletserver/health_streamer_test.go +++ b/go/vt/vttablet/tabletserver/health_streamer_test.go @@ -29,15 +29,15 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) func TestHealthStreamerClosed(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/livequeryz.go b/go/vt/vttablet/tabletserver/livequeryz.go index 5367f8da27b..b93494f9a85 100644 --- a/go/vt/vttablet/tabletserver/livequeryz.go +++ b/go/vt/vttablet/tabletserver/livequeryz.go @@ -24,9 +24,9 @@ import ( "github.com/google/safehtml/template" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logz" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logz" ) var ( diff --git a/go/vt/vttablet/tabletserver/livequeryz_test.go b/go/vt/vttablet/tabletserver/livequeryz_test.go index 18a9af50d33..ea6075ffb7c 100644 --- a/go/vt/vttablet/tabletserver/livequeryz_test.go +++ b/go/vt/vttablet/tabletserver/livequeryz_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) func TestLiveQueryzHandlerJSON(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/messager/cache.go b/go/vt/vttablet/tabletserver/messager/cache.go index c0ebe66eaf9..0dd120dbe09 100644 --- a/go/vt/vttablet/tabletserver/messager/cache.go +++ b/go/vt/vttablet/tabletserver/messager/cache.go @@ -20,9 +20,9 @@ import ( "container/heap" "sync" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) //_______________________________________________ diff --git a/go/vt/vttablet/tabletserver/messager/cache_test.go b/go/vt/vttablet/tabletserver/messager/cache_test.go index 1b20ed792c3..47a4e87c4a8 100644 --- a/go/vt/vttablet/tabletserver/messager/cache_test.go +++ b/go/vt/vttablet/tabletserver/messager/cache_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) func TestMessagerCacheOrder(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/messager/engine.go b/go/vt/vttablet/tabletserver/messager/engine.go index 8085d285fb0..77b94ddaa6d 100644 --- a/go/vt/vttablet/tabletserver/messager/engine.go +++ b/go/vt/vttablet/tabletserver/messager/engine.go @@ -22,16 +22,16 @@ import ( "golang.org/x/sync/semaphore" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // TabletService defines the functions of TabletServer diff --git a/go/vt/vttablet/tabletserver/messager/engine_test.go b/go/vt/vttablet/tabletserver/messager/engine_test.go index 1ca65b0bcc5..e8b0f35faca 100644 --- a/go/vt/vttablet/tabletserver/messager/engine_test.go +++ b/go/vt/vttablet/tabletserver/messager/engine_test.go @@ -21,13 +21,13 @@ import ( "reflect" "testing" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) var ( diff --git a/go/vt/vttablet/tabletserver/messager/message_manager.go b/go/vt/vttablet/tabletserver/messager/message_manager.go index 40f0abbd833..0fc6145cf63 100644 --- a/go/vt/vttablet/tabletserver/messager/message_manager.go +++ b/go/vt/vttablet/tabletserver/messager/message_manager.go @@ -27,18 +27,18 @@ import ( "golang.org/x/sync/semaphore" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var ( diff --git a/go/vt/vttablet/tabletserver/messager/message_manager_test.go b/go/vt/vttablet/tabletserver/messager/message_manager_test.go index 97f3662baf1..2b4df1e6b95 100644 --- a/go/vt/vttablet/tabletserver/messager/message_manager_test.go +++ b/go/vt/vttablet/tabletserver/messager/message_manager_test.go @@ -31,16 +31,16 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/sync/semaphore" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var ( diff --git a/go/vt/vttablet/tabletserver/planbuilder/builder.go b/go/vt/vttablet/tabletserver/planbuilder/builder.go index 51b93ae7265..d6ad13d8164 100644 --- a/go/vt/vttablet/tabletserver/planbuilder/builder.go +++ b/go/vt/vttablet/tabletserver/planbuilder/builder.go @@ -19,13 +19,13 @@ package planbuilder import ( "strings" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func analyzeSelect(env *vtenv.Environment, sel *sqlparser.Select, tables map[string]*schema.Table) (plan *Plan, err error) { diff --git a/go/vt/vttablet/tabletserver/planbuilder/cached_size.go b/go/vt/vttablet/tabletserver/planbuilder/cached_size.go index bc702b8c594..6887399a497 100644 --- a/go/vt/vttablet/tabletserver/planbuilder/cached_size.go +++ b/go/vt/vttablet/tabletserver/planbuilder/cached_size.go @@ -17,7 +17,7 @@ limitations under the License. package planbuilder -import hack "github.com/mdibaiee/vitess/go/hack" +import hack "github.com/vitess/vitess/go/hack" type cachedObject interface { CachedSize(alloc bool) int64 @@ -43,31 +43,31 @@ func (cached *Plan) CachedSize(alloc bool) int64 { if alloc { size += int64(128) } - // field Table *github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema.Table + // field Table *github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema.Table size += cached.Table.CachedSize(true) - // field AllTables []*github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema.Table + // field AllTables []*github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema.Table { size += hack.RuntimeAllocSize(int64(cap(cached.AllTables)) * int64(8)) for _, elem := range cached.AllTables { size += elem.CachedSize(true) } } - // field Permissions []github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder.Permission + // field Permissions []github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder.Permission { size += hack.RuntimeAllocSize(int64(cap(cached.Permissions)) * int64(24)) for _, elem := range cached.Permissions { size += elem.CachedSize(false) } } - // field FullQuery *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedQuery + // field FullQuery *github.com/vitess/vitess/go/vt/sqlparser.ParsedQuery size += cached.FullQuery.CachedSize(true) - // field NextCount github.com/mdibaiee/vitess/go/vt/vtgate/evalengine.Expr + // field NextCount github.com/vitess/vitess/go/vt/vtgate/evalengine.Expr if cc, ok := cached.NextCount.(cachedObject); ok { size += cc.CachedSize(true) } - // field WhereClause *github.com/mdibaiee/vitess/go/vt/sqlparser.ParsedQuery + // field WhereClause *github.com/vitess/vitess/go/vt/sqlparser.ParsedQuery size += cached.WhereClause.CachedSize(true) - // field FullStmt github.com/mdibaiee/vitess/go/vt/sqlparser.Statement + // field FullStmt github.com/vitess/vitess/go/vt/sqlparser.Statement if cc, ok := cached.FullStmt.(cachedObject); ok { size += cc.CachedSize(true) } diff --git a/go/vt/vttablet/tabletserver/planbuilder/permission.go b/go/vt/vttablet/tabletserver/planbuilder/permission.go index e0d9fb36a27..31dfc40da01 100644 --- a/go/vt/vttablet/tabletserver/planbuilder/permission.go +++ b/go/vt/vttablet/tabletserver/planbuilder/permission.go @@ -19,8 +19,8 @@ package planbuilder import ( "fmt" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/tableacl" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/tableacl" ) // Permission associates the required access permission diff --git a/go/vt/vttablet/tabletserver/planbuilder/permission_test.go b/go/vt/vttablet/tabletserver/planbuilder/permission_test.go index cd194bfd6f8..faf3fe51147 100644 --- a/go/vt/vttablet/tabletserver/planbuilder/permission_test.go +++ b/go/vt/vttablet/tabletserver/planbuilder/permission_test.go @@ -19,9 +19,9 @@ package planbuilder import ( "testing" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/tableacl" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/tableacl" ) func TestBuildPermissions(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/planbuilder/plan.go b/go/vt/vttablet/tabletserver/planbuilder/plan.go index 17fae2bdc17..8a4be481401 100644 --- a/go/vt/vttablet/tabletserver/planbuilder/plan.go +++ b/go/vt/vttablet/tabletserver/planbuilder/plan.go @@ -20,14 +20,14 @@ import ( "encoding/json" "strings" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/tableacl" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/tableacl" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var ( diff --git a/go/vt/vttablet/tabletserver/planbuilder/plan_test.go b/go/vt/vttablet/tabletserver/planbuilder/plan_test.go index 7dbd92895b8..aab067bc682 100644 --- a/go/vt/vttablet/tabletserver/planbuilder/plan_test.go +++ b/go/vt/vttablet/tabletserver/planbuilder/plan_test.go @@ -30,10 +30,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/tableacl" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/tableacl" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" ) // MarshalJSON returns a JSON of the given Plan. diff --git a/go/vt/vttablet/tabletserver/planbuilder/query_gen.go b/go/vt/vttablet/tabletserver/planbuilder/query_gen.go index 72925cb7ede..ebaf776f1a9 100644 --- a/go/vt/vttablet/tabletserver/planbuilder/query_gen.go +++ b/go/vt/vttablet/tabletserver/planbuilder/query_gen.go @@ -17,7 +17,7 @@ limitations under the License. package planbuilder import ( - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) // GenerateFullQuery generates the full query from the ast. diff --git a/go/vt/vttablet/tabletserver/query_engine.go b/go/vt/vttablet/tabletserver/query_engine.go index c02ed36ac2e..a7cbaaf2efc 100644 --- a/go/vt/vttablet/tabletserver/query_engine.go +++ b/go/vt/vttablet/tabletserver/query_engine.go @@ -28,29 +28,29 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/cache/theine" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/pools/smartconnpool" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/sync2" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/dbconnpool" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/tableacl" - tacl "github.com/mdibaiee/vitess/go/vt/tableacl/acl" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/txserializer" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/cache/theine" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/pools/smartconnpool" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/sync2" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/dbconnpool" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/tableacl" + tacl "github.com/vitess/vitess/go/vt/tableacl/acl" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/txserializer" ) // _______________________________________________ diff --git a/go/vt/vttablet/tabletserver/query_engine_test.go b/go/vt/vttablet/tabletserver/query_engine_test.go index bdf17333187..e5a0e4a5ec9 100644 --- a/go/vt/vttablet/tabletserver/query_engine_test.go +++ b/go/vt/vttablet/tabletserver/query_engine_test.go @@ -31,28 +31,28 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/cache/theine" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/cache/theine" + "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/tableacl" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema/schematest" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/tableacl" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema/schematest" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestStrictMode(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/query_executor.go b/go/vt/vttablet/tabletserver/query_executor.go index 919f209e503..d7c85cd6799 100644 --- a/go/vt/vttablet/tabletserver/query_executor.go +++ b/go/vt/vttablet/tabletserver/query_executor.go @@ -25,30 +25,30 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/pools/smartconnpool" - - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/callinfo" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/tableacl" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - p "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules" - eschema "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/pools/smartconnpool" + + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/callinfo" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/tableacl" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + p "github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules" + eschema "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // QueryExecutor is used for executing a query request. diff --git a/go/vt/vttablet/tabletserver/query_executor_test.go b/go/vt/vttablet/tabletserver/query_executor_test.go index ab53fddddf1..d665fe42500 100644 --- a/go/vt/vttablet/tabletserver/query_executor_test.go +++ b/go/vt/vttablet/tabletserver/query_executor_test.go @@ -28,32 +28,32 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/sync2" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/callinfo" - "github.com/mdibaiee/vitess/go/vt/callinfo/fakecallinfo" - "github.com/mdibaiee/vitess/go/vt/sidecardb" - "github.com/mdibaiee/vitess/go/vt/tableacl" - "github.com/mdibaiee/vitess/go/vt/tableacl/simpleacl" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tx" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/txthrottler" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tableaclpb "github.com/mdibaiee/vitess/go/vt/proto/tableacl" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sync2" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/callinfo" + "github.com/vitess/vitess/go/vt/callinfo/fakecallinfo" + "github.com/vitess/vitess/go/vt/sidecardb" + "github.com/vitess/vitess/go/vt/tableacl" + "github.com/vitess/vitess/go/vt/tableacl/simpleacl" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tx" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/txthrottler" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + tableaclpb "github.com/vitess/vitess/go/vt/proto/tableacl" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func TestQueryExecutorPlans(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/query_list.go b/go/vt/vttablet/tabletserver/query_list.go index 5731dded249..4005954a76c 100644 --- a/go/vt/vttablet/tabletserver/query_list.go +++ b/go/vt/vttablet/tabletserver/query_list.go @@ -24,12 +24,12 @@ import ( "github.com/google/safehtml" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/callinfo" - "github.com/mdibaiee/vitess/go/vt/log" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/callinfo" + "github.com/vitess/vitess/go/vt/log" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) // QueryDetail is a simple wrapper for Query, Context and a killable conn. diff --git a/go/vt/vttablet/tabletserver/query_list_test.go b/go/vt/vttablet/tabletserver/query_list_test.go index 5ccff1aac39..e71027cc4bd 100644 --- a/go/vt/vttablet/tabletserver/query_list_test.go +++ b/go/vt/vttablet/tabletserver/query_list_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" ) type testConn struct { diff --git a/go/vt/vttablet/tabletserver/querylogz.go b/go/vt/vttablet/tabletserver/querylogz.go index a71331bf5a4..c9fbba5271a 100644 --- a/go/vt/vttablet/tabletserver/querylogz.go +++ b/go/vt/vttablet/tabletserver/querylogz.go @@ -23,11 +23,11 @@ import ( "text/template" "time" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logz" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logz" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) var ( diff --git a/go/vt/vttablet/tabletserver/querylogz_test.go b/go/vt/vttablet/tabletserver/querylogz_test.go index efd5d212594..b4226d4d990 100644 --- a/go/vt/vttablet/tabletserver/querylogz_test.go +++ b/go/vt/vttablet/tabletserver/querylogz_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) func TestQuerylogzHandler(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/queryz.go b/go/vt/vttablet/tabletserver/queryz.go index f2667ad99d9..3e879f7a93c 100644 --- a/go/vt/vttablet/tabletserver/queryz.go +++ b/go/vt/vttablet/tabletserver/queryz.go @@ -24,10 +24,10 @@ import ( "github.com/google/safehtml/template" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logz" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logz" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder" ) var ( diff --git a/go/vt/vttablet/tabletserver/queryz_test.go b/go/vt/vttablet/tabletserver/queryz_test.go index 87d7bd285b6..b9f857e8e96 100644 --- a/go/vt/vttablet/tabletserver/queryz_test.go +++ b/go/vt/vttablet/tabletserver/queryz_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" ) func TestQueryzHandler(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/repltracker/poller.go b/go/vt/vttablet/tabletserver/repltracker/poller.go index 961aa3e8a68..623d9d43792 100644 --- a/go/vt/vttablet/tabletserver/repltracker/poller.go +++ b/go/vt/vttablet/tabletserver/repltracker/poller.go @@ -21,11 +21,11 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/vterrors" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var replicationLagSeconds = stats.NewGauge("replicationLagSec", "replication lag in seconds") diff --git a/go/vt/vttablet/tabletserver/repltracker/poller_test.go b/go/vt/vttablet/tabletserver/repltracker/poller_test.go index cd66319a5cf..625a590c265 100644 --- a/go/vt/vttablet/tabletserver/repltracker/poller_test.go +++ b/go/vt/vttablet/tabletserver/repltracker/poller_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl" ) func TestPoller(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/repltracker/reader.go b/go/vt/vttablet/tabletserver/repltracker/reader.go index 2ae363278f0..3357df5b0ac 100644 --- a/go/vt/vttablet/tabletserver/repltracker/reader.go +++ b/go/vt/vttablet/tabletserver/repltracker/reader.go @@ -22,17 +22,17 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + + querypb "github.com/vitess/vitess/go/vt/proto/query" ) const ( diff --git a/go/vt/vttablet/tabletserver/repltracker/reader_test.go b/go/vt/vttablet/tabletserver/repltracker/reader_test.go index 31989c45448..9fc887e6581 100644 --- a/go/vt/vttablet/tabletserver/repltracker/reader_test.go +++ b/go/vt/vttablet/tabletserver/repltracker/reader_test.go @@ -24,14 +24,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // TestReaderReadHeartbeat tests that reading a heartbeat sets the appropriate diff --git a/go/vt/vttablet/tabletserver/repltracker/repltracker.go b/go/vt/vttablet/tabletserver/repltracker/repltracker.go index 21d36b47864..1669df38f3f 100644 --- a/go/vt/vttablet/tabletserver/repltracker/repltracker.go +++ b/go/vt/vttablet/tabletserver/repltracker/repltracker.go @@ -20,14 +20,14 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/heartbeat" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/heartbeat" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/vt/vttablet/tabletserver/repltracker/repltracker_test.go b/go/vt/vttablet/tabletserver/repltracker/repltracker_test.go index b4672f526b7..1dc5861e38b 100644 --- a/go/vt/vttablet/tabletserver/repltracker/repltracker_test.go +++ b/go/vt/vttablet/tabletserver/repltracker/repltracker_test.go @@ -23,13 +23,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/mysqlctl" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) func TestReplTracker(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/repltracker/writer.go b/go/vt/vttablet/tabletserver/repltracker/writer.go index 2438eca0dff..fb2577c13ad 100644 --- a/go/vt/vttablet/tabletserver/repltracker/writer.go +++ b/go/vt/vttablet/tabletserver/repltracker/writer.go @@ -23,19 +23,19 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/constants/sidecar" - - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/dbconnpool" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/constants/sidecar" + + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/dbconnpool" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/vttablet/tabletserver/repltracker/writer_test.go b/go/vt/vttablet/tabletserver/repltracker/writer_test.go index 05e7df7dd60..cf7238da432 100644 --- a/go/vt/vttablet/tabletserver/repltracker/writer_test.go +++ b/go/vt/vttablet/tabletserver/repltracker/writer_test.go @@ -25,12 +25,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) func TestWriteHeartbeat(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/rules/cached_size.go b/go/vt/vttablet/tabletserver/rules/cached_size.go index c32157e3470..3e684bc7e4c 100644 --- a/go/vt/vttablet/tabletserver/rules/cached_size.go +++ b/go/vt/vttablet/tabletserver/rules/cached_size.go @@ -17,7 +17,7 @@ limitations under the License. package rules -import hack "github.com/mdibaiee/vitess/go/hack" +import hack "github.com/vitess/vitess/go/hack" type cachedObject interface { CachedSize(alloc bool) int64 @@ -33,7 +33,7 @@ func (cached *BindVarCond) CachedSize(alloc bool) int64 { } // field name string size += hack.RuntimeAllocSize(int64(len(cached.name))) - // field value github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules.bvcValue + // field value github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules.bvcValue if cc, ok := cached.value.(cachedObject); ok { size += cc.CachedSize(true) } @@ -51,17 +51,17 @@ func (cached *Rule) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(len(cached.Description))) // field Name string size += hack.RuntimeAllocSize(int64(len(cached.Name))) - // field requestIP github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules.namedRegexp + // field requestIP github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules.namedRegexp size += cached.requestIP.CachedSize(false) - // field user github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules.namedRegexp + // field user github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules.namedRegexp size += cached.user.CachedSize(false) - // field query github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules.namedRegexp + // field query github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules.namedRegexp size += cached.query.CachedSize(false) - // field leadingComment github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules.namedRegexp + // field leadingComment github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules.namedRegexp size += cached.leadingComment.CachedSize(false) - // field trailingComment github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules.namedRegexp + // field trailingComment github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules.namedRegexp size += cached.trailingComment.CachedSize(false) - // field plans []github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder.PlanType + // field plans []github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder.PlanType { size += hack.RuntimeAllocSize(int64(cap(cached.plans)) * int64(8)) } @@ -72,7 +72,7 @@ func (cached *Rule) CachedSize(alloc bool) int64 { size += hack.RuntimeAllocSize(int64(len(elem))) } } - // field bindVarConds []github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules.BindVarCond + // field bindVarConds []github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules.BindVarCond { size += hack.RuntimeAllocSize(int64(cap(cached.bindVarConds)) * int64(48)) for _, elem := range cached.bindVarConds { @@ -89,7 +89,7 @@ func (cached *Rules) CachedSize(alloc bool) int64 { if alloc { size += int64(24) } - // field rules []*github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules.Rule + // field rules []*github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules.Rule { size += hack.RuntimeAllocSize(int64(cap(cached.rules)) * int64(8)) for _, elem := range cached.rules { diff --git a/go/vt/vttablet/tabletserver/rules/map.go b/go/vt/vttablet/tabletserver/rules/map.go index 3b5d8b732c4..f9869435c18 100644 --- a/go/vt/vttablet/tabletserver/rules/map.go +++ b/go/vt/vttablet/tabletserver/rules/map.go @@ -21,8 +21,8 @@ import ( "errors" "sync" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder" ) // Map is the maintainer of Rules from multiple sources diff --git a/go/vt/vttablet/tabletserver/rules/map_test.go b/go/vt/vttablet/tabletserver/rules/map_test.go index 0de3083110e..dd28dc59fd0 100644 --- a/go/vt/vttablet/tabletserver/rules/map_test.go +++ b/go/vt/vttablet/tabletserver/rules/map_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder" ) var ( diff --git a/go/vt/vttablet/tabletserver/rules/rules.go b/go/vt/vttablet/tabletserver/rules/rules.go index fba49b24b9d..a683665992c 100644 --- a/go/vt/vttablet/tabletserver/rules/rules.go +++ b/go/vt/vttablet/tabletserver/rules/rules.go @@ -26,12 +26,12 @@ import ( "strconv" "time" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder" ) // ----------------------------------------------- diff --git a/go/vt/vttablet/tabletserver/rules/rules_test.go b/go/vt/vttablet/tabletserver/rules/rules_test.go index ed47e973494..050b920084a 100644 --- a/go/vt/vttablet/tabletserver/rules/rules_test.go +++ b/go/vt/vttablet/tabletserver/rules/rules_test.go @@ -27,13 +27,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func TestQueryRules(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/schema/cached_size.go b/go/vt/vttablet/tabletserver/schema/cached_size.go index 9e408dcc39a..adb9f0d1237 100644 --- a/go/vt/vttablet/tabletserver/schema/cached_size.go +++ b/go/vt/vttablet/tabletserver/schema/cached_size.go @@ -17,7 +17,7 @@ limitations under the License. package schema -import hack "github.com/mdibaiee/vitess/go/hack" +import hack "github.com/vitess/vitess/go/hack" func (cached *MessageInfo) CachedSize(alloc bool) int64 { if cached == nil { @@ -27,7 +27,7 @@ func (cached *MessageInfo) CachedSize(alloc bool) int64 { if alloc { size += int64(80) } - // field Fields []*github.com/mdibaiee/vitess/go/vt/proto/query.Field + // field Fields []*github.com/vitess/vitess/go/vt/proto/query.Field { size += hack.RuntimeAllocSize(int64(cap(cached.Fields)) * int64(8)) for _, elem := range cached.Fields { @@ -44,9 +44,9 @@ func (cached *Table) CachedSize(alloc bool) int64 { if alloc { size += int64(112) } - // field Name github.com/mdibaiee/vitess/go/vt/sqlparser.IdentifierCS + // field Name github.com/vitess/vitess/go/vt/sqlparser.IdentifierCS size += cached.Name.CachedSize(false) - // field Fields []*github.com/mdibaiee/vitess/go/vt/proto/query.Field + // field Fields []*github.com/vitess/vitess/go/vt/proto/query.Field { size += hack.RuntimeAllocSize(int64(cap(cached.Fields)) * int64(8)) for _, elem := range cached.Fields { @@ -57,11 +57,11 @@ func (cached *Table) CachedSize(alloc bool) int64 { { size += hack.RuntimeAllocSize(int64(cap(cached.PKColumns)) * int64(8)) } - // field SequenceInfo *github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema.SequenceInfo + // field SequenceInfo *github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema.SequenceInfo if cached.SequenceInfo != nil { size += hack.RuntimeAllocSize(int64(24)) } - // field MessageInfo *github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema.MessageInfo + // field MessageInfo *github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema.MessageInfo size += cached.MessageInfo.CachedSize(true) return size } diff --git a/go/vt/vttablet/tabletserver/schema/db.go b/go/vt/vttablet/tabletserver/schema/db.go index 419dadcb403..7afa9020962 100644 --- a/go/vt/vttablet/tabletserver/schema/db.go +++ b/go/vt/vttablet/tabletserver/schema/db.go @@ -19,13 +19,13 @@ package schema import ( "context" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" ) const ( diff --git a/go/vt/vttablet/tabletserver/schema/db_test.go b/go/vt/vttablet/tabletserver/schema/db_test.go index c6bbfcfe1be..ff1cba2457e 100644 --- a/go/vt/vttablet/tabletserver/schema/db_test.go +++ b/go/vt/vttablet/tabletserver/schema/db_test.go @@ -25,15 +25,15 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/exp/maps" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) var ( diff --git a/go/vt/vttablet/tabletserver/schema/engine.go b/go/vt/vttablet/tabletserver/schema/engine.go index 0de852f5be7..540df4e8bc4 100644 --- a/go/vt/vttablet/tabletserver/schema/engine.go +++ b/go/vt/vttablet/tabletserver/schema/engine.go @@ -28,31 +28,31 @@ import ( "golang.org/x/exp/maps" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/dbconnpool" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sidecardb" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/dbconnpool" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sidecardb" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const maxTableCount = 10000 diff --git a/go/vt/vttablet/tabletserver/schema/engine_test.go b/go/vt/vttablet/tabletserver/schema/engine_test.go index 70b5272a132..21d20d5401d 100644 --- a/go/vt/vttablet/tabletserver/schema/engine_test.go +++ b/go/vt/vttablet/tabletserver/schema/engine_test.go @@ -32,24 +32,24 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/event/syslogger" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema/schematest" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/event/syslogger" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema/schematest" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) const baseShowTablesWithSizesPattern = `SELECT t\.table_name.*SUM\(i\.file_size\).*` diff --git a/go/vt/vttablet/tabletserver/schema/historian.go b/go/vt/vttablet/tabletserver/schema/historian.go index ed049c33d4e..452d8783a80 100644 --- a/go/vt/vttablet/tabletserver/schema/historian.go +++ b/go/vt/vttablet/tabletserver/schema/historian.go @@ -22,15 +22,15 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) const getInitialSchemaVersions = "select id, pos, ddl, time_updated, schemax from %s.schema_version where time_updated > %d order by id asc" diff --git a/go/vt/vttablet/tabletserver/schema/historian_test.go b/go/vt/vttablet/tabletserver/schema/historian_test.go index b932325e839..061dcea9886 100644 --- a/go/vt/vttablet/tabletserver/schema/historian_test.go +++ b/go/vt/vttablet/tabletserver/schema/historian_test.go @@ -24,13 +24,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/sqlparser" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func getTable(name string, fieldNames []string, fieldTypes []querypb.Type, pks []int64) *binlogdatapb.MinimalTable { diff --git a/go/vt/vttablet/tabletserver/schema/load_table.go b/go/vt/vttablet/tabletserver/schema/load_table.go index c9521ba38bb..daeaccda90e 100644 --- a/go/vt/vttablet/tabletserver/schema/load_table.go +++ b/go/vt/vttablet/tabletserver/schema/load_table.go @@ -23,14 +23,14 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" ) // LoadTable creates a Table from the schema info in the database. diff --git a/go/vt/vttablet/tabletserver/schema/load_table_test.go b/go/vt/vttablet/tabletserver/schema/load_table_test.go index 5a3cd97424e..2370f4631ed 100644 --- a/go/vt/vttablet/tabletserver/schema/load_table_test.go +++ b/go/vt/vttablet/tabletserver/schema/load_table_test.go @@ -23,20 +23,20 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/vtenv" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) func TestLoadTable(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/schema/main_test.go b/go/vt/vttablet/tabletserver/schema/main_test.go index 3ed0112ad74..663fc5d2048 100644 --- a/go/vt/vttablet/tabletserver/schema/main_test.go +++ b/go/vt/vttablet/tabletserver/schema/main_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" ) func getTestSchemaEngine(t *testing.T, schemaMaxAgeSeconds int64) (*Engine, *fakesqldb.DB, func()) { diff --git a/go/vt/vttablet/tabletserver/schema/schema.go b/go/vt/vttablet/tabletserver/schema/schema.go index 12bf905a753..272bebeeecd 100644 --- a/go/vt/vttablet/tabletserver/schema/schema.go +++ b/go/vt/vttablet/tabletserver/schema/schema.go @@ -20,11 +20,11 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/sqlparser" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // Table types diff --git a/go/vt/vttablet/tabletserver/schema/schematest/schematest.go b/go/vt/vttablet/tabletserver/schema/schematest/schematest.go index c6877bfcc81..868b2bdb4a0 100644 --- a/go/vt/vttablet/tabletserver/schema/schematest/schematest.go +++ b/go/vt/vttablet/tabletserver/schema/schematest/schematest.go @@ -19,11 +19,11 @@ limitations under the License. package schematest import ( - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // AddDefaultQueries returns a default set of queries that can diff --git a/go/vt/vttablet/tabletserver/schema/schemaz.go b/go/vt/vttablet/tabletserver/schema/schemaz.go index 0718183120c..75a69efba8c 100644 --- a/go/vt/vttablet/tabletserver/schema/schemaz.go +++ b/go/vt/vttablet/tabletserver/schema/schemaz.go @@ -22,9 +22,9 @@ import ( "github.com/google/safehtml/template" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logz" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logz" ) var ( diff --git a/go/vt/vttablet/tabletserver/schema/tracker.go b/go/vt/vttablet/tabletserver/schema/tracker.go index 824a346384b..d41f830b7b7 100644 --- a/go/vt/vttablet/tabletserver/schema/tracker.go +++ b/go/vt/vttablet/tabletserver/schema/tracker.go @@ -23,17 +23,17 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // VStreamer defines the functions of VStreamer diff --git a/go/vt/vttablet/tabletserver/schema/tracker_test.go b/go/vt/vttablet/tabletserver/schema/tracker_test.go index daa19d263c4..b12d8ae7fee 100644 --- a/go/vt/vttablet/tabletserver/schema/tracker_test.go +++ b/go/vt/vttablet/tabletserver/schema/tracker_test.go @@ -22,12 +22,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/sqltypes" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" ) func TestTracker(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/state_manager.go b/go/vt/vttablet/tabletserver/state_manager.go index 94fd440dbdf..201039e754f 100644 --- a/go/vt/vttablet/tabletserver/state_manager.go +++ b/go/vt/vttablet/tabletserver/state_manager.go @@ -25,14 +25,14 @@ import ( "golang.org/x/sync/semaphore" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/log" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) type servingState int64 diff --git a/go/vt/vttablet/tabletserver/state_manager_test.go b/go/vt/vttablet/tabletserver/state_manager_test.go index fb12f530a25..a552a0e0412 100644 --- a/go/vt/vttablet/tabletserver/state_manager_test.go +++ b/go/vt/vttablet/tabletserver/state_manager_test.go @@ -28,16 +28,16 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) var testNow = time.Now() diff --git a/go/vt/vttablet/tabletserver/stateful_connection.go b/go/vt/vttablet/tabletserver/stateful_connection.go index 8a52f3570e6..91b4c05d53e 100644 --- a/go/vt/vttablet/tabletserver/stateful_connection.go +++ b/go/vt/vttablet/tabletserver/stateful_connection.go @@ -21,19 +21,19 @@ import ( "fmt" "time" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/pools/smartconnpool" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tx" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/pools/smartconnpool" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tx" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // StatefulConnection is used in the situations where we need a dedicated connection for a vtgate session. diff --git a/go/vt/vttablet/tabletserver/stateful_connection_pool.go b/go/vt/vttablet/tabletserver/stateful_connection_pool.go index 15beb0ec50d..a08f1f17ca7 100644 --- a/go/vt/vttablet/tabletserver/stateful_connection_pool.go +++ b/go/vt/vttablet/tabletserver/stateful_connection_pool.go @@ -21,15 +21,15 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/pools" - "github.com/mdibaiee/vitess/go/pools/smartconnpool" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tx" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/pools" + "github.com/vitess/vitess/go/pools/smartconnpool" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tx" + + querypb "github.com/vitess/vitess/go/vt/proto/query" ) const ( diff --git a/go/vt/vttablet/tabletserver/stateful_connection_pool_test.go b/go/vt/vttablet/tabletserver/stateful_connection_pool_test.go index 45bd41c4b33..94231b62be2 100644 --- a/go/vt/vttablet/tabletserver/stateful_connection_pool_test.go +++ b/go/vt/vttablet/tabletserver/stateful_connection_pool_test.go @@ -23,11 +23,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tx" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tx" ) func TestActivePoolClientRowsFound(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/status.go b/go/vt/vttablet/tabletserver/status.go index bc1be98e429..5fe287ffcd8 100644 --- a/go/vt/vttablet/tabletserver/status.go +++ b/go/vt/vttablet/tabletserver/status.go @@ -25,7 +25,7 @@ import ( "sync/atomic" "time" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // This file contains the status web page export for tabletserver diff --git a/go/vt/vttablet/tabletserver/stream_consolidator.go b/go/vt/vttablet/tabletserver/stream_consolidator.go index 4720d5210ee..0e0659117ac 100644 --- a/go/vt/vttablet/tabletserver/stream_consolidator.go +++ b/go/vt/vttablet/tabletserver/stream_consolidator.go @@ -21,11 +21,11 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/sqltypes" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/sqltypes" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) const streamBufferSize = 8 diff --git a/go/vt/vttablet/tabletserver/stream_consolidator_flaky_test.go b/go/vt/vttablet/tabletserver/stream_consolidator_flaky_test.go index 7821e0bd27f..d73b122cbff 100644 --- a/go/vt/vttablet/tabletserver/stream_consolidator_flaky_test.go +++ b/go/vt/vttablet/tabletserver/stream_consolidator_flaky_test.go @@ -24,14 +24,14 @@ import ( "testing" "time" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) type consolidationResult struct { diff --git a/go/vt/vttablet/tabletserver/tabletenv/config.go b/go/vt/vttablet/tabletserver/tabletenv/config.go index 52817a75e68..9cd5ee8fbc3 100644 --- a/go/vt/vttablet/tabletserver/tabletenv/config.go +++ b/go/vt/vttablet/tabletserver/tabletenv/config.go @@ -27,22 +27,22 @@ import ( "github.com/spf13/pflag" "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/flagutil" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/throttler" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - throttlerdatapb "github.com/mdibaiee/vitess/go/vt/proto/throttlerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/flagutil" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/throttler" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + throttlerdatapb "github.com/vitess/vitess/go/vt/proto/throttlerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // These constants represent values for various config parameters. diff --git a/go/vt/vttablet/tabletserver/tabletenv/config_test.go b/go/vt/vttablet/tabletserver/tabletenv/config_test.go index c2b41e98bc9..1c160ab85b3 100644 --- a/go/vt/vttablet/tabletserver/tabletenv/config_test.go +++ b/go/vt/vttablet/tabletserver/tabletenv/config_test.go @@ -24,17 +24,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/throttler" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/yaml2" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/throttler" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/yaml2" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func TestConfigParse(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/tabletenv/env.go b/go/vt/vttablet/tabletserver/tabletenv/env.go index 69ec66b4a80..ffa3757afeb 100644 --- a/go/vt/vttablet/tabletserver/tabletenv/env.go +++ b/go/vt/vttablet/tabletserver/tabletenv/env.go @@ -19,10 +19,10 @@ limitations under the License. package tabletenv import ( - "github.com/mdibaiee/vitess/go/tb" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/tb" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vtenv" ) // Env defines the functions supported by TabletServer diff --git a/go/vt/vttablet/tabletserver/tabletenv/logstats.go b/go/vt/vttablet/tabletserver/tabletenv/logstats.go index 4b87d02eabf..ea6f5880ed2 100644 --- a/go/vt/vttablet/tabletserver/tabletenv/logstats.go +++ b/go/vt/vttablet/tabletserver/tabletenv/logstats.go @@ -25,13 +25,13 @@ import ( "github.com/google/safehtml" - "github.com/mdibaiee/vitess/go/logstats" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/callinfo" + "github.com/vitess/vitess/go/logstats" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/callinfo" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) const ( diff --git a/go/vt/vttablet/tabletserver/tabletenv/logstats_test.go b/go/vt/vttablet/tabletserver/tabletenv/logstats_test.go index ecd6eecbe20..1349a5e15ba 100644 --- a/go/vt/vttablet/tabletserver/tabletenv/logstats_test.go +++ b/go/vt/vttablet/tabletserver/tabletenv/logstats_test.go @@ -27,11 +27,11 @@ import ( "github.com/google/safehtml/testconversions" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/callinfo" - "github.com/mdibaiee/vitess/go/vt/callinfo/fakecallinfo" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/callinfo" + "github.com/vitess/vitess/go/vt/callinfo/fakecallinfo" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestLogStats(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/tabletenv/seconds_test.go b/go/vt/vttablet/tabletserver/tabletenv/seconds_test.go index 84d0e66289c..e8439ea5833 100644 --- a/go/vt/vttablet/tabletserver/tabletenv/seconds_test.go +++ b/go/vt/vttablet/tabletserver/tabletenv/seconds_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/yaml2" + "github.com/vitess/vitess/go/yaml2" ) func TestSecondsYaml(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/tabletenv/stats.go b/go/vt/vttablet/tabletserver/tabletenv/stats.go index a589346f0b1..9d87ef56df7 100644 --- a/go/vt/vttablet/tabletserver/tabletenv/stats.go +++ b/go/vt/vttablet/tabletserver/tabletenv/stats.go @@ -19,9 +19,9 @@ package tabletenv import ( "time" - "github.com/mdibaiee/vitess/go/stats" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/stats" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/servenv" ) // Stats contains tracked by various parts of TabletServer. diff --git a/go/vt/vttablet/tabletserver/tabletenv/tabletenvtest/tabletenvtest.go b/go/vt/vttablet/tabletserver/tabletenv/tabletenvtest/tabletenvtest.go index aeea70b220c..337f3edace1 100644 --- a/go/vt/vttablet/tabletserver/tabletenv/tabletenvtest/tabletenvtest.go +++ b/go/vt/vttablet/tabletserver/tabletenv/tabletenvtest/tabletenvtest.go @@ -19,8 +19,8 @@ package tabletenvtest import ( "github.com/spf13/pflag" - _flag "github.com/mdibaiee/vitess/go/internal/flag" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + _flag "github.com/vitess/vitess/go/internal/flag" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) // LoadTabletEnvFlags loads the default values for the tabletenv flags and is useful for tests which diff --git a/go/vt/vttablet/tabletserver/tabletserver.go b/go/vt/vttablet/tabletserver/tabletserver.go index 2728368fcc0..6627a6281ce 100644 --- a/go/vt/vttablet/tabletserver/tabletserver.go +++ b/go/vt/vttablet/tabletserver/tabletserver.go @@ -32,45 +32,45 @@ import ( "syscall" "time" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/pools/smartconnpool" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/tb" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/tableacl" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/onlineddl" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/gc" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/messager" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/planbuilder" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/repltracker" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/txserializer" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/txthrottler" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/vstreamer" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/pools/smartconnpool" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/tb" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/tableacl" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/onlineddl" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/gc" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/messager" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/planbuilder" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/repltracker" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/txserializer" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/txthrottler" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/vstreamer" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // logPoolFull is for throttling transaction / query pool full messages in the log. diff --git a/go/vt/vttablet/tabletserver/tabletserver_test.go b/go/vt/vttablet/tabletserver/tabletserver_test.go index dc082d3fe8a..81a0f9b0fdf 100644 --- a/go/vt/vttablet/tabletserver/tabletserver_test.go +++ b/go/vt/vttablet/tabletserver/tabletserver_test.go @@ -30,33 +30,33 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql/config" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/sidecardb" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/mysql/config" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/sidecardb" + "github.com/vitess/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/test/utils" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/test/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/tableacl" - "github.com/mdibaiee/vitess/go/vt/tableacl/simpleacl" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/tableacl" + "github.com/vitess/vitess/go/vt/tableacl/simpleacl" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func TestTabletServerHealthz(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/testutils_test.go b/go/vt/vttablet/tabletserver/testutils_test.go index 4b7b26dcb60..63ad48f5312 100644 --- a/go/vt/vttablet/tabletserver/testutils_test.go +++ b/go/vt/vttablet/tabletserver/testutils_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/vt/dbconfigs" ) var errRejected = errors.New("rejected") diff --git a/go/vt/vttablet/tabletserver/throttle/check.go b/go/vt/vttablet/tabletserver/throttle/check.go index 1334656de93..bc8f10713cc 100644 --- a/go/vt/vttablet/tabletserver/throttle/check.go +++ b/go/vt/vttablet/tabletserver/throttle/check.go @@ -48,10 +48,10 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/base" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/base" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" ) const ( diff --git a/go/vt/vttablet/tabletserver/throttle/check_result.go b/go/vt/vttablet/tabletserver/throttle/check_result.go index 3f35658a796..b102204a573 100644 --- a/go/vt/vttablet/tabletserver/throttle/check_result.go +++ b/go/vt/vttablet/tabletserver/throttle/check_result.go @@ -44,7 +44,7 @@ package throttle import ( "net/http" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/base" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/base" ) // CheckResult is the result for an app inquiring on a metric. It also exports as JSON via the API diff --git a/go/vt/vttablet/tabletserver/throttle/client.go b/go/vt/vttablet/tabletserver/throttle/client.go index 35757a257dc..45e43b985f5 100644 --- a/go/vt/vttablet/tabletserver/throttle/client.go +++ b/go/vt/vttablet/tabletserver/throttle/client.go @@ -23,7 +23,7 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" ) const ( diff --git a/go/vt/vttablet/tabletserver/throttle/mysql.go b/go/vt/vttablet/tabletserver/throttle/mysql.go index c65532c0a66..1b10b4000a8 100644 --- a/go/vt/vttablet/tabletserver/throttle/mysql.go +++ b/go/vt/vttablet/tabletserver/throttle/mysql.go @@ -45,8 +45,8 @@ import ( "context" "sort" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/base" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/mysql" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/base" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/mysql" ) func aggregateMySQLProbes( diff --git a/go/vt/vttablet/tabletserver/throttle/mysql/mysql_inventory.go b/go/vt/vttablet/tabletserver/throttle/mysql/mysql_inventory.go index 2e7f236ba25..6f165bc5129 100644 --- a/go/vt/vttablet/tabletserver/throttle/mysql/mysql_inventory.go +++ b/go/vt/vttablet/tabletserver/throttle/mysql/mysql_inventory.go @@ -42,7 +42,7 @@ limitations under the License. package mysql import ( - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/base" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/base" ) // ClusterTablet combines a cluster name with a tablet alias diff --git a/go/vt/vttablet/tabletserver/throttle/mysql/mysql_throttle_metric.go b/go/vt/vttablet/tabletserver/throttle/mysql/mysql_throttle_metric.go index 4e4409e318f..8991c573ee2 100644 --- a/go/vt/vttablet/tabletserver/throttle/mysql/mysql_throttle_metric.go +++ b/go/vt/vttablet/tabletserver/throttle/mysql/mysql_throttle_metric.go @@ -48,7 +48,7 @@ import ( "github.com/patrickmn/go-cache" - "github.com/mdibaiee/vitess/go/stats" + "github.com/vitess/vitess/go/stats" ) // MetricsQueryType indicates the type of metrics query on MySQL backend. See following. diff --git a/go/vt/vttablet/tabletserver/throttle/mysql/probe.go b/go/vt/vttablet/tabletserver/throttle/mysql/probe.go index 473e84255f3..e0c5953ce9b 100644 --- a/go/vt/vttablet/tabletserver/throttle/mysql/probe.go +++ b/go/vt/vttablet/tabletserver/throttle/mysql/probe.go @@ -44,7 +44,7 @@ package mysql import ( "fmt" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // Probe is the minimal configuration required to connect to a MySQL server diff --git a/go/vt/vttablet/tabletserver/throttle/mysql_test.go b/go/vt/vttablet/tabletserver/throttle/mysql_test.go index 73a34612399..e548c121c4a 100644 --- a/go/vt/vttablet/tabletserver/throttle/mysql_test.go +++ b/go/vt/vttablet/tabletserver/throttle/mysql_test.go @@ -45,8 +45,8 @@ import ( "context" "testing" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/base" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/mysql" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/base" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/mysql" "github.com/stretchr/testify/assert" ) diff --git a/go/vt/vttablet/tabletserver/throttle/throttler.go b/go/vt/vttablet/tabletserver/throttle/throttler.go index 9177113f962..626e024e003 100644 --- a/go/vt/vttablet/tabletserver/throttle/throttler.go +++ b/go/vt/vttablet/tabletserver/throttle/throttler.go @@ -57,28 +57,28 @@ import ( "github.com/patrickmn/go-cache" "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/stats" - - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/log" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/heartbeat" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/base" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/config" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/mysql" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/stats" + + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/log" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/heartbeat" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/base" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/config" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/mysql" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" ) const ( diff --git a/go/vt/vttablet/tabletserver/throttle/throttler_test.go b/go/vt/vttablet/tabletserver/throttle/throttler_test.go index 18624146446..1179572ab7b 100644 --- a/go/vt/vttablet/tabletserver/throttle/throttler_test.go +++ b/go/vt/vttablet/tabletserver/throttle/throttler_test.go @@ -29,17 +29,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/config" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/mysql" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/config" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/mysql" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/vttablet/tabletserver/twopc.go b/go/vt/vttablet/tabletserver/twopc.go index 92d1ec845ef..876ac1c83b2 100644 --- a/go/vt/vttablet/tabletserver/twopc.go +++ b/go/vt/vttablet/tabletserver/twopc.go @@ -21,20 +21,20 @@ import ( "fmt" "time" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tx" - - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/dbconnpool" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tx" + + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/dbconnpool" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const ( diff --git a/go/vt/vttablet/tabletserver/twopc_test.go b/go/vt/vttablet/tabletserver/twopc_test.go index b6ec36d62c5..b5558c665c7 100644 --- a/go/vt/vttablet/tabletserver/twopc_test.go +++ b/go/vt/vttablet/tabletserver/twopc_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tx" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tx" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestReadAllRedo(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/twopcz.go b/go/vt/vttablet/tabletserver/twopcz.go index 00d413fb5ae..600061d0597 100644 --- a/go/vt/vttablet/tabletserver/twopcz.go +++ b/go/vt/vttablet/tabletserver/twopcz.go @@ -23,10 +23,10 @@ import ( "github.com/google/safehtml/template" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tx" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tx" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/vt/log" ) var ( diff --git a/go/vt/vttablet/tabletserver/tx/api.go b/go/vt/vttablet/tabletserver/tx/api.go index b15958d98dd..57ac77749e0 100644 --- a/go/vt/vttablet/tabletserver/tx/api.go +++ b/go/vt/vttablet/tabletserver/tx/api.go @@ -21,10 +21,10 @@ import ( "strings" "time" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sqlparser" ) type ( diff --git a/go/vt/vttablet/tabletserver/tx/twopc.go b/go/vt/vttablet/tabletserver/tx/twopc.go index 5e397d01322..b9206a83947 100644 --- a/go/vt/vttablet/tabletserver/tx/twopc.go +++ b/go/vt/vttablet/tabletserver/tx/twopc.go @@ -19,7 +19,7 @@ package tx import ( "time" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // DistributedTx is similar to querypb.TransactionMetadata, but diff --git a/go/vt/vttablet/tabletserver/tx_engine.go b/go/vt/vttablet/tabletserver/tx_engine.go index f20b02f9bc4..0fba890b0ce 100644 --- a/go/vt/vttablet/tabletserver/tx_engine.go +++ b/go/vt/vttablet/tabletserver/tx_engine.go @@ -22,22 +22,22 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/pools/smartconnpool" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/dtids" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/connpool" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tx" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/txlimiter" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/pools/smartconnpool" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/dtids" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/connpool" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tx" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/txlimiter" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) type txEngineState int diff --git a/go/vt/vttablet/tabletserver/tx_engine_test.go b/go/vt/vttablet/tabletserver/tx_engine_test.go index bbb8be7fc49..698f15e776e 100644 --- a/go/vt/vttablet/tabletserver/tx_engine_test.go +++ b/go/vt/vttablet/tabletserver/tx_engine_test.go @@ -25,19 +25,19 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tx" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tx" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestTxEngineClose(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/tx_executor.go b/go/vt/vttablet/tabletserver/tx_executor.go index f98a27b8236..e4305c940e0 100644 --- a/go/vt/vttablet/tabletserver/tx_executor.go +++ b/go/vt/vttablet/tabletserver/tx_executor.go @@ -20,15 +20,15 @@ import ( "context" "time" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tx" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tx" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) // TxExecutor is used for executing a transactional request. diff --git a/go/vt/vttablet/tabletserver/tx_executor_test.go b/go/vt/vttablet/tabletserver/tx_executor_test.go index ebe6fd4c5f9..d6ccb410fd1 100644 --- a/go/vt/vttablet/tabletserver/tx_executor_test.go +++ b/go/vt/vttablet/tabletserver/tx_executor_test.go @@ -24,19 +24,19 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tx" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tx" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vtgate/fakerpcvtgateconn" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vtgate/fakerpcvtgateconn" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestTxExecutorEmptyPrepare(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/tx_pool.go b/go/vt/vttablet/tabletserver/tx_pool.go index 3d733c73a61..35da6597786 100644 --- a/go/vt/vttablet/tabletserver/tx_pool.go +++ b/go/vt/vttablet/tabletserver/tx_pool.go @@ -22,21 +22,21 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/pools/smartconnpool" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/trace" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tx" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/txlimiter" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/pools/smartconnpool" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/trace" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tx" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/txlimiter" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const ( diff --git a/go/vt/vttablet/tabletserver/tx_pool_test.go b/go/vt/vttablet/tabletserver/tx_pool_test.go index d96b07a3aa5..3c99bf5a553 100644 --- a/go/vt/vttablet/tabletserver/tx_pool_test.go +++ b/go/vt/vttablet/tabletserver/tx_pool_test.go @@ -23,21 +23,21 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/dbconfigs" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tx" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tx" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) func TestTxPoolExecuteCommit(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/txlimiter/tx_limiter.go b/go/vt/vttablet/tabletserver/txlimiter/tx_limiter.go index 266407498ad..8d48b75f6e4 100644 --- a/go/vt/vttablet/tabletserver/txlimiter/tx_limiter.go +++ b/go/vt/vttablet/tabletserver/txlimiter/tx_limiter.go @@ -20,13 +20,13 @@ import ( "strings" "sync" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const unknown string = "unknown" diff --git a/go/vt/vttablet/tabletserver/txlimiter/tx_limiter_test.go b/go/vt/vttablet/tabletserver/txlimiter/tx_limiter_test.go index 7f8299ba204..5918b017caa 100644 --- a/go/vt/vttablet/tabletserver/txlimiter/tx_limiter_test.go +++ b/go/vt/vttablet/tabletserver/txlimiter/tx_limiter_test.go @@ -19,12 +19,12 @@ package txlimiter import ( "testing" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func resetVariables(txl *Impl) { diff --git a/go/vt/vttablet/tabletserver/txlogz.go b/go/vt/vttablet/tabletserver/txlogz.go index f21c6f894ef..5487d0f07ea 100644 --- a/go/vt/vttablet/tabletserver/txlogz.go +++ b/go/vt/vttablet/tabletserver/txlogz.go @@ -24,14 +24,14 @@ import ( "github.com/google/safehtml/template" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logz" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logz" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" ) var ( diff --git a/go/vt/vttablet/tabletserver/txlogz_test.go b/go/vt/vttablet/tabletserver/txlogz_test.go index 9659e604df2..e925f017586 100644 --- a/go/vt/vttablet/tabletserver/txlogz_test.go +++ b/go/vt/vttablet/tabletserver/txlogz_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tx" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tx" - "github.com/mdibaiee/vitess/go/vt/callerid" + "github.com/vitess/vitess/go/vt/callerid" - "github.com/mdibaiee/vitess/go/streamlog" + "github.com/vitess/vitess/go/streamlog" ) func testNotRedacted(t *testing.T, r *httptest.ResponseRecorder) { diff --git a/go/vt/vttablet/tabletserver/txserializer/tx_serializer.go b/go/vt/vttablet/tabletserver/txserializer/tx_serializer.go index 9d8acb59665..4451cc79dfc 100644 --- a/go/vt/vttablet/tabletserver/txserializer/tx_serializer.go +++ b/go/vt/vttablet/tabletserver/txserializer/tx_serializer.go @@ -27,15 +27,15 @@ import ( "context" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/sync2" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/sync2" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // TxSerializer serializes incoming transactions which target the same row range diff --git a/go/vt/vttablet/tabletserver/txserializer/tx_serializer_test.go b/go/vt/vttablet/tabletserver/txserializer/tx_serializer_test.go index 2508e17beb4..ac33f355109 100644 --- a/go/vt/vttablet/tabletserver/txserializer/tx_serializer_test.go +++ b/go/vt/vttablet/tabletserver/txserializer/tx_serializer_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/streamlog" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/streamlog" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) func resetVariables(txs *TxSerializer) { diff --git a/go/vt/vttablet/tabletserver/txthrottler/mock_healthcheck_test.go b/go/vt/vttablet/tabletserver/txthrottler/mock_healthcheck_test.go index cbb4064ab14..ce9b317e71f 100644 --- a/go/vt/vttablet/tabletserver/txthrottler/mock_healthcheck_test.go +++ b/go/vt/vttablet/tabletserver/txthrottler/mock_healthcheck_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mdibaiee/vitess/go/vt/discovery (interfaces: HealthCheck) +// Source: github.com/vitess/vitess/go/vt/discovery (interfaces: HealthCheck) // Package txthrottler is a generated GoMock package. package txthrottler @@ -10,10 +10,10 @@ import ( gomock "go.uber.org/mock/gomock" - discovery "github.com/mdibaiee/vitess/go/vt/discovery" - query "github.com/mdibaiee/vitess/go/vt/proto/query" - topodata "github.com/mdibaiee/vitess/go/vt/proto/topodata" - queryservice "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" + discovery "github.com/vitess/vitess/go/vt/discovery" + query "github.com/vitess/vitess/go/vt/proto/query" + topodata "github.com/vitess/vitess/go/vt/proto/topodata" + queryservice "github.com/vitess/vitess/go/vt/vttablet/queryservice" ) // MockHealthCheck is a mock of HealthCheck interface. diff --git a/go/vt/vttablet/tabletserver/txthrottler/mock_throttler_test.go b/go/vt/vttablet/tabletserver/txthrottler/mock_throttler_test.go index d31a7a3111f..51fb025d8a9 100644 --- a/go/vt/vttablet/tabletserver/txthrottler/mock_throttler_test.go +++ b/go/vt/vttablet/tabletserver/txthrottler/mock_throttler_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/txthrottler (interfaces: ThrottlerInterface) +// Source: github.com/vitess/vitess/go/vt/vttablet/tabletserver/txthrottler (interfaces: ThrottlerInterface) // Package txthrottler is a generated GoMock package. package txthrottler @@ -10,9 +10,9 @@ import ( gomock "go.uber.org/mock/gomock" - discovery "github.com/mdibaiee/vitess/go/vt/discovery" - throttlerdata "github.com/mdibaiee/vitess/go/vt/proto/throttlerdata" - topodata "github.com/mdibaiee/vitess/go/vt/proto/topodata" + discovery "github.com/vitess/vitess/go/vt/discovery" + throttlerdata "github.com/vitess/vitess/go/vt/proto/throttlerdata" + topodata "github.com/vitess/vitess/go/vt/proto/topodata" ) // MockThrottlerInterface is a mock of ThrottlerInterface interface. diff --git a/go/vt/vttablet/tabletserver/txthrottler/tx_throttler.go b/go/vt/vttablet/tabletserver/txthrottler/tx_throttler.go index bed6a978817..9985e45cff9 100644 --- a/go/vt/vttablet/tabletserver/txthrottler/tx_throttler.go +++ b/go/vt/vttablet/tabletserver/txthrottler/tx_throttler.go @@ -25,17 +25,17 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/throttler" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - throttlerdatapb "github.com/mdibaiee/vitess/go/vt/proto/throttlerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/throttler" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + throttlerdatapb "github.com/vitess/vitess/go/vt/proto/throttlerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // These vars store the functions used to create the topo server, healthcheck, diff --git a/go/vt/vttablet/tabletserver/txthrottler/tx_throttler_test.go b/go/vt/vttablet/tabletserver/txthrottler/tx_throttler_test.go index 33689a5a9d2..aa8a4de1769 100644 --- a/go/vt/vttablet/tabletserver/txthrottler/tx_throttler_test.go +++ b/go/vt/vttablet/tabletserver/txthrottler/tx_throttler_test.go @@ -17,8 +17,8 @@ limitations under the License. package txthrottler // Commands to generate the mocks for this test. -//go:generate mockgen -destination mock_healthcheck_test.go -package txthrottler -mock_names "HealthCheck=MockHealthCheck" github.com/mdibaiee/vitess/go/vt/discovery HealthCheck -//go:generate mockgen -destination mock_throttler_test.go -package txthrottler github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/txthrottler ThrottlerInterface +//go:generate mockgen -destination mock_healthcheck_test.go -package txthrottler -mock_names "HealthCheck=MockHealthCheck" github.com/vitess/vitess/go/vt/discovery HealthCheck +//go:generate mockgen -destination mock_throttler_test.go -package txthrottler github.com/vitess/vitess/go/vt/vttablet/tabletserver/txthrottler ThrottlerInterface import ( "context" @@ -29,16 +29,16 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/throttler" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/throttler" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestDisabledThrottler(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/vstreamer/copy.go b/go/vt/vttablet/tabletserver/vstreamer/copy.go index 0d51fc88066..3670fa6aa17 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/copy.go +++ b/go/vt/vttablet/tabletserver/vstreamer/copy.go @@ -23,12 +23,12 @@ import ( "math" "time" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/slice" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/slice" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // starts the copy phase for the first table in the (sorted) list. diff --git a/go/vt/vttablet/tabletserver/vstreamer/engine.go b/go/vt/vttablet/tabletserver/vstreamer/engine.go index ab9a759d0b1..07ed0b90387 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/engine.go +++ b/go/vt/vttablet/tabletserver/vstreamer/engine.go @@ -28,25 +28,25 @@ import ( "sync/atomic" "time" - "github.com/mdibaiee/vitess/go/acl" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/acl" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // Engine is the engine for handling vreplication streaming requests. diff --git a/go/vt/vttablet/tabletserver/vstreamer/engine_test.go b/go/vt/vttablet/tabletserver/vstreamer/engine_test.go index 53394713345..0bb97d33664 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/engine_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/engine_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" ) var ( diff --git a/go/vt/vttablet/tabletserver/vstreamer/fuzz.go b/go/vt/vttablet/tabletserver/vstreamer/fuzz.go index d3120efa6c4..0f730e6e7e1 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/fuzz.go +++ b/go/vt/vttablet/tabletserver/vstreamer/fuzz.go @@ -22,10 +22,10 @@ package vstreamer import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // Fuzz implements the fuzzer diff --git a/go/vt/vttablet/tabletserver/vstreamer/helper_event_test.go b/go/vt/vttablet/tabletserver/vstreamer/helper_event_test.go index dd54ff90a75..3227b923df5 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/helper_event_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/helper_event_test.go @@ -42,15 +42,15 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/collations/colldata" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/schemadiff" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/vstreamer/testenv" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/collations/colldata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/schemadiff" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/vstreamer/testenv" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) const ( diff --git a/go/vt/vttablet/tabletserver/vstreamer/local_vschema.go b/go/vt/vttablet/tabletserver/vstreamer/local_vschema.go index c9e4dcc2f45..2887150389d 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/local_vschema.go +++ b/go/vt/vttablet/tabletserver/vstreamer/local_vschema.go @@ -20,9 +20,9 @@ import ( "fmt" "strings" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) // localVSchema provides vschema behavior specific to vstreamer. diff --git a/go/vt/vttablet/tabletserver/vstreamer/local_vschema_test.go b/go/vt/vttablet/tabletserver/vstreamer/local_vschema_test.go index cba19d0b951..acfa2f5c4f8 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/local_vschema_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/local_vschema_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" ) func TestFindColVindex(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/vstreamer/main_test.go b/go/vt/vttablet/tabletserver/vstreamer/main_test.go index da5f36a6325..ebf0982285a 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/main_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/main_test.go @@ -29,18 +29,18 @@ import ( "github.com/stretchr/testify/require" - _flag "github.com/mdibaiee/vitess/go/internal/flag" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/vstreamer/testenv" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + _flag "github.com/vitess/vitess/go/internal/flag" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/vstreamer/testenv" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) var ( diff --git a/go/vt/vttablet/tabletserver/vstreamer/packet_size.go b/go/vt/vttablet/tabletserver/vstreamer/packet_size.go index 25be856dc3a..21835eafe83 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/packet_size.go +++ b/go/vt/vttablet/tabletserver/vstreamer/packet_size.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/mathstats" + "github.com/vitess/vitess/go/mathstats" ) var ( diff --git a/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go b/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go index 5b178992ddc..a127eff8373 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go +++ b/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go @@ -23,21 +23,21 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) // Plan represents the plan for a table. diff --git a/go/vt/vttablet/tabletserver/vstreamer/planbuilder_test.go b/go/vt/vttablet/tabletserver/vstreamer/planbuilder_test.go index 08864420894..f59da6cd1ce 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/planbuilder_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/planbuilder_test.go @@ -23,19 +23,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) var testLocalVSchema *localVSchema diff --git a/go/vt/vttablet/tabletserver/vstreamer/resultstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/resultstreamer.go index bdce0c70d89..51ff910df33 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/resultstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/resultstreamer.go @@ -21,13 +21,13 @@ import ( "fmt" "time" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) // resultStreamer streams the results of the requested query diff --git a/go/vt/vttablet/tabletserver/vstreamer/resultstreamer_test.go b/go/vt/vttablet/tabletserver/vstreamer/resultstreamer_test.go index bf2988805a3..0c0958dc935 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/resultstreamer_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/resultstreamer_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) func TestStreamResults(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/vstreamer/rowstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/rowstreamer.go index 06086f5b868..97ed9689514 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/rowstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/rowstreamer.go @@ -23,23 +23,23 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) var ( diff --git a/go/vt/vttablet/tabletserver/vstreamer/rowstreamer_test.go b/go/vt/vttablet/tabletserver/vstreamer/rowstreamer_test.go index d08bae74d6d..aa0ced812be 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/rowstreamer_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/rowstreamer_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) // TestRowStreamerQuery validates that the correct force index hint and order by is added to the rowstreamer query. diff --git a/go/vt/vttablet/tabletserver/vstreamer/snapshot_conn.go b/go/vt/vttablet/tabletserver/vstreamer/snapshot_conn.go index 7b7068e2fa3..63d1fc79b0c 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/snapshot_conn.go +++ b/go/vt/vttablet/tabletserver/vstreamer/snapshot_conn.go @@ -25,15 +25,15 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" ) // If the current binary log is greater than this byte size, we diff --git a/go/vt/vttablet/tabletserver/vstreamer/snapshot_conn_test.go b/go/vt/vttablet/tabletserver/vstreamer/snapshot_conn_test.go index 554e390a0f2..ac1ced25f47 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/snapshot_conn_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/snapshot_conn_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) func TestStartSnapshot(t *testing.T) { diff --git a/go/vt/vttablet/tabletserver/vstreamer/tablestreamer.go b/go/vt/vttablet/tabletserver/vstreamer/tablestreamer.go index 650e5ec4f64..4572e1460bb 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/tablestreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/tablestreamer.go @@ -23,16 +23,16 @@ import ( "strings" "sync/atomic" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/vttablet" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - schema2 "github.com/mdibaiee/vitess/go/vt/schema" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/vttablet" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + schema2 "github.com/vitess/vitess/go/vt/schema" ) /* diff --git a/go/vt/vttablet/tabletserver/vstreamer/tablestreamer_test.go b/go/vt/vttablet/tabletserver/vstreamer/tablestreamer_test.go index 3610c01a5a2..4dc00d1abaa 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/tablestreamer_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/tablestreamer_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) // TestTableStreamer streams all tables and ensures all rows are received in the correct order. diff --git a/go/vt/vttablet/tabletserver/vstreamer/testenv/testenv.go b/go/vt/vttablet/tabletserver/vstreamer/testenv/testenv.go index 5bb41bb831c..be295dbc336 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/testenv/testenv.go +++ b/go/vt/vttablet/tabletserver/vstreamer/testenv/testenv.go @@ -24,23 +24,23 @@ import ( "regexp" "strings" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/srvtopo" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttest" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/srvtopo" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttest" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" ) const ( diff --git a/go/vt/vttablet/tabletserver/vstreamer/uvstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/uvstreamer.go index 246ac0bc5cd..325eabe16e9 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/uvstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/uvstreamer.go @@ -26,18 +26,18 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/mysql/replication" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/mysql/replication" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" ) var uvstreamerTestMode = false // Only used for testing diff --git a/go/vt/vttablet/tabletserver/vstreamer/uvstreamer_flaky_test.go b/go/vt/vttablet/tabletserver/vstreamer/uvstreamer_flaky_test.go index 2e588a53da2..80339f98a42 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/uvstreamer_flaky_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/uvstreamer_flaky_test.go @@ -51,17 +51,17 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/proto/query" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/proto/query" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/log" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + "github.com/vitess/vitess/go/vt/log" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) const ( diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index d32a8871b97..00ab645da59 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -26,27 +26,27 @@ import ( "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/timer" - "github.com/mdibaiee/vitess/go/vt/binlog" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - vtschema "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vttablet" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - - mysqlbinlog "github.com/mdibaiee/vitess/go/mysql/binlog" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/timer" + "github.com/vitess/vitess/go/vt/binlog" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + vtschema "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vttablet" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + + mysqlbinlog "github.com/vitess/vitess/go/mysql/binlog" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const ( diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go index 1d194e2d3f7..22309e6d954 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go @@ -31,15 +31,15 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/vstreamer/testenv" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/vstreamer/testenv" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" ) type testcase struct { diff --git a/go/vt/vttablet/tabletservermock/controller.go b/go/vt/vttablet/tabletservermock/controller.go index 01e22f13a8b..d9965c591a9 100644 --- a/go/vt/vttablet/tabletservermock/controller.go +++ b/go/vt/vttablet/tabletservermock/controller.go @@ -22,18 +22,18 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/rules" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/schema" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/tabletenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletserver/throttle" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/rules" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/schema" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/tabletenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletserver/throttle" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // BroadcastData is used by the mock Controller to send data diff --git a/go/vt/vttablet/tmclient/rpc_client_api.go b/go/vt/vttablet/tmclient/rpc_client_api.go index c6a0073841e..1c9972ba771 100644 --- a/go/vt/vttablet/tmclient/rpc_client_api.go +++ b/go/vt/vttablet/tmclient/rpc_client_api.go @@ -22,16 +22,16 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/hook" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/servenv" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/hook" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/servenv" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // tabletManagerProtocol is the implementation to use for tablet diff --git a/go/vt/vttablet/tmclienttest/tmclienttest.go b/go/vt/vttablet/tmclienttest/tmclienttest.go index 79a553c0372..af17501f0c8 100644 --- a/go/vt/vttablet/tmclienttest/tmclienttest.go +++ b/go/vt/vttablet/tmclienttest/tmclienttest.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" ) const tmclientProtocolFlagName = "tablet_manager_protocol" diff --git a/go/vt/vttablet/tmrpctest/test_tm_rpc.go b/go/vt/vttablet/tmrpctest/test_tm_rpc.go index 671158237a8..a03283f3034 100644 --- a/go/vt/vttablet/tmrpctest/test_tm_rpc.go +++ b/go/vt/vttablet/tmrpctest/test_tm_rpc.go @@ -28,20 +28,20 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/mysql/replication" - - "github.com/mdibaiee/vitess/go/protoutil" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/hook" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - replicationdatapb "github.com/mdibaiee/vitess/go/vt/proto/replicationdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql/replication" + + "github.com/vitess/vitess/go/protoutil" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/hook" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + replicationdatapb "github.com/vitess/vitess/go/vt/proto/replicationdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // fakeRPCTM implements tabletmanager.RPCTM and fills in all diff --git a/go/vt/vttest/environment.go b/go/vt/vttest/environment.go index be5ac65ec6a..9cb3141e801 100644 --- a/go/vt/vttest/environment.go +++ b/go/vt/vttest/environment.go @@ -25,10 +25,10 @@ import ( "strconv" "strings" - "github.com/mdibaiee/vitess/go/vt/proto/vttest" + "github.com/vitess/vitess/go/vt/proto/vttest" // we use gRPC everywhere, so import the vtgate client. - _ "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateconn" + _ "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateconn" ) // Environment is the interface that customizes the global settings for diff --git a/go/vt/vttest/local_cluster.go b/go/vt/vttest/local_cluster.go index 08314076a2e..cda527d4389 100644 --- a/go/vt/vttest/local_cluster.go +++ b/go/vt/vttest/local_cluster.go @@ -35,23 +35,23 @@ import ( "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/constants/sidecar" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/logutil" - "github.com/mdibaiee/vitess/go/vt/sidecardb" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctlclient" + "github.com/vitess/vitess/go/constants/sidecar" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/logutil" + "github.com/vitess/vitess/go/vt/sidecardb" + "github.com/vitess/vitess/go/vt/vtctl/vtctlclient" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vttestpb "github.com/mdibaiee/vitess/go/vt/proto/vttest" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vttestpb "github.com/vitess/vitess/go/vt/proto/vttest" // we need to import the grpcvtctlclient library so the gRPC // vtctl client is registered and can be used. - _ "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctlclient" + _ "github.com/vitess/vitess/go/vt/vtctl/grpcvtctlclient" ) // Config are the settings used to configure the self-contained Vitess cluster. diff --git a/go/vt/vttest/mysqlctl.go b/go/vt/vttest/mysqlctl.go index 8f837dd1283..fee0ea722fa 100644 --- a/go/vt/vttest/mysqlctl.go +++ b/go/vt/vttest/mysqlctl.go @@ -25,10 +25,10 @@ import ( "strings" "time" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/mysqlctl" ) // MySQLManager is an interface to a mysqld process manager, capable diff --git a/go/vt/vttest/plugin_consultopo.go b/go/vt/vttest/plugin_consultopo.go index 235866ad286..3de4b3cdefc 100644 --- a/go/vt/vttest/plugin_consultopo.go +++ b/go/vt/vttest/plugin_consultopo.go @@ -19,5 +19,5 @@ package vttest // This plugin imports consultopo to register the consul implementation of TopoServer. import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/consultopo" // nolint:revive + _ "github.com/vitess/vitess/go/vt/topo/consultopo" // nolint:revive ) diff --git a/go/vt/vttest/plugin_etcd2topo.go b/go/vt/vttest/plugin_etcd2topo.go index 50219adbd87..74f98343666 100644 --- a/go/vt/vttest/plugin_etcd2topo.go +++ b/go/vt/vttest/plugin_etcd2topo.go @@ -19,5 +19,5 @@ package vttest // This plugin imports etcd2topo to register the etcd2 implementation of TopoServer. import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/etcd2topo" // nolint:revive + _ "github.com/vitess/vitess/go/vt/topo/etcd2topo" // nolint:revive ) diff --git a/go/vt/vttest/plugin_grpctmclient.go b/go/vt/vttest/plugin_grpctmclient.go index 4889f6efa90..853a2f26d3d 100644 --- a/go/vt/vttest/plugin_grpctmclient.go +++ b/go/vt/vttest/plugin_grpctmclient.go @@ -19,5 +19,5 @@ package vttest // Imports and register the gRPC tabletmanager client import ( - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmclient" // nolint:revive + _ "github.com/vitess/vitess/go/vt/vttablet/grpctmclient" // nolint:revive ) diff --git a/go/vt/vttest/plugin_zk2topo.go b/go/vt/vttest/plugin_zk2topo.go index 7529b2e8704..b7c60fb19cd 100644 --- a/go/vt/vttest/plugin_zk2topo.go +++ b/go/vt/vttest/plugin_zk2topo.go @@ -19,5 +19,5 @@ package vttest // Imports and register the zk2 TopologyServer import ( - _ "github.com/mdibaiee/vitess/go/vt/topo/zk2topo" // nolint:revive + _ "github.com/vitess/vitess/go/vt/topo/zk2topo" // nolint:revive ) diff --git a/go/vt/vttest/topoctl.go b/go/vt/vttest/topoctl.go index e8cb43299c5..53f06ab9665 100644 --- a/go/vt/vttest/topoctl.go +++ b/go/vt/vttest/topoctl.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/mdibaiee/vitess/go/vt/log" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vttest" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/log" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vttest" + "github.com/vitess/vitess/go/vt/topo" ) // TopoManager is an interface to manage things in a remote topology server for local cluster diff --git a/go/vt/vttest/toxiproxyctl.go b/go/vt/vttest/toxiproxyctl.go index 0eff91cb5cf..bf32ea3b60b 100644 --- a/go/vt/vttest/toxiproxyctl.go +++ b/go/vt/vttest/toxiproxyctl.go @@ -27,9 +27,9 @@ import ( toxiproxy "github.com/Shopify/toxiproxy/v2/client" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/vterrors" ) const ( @@ -245,7 +245,7 @@ func WriteInitDBFile(initFile, customSQL, newInitFile string) error { } // getInitDBSQL is a helper function that retrieves the modified contents of the init_db.sql file with custom SQL statements. -// We avoid using github.com/mdibaiee/vitess/go/test/endtoend/utils.GetInitDBSQL as importing this package adds unnecessary flags to vttestserver. +// We avoid using github.com/vitess/vitess/go/test/endtoend/utils.GetInitDBSQL as importing this package adds unnecessary flags to vttestserver. func getInitDBSQL(initDBSQL string, customSQL string) (string, error) { splitString := strings.Split(initDBSQL, "# {{custom_sql}}") if len(splitString) != 2 { diff --git a/go/vt/vttest/vtprocess.go b/go/vt/vttest/vtprocess.go index 21dacf75c21..9ce05847474 100644 --- a/go/vt/vttest/vtprocess.go +++ b/go/vt/vttest/vtprocess.go @@ -31,8 +31,8 @@ import ( "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/servenv" ) // HealthChecker is a callback that impements a service-specific health check diff --git a/go/vt/vttls/crl.go b/go/vt/vttls/crl.go index 0b3870f34c8..345308d4260 100644 --- a/go/vt/vttls/crl.go +++ b/go/vt/vttls/crl.go @@ -23,7 +23,7 @@ import ( "os" "time" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) type verifyPeerCertificateFunc func([][]byte, [][]*x509.Certificate) error diff --git a/go/vt/vttls/vttls.go b/go/vt/vttls/vttls.go index 794e4784270..71db76d7920 100644 --- a/go/vt/vttls/vttls.go +++ b/go/vt/vttls/vttls.go @@ -23,8 +23,8 @@ import ( "strings" "sync" - "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/vt/vterrors" ) // SslMode indicates the type of SSL mode to use. This matches diff --git a/go/vt/wrangler/external_cluster.go b/go/vt/wrangler/external_cluster.go index 828c40938be..7f238cfc63c 100644 --- a/go/vt/wrangler/external_cluster.go +++ b/go/vt/wrangler/external_cluster.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/topodata" ) // MountExternalVitessCluster adds a topo record for cluster with specified parameters so that it is available to a Migrate command diff --git a/go/vt/wrangler/external_cluster_test.go b/go/vt/wrangler/external_cluster_test.go index 316743a3936..10d5a2ea613 100644 --- a/go/vt/wrangler/external_cluster_test.go +++ b/go/vt/wrangler/external_cluster_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtenv" ) func TestVitessCluster(t *testing.T) { diff --git a/go/vt/wrangler/fake_dbclient_test.go b/go/vt/wrangler/fake_dbclient_test.go index 6f3e5462c75..a3e41062f60 100644 --- a/go/vt/wrangler/fake_dbclient_test.go +++ b/go/vt/wrangler/fake_dbclient_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/sqltypes" + "github.com/vitess/vitess/go/sqltypes" ) func verifyQueries(t *testing.T, dcs []*fakeDBClient) { diff --git a/go/vt/wrangler/fake_tablet_test.go b/go/vt/wrangler/fake_tablet_test.go index 575d5b65d2a..cfd88366d69 100644 --- a/go/vt/wrangler/fake_tablet_test.go +++ b/go/vt/wrangler/fake_tablet_test.go @@ -26,31 +26,31 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmserver" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice/fakes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconntest" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager" - vdiff2 "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vdiff" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletservermock" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclienttest" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/mysqlctl" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/grpctmserver" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/queryservice/fakes" + "github.com/vitess/vitess/go/vt/vttablet/tabletconntest" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager" + vdiff2 "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vdiff" + "github.com/vitess/vitess/go/vt/vttablet/tabletservermock" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/vttablet/tmclienttest" // import the gRPC client implementation for tablet manager - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmclient" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctmclient" // import the gRPC client implementation for query service - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctabletconn" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctabletconn" ) func init() { diff --git a/go/vt/wrangler/keyspace.go b/go/vt/wrangler/keyspace.go index c6a2b0e984f..2700ed4839d 100644 --- a/go/vt/wrangler/keyspace.go +++ b/go/vt/wrangler/keyspace.go @@ -23,15 +23,15 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vterrors" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/wrangler/materializer.go b/go/vt/wrangler/materializer.go index 11c71d566c3..24cd6db3fd2 100644 --- a/go/vt/wrangler/materializer.go +++ b/go/vt/wrangler/materializer.go @@ -30,32 +30,32 @@ import ( "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/schemadiff" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtctl/schematools" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/schemadiff" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtctl/schematools" + "github.com/vitess/vitess/go/vt/vtctl/workflow" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) type materializer struct { diff --git a/go/vt/wrangler/materializer_env_test.go b/go/vt/wrangler/materializer_env_test.go index 6ce58a11f29..0404bcba7b3 100644 --- a/go/vt/wrangler/materializer_env_test.go +++ b/go/vt/wrangler/materializer_env_test.go @@ -26,22 +26,22 @@ import ( "sync" "testing" - _flag "github.com/mdibaiee/vitess/go/internal/flag" - - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + _flag "github.com/vitess/vitess/go/internal/flag" + + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) type testMaterializerEnv struct { diff --git a/go/vt/wrangler/materializer_test.go b/go/vt/wrangler/materializer_test.go index 296a6592175..28e23ed3d66 100644 --- a/go/vt/wrangler/materializer_test.go +++ b/go/vt/wrangler/materializer_test.go @@ -30,21 +30,21 @@ import ( "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/test/utils" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/test/utils" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) const mzUpdateQuery = "update _vt.vreplication set state='Running' where db_name='vt_targetks' and workflow='workflow'" diff --git a/go/vt/wrangler/permissions.go b/go/vt/wrangler/permissions.go index 86bed1d4707..f1024d932eb 100644 --- a/go/vt/wrangler/permissions.go +++ b/go/vt/wrangler/permissions.go @@ -23,13 +23,13 @@ import ( "context" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/topo/topoproto" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // GetPermissions returns the permissions set on a remote tablet diff --git a/go/vt/wrangler/reparent.go b/go/vt/wrangler/reparent.go index 3256aa7b44d..80cc1f8a7fa 100644 --- a/go/vt/wrangler/reparent.go +++ b/go/vt/wrangler/reparent.go @@ -25,15 +25,15 @@ import ( "fmt" "time" - "github.com/mdibaiee/vitess/go/event" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools/events" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/event" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools/events" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // ReparentTablet tells a tablet to reparent this tablet to the current diff --git a/go/vt/wrangler/resharder.go b/go/vt/wrangler/resharder.go index 4e216777f9e..a224e742654 100644 --- a/go/vt/wrangler/resharder.go +++ b/go/vt/wrangler/resharder.go @@ -25,21 +25,21 @@ import ( "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" - - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/vtctl/workflow" + + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) type resharder struct { diff --git a/go/vt/wrangler/resharder_env_test.go b/go/vt/wrangler/resharder_env_test.go index b5b92679d5b..e99c3f73208 100644 --- a/go/vt/wrangler/resharder_env_test.go +++ b/go/vt/wrangler/resharder_env_test.go @@ -26,17 +26,17 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) type testResharderEnv struct { diff --git a/go/vt/wrangler/resharder_test.go b/go/vt/wrangler/resharder_test.go index 8f2fef0f63f..6ad0510da2e 100644 --- a/go/vt/wrangler/resharder_test.go +++ b/go/vt/wrangler/resharder_test.go @@ -25,12 +25,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) const rsSelectFrozenQuery = "select 1 from _vt.vreplication where db_name='vt_ks' and message='FROZEN' and workflow_sub_type != 1" diff --git a/go/vt/wrangler/schema.go b/go/vt/wrangler/schema.go index 7e7066b0df3..bcfe127a686 100644 --- a/go/vt/wrangler/schema.go +++ b/go/vt/wrangler/schema.go @@ -24,19 +24,19 @@ import ( "text/template" "time" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/schematools" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/schematools" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // helper method to asynchronously diff a schema diff --git a/go/vt/wrangler/schema_test.go b/go/vt/wrangler/schema_test.go index 92f8a4d6319..e1334ffb91c 100644 --- a/go/vt/wrangler/schema_test.go +++ b/go/vt/wrangler/schema_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/sqltypes" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) func TestValidateSchemaShard(t *testing.T) { diff --git a/go/vt/wrangler/shard.go b/go/vt/wrangler/shard.go index f7e99a05744..784704c2a89 100644 --- a/go/vt/wrangler/shard.go +++ b/go/vt/wrangler/shard.go @@ -20,10 +20,10 @@ import ( "context" "fmt" - "github.com/mdibaiee/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // shard related methods for Wrangler diff --git a/go/vt/wrangler/split.go b/go/vt/wrangler/split.go index eddb4ce99c0..a733a9f37c1 100644 --- a/go/vt/wrangler/split.go +++ b/go/vt/wrangler/split.go @@ -22,13 +22,13 @@ import ( "io" "time" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/wrangler/stream_migrater_test.go b/go/vt/wrangler/stream_migrater_test.go index 6de730c1a54..0ada8222283 100644 --- a/go/vt/wrangler/stream_migrater_test.go +++ b/go/vt/wrangler/stream_migrater_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/vtctl/workflow" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var ( diff --git a/go/vt/wrangler/switcher.go b/go/vt/wrangler/switcher.go index 9e98051bf48..3bb61f78967 100644 --- a/go/vt/wrangler/switcher.go +++ b/go/vt/wrangler/switcher.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" + "github.com/vitess/vitess/go/vt/vtctl/workflow" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var _ iswitcher = (*switcher)(nil) diff --git a/go/vt/wrangler/switcher_dry_run.go b/go/vt/wrangler/switcher_dry_run.go index 165cd70c6d8..4bd58397b0a 100644 --- a/go/vt/wrangler/switcher_dry_run.go +++ b/go/vt/wrangler/switcher_dry_run.go @@ -26,11 +26,11 @@ import ( "golang.org/x/exp/maps" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/vt/vtctl/workflow" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) var _ iswitcher = (*switcherDryRun)(nil) diff --git a/go/vt/wrangler/switcher_interface.go b/go/vt/wrangler/switcher_interface.go index ea875f0bf9d..56a17b9b2be 100644 --- a/go/vt/wrangler/switcher_interface.go +++ b/go/vt/wrangler/switcher_interface.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" + "github.com/vitess/vitess/go/vt/vtctl/workflow" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) type iswitcher interface { diff --git a/go/vt/wrangler/tablet.go b/go/vt/wrangler/tablet.go index 0696a6a5024..5e73fc12daa 100644 --- a/go/vt/wrangler/tablet.go +++ b/go/vt/wrangler/tablet.go @@ -21,14 +21,14 @@ import ( "fmt" "time" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // Tablet related methods for wrangler diff --git a/go/vt/wrangler/tablet_test.go b/go/vt/wrangler/tablet_test.go index 391c1e97fdc..0e9923f9fc4 100644 --- a/go/vt/wrangler/tablet_test.go +++ b/go/vt/wrangler/tablet_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/vt/logutil" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/logutil" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtenv" ) // TestInitTabletShardConversion makes sure InitTablet converts the diff --git a/go/vt/wrangler/testlib/backup_test.go b/go/vt/wrangler/testlib/backup_test.go index e071c054a18..ad451984c5e 100644 --- a/go/vt/wrangler/testlib/backup_test.go +++ b/go/vt/wrangler/testlib/backup_test.go @@ -27,24 +27,24 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/capabilities" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/backupstorage" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/filebackupstorage" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/capabilities" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/mysqlctl/backupstorage" + "github.com/vitess/vitess/go/vt/mysqlctl/filebackupstorage" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const mysqlShutdownTimeout = 1 * time.Minute diff --git a/go/vt/wrangler/testlib/copy_schema_shard_test.go b/go/vt/wrangler/testlib/copy_schema_shard_test.go index 42ffc78c078..cb1df03a4b2 100644 --- a/go/vt/wrangler/testlib/copy_schema_shard_test.go +++ b/go/vt/wrangler/testlib/copy_schema_shard_test.go @@ -22,20 +22,20 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/mysqlctl/tmutils" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" - - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/mysqlctl/tmutils" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" + + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestCopySchemaShard_UseTabletAsSource(t *testing.T) { diff --git a/go/vt/wrangler/testlib/emergency_reparent_shard_test.go b/go/vt/wrangler/testlib/emergency_reparent_shard_test.go index 566366cb2e0..1818af89f1c 100644 --- a/go/vt/wrangler/testlib/emergency_reparent_shard_test.go +++ b/go/vt/wrangler/testlib/emergency_reparent_shard_test.go @@ -25,20 +25,20 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil/reparenttestutil" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil/reparenttestutil" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestEmergencyReparentShard(t *testing.T) { diff --git a/go/vt/wrangler/testlib/external_reparent_test.go b/go/vt/wrangler/testlib/external_reparent_test.go index e5be530c5fa..f22066a12d4 100644 --- a/go/vt/wrangler/testlib/external_reparent_test.go +++ b/go/vt/wrangler/testlib/external_reparent_test.go @@ -24,16 +24,16 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // The tests in this package test the wrangler version of TabletExternallyReparented diff --git a/go/vt/wrangler/testlib/fake_tablet.go b/go/vt/wrangler/testlib/fake_tablet.go index 374b6889e29..1afd2947e7e 100644 --- a/go/vt/wrangler/testlib/fake_tablet.go +++ b/go/vt/wrangler/testlib/fake_tablet.go @@ -29,30 +29,30 @@ import ( "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/dbconfigs" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmserver" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconntest" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletservermock" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclienttest" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/dbconfigs" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/grpctmserver" + "github.com/vitess/vitess/go/vt/vttablet/tabletconntest" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/vt/vttablet/tabletservermock" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/vttablet/tmclienttest" + "github.com/vitess/vitess/go/vt/wrangler" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" // import the gRPC client implementation for tablet manager - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctmclient" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctmclient" // import the gRPC client implementation for query service - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctabletconn" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctabletconn" ) // This file contains utility methods for unit tests. diff --git a/go/vt/wrangler/testlib/find_tablet_test.go b/go/vt/wrangler/testlib/find_tablet_test.go index dbcc550bd65..d1dc284e2f4 100644 --- a/go/vt/wrangler/testlib/find_tablet_test.go +++ b/go/vt/wrangler/testlib/find_tablet_test.go @@ -21,16 +21,16 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestFindTablet(t *testing.T) { diff --git a/go/vt/wrangler/testlib/permissions_test.go b/go/vt/wrangler/testlib/permissions_test.go index 2a0fb5d10c6..f506da28998 100644 --- a/go/vt/wrangler/testlib/permissions_test.go +++ b/go/vt/wrangler/testlib/permissions_test.go @@ -22,19 +22,19 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/wrangler" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestPermissions(t *testing.T) { diff --git a/go/vt/wrangler/testlib/planned_reparent_shard_test.go b/go/vt/wrangler/testlib/planned_reparent_shard_test.go index 5f2bf3ea35b..501057fd785 100644 --- a/go/vt/wrangler/testlib/planned_reparent_shard_test.go +++ b/go/vt/wrangler/testlib/planned_reparent_shard_test.go @@ -22,24 +22,24 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/vt/mysqlctl" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/vt/mysqlctl" + "github.com/vitess/vitess/go/vt/vtenv" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil/reparenttestutil" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletservermock" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil/reparenttestutil" + "github.com/vitess/vitess/go/vt/vttablet/tabletservermock" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestPlannedReparentShardNoPrimaryProvided(t *testing.T) { diff --git a/go/vt/wrangler/testlib/reparent_utils_test.go b/go/vt/wrangler/testlib/reparent_utils_test.go index d233de3108c..20778a5186c 100644 --- a/go/vt/wrangler/testlib/reparent_utils_test.go +++ b/go/vt/wrangler/testlib/reparent_utils_test.go @@ -24,19 +24,19 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil" - "github.com/mdibaiee/vitess/go/vt/vtctl/reparentutil/reparenttestutil" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil" + "github.com/vitess/vitess/go/vt/vtctl/reparentutil/reparenttestutil" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestShardReplicationStatuses(t *testing.T) { diff --git a/go/vt/wrangler/testlib/semi_sync_test.go b/go/vt/wrangler/testlib/semi_sync_test.go index 37b6c47eee9..faf8c2530df 100644 --- a/go/vt/wrangler/testlib/semi_sync_test.go +++ b/go/vt/wrangler/testlib/semi_sync_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topo/topoproto" ) func checkSemiSyncEnabled(t *testing.T, primary, replica bool, tablets ...*FakeTablet) { diff --git a/go/vt/wrangler/testlib/shard_test.go b/go/vt/wrangler/testlib/shard_test.go index ce0baab62ac..3f8e9f8faf2 100644 --- a/go/vt/wrangler/testlib/shard_test.go +++ b/go/vt/wrangler/testlib/shard_test.go @@ -21,15 +21,15 @@ import ( "strings" "testing" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/wrangler" - - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/wrangler" + + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func TestDeleteShardCleanup(t *testing.T) { diff --git a/go/vt/wrangler/testlib/utils.go b/go/vt/wrangler/testlib/utils.go index 5b2aa814cfe..a8026f8344d 100644 --- a/go/vt/wrangler/testlib/utils.go +++ b/go/vt/wrangler/testlib/utils.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/require" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/wrangler" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/wrangler" ) // waitForTabletType waits for the given tablet type to be reached. diff --git a/go/vt/wrangler/testlib/version_test.go b/go/vt/wrangler/testlib/version_test.go index 5d1ac21f53f..48c2c651a20 100644 --- a/go/vt/wrangler/testlib/version_test.go +++ b/go/vt/wrangler/testlib/version_test.go @@ -25,16 +25,16 @@ import ( "testing" "time" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/wrangler" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/wrangler" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func expvarHandler(gitRev *string) func(http.ResponseWriter, *http.Request) { diff --git a/go/vt/wrangler/testlib/vtctl_pipe.go b/go/vt/wrangler/testlib/vtctl_pipe.go index 5ab79c3d73a..bec24000c21 100644 --- a/go/vt/wrangler/testlib/vtctl_pipe.go +++ b/go/vt/wrangler/testlib/vtctl_pipe.go @@ -30,16 +30,16 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/servenv" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctlserver" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctlclient" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/servenv" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctlserver" + "github.com/vitess/vitess/go/vt/vtctl/vtctlclient" + "github.com/vitess/vitess/go/vt/vtenv" // we need to import the grpcvtctlclient library so the gRPC // vtctl client is registered and can be used. - _ "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctlclient" + _ "github.com/vitess/vitess/go/vt/vtctl/grpcvtctlclient" ) var servenvInitialized sync.Once diff --git a/go/vt/wrangler/testlib/vtctl_topo_test.go b/go/vt/wrangler/testlib/vtctl_topo_test.go index 529a1bcf25d..b4199e6b117 100644 --- a/go/vt/wrangler/testlib/vtctl_topo_test.go +++ b/go/vt/wrangler/testlib/vtctl_topo_test.go @@ -25,9 +25,9 @@ import ( "google.golang.org/protobuf/proto" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) func testVtctlTopoCommand(t *testing.T, vp *VtctlPipe, args []string, want string) { diff --git a/go/vt/wrangler/traffic_switcher.go b/go/vt/wrangler/traffic_switcher.go index a3a57126bcb..e1f92b9570e 100644 --- a/go/vt/wrangler/traffic_switcher.go +++ b/go/vt/wrangler/traffic_switcher.go @@ -29,31 +29,31 @@ import ( "golang.org/x/exp/maps" "golang.org/x/sync/errgroup" - "github.com/mdibaiee/vitess/go/json2" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" + "github.com/vitess/vitess/go/json2" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtctl/workflow" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" ) const ( diff --git a/go/vt/wrangler/traffic_switcher_env_test.go b/go/vt/wrangler/traffic_switcher_env_test.go index 3cf67da02e2..5e4f7520ecf 100644 --- a/go/vt/wrangler/traffic_switcher_env_test.go +++ b/go/vt/wrangler/traffic_switcher_env_test.go @@ -29,31 +29,31 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sync/semaphore" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqlescape" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconntest" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqlescape" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletconntest" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) const ( diff --git a/go/vt/wrangler/traffic_switcher_test.go b/go/vt/wrangler/traffic_switcher_test.go index 85f2d966539..bfd1a48e240 100644 --- a/go/vt/wrangler/traffic_switcher_test.go +++ b/go/vt/wrangler/traffic_switcher_test.go @@ -28,15 +28,15 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vschemapb "github.com/mdibaiee/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtctl/workflow" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vschemapb "github.com/vitess/vitess/go/vt/proto/vschema" ) var ( diff --git a/go/vt/wrangler/validator.go b/go/vt/wrangler/validator.go index aa7b1349075..18f18b5513a 100644 --- a/go/vt/wrangler/validator.go +++ b/go/vt/wrangler/validator.go @@ -20,9 +20,9 @@ import ( "context" "errors" - "github.com/mdibaiee/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/logutil" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // consumeValidationResults consumes results from Validate(Keyspace|Shard)? methods. diff --git a/go/vt/wrangler/vdiff.go b/go/vt/wrangler/vdiff.go index a5edabfc50e..e849dbb790c 100644 --- a/go/vt/wrangler/vdiff.go +++ b/go/vt/wrangler/vdiff.go @@ -29,39 +29,39 @@ import ( "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/ptr" - "github.com/mdibaiee/vitess/go/vt/vtenv" - - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/schema" - "github.com/mdibaiee/vitess/go/vt/schemadiff" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtctl/schematools" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" - "github.com/mdibaiee/vitess/go/vt/vterrors" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" - "github.com/mdibaiee/vitess/go/vt/vtgate/vindexes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vreplication" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/ptr" + "github.com/vitess/vitess/go/vt/vtenv" + + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/schema" + "github.com/vitess/vitess/go/vt/schemadiff" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtctl/schematools" + "github.com/vitess/vitess/go/vt/vtctl/workflow" + "github.com/vitess/vitess/go/vt/vterrors" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/vt/vtgate/vindexes" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vreplication" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // At most how many samples we should show for row differences in the final report diff --git a/go/vt/wrangler/vdiff2.go b/go/vt/wrangler/vdiff2.go index 1c87c0a12ab..0db35ae29b9 100644 --- a/go/vt/wrangler/vdiff2.go +++ b/go/vt/wrangler/vdiff2.go @@ -21,13 +21,13 @@ import ( "fmt" "sync" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" + "github.com/vitess/vitess/go/vt/vtctl/workflow" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" - vdiff2 "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vdiff" + vdiff2 "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vdiff" - "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) type VDiffOutput struct { diff --git a/go/vt/wrangler/vdiff_env_test.go b/go/vt/wrangler/vdiff_env_test.go index b06f8319b0c..99498251986 100644 --- a/go/vt/wrangler/vdiff_env_test.go +++ b/go/vt/wrangler/vdiff_env_test.go @@ -23,23 +23,23 @@ import ( "sync" "testing" - "github.com/mdibaiee/vitess/go/mysql/fakesqldb" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice/fakes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconntest" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql/fakesqldb" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/queryservice/fakes" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletconntest" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/wrangler/vdiff_test.go b/go/vt/wrangler/vdiff_test.go index 79114c32752..0f4577ca773 100644 --- a/go/vt/wrangler/vdiff_test.go +++ b/go/vt/wrangler/vdiff_test.go @@ -25,16 +25,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/mysql/collations" - "github.com/mdibaiee/vitess/go/sqltypes" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine" - "github.com/mdibaiee/vitess/go/vt/vtgate/engine/opcode" - "github.com/mdibaiee/vitess/go/vt/vtgate/evalengine" + "github.com/vitess/vitess/go/mysql/collations" + "github.com/vitess/vitess/go/sqltypes" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vtgate/engine" + "github.com/vitess/vitess/go/vt/vtgate/engine/opcode" + "github.com/vitess/vitess/go/vt/vtgate/evalengine" ) func TestVDiffPlanSuccess(t *testing.T) { diff --git a/go/vt/wrangler/version.go b/go/vt/wrangler/version.go index 80ea746ce07..cb0b69645a6 100644 --- a/go/vt/wrangler/version.go +++ b/go/vt/wrangler/version.go @@ -21,11 +21,11 @@ import ( "context" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo/topoproto" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtctldatapb "github.com/mdibaiee/vitess/go/vt/proto/vtctldata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtctldatapb "github.com/vitess/vitess/go/vt/proto/vtctldata" ) // GetVersion returns the version string from a tablet diff --git a/go/vt/wrangler/vexec.go b/go/vt/wrangler/vexec.go index cb701c286c4..176bc96eb57 100644 --- a/go/vt/wrangler/vexec.go +++ b/go/vt/wrangler/vexec.go @@ -28,25 +28,25 @@ import ( "google.golang.org/protobuf/encoding/prototext" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sets" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/concurrency" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vterrors" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtrpcpb "github.com/mdibaiee/vitess/go/vt/proto/vtrpc" - workflow2 "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" - vtctldvexec "github.com/mdibaiee/vitess/go/vt/vtctl/workflow/vexec" // renamed to avoid a collision with the vexec struct in this package + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sets" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/concurrency" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vterrors" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtrpcpb "github.com/vitess/vitess/go/vt/proto/vtrpc" + workflow2 "github.com/vitess/vitess/go/vt/vtctl/workflow" + vtctldvexec "github.com/vitess/vitess/go/vt/vtctl/workflow/vexec" // renamed to avoid a collision with the vexec struct in this package ) const ( diff --git a/go/vt/wrangler/vexec_plan.go b/go/vt/wrangler/vexec_plan.go index 784772309d3..7ee7cd4e059 100644 --- a/go/vt/wrangler/vexec_plan.go +++ b/go/vt/wrangler/vexec_plan.go @@ -23,11 +23,11 @@ import ( "github.com/olekukonko/tablewriter" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/sqlparser" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // vexecPlan contains the final query to be sent to the tablets diff --git a/go/vt/wrangler/vexec_test.go b/go/vt/wrangler/vexec_test.go index d5287debee6..5d9368abc18 100644 --- a/go/vt/wrangler/vexec_test.go +++ b/go/vt/wrangler/vexec_test.go @@ -29,13 +29,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/textutil" - "github.com/mdibaiee/vitess/go/vt/logutil" - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/textutil" + "github.com/vitess/vitess/go/vt/logutil" + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/vtenv" ) var ( diff --git a/go/vt/wrangler/workflow.go b/go/vt/wrangler/workflow.go index 69a3d027a3b..358d577715b 100644 --- a/go/vt/wrangler/workflow.go +++ b/go/vt/wrangler/workflow.go @@ -8,18 +8,18 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/mysql/sqlerror" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topotools" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" - vdiff2 "github.com/mdibaiee/vitess/go/vt/vttablet/tabletmanager/vdiff" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql/sqlerror" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topotools" + "github.com/vitess/vitess/go/vt/vtctl/workflow" + vdiff2 "github.com/vitess/vitess/go/vt/vttablet/tabletmanager/vdiff" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) // VReplicationWorkflowType specifies whether workflow is MoveTables or Reshard diff --git a/go/vt/wrangler/workflow_test.go b/go/vt/wrangler/workflow_test.go index 7d818eac855..91ada0e9bf1 100644 --- a/go/vt/wrangler/workflow_test.go +++ b/go/vt/wrangler/workflow_test.go @@ -27,16 +27,16 @@ import ( "github.com/stretchr/testify/require" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/proto/topodata" - "github.com/mdibaiee/vitess/go/vt/proto/vschema" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtctl/workflow" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/vt/proto/vschema" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtctl/workflow" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" ) var noResult = &sqltypes.Result{} diff --git a/go/vt/wrangler/wrangler.go b/go/vt/wrangler/wrangler.go index f2524d53614..ed5fb307448 100644 --- a/go/vt/wrangler/wrangler.go +++ b/go/vt/wrangler/wrangler.go @@ -23,15 +23,15 @@ import ( "golang.org/x/sync/semaphore" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/sqlparser" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctldserver" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - vtctlservicepb "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/sqlparser" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtctl/grpcvtctldserver" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + vtctlservicepb "github.com/vitess/vitess/go/vt/proto/vtctlservice" ) var ( diff --git a/go/vt/wrangler/wrangler_env_test.go b/go/vt/wrangler/wrangler_env_test.go index e6545c86eba..0bc2a6e7478 100644 --- a/go/vt/wrangler/wrangler_env_test.go +++ b/go/vt/wrangler/wrangler_env_test.go @@ -23,23 +23,23 @@ import ( "sync" "testing" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/topo/memorytopo" - "github.com/mdibaiee/vitess/go/vt/vtenv" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice/fakes" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconntest" - "github.com/mdibaiee/vitess/go/vt/vttablet/tmclient" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - tabletmanagerdatapb "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/topo/memorytopo" + "github.com/vitess/vitess/go/vt/vtenv" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/queryservice/fakes" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + "github.com/vitess/vitess/go/vt/vttablet/tabletconntest" + "github.com/vitess/vitess/go/vt/vttablet/tmclient" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + querypb "github.com/vitess/vitess/go/vt/proto/query" + tabletmanagerdatapb "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) const ( diff --git a/go/vt/zkctl/zkconf.go b/go/vt/zkctl/zkconf.go index 4736197eb64..5e0f13077fb 100644 --- a/go/vt/zkctl/zkconf.go +++ b/go/vt/zkctl/zkconf.go @@ -31,9 +31,9 @@ import ( "strings" "text/template" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/vt/env" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/vt/env" + "github.com/vitess/vitess/go/vt/log" ) type zkServerAddr struct { diff --git a/go/vt/zkctl/zkctl.go b/go/vt/zkctl/zkctl.go index e3e0274ae65..4588a887d1a 100644 --- a/go/vt/zkctl/zkctl.go +++ b/go/vt/zkctl/zkctl.go @@ -33,9 +33,9 @@ import ( zookeeper "github.com/z-division/go-zookeeper/zk" - "github.com/mdibaiee/vitess/go/syscallutil" - "github.com/mdibaiee/vitess/go/vt/env" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/syscallutil" + "github.com/vitess/vitess/go/vt/env" + "github.com/vitess/vitess/go/vt/log" ) const ( diff --git a/go/vt/zkctl/zkctl_local.go b/go/vt/zkctl/zkctl_local.go index 41144b5b293..a9f3d68f0a2 100644 --- a/go/vt/zkctl/zkctl_local.go +++ b/go/vt/zkctl/zkctl_local.go @@ -19,8 +19,8 @@ package zkctl import ( "fmt" - "github.com/mdibaiee/vitess/go/netutil" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/netutil" + "github.com/vitess/vitess/go/vt/log" ) // StartLocalZk is a helper method to create a local ZK process. Used diff --git a/go/vtbench/client.go b/go/vtbench/client.go index caf4e05f6b4..932069b29e1 100644 --- a/go/vtbench/client.go +++ b/go/vtbench/client.go @@ -23,17 +23,17 @@ import ( "google.golang.org/grpc" - "github.com/mdibaiee/vitess/go/mysql" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/grpcclient" - "github.com/mdibaiee/vitess/go/vt/key" - "github.com/mdibaiee/vitess/go/vt/topo/topoproto" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" - "github.com/mdibaiee/vitess/go/vt/vttablet/queryservice" - "github.com/mdibaiee/vitess/go/vt/vttablet/tabletconn" - - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" + "github.com/vitess/vitess/go/mysql" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/grpcclient" + "github.com/vitess/vitess/go/vt/key" + "github.com/vitess/vitess/go/vt/topo/topoproto" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" + "github.com/vitess/vitess/go/vt/vttablet/queryservice" + "github.com/vitess/vitess/go/vt/vttablet/tabletconn" + + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" ) type clientConn interface { diff --git a/go/vtbench/vtbench.go b/go/vtbench/vtbench.go index d7386586ae6..048a4f21f05 100644 --- a/go/vtbench/vtbench.go +++ b/go/vtbench/vtbench.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "github.com/mdibaiee/vitess/go/stats" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/stats" + "github.com/vitess/vitess/go/vt/log" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" + querypb "github.com/vitess/vitess/go/vt/proto/query" ) // ClientProtocol indicates how to connect diff --git a/misc/errcheck_excludes.txt b/misc/errcheck_excludes.txt index 6c56efc200c..765e3fb573e 100644 --- a/misc/errcheck_excludes.txt +++ b/misc/errcheck_excludes.txt @@ -34,16 +34,16 @@ os.Rename (*google.golang.org/grpc.ClientConn).Close (*google.golang.org/grpc.Server).Serve -(*github.com/mdibaiee/vitess/go/bytes2.Buffer).Write -(*github.com/mdibaiee/vitess/go/bytes2.Buffer).WriteByte -(*github.com/mdibaiee/vitess/go/bytes2.Buffer).WriteString +(*github.com/vitess/vitess/go/bytes2.Buffer).Write +(*github.com/vitess/vitess/go/bytes2.Buffer).WriteByte +(*github.com/vitess/vitess/go/bytes2.Buffer).WriteString -(github.com/mdibaiee/vitess/go/sqltypes.BinWriter).Write +(github.com/vitess/vitess/go/sqltypes.BinWriter).Write -github.com/mdibaiee/vitess/go/vt/orchestrator/external/golib/log.Errore -github.com/mdibaiee/vitess/go/vt/orchestrator/external/golib/log.Errorf -github.com/mdibaiee/vitess/go/vt/orchestrator/external/golib/log.Fatal -github.com/mdibaiee/vitess/go/vt/orchestrator/external/golib/log.Fatale -github.com/mdibaiee/vitess/go/vt/orchestrator/external/golib/log.Fatalf +github.com/vitess/vitess/go/vt/orchestrator/external/golib/log.Errore +github.com/vitess/vitess/go/vt/orchestrator/external/golib/log.Errorf +github.com/vitess/vitess/go/vt/orchestrator/external/golib/log.Fatal +github.com/vitess/vitess/go/vt/orchestrator/external/golib/log.Fatale +github.com/vitess/vitess/go/vt/orchestrator/external/golib/log.Fatalf -(*github.com/mdibaiee/vitess/go/vt/vttest.LocalCluster).TearDown +(*github.com/vitess/vitess/go/vt/vttest.LocalCluster).TearDown diff --git a/misc/git/hooks/asthelpers b/misc/git/hooks/asthelpers index d1e50c4e89e..ea150b5ef95 100755 --- a/misc/git/hooks/asthelpers +++ b/misc/git/hooks/asthelpers @@ -15,4 +15,4 @@ # this script, which should run before committing code, makes sure that the visitor is re-generated when the ast changes -go run ./go/tools/asthelpergen/main --in ./go/vt/sqlparser --verify=true --iface github.com/mdibaiee/vitess/go/vt/sqlparser.SQLNode --clone_exclude "*ColName" --equals_custom "*ColName" +go run ./go/tools/asthelpergen/main --in ./go/vt/sqlparser --verify=true --iface github.com/vitess/vitess/go/vt/sqlparser.SQLNode --clone_exclude "*ColName" --equals_custom "*ColName" diff --git a/misc/git/hooks/goimports b/misc/git/hooks/goimports index c9d5f1f79b4..72feab1bee3 100755 --- a/misc/git/hooks/goimports +++ b/misc/git/hooks/goimports @@ -22,14 +22,14 @@ gofiles=$(git diff --cached --name-only --diff-filter=ACM | grep '^go/.*\.go$' | grep -v '^go/vt/proto/') [ -z "$gofiles" ] && exit 0 -unformatted=$($(go env GOPATH)/bin/goimports -local github.com/mdibaiee/vitess -l=true $gofiles 2>&1 | awk -F: '{print $1}') +unformatted=$($(go env GOPATH)/bin/goimports -local github.com/vitess/vitess -l=true $gofiles 2>&1 | awk -F: '{print $1}') [ -z "$unformatted" ] && exit 0 # Some files are not goimports'd. Print message and fail. echo >&2 "Go files must be formatted with goimports. Please run:" echo >&2 -echo -n >&2 " $(go env GOPATH)/bin/goimports -local github.com/mdibaiee/vitess -w" +echo -n >&2 " $(go env GOPATH)/bin/goimports -local github.com/vitess/vitess -w" for fn in $unformatted; do echo -n >&2 " $PWD/$fn" done diff --git a/proto/binlogdata.proto b/proto/binlogdata.proto index c3da3928414..67bfe4b4e74 100644 --- a/proto/binlogdata.proto +++ b/proto/binlogdata.proto @@ -19,7 +19,7 @@ limitations under the License. // replication only. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/binlogdata"; +option go_package = "github.com/vitess/vitess/go/vt/proto/binlogdata"; package binlogdata; diff --git a/proto/binlogservice.proto b/proto/binlogservice.proto index 51e3335cca5..fb1fea5dd14 100644 --- a/proto/binlogservice.proto +++ b/proto/binlogservice.proto @@ -19,7 +19,7 @@ limitations under the License. // filtered replication only. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/binlogservice"; +option go_package = "github.com/vitess/vitess/go/vt/proto/binlogservice"; package binlogservice; diff --git a/proto/logutil.proto b/proto/logutil.proto index b837035a659..cadffbb71df 100644 --- a/proto/logutil.proto +++ b/proto/logutil.proto @@ -17,7 +17,7 @@ limitations under the License. // This package contains the data structures for the logging service. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/logutil"; +option go_package = "github.com/vitess/vitess/go/vt/proto/logutil"; package logutil; diff --git a/proto/mysqlctl.proto b/proto/mysqlctl.proto index b9bc484a2fd..9deda0a8245 100644 --- a/proto/mysqlctl.proto +++ b/proto/mysqlctl.proto @@ -18,7 +18,7 @@ limitations under the License. // calls to mysqlctld. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/mysqlctl"; +option go_package = "github.com/vitess/vitess/go/vt/proto/mysqlctl"; package mysqlctl; diff --git a/proto/query.proto b/proto/query.proto index 2ca49779e48..eba65903fb2 100644 --- a/proto/query.proto +++ b/proto/query.proto @@ -18,7 +18,7 @@ limitations under the License. // RPC calls to Vttablet. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/query"; +option go_package = "github.com/vitess/vitess/go/vt/proto/query"; package query; diff --git a/proto/queryservice.proto b/proto/queryservice.proto index c4ef130aff1..43b176d930d 100644 --- a/proto/queryservice.proto +++ b/proto/queryservice.proto @@ -19,7 +19,7 @@ limitations under the License. syntax = "proto3"; package queryservice; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/queryservice"; +option go_package = "github.com/vitess/vitess/go/vt/proto/queryservice"; import "query.proto"; import "binlogdata.proto"; diff --git a/proto/replicationdata.proto b/proto/replicationdata.proto index ab81a156ae5..b7170be8275 100644 --- a/proto/replicationdata.proto +++ b/proto/replicationdata.proto @@ -17,7 +17,7 @@ limitations under the License. // This file defines the replication related structures we use. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/replicationdata"; +option go_package = "github.com/vitess/vitess/go/vt/proto/replicationdata"; package replicationdata; diff --git a/proto/tableacl.proto b/proto/tableacl.proto index ed110c51722..0722da377e8 100644 --- a/proto/tableacl.proto +++ b/proto/tableacl.proto @@ -17,7 +17,7 @@ limitations under the License. // Table ACL proto definitions. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/tableacl"; +option go_package = "github.com/vitess/vitess/go/vt/proto/tableacl"; package tableacl; diff --git a/proto/tabletmanagerdata.proto b/proto/tabletmanagerdata.proto index 50a61ac5cf6..6032cc5fc2b 100644 --- a/proto/tabletmanagerdata.proto +++ b/proto/tabletmanagerdata.proto @@ -18,7 +18,7 @@ limitations under the License. // RPC calls to VtTablet for the management API. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerdata"; +option go_package = "github.com/vitess/vitess/go/vt/proto/tabletmanagerdata"; package tabletmanagerdata; diff --git a/proto/tabletmanagerservice.proto b/proto/tabletmanagerservice.proto index 09d9c3f7404..b1e68491a88 100644 --- a/proto/tabletmanagerservice.proto +++ b/proto/tabletmanagerservice.proto @@ -18,7 +18,7 @@ limitations under the License. // calls to VtTablet. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/tabletmanagerservice"; +option go_package = "github.com/vitess/vitess/go/vt/proto/tabletmanagerservice"; package tabletmanagerservice; diff --git a/proto/throttlerdata.proto b/proto/throttlerdata.proto index 5c1dc490d35..745dc4bc051 100644 --- a/proto/throttlerdata.proto +++ b/proto/throttlerdata.proto @@ -17,7 +17,7 @@ limitations under the License. // Data structures for the throttler RPC interface. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/throttlerdata"; +option go_package = "github.com/vitess/vitess/go/vt/proto/throttlerdata"; package throttlerdata; diff --git a/proto/throttlerservice.proto b/proto/throttlerservice.proto index 00ba4a7dd2f..f37f2f14c64 100644 --- a/proto/throttlerservice.proto +++ b/proto/throttlerservice.proto @@ -18,7 +18,7 @@ limitations under the License. // which is used by vreplication. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/throttlerservice"; +option go_package = "github.com/vitess/vitess/go/vt/proto/throttlerservice"; package throttlerservice; diff --git a/proto/topodata.proto b/proto/topodata.proto index a4b123c9733..3bf23189503 100644 --- a/proto/topodata.proto +++ b/proto/topodata.proto @@ -20,7 +20,7 @@ limitations under the License. // service. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/topodata"; +option go_package = "github.com/vitess/vitess/go/vt/proto/topodata"; option java_package="io.vitess.proto"; diff --git a/proto/vschema.proto b/proto/vschema.proto index 9d8650437d0..1b57a0fe7e8 100644 --- a/proto/vschema.proto +++ b/proto/vschema.proto @@ -17,7 +17,7 @@ limitations under the License. // This file contains the types needed to define a vschema. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/vschema"; +option go_package = "github.com/vitess/vitess/go/vt/proto/vschema"; package vschema; diff --git a/proto/vtadmin.proto b/proto/vtadmin.proto index 65f96321412..748ce3ca2b6 100644 --- a/proto/vtadmin.proto +++ b/proto/vtadmin.proto @@ -17,7 +17,7 @@ limitations under the License. // This package contains the types used by VTAdmin (and later an RPC service). syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/vtadmin"; +option go_package = "github.com/vitess/vitess/go/vt/proto/vtadmin"; package vtadmin; diff --git a/proto/vtctldata.proto b/proto/vtctldata.proto index ff5fc128223..604e45c634b 100644 --- a/proto/vtctldata.proto +++ b/proto/vtctldata.proto @@ -18,7 +18,7 @@ limitations under the License. // you to use vtctld as a server for vt commands. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/vtctldata"; +option go_package = "github.com/vitess/vitess/go/vt/proto/vtctldata"; package vtctldata; diff --git a/proto/vtctlservice.proto b/proto/vtctlservice.proto index 3c284dc49ad..8ef7765b9c0 100644 --- a/proto/vtctlservice.proto +++ b/proto/vtctlservice.proto @@ -18,7 +18,7 @@ limitations under the License. // proxy for vt commands. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/vtctlservice"; +option go_package = "github.com/vitess/vitess/go/vt/proto/vtctlservice"; package vtctlservice; diff --git a/proto/vtgate.proto b/proto/vtgate.proto index 953cf21eaf9..4308aa5fc89 100644 --- a/proto/vtgate.proto +++ b/proto/vtgate.proto @@ -17,7 +17,7 @@ limitations under the License. // Data definitions for service vtgateservice. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/vtgate"; +option go_package = "github.com/vitess/vitess/go/vt/proto/vtgate"; package vtgate; diff --git a/proto/vtgateservice.proto b/proto/vtgateservice.proto index 98516c73d15..4e4c231e415 100644 --- a/proto/vtgateservice.proto +++ b/proto/vtgateservice.proto @@ -18,7 +18,7 @@ limitations under the License. // This is the main entry point to Vitess. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/vtgateservice"; +option go_package = "github.com/vitess/vitess/go/vt/proto/vtgateservice"; option java_package="io.vitess.proto.grpc"; diff --git a/proto/vtrpc.proto b/proto/vtrpc.proto index 81d0c47b21f..0ecddf6e483 100644 --- a/proto/vtrpc.proto +++ b/proto/vtrpc.proto @@ -17,7 +17,7 @@ limitations under the License. // This file contains useful data structures for RPCs in Vitess. syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/vtrpc"; +option go_package = "github.com/vitess/vitess/go/vt/proto/vtrpc"; option java_package="io.vitess.proto"; diff --git a/proto/vttest.proto b/proto/vttest.proto index 56be43d61ad..1cb5963cde2 100644 --- a/proto/vttest.proto +++ b/proto/vttest.proto @@ -41,7 +41,7 @@ limitations under the License. // 'keyspaces { name: "test_keyspace" shards { name: "-80" } shards { name: "80-" } } keyspaces { name: "redirect" served_from: "test_keyspace" }' syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/vttest"; +option go_package = "github.com/vitess/vitess/go/vt/proto/vttest"; import "vschema.proto"; diff --git a/proto/vttime.proto b/proto/vttime.proto index 5133f6329c8..f67fcf4e83f 100644 --- a/proto/vttime.proto +++ b/proto/vttime.proto @@ -17,7 +17,7 @@ limitations under the License. // This package contains a shared time data structure syntax = "proto3"; -option go_package = "github.com/mdibaiee/vitess/go/vt/proto/vttime"; +option go_package = "github.com/vitess/vitess/go/vt/proto/vttime"; package vttime; diff --git a/test.go b/test.go index 77a2f05ac4c..be4d92093f2 100755 --- a/test.go +++ b/test.go @@ -216,7 +216,7 @@ func (t *Test) run(dir, dataDir string) ([]byte, error) { // Also try to make them use different port ranges // to mitigate failures due to zombie processes. cmd.Env = updateEnv(os.Environ(), map[string]string{ - "VTROOT": "/vt/src/github.com/mdibaiee/vitess", + "VTROOT": "/vt/src/github.com/vitess/vitess", "VTDATAROOT": dataDir, "VTPORTSTART": strconv.FormatInt(int64(getPortStart(100)), 10), }) diff --git a/test/README.md b/test/README.md index 5d4c7e12e67..1bdd7161cfc 100644 --- a/test/README.md +++ b/test/README.md @@ -26,7 +26,7 @@ Each test is of the form: ```javascript "vtgate": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate"], "Command": [], "Manual": false, "Shard": 17, diff --git a/test/client/client.go b/test/client/client.go index 52ec666cbd0..7949cf6b55e 100644 --- a/test/client/client.go +++ b/test/client/client.go @@ -33,7 +33,7 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/vt/vitessdriver" + "github.com/vitess/vitess/go/vt/vitessdriver" ) var ( diff --git a/test/config.json b/test/config.json index bef4553f1e2..da16197a238 100644 --- a/test/config.json +++ b/test/config.json @@ -93,7 +93,7 @@ }, "backup_pitr": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/backup/pitr", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/backup/pitr", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "backup_pitr", @@ -102,7 +102,7 @@ }, "backup_pitr_xtrabackup": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/backup/pitr_xtrabackup", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/backup/pitr_xtrabackup", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "backup_pitr_xtrabackup", @@ -111,7 +111,7 @@ }, "backup": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/backup/vtctlbackup", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/backup/vtctlbackup", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "vtctlbackup_sharded_clustertest_heavy", @@ -120,7 +120,7 @@ }, "backup_mysqlctld": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/backup/mysqlctld", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/backup/mysqlctld", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "21", @@ -129,7 +129,7 @@ }, "backup_only": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/backup/vtbackup", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/backup/vtbackup", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vtbackup", @@ -138,7 +138,7 @@ }, "backup_xtrabackup": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/backup/xtrabackup", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/backup/xtrabackup", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "xb_backup", @@ -147,7 +147,7 @@ }, "backup_xtrabackup_xbstream": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/backup/xtrabackupstream", "-run", "XtrabackupStream", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/backup/xtrabackupstream", "-run", "XtrabackupStream", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "xb_backup", @@ -156,7 +156,7 @@ }, "backup_xtrabackup_xbstream_lz4": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/backup/xtrabackupstream", "-run", "XtrabackupStreamWithlz4Compression", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/backup/xtrabackupstream", "-run", "XtrabackupStreamWithlz4Compression", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "xb_backup", @@ -165,7 +165,7 @@ }, "cellalias": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/cellalias"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/cellalias"], "Command": [], "Manual": false, "Shard": "13", @@ -174,7 +174,7 @@ }, "prepare_statement": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/preparestmt"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/preparestmt"], "Command": [], "Manual": false, "Shard": "12", @@ -183,7 +183,7 @@ }, "mysql_server": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/mysqlserver"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/mysqlserver"], "Command": [], "Manual": false, "Shard": "mysql_server_vault", @@ -192,7 +192,7 @@ }, "messaging": { "File": "messaging_test.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/messaging"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/messaging"], "Command": [], "Manual": false, "Shard": "12", @@ -201,7 +201,7 @@ }, "clustertest": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/clustertest"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/clustertest"], "Command": [], "Manual": false, "Shard": "vtctlbackup_sharded_clustertest_heavy", @@ -210,7 +210,7 @@ }, "encrypted_replication": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/encryption/encryptedreplication"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/encryption/encryptedreplication"], "Command": [], "Manual": false, "Shard": "12", @@ -219,7 +219,7 @@ }, "encrypted_transport": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/encryption/encryptedtransport"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/encryption/encryptedtransport"], "Command": [], "Manual": false, "Shard": "12", @@ -228,7 +228,7 @@ }, "keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/keyspace"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/keyspace"], "Command": [], "Manual": false, "Shard": "12", @@ -239,7 +239,7 @@ }, "mysqlctl": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/mysqlctl"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/mysqlctl"], "Command": [], "Manual": false, "Shard": "12", @@ -250,7 +250,7 @@ }, "mysqlctld": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/mysqlctld"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/mysqlctld"], "Command": [], "Manual": false, "Shard": "12", @@ -261,7 +261,7 @@ }, "onlineddl_vrepl": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/onlineddl/vrepl", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/onlineddl/vrepl", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "onlineddl_vrepl", @@ -270,7 +270,7 @@ }, "onlineddl_vrepl_stress": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/onlineddl/vrepl_stress", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/onlineddl/vrepl_stress", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "onlineddl_vrepl_stress", @@ -279,7 +279,7 @@ }, "onlineddl_vrepl_suite": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/onlineddl/vrepl_suite", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/onlineddl/vrepl_suite", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "onlineddl_vrepl_suite", @@ -288,7 +288,7 @@ }, "onlineddl_vrepl_stress_suite": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/onlineddl/vrepl_stress_suite", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/onlineddl/vrepl_stress_suite", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "onlineddl_vrepl_stress_suite", @@ -297,7 +297,7 @@ }, "onlineddl_revert": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/onlineddl/revert", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/onlineddl/revert", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "onlineddl_revert", @@ -306,7 +306,7 @@ }, "onlineddl_scheduler": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/onlineddl/scheduler", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/onlineddl/scheduler", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "onlineddl_scheduler", @@ -315,7 +315,7 @@ }, "onlineddl_flow": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/onlineddl/flow", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/onlineddl/flow", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "onlineddl_flow", @@ -324,7 +324,7 @@ }, "schemadiff_vrepl": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/schemadiff/vrepl", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/schemadiff/vrepl", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "schemadiff_vrepl", @@ -333,7 +333,7 @@ }, "pitr": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/recovery/pitr"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/recovery/pitr"], "Command": [], "Manual": false, "Shard": "10", @@ -344,7 +344,7 @@ }, "recovery": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/recovery/unshardedrecovery"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/recovery/unshardedrecovery"], "Command": [], "Manual": false, "Shard": "vtctlbackup_sharded_clustertest_heavy", @@ -353,7 +353,7 @@ }, "emergencyreparent": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/reparent/emergencyreparent", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/reparent/emergencyreparent", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "ers_prs_newfeatures_heavy", @@ -362,7 +362,7 @@ }, "plannedreparent": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/reparent/plannedreparent", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/reparent/plannedreparent", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "ers_prs_newfeatures_heavy", @@ -371,7 +371,7 @@ }, "newfeatures": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/reparent/newfeaturetest"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/reparent/newfeaturetest"], "Command": [], "Manual": false, "Shard": "ers_prs_newfeatures_heavy", @@ -380,7 +380,7 @@ }, "sharded": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/sharded", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/sharded", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "vtctlbackup_sharded_clustertest_heavy", @@ -389,7 +389,7 @@ }, "tabletgateway_buffer_reparent": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/tabletgateway/buffer/reparent"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/tabletgateway/buffer/reparent"], "Command": [], "Manual": false, "Shard": "13", @@ -398,7 +398,7 @@ }, "tabletgateway_buffer_reshard": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/tabletgateway/buffer/reshard"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/tabletgateway/buffer/reshard"], "Command": [], "Manual": false, "Shard": "13", @@ -407,7 +407,7 @@ }, "tabletgateway": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/tabletgateway"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/tabletgateway"], "Command": [], "Manual": false, "Shard": "15", @@ -416,7 +416,7 @@ }, "tabletmanager": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/tabletmanager"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/tabletmanager"], "Command": [], "Manual": false, "Shard": "18", @@ -427,7 +427,7 @@ }, "tabletmanager_replication_manager": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/tabletmanager/replication_manager"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/tabletmanager/replication_manager"], "Command": [], "Manual": false, "Shard": "18", @@ -437,7 +437,7 @@ "tabletmanager_consul": { "File": "unused.go", "Args": [ - "github.com/mdibaiee/vitess/go/test/endtoend/tabletmanager","--topo-flavor=consul" + "github.com/vitess/vitess/go/test/endtoend/tabletmanager","--topo-flavor=consul" ], "Command": [], "Manual": false, @@ -449,7 +449,7 @@ }, "tabletmanager_throttler_topo": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/tabletmanager/throttler_topo"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/tabletmanager/throttler_topo"], "Command": [], "Manual": false, "Shard": "tabletmanager_throttler_topo", @@ -460,7 +460,7 @@ }, "tabletmanager_tablegc": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/tabletmanager/tablegc"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/tabletmanager/tablegc"], "Command": [], "Manual": false, "Shard": "tabletmanager_tablegc", @@ -472,7 +472,7 @@ "tabletmanager_zk2": { "File": "unused.go", "Args": [ - "github.com/mdibaiee/vitess/go/test/endtoend/tabletmanager","--topo-flavor=zk2" + "github.com/vitess/vitess/go/test/endtoend/tabletmanager","--topo-flavor=zk2" ], "Command": [], "Manual": false, @@ -484,7 +484,7 @@ }, "upgrade": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/versionupgrade", "-keep-data", "-force-vtdataroot", "/tmp/vtdataroot/vtroot_10901", "-force-port-start", "vtctlbackup_sharded_clustertest_heavy900", "-force-base-tablet-uid", "vtctlbackup_sharded_clustertest_heavy90"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/versionupgrade", "-keep-data", "-force-vtdataroot", "/tmp/vtdataroot/vtroot_10901", "-force-port-start", "vtctlbackup_sharded_clustertest_heavy900", "-force-base-tablet-uid", "vtctlbackup_sharded_clustertest_heavy90"], "Command": [], "Manual": false, "Shard": "28", @@ -493,7 +493,7 @@ }, "vtgate": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate"], "Command": [], "Manual": false, "Shard": "vtgate_general_heavy", @@ -502,7 +502,7 @@ }, "vtgate_queries_derived": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/derived"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/derived"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -511,7 +511,7 @@ }, "vtgate_queries_aggregation": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/aggregation"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/aggregation"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -520,7 +520,7 @@ }, "vtgate_queries_foundrows": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/foundrows"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/foundrows"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -529,7 +529,7 @@ }, "vtgate_queries_informationschema": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/informationschema"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/informationschema"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -538,7 +538,7 @@ }, "vtgate_queries_misc": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/misc"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/misc"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -547,7 +547,7 @@ }, "vtgate_queries_timeout": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/timeout"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/timeout"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -556,7 +556,7 @@ }, "vtgate_queries_normalize": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/normalize"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/normalize"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -565,7 +565,7 @@ }, "vtgate_queries_no_scatter": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/no_scatter"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/no_scatter"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -574,7 +574,7 @@ }, "vtgate_queries_orderby": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/orderby", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/orderby", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -583,7 +583,7 @@ }, "vtgate_queries_tpch": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/tpch", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/tpch", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -592,7 +592,7 @@ }, "vtgate_queries_subquery": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/subquery", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/subquery", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -601,7 +601,7 @@ }, "vtgate_queries_union": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/union", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/union", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -610,7 +610,7 @@ }, "vtgate_queries_insert": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/dml"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/dml"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -619,7 +619,7 @@ }, "vtgate_queries_vexplain": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/vexplain"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/vexplain"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -628,7 +628,7 @@ }, "vtgate_queries_reference": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/reference"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/reference"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -637,7 +637,7 @@ }, "vtgate_queries_random": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/random"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/random"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -646,7 +646,7 @@ }, "vtgate_kill": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/kill"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/kill"], "Command": [], "Manual": false, "Shard": "vtgate_queries", @@ -655,7 +655,7 @@ }, "vtgate_concurrentdml": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/concurrentdml"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/concurrentdml"], "Command": [], "Manual": false, "Shard": "vtgate_concurrentdml", @@ -664,7 +664,7 @@ }, "vtgate_schema": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/schema", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/schema", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vtgate_schema", @@ -673,7 +673,7 @@ }, "vtgate_schematracker_loadkeyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/schematracker/loadkeyspace"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/schematracker/loadkeyspace"], "Command": [], "Manual": false, "Shard": "vtgate_schema_tracker", @@ -682,7 +682,7 @@ }, "vtgate_schematracker_restarttablet": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/schematracker/restarttablet"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/schematracker/restarttablet"], "Command": [], "Manual": false, "Shard": "vtgate_schema_tracker", @@ -691,7 +691,7 @@ }, "vtgate_schematracker_sharded": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/schematracker/sharded", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/schematracker/sharded", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vtgate_schema_tracker", @@ -700,7 +700,7 @@ }, "vtgate_schematracker_sharded_prs": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/schematracker/sharded_prs", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/schematracker/sharded_prs", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vtgate_schema_tracker", @@ -709,7 +709,7 @@ }, "vtgate_schematracker_unsharded": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/schematracker/unsharded", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/schematracker/unsharded", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vtgate_schema_tracker", @@ -718,7 +718,7 @@ }, "vtgate_mysql80": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/mysql80"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/mysql80"], "Command": [], "Manual": false, "Shard": "mysql80", @@ -727,7 +727,7 @@ }, "vtgate_sequence": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/sequence"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/sequence"], "Command": [], "Manual": false, "Shard": "vtgate_general_heavy", @@ -736,7 +736,7 @@ }, "vtgate_setstatement": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/reservedconn"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/reservedconn"], "Command": [], "Manual": false, "Shard": "vtgate_reservedconn", @@ -745,7 +745,7 @@ }, "vtgate_reserved_conn1": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/reservedconn/reconnect1"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/reservedconn/reconnect1"], "Command": [], "Manual": false, "Shard": "vtgate_reservedconn", @@ -754,7 +754,7 @@ }, "vtgate_reserved_conn2": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/reservedconn/reconnect2"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/reservedconn/reconnect2"], "Command": [], "Manual": false, "Shard": "vtgate_reservedconn", @@ -763,7 +763,7 @@ }, "vtgate_reserved_conn3": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/reservedconn/reconnect3"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/reservedconn/reconnect3"], "Command": [], "Manual": false, "Shard": "vtgate_reservedconn", @@ -772,7 +772,7 @@ }, "vtgate_reserved_conn4": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/reservedconn/reconnect4"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/reservedconn/reconnect4"], "Command": [], "Manual": false, "Shard": "vtgate_reservedconn", @@ -781,7 +781,7 @@ }, "vtgate_tablet_healthcheck_cache": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/tablet_healthcheck_cache", "-timeout", "45m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/tablet_healthcheck_cache", "-timeout", "45m"], "Command": [], "Manual": false, "Shard": "vtgate_tablet_healthcheck_cache", @@ -790,7 +790,7 @@ }, "vtgate_transaction": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/transaction"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/transaction"], "Command": [], "Manual": false, "Shard": "vtgate_transaction", @@ -799,7 +799,7 @@ }, "vtgate_transaction_restart": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/transaction/restart"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/transaction/restart"], "Command": [], "Manual": false, "Shard": "vtgate_transaction", @@ -808,7 +808,7 @@ }, "vtgate_transaction_rollback": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/transaction/rollback"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/transaction/rollback"], "Command": [], "Manual": false, "Shard": "vtgate_transaction", @@ -817,7 +817,7 @@ }, "vtgate_transaction_single": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/transaction/single"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/transaction/single"], "Command": [], "Manual": false, "Shard": "vtgate_transaction", @@ -826,7 +826,7 @@ }, "vtgate_transaction_twopc": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/transaction/twopc"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/transaction/twopc"], "Command": [], "Manual": false, "Shard": "vtgate_transaction", @@ -835,7 +835,7 @@ }, "vtgate_transaction_partial_exec": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/partialfailure"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/partialfailure"], "Command": [], "Manual": false, "Shard": "vtgate_transaction", @@ -844,7 +844,7 @@ }, "vtgate_unsharded": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/unsharded"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/unsharded"], "Command": [], "Manual": false, "Shard": "vtgate_unsharded", @@ -853,7 +853,7 @@ }, "vtgate_vschema": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/vschema", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/vschema", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vtgate_vschema", @@ -862,7 +862,7 @@ }, "vtgate_readafterwrite": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/readafterwrite"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/readafterwrite"], "Command": [], "Manual": false, "Shard": "vtgate_readafterwrite", @@ -871,7 +871,7 @@ }, "vtgate_dbddlplugin": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/createdb_plugin"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/createdb_plugin"], "Command": [], "Manual": false, "Shard": "vtgate_general_heavy", @@ -880,7 +880,7 @@ }, "vtgate_foreignkey": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/foreignkey"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/foreignkey"], "Command": [], "Manual": false, "Shard": "vtgate_foreignkey_stress", @@ -889,7 +889,7 @@ }, "vtgate_foreignkey_stress": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/foreignkey/stress", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/foreignkey/stress", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "vtgate_foreignkey_stress", @@ -898,7 +898,7 @@ }, "vtgate_gen4": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/gen4"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/gen4"], "Command": [], "Manual": false, "Shard": "vtgate_gen4", @@ -907,7 +907,7 @@ }, "vtgate_godriver": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/godriver"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/godriver"], "Command": [], "Manual": false, "Shard": "vtgate_godriver", @@ -916,7 +916,7 @@ }, "vtgate_watchkeyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/keyspace_watches"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/keyspace_watches"], "Command": [], "Manual": false, "Shard": "vtgate_topo", @@ -925,7 +925,7 @@ }, "vtgate_grpc_api": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/grpc_api"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/grpc_api"], "Command": [], "Manual": false, "Shard": "vtgate_general_heavy", @@ -934,7 +934,7 @@ }, "topo_zk2": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/topotest/zk2", "--topo-flavor=zk2"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/topotest/zk2", "--topo-flavor=zk2"], "Command": [], "Manual": false, "Shard": "25", @@ -943,7 +943,7 @@ }, "topo_consul": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/topotest/consul", "--topo-flavor=consul"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/topotest/consul", "--topo-flavor=consul"], "Command": [], "Manual": false, "Shard": "vtgate_topo_consul", @@ -952,7 +952,7 @@ }, "topo_etcd2": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/topotest/etcd2"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/topotest/etcd2"], "Command": [], "Manual": false, "Shard": "vtgate_topo_etcd", @@ -961,7 +961,7 @@ }, "errs_as_warns": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/errors_as_warnings"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/errors_as_warnings"], "Command": [], "Manual": false, "Shard": "vtgate_general_heavy", @@ -970,7 +970,7 @@ }, "consolidator": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/consolidator"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/consolidator"], "Command": [], "Manual": false, "Shard": "vtgate_general_heavy", @@ -979,7 +979,7 @@ }, "prefixfanout": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/prefixfanout"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/prefixfanout"], "Command": [], "Manual": false, "Shard": "vtgate_vindex_heavy", @@ -988,7 +988,7 @@ }, "vindex_bindvars": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/vindex_bindvars"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/vindex_bindvars"], "Command": [], "Manual": false, "Shard": "vtgate_vindex_heavy", @@ -997,7 +997,7 @@ }, "vindex_secondary": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/sec_vind"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/sec_vind"], "Command": [], "Manual": false, "Shard": "vtgate_vindex_heavy", @@ -1006,7 +1006,7 @@ }, "vttest_sample": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtcombo"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtcombo"], "Command": [], "Manual": false, "Shard": "25", @@ -1015,7 +1015,7 @@ }, "xb_recovery": { "File": "recovery_test.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/recovery/xtrabackup"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/recovery/xtrabackup"], "Command": [], "Manual": false, "Shard": "xb_recovery", @@ -1024,7 +1024,7 @@ }, "vreplication_materialize": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestMaterialize"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestMaterialize"], "Command": [], "Manual": false, "Shard": "vreplication_partial_movetables_and_materialize", @@ -1033,7 +1033,7 @@ }, "vreplication_vtctldclient_materialize": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestMaterializeVtctldClient"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestMaterializeVtctldClient"], "Command": [], "Manual": false, "Shard": "vreplication_partial_movetables_and_materialize", @@ -1042,7 +1042,7 @@ }, "vreplication_cellalias": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "CellAlias"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "CellAlias"], "Command": [], "Manual": false, "Shard": "vreplication_cellalias", @@ -1051,7 +1051,7 @@ }, "vreplication_multi_tenant": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication","-run", "MultiTenant"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication","-run", "MultiTenant"], "Command": [], "Manual": false, "Shard": "vreplication_multi_tenant", @@ -1060,7 +1060,7 @@ }, "vreplication_partial_movetables_basic": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "PartialMoveTablesBasic"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "PartialMoveTablesBasic"], "Command": [], "Manual": false, "Shard": "vreplication_partial_movetables_and_materialize", @@ -1069,7 +1069,7 @@ }, "vdiff_multiple_movetables_test.go": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestMultipleConcurrentVDiffs"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestMultipleConcurrentVDiffs"], "Command": [], "Manual": false, "Shard": "vreplication_partial_movetables_and_materialize", @@ -1078,7 +1078,7 @@ }, "vreplication_movetables_buffering": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestMoveTablesBuffering"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestMoveTablesBuffering"], "Command": [], "Manual": false, "Shard": "vreplication_cellalias", @@ -1087,7 +1087,7 @@ }, "vreplication_onlineddl_vdiff": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestOnlineDDLVDiff"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestOnlineDDLVDiff"], "Command": [], "Manual": false, "Shard": "vreplication_cellalias", @@ -1096,7 +1096,7 @@ }, "vreplication_vschema_load": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestVSchemaChangesUnderLoad"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestVSchemaChangesUnderLoad"], "Command": [], "Manual": false, "Shard": "vreplication_cellalias", @@ -1105,7 +1105,7 @@ }, "sidecardb": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestSidecarDB"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestSidecarDB"], "Command": [], "Manual": false, "Shard": "schemadiff_vrepl", @@ -1114,7 +1114,7 @@ }, "vreplication_basic": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestBasicVreplicationWorkflow", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestBasicVreplicationWorkflow", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vreplication_basic", @@ -1123,7 +1123,7 @@ }, "vreplication_copy_parallel": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestVreplicationCopyParallel", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestVreplicationCopyParallel", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vreplication_copy_parallel", @@ -1132,7 +1132,7 @@ }, "vreplication_partial_movetables_sequences": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestPartialMoveTablesWithSequences"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestPartialMoveTablesWithSequences"], "Command": [], "Manual": false, "Shard": "vreplication_partial_movetables_and_materialize", @@ -1141,7 +1141,7 @@ }, "vstream_flush_binlog": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestVStreamFlushBinlog"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestVStreamFlushBinlog"], "Command": [], "Manual": false, "Shard": "vreplication_basic", @@ -1150,7 +1150,7 @@ }, "multi_vstreams_keyspace_reshard": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestMultiVStreamsKeyspaceReshard", "-timeout", "15m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestMultiVStreamsKeyspaceReshard", "-timeout", "15m"], "Command": [], "Manual": false, "Shard": "vstream", @@ -1159,7 +1159,7 @@ }, "vstream_failover": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "VStreamFailover"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "VStreamFailover"], "Command": [], "Manual": false, "Shard": "vstream", @@ -1168,7 +1168,7 @@ }, "vstream_stoponreshard_true": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "VStreamStopOnReshardTrue"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "VStreamStopOnReshardTrue"], "Command": [], "Manual": false, "Shard": "vstream", @@ -1177,7 +1177,7 @@ }, "vstream_stoponreshard_false": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "VStreamStopOnReshardFalse"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "VStreamStopOnReshardFalse"], "Command": [], "Manual": false, "Shard": "vstream", @@ -1186,7 +1186,7 @@ }, "vstream_with_keyspaces_to_watch": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "VStreamWithKeyspacesToWatch"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "VStreamWithKeyspacesToWatch"], "Command": [], "Manual": false, "Shard": "vstream", @@ -1195,7 +1195,7 @@ }, "vtorc_primary_failure": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtorc/primaryfailure"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtorc/primaryfailure"], "Command": [], "Manual": false, "Shard": "vtorc", @@ -1204,7 +1204,7 @@ }, "vtorc_api": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtorc/api"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtorc/api"], "Command": [], "Manual": false, "Shard": "vtorc", @@ -1213,7 +1213,7 @@ }, "vtorc_general": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtorc/general"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtorc/general"], "Command": [], "Manual": false, "Shard": "vtorc", @@ -1222,7 +1222,7 @@ }, "vtorc_readtopologyinstance": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtorc/readtopologyinstance"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtorc/readtopologyinstance"], "Command": [], "Manual": false, "Shard": "vtorc", @@ -1231,7 +1231,7 @@ }, "vault": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vault"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vault"], "Command": [], "Manual": false, "Shard": "mysql_server_vault", @@ -1240,7 +1240,7 @@ }, "vreplication_v2": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestBasicV2Workflows", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestBasicV2Workflows", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "vreplication_v2", @@ -1249,7 +1249,7 @@ }, "vreplication_fk": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestFKWorkflow"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestFKWorkflow"], "Command": [], "Manual": false, "Shard": "vreplication_cellalias", @@ -1258,7 +1258,7 @@ }, "vreplication_foreign_key_stress": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestFKExt"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestFKExt"], "Command": [], "Manual": false, "Shard": "vreplication_foreign_key_stress", @@ -1267,7 +1267,7 @@ }, "vreplication_across_db_versions": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestV2WorkflowsAcrossDBVersions", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestV2WorkflowsAcrossDBVersions", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vreplication_across_db_versions", @@ -1276,7 +1276,7 @@ }, "vreplication_mariadb_to_mysql": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestMoveTablesMariaDBToMySQL", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestMoveTablesMariaDBToMySQL", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vreplication_mariadb_to_mysql", @@ -1285,7 +1285,7 @@ }, "vreplication_vtctldclient_cli": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestVtctldclientCLI", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestVtctldclientCLI", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vreplication_migrate_vdiff2_convert_tz", @@ -1294,7 +1294,7 @@ }, "vreplication_vtctl_migrate": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestVtctlMigrate", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestVtctlMigrate", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "vreplication_migrate_vdiff2_convert_tz", @@ -1303,7 +1303,7 @@ }, "vreplication_vtctld_migrate": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestVtctldMigrate", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestVtctldMigrate", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "vreplication_migrate_vdiff2_convert_tz", @@ -1312,7 +1312,7 @@ }, "vdiff2": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestVDiff2", "-timeout", "30m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestVDiff2", "-timeout", "30m"], "Command": [], "Manual": false, "Shard": "vreplication_migrate_vdiff2_convert_tz", @@ -1321,7 +1321,7 @@ }, "vreplication_movetables_tz": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vreplication", "-run", "TestMoveTablesTZ"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vreplication", "-run", "TestMoveTablesTZ"], "Command": [], "Manual": false, "Shard": "vreplication_migrate_vdiff2_convert_tz", @@ -1330,7 +1330,7 @@ }, "topo_connection_cache": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/topoconncache", "-run", "TestVtctldListAllTablets"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/topoconncache", "-run", "TestVtctldListAllTablets"], "Command": [], "Manual": false, "Shard": "topo_connection_cache", @@ -1339,7 +1339,7 @@ }, "prscomplex": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/reparent/prscomplex"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/reparent/prscomplex"], "Command": [], "Manual": false, "Shard": "vttablet_prscomplex", @@ -1348,7 +1348,7 @@ }, "prssettingspool": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/reparent/prssettingspool"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/reparent/prssettingspool"], "Command": [], "Manual": false, "Shard": "vttablet_prscomplex", diff --git a/test/config_partial_keyspace.json b/test/config_partial_keyspace.json index 27452dbe901..9de8308835b 100644 --- a/test/config_partial_keyspace.json +++ b/test/config_partial_keyspace.json @@ -2,7 +2,7 @@ "Tests": { "vtgate_partial_keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate"], "Command": [], "Manual": false, "Shard": "vtgate_partial_keyspace", @@ -11,7 +11,7 @@ }, "vtgate_sequence_partial_keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/sequence"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/sequence"], "Command": [], "Manual": false, "Shard": "vtgate_partial_keyspace", @@ -20,7 +20,7 @@ }, "errs_as_warns_partial_keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/errors_as_warnings"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/errors_as_warnings"], "Command": [], "Manual": false, "Shard": "vtgate_partial_keyspace", @@ -29,7 +29,7 @@ }, "vtgate_transaction_partial_keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/transaction"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/transaction"], "Command": [], "Manual": false, "Shard": "vtgate_partial_keyspace", @@ -38,7 +38,7 @@ }, "vtgate_transaction_rollback_partial_keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/transaction/rollback"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/transaction/rollback"], "Command": [], "Manual": false, "Shard": "vtgate_partial_keyspace", @@ -47,7 +47,7 @@ }, "vtgate_transaction_single_partial_keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/transaction/single"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/transaction/single"], "Command": [], "Manual": false, "Shard": "vtgate_partial_keyspace", @@ -56,7 +56,7 @@ }, "vtgate_transaction_partial_exec_partial_keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/partialfailure"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/partialfailure"], "Command": [], "Manual": false, "Shard": "vtgate_partial_keyspace", @@ -65,7 +65,7 @@ }, "vtgate_queries_aggregation_partial_keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/aggregation"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/aggregation"], "Command": [], "Manual": false, "Shard": "vtgate_partial_keyspace", @@ -74,7 +74,7 @@ }, "vtgate_queries_foundrows_partial_keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/foundrows"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/foundrows"], "Command": [], "Manual": false, "Shard": "vtgate_partial_keyspace", @@ -83,7 +83,7 @@ }, "vtgate_queries_informationschema_partial_keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/informationschema"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/informationschema"], "Command": [], "Manual": false, "Shard": "vtgate_partial_keyspace", @@ -92,7 +92,7 @@ }, "vtgate_queries_misc_partial_keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/misc"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/misc"], "Command": [], "Manual": false, "Shard": "vtgate_partial_keyspace", @@ -101,7 +101,7 @@ }, "vtgate_queries_normalize_partial_keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/normalize"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/normalize"], "Command": [], "Manual": false, "Shard": "vtgate_partial_keyspace", @@ -110,7 +110,7 @@ }, "vtgate_queries_orderby_partial_keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/orderby", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/orderby", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vtgate_partial_keyspace", @@ -119,7 +119,7 @@ }, "vtgate_queries_subquery_partial_keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/subquery", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/subquery", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vtgate_partial_keyspace", @@ -128,7 +128,7 @@ }, "vtgate_queries_union_partial_keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/union", "-timeout", "20m"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/union", "-timeout", "20m"], "Command": [], "Manual": false, "Shard": "vtgate_partial_keyspace", @@ -137,7 +137,7 @@ }, "vtgate_queries_insert_partial_keyspace": { "File": "unused.go", - "Args": ["github.com/mdibaiee/vitess/go/test/endtoend/vtgate/queries/dml"], + "Args": ["github.com/vitess/vitess/go/test/endtoend/vtgate/queries/dml"], "Command": [], "Manual": false, "Shard": "vtgate_partial_keyspace", diff --git a/test/templates/dockerfile.tpl b/test/templates/dockerfile.tpl index 67198bfbbc9..8ca8d9b3289 100644 --- a/test/templates/dockerfile.tpl +++ b/test/templates/dockerfile.tpl @@ -6,8 +6,8 @@ FROM "${image}" USER root # Re-copy sources from working tree -RUN rm -rf /vt/src/github.com/mdibaiee/vitess/* -COPY . /vt/src/github.com/mdibaiee/vitess +RUN rm -rf /vt/src/github.com/vitess/vitess/* +COPY . /vt/src/github.com/vitess/vitess {{if .InstallXtraBackup}} # install XtraBackup @@ -20,7 +20,7 @@ RUN apt-get install -y percona-xtrabackup-24 {{end}} # Set the working directory -WORKDIR /vt/src/github.com/mdibaiee/vitess +WORKDIR /vt/src/github.com/vitess/vitess # Fix permissions RUN chown -R vitess:vitess /vt @@ -28,7 +28,7 @@ RUN chown -R vitess:vitess /vt USER vitess # Set environment variables -ENV VTROOT /vt/src/github.com/mdibaiee/vitess +ENV VTROOT /vt/src/github.com/vitess/vitess # Set the vtdataroot such that it uses the volume mount ENV VTDATAROOT /vt/vtdataroot diff --git a/tools/all_test_for_coverage.sh b/tools/all_test_for_coverage.sh index 93102e53df0..056452a18df 100755 --- a/tools/all_test_for_coverage.sh +++ b/tools/all_test_for_coverage.sh @@ -31,7 +31,7 @@ all_except_endtoend_tests=$(echo "$packages_with_all_tests" | grep -v "endtoend" counter=0 for pkg in $all_except_endtoend_tests do - go test -coverpkg=github.com/mdibaiee/vitess/go/... -coverprofile "/tmp/unit_$counter.out" -json > "/tmp/unit_$counter.json" $pkg -v -p=1 || : + go test -coverpkg=github.com/vitess/vitess/go/... -coverprofile "/tmp/unit_$counter.out" -json > "/tmp/unit_$counter.json" $pkg -v -p=1 || : counter=$((counter+1)) done @@ -45,14 +45,14 @@ cp ./tools/coverage-go/vtgate_test.go ./go/cmd/vtgate/vtgate_test.go cp ./tools/coverage-go/vtworker_test.go ./go/cmd/vtworker/vtworker_test.go cp ./tools/coverage-go/vtworkerclient_test.go ./go/cmd/vtworkerclient/vtworkerclient_test.go -go test -coverpkg=github.com/mdibaiee/vitess/go/... -c github.com/mdibaiee/vitess/go/cmd/vtctl -o ./bin/vtctl -go test -coverpkg=github.com/mdibaiee/vitess/go/... -c github.com/mdibaiee/vitess/go/cmd/vtctld -o ./bin/vtctld -go test -coverpkg=github.com/mdibaiee/vitess/go/... -c github.com/mdibaiee/vitess/go/cmd/mysqlctl -o ./bin/mysqlctl -go test -coverpkg=github.com/mdibaiee/vitess/go/... -c github.com/mdibaiee/vitess/go/cmd/vtctlclient -o ./bin/vtctlclient -go test -coverpkg=github.com/mdibaiee/vitess/go/... -c github.com/mdibaiee/vitess/go/cmd/vttablet -o ./bin/vttablet -go test -coverpkg=github.com/mdibaiee/vitess/go/... -c github.com/mdibaiee/vitess/go/cmd/vtgate -o ./bin/vtgate -go test -coverpkg=github.com/mdibaiee/vitess/go/... -c github.com/mdibaiee/vitess/go/cmd/vtworker -o ./bin/vtworker -go test -coverpkg=github.com/mdibaiee/vitess/go/... -c github.com/mdibaiee/vitess/go/cmd/vtworkerclient -o ./bin/vtworkerclient +go test -coverpkg=github.com/vitess/vitess/go/... -c github.com/vitess/vitess/go/cmd/vtctl -o ./bin/vtctl +go test -coverpkg=github.com/vitess/vitess/go/... -c github.com/vitess/vitess/go/cmd/vtctld -o ./bin/vtctld +go test -coverpkg=github.com/vitess/vitess/go/... -c github.com/vitess/vitess/go/cmd/mysqlctl -o ./bin/mysqlctl +go test -coverpkg=github.com/vitess/vitess/go/... -c github.com/vitess/vitess/go/cmd/vtctlclient -o ./bin/vtctlclient +go test -coverpkg=github.com/vitess/vitess/go/... -c github.com/vitess/vitess/go/cmd/vttablet -o ./bin/vttablet +go test -coverpkg=github.com/vitess/vitess/go/... -c github.com/vitess/vitess/go/cmd/vtgate -o ./bin/vtgate +go test -coverpkg=github.com/vitess/vitess/go/... -c github.com/vitess/vitess/go/cmd/vtworker -o ./bin/vtworker +go test -coverpkg=github.com/vitess/vitess/go/... -c github.com/vitess/vitess/go/cmd/vtworkerclient -o ./bin/vtworkerclient ### Execute go/test/endtoend testcase ### echo "--------- executing endtoend testcases ---------" diff --git a/tools/build_version_flags.sh b/tools/build_version_flags.sh index 3665d69e28f..9d1e4d26fb8 100755 --- a/tools/build_version_flags.sh +++ b/tools/build_version_flags.sh @@ -26,10 +26,10 @@ DEFAULT_BUILD_GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD) DEFAULT_BUILD_TIME=$(LC_ALL=C date) echo "\ - -X 'github.com/mdibaiee/vitess/go/vt/servenv.buildHost=$(hostname)' \ - -X 'github.com/mdibaiee/vitess/go/vt/servenv.buildUser=$(whoami)' \ - -X 'github.com/mdibaiee/vitess/go/vt/servenv.buildGitRev=${BUILD_GIT_REV:-$DEFAULT_BUILD_GIT_REV}' \ - -X 'github.com/mdibaiee/vitess/go/vt/servenv.buildGitBranch=${BUILD_GIT_BRANCH:-$DEFAULT_BUILD_GIT_BRANCH}' \ - -X 'github.com/mdibaiee/vitess/go/vt/servenv.buildTime=${BUILD_TIME:-$DEFAULT_BUILD_TIME}' \ - -X 'github.com/mdibaiee/vitess/go/vt/servenv.jenkinsBuildNumberStr=${BUILD_NUMBER}' \ + -X 'github.com/vitess/vitess/go/vt/servenv.buildHost=$(hostname)' \ + -X 'github.com/vitess/vitess/go/vt/servenv.buildUser=$(whoami)' \ + -X 'github.com/vitess/vitess/go/vt/servenv.buildGitRev=${BUILD_GIT_REV:-$DEFAULT_BUILD_GIT_REV}' \ + -X 'github.com/vitess/vitess/go/vt/servenv.buildGitBranch=${BUILD_GIT_BRANCH:-$DEFAULT_BUILD_GIT_BRANCH}' \ + -X 'github.com/vitess/vitess/go/vt/servenv.buildTime=${BUILD_TIME:-$DEFAULT_BUILD_TIME}' \ + -X 'github.com/vitess/vitess/go/vt/servenv.jenkinsBuildNumberStr=${BUILD_NUMBER}' \ " diff --git a/tools/rowlog/rowlog.go b/tools/rowlog/rowlog.go index 5208709b676..416f4257b13 100644 --- a/tools/rowlog/rowlog.go +++ b/tools/rowlog/rowlog.go @@ -15,26 +15,26 @@ import ( "github.com/spf13/pflag" - "github.com/mdibaiee/vitess/go/mysql/replication" - "github.com/mdibaiee/vitess/go/sqltypes" - "github.com/mdibaiee/vitess/go/vt/binlog/binlogplayer" - "github.com/mdibaiee/vitess/go/vt/discovery" - "github.com/mdibaiee/vitess/go/vt/log" - "github.com/mdibaiee/vitess/go/vt/logutil" - "github.com/mdibaiee/vitess/go/vt/topo" - "github.com/mdibaiee/vitess/go/vt/vtctl/vtctlclient" - "github.com/mdibaiee/vitess/go/vt/vtgate/vtgateconn" - - _ "github.com/mdibaiee/vitess/go/vt/topo/etcd2topo" // TODO: after #11394, add rowlog to this https://github.com/vitessio/vitess/pull/11394/files#diff-ee3c1b94c587244ea0645a8ee10187e1112167725f752d58cf17bab6e6d1047cR85 - _ "github.com/mdibaiee/vitess/go/vt/vtctl/grpcvtctlclient" - _ "github.com/mdibaiee/vitess/go/vt/vtgate/grpcvtgateconn" - _ "github.com/mdibaiee/vitess/go/vt/vttablet/grpctabletconn" - - binlogdatapb "github.com/mdibaiee/vitess/go/vt/proto/binlogdata" - logutilpb "github.com/mdibaiee/vitess/go/vt/proto/logutil" - querypb "github.com/mdibaiee/vitess/go/vt/proto/query" - topodatapb "github.com/mdibaiee/vitess/go/vt/proto/topodata" - vtgatepb "github.com/mdibaiee/vitess/go/vt/proto/vtgate" + "github.com/vitess/vitess/go/mysql/replication" + "github.com/vitess/vitess/go/sqltypes" + "github.com/vitess/vitess/go/vt/binlog/binlogplayer" + "github.com/vitess/vitess/go/vt/discovery" + "github.com/vitess/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/logutil" + "github.com/vitess/vitess/go/vt/topo" + "github.com/vitess/vitess/go/vt/vtctl/vtctlclient" + "github.com/vitess/vitess/go/vt/vtgate/vtgateconn" + + _ "github.com/vitess/vitess/go/vt/topo/etcd2topo" // TODO: after #11394, add rowlog to this https://github.com/vitessio/vitess/pull/11394/files#diff-ee3c1b94c587244ea0645a8ee10187e1112167725f752d58cf17bab6e6d1047cR85 + _ "github.com/vitess/vitess/go/vt/vtctl/grpcvtctlclient" + _ "github.com/vitess/vitess/go/vt/vtgate/grpcvtgateconn" + _ "github.com/vitess/vitess/go/vt/vttablet/grpctabletconn" + + binlogdatapb "github.com/vitess/vitess/go/vt/proto/binlogdata" + logutilpb "github.com/vitess/vitess/go/vt/proto/logutil" + querypb "github.com/vitess/vitess/go/vt/proto/query" + topodatapb "github.com/vitess/vitess/go/vt/proto/topodata" + vtgatepb "github.com/vitess/vitess/go/vt/proto/vtgate" ) type RowLogConfig struct { diff --git a/vitess-mixin/e2e/vtcompose/vtcompose.go b/vitess-mixin/e2e/vtcompose/vtcompose.go index 983c8ed247e..0e89f06a890 100644 --- a/vitess-mixin/e2e/vtcompose/vtcompose.go +++ b/vitess-mixin/e2e/vtcompose/vtcompose.go @@ -30,7 +30,7 @@ import ( jsonpatch "github.com/evanphx/json-patch" yamlpatch "github.com/krishicks/yaml-patch" - "github.com/mdibaiee/vitess/go/vt/log" + "github.com/vitess/vitess/go/vt/log" ) const ( diff --git a/vitess-mixin/go.mod b/vitess-mixin/go.mod index 173153adf23..57c2e3f7fe5 100644 --- a/vitess-mixin/go.mod +++ b/vitess-mixin/go.mod @@ -11,7 +11,7 @@ require ( // See https://github.com/prometheus/prometheus/issues/5590#issuecomment-546368944 github.com/prometheus/prometheus v1.8.2-0.20191017095924-6f92ce560538 github.com/stretchr/testify v1.9.0 - github.com/mdibaiee/vitess v0.19.4 + github.com/vitess/vitess v0.19.4 ) require ( diff --git a/vitess-mixin/go.sum b/vitess-mixin/go.sum index 20a01aef206..81483e5e53e 100644 --- a/vitess-mixin/go.sum +++ b/vitess-mixin/go.sum @@ -904,5 +904,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ih sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= -github.com/mdibaiee/vitess v0.19.4 h1:fJhZm5RknYbF7YUBXBmcvST/mvA4CeevlI9N0TLlYXA= -github.com/mdibaiee/vitess v0.19.4/go.mod h1:15uIi9x/Gu+BdDhUR80yP0M1v7aMG2mZQXSd56CE2t0= +github.com/vitess/vitess v0.19.4 h1:fJhZm5RknYbF7YUBXBmcvST/mvA4CeevlI9N0TLlYXA= +github.com/vitess/vitess v0.19.4/go.mod h1:15uIi9x/Gu+BdDhUR80yP0M1v7aMG2mZQXSd56CE2t0=