From 702fdfa94afd6453c7a3b8007bf8cff3e991c16d Mon Sep 17 00:00:00 2001 From: amyangfei Date: Fri, 17 Dec 2021 22:14:36 +0800 Subject: [PATCH] *: rename repo from pingcap/ticdc to pingcap/tiflow --- Dockerfile | 4 +- Dockerfile.development | 4 +- Makefile | 30 +++---- README.md | 10 +-- cdc/capture/capture.go | 22 ++--- cdc/capture/http_handler.go | 14 ++-- cdc/capture/http_validator.go | 20 ++--- cdc/capture/http_validator_test.go | 4 +- cdc/capture/main_test.go | 2 +- cdc/entry/codec.go | 4 +- cdc/entry/main_test.go | 2 +- cdc/entry/mounter.go | 6 +- cdc/entry/mounter_test.go | 4 +- cdc/entry/schema_storage.go | 8 +- cdc/entry/schema_storage_test.go | 4 +- cdc/http_handler.go | 8 +- cdc/http_router.go | 4 +- cdc/http_router_test.go | 2 +- cdc/http_status.go | 12 +-- cdc/http_status_test.go | 6 +- cdc/kv/client.go | 16 ++-- cdc/kv/client_bench_test.go | 10 +-- cdc/kv/client_mock_test.go | 2 +- cdc/kv/client_test.go | 84 +++++++++---------- cdc/kv/grpc_pool_impl.go | 4 +- cdc/kv/grpc_pool_impl_test.go | 4 +- cdc/kv/matcher_test.go | 2 +- cdc/kv/region_worker.go | 12 +-- cdc/kv/region_worker_test.go | 4 +- cdc/kv/resolvedts_heap_test.go | 2 +- cdc/kv/store_op.go | 8 +- cdc/kv/testing.go | 8 +- cdc/kv/token_region.go | 2 +- cdc/kv/token_region_test.go | 2 +- cdc/metrics.go | 22 ++--- cdc/model/capture.go | 2 +- cdc/model/changefeed.go | 6 +- cdc/model/changefeed_test.go | 4 +- cdc/model/http_model.go | 4 +- cdc/model/http_model_test.go | 2 +- cdc/model/kv.go | 2 +- cdc/model/kv_test.go | 2 +- cdc/model/main_test.go | 2 +- cdc/model/owner.go | 2 +- cdc/model/sink.go | 4 +- cdc/model/string.go | 2 +- cdc/owner/async_sink.go | 10 +-- cdc/owner/async_sink_test.go | 14 ++-- cdc/owner/barrier.go | 2 +- cdc/owner/barrier_test.go | 4 +- cdc/owner/changefeed.go | 14 ++-- cdc/owner/changefeed_test.go | 18 ++-- cdc/owner/ddl_puller.go | 16 ++-- cdc/owner/ddl_puller_test.go | 8 +- cdc/owner/feed_state_manager.go | 6 +- cdc/owner/feed_state_manager_test.go | 10 +-- cdc/owner/owner.go | 12 +-- cdc/owner/owner_test.go | 16 ++-- cdc/owner/scheduler.go | 6 +- cdc/owner/scheduler_test.go | 6 +- cdc/owner/schema.go | 12 +-- cdc/owner/schema_test.go | 8 +- cdc/owner/status_provider.go | 4 +- cdc/processor/manager.go | 8 +- cdc/processor/manager_test.go | 14 ++-- cdc/processor/pipeline/cyclic_mark.go | 8 +- cdc/processor/pipeline/cyclic_mark_test.go | 12 +-- cdc/processor/pipeline/mounter.go | 6 +- cdc/processor/pipeline/mounter_test.go | 10 +-- cdc/processor/pipeline/puller.go | 12 +-- cdc/processor/pipeline/sink.go | 8 +- cdc/processor/pipeline/sink_test.go | 12 +-- cdc/processor/pipeline/sorter.go | 14 ++-- cdc/processor/pipeline/sorter_test.go | 16 ++-- cdc/processor/pipeline/table.go | 16 ++-- cdc/processor/processor.go | 32 +++---- cdc/processor/processor_test.go | 18 ++-- cdc/puller/frontier/frontier.go | 2 +- cdc/puller/frontier/frontier_bench_test.go | 2 +- cdc/puller/frontier/frontier_test.go | 4 +- cdc/puller/frontier/heap_test.go | 2 +- cdc/puller/frontier/list_test.go | 2 +- cdc/puller/mock_puller.go | 4 +- cdc/puller/mock_puller_test.go | 6 +- cdc/puller/puller.go | 14 ++-- cdc/puller/puller_test.go | 16 ++-- cdc/redo/applier.go | 4 +- cdc/redo/common/util.go | 2 +- cdc/redo/convert.go | 2 +- cdc/redo/convert_test.go | 2 +- cdc/redo/manager.go | 10 +-- cdc/redo/manager_test.go | 4 +- cdc/redo/reader/blackhole_reader.go | 2 +- cdc/redo/reader/file.go | 8 +- cdc/redo/reader/file_test.go | 8 +- cdc/redo/reader/mock_RedoLogReader.go | 2 +- cdc/redo/reader/mock_fileReader.go | 2 +- cdc/redo/reader/reader.go | 6 +- cdc/redo/reader/reader_test.go | 6 +- cdc/redo/writer/blackhole_writer.go | 2 +- cdc/redo/writer/file.go | 4 +- cdc/redo/writer/file_test.go | 4 +- cdc/redo/writer/mock_RedoLogWriter.go | 2 +- cdc/redo/writer/writer.go | 6 +- cdc/redo/writer/writer_test.go | 6 +- cdc/server.go | 18 ++-- cdc/server_test.go | 10 +-- cdc/sink/black_hole.go | 2 +- cdc/sink/buffer_sink.go | 4 +- cdc/sink/causality.go | 2 +- cdc/sink/causality_test.go | 4 +- cdc/sink/cdclog/file.go | 8 +- cdc/sink/cdclog/s3.go | 8 +- cdc/sink/cdclog/utils.go | 6 +- cdc/sink/codec/avro.go | 8 +- cdc/sink/codec/avro_test.go | 10 +-- cdc/sink/codec/canal.go | 6 +- cdc/sink/codec/canal_flat.go | 6 +- cdc/sink/codec/canal_flat_test.go | 4 +- cdc/sink/codec/canal_test.go | 6 +- cdc/sink/codec/codec_test.go | 8 +- cdc/sink/codec/craft.go | 6 +- cdc/sink/codec/craft/codec_test.go | 2 +- cdc/sink/codec/craft/decoder.go | 4 +- cdc/sink/codec/craft/encoder.go | 2 +- cdc/sink/codec/craft/model.go | 4 +- cdc/sink/codec/craft_test.go | 4 +- cdc/sink/codec/interface.go | 4 +- cdc/sink/codec/interface_test.go | 4 +- cdc/sink/codec/json.go | 4 +- cdc/sink/codec/json_test.go | 4 +- cdc/sink/codec/maxwell.go | 4 +- cdc/sink/codec/maxwell_test.go | 4 +- cdc/sink/codec/schema_registry.go | 8 +- cdc/sink/codec/schema_registry_test.go | 6 +- cdc/sink/common/common.go | 4 +- cdc/sink/common/common_test.go | 4 +- cdc/sink/common/flow_control.go | 2 +- cdc/sink/common/flow_control_test.go | 2 +- cdc/sink/dispatcher/default.go | 2 +- cdc/sink/dispatcher/default_test.go | 4 +- cdc/sink/dispatcher/dispatcher.go | 6 +- cdc/sink/dispatcher/index_value.go | 4 +- cdc/sink/dispatcher/index_value_test.go | 4 +- cdc/sink/dispatcher/switcher_test.go | 6 +- cdc/sink/dispatcher/table.go | 4 +- cdc/sink/dispatcher/table_test.go | 4 +- cdc/sink/dispatcher/ts.go | 2 +- cdc/sink/dispatcher/ts_test.go | 4 +- cdc/sink/manager.go | 4 +- cdc/sink/manager_test.go | 8 +- cdc/sink/mq.go | 22 ++--- cdc/sink/mq_test.go | 14 ++-- cdc/sink/mysql.go | 26 +++--- cdc/sink/mysql_test.go | 18 ++-- cdc/sink/producer/kafka/kafka.go | 14 ++-- cdc/sink/producer/kafka/kafka_test.go | 12 +-- cdc/sink/producer/mq_producer.go | 2 +- cdc/sink/producer/pulsar/producer.go | 4 +- cdc/sink/simple_mysql_tester.go | 10 +-- cdc/sink/sink.go | 10 +-- cdc/sink/sink_test.go | 4 +- cdc/sink/statistics.go | 2 +- cdc/sink/syncpointStore.go | 4 +- cdc/sink/table_sink.go | 4 +- cdc/sink/txns_heap.go | 2 +- cdc/sink/txns_heap_test.go | 4 +- cdc/sorter/encoding/key.go | 2 +- cdc/sorter/encoding/key_test.go | 2 +- cdc/sorter/encoding/value.go | 2 +- cdc/sorter/memory/entry_sorter.go | 6 +- cdc/sorter/memory/entry_sorter_test.go | 4 +- cdc/sorter/sorter.go | 2 +- cdc/sorter/unified/backend.go | 2 +- cdc/sorter/unified/backend_pool.go | 10 +-- cdc/sorter/unified/backend_pool_test.go | 20 ++--- cdc/sorter/unified/file_backend.go | 6 +- cdc/sorter/unified/file_backend_test.go | 8 +- cdc/sorter/unified/heap.go | 2 +- cdc/sorter/unified/heap_sorter.go | 10 +-- cdc/sorter/unified/memory_backend.go | 2 +- cdc/sorter/unified/memory_backend_test.go | 4 +- cdc/sorter/unified/merger.go | 8 +- cdc/sorter/unified/merger_test.go | 28 +++---- cdc/sorter/unified/sorter_test.go | 40 ++++----- cdc/sorter/unified/unified_sorter.go | 8 +- chaos/Dockerfile.chaos | 4 +- cmd/cdc/main.go | 2 +- cmd/kafka-consumer/main.go | 18 ++-- demo/java/README.md | 4 +- dm/_utils/terror_gen/checker_template.go | 2 +- dm/chaos/cases/cases.go | 6 +- dm/chaos/cases/config.go | 2 +- dm/chaos/cases/db.go | 10 +-- dm/chaos/cases/diff.go | 2 +- dm/chaos/cases/generator.go | 2 +- dm/chaos/cases/instance.go | 4 +- dm/chaos/cases/main.go | 4 +- dm/chaos/cases/member.go | 4 +- dm/chaos/cases/source.go | 4 +- dm/chaos/cases/task.go | 10 +-- dm/checker/check_test.go | 6 +- dm/checker/checker.go | 18 ++-- dm/checker/cmd.go | 6 +- dm/cmd/dm-ctl/main.go | 10 +-- dm/cmd/dm-master/main.go | 10 +-- dm/cmd/dm-master/main_test.go | 2 +- dm/cmd/dm-portal/main.go | 6 +- dm/cmd/dm-syncer/config.go | 6 +- dm/cmd/dm-syncer/main.go | 14 ++-- dm/cmd/dm-worker/main.go | 10 +-- dm/cmd/dm-worker/main_test.go | 4 +- .../binlog-event-blackhole/fetcher.go | 2 +- dm/debug-tools/binlog-event-blackhole/main.go | 2 +- dm/dm/common/common.go | 2 +- dm/dm/config/checking_item.go | 2 +- dm/dm/config/source_config.go | 10 +-- dm/dm/config/source_config_test.go | 2 +- dm/dm/config/subtask.go | 8 +- dm/dm/config/task.go | 6 +- dm/dm/config/task_converters.go | 6 +- dm/dm/config/task_converters_test.go | 4 +- dm/dm/config/task_test.go | 2 +- dm/dm/ctl/common/config.go | 4 +- dm/dm/ctl/common/operate_relay.go | 2 +- dm/dm/ctl/common/operate_task.go | 2 +- dm/dm/ctl/common/util.go | 12 +-- dm/dm/ctl/ctl.go | 8 +- dm/dm/ctl/master/binlog.go | 4 +- dm/dm/ctl/master/check_task.go | 6 +- dm/dm/ctl/master/config.go | 10 +-- dm/dm/ctl/master/get_config.go | 4 +- dm/dm/ctl/master/handle_error.go | 6 +- dm/dm/ctl/master/list_member.go | 4 +- dm/dm/ctl/master/offline_member.go | 4 +- dm/dm/ctl/master/operate_leader.go | 4 +- dm/dm/ctl/master/operate_schema.go | 4 +- dm/dm/ctl/master/operate_source.go | 10 +-- dm/dm/ctl/master/operate_task.go | 4 +- dm/dm/ctl/master/pause_relay.go | 4 +- dm/dm/ctl/master/pause_task.go | 2 +- dm/dm/ctl/master/purge_relay.go | 6 +- dm/dm/ctl/master/query_status.go | 4 +- dm/dm/ctl/master/query_status_test.go | 2 +- dm/dm/ctl/master/resume_relay.go | 4 +- dm/dm/ctl/master/resume_task.go | 2 +- dm/dm/ctl/master/show_ddl_locks.go | 4 +- dm/dm/ctl/master/source_table_schema.go | 4 +- dm/dm/ctl/master/start_stop_relay.go | 4 +- dm/dm/ctl/master/start_task.go | 12 +-- dm/dm/ctl/master/stop_task.go | 2 +- dm/dm/ctl/master/transfer_source.go | 4 +- dm/dm/ctl/master/unlock_ddl_lock.go | 4 +- dm/dm/master/agent_pool.go | 2 +- dm/dm/master/bootstrap.go | 22 ++--- dm/dm/master/bootstrap_test.go | 12 +-- dm/dm/master/config.go | 8 +- dm/dm/master/config_test.go | 4 +- dm/dm/master/election.go | 6 +- dm/dm/master/election_test.go | 10 +-- dm/dm/master/etcd.go | 6 +- dm/dm/master/etcd_test.go | 6 +- dm/dm/master/http_handler.go | 8 +- dm/dm/master/metrics/metrics.go | 2 +- dm/dm/master/openapi.go | 22 ++--- dm/dm/master/openapi_test.go | 26 +++--- dm/dm/master/scheduler/scheduler.go | 16 ++-- dm/dm/master/scheduler/scheduler_test.go | 22 ++--- dm/dm/master/scheduler/worker.go | 12 +-- dm/dm/master/scheduler/worker_test.go | 10 +-- dm/dm/master/server.go | 36 ++++---- dm/dm/master/server_test.go | 44 +++++----- dm/dm/master/shardddl/info.go | 2 +- dm/dm/master/shardddl/info_test.go | 2 +- dm/dm/master/shardddl/optimist.go | 18 ++-- dm/dm/master/shardddl/optimist_test.go | 10 +-- dm/dm/master/shardddl/pessimist.go | 14 ++-- dm/dm/master/shardddl/pessimist_test.go | 14 ++-- dm/dm/master/workerrpc/interface.go | 2 +- dm/dm/master/workerrpc/rawgrpc.go | 6 +- dm/dm/master/workerrpc/workerrpc_test.go | 8 +- dm/dm/pbmock/dmmaster.go | 4 +- dm/dm/pbmock/dmworker.go | 4 +- dm/dm/portal/api.go | 6 +- dm/dm/portal/api_test.go | 2 +- dm/dm/portal/config.go | 6 +- dm/dm/unit/unit.go | 8 +- dm/dm/unit/unit_test.go | 4 +- dm/dm/worker/config.go | 8 +- dm/dm/worker/config_test.go | 2 +- dm/dm/worker/join.go | 10 +-- dm/dm/worker/metrics.go | 16 ++-- dm/dm/worker/relay.go | 16 ++-- dm/dm/worker/relay_test.go | 18 ++-- dm/dm/worker/server.go | 24 +++--- dm/dm/worker/server_test.go | 28 +++---- dm/dm/worker/source_worker.go | 22 ++--- dm/dm/worker/source_worker_test.go | 46 +++++----- dm/dm/worker/status.go | 6 +- dm/dm/worker/subtask.go | 26 +++--- dm/dm/worker/subtask_test.go | 18 ++-- dm/dm/worker/task_checker.go | 12 +-- dm/dm/worker/task_checker_test.go | 10 +-- dm/dm/worker/v1meta.go | 6 +- dm/dumpling/dumpling.go | 18 ++-- dm/dumpling/dumpling_test.go | 26 +++--- dm/dumpling/metrics.go | 2 +- dm/dumpling/util.go | 4 +- dm/dumpling/util_test.go | 6 +- dm/loader/checkpoint.go | 12 +-- dm/loader/checkpoint_test.go | 8 +- dm/loader/convert_data.go | 8 +- dm/loader/convert_data_test.go | 2 +- dm/loader/db.go | 14 ++-- dm/loader/lightning.go | 16 ++-- dm/loader/loader.go | 18 ++-- dm/loader/metrics.go | 2 +- dm/loader/status.go | 4 +- dm/loader/status_test.go | 4 +- dm/loader/util.go | 12 +-- dm/openapi/fixtures/task.go | 2 +- dm/openapi/task.go | 2 +- dm/openapi/task_test.go | 2 +- dm/pkg/backoff/backoff.go | 2 +- dm/pkg/backoff/backoff_test.go | 2 +- dm/pkg/binlog/event/common.go | 4 +- dm/pkg/binlog/event/common_test.go | 2 +- dm/pkg/binlog/event/ddl.go | 4 +- dm/pkg/binlog/event/ddl_test.go | 2 +- dm/pkg/binlog/event/dml.go | 4 +- dm/pkg/binlog/event/dml_test.go | 2 +- dm/pkg/binlog/event/event.go | 4 +- dm/pkg/binlog/event/event_test.go | 2 +- dm/pkg/binlog/event/generator.go | 4 +- dm/pkg/binlog/event/generator_test.go | 2 +- dm/pkg/binlog/event/helper.go | 4 +- dm/pkg/binlog/event/helper_test.go | 4 +- dm/pkg/binlog/event/sid_mysql.go | 2 +- dm/pkg/binlog/event/util.go | 2 +- dm/pkg/binlog/event/util_test.go | 2 +- dm/pkg/binlog/filename.go | 2 +- dm/pkg/binlog/position.go | 8 +- dm/pkg/binlog/position_test.go | 2 +- dm/pkg/binlog/reader/file.go | 8 +- dm/pkg/binlog/reader/file_test.go | 8 +- dm/pkg/binlog/reader/mock.go | 2 +- dm/pkg/binlog/reader/reader.go | 2 +- dm/pkg/binlog/reader/tcp.go | 10 +-- dm/pkg/binlog/reader/tcp_test.go | 24 +++--- dm/pkg/binlog/reader/util.go | 12 +-- dm/pkg/binlog/status.go | 2 +- dm/pkg/binlog/writer/file.go | 6 +- dm/pkg/binlog/writer/file_test.go | 4 +- dm/pkg/conn/baseconn.go | 12 +-- dm/pkg/conn/baseconn_test.go | 8 +- dm/pkg/conn/basedb.go | 8 +- dm/pkg/conn/basedb_test.go | 8 +- dm/pkg/conn/mockdb.go | 2 +- dm/pkg/conn/utils.go | 2 +- dm/pkg/conn/utils_test.go | 2 +- dm/pkg/context/context.go | 2 +- dm/pkg/dumpling/utils.go | 6 +- dm/pkg/dumpling/utils_test.go | 4 +- dm/pkg/election/election.go | 4 +- dm/pkg/election/election_test.go | 14 ++-- dm/pkg/encrypt/encrypt.go | 2 +- dm/pkg/etcdutil/etcdutil.go | 6 +- dm/pkg/etcdutil/etcdutil_test.go | 8 +- dm/pkg/func-rollback/rollback.go | 2 +- dm/pkg/gtid/gtid.go | 2 +- dm/pkg/gtid/gtid_test.go | 2 +- dm/pkg/ha/bound.go | 10 +-- dm/pkg/ha/bound_test.go | 2 +- dm/pkg/ha/keepalive.go | 6 +- dm/pkg/ha/keepalive_test.go | 2 +- dm/pkg/ha/load_task.go | 4 +- dm/pkg/ha/ops.go | 4 +- dm/pkg/ha/ops_test.go | 4 +- dm/pkg/ha/relay.go | 10 +-- dm/pkg/ha/relay_test.go | 2 +- dm/pkg/ha/source.go | 8 +- dm/pkg/ha/source_test.go | 2 +- dm/pkg/ha/stage.go | 12 +-- dm/pkg/ha/stage_test.go | 4 +- dm/pkg/ha/subtask.go | 8 +- dm/pkg/ha/subtask_test.go | 2 +- dm/pkg/ha/worker.go | 4 +- dm/pkg/log/log.go | 4 +- dm/pkg/parser/common.go | 6 +- dm/pkg/parser/common_test.go | 4 +- dm/pkg/retry/errors.go | 2 +- dm/pkg/retry/strategy.go | 2 +- dm/pkg/retry/strategy_test.go | 4 +- dm/pkg/schema/tracker.go | 8 +- dm/pkg/schema/tracker_test.go | 4 +- dm/pkg/shardddl/optimism/column.go | 4 +- dm/pkg/shardddl/optimism/info.go | 6 +- dm/pkg/shardddl/optimism/info_test.go | 4 +- dm/pkg/shardddl/optimism/keeper.go | 4 +- dm/pkg/shardddl/optimism/keeper_test.go | 2 +- dm/pkg/shardddl/optimism/lock.go | 6 +- dm/pkg/shardddl/optimism/lock_test.go | 6 +- dm/pkg/shardddl/optimism/operation.go | 4 +- dm/pkg/shardddl/optimism/ops.go | 6 +- dm/pkg/shardddl/optimism/schema.go | 4 +- dm/pkg/shardddl/optimism/table.go | 4 +- dm/pkg/shardddl/pessimism/info.go | 6 +- dm/pkg/shardddl/pessimism/info_test.go | 4 +- dm/pkg/shardddl/pessimism/keeper.go | 4 +- dm/pkg/shardddl/pessimism/lock.go | 6 +- dm/pkg/shardddl/pessimism/lock_test.go | 2 +- dm/pkg/shardddl/pessimism/operation.go | 4 +- dm/pkg/shardddl/pessimism/ops.go | 4 +- dm/pkg/streamer/file.go | 8 +- dm/pkg/streamer/file_test.go | 4 +- dm/pkg/streamer/hub.go | 6 +- dm/pkg/streamer/reader.go | 16 ++-- dm/pkg/streamer/reader_test.go | 14 ++-- dm/pkg/streamer/streamer.go | 10 +-- dm/pkg/streamer/streamer_test.go | 12 +-- dm/pkg/streamer/util.go | 4 +- dm/pkg/upgrade/upgrade.go | 16 ++-- dm/pkg/upgrade/upgrade_test.go | 2 +- dm/pkg/upgrade/version.go | 8 +- dm/pkg/utils/common.go | 4 +- dm/pkg/utils/db.go | 6 +- dm/pkg/utils/db_test.go | 2 +- dm/pkg/utils/encrypt.go | 4 +- dm/pkg/utils/encrypt_test.go | 2 +- dm/pkg/utils/file.go | 4 +- dm/pkg/utils/file_test.go | 2 +- dm/pkg/utils/printer.go | 2 +- dm/pkg/utils/printer_test.go | 2 +- dm/pkg/utils/relay.go | 2 +- dm/pkg/utils/storage_unix.go | 2 +- dm/pkg/utils/storage_windows.go | 2 +- dm/pkg/utils/time.go | 2 +- dm/pkg/utils/util.go | 6 +- dm/pkg/v1dbschema/schema.go | 20 ++--- dm/pkg/v1dbschema/schema_test.go | 16 ++-- dm/pkg/v1workermeta/api.go | 8 +- dm/pkg/v1workermeta/api_test.go | 6 +- dm/pkg/v1workermeta/db.go | 2 +- dm/pkg/v1workermeta/meta.go | 4 +- dm/pkg/v1workermeta/meta_test.go | 6 +- dm/relay/common/util.go | 4 +- dm/relay/config.go | 6 +- dm/relay/meta.go | 8 +- dm/relay/meta_test.go | 2 +- dm/relay/metrics.go | 8 +- dm/relay/purger/file.go | 8 +- dm/relay/purger/file_test.go | 6 +- dm/relay/purger/purger.go | 12 +-- dm/relay/purger/purger_test.go | 8 +- dm/relay/purger/strategy.go | 2 +- dm/relay/purger/strategy_filename.go | 8 +- dm/relay/purger/strategy_inactive.go | 6 +- dm/relay/purger/strategy_space.go | 8 +- dm/relay/purger/strategy_time.go | 6 +- dm/relay/reader/reader.go | 10 +-- dm/relay/reader/reader_test.go | 2 +- dm/relay/relay.go | 32 +++---- dm/relay/relay_test.go | 32 +++---- dm/relay/retry/reader.go | 6 +- dm/relay/transformer/transformer.go | 2 +- dm/relay/transformer/transformer_test.go | 4 +- dm/relay/util.go | 2 +- dm/relay/util_test.go | 4 +- dm/relay/writer/file.go | 14 ++-- dm/relay/writer/file_test.go | 8 +- dm/relay/writer/file_util.go | 10 +-- dm/relay/writer/file_util_test.go | 4 +- dm/relay/writer/writer.go | 2 +- dm/syncer/causality.go | 4 +- dm/syncer/causality_test.go | 10 +-- dm/syncer/checkpoint.go | 24 +++--- dm/syncer/checkpoint_test.go | 18 ++-- dm/syncer/compactor.go | 4 +- dm/syncer/compactor_test.go | 14 ++-- dm/syncer/dbconn/db.go | 16 ++-- dm/syncer/dbconn/upstream_db.go | 14 ++-- dm/syncer/dbconn/upstream_db_test.go | 4 +- dm/syncer/ddl.go | 10 +-- dm/syncer/ddl_test.go | 14 ++-- dm/syncer/dml.go | 4 +- dm/syncer/dml_worker.go | 12 +-- dm/syncer/err-operator/operator.go | 8 +- dm/syncer/err-operator/operator_test.go | 8 +- dm/syncer/error.go | 6 +- dm/syncer/error_test.go | 6 +- dm/syncer/expr_filter_group.go | 6 +- dm/syncer/expr_filter_group_test.go | 8 +- dm/syncer/filter.go | 6 +- dm/syncer/filter_test.go | 12 +-- dm/syncer/handle_error.go | 8 +- dm/syncer/handle_error_test.go | 6 +- dm/syncer/job.go | 2 +- dm/syncer/job_test.go | 2 +- dm/syncer/metrics/metrics.go | 2 +- dm/syncer/mode.go | 4 +- dm/syncer/online-ddl-tools/online_ddl.go | 16 ++-- dm/syncer/optimist.go | 6 +- dm/syncer/relay.go | 10 +-- dm/syncer/safe-mode/mode.go | 6 +- dm/syncer/safe-mode/mode_test.go | 2 +- dm/syncer/schema.go | 12 +-- dm/syncer/shardddl/optimist.go | 4 +- dm/syncer/shardddl/optimist_test.go | 6 +- dm/syncer/shardddl/pessimist.go | 6 +- dm/syncer/shardddl/pessimist_test.go | 8 +- dm/syncer/sharding-meta/shardmeta.go | 10 +-- dm/syncer/sharding-meta/shardmeta_test.go | 2 +- dm/syncer/sharding_group.go | 20 ++--- dm/syncer/sharding_group_test.go | 20 ++--- dm/syncer/status.go | 10 +-- dm/syncer/status_test.go | 12 +-- dm/syncer/streamer_controller.go | 18 ++-- dm/syncer/syncer.go | 50 +++++------ dm/syncer/syncer_test.go | 34 ++++---- dm/syncer/test_injector.go | 4 +- dm/syncer/util.go | 6 +- .../_dmctl_tools/check_exit_safe_binlog.go | 8 +- .../_dmctl_tools/check_master_http_apis.go | 2 +- dm/tests/_dmctl_tools/check_master_online.go | 4 +- .../_dmctl_tools/check_master_online_http.go | 2 +- dm/tests/_dmctl_tools/check_worker_online.go | 4 +- dm/tests/_utils/ha_cases_lib.sh | 4 +- dm/tests/adjust_gtid/run.sh | 2 +- dm/tests/all_mode/run.sh | 26 +++--- dm/tests/case_sensitive/run.sh | 4 +- dm/tests/checkpoint_transaction/run.sh | 2 +- dm/tests/dmctl_basic/run.sh | 2 +- dm/tests/drop_column_with_index/run.sh | 4 +- dm/tests/duplicate_event/run.sh | 4 +- dm/tests/fake_rotate_event/run.sh | 2 +- dm/tests/full_mode/run.sh | 4 +- dm/tests/generate-mock.sh | 2 +- dm/tests/ha_cases_1/run.sh | 4 +- dm/tests/import_goroutine_leak/run.sh | 36 ++++---- dm/tests/incremental_mode/run.sh | 8 +- dm/tests/initial_unit/run.sh | 4 +- dm/tests/lightning_mode/run.sh | 4 +- dm/tests/load_interrupt/run.sh | 6 +- dm/tests/load_task/run.sh | 10 +-- dm/tests/metrics/run.sh | 12 +-- dm/tests/new_relay/run.sh | 4 +- dm/tests/online_ddl/run.sh | 4 +- dm/tests/only_dml/run.sh | 2 +- dm/tests/print_status/run.sh | 6 +- dm/tests/relay_interrupt/run.sh | 6 +- dm/tests/retry_cancel/run.sh.todo | 6 +- dm/tests/safe_mode/run.sh | 10 +-- dm/tests/sequence_safe_mode/run.sh | 8 +- dm/tests/sequence_sharding_optimistic/run.sh | 2 +- dm/tests/shardddl1/run.sh | 4 +- dm/tests/shardddl2/run.sh | 4 +- dm/tests/sharding/run.sh | 2 +- dm/tests/sharding2/run.sh | 4 +- dm/tests/start_task/run.sh | 4 +- dm/tests/utils/dmctl.go | 2 +- dm/tests/utils/log.go | 2 +- ...5-ticdc-high-availability-new-design-cn.md | 6 +- ...021-10-13-ticdc-mq-sink-column-selector.md | 2 +- docs/design/README.md | 4 +- docs/design/TEMPLATE.md | 4 +- docs/design/package.json | 6 +- go.mod | 2 +- .../framework/avro/kafka_docker_env.go | 2 +- .../framework/avro/kafka_docker_env_test.go | 2 +- .../framework/avro/kafka_single_table.go | 2 +- .../framework/avro/kafka_single_table_test.go | 2 +- .../framework/canal/kafka_docker_env.go | 2 +- .../framework/canal/kafka_docker_env_test.go | 2 +- .../framework/canal/kafka_single_table.go | 2 +- .../canal/kafka_single_table_test.go | 2 +- integration/framework/docker_compose_op.go | 4 +- integration/framework/docker_env.go | 4 +- integration/framework/mysql/docker_env.go | 2 +- .../framework/mysql/docker_env_test.go | 2 +- integration/framework/mysql/single_table.go | 2 +- .../framework/mysql/single_table_test.go | 2 +- integration/framework/sql_helper.go | 2 +- integration/integration.go | 12 +-- integration/tests/case_alter.go | 2 +- integration/tests/case_composite_pkey.go | 2 +- integration/tests/case_date_time.go | 8 +- integration/tests/case_delete.go | 2 +- integration/tests/case_many_types.go | 8 +- integration/tests/case_simple.go | 2 +- integration/tests/case_unsigned.go | 2 +- kafka_consumer/Dockerfile | 4 +- pkg/actor/actor.go | 4 +- pkg/actor/actor_test.go | 4 +- pkg/actor/message/message.go | 2 +- pkg/actor/message/message_test.go | 2 +- pkg/actor/system.go | 4 +- pkg/actor/system_test.go | 8 +- pkg/applier/redo.go | 14 ++-- pkg/applier/redo_test.go | 8 +- pkg/cmd/cli/cli.go | 6 +- pkg/cmd/cli/cli_capture.go | 6 +- pkg/cmd/cli/cli_capture_list.go | 10 +-- pkg/cmd/cli/cli_changefeed.go | 6 +- pkg/cmd/cli/cli_changefeed_create.go | 28 +++---- pkg/cmd/cli/cli_changefeed_create_test.go | 4 +- pkg/cmd/cli/cli_changefeed_cyclic.go | 2 +- ...cli_changefeed_cyclic_create_marktables.go | 10 +-- pkg/cmd/cli/cli_changefeed_helper.go | 20 ++--- pkg/cmd/cli/cli_changefeed_helper_test.go | 2 +- pkg/cmd/cli/cli_changefeed_list.go | 12 +-- pkg/cmd/cli/cli_changefeed_pause.go | 10 +-- pkg/cmd/cli/cli_changefeed_query.go | 14 ++-- pkg/cmd/cli/cli_changefeed_remove.go | 10 +-- pkg/cmd/cli/cli_changefeed_resume.go | 12 +-- pkg/cmd/cli/cli_changefeed_statistics.go | 8 +- pkg/cmd/cli/cli_changefeed_update.go | 12 +-- pkg/cmd/cli/cli_changefeed_update_test.go | 4 +- pkg/cmd/cli/cli_processor.go | 6 +- pkg/cmd/cli/cli_processor_list.go | 8 +- pkg/cmd/cli/cli_processor_query.go | 12 +-- pkg/cmd/cli/cli_test.go | 2 +- pkg/cmd/cli/cli_tso.go | 2 +- pkg/cmd/cli/cli_tso_query.go | 4 +- pkg/cmd/cli/cli_unsafe.go | 2 +- .../cli_unsafe_delete_service_gc_safepoint.go | 6 +- pkg/cmd/cli/cli_unsafe_reset.go | 8 +- pkg/cmd/cli/cli_unsafe_show_metadata.go | 6 +- pkg/cmd/cmd.go | 8 +- pkg/cmd/factory/factory.go | 6 +- pkg/cmd/factory/factory_impl.go | 12 +-- pkg/cmd/redo/apply.go | 4 +- pkg/cmd/redo/meta.go | 4 +- pkg/cmd/redo/redo.go | 4 +- pkg/cmd/server/server.go | 20 ++--- pkg/cmd/server/server_test.go | 4 +- pkg/cmd/util/helper.go | 8 +- pkg/cmd/util/helper_test.go | 4 +- pkg/cmd/version/version.go | 2 +- pkg/config/config.go | 6 +- pkg/config/main_test.go | 2 +- pkg/config/sorter.go | 2 +- pkg/context/context.go | 12 +-- pkg/context/context_test.go | 4 +- pkg/context/main_test.go | 2 +- pkg/cyclic/filter.go | 4 +- pkg/cyclic/filter_test.go | 4 +- pkg/cyclic/main_test.go | 2 +- pkg/cyclic/mark/main_test.go | 2 +- pkg/cyclic/mark/mark.go | 6 +- pkg/cyclic/replication.go | 8 +- pkg/cyclic/replication_test.go | 6 +- pkg/errors/main_test.go | 2 +- pkg/etcd/client.go | 4 +- pkg/etcd/client_test.go | 2 +- pkg/etcd/etcd.go | 6 +- pkg/etcd/etcd_test.go | 8 +- pkg/etcd/etcdkey.go | 2 +- pkg/etcd/etcdkey_test.go | 2 +- pkg/filelock/filelock.go | 2 +- pkg/filelock/filelock_test.go | 2 +- pkg/filter/filter.go | 6 +- pkg/filter/filter_test.go | 2 +- pkg/filter/main_test.go | 2 +- pkg/flags/main_test.go | 2 +- pkg/flags/urls.go | 2 +- pkg/httputil/httputil.go | 2 +- pkg/httputil/httputil_test.go | 2 +- pkg/httputil/main_test.go | 2 +- pkg/leakutil/leak_helper_test.go | 2 +- pkg/logutil/log.go | 4 +- pkg/logutil/log_test.go | 2 +- pkg/notify/main_test.go | 2 +- pkg/notify/notify.go | 2 +- pkg/notify/notify_test.go | 2 +- pkg/orchestrator/etcd_worker.go | 6 +- pkg/orchestrator/etcd_worker_bank_test.go | 6 +- pkg/orchestrator/etcd_worker_test.go | 8 +- pkg/orchestrator/interfaces.go | 2 +- pkg/orchestrator/reactor_state.go | 8 +- pkg/orchestrator/reactor_state_test.go | 8 +- pkg/orchestrator/reactor_state_tester.go | 4 +- pkg/orchestrator/util/key_utils_test.go | 2 +- pkg/pdtime/acquirer.go | 2 +- pkg/pdtime/main_test.go | 2 +- pkg/pipeline/context.go | 2 +- pkg/pipeline/main_test.go | 2 +- pkg/pipeline/message.go | 2 +- pkg/pipeline/pipeline.go | 4 +- pkg/pipeline/pipeline_test.go | 8 +- pkg/pipeline/runner.go | 2 +- pkg/pipeline/test.go | 2 +- pkg/quotes/main_test.go | 2 +- pkg/regionspan/span.go | 2 +- pkg/retry/main_test.go | 2 +- pkg/retry/retry_with_opt.go | 2 +- pkg/scheduler/interface.go | 2 +- pkg/scheduler/main_test.go | 2 +- pkg/scheduler/table_number.go | 2 +- pkg/scheduler/table_number_test.go | 2 +- pkg/scheduler/workload.go | 2 +- pkg/scheduler/workload_test.go | 2 +- pkg/security/credential.go | 2 +- pkg/tcpserver/main_test.go | 2 +- pkg/tcpserver/tcp_server.go | 4 +- pkg/tcpserver/tcp_server_test.go | 4 +- pkg/txnutil/gc/gc_manager.go | 8 +- pkg/txnutil/gc/gc_manager_test.go | 8 +- pkg/txnutil/gc/gc_service.go | 4 +- pkg/txnutil/gc/gc_service_test.go | 2 +- pkg/types/main_test.go | 2 +- pkg/types/urls.go | 2 +- pkg/util/bitflag_test.go | 2 +- pkg/util/ctx_test.go | 2 +- pkg/util/fileutil.go | 4 +- pkg/util/fileutil_test.go | 8 +- pkg/util/overlap_merge_test.go | 2 +- pkg/util/test_helper_test.go | 2 +- pkg/util/testleak/leaktest.go | 8 +- pkg/util/tz.go | 2 +- pkg/util/tz_test.go | 2 +- pkg/version/check.go | 8 +- pkg/version/check_test.go | 2 +- pkg/version/main_test.go | 2 +- pkg/version/version.go | 2 +- pkg/workerpool/async_pool_impl.go | 4 +- pkg/workerpool/main_test.go | 2 +- pkg/workerpool/pool_impl.go | 4 +- pkg/workerpool/pool_test.go | 12 +-- .../cdc_state_checker/cdc_monitor.go | 6 +- testing_utils/cdc_state_checker/main.go | 2 +- testing_utils/cdc_state_checker/reactor.go | 4 +- testing_utils/cdc_state_checker/state.go | 8 +- .../many_sorters_test/many_sorters.go | 12 +-- .../sorter_stress_test/sorter_stress.go | 10 +-- .../_utils/run_cdc_cli_tso_query | 2 +- tests/integration_tests/availability/owner.sh | 6 +- tests/integration_tests/bank/case.go | 4 +- .../capture_session_done_during_task/run.sh | 2 +- .../run.sh | 2 +- tests/integration_tests/cdc/cdc.go | 4 +- .../changefeed_auto_stop/run.sh | 2 +- .../integration_tests/changefeed_error/run.sh | 8 +- .../changefeed_fast_fail/run.sh | 2 +- .../consistent_replicate_nfs/run.sh | 2 +- .../consistent_replicate_s3/run.sh | 2 +- tests/integration_tests/dailytest/db.go | 2 +- tests/integration_tests/ddl_puller_lag/run.sh | 2 +- .../force_replicate_table/run.sh | 2 +- tests/integration_tests/gc_safepoint/run.sh | 2 +- .../kafka_sink_error_resume/run.sh | 2 +- .../kill_owner_with_ddl/run.sh | 2 +- .../kv_client_stream_reconnect/run.sh | 2 +- tests/integration_tests/many_pk_or_uk/main.go | 2 +- tests/integration_tests/move_table/main.go | 6 +- tests/integration_tests/multi_source/main.go | 2 +- .../owner_remove_table_error/run.sh | 2 +- .../processor_err_chan/run.sh | 2 +- .../integration_tests/processor_panic/main.go | 4 +- .../integration_tests/processor_panic/run.sh | 2 +- .../processor_resolved_ts_fallback/run.sh | 2 +- .../processor_stop_delay/run.sh | 2 +- tests/integration_tests/resolve_lock/main.go | 2 +- tests/integration_tests/sink_hang/run.sh | 2 +- tests/integration_tests/sink_retry/run.sh | 2 +- tools/check/check-errdoc.sh | 2 +- 765 files changed, 2539 insertions(+), 2539 deletions(-) diff --git a/Dockerfile b/Dockerfile index c420ef81bf4..f8917bcb66d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ FROM golang:1.16-alpine as builder RUN apk add --no-cache git make bash -WORKDIR /go/src/github.com/pingcap/ticdc +WORKDIR /go/src/github.com/pingcap/tiflow COPY . . ENV CDC_ENABLE_VENDOR=0 RUN make FROM alpine:3.12 RUN apk add --no-cache tzdata bash curl socat -COPY --from=builder /go/src/github.com/pingcap/ticdc/bin/cdc /cdc +COPY --from=builder /go/src/github.com/pingcap/tiflow/bin/cdc /cdc EXPOSE 8300 CMD [ "/cdc" ] diff --git a/Dockerfile.development b/Dockerfile.development index d91a4ab4b0c..1d01bf9c8d1 100644 --- a/Dockerfile.development +++ b/Dockerfile.development @@ -1,6 +1,6 @@ FROM golang:1.16-alpine3.12 as builder RUN apk add --no-cache git make bash -WORKDIR /go/src/github.com/pingcap/ticdc +WORKDIR /go/src/github.com/pingcap/tiflow COPY . . ENV CDC_ENABLE_VENDOR=1 RUN go mod vendor @@ -10,6 +10,6 @@ RUN make failpoint-disable FROM alpine:3.12 RUN apk add --no-cache tzdata bash curl socat -COPY --from=builder /go/src/github.com/pingcap/ticdc/bin/cdc /cdc +COPY --from=builder /go/src/github.com/pingcap/tiflow/bin/cdc /cdc EXPOSE 8300 CMD [ "/cdc" ] diff --git a/Makefile b/Makefile index 0ead040af7c..31d3798b6a0 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ integration_test_build integration_test integration_test_mysql integration_test_kafka bank \ dm dm-master dm-worker dmctl dm-portal dm-syncer dm_coverage -PROJECT=ticdc +PROJECT=tiflow P=3 FAIL_ON_STDOUT := awk '{ print } END { if (NR > 0) { exit 1 } }' @@ -30,11 +30,11 @@ GOTESTNORACE := CGO_ENABLED=1 $(GO) test -p $(P) ARCH := "$(shell uname -s)" LINUX := "Linux" MAC := "Darwin" -CDC_PKG := github.com/pingcap/ticdc -DM_PKG := github.com/pingcap/ticdc/dm +CDC_PKG := github.com/pingcap/tiflow +DM_PKG := github.com/pingcap/tiflow/dm PACKAGE_LIST := go list ./... | grep -vE 'vendor|proto|ticdc\/tests|integration|testing_utils|pb|pbmock' -PACKAGE_LIST_WITHOUT_DM := $(PACKAGE_LIST) | grep -vE 'github.com/pingcap/ticdc/dm' -DM_PACKAGE_LIST := go list github.com/pingcap/ticdc/dm/... | grep -vE 'pb|pbmock|dm/cmd' +PACKAGE_LIST_WITHOUT_DM := $(PACKAGE_LIST) | grep -vE 'github.com/pingcap/tiflow/dm' +DM_PACKAGE_LIST := go list github.com/pingcap/tiflow/dm/... | grep -vE 'pb|pbmock|dm/cmd' PACKAGES := $$($(PACKAGE_LIST)) PACKAGES_WITHOUT_DM := $$($(PACKAGE_LIST_WITHOUT_DM)) DM_PACKAGES := $$($(DM_PACKAGE_LIST)) @@ -141,8 +141,8 @@ check_third_party_binary: integration_test_build: check_failpoint_ctl $(FAILPOINT_ENABLE) $(GOTEST) -ldflags '$(LDFLAGS)' -c -cover -covermode=atomic \ - -coverpkg=github.com/pingcap/ticdc/... \ - -o bin/cdc.test github.com/pingcap/ticdc/cmd/cdc \ + -coverpkg=github.com/pingcap/tiflow/... \ + -o bin/cdc.test github.com/pingcap/tiflow/cmd/cdc \ || { $(FAILPOINT_DISABLE); exit 1; } $(GOBUILD) -ldflags '$(LDFLAGS)' -o bin/cdc ./cmd/cdc/main.go \ || { $(FAILPOINT_DISABLE); exit 1; } @@ -273,20 +273,20 @@ dm_unit_test: check_failpoint_ctl dm_integration_test_build: check_failpoint_ctl $(FAILPOINT_ENABLE) $(GOTEST) -ldflags '$(LDFLAGS)' -c -cover -covermode=atomic \ - -coverpkg=github.com/pingcap/ticdc/dm/... \ - -o bin/dm-worker.test github.com/pingcap/ticdc/dm/cmd/dm-worker \ + -coverpkg=github.com/pingcap/tiflow/dm/... \ + -o bin/dm-worker.test github.com/pingcap/tiflow/dm/cmd/dm-worker \ || { $(FAILPOINT_DISABLE); exit 1; } $(GOTEST) -ldflags '$(LDFLAGS)' -c -cover -covermode=atomic \ - -coverpkg=github.com/pingcap/ticdc/dm/... \ - -o bin/dm-master.test github.com/pingcap/ticdc/dm/cmd/dm-master \ + -coverpkg=github.com/pingcap/tiflow/dm/... \ + -o bin/dm-master.test github.com/pingcap/tiflow/dm/cmd/dm-master \ || { $(FAILPOINT_DISABLE); exit 1; } $(GOTESTNORACE) -ldflags '$(LDFLAGS)' -c -cover -covermode=count \ - -coverpkg=github.com/pingcap/ticdc/dm/... \ - -o bin/dmctl.test github.com/pingcap/ticdc/dm/cmd/dm-ctl \ + -coverpkg=github.com/pingcap/tiflow/dm/... \ + -o bin/dmctl.test github.com/pingcap/tiflow/dm/cmd/dm-ctl \ || { $(FAILPOINT_DISABLE); exit 1; } $(GOTEST) -ldflags '$(LDFLAGS)' -c -cover -covermode=atomic \ - -coverpkg=github.com/pingcap/ticdc/dm/... \ - -o bin/dm-syncer.test github.com/pingcap/ticdc/dm/cmd/dm-syncer \ + -coverpkg=github.com/pingcap/tiflow/dm/... \ + -o bin/dm-syncer.test github.com/pingcap/tiflow/dm/cmd/dm-syncer \ || { $(FAILPOINT_DISABLE); exit 1; } $(FAILPOINT_DISABLE) ./dm/tests/prepare_tools.sh diff --git a/README.md b/README.md index 9ed4a02657e..6c6a9f72eee 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # TiCDC -[![Build Status](https://github.com/pingcap/ticdc/actions/workflows/check_and_build.yaml/badge.svg?branch=master)](https://github.com/pingcap/ticdc/actions/workflows/check_and_build.yaml?query=event%3Apush+branch%3Amaster) -[![codecov](https://codecov.io/gh/pingcap/ticdc/branch/master/graph/badge.svg)](https://codecov.io/gh/pingcap/ticdc) -[![Coverage Status](https://coveralls.io/repos/github/pingcap/ticdc/badge.svg)](https://coveralls.io/github/pingcap/ticdc) -[![LICENSE](https://img.shields.io/github/license/pingcap/ticdc.svg)](https://github.com/pingcap/ticdc/blob/master/LICENSE) -[![Go Report Card](https://goreportcard.com/badge/github.com/pingcap/ticdc)](https://goreportcard.com/report/github.com/pingcap/ticdc) +[![Build Status](https://github.com/pingcap/tiflow/actions/workflows/check_and_build.yaml/badge.svg?branch=master)](https://github.com/pingcap/tiflow/actions/workflows/check_and_build.yaml?query=event%3Apush+branch%3Amaster) +[![codecov](https://codecov.io/gh/pingcap/tiflow/branch/master/graph/badge.svg)](https://codecov.io/gh/pingcap/tiflow) +[![Coverage Status](https://coveralls.io/repos/github/pingcap/tiflow/badge.svg)](https://coveralls.io/github/pingcap/tiflow) +[![LICENSE](https://img.shields.io/github/license/pingcap/tiflow.svg)](https://github.com/pingcap/tiflow/blob/master/LICENSE) +[![Go Report Card](https://goreportcard.com/badge/github.com/pingcap/tiflow)](https://goreportcard.com/report/github.com/pingcap/tiflow) **TiCDC** is [TiDB](https://docs.pingcap.com/tidb/stable)'s change data capture framework. It supports replicating change data to various downstreams, including MySQL protocol-compatible databases, message queues via the open CDC protocol and other systems such as local file storage. diff --git a/cdc/capture/capture.go b/cdc/capture/capture.go index f35b5eea01e..de7b8ba3982 100644 --- a/cdc/capture/capture.go +++ b/cdc/capture/capture.go @@ -24,18 +24,18 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/kv" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/owner" - "github.com/pingcap/ticdc/cdc/processor" - "github.com/pingcap/ticdc/pkg/config" - cdcContext "github.com/pingcap/ticdc/pkg/context" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/orchestrator" - "github.com/pingcap/ticdc/pkg/pdtime" - "github.com/pingcap/ticdc/pkg/version" tidbkv "github.com/pingcap/tidb/kv" + "github.com/pingcap/tiflow/cdc/kv" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/owner" + "github.com/pingcap/tiflow/cdc/processor" + "github.com/pingcap/tiflow/pkg/config" + cdcContext "github.com/pingcap/tiflow/pkg/context" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/orchestrator" + "github.com/pingcap/tiflow/pkg/pdtime" + "github.com/pingcap/tiflow/pkg/version" pd "github.com/tikv/pd/client" "go.etcd.io/etcd/clientv3/concurrency" "go.etcd.io/etcd/mvcc" diff --git a/cdc/capture/http_handler.go b/cdc/capture/http_handler.go index ae937f15f0a..1b340c7477e 100644 --- a/cdc/capture/http_handler.go +++ b/cdc/capture/http_handler.go @@ -20,14 +20,14 @@ import ( "github.com/gin-gonic/gin" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/owner" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/logutil" - "github.com/pingcap/ticdc/pkg/retry" - "github.com/pingcap/ticdc/pkg/version" "github.com/pingcap/tidb/br/pkg/httputil" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/owner" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/logutil" + "github.com/pingcap/tiflow/pkg/retry" + "github.com/pingcap/tiflow/pkg/version" "github.com/tikv/client-go/v2/oracle" "go.uber.org/zap" ) diff --git a/cdc/capture/http_validator.go b/cdc/capture/http_validator.go index 442c5ca3497..0281a23d63f 100644 --- a/cdc/capture/http_validator.go +++ b/cdc/capture/http_validator.go @@ -19,17 +19,17 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/entry" - "github.com/pingcap/ticdc/cdc/kv" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sink" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/filter" - "github.com/pingcap/ticdc/pkg/txnutil/gc" - "github.com/pingcap/ticdc/pkg/util" - "github.com/pingcap/ticdc/pkg/version" tidbkv "github.com/pingcap/tidb/kv" + "github.com/pingcap/tiflow/cdc/entry" + "github.com/pingcap/tiflow/cdc/kv" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sink" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/filter" + "github.com/pingcap/tiflow/pkg/txnutil/gc" + "github.com/pingcap/tiflow/pkg/util" + "github.com/pingcap/tiflow/pkg/version" "github.com/r3labs/diff" "github.com/tikv/client-go/v2/oracle" ) diff --git a/cdc/capture/http_validator_test.go b/cdc/capture/http_validator_test.go index 8758fef2366..fe855009bf5 100644 --- a/cdc/capture/http_validator_test.go +++ b/cdc/capture/http_validator_test.go @@ -17,8 +17,8 @@ import ( "context" "testing" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" "github.com/stretchr/testify/require" ) diff --git a/cdc/capture/main_test.go b/cdc/capture/main_test.go index b29c295421f..8984319767d 100644 --- a/cdc/capture/main_test.go +++ b/cdc/capture/main_test.go @@ -16,7 +16,7 @@ package capture import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/cdc/entry/codec.go b/cdc/entry/codec.go index bfa4bbbd11e..40b03c0b30c 100644 --- a/cdc/entry/codec.go +++ b/cdc/entry/codec.go @@ -18,14 +18,14 @@ import ( "time" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - cerror "github.com/pingcap/ticdc/pkg/errors" "github.com/pingcap/tidb/kv" "github.com/pingcap/tidb/parser/mysql" "github.com/pingcap/tidb/tablecodec" "github.com/pingcap/tidb/types" "github.com/pingcap/tidb/util/codec" "github.com/pingcap/tidb/util/rowcodec" + "github.com/pingcap/tiflow/cdc/model" + cerror "github.com/pingcap/tiflow/pkg/errors" ) var ( diff --git a/cdc/entry/main_test.go b/cdc/entry/main_test.go index fce350517c1..74b87377b2f 100644 --- a/cdc/entry/main_test.go +++ b/cdc/entry/main_test.go @@ -16,7 +16,7 @@ package entry import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/cdc/entry/mounter.go b/cdc/entry/mounter.go index 15845e117a2..520a0f20233 100644 --- a/cdc/entry/mounter.go +++ b/cdc/entry/mounter.go @@ -24,15 +24,15 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/util" "github.com/pingcap/tidb/kv" timodel "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/parser/mysql" "github.com/pingcap/tidb/table" "github.com/pingcap/tidb/tablecodec" "github.com/pingcap/tidb/types" + "github.com/pingcap/tiflow/cdc/model" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/util" "go.uber.org/zap" "golang.org/x/sync/errgroup" ) diff --git a/cdc/entry/mounter_test.go b/cdc/entry/mounter_test.go index 0e326ce329f..686025ac3b0 100644 --- a/cdc/entry/mounter_test.go +++ b/cdc/entry/mounter_test.go @@ -20,14 +20,14 @@ import ( "time" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/regionspan" ticonfig "github.com/pingcap/tidb/config" tidbkv "github.com/pingcap/tidb/kv" "github.com/pingcap/tidb/parser/mysql" "github.com/pingcap/tidb/session" "github.com/pingcap/tidb/store/mockstore" "github.com/pingcap/tidb/testkit" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/regionspan" "github.com/stretchr/testify/require" "github.com/tikv/client-go/v2/oracle" "go.uber.org/zap" diff --git a/cdc/entry/schema_storage.go b/cdc/entry/schema_storage.go index 2e9ce1b60a5..f38dd358b76 100644 --- a/cdc/entry/schema_storage.go +++ b/cdc/entry/schema_storage.go @@ -22,12 +22,12 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/filter" - "github.com/pingcap/ticdc/pkg/retry" timeta "github.com/pingcap/tidb/meta" timodel "github.com/pingcap/tidb/parser/model" + "github.com/pingcap/tiflow/cdc/model" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/filter" + "github.com/pingcap/tiflow/pkg/retry" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/cdc/entry/schema_storage_test.go b/cdc/entry/schema_storage_test.go index 34c72b9e3a9..9ee426af65a 100644 --- a/cdc/entry/schema_storage_test.go +++ b/cdc/entry/schema_storage_test.go @@ -20,8 +20,6 @@ import ( "testing" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/kv" - "github.com/pingcap/ticdc/cdc/model" ticonfig "github.com/pingcap/tidb/config" "github.com/pingcap/tidb/domain" tidbkv "github.com/pingcap/tidb/kv" @@ -33,6 +31,8 @@ import ( "github.com/pingcap/tidb/store/mockstore" "github.com/pingcap/tidb/testkit" "github.com/pingcap/tidb/types" + "github.com/pingcap/tiflow/cdc/kv" + "github.com/pingcap/tiflow/cdc/model" "github.com/stretchr/testify/require" "github.com/tikv/client-go/v2/oracle" ) diff --git a/cdc/http_handler.go b/cdc/http_handler.go index a4c77d122ee..f057b0c1088 100644 --- a/cdc/http_handler.go +++ b/cdc/http_handler.go @@ -23,10 +23,10 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/owner" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/logutil" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/owner" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/logutil" "github.com/tikv/client-go/v2/oracle" "go.etcd.io/etcd/clientv3/concurrency" "go.uber.org/zap" diff --git a/cdc/http_router.go b/cdc/http_router.go index d6b74cb7aac..51019609629 100644 --- a/cdc/http_router.go +++ b/cdc/http_router.go @@ -21,12 +21,12 @@ import ( "time" "github.com/gin-gonic/gin" - "github.com/pingcap/ticdc/cdc/capture" + "github.com/pingcap/tiflow/cdc/capture" swaggerFiles "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" // use for OpenAPI online docs - _ "github.com/pingcap/ticdc/docs/api" + _ "github.com/pingcap/tiflow/docs/api" ) // newRouter create a router for OpenAPI diff --git a/cdc/http_router_test.go b/cdc/http_router_test.go index 4821a72b6d2..47ebb4245b9 100644 --- a/cdc/http_router_test.go +++ b/cdc/http_router_test.go @@ -19,7 +19,7 @@ import ( "net/http/httptest" "testing" - "github.com/pingcap/ticdc/cdc/capture" + "github.com/pingcap/tiflow/cdc/capture" "github.com/stretchr/testify/require" ) diff --git a/cdc/http_status.go b/cdc/http_status.go index 5aff78126a0..7b534b502ec 100644 --- a/cdc/http_status.go +++ b/cdc/http_status.go @@ -26,12 +26,12 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/capture" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/util" - "github.com/pingcap/ticdc/pkg/version" + "github.com/pingcap/tiflow/cdc/capture" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/util" + "github.com/pingcap/tiflow/pkg/version" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "go.etcd.io/etcd/clientv3" diff --git a/cdc/http_status_test.go b/cdc/http_status_test.go index 71cbb66a188..3e758b62351 100644 --- a/cdc/http_status_test.go +++ b/cdc/http_status_test.go @@ -23,8 +23,8 @@ import ( "github.com/pingcap/check" "github.com/pingcap/failpoint" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/util/testleak" "go.etcd.io/etcd/clientv3/concurrency" ) @@ -127,7 +127,7 @@ func testRequestNonOwnerFailed(c *check.C, uri string) { } func testHandleFailpoint(c *check.C) { - fp := "github.com/pingcap/ticdc/cdc/TestHandleFailpoint" + fp := "github.com/pingcap/tiflow/cdc/TestHandleFailpoint" uri := fmt.Sprintf("http://%s/debug/fail/%s", advertiseAddr4Test, fp) body := bytes.NewReader([]byte("return(true)")) req, err := http.NewRequest("PUT", uri, body) diff --git a/cdc/kv/client.go b/cdc/kv/client.go index 0a726bd1f86..b78601f3719 100644 --- a/cdc/kv/client.go +++ b/cdc/kv/client.go @@ -29,14 +29,14 @@ import ( "github.com/pingcap/kvproto/pkg/kvrpcpb" "github.com/pingcap/kvproto/pkg/metapb" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/regionspan" - "github.com/pingcap/ticdc/pkg/retry" - "github.com/pingcap/ticdc/pkg/txnutil" - "github.com/pingcap/ticdc/pkg/util" - "github.com/pingcap/ticdc/pkg/version" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/regionspan" + "github.com/pingcap/tiflow/pkg/retry" + "github.com/pingcap/tiflow/pkg/txnutil" + "github.com/pingcap/tiflow/pkg/util" + "github.com/pingcap/tiflow/pkg/version" "github.com/prometheus/client_golang/prometheus" tidbkv "github.com/tikv/client-go/v2/kv" "github.com/tikv/client-go/v2/tikv" diff --git a/cdc/kv/client_bench_test.go b/cdc/kv/client_bench_test.go index 9f0554c88e6..9375524d265 100644 --- a/cdc/kv/client_bench_test.go +++ b/cdc/kv/client_bench_test.go @@ -24,12 +24,12 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/kvproto/pkg/cdcpb" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/regionspan" - "github.com/pingcap/ticdc/pkg/retry" - "github.com/pingcap/ticdc/pkg/security" - "github.com/pingcap/ticdc/pkg/txnutil" "github.com/pingcap/tidb/store/mockstore/mockcopr" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/regionspan" + "github.com/pingcap/tiflow/pkg/retry" + "github.com/pingcap/tiflow/pkg/security" + "github.com/pingcap/tiflow/pkg/txnutil" "github.com/tikv/client-go/v2/oracle" "github.com/tikv/client-go/v2/testutils" "github.com/tikv/client-go/v2/tikv" diff --git a/cdc/kv/client_mock_test.go b/cdc/kv/client_mock_test.go index d98961c2de7..e077006b746 100644 --- a/cdc/kv/client_mock_test.go +++ b/cdc/kv/client_mock_test.go @@ -21,7 +21,7 @@ import ( "github.com/pingcap/kvproto/pkg/cdcpb" "github.com/pingcap/kvproto/pkg/metapb" - "github.com/pingcap/ticdc/pkg/version" + "github.com/pingcap/tiflow/pkg/version" pd "github.com/tikv/pd/client" ) diff --git a/cdc/kv/client_test.go b/cdc/kv/client_test.go index 5917dbfb17c..067f3682617 100644 --- a/cdc/kv/client_test.go +++ b/cdc/kv/client_test.go @@ -32,18 +32,18 @@ import ( "github.com/pingcap/kvproto/pkg/errorpb" "github.com/pingcap/kvproto/pkg/metapb" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/regionspan" - "github.com/pingcap/ticdc/pkg/retry" - "github.com/pingcap/ticdc/pkg/security" - "github.com/pingcap/ticdc/pkg/txnutil" - "github.com/pingcap/ticdc/pkg/util" - "github.com/pingcap/ticdc/pkg/util/testleak" "github.com/pingcap/tidb/kv" "github.com/pingcap/tidb/store/mockstore/mockcopr" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/regionspan" + "github.com/pingcap/tiflow/pkg/retry" + "github.com/pingcap/tiflow/pkg/security" + "github.com/pingcap/tiflow/pkg/txnutil" + "github.com/pingcap/tiflow/pkg/util" + "github.com/pingcap/tiflow/pkg/util/testleak" "github.com/tikv/client-go/v2/oracle" "github.com/tikv/client-go/v2/testutils" "github.com/tikv/client-go/v2/tikv" @@ -1388,10 +1388,10 @@ func (s *clientSuite) testStreamRecvWithError(c *check.C, failpointStr string) { cluster.AddStore(1, addr1) cluster.Bootstrap(regionID, []uint64{1}, []uint64{4}, 4) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/kv/kvClientStreamRecvError", failpointStr) + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/kv/kvClientStreamRecvError", failpointStr) c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/kv/kvClientStreamRecvError") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/kv/kvClientStreamRecvError") }() baseAllocatedID := currentRequestID() lockresolver := txnutil.NewLockerResolver(kvStorage) @@ -1576,10 +1576,10 @@ func (s *clientSuite) TestStreamRecvWithErrorAndResolvedGoBack(c *check.C) { }, retry.WithBackoffBaseDelay(200), retry.WithBackoffMaxDelay(60*1000), retry.WithMaxTries(10)) c.Assert(err, check.IsNil) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/kv/kvClientStreamRecvError", "1*return(\"\")") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/kv/kvClientStreamRecvError", "1*return(\"\")") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/kv/kvClientStreamRecvError") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/kv/kvClientStreamRecvError") }() ch1 <- resolved @@ -1730,10 +1730,10 @@ func (s *clientSuite) TestIncompatibleTiKV(c *check.C) { cluster.AddStore(1, addr1) cluster.Bootstrap(regionID, []uint64{1}, []uint64{4}, 4) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/kv/kvClientDelayWhenIncompatible", "return(true)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/kv/kvClientDelayWhenIncompatible", "return(true)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/kv/kvClientDelayWhenIncompatible") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/kv/kvClientDelayWhenIncompatible") }() lockresolver := txnutil.NewLockerResolver(kvStorage) isPullInit := &mockPullerInit{} @@ -1990,10 +1990,10 @@ func (s *clientSuite) TestResolveLock(c *check.C) { cluster.AddStore(1, addr1) cluster.Bootstrap(regionID, []uint64{1}, []uint64{4}, 4) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/kv/kvClientResolveLockInterval", "return(3)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/kv/kvClientResolveLockInterval", "return(3)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/kv/kvClientResolveLockInterval") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/kv/kvClientResolveLockInterval") }() baseAllocatedID := currentRequestID() lockresolver := txnutil.NewLockerResolver(kvStorage) @@ -2089,10 +2089,10 @@ func (s *clientSuite) testEventCommitTsFallback(c *check.C, events []*cdcpb.Chan logPanic = log.Panic }() - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/kv/kvClientErrUnreachable", "return(true)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/kv/kvClientErrUnreachable", "return(true)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/kv/kvClientErrUnreachable") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/kv/kvClientErrUnreachable") }() baseAllocatedID := currentRequestID() lockresolver := txnutil.NewLockerResolver(kvStorage) @@ -2237,10 +2237,10 @@ func (s *clientSuite) testEventAfterFeedStop(c *check.C) { // add 2s delay to simulate event feed processor has been marked stopped, but // before event feed processor is reconstruct, some duplicated events are // sent to event feed processor. - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/kv/kvClientSingleFeedProcessDelay", "1*sleep(2000)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/kv/kvClientSingleFeedProcessDelay", "1*sleep(2000)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/kv/kvClientSingleFeedProcessDelay") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/kv/kvClientSingleFeedProcessDelay") }() baseAllocatedID := currentRequestID() lockresolver := txnutil.NewLockerResolver(kvStorage) @@ -2738,13 +2738,13 @@ func (s *clientSuite) TestFailRegionReentrant(c *check.C) { cluster.AddStore(1, addr1) cluster.Bootstrap(regionID, []uint64{1}, []uint64{4}, 4) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/kv/kvClientRegionReentrantError", "1*return(\"ok\")->1*return(\"error\")") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/kv/kvClientRegionReentrantError", "1*return(\"ok\")->1*return(\"error\")") c.Assert(err, check.IsNil) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/kv/kvClientRegionReentrantErrorDelay", "sleep(500)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/kv/kvClientRegionReentrantErrorDelay", "sleep(500)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/kv/kvClientRegionReentrantError") - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/kv/kvClientRegionReentrantErrorDelay") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/kv/kvClientRegionReentrantError") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/kv/kvClientRegionReentrantErrorDelay") }() baseAllocatedID := currentRequestID() lockresolver := txnutil.NewLockerResolver(kvStorage.(tikv.Storage)) @@ -2820,13 +2820,13 @@ func (s *clientSuite) TestClientV1UnlockRangeReentrant(c *check.C) { cluster.Bootstrap(regionID3, []uint64{1}, []uint64{4}, 4) cluster.SplitRaw(regionID3, regionID4, []byte("b"), []uint64{5}, 5) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/kv/kvClientStreamRecvError", "1*return(\"injected stream recv error\")") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/kv/kvClientStreamRecvError", "1*return(\"injected stream recv error\")") c.Assert(err, check.IsNil) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/kv/kvClientPendingRegionDelay", "1*sleep(0)->1*sleep(2000)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/kv/kvClientPendingRegionDelay", "1*sleep(0)->1*sleep(2000)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/kv/kvClientStreamRecvError") - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/kv/kvClientPendingRegionDelay") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/kv/kvClientStreamRecvError") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/kv/kvClientPendingRegionDelay") }() lockresolver := txnutil.NewLockerResolver(kvStorage) isPullInit := &mockPullerInit{} @@ -2883,16 +2883,16 @@ func (s *clientSuite) testClientErrNoPendingRegion(c *check.C) { cluster.Bootstrap(regionID3, []uint64{1}, []uint64{4}, 4) cluster.SplitRaw(regionID3, regionID4, []byte("b"), []uint64{5}, 5) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/kv/kvClientStreamRecvError", "1*return(\"injected error\")") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/kv/kvClientStreamRecvError", "1*return(\"injected error\")") c.Assert(err, check.IsNil) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/kv/kvClientPendingRegionDelay", "1*sleep(0)->2*sleep(1000)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/kv/kvClientPendingRegionDelay", "1*sleep(0)->2*sleep(1000)") c.Assert(err, check.IsNil) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/kv/kvClientStreamCloseDelay", "sleep(2000)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/kv/kvClientStreamCloseDelay", "sleep(2000)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/kv/kvClientStreamRecvError") - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/kv/kvClientPendingRegionDelay") - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/kv/kvClientStreamCloseDelay") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/kv/kvClientStreamRecvError") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/kv/kvClientPendingRegionDelay") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/kv/kvClientStreamCloseDelay") }() lockresolver := txnutil.NewLockerResolver(kvStorage) isPullInit := &mockPullerInit{} @@ -2961,12 +2961,12 @@ func (s *clientSuite) testKVClientForceReconnect(c *check.C) { cluster.AddStore(1, addr1) cluster.Bootstrap(regionID3, []uint64{1}, []uint64{4}, 4) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/kv/kvClientResolveLockInterval", "return(1)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/kv/kvClientResolveLockInterval", "return(1)") c.Assert(err, check.IsNil) originalReconnectInterval := reconnectInterval reconnectInterval = 3 * time.Second defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/kv/kvClientResolveLockInterval") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/kv/kvClientResolveLockInterval") reconnectInterval = originalReconnectInterval }() @@ -3114,10 +3114,10 @@ func (s *clientSuite) TestConcurrentProcessRangeRequest(c *check.C) { cluster.AddStore(storeID, addr1) cluster.Bootstrap(regionID, []uint64{storeID}, []uint64{peerID}, peerID) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/kv/kvClientMockRangeLock", "1*return(20)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/kv/kvClientMockRangeLock", "1*return(20)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/kv/kvClientMockRangeLock") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/kv/kvClientMockRangeLock") }() lockresolver := txnutil.NewLockerResolver(kvStorage) isPullInit := &mockPullerInit{} @@ -3226,10 +3226,10 @@ func (s *clientSuite) TestEvTimeUpdate(c *check.C) { originalReconnectInterval := reconnectInterval reconnectInterval = 1500 * time.Millisecond - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/kv/kvClientCheckUnInitRegionInterval", "return(2)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/kv/kvClientCheckUnInitRegionInterval", "return(2)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/kv/kvClientCheckUnInitRegionInterval") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/kv/kvClientCheckUnInitRegionInterval") reconnectInterval = originalReconnectInterval }() diff --git a/cdc/kv/grpc_pool_impl.go b/cdc/kv/grpc_pool_impl.go index c232254b8a8..7ed90c4d07b 100644 --- a/cdc/kv/grpc_pool_impl.go +++ b/cdc/kv/grpc_pool_impl.go @@ -19,8 +19,8 @@ import ( "time" "github.com/pingcap/log" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/security" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/security" "go.uber.org/zap" "google.golang.org/grpc" gbackoff "google.golang.org/grpc/backoff" diff --git a/cdc/kv/grpc_pool_impl_test.go b/cdc/kv/grpc_pool_impl_test.go index a143f672b68..70e8b7413bb 100644 --- a/cdc/kv/grpc_pool_impl_test.go +++ b/cdc/kv/grpc_pool_impl_test.go @@ -17,8 +17,8 @@ import ( "context" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/security" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/security" + "github.com/pingcap/tiflow/pkg/util/testleak" ) // Use clientSuite for some special reasons, the embed etcd uses zap as the only candidate diff --git a/cdc/kv/matcher_test.go b/cdc/kv/matcher_test.go index b911a74e77f..fd9f745e7aa 100644 --- a/cdc/kv/matcher_test.go +++ b/cdc/kv/matcher_test.go @@ -16,7 +16,7 @@ package kv import ( "github.com/pingcap/check" "github.com/pingcap/kvproto/pkg/cdcpb" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type matcherSuite struct{} diff --git a/cdc/kv/region_worker.go b/cdc/kv/region_worker.go index b92d06dff07..dead08c2626 100644 --- a/cdc/kv/region_worker.go +++ b/cdc/kv/region_worker.go @@ -25,12 +25,12 @@ import ( "github.com/pingcap/failpoint" "github.com/pingcap/kvproto/pkg/cdcpb" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/regionspan" - "github.com/pingcap/ticdc/pkg/util" - "github.com/pingcap/ticdc/pkg/workerpool" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/regionspan" + "github.com/pingcap/tiflow/pkg/util" + "github.com/pingcap/tiflow/pkg/workerpool" "github.com/prometheus/client_golang/prometheus" "github.com/tikv/client-go/v2/oracle" "go.uber.org/zap" diff --git a/cdc/kv/region_worker_test.go b/cdc/kv/region_worker_test.go index 68b983d5668..13eac0d4ca7 100644 --- a/cdc/kv/region_worker_test.go +++ b/cdc/kv/region_worker_test.go @@ -19,8 +19,8 @@ import ( "sync" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type regionWorkerSuite struct{} diff --git a/cdc/kv/resolvedts_heap_test.go b/cdc/kv/resolvedts_heap_test.go index 2a79e609c94..4fe92e9b5f1 100644 --- a/cdc/kv/resolvedts_heap_test.go +++ b/cdc/kv/resolvedts_heap_test.go @@ -17,7 +17,7 @@ import ( "time" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type rtsHeapSuite struct{} diff --git a/cdc/kv/store_op.go b/cdc/kv/store_op.go index 6047db69de9..a40e409001c 100644 --- a/cdc/kv/store_op.go +++ b/cdc/kv/store_op.go @@ -20,16 +20,16 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/flags" - "github.com/pingcap/ticdc/pkg/security" tidbconfig "github.com/pingcap/tidb/config" "github.com/pingcap/tidb/kv" tidbkv "github.com/pingcap/tidb/kv" "github.com/pingcap/tidb/meta" "github.com/pingcap/tidb/store" "github.com/pingcap/tidb/store/driver" + "github.com/pingcap/tiflow/cdc/model" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/flags" + "github.com/pingcap/tiflow/pkg/security" "github.com/tikv/client-go/v2/oracle" "github.com/tikv/client-go/v2/tikv" "go.uber.org/zap" diff --git a/cdc/kv/testing.go b/cdc/kv/testing.go index b28fe933563..72795240b83 100644 --- a/cdc/kv/testing.go +++ b/cdc/kv/testing.go @@ -22,13 +22,13 @@ import ( "time" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/regionspan" - "github.com/pingcap/ticdc/pkg/security" - "github.com/pingcap/ticdc/pkg/txnutil" "github.com/pingcap/tidb/kv" "github.com/pingcap/tidb/store" "github.com/pingcap/tidb/store/driver" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/regionspan" + "github.com/pingcap/tiflow/pkg/security" + "github.com/pingcap/tiflow/pkg/txnutil" "github.com/stretchr/testify/require" "github.com/tikv/client-go/v2/tikv" pd "github.com/tikv/pd/client" diff --git a/cdc/kv/token_region.go b/cdc/kv/token_region.go index 4275b11bf81..61b3c9d10e1 100644 --- a/cdc/kv/token_region.go +++ b/cdc/kv/token_region.go @@ -19,7 +19,7 @@ import ( "time" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/pkg/util" + "github.com/pingcap/tiflow/pkg/util" "github.com/prometheus/client_golang/prometheus" ) diff --git a/cdc/kv/token_region_test.go b/cdc/kv/token_region_test.go index 76efd053860..a5ad7d5279e 100644 --- a/cdc/kv/token_region_test.go +++ b/cdc/kv/token_region_test.go @@ -21,7 +21,7 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" "github.com/tikv/client-go/v2/tikv" "golang.org/x/sync/errgroup" ) diff --git a/cdc/metrics.go b/cdc/metrics.go index ae7cfac34e7..f27d4e1de66 100644 --- a/cdc/metrics.go +++ b/cdc/metrics.go @@ -14,17 +14,17 @@ package cdc import ( - "github.com/pingcap/ticdc/cdc/entry" - "github.com/pingcap/ticdc/cdc/kv" - "github.com/pingcap/ticdc/cdc/owner" - "github.com/pingcap/ticdc/cdc/processor" - tablepipeline "github.com/pingcap/ticdc/cdc/processor/pipeline" - "github.com/pingcap/ticdc/cdc/puller" - "github.com/pingcap/ticdc/cdc/sink" - "github.com/pingcap/ticdc/cdc/sorter/memory" - "github.com/pingcap/ticdc/cdc/sorter/unified" - "github.com/pingcap/ticdc/pkg/actor" - "github.com/pingcap/ticdc/pkg/etcd" + "github.com/pingcap/tiflow/cdc/entry" + "github.com/pingcap/tiflow/cdc/kv" + "github.com/pingcap/tiflow/cdc/owner" + "github.com/pingcap/tiflow/cdc/processor" + tablepipeline "github.com/pingcap/tiflow/cdc/processor/pipeline" + "github.com/pingcap/tiflow/cdc/puller" + "github.com/pingcap/tiflow/cdc/sink" + "github.com/pingcap/tiflow/cdc/sorter/memory" + "github.com/pingcap/tiflow/cdc/sorter/unified" + "github.com/pingcap/tiflow/pkg/actor" + "github.com/pingcap/tiflow/pkg/etcd" "github.com/prometheus/client_golang/prometheus" ) diff --git a/cdc/model/capture.go b/cdc/model/capture.go index f6594786211..aa2aa76331b 100644 --- a/cdc/model/capture.go +++ b/cdc/model/capture.go @@ -17,7 +17,7 @@ import ( "encoding/json" "github.com/pingcap/errors" - cerror "github.com/pingcap/ticdc/pkg/errors" + cerror "github.com/pingcap/tiflow/pkg/errors" ) // CaptureInfo store in etcd. diff --git a/cdc/model/changefeed.go b/cdc/model/changefeed.go index 133b6297427..d1806071bc9 100644 --- a/cdc/model/changefeed.go +++ b/cdc/model/changefeed.go @@ -22,9 +22,9 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/cyclic/mark" - cerror "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/cyclic/mark" + cerror "github.com/pingcap/tiflow/pkg/errors" "github.com/tikv/client-go/v2/oracle" "go.uber.org/zap" ) diff --git a/cdc/model/changefeed_test.go b/cdc/model/changefeed_test.go index b0e5befe4ea..1a2d9103f20 100644 --- a/cdc/model/changefeed_test.go +++ b/cdc/model/changefeed_test.go @@ -19,10 +19,10 @@ import ( "testing" "time" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" filter "github.com/pingcap/tidb-tools/pkg/table-filter" "github.com/pingcap/tidb/parser/model" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" "github.com/stretchr/testify/require" "github.com/tikv/client-go/v2/oracle" ) diff --git a/cdc/model/http_model.go b/cdc/model/http_model.go index b6f80f179fb..25d9e6d05c6 100644 --- a/cdc/model/http_model.go +++ b/cdc/model/http_model.go @@ -18,8 +18,8 @@ import ( "fmt" "time" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" ) // JSONTime used to wrap time into json format diff --git a/cdc/model/http_model_test.go b/cdc/model/http_model_test.go index 72dd7d0dc3d..5e46d787a28 100644 --- a/cdc/model/http_model_test.go +++ b/cdc/model/http_model_test.go @@ -17,7 +17,7 @@ import ( "encoding/json" "testing" - cerror "github.com/pingcap/ticdc/pkg/errors" + cerror "github.com/pingcap/tiflow/pkg/errors" "github.com/stretchr/testify/require" ) diff --git a/cdc/model/kv.go b/cdc/model/kv.go index 1e249248970..4af1c9569b3 100644 --- a/cdc/model/kv.go +++ b/cdc/model/kv.go @@ -18,7 +18,7 @@ package model import ( "fmt" - "github.com/pingcap/ticdc/pkg/regionspan" + "github.com/pingcap/tiflow/pkg/regionspan" ) // OpType for the kv, delete or put diff --git a/cdc/model/kv_test.go b/cdc/model/kv_test.go index c1465240d1a..7f5e25113b7 100644 --- a/cdc/model/kv_test.go +++ b/cdc/model/kv_test.go @@ -16,7 +16,7 @@ package model import ( "testing" - "github.com/pingcap/ticdc/pkg/regionspan" + "github.com/pingcap/tiflow/pkg/regionspan" "github.com/stretchr/testify/require" ) diff --git a/cdc/model/main_test.go b/cdc/model/main_test.go index 18154f1c399..e7ec3924ffe 100644 --- a/cdc/model/main_test.go +++ b/cdc/model/main_test.go @@ -16,7 +16,7 @@ package model import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/cdc/model/owner.go b/cdc/model/owner.go index 2ca915e44dd..f4726d8edd4 100644 --- a/cdc/model/owner.go +++ b/cdc/model/owner.go @@ -20,7 +20,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - cerror "github.com/pingcap/ticdc/pkg/errors" + cerror "github.com/pingcap/tiflow/pkg/errors" "go.uber.org/zap" ) diff --git a/cdc/model/sink.go b/cdc/model/sink.go index e05447d3fd5..b7cb4d18c54 100644 --- a/cdc/model/sink.go +++ b/cdc/model/sink.go @@ -19,9 +19,9 @@ import ( "sync" "github.com/pingcap/log" - "github.com/pingcap/ticdc/pkg/quotes" - "github.com/pingcap/ticdc/pkg/util" "github.com/pingcap/tidb/parser/model" + "github.com/pingcap/tiflow/pkg/quotes" + "github.com/pingcap/tiflow/pkg/util" "go.uber.org/zap" ) diff --git a/cdc/model/string.go b/cdc/model/string.go index eda57d46756..0b2ed1908ff 100644 --- a/cdc/model/string.go +++ b/cdc/model/string.go @@ -16,7 +16,7 @@ package model import ( "strings" - cerror "github.com/pingcap/ticdc/pkg/errors" + cerror "github.com/pingcap/tiflow/pkg/errors" ) // HolderString returns a string of place holders separated by comma diff --git a/cdc/owner/async_sink.go b/cdc/owner/async_sink.go index e51af798c6c..632883e5dfd 100644 --- a/cdc/owner/async_sink.go +++ b/cdc/owner/async_sink.go @@ -22,11 +22,11 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sink" - cdcContext "github.com/pingcap/ticdc/pkg/context" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/filter" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sink" + cdcContext "github.com/pingcap/tiflow/pkg/context" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/filter" "go.uber.org/zap" ) diff --git a/cdc/owner/async_sink_test.go b/cdc/owner/async_sink_test.go index 3c7fc11a11e..981c1905e6b 100644 --- a/cdc/owner/async_sink_test.go +++ b/cdc/owner/async_sink_test.go @@ -21,13 +21,13 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sink" - "github.com/pingcap/ticdc/pkg/config" - cdcContext "github.com/pingcap/ticdc/pkg/context" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/retry" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sink" + "github.com/pingcap/tiflow/pkg/config" + cdcContext "github.com/pingcap/tiflow/pkg/context" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/retry" + "github.com/pingcap/tiflow/pkg/util/testleak" ) var _ = check.Suite(&asyncSinkSuite{}) diff --git a/cdc/owner/barrier.go b/cdc/owner/barrier.go index 6eed7aba493..abe951090d8 100644 --- a/cdc/owner/barrier.go +++ b/cdc/owner/barrier.go @@ -17,7 +17,7 @@ import ( "math" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" ) type barrierType int diff --git a/cdc/owner/barrier_test.go b/cdc/owner/barrier_test.go index d8a6b851cf0..5b09cd030ba 100644 --- a/cdc/owner/barrier_test.go +++ b/cdc/owner/barrier_test.go @@ -19,8 +19,8 @@ import ( "testing" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" ) func Test(t *testing.T) { check.TestingT(t) } diff --git a/cdc/owner/changefeed.go b/cdc/owner/changefeed.go index 3bb3dfbb826..2ee838cb178 100644 --- a/cdc/owner/changefeed.go +++ b/cdc/owner/changefeed.go @@ -20,15 +20,15 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/redo" - cdcContext "github.com/pingcap/ticdc/pkg/context" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/orchestrator" - "github.com/pingcap/ticdc/pkg/txnutil/gc" - "github.com/pingcap/ticdc/pkg/util" timodel "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/sessionctx/binloginfo" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/redo" + cdcContext "github.com/pingcap/tiflow/pkg/context" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/orchestrator" + "github.com/pingcap/tiflow/pkg/txnutil/gc" + "github.com/pingcap/tiflow/pkg/util" "github.com/prometheus/client_golang/prometheus" "github.com/tikv/client-go/v2/oracle" "go.uber.org/zap" diff --git a/cdc/owner/changefeed_test.go b/cdc/owner/changefeed_test.go index e3a630a4340..2657ce5fa8f 100644 --- a/cdc/owner/changefeed_test.go +++ b/cdc/owner/changefeed_test.go @@ -20,16 +20,16 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/entry" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - cdcContext "github.com/pingcap/ticdc/pkg/context" - "github.com/pingcap/ticdc/pkg/orchestrator" - "github.com/pingcap/ticdc/pkg/pdtime" - "github.com/pingcap/ticdc/pkg/txnutil/gc" - "github.com/pingcap/ticdc/pkg/util/testleak" - "github.com/pingcap/ticdc/pkg/version" timodel "github.com/pingcap/tidb/parser/model" + "github.com/pingcap/tiflow/cdc/entry" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + cdcContext "github.com/pingcap/tiflow/pkg/context" + "github.com/pingcap/tiflow/pkg/orchestrator" + "github.com/pingcap/tiflow/pkg/pdtime" + "github.com/pingcap/tiflow/pkg/txnutil/gc" + "github.com/pingcap/tiflow/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/version" "github.com/tikv/client-go/v2/oracle" ) diff --git a/cdc/owner/ddl_puller.go b/cdc/owner/ddl_puller.go index 95c3e9b13ae..ad5452eb00e 100644 --- a/cdc/owner/ddl_puller.go +++ b/cdc/owner/ddl_puller.go @@ -19,15 +19,15 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/entry" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/puller" - "github.com/pingcap/ticdc/cdc/sorter/memory" - cdcContext "github.com/pingcap/ticdc/pkg/context" - "github.com/pingcap/ticdc/pkg/filter" - "github.com/pingcap/ticdc/pkg/regionspan" - "github.com/pingcap/ticdc/pkg/util" timodel "github.com/pingcap/tidb/parser/model" + "github.com/pingcap/tiflow/cdc/entry" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/puller" + "github.com/pingcap/tiflow/cdc/sorter/memory" + cdcContext "github.com/pingcap/tiflow/pkg/context" + "github.com/pingcap/tiflow/pkg/filter" + "github.com/pingcap/tiflow/pkg/regionspan" + "github.com/pingcap/tiflow/pkg/util" "go.uber.org/zap" "golang.org/x/sync/errgroup" ) diff --git a/cdc/owner/ddl_puller_test.go b/cdc/owner/ddl_puller_test.go index 4e9cc5e6396..3ed7b4a45cd 100644 --- a/cdc/owner/ddl_puller_test.go +++ b/cdc/owner/ddl_puller_test.go @@ -21,12 +21,12 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - cdcContext "github.com/pingcap/ticdc/pkg/context" - "github.com/pingcap/ticdc/pkg/retry" - "github.com/pingcap/ticdc/pkg/util/testleak" timodel "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/util/codec" + "github.com/pingcap/tiflow/cdc/model" + cdcContext "github.com/pingcap/tiflow/pkg/context" + "github.com/pingcap/tiflow/pkg/retry" + "github.com/pingcap/tiflow/pkg/util/testleak" ) var _ = check.Suite(&ddlPullerSuite{}) diff --git a/cdc/owner/feed_state_manager.go b/cdc/owner/feed_state_manager.go index 909cc9a2f80..256ad0e07eb 100644 --- a/cdc/owner/feed_state_manager.go +++ b/cdc/owner/feed_state_manager.go @@ -18,9 +18,9 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/orchestrator" + "github.com/pingcap/tiflow/cdc/model" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/orchestrator" "go.uber.org/zap" ) diff --git a/cdc/owner/feed_state_manager_test.go b/cdc/owner/feed_state_manager_test.go index 66d8c951a46..6bb962938e7 100644 --- a/cdc/owner/feed_state_manager_test.go +++ b/cdc/owner/feed_state_manager_test.go @@ -15,11 +15,11 @@ package owner import ( "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - cdcContext "github.com/pingcap/ticdc/pkg/context" - "github.com/pingcap/ticdc/pkg/orchestrator" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + cdcContext "github.com/pingcap/tiflow/pkg/context" + "github.com/pingcap/tiflow/pkg/orchestrator" + "github.com/pingcap/tiflow/pkg/util/testleak" ) var _ = check.Suite(&feedStateManagerSuite{}) diff --git a/cdc/owner/owner.go b/cdc/owner/owner.go index 358bfee893c..c830f5081f7 100644 --- a/cdc/owner/owner.go +++ b/cdc/owner/owner.go @@ -25,12 +25,12 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cdcContext "github.com/pingcap/ticdc/pkg/context" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/orchestrator" - "github.com/pingcap/ticdc/pkg/txnutil/gc" - "github.com/pingcap/ticdc/pkg/version" + "github.com/pingcap/tiflow/cdc/model" + cdcContext "github.com/pingcap/tiflow/pkg/context" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/orchestrator" + "github.com/pingcap/tiflow/pkg/txnutil/gc" + "github.com/pingcap/tiflow/pkg/version" pd "github.com/tikv/pd/client" "go.uber.org/zap" ) diff --git a/cdc/owner/owner_test.go b/cdc/owner/owner_test.go index 25ad60ae026..21fdaa43937 100644 --- a/cdc/owner/owner_test.go +++ b/cdc/owner/owner_test.go @@ -21,14 +21,14 @@ import ( "time" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - cdcContext "github.com/pingcap/ticdc/pkg/context" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/orchestrator" - "github.com/pingcap/ticdc/pkg/txnutil/gc" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + cdcContext "github.com/pingcap/tiflow/pkg/context" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/orchestrator" + "github.com/pingcap/tiflow/pkg/txnutil/gc" + "github.com/pingcap/tiflow/pkg/util/testleak" "github.com/tikv/client-go/v2/oracle" ) diff --git a/cdc/owner/scheduler.go b/cdc/owner/scheduler.go index 9b674d0b743..2bf474790ac 100644 --- a/cdc/owner/scheduler.go +++ b/cdc/owner/scheduler.go @@ -19,9 +19,9 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/orchestrator" + "github.com/pingcap/tiflow/cdc/model" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/orchestrator" "go.uber.org/zap" ) diff --git a/cdc/owner/scheduler_test.go b/cdc/owner/scheduler_test.go index f2dbb5ed545..320100237a3 100644 --- a/cdc/owner/scheduler_test.go +++ b/cdc/owner/scheduler_test.go @@ -18,9 +18,9 @@ import ( "math/rand" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/orchestrator" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/orchestrator" + "github.com/pingcap/tiflow/pkg/util/testleak" ) var _ = check.Suite(&schedulerSuite{}) diff --git a/cdc/owner/schema.go b/cdc/owner/schema.go index d24584bda61..0b1af16beb3 100644 --- a/cdc/owner/schema.go +++ b/cdc/owner/schema.go @@ -16,15 +16,15 @@ package owner import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/entry" - "github.com/pingcap/ticdc/cdc/kv" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/cyclic/mark" - "github.com/pingcap/ticdc/pkg/filter" tidbkv "github.com/pingcap/tidb/kv" timeta "github.com/pingcap/tidb/meta" timodel "github.com/pingcap/tidb/parser/model" + "github.com/pingcap/tiflow/cdc/entry" + "github.com/pingcap/tiflow/cdc/kv" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/cyclic/mark" + "github.com/pingcap/tiflow/pkg/filter" "go.uber.org/zap" ) diff --git a/cdc/owner/schema_test.go b/cdc/owner/schema_test.go index 06e3d7e6ba3..9ed7e8ec14f 100644 --- a/cdc/owner/schema_test.go +++ b/cdc/owner/schema_test.go @@ -17,12 +17,12 @@ import ( "sort" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/entry" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/util/testleak" timodel "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/parser/mysql" + "github.com/pingcap/tiflow/cdc/entry" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/util/testleak" "github.com/tikv/client-go/v2/oracle" ) diff --git a/cdc/owner/status_provider.go b/cdc/owner/status_provider.go index 69dec072d21..c13f23e9967 100644 --- a/cdc/owner/status_provider.go +++ b/cdc/owner/status_provider.go @@ -16,10 +16,10 @@ package owner import ( "context" - cerror "github.com/pingcap/ticdc/pkg/errors" + cerror "github.com/pingcap/tiflow/pkg/errors" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" ) // StatusProvider provide some func to get meta-information from owner diff --git a/cdc/processor/manager.go b/cdc/processor/manager.go index 968a65ebca4..a84b91a3fbf 100644 --- a/cdc/processor/manager.go +++ b/cdc/processor/manager.go @@ -22,10 +22,10 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cdcContext "github.com/pingcap/ticdc/pkg/context" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/orchestrator" + "github.com/pingcap/tiflow/cdc/model" + cdcContext "github.com/pingcap/tiflow/pkg/context" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/orchestrator" "go.uber.org/zap" ) diff --git a/cdc/processor/manager_test.go b/cdc/processor/manager_test.go index 94b969d2222..5aa066d0944 100644 --- a/cdc/processor/manager_test.go +++ b/cdc/processor/manager_test.go @@ -21,13 +21,13 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - tablepipeline "github.com/pingcap/ticdc/cdc/processor/pipeline" - "github.com/pingcap/ticdc/pkg/config" - cdcContext "github.com/pingcap/ticdc/pkg/context" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/orchestrator" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + tablepipeline "github.com/pingcap/tiflow/cdc/processor/pipeline" + "github.com/pingcap/tiflow/pkg/config" + cdcContext "github.com/pingcap/tiflow/pkg/context" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/orchestrator" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type managerSuite struct { diff --git a/cdc/processor/pipeline/cyclic_mark.go b/cdc/processor/pipeline/cyclic_mark.go index da0ac0562d8..2350f6bd3b2 100644 --- a/cdc/processor/pipeline/cyclic_mark.go +++ b/cdc/processor/pipeline/cyclic_mark.go @@ -16,10 +16,10 @@ package pipeline import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/entry" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/cyclic/mark" - "github.com/pingcap/ticdc/pkg/pipeline" + "github.com/pingcap/tiflow/cdc/entry" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/cyclic/mark" + "github.com/pingcap/tiflow/pkg/pipeline" "go.uber.org/zap" ) diff --git a/cdc/processor/pipeline/cyclic_mark_test.go b/cdc/processor/pipeline/cyclic_mark_test.go index 38c03c42616..0b83fb5cefc 100644 --- a/cdc/processor/pipeline/cyclic_mark_test.go +++ b/cdc/processor/pipeline/cyclic_mark_test.go @@ -20,13 +20,13 @@ import ( "github.com/google/go-cmp/cmp" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - cdcContext "github.com/pingcap/ticdc/pkg/context" - "github.com/pingcap/ticdc/pkg/cyclic/mark" - "github.com/pingcap/ticdc/pkg/pipeline" - "github.com/pingcap/ticdc/pkg/util/testleak" "github.com/pingcap/tidb/tablecodec" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + cdcContext "github.com/pingcap/tiflow/pkg/context" + "github.com/pingcap/tiflow/pkg/cyclic/mark" + "github.com/pingcap/tiflow/pkg/pipeline" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type markSuite struct{} diff --git a/cdc/processor/pipeline/mounter.go b/cdc/processor/pipeline/mounter.go index 2e156b9cdbd..c8034ae89ae 100644 --- a/cdc/processor/pipeline/mounter.go +++ b/cdc/processor/pipeline/mounter.go @@ -21,9 +21,9 @@ import ( "github.com/edwingeng/deque" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/notify" - "github.com/pingcap/ticdc/pkg/pipeline" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/notify" + "github.com/pingcap/tiflow/pkg/pipeline" "go.uber.org/zap" "golang.org/x/sync/errgroup" "golang.org/x/time/rate" diff --git a/cdc/processor/pipeline/mounter_test.go b/cdc/processor/pipeline/mounter_test.go index dbb19ccee56..c2d2609ed15 100644 --- a/cdc/processor/pipeline/mounter_test.go +++ b/cdc/processor/pipeline/mounter_test.go @@ -22,11 +22,11 @@ import ( "github.com/pingcap/check" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cdcContext "github.com/pingcap/ticdc/pkg/context" - "github.com/pingcap/ticdc/pkg/pipeline" - "github.com/pingcap/ticdc/pkg/retry" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + cdcContext "github.com/pingcap/tiflow/pkg/context" + "github.com/pingcap/tiflow/pkg/pipeline" + "github.com/pingcap/tiflow/pkg/retry" + "github.com/pingcap/tiflow/pkg/util/testleak" "go.uber.org/zap" ) diff --git a/cdc/processor/pipeline/puller.go b/cdc/processor/pipeline/puller.go index 1a8d3492406..02ee12707e1 100644 --- a/cdc/processor/pipeline/puller.go +++ b/cdc/processor/pipeline/puller.go @@ -17,12 +17,12 @@ import ( "context" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/puller" - cdcContext "github.com/pingcap/ticdc/pkg/context" - "github.com/pingcap/ticdc/pkg/pipeline" - "github.com/pingcap/ticdc/pkg/regionspan" - "github.com/pingcap/ticdc/pkg/util" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/puller" + cdcContext "github.com/pingcap/tiflow/pkg/context" + "github.com/pingcap/tiflow/pkg/pipeline" + "github.com/pingcap/tiflow/pkg/regionspan" + "github.com/pingcap/tiflow/pkg/util" "github.com/tikv/client-go/v2/oracle" "golang.org/x/sync/errgroup" ) diff --git a/cdc/processor/pipeline/sink.go b/cdc/processor/pipeline/sink.go index 651a250a340..b436df2a050 100644 --- a/cdc/processor/pipeline/sink.go +++ b/cdc/processor/pipeline/sink.go @@ -20,10 +20,10 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sink" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/pipeline" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sink" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/pipeline" "go.uber.org/zap" ) diff --git a/cdc/processor/pipeline/sink_test.go b/cdc/processor/pipeline/sink_test.go index 12ba3bb1fa5..2e6b25cce0e 100644 --- a/cdc/processor/pipeline/sink_test.go +++ b/cdc/processor/pipeline/sink_test.go @@ -20,12 +20,12 @@ import ( "time" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - cdcContext "github.com/pingcap/ticdc/pkg/context" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/pipeline" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + cdcContext "github.com/pingcap/tiflow/pkg/context" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/pipeline" + "github.com/pingcap/tiflow/pkg/util/testleak" "github.com/tikv/client-go/v2/oracle" ) diff --git a/cdc/processor/pipeline/sorter.go b/cdc/processor/pipeline/sorter.go index 755981c3d64..cfd7e60a226 100644 --- a/cdc/processor/pipeline/sorter.go +++ b/cdc/processor/pipeline/sorter.go @@ -21,13 +21,13 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/entry" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sorter" - "github.com/pingcap/ticdc/cdc/sorter/memory" - "github.com/pingcap/ticdc/cdc/sorter/unified" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/pipeline" + "github.com/pingcap/tiflow/cdc/entry" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sorter" + "github.com/pingcap/tiflow/cdc/sorter/memory" + "github.com/pingcap/tiflow/cdc/sorter/unified" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/pipeline" "go.uber.org/zap" "golang.org/x/sync/errgroup" ) diff --git a/cdc/processor/pipeline/sorter_test.go b/cdc/processor/pipeline/sorter_test.go index 35ebba8a165..6959951ff95 100644 --- a/cdc/processor/pipeline/sorter_test.go +++ b/cdc/processor/pipeline/sorter_test.go @@ -18,13 +18,13 @@ import ( "strings" "testing" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sorter/memory" - "github.com/pingcap/ticdc/cdc/sorter/unified" - "github.com/pingcap/ticdc/pkg/config" - cdcContext "github.com/pingcap/ticdc/pkg/context" - "github.com/pingcap/ticdc/pkg/leakutil" - "github.com/pingcap/ticdc/pkg/pipeline" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sorter/memory" + "github.com/pingcap/tiflow/cdc/sorter/unified" + "github.com/pingcap/tiflow/pkg/config" + cdcContext "github.com/pingcap/tiflow/pkg/context" + "github.com/pingcap/tiflow/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/pipeline" "github.com/stretchr/testify/require" "go.uber.org/goleak" ) @@ -32,7 +32,7 @@ import ( func TestMain(m *testing.M) { leakutil.SetUpLeakTest( m, - goleak.IgnoreTopFunction("github.com/pingcap/ticdc/cdc/sorter/unified.newBackEndPool.func1"), + goleak.IgnoreTopFunction("github.com/pingcap/tiflow/cdc/sorter/unified.newBackEndPool.func1"), ) } diff --git a/cdc/processor/pipeline/table.go b/cdc/processor/pipeline/table.go index 7ee785b90dc..eb6b05e8ef5 100644 --- a/cdc/processor/pipeline/table.go +++ b/cdc/processor/pipeline/table.go @@ -18,14 +18,14 @@ import ( "time" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/entry" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sink" - "github.com/pingcap/ticdc/cdc/sink/common" - serverConfig "github.com/pingcap/ticdc/pkg/config" - cdcContext "github.com/pingcap/ticdc/pkg/context" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/pipeline" + "github.com/pingcap/tiflow/cdc/entry" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sink" + "github.com/pingcap/tiflow/cdc/sink/common" + serverConfig "github.com/pingcap/tiflow/pkg/config" + cdcContext "github.com/pingcap/tiflow/pkg/context" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/pipeline" "go.uber.org/zap" ) diff --git a/cdc/processor/processor.go b/cdc/processor/processor.go index 36787e3d70b..b9ae2843c84 100644 --- a/cdc/processor/processor.go +++ b/cdc/processor/processor.go @@ -25,22 +25,22 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/entry" - "github.com/pingcap/ticdc/cdc/kv" - "github.com/pingcap/ticdc/cdc/model" - tablepipeline "github.com/pingcap/ticdc/cdc/processor/pipeline" - "github.com/pingcap/ticdc/cdc/puller" - "github.com/pingcap/ticdc/cdc/redo" - "github.com/pingcap/ticdc/cdc/sink" - "github.com/pingcap/ticdc/cdc/sorter/memory" - cdcContext "github.com/pingcap/ticdc/pkg/context" - "github.com/pingcap/ticdc/pkg/cyclic/mark" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/filter" - "github.com/pingcap/ticdc/pkg/orchestrator" - "github.com/pingcap/ticdc/pkg/regionspan" - "github.com/pingcap/ticdc/pkg/retry" - "github.com/pingcap/ticdc/pkg/util" + "github.com/pingcap/tiflow/cdc/entry" + "github.com/pingcap/tiflow/cdc/kv" + "github.com/pingcap/tiflow/cdc/model" + tablepipeline "github.com/pingcap/tiflow/cdc/processor/pipeline" + "github.com/pingcap/tiflow/cdc/puller" + "github.com/pingcap/tiflow/cdc/redo" + "github.com/pingcap/tiflow/cdc/sink" + "github.com/pingcap/tiflow/cdc/sorter/memory" + cdcContext "github.com/pingcap/tiflow/pkg/context" + "github.com/pingcap/tiflow/pkg/cyclic/mark" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/filter" + "github.com/pingcap/tiflow/pkg/orchestrator" + "github.com/pingcap/tiflow/pkg/regionspan" + "github.com/pingcap/tiflow/pkg/retry" + "github.com/pingcap/tiflow/pkg/util" "github.com/prometheus/client_golang/prometheus" "github.com/tikv/client-go/v2/oracle" "go.uber.org/zap" diff --git a/cdc/processor/processor_test.go b/cdc/processor/processor_test.go index b6156afbc5b..d95a737ed70 100644 --- a/cdc/processor/processor_test.go +++ b/cdc/processor/processor_test.go @@ -24,15 +24,15 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/entry" - "github.com/pingcap/ticdc/cdc/model" - tablepipeline "github.com/pingcap/ticdc/cdc/processor/pipeline" - "github.com/pingcap/ticdc/cdc/redo" - cdcContext "github.com/pingcap/ticdc/pkg/context" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/orchestrator" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/entry" + "github.com/pingcap/tiflow/cdc/model" + tablepipeline "github.com/pingcap/tiflow/cdc/processor/pipeline" + "github.com/pingcap/tiflow/cdc/redo" + cdcContext "github.com/pingcap/tiflow/pkg/context" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/orchestrator" + "github.com/pingcap/tiflow/pkg/util/testleak" ) func Test(t *testing.T) { check.TestingT(t) } diff --git a/cdc/puller/frontier/frontier.go b/cdc/puller/frontier/frontier.go index 8cb4e160620..6372b21dc8f 100644 --- a/cdc/puller/frontier/frontier.go +++ b/cdc/puller/frontier/frontier.go @@ -19,7 +19,7 @@ import ( "math" "strings" - "github.com/pingcap/ticdc/pkg/regionspan" + "github.com/pingcap/tiflow/pkg/regionspan" ) // Frontier checks resolved event of spans and moves the global resolved ts ahead diff --git a/cdc/puller/frontier/frontier_bench_test.go b/cdc/puller/frontier/frontier_bench_test.go index b966740ceef..158122129b1 100644 --- a/cdc/puller/frontier/frontier_bench_test.go +++ b/cdc/puller/frontier/frontier_bench_test.go @@ -17,7 +17,7 @@ import ( "fmt" "testing" - "github.com/pingcap/ticdc/pkg/regionspan" + "github.com/pingcap/tiflow/pkg/regionspan" ) func toCMPBytes(i int) []byte { diff --git a/cdc/puller/frontier/frontier_test.go b/cdc/puller/frontier/frontier_test.go index 0533fc133ef..3bcde1d8abd 100644 --- a/cdc/puller/frontier/frontier_test.go +++ b/cdc/puller/frontier/frontier_test.go @@ -20,8 +20,8 @@ import ( "testing" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/regionspan" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/regionspan" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type spanFrontierSuite struct{} diff --git a/cdc/puller/frontier/heap_test.go b/cdc/puller/frontier/heap_test.go index 5bc9686106e..ccfc9befc17 100644 --- a/cdc/puller/frontier/heap_test.go +++ b/cdc/puller/frontier/heap_test.go @@ -19,7 +19,7 @@ import ( "time" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type tsHeapSuite struct{} diff --git a/cdc/puller/frontier/list_test.go b/cdc/puller/frontier/list_test.go index 7acf366f77e..92c27a87dbc 100644 --- a/cdc/puller/frontier/list_test.go +++ b/cdc/puller/frontier/list_test.go @@ -18,7 +18,7 @@ import ( "math/rand" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type spanListSuite struct{} diff --git a/cdc/puller/mock_puller.go b/cdc/puller/mock_puller.go index d9be65da364..953585454f7 100644 --- a/cdc/puller/mock_puller.go +++ b/cdc/puller/mock_puller.go @@ -21,14 +21,14 @@ import ( "github.com/pingcap/check" "github.com/pingcap/kvproto/pkg/kvrpcpb" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/regionspan" "github.com/pingcap/tidb/domain" tidbkv "github.com/pingcap/tidb/kv" timodel "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/session" "github.com/pingcap/tidb/store/mockstore" "github.com/pingcap/tidb/util/testkit" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/regionspan" "github.com/tikv/client-go/v2/testutils" "go.uber.org/zap" ) diff --git a/cdc/puller/mock_puller_test.go b/cdc/puller/mock_puller_test.go index 1c80954cd3c..e41ddeafbab 100644 --- a/cdc/puller/mock_puller_test.go +++ b/cdc/puller/mock_puller_test.go @@ -22,9 +22,9 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/entry" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util" + "github.com/pingcap/tiflow/cdc/entry" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util" "github.com/tikv/client-go/v2/oracle" ) diff --git a/cdc/puller/puller.go b/cdc/puller/puller.go index d015dc4bb09..ea17008fdc5 100644 --- a/cdc/puller/puller.go +++ b/cdc/puller/puller.go @@ -20,13 +20,13 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/kv" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/puller/frontier" - "github.com/pingcap/ticdc/pkg/regionspan" - "github.com/pingcap/ticdc/pkg/txnutil" - "github.com/pingcap/ticdc/pkg/util" tidbkv "github.com/pingcap/tidb/kv" + "github.com/pingcap/tiflow/cdc/kv" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/puller/frontier" + "github.com/pingcap/tiflow/pkg/regionspan" + "github.com/pingcap/tiflow/pkg/txnutil" + "github.com/pingcap/tiflow/pkg/util" "github.com/tikv/client-go/v2/oracle" "github.com/tikv/client-go/v2/tikv" pd "github.com/tikv/pd/client" @@ -159,7 +159,7 @@ func (p *pullerImpl) Run(ctx context.Context) error { lastResolvedTs := p.checkpointTs g.Go(func() error { output := func(raw *model.RawKVEntry) error { - // even after https://github.com/pingcap/ticdc/pull/2038, kv client + // even after https://github.com/pingcap/tiflow/pull/2038, kv client // could still miss region change notification, which leads to resolved // ts update missing in puller, however resolved ts fallback here can // be ignored since no late data is received and the guarantee of diff --git a/cdc/puller/puller_test.go b/cdc/puller/puller_test.go index 4b34057d164..b374b7fe30a 100644 --- a/cdc/puller/puller_test.go +++ b/cdc/puller/puller_test.go @@ -21,16 +21,16 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/kv" - "github.com/pingcap/ticdc/cdc/model" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/regionspan" - "github.com/pingcap/ticdc/pkg/retry" - "github.com/pingcap/ticdc/pkg/security" - "github.com/pingcap/ticdc/pkg/txnutil" - "github.com/pingcap/ticdc/pkg/util/testleak" tidbkv "github.com/pingcap/tidb/kv" "github.com/pingcap/tidb/store/mockstore" + "github.com/pingcap/tiflow/cdc/kv" + "github.com/pingcap/tiflow/cdc/model" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/regionspan" + "github.com/pingcap/tiflow/pkg/retry" + "github.com/pingcap/tiflow/pkg/security" + "github.com/pingcap/tiflow/pkg/txnutil" + "github.com/pingcap/tiflow/pkg/util/testleak" "github.com/tikv/client-go/v2/tikv" pd "github.com/tikv/pd/client" ) diff --git a/cdc/redo/applier.go b/cdc/redo/applier.go index b81fc02ed8d..e4d9ef520a6 100644 --- a/cdc/redo/applier.go +++ b/cdc/redo/applier.go @@ -16,8 +16,8 @@ package redo import ( "context" - "github.com/pingcap/ticdc/cdc/redo/reader" - cerror "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/cdc/redo/reader" + cerror "github.com/pingcap/tiflow/pkg/errors" ) // NewRedoReader creates a new redo log reader diff --git a/cdc/redo/common/util.go b/cdc/redo/common/util.go index 106fe1b2ba8..5ba7321583a 100644 --- a/cdc/redo/common/util.go +++ b/cdc/redo/common/util.go @@ -22,8 +22,8 @@ import ( "github.com/pingcap/errors" backuppb "github.com/pingcap/kvproto/pkg/brpb" - cerror "github.com/pingcap/ticdc/pkg/errors" "github.com/pingcap/tidb/br/pkg/storage" + cerror "github.com/pingcap/tiflow/pkg/errors" ) // InitS3storage init a storage used for s3, diff --git a/cdc/redo/convert.go b/cdc/redo/convert.go index 2f62ebee206..4d18ab8ca50 100644 --- a/cdc/redo/convert.go +++ b/cdc/redo/convert.go @@ -16,8 +16,8 @@ package redo import ( "bytes" - "github.com/pingcap/ticdc/cdc/model" pmodel "github.com/pingcap/tidb/parser/model" + "github.com/pingcap/tiflow/cdc/model" ) // RowToRedo converts row changed event to redo log row diff --git a/cdc/redo/convert_test.go b/cdc/redo/convert_test.go index 3b1fe695be0..2db1303922f 100644 --- a/cdc/redo/convert_test.go +++ b/cdc/redo/convert_test.go @@ -16,9 +16,9 @@ package redo import ( "testing" - "github.com/pingcap/ticdc/cdc/model" timodel "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/parser/mysql" + "github.com/pingcap/tiflow/cdc/model" "github.com/stretchr/testify/require" ) diff --git a/cdc/redo/manager.go b/cdc/redo/manager.go index 94553c9db8b..886cd781f0f 100644 --- a/cdc/redo/manager.go +++ b/cdc/redo/manager.go @@ -23,12 +23,12 @@ import ( "time" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/redo/writer" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/util" "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/redo/writer" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/util" "go.uber.org/zap" ) diff --git a/cdc/redo/manager_test.go b/cdc/redo/manager_test.go index 18a5f9fb48e..72b51731d5d 100644 --- a/cdc/redo/manager_test.go +++ b/cdc/redo/manager_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" "github.com/stretchr/testify/require" ) diff --git a/cdc/redo/reader/blackhole_reader.go b/cdc/redo/reader/blackhole_reader.go index 97db8592c6b..724ea6a0a3e 100644 --- a/cdc/redo/reader/blackhole_reader.go +++ b/cdc/redo/reader/blackhole_reader.go @@ -16,7 +16,7 @@ package reader import ( "context" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" ) // BlackHoleReader is a blockHole storage which implements LogReader interface diff --git a/cdc/redo/reader/file.go b/cdc/redo/reader/file.go index d809feb5b9f..976d4a474a5 100644 --- a/cdc/redo/reader/file.go +++ b/cdc/redo/reader/file.go @@ -29,11 +29,11 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/redo/common" - "github.com/pingcap/ticdc/cdc/redo/writer" - cerror "github.com/pingcap/ticdc/pkg/errors" "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/redo/common" + "github.com/pingcap/tiflow/cdc/redo/writer" + cerror "github.com/pingcap/tiflow/pkg/errors" "go.uber.org/multierr" "go.uber.org/zap" "golang.org/x/sync/errgroup" diff --git a/cdc/redo/reader/file_test.go b/cdc/redo/reader/file_test.go index 0de8bc77295..47c55dbf303 100644 --- a/cdc/redo/reader/file_test.go +++ b/cdc/redo/reader/file_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/redo/common" - "github.com/pingcap/ticdc/cdc/redo/writer" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/redo/common" + "github.com/pingcap/tiflow/cdc/redo/writer" + "github.com/pingcap/tiflow/pkg/leakutil" "github.com/stretchr/testify/require" "golang.org/x/net/context" ) diff --git a/cdc/redo/reader/mock_RedoLogReader.go b/cdc/redo/reader/mock_RedoLogReader.go index d949a3194f8..484c735046d 100644 --- a/cdc/redo/reader/mock_RedoLogReader.go +++ b/cdc/redo/reader/mock_RedoLogReader.go @@ -18,7 +18,7 @@ package reader import ( context "context" - model "github.com/pingcap/ticdc/cdc/model" + model "github.com/pingcap/tiflow/cdc/model" mock "github.com/stretchr/testify/mock" ) diff --git a/cdc/redo/reader/mock_fileReader.go b/cdc/redo/reader/mock_fileReader.go index de323d8e270..3339fb7237a 100644 --- a/cdc/redo/reader/mock_fileReader.go +++ b/cdc/redo/reader/mock_fileReader.go @@ -16,7 +16,7 @@ package reader import ( - model "github.com/pingcap/ticdc/cdc/model" + model "github.com/pingcap/tiflow/cdc/model" mock "github.com/stretchr/testify/mock" ) diff --git a/cdc/redo/reader/reader.go b/cdc/redo/reader/reader.go index 339c5184956..e1c88491ddc 100644 --- a/cdc/redo/reader/reader.go +++ b/cdc/redo/reader/reader.go @@ -24,9 +24,9 @@ import ( "sync" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/redo/common" - cerror "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/redo/common" + cerror "github.com/pingcap/tiflow/pkg/errors" "go.uber.org/multierr" ) diff --git a/cdc/redo/reader/reader_test.go b/cdc/redo/reader/reader_test.go index 2d89bafe5ab..dd963d7cf55 100644 --- a/cdc/redo/reader/reader_test.go +++ b/cdc/redo/reader/reader_test.go @@ -26,11 +26,11 @@ import ( "github.com/golang/mock/gomock" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/redo/common" - "github.com/pingcap/ticdc/cdc/redo/writer" mockstorage "github.com/pingcap/tidb/br/pkg/mock/storage" "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/redo/common" + "github.com/pingcap/tiflow/cdc/redo/writer" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" "go.uber.org/multierr" diff --git a/cdc/redo/writer/blackhole_writer.go b/cdc/redo/writer/blackhole_writer.go index 9accc98086b..6682edef6f3 100644 --- a/cdc/redo/writer/blackhole_writer.go +++ b/cdc/redo/writer/blackhole_writer.go @@ -18,7 +18,7 @@ import ( "sync" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" "go.uber.org/zap" ) diff --git a/cdc/redo/writer/file.go b/cdc/redo/writer/file.go index d307f98f45c..86a636af3d1 100644 --- a/cdc/redo/writer/file.go +++ b/cdc/redo/writer/file.go @@ -28,9 +28,9 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/redo/common" - cerror "github.com/pingcap/ticdc/pkg/errors" "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tiflow/cdc/redo/common" + cerror "github.com/pingcap/tiflow/pkg/errors" "github.com/uber-go/atomic" pioutil "go.etcd.io/etcd/pkg/ioutil" "go.uber.org/multierr" diff --git a/cdc/redo/writer/file_test.go b/cdc/redo/writer/file_test.go index ad3a7f7bdb7..e71b814d553 100644 --- a/cdc/redo/writer/file_test.go +++ b/cdc/redo/writer/file_test.go @@ -25,9 +25,9 @@ import ( "github.com/golang/mock/gomock" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/redo/common" - "github.com/pingcap/ticdc/pkg/leakutil" mockstorage "github.com/pingcap/tidb/br/pkg/mock/storage" + "github.com/pingcap/tiflow/cdc/redo/common" + "github.com/pingcap/tiflow/pkg/leakutil" "github.com/stretchr/testify/require" "github.com/uber-go/atomic" ) diff --git a/cdc/redo/writer/mock_RedoLogWriter.go b/cdc/redo/writer/mock_RedoLogWriter.go index 3b7416888fa..361aa6f61ab 100644 --- a/cdc/redo/writer/mock_RedoLogWriter.go +++ b/cdc/redo/writer/mock_RedoLogWriter.go @@ -18,7 +18,7 @@ package writer import ( context "context" - model "github.com/pingcap/ticdc/cdc/model" + model "github.com/pingcap/tiflow/cdc/model" mock "github.com/stretchr/testify/mock" ) diff --git a/cdc/redo/writer/writer.go b/cdc/redo/writer/writer.go index 37b019c0742..fceb3de233b 100644 --- a/cdc/redo/writer/writer.go +++ b/cdc/redo/writer/writer.go @@ -28,10 +28,10 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/redo/common" - cerror "github.com/pingcap/ticdc/pkg/errors" "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/redo/common" + cerror "github.com/pingcap/tiflow/pkg/errors" "go.uber.org/multierr" "go.uber.org/zap" "golang.org/x/sync/errgroup" diff --git a/cdc/redo/writer/writer_test.go b/cdc/redo/writer/writer_test.go index bd7432ca49a..618281b5537 100644 --- a/cdc/redo/writer/writer_test.go +++ b/cdc/redo/writer/writer_test.go @@ -28,10 +28,10 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/golang/mock/gomock" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/redo/common" - cerror "github.com/pingcap/ticdc/pkg/errors" mockstorage "github.com/pingcap/tidb/br/pkg/mock/storage" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/redo/common" + cerror "github.com/pingcap/tiflow/pkg/errors" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" "go.uber.org/multierr" diff --git a/cdc/server.go b/cdc/server.go index 06ace4658ff..9decacdbd77 100644 --- a/cdc/server.go +++ b/cdc/server.go @@ -24,16 +24,16 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/capture" - "github.com/pingcap/ticdc/cdc/kv" - "github.com/pingcap/ticdc/cdc/sorter/unified" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/httputil" - "github.com/pingcap/ticdc/pkg/util" - "github.com/pingcap/ticdc/pkg/version" tidbkv "github.com/pingcap/tidb/kv" + "github.com/pingcap/tiflow/cdc/capture" + "github.com/pingcap/tiflow/cdc/kv" + "github.com/pingcap/tiflow/cdc/sorter/unified" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/httputil" + "github.com/pingcap/tiflow/pkg/util" + "github.com/pingcap/tiflow/pkg/version" "github.com/prometheus/client_golang/prometheus" pd "github.com/tikv/pd/client" "go.etcd.io/etcd/clientv3" diff --git a/cdc/server_test.go b/cdc/server_test.go index 0ff6241080d..5fdbe3c785f 100644 --- a/cdc/server_test.go +++ b/cdc/server_test.go @@ -20,11 +20,11 @@ import ( "time" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/util" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/util" + "github.com/pingcap/tiflow/pkg/util/testleak" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/embed" "golang.org/x/sync/errgroup" diff --git a/cdc/sink/black_hole.go b/cdc/sink/black_hole.go index 3eca14a0119..42e623422f7 100644 --- a/cdc/sink/black_hole.go +++ b/cdc/sink/black_hole.go @@ -18,7 +18,7 @@ import ( "sync/atomic" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" "go.uber.org/zap" ) diff --git a/cdc/sink/buffer_sink.go b/cdc/sink/buffer_sink.go index d8d70456ca7..73cc3be0b9d 100644 --- a/cdc/sink/buffer_sink.go +++ b/cdc/sink/buffer_sink.go @@ -22,8 +22,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util" "go.uber.org/zap" ) diff --git a/cdc/sink/causality.go b/cdc/sink/causality.go index 0a9377c36e2..0d7c0389735 100644 --- a/cdc/sink/causality.go +++ b/cdc/sink/causality.go @@ -19,7 +19,7 @@ import ( "github.com/pingcap/log" "go.uber.org/zap" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" ) // causality provides a simple mechanism to improve the concurrency of SQLs execution under the premise of ensuring correctness. diff --git a/cdc/sink/causality_test.go b/cdc/sink/causality_test.go index e7a14ecc008..06dbdd1e5da 100644 --- a/cdc/sink/causality_test.go +++ b/cdc/sink/causality_test.go @@ -18,9 +18,9 @@ import ( "sort" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" "github.com/pingcap/tidb/parser/mysql" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type testCausalitySuite struct{} diff --git a/cdc/sink/cdclog/file.go b/cdc/sink/cdclog/file.go index c6794b3c6e2..ee57b4e3450 100644 --- a/cdc/sink/cdclog/file.go +++ b/cdc/sink/cdclog/file.go @@ -21,11 +21,11 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sink/codec" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/quotes" parsemodel "github.com/pingcap/tidb/parser/model" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sink/codec" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/quotes" "github.com/uber-go/atomic" "go.uber.org/zap" ) diff --git a/cdc/sink/cdclog/s3.go b/cdc/sink/cdclog/s3.go index f76d6c23946..2b6da88cb1f 100644 --- a/cdc/sink/cdclog/s3.go +++ b/cdc/sink/cdclog/s3.go @@ -22,12 +22,12 @@ import ( "github.com/pingcap/errors" backup "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sink/codec" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/quotes" "github.com/pingcap/tidb/br/pkg/storage" parsemodel "github.com/pingcap/tidb/parser/model" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sink/codec" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/quotes" "github.com/uber-go/atomic" "go.uber.org/zap" ) diff --git a/cdc/sink/cdclog/utils.go b/cdc/sink/cdclog/utils.go index f2b351ca836..4c328cd4c6f 100644 --- a/cdc/sink/cdclog/utils.go +++ b/cdc/sink/cdclog/utils.go @@ -21,10 +21,10 @@ import ( "time" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sink/codec" - "github.com/pingcap/ticdc/pkg/quotes" "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sink/codec" + "github.com/pingcap/tiflow/pkg/quotes" "github.com/uber-go/atomic" "go.uber.org/zap" "golang.org/x/sync/errgroup" diff --git a/cdc/sink/codec/avro.go b/cdc/sink/codec/avro.go index eed118c3ce8..cb6ed9e9952 100644 --- a/cdc/sink/codec/avro.go +++ b/cdc/sink/codec/avro.go @@ -26,12 +26,12 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/security" - "github.com/pingcap/ticdc/pkg/util" "github.com/pingcap/tidb/parser/mysql" "github.com/pingcap/tidb/types" + "github.com/pingcap/tiflow/cdc/model" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/security" + "github.com/pingcap/tiflow/pkg/util" "go.uber.org/zap" ) diff --git a/cdc/sink/codec/avro_test.go b/cdc/sink/codec/avro_test.go index 4b0290fa726..0d243110359 100644 --- a/cdc/sink/codec/avro_test.go +++ b/cdc/sink/codec/avro_test.go @@ -21,14 +21,14 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/puller" - "github.com/pingcap/ticdc/pkg/regionspan" - "github.com/pingcap/ticdc/pkg/security" - "github.com/pingcap/ticdc/pkg/util/testleak" model2 "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/parser/mysql" "github.com/pingcap/tidb/types" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/puller" + "github.com/pingcap/tiflow/pkg/regionspan" + "github.com/pingcap/tiflow/pkg/security" + "github.com/pingcap/tiflow/pkg/util/testleak" "go.uber.org/zap" ) diff --git a/cdc/sink/codec/canal.go b/cdc/sink/codec/canal.go index 91427c9bb8d..089103d2f8d 100644 --- a/cdc/sink/codec/canal.go +++ b/cdc/sink/codec/canal.go @@ -22,12 +22,12 @@ import ( "github.com/golang/protobuf/proto" // nolint:staticcheck "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cerror "github.com/pingcap/ticdc/pkg/errors" - canal "github.com/pingcap/ticdc/proto/canal" mm "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/parser/mysql" parser_types "github.com/pingcap/tidb/parser/types" + "github.com/pingcap/tiflow/cdc/model" + cerror "github.com/pingcap/tiflow/pkg/errors" + canal "github.com/pingcap/tiflow/proto/canal" "go.uber.org/zap" "golang.org/x/text/encoding" "golang.org/x/text/encoding/charmap" diff --git a/cdc/sink/codec/canal_flat.go b/cdc/sink/codec/canal_flat.go index 5929488db07..93579556ecd 100644 --- a/cdc/sink/codec/canal_flat.go +++ b/cdc/sink/codec/canal_flat.go @@ -19,9 +19,9 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cerrors "github.com/pingcap/ticdc/pkg/errors" - canal "github.com/pingcap/ticdc/proto/canal" + "github.com/pingcap/tiflow/cdc/model" + cerrors "github.com/pingcap/tiflow/pkg/errors" + canal "github.com/pingcap/tiflow/proto/canal" "go.uber.org/zap" ) diff --git a/cdc/sink/codec/canal_flat_test.go b/cdc/sink/codec/canal_flat_test.go index 14df059e673..0d6cbb7531b 100644 --- a/cdc/sink/codec/canal_flat_test.go +++ b/cdc/sink/codec/canal_flat_test.go @@ -17,10 +17,10 @@ import ( "encoding/json" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" mm "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/parser/mysql" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" "golang.org/x/text/encoding/charmap" ) diff --git a/cdc/sink/codec/canal_test.go b/cdc/sink/codec/canal_test.go index 770861c568a..bf8f0fa113d 100644 --- a/cdc/sink/codec/canal_test.go +++ b/cdc/sink/codec/canal_test.go @@ -20,9 +20,9 @@ import ( "github.com/pingcap/tidb/parser/mysql" "golang.org/x/text/encoding/charmap" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" - canal "github.com/pingcap/ticdc/proto/canal" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" + canal "github.com/pingcap/tiflow/proto/canal" ) type canalBatchSuite struct { diff --git a/cdc/sink/codec/codec_test.go b/cdc/sink/codec/codec_test.go index 75b55d31846..57744272290 100644 --- a/cdc/sink/codec/codec_test.go +++ b/cdc/sink/codec/codec_test.go @@ -19,11 +19,11 @@ import ( "testing" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sink/codec/craft" - "github.com/pingcap/ticdc/pkg/util/testleak" - "github.com/pingcap/ticdc/proto/benchmark" "github.com/pingcap/tidb/parser/mysql" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sink/codec/craft" + "github.com/pingcap/tiflow/pkg/util/testleak" + "github.com/pingcap/tiflow/proto/benchmark" ) var ( diff --git a/cdc/sink/codec/craft.go b/cdc/sink/codec/craft.go index 2766f12950b..5245e3e7e4e 100644 --- a/cdc/sink/codec/craft.go +++ b/cdc/sink/codec/craft.go @@ -19,9 +19,9 @@ import ( "strconv" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sink/codec/craft" - cerror "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sink/codec/craft" + cerror "github.com/pingcap/tiflow/pkg/errors" ) // CraftEventBatchEncoder encodes the events into the byte of a batch into craft binary format. diff --git a/cdc/sink/codec/craft/codec_test.go b/cdc/sink/codec/craft/codec_test.go index 38221a136bc..7da187c3f2a 100644 --- a/cdc/sink/codec/craft/codec_test.go +++ b/cdc/sink/codec/craft/codec_test.go @@ -19,7 +19,7 @@ import ( "time" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" ) func init() { diff --git a/cdc/sink/codec/craft/decoder.go b/cdc/sink/codec/craft/decoder.go index 66a947bf7e0..6295d7586d6 100644 --- a/cdc/sink/codec/craft/decoder.go +++ b/cdc/sink/codec/craft/decoder.go @@ -19,10 +19,10 @@ import ( "unsafe" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - cerror "github.com/pingcap/ticdc/pkg/errors" pmodel "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/parser/mysql" + "github.com/pingcap/tiflow/cdc/model" + cerror "github.com/pingcap/tiflow/pkg/errors" ) /// create string from byte slice without copying diff --git a/cdc/sink/codec/craft/encoder.go b/cdc/sink/codec/craft/encoder.go index 267fb262560..69938f99a27 100644 --- a/cdc/sink/codec/craft/encoder.go +++ b/cdc/sink/codec/craft/encoder.go @@ -18,8 +18,8 @@ import ( "math" "unsafe" - "github.com/pingcap/ticdc/cdc/model" "github.com/pingcap/tidb/parser/mysql" + "github.com/pingcap/tiflow/cdc/model" ) // create byte slice from string without copying diff --git a/cdc/sink/codec/craft/model.go b/cdc/sink/codec/craft/model.go index a6b51aaa418..9854d6be456 100644 --- a/cdc/sink/codec/craft/model.go +++ b/cdc/sink/codec/craft/model.go @@ -15,8 +15,8 @@ package craft import ( "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - cerror "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/cdc/model" + cerror "github.com/pingcap/tiflow/pkg/errors" ) const ( diff --git a/cdc/sink/codec/craft_test.go b/cdc/sink/codec/craft_test.go index 91e7410f1e6..e981e775f97 100644 --- a/cdc/sink/codec/craft_test.go +++ b/cdc/sink/codec/craft_test.go @@ -18,9 +18,9 @@ import ( "strconv" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" "github.com/pingcap/tidb/parser/mysql" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type craftBatchSuite struct { diff --git a/cdc/sink/codec/interface.go b/cdc/sink/codec/interface.go index 45d56ff1d9a..d97c5965119 100644 --- a/cdc/sink/codec/interface.go +++ b/cdc/sink/codec/interface.go @@ -20,8 +20,8 @@ import ( "time" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/security" "github.com/tikv/client-go/v2/oracle" "go.uber.org/zap" ) diff --git a/cdc/sink/codec/interface_test.go b/cdc/sink/codec/interface_test.go index 6c28b52fb78..f82b4fb49bc 100644 --- a/cdc/sink/codec/interface_test.go +++ b/cdc/sink/codec/interface_test.go @@ -15,11 +15,11 @@ package codec import ( "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" timodel "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/parser/mysql" "github.com/pingcap/tidb/parser/types" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type codecInterfaceSuite struct{} diff --git a/cdc/sink/codec/json.go b/cdc/sink/codec/json.go index 723ef7853dd..f768b1de758 100644 --- a/cdc/sink/codec/json.go +++ b/cdc/sink/codec/json.go @@ -25,12 +25,12 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - cerror "github.com/pingcap/ticdc/pkg/errors" timodel "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/parser/mysql" + cerror "github.com/pingcap/tiflow/pkg/errors" "go.uber.org/zap" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" ) const ( diff --git a/cdc/sink/codec/json_test.go b/cdc/sink/codec/json_test.go index 461524de463..7f02c564904 100644 --- a/cdc/sink/codec/json_test.go +++ b/cdc/sink/codec/json_test.go @@ -20,9 +20,9 @@ import ( "testing" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" "github.com/pingcap/tidb/parser/mysql" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" ) func Test(t *testing.T) { check.TestingT(t) } diff --git a/cdc/sink/codec/maxwell.go b/cdc/sink/codec/maxwell.go index 9be0f7ba305..d6e54c72448 100644 --- a/cdc/sink/codec/maxwell.go +++ b/cdc/sink/codec/maxwell.go @@ -20,10 +20,10 @@ import ( "encoding/json" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - cerror "github.com/pingcap/ticdc/pkg/errors" model2 "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/parser/mysql" + "github.com/pingcap/tiflow/cdc/model" + cerror "github.com/pingcap/tiflow/pkg/errors" "github.com/tikv/pd/pkg/tsoutil" ) diff --git a/cdc/sink/codec/maxwell_test.go b/cdc/sink/codec/maxwell_test.go index f624efc453d..5e6fea4a58e 100644 --- a/cdc/sink/codec/maxwell_test.go +++ b/cdc/sink/codec/maxwell_test.go @@ -15,8 +15,8 @@ package codec import ( "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type maxwellbatchSuite struct { diff --git a/cdc/sink/codec/schema_registry.go b/cdc/sink/codec/schema_registry.go index 24b166cd21f..bca5cf6b57d 100644 --- a/cdc/sink/codec/schema_registry.go +++ b/cdc/sink/codec/schema_registry.go @@ -29,10 +29,10 @@ import ( "github.com/linkedin/goavro/v2" "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/httputil" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/cdc/model" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/httputil" + "github.com/pingcap/tiflow/pkg/security" "go.uber.org/zap" ) diff --git a/cdc/sink/codec/schema_registry_test.go b/cdc/sink/codec/schema_registry_test.go index b6bc5795b5b..57759e07b66 100644 --- a/cdc/sink/codec/schema_registry_test.go +++ b/cdc/sink/codec/schema_registry_test.go @@ -25,9 +25,9 @@ import ( "github.com/jarcoal/httpmock" "github.com/linkedin/goavro/v2" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/security" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/security" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type AvroSchemaRegistrySuite struct{} diff --git a/cdc/sink/common/common.go b/cdc/sink/common/common.go index 844e2f0bedd..cf018a7c8b5 100644 --- a/cdc/sink/common/common.go +++ b/cdc/sink/common/common.go @@ -19,8 +19,8 @@ import ( "sync/atomic" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/filter" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/filter" "go.uber.org/zap" ) diff --git a/cdc/sink/common/common_test.go b/cdc/sink/common/common_test.go index 28a87086337..4cadba85e56 100644 --- a/cdc/sink/common/common_test.go +++ b/cdc/sink/common/common_test.go @@ -19,8 +19,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type SinkCommonSuite struct{} diff --git a/cdc/sink/common/flow_control.go b/cdc/sink/common/flow_control.go index a008d58b25a..9a13cc38389 100644 --- a/cdc/sink/common/flow_control.go +++ b/cdc/sink/common/flow_control.go @@ -20,7 +20,7 @@ import ( "github.com/edwingeng/deque" "github.com/pingcap/errors" "github.com/pingcap/log" - cerrors "github.com/pingcap/ticdc/pkg/errors" + cerrors "github.com/pingcap/tiflow/pkg/errors" "go.uber.org/zap" ) diff --git a/cdc/sink/common/flow_control_test.go b/cdc/sink/common/flow_control_test.go index 1b002f45000..d7c9dbefe26 100644 --- a/cdc/sink/common/flow_control_test.go +++ b/cdc/sink/common/flow_control_test.go @@ -22,7 +22,7 @@ import ( "time" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" "golang.org/x/sync/errgroup" ) diff --git a/cdc/sink/dispatcher/default.go b/cdc/sink/dispatcher/default.go index 741f0cad3f2..31d75eb0abd 100644 --- a/cdc/sink/dispatcher/default.go +++ b/cdc/sink/dispatcher/default.go @@ -14,7 +14,7 @@ package dispatcher import ( - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" ) type defaultDispatcher struct { diff --git a/cdc/sink/dispatcher/default_test.go b/cdc/sink/dispatcher/default_test.go index eb2d13540e7..93fe3952af1 100644 --- a/cdc/sink/dispatcher/default_test.go +++ b/cdc/sink/dispatcher/default_test.go @@ -15,8 +15,8 @@ package dispatcher import ( "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type DefaultDispatcherSuite struct{} diff --git a/cdc/sink/dispatcher/dispatcher.go b/cdc/sink/dispatcher/dispatcher.go index 7d6f86873c3..6b4818295d1 100644 --- a/cdc/sink/dispatcher/dispatcher.go +++ b/cdc/sink/dispatcher/dispatcher.go @@ -17,10 +17,10 @@ import ( "strings" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" filter "github.com/pingcap/tidb-tools/pkg/table-filter" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" "go.uber.org/zap" ) diff --git a/cdc/sink/dispatcher/index_value.go b/cdc/sink/dispatcher/index_value.go index e9824fc2808..79913bc636c 100644 --- a/cdc/sink/dispatcher/index_value.go +++ b/cdc/sink/dispatcher/index_value.go @@ -14,8 +14,8 @@ package dispatcher import ( - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/hash" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/hash" ) type indexValueDispatcher struct { diff --git a/cdc/sink/dispatcher/index_value_test.go b/cdc/sink/dispatcher/index_value_test.go index cbbffbaca90..5f0890885c2 100644 --- a/cdc/sink/dispatcher/index_value_test.go +++ b/cdc/sink/dispatcher/index_value_test.go @@ -15,8 +15,8 @@ package dispatcher import ( "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type IndexValueDispatcherSuite struct{} diff --git a/cdc/sink/dispatcher/switcher_test.go b/cdc/sink/dispatcher/switcher_test.go index e6fc8d7c984..6f3caf20143 100644 --- a/cdc/sink/dispatcher/switcher_test.go +++ b/cdc/sink/dispatcher/switcher_test.go @@ -15,9 +15,9 @@ package dispatcher import ( "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type SwitcherSuite struct{} diff --git a/cdc/sink/dispatcher/table.go b/cdc/sink/dispatcher/table.go index 28d4c04d464..98617f7ce22 100644 --- a/cdc/sink/dispatcher/table.go +++ b/cdc/sink/dispatcher/table.go @@ -14,8 +14,8 @@ package dispatcher import ( - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/hash" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/hash" ) type tableDispatcher struct { diff --git a/cdc/sink/dispatcher/table_test.go b/cdc/sink/dispatcher/table_test.go index 5aeb9d80936..9b2f17c4108 100644 --- a/cdc/sink/dispatcher/table_test.go +++ b/cdc/sink/dispatcher/table_test.go @@ -15,8 +15,8 @@ package dispatcher import ( "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type TableDispatcherSuite struct{} diff --git a/cdc/sink/dispatcher/ts.go b/cdc/sink/dispatcher/ts.go index 06d1fb1634a..e061734d210 100644 --- a/cdc/sink/dispatcher/ts.go +++ b/cdc/sink/dispatcher/ts.go @@ -13,7 +13,7 @@ package dispatcher -import "github.com/pingcap/ticdc/cdc/model" +import "github.com/pingcap/tiflow/cdc/model" type tsDispatcher struct { partitionNum int32 diff --git a/cdc/sink/dispatcher/ts_test.go b/cdc/sink/dispatcher/ts_test.go index 31099f6067a..f4eac2471bb 100644 --- a/cdc/sink/dispatcher/ts_test.go +++ b/cdc/sink/dispatcher/ts_test.go @@ -17,8 +17,8 @@ import ( "testing" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" ) func Test(t *testing.T) { check.TestingT(t) } diff --git a/cdc/sink/manager.go b/cdc/sink/manager.go index 8df65c0d9b0..dd09ccd412c 100644 --- a/cdc/sink/manager.go +++ b/cdc/sink/manager.go @@ -22,8 +22,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - redo "github.com/pingcap/ticdc/cdc/redo" + "github.com/pingcap/tiflow/cdc/model" + redo "github.com/pingcap/tiflow/cdc/redo" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/cdc/sink/manager_test.go b/cdc/sink/manager_test.go index 29ea4bd83d2..912100b9eb6 100644 --- a/cdc/sink/manager_test.go +++ b/cdc/sink/manager_test.go @@ -24,9 +24,9 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/redo" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/redo" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type managerSuite struct{} @@ -251,7 +251,7 @@ func (s *managerSuite) TestManagerDestroyTableSink(c *check.C) { } // Run the benchmark -// go test -benchmem -run='^$' -bench '^(BenchmarkManagerFlushing)$' github.com/pingcap/ticdc/cdc/sink +// go test -benchmem -run='^$' -bench '^(BenchmarkManagerFlushing)$' github.com/pingcap/tiflow/cdc/sink func BenchmarkManagerFlushing(b *testing.B) { ctx, cancel := context.WithCancel(context.Background()) errCh := make(chan error, 16) diff --git a/cdc/sink/mq.go b/cdc/sink/mq.go index 5a2bf4edbac..df5128ea42f 100644 --- a/cdc/sink/mq.go +++ b/cdc/sink/mq.go @@ -22,17 +22,17 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sink/codec" - "github.com/pingcap/ticdc/cdc/sink/dispatcher" - "github.com/pingcap/ticdc/cdc/sink/producer" - "github.com/pingcap/ticdc/cdc/sink/producer/kafka" - "github.com/pingcap/ticdc/cdc/sink/producer/pulsar" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/filter" - "github.com/pingcap/ticdc/pkg/notify" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sink/codec" + "github.com/pingcap/tiflow/cdc/sink/dispatcher" + "github.com/pingcap/tiflow/cdc/sink/producer" + "github.com/pingcap/tiflow/cdc/sink/producer/kafka" + "github.com/pingcap/tiflow/cdc/sink/producer/pulsar" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/filter" + "github.com/pingcap/tiflow/pkg/notify" + "github.com/pingcap/tiflow/pkg/security" "go.uber.org/zap" "golang.org/x/sync/errgroup" ) diff --git a/cdc/sink/mq_test.go b/cdc/sink/mq_test.go index b3f80867a59..c94152b7e05 100644 --- a/cdc/sink/mq_test.go +++ b/cdc/sink/mq_test.go @@ -19,16 +19,16 @@ import ( "net/url" "github.com/pingcap/failpoint" - "github.com/pingcap/ticdc/cdc/sink/codec" + "github.com/pingcap/tiflow/cdc/sink/codec" "github.com/Shopify/sarama" "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/filter" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/filter" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type mqSinkSuite struct{} @@ -199,7 +199,7 @@ func (s mqSinkSuite) TestPulsarSinkEncoderConfig(c *check.C) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() - err := failpoint.Enable("github.com/pingcap/ticdc/cdc/sink/producer/pulsar/MockPulsar", "return(true)") + err := failpoint.Enable("github.com/pingcap/tiflow/cdc/sink/producer/pulsar/MockPulsar", "return(true)") c.Assert(err, check.IsNil) uri := "pulsar://127.0.0.1:1234/kafka-test?" + diff --git a/cdc/sink/mysql.go b/cdc/sink/mysql.go index b74efd48736..d0704ba8a92 100644 --- a/cdc/sink/mysql.go +++ b/cdc/sink/mysql.go @@ -29,23 +29,23 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sink/common" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/cyclic" - "github.com/pingcap/ticdc/pkg/cyclic/mark" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/filter" - tifilter "github.com/pingcap/ticdc/pkg/filter" - "github.com/pingcap/ticdc/pkg/notify" - "github.com/pingcap/ticdc/pkg/quotes" - "github.com/pingcap/ticdc/pkg/retry" - "github.com/pingcap/ticdc/pkg/security" - "github.com/pingcap/ticdc/pkg/util" tddl "github.com/pingcap/tidb/ddl" "github.com/pingcap/tidb/infoschema" timodel "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/parser/mysql" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sink/common" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/cyclic" + "github.com/pingcap/tiflow/pkg/cyclic/mark" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/filter" + tifilter "github.com/pingcap/tiflow/pkg/filter" + "github.com/pingcap/tiflow/pkg/notify" + "github.com/pingcap/tiflow/pkg/quotes" + "github.com/pingcap/tiflow/pkg/retry" + "github.com/pingcap/tiflow/pkg/security" + "github.com/pingcap/tiflow/pkg/util" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/cdc/sink/mysql_test.go b/cdc/sink/mysql_test.go index 8a9ad5b1a31..bc242861eba 100644 --- a/cdc/sink/mysql_test.go +++ b/cdc/sink/mysql_test.go @@ -31,18 +31,18 @@ import ( dmysql "github.com/go-sql-driver/mysql" "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sink/common" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/cyclic/mark" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/filter" - "github.com/pingcap/ticdc/pkg/notify" - "github.com/pingcap/ticdc/pkg/retry" - "github.com/pingcap/ticdc/pkg/util/testleak" "github.com/pingcap/tidb/infoschema" timodel "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/parser/mysql" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sink/common" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/cyclic/mark" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/filter" + "github.com/pingcap/tiflow/pkg/notify" + "github.com/pingcap/tiflow/pkg/retry" + "github.com/pingcap/tiflow/pkg/util/testleak" "golang.org/x/sync/errgroup" ) diff --git a/cdc/sink/producer/kafka/kafka.go b/cdc/sink/producer/kafka/kafka.go index e718f543dcc..9b9fc650992 100644 --- a/cdc/sink/producer/kafka/kafka.go +++ b/cdc/sink/producer/kafka/kafka.go @@ -28,12 +28,12 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/sink/codec" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/notify" - "github.com/pingcap/ticdc/pkg/security" - "github.com/pingcap/ticdc/pkg/util" + "github.com/pingcap/tiflow/cdc/sink/codec" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/notify" + "github.com/pingcap/tiflow/pkg/security" + "github.com/pingcap/tiflow/pkg/util" "go.uber.org/zap" ) @@ -550,7 +550,7 @@ func newSaramaConfig(ctx context.Context, c *Config) (*sarama.Config, error) { // Metadata.Retry.Backoff * Metadata.Retry.Max` // to fail. // See: https://github.com/Shopify/sarama/issues/765 - // and https://github.com/pingcap/ticdc/issues/3352. + // and https://github.com/pingcap/tiflow/issues/3352. config.Metadata.Timeout = 1 * time.Minute config.Producer.Partitioner = sarama.NewManualPartitioner diff --git a/cdc/sink/producer/kafka/kafka_test.go b/cdc/sink/producer/kafka/kafka_test.go index b4f72df36bd..2206b96d582 100644 --- a/cdc/sink/producer/kafka/kafka_test.go +++ b/cdc/sink/producer/kafka/kafka_test.go @@ -24,12 +24,12 @@ import ( "github.com/Shopify/sarama" "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/sink/codec" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/security" - "github.com/pingcap/ticdc/pkg/util" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/sink/codec" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/security" + "github.com/pingcap/tiflow/pkg/util" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type kafkaSuite struct{} diff --git a/cdc/sink/producer/mq_producer.go b/cdc/sink/producer/mq_producer.go index 380065b679b..7e9664f61ed 100644 --- a/cdc/sink/producer/mq_producer.go +++ b/cdc/sink/producer/mq_producer.go @@ -16,7 +16,7 @@ package producer import ( "context" - "github.com/pingcap/ticdc/cdc/sink/codec" + "github.com/pingcap/tiflow/cdc/sink/codec" ) // Producer is an interface of mq producer diff --git a/cdc/sink/producer/pulsar/producer.go b/cdc/sink/producer/pulsar/producer.go index 26cb6c3485a..bf9664d2dce 100644 --- a/cdc/sink/producer/pulsar/producer.go +++ b/cdc/sink/producer/pulsar/producer.go @@ -21,8 +21,8 @@ import ( "github.com/apache/pulsar-client-go/pulsar" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/sink/codec" - cerror "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/cdc/sink/codec" + cerror "github.com/pingcap/tiflow/pkg/errors" "go.uber.org/zap" ) diff --git a/cdc/sink/simple_mysql_tester.go b/cdc/sink/simple_mysql_tester.go index 3b3d7edc885..2bb46c14bb9 100644 --- a/cdc/sink/simple_mysql_tester.go +++ b/cdc/sink/simple_mysql_tester.go @@ -25,11 +25,11 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/filter" - "github.com/pingcap/ticdc/pkg/quotes" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/filter" + "github.com/pingcap/tiflow/pkg/quotes" "go.uber.org/zap" ) diff --git a/cdc/sink/sink.go b/cdc/sink/sink.go index c5d7cd18ca0..155012bc28a 100644 --- a/cdc/sink/sink.go +++ b/cdc/sink/sink.go @@ -18,11 +18,11 @@ import ( "net/url" "strings" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sink/cdclog" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/filter" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sink/cdclog" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/filter" ) // Sink options keys diff --git a/cdc/sink/sink_test.go b/cdc/sink/sink_test.go index 557239a9861..ae68c9f3984 100644 --- a/cdc/sink/sink_test.go +++ b/cdc/sink/sink_test.go @@ -17,8 +17,8 @@ import ( "context" "testing" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/util/testleak" "github.com/stretchr/testify/require" ) diff --git a/cdc/sink/statistics.go b/cdc/sink/statistics.go index b09a8c988c1..26c1bad7fb4 100644 --- a/cdc/sink/statistics.go +++ b/cdc/sink/statistics.go @@ -19,7 +19,7 @@ import ( "time" "github.com/pingcap/log" - "github.com/pingcap/ticdc/pkg/util" + "github.com/pingcap/tiflow/pkg/util" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/cdc/sink/syncpointStore.go b/cdc/sink/syncpointStore.go index d20cb5e5960..230993ffbae 100644 --- a/cdc/sink/syncpointStore.go +++ b/cdc/sink/syncpointStore.go @@ -18,8 +18,8 @@ import ( "net/url" "strings" - "github.com/pingcap/ticdc/cdc/model" - cerror "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/cdc/model" + cerror "github.com/pingcap/tiflow/pkg/errors" ) // SyncpointStore is an abstraction for anything that a changefeed may emit into. diff --git a/cdc/sink/table_sink.go b/cdc/sink/table_sink.go index 1e9679c7bc4..83a1acb8c86 100644 --- a/cdc/sink/table_sink.go +++ b/cdc/sink/table_sink.go @@ -20,8 +20,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/redo" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/redo" "go.uber.org/zap" ) diff --git a/cdc/sink/txns_heap.go b/cdc/sink/txns_heap.go index a514a05dd38..16dd48e53bb 100644 --- a/cdc/sink/txns_heap.go +++ b/cdc/sink/txns_heap.go @@ -16,7 +16,7 @@ package sink import ( "container/heap" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" ) type innerTxnsHeap []innerHeapEntry diff --git a/cdc/sink/txns_heap_test.go b/cdc/sink/txns_heap_test.go index b488260419c..7084dc8ea47 100644 --- a/cdc/sink/txns_heap_test.go +++ b/cdc/sink/txns_heap_test.go @@ -15,8 +15,8 @@ package sink import ( "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type TxnsHeapSuite struct{} diff --git a/cdc/sorter/encoding/key.go b/cdc/sorter/encoding/key.go index 53a95032313..a3adf9ded5b 100644 --- a/cdc/sorter/encoding/key.go +++ b/cdc/sorter/encoding/key.go @@ -17,7 +17,7 @@ import ( "encoding/binary" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" "go.uber.org/zap" ) diff --git a/cdc/sorter/encoding/key_test.go b/cdc/sorter/encoding/key_test.go index d52d2e04aa7..f4020e8f1ac 100644 --- a/cdc/sorter/encoding/key_test.go +++ b/cdc/sorter/encoding/key_test.go @@ -17,7 +17,7 @@ import ( "bytes" "testing" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" "github.com/stretchr/testify/require" ) diff --git a/cdc/sorter/encoding/value.go b/cdc/sorter/encoding/value.go index ec976dd2eaf..f29e1c95525 100644 --- a/cdc/sorter/encoding/value.go +++ b/cdc/sorter/encoding/value.go @@ -15,7 +15,7 @@ package encoding import ( "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" ) // SerializerDeserializer is the interface encodes and decodes model.PolymorphicEvent. diff --git a/cdc/sorter/memory/entry_sorter.go b/cdc/sorter/memory/entry_sorter.go index f8132088dcf..916fad5dc32 100644 --- a/cdc/sorter/memory/entry_sorter.go +++ b/cdc/sorter/memory/entry_sorter.go @@ -22,9 +22,9 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/notify" - "github.com/pingcap/ticdc/pkg/util" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/notify" + "github.com/pingcap/tiflow/pkg/util" "go.uber.org/zap" "golang.org/x/sync/errgroup" ) diff --git a/cdc/sorter/memory/entry_sorter_test.go b/cdc/sorter/memory/entry_sorter_test.go index 55e3229bc7a..f8c608f5def 100644 --- a/cdc/sorter/memory/entry_sorter_test.go +++ b/cdc/sorter/memory/entry_sorter_test.go @@ -21,8 +21,8 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type mockEntrySorterSuite struct{} diff --git a/cdc/sorter/sorter.go b/cdc/sorter/sorter.go index 9145d5534fc..512f47b776c 100644 --- a/cdc/sorter/sorter.go +++ b/cdc/sorter/sorter.go @@ -16,7 +16,7 @@ package sorter import ( "context" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" ) // EventSorter accepts unsorted PolymorphicEvents, sort them in background and returns diff --git a/cdc/sorter/unified/backend.go b/cdc/sorter/unified/backend.go index 576747c2083..6f546bfcfab 100644 --- a/cdc/sorter/unified/backend.go +++ b/cdc/sorter/unified/backend.go @@ -13,7 +13,7 @@ package unified -import "github.com/pingcap/ticdc/cdc/model" +import "github.com/pingcap/tiflow/cdc/model" type backEnd interface { reader() (backEndReader, error) diff --git a/cdc/sorter/unified/backend_pool.go b/cdc/sorter/unified/backend_pool.go index 60375a12600..72b015d187a 100644 --- a/cdc/sorter/unified/backend_pool.go +++ b/cdc/sorter/unified/backend_pool.go @@ -27,12 +27,12 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - sorterencoding "github.com/pingcap/ticdc/cdc/sorter/encoding" - "github.com/pingcap/ticdc/pkg/config" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/filelock" - "github.com/pingcap/ticdc/pkg/util" "github.com/pingcap/tidb/util/memory" + sorterencoding "github.com/pingcap/tiflow/cdc/sorter/encoding" + "github.com/pingcap/tiflow/pkg/config" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/filelock" + "github.com/pingcap/tiflow/pkg/util" "go.uber.org/zap" ) diff --git a/cdc/sorter/unified/backend_pool_test.go b/cdc/sorter/unified/backend_pool_test.go index e616a23f4a2..0db78c71670 100644 --- a/cdc/sorter/unified/backend_pool_test.go +++ b/cdc/sorter/unified/backend_pool_test.go @@ -23,10 +23,10 @@ import ( "github.com/pingcap/check" "github.com/pingcap/failpoint" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/filelock" - "github.com/pingcap/ticdc/pkg/util/testleak" "github.com/pingcap/tidb/util/memory" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/filelock" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type backendPoolSuite struct{} @@ -51,7 +51,7 @@ func (s *backendPoolSuite) TestBasicFunction(c *check.C) { conf.Sorter.MaxMemoryConsumption = 16 * 1024 * 1024 * 1024 // 16G config.StoreGlobalServerConfig(conf) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/memoryPressureInjectPoint", "return(100)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/memoryPressureInjectPoint", "return(100)") c.Assert(err, check.IsNil) ctx, cancel := context.WithTimeout(context.Background(), time.Second*20) @@ -68,9 +68,9 @@ func (s *backendPoolSuite) TestBasicFunction(c *check.C) { fileName := backEnd.(*fileBackEnd).fileName c.Assert(fileName, check.Not(check.Equals), "") - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/memoryPressureInjectPoint", "return(0)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/memoryPressureInjectPoint", "return(0)") c.Assert(err, check.IsNil) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/memoryUsageInjectPoint", "return(34359738368)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/memoryUsageInjectPoint", "return(34359738368)") c.Assert(err, check.IsNil) backEnd1, err := backEndPool.alloc(ctx) @@ -80,9 +80,9 @@ func (s *backendPoolSuite) TestBasicFunction(c *check.C) { c.Assert(fileName1, check.Not(check.Equals), "") c.Assert(fileName1, check.Not(check.Equals), fileName) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/memoryPressureInjectPoint", "return(0)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/memoryPressureInjectPoint", "return(0)") c.Assert(err, check.IsNil) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/memoryUsageInjectPoint", "return(0)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/memoryUsageInjectPoint", "return(0)") c.Assert(err, check.IsNil) backEnd2, err := backEndPool.alloc(ctx) @@ -161,9 +161,9 @@ func (s *backendPoolSuite) TestCleanUpSelf(c *check.C) { conf.Sorter.MaxMemoryConsumption = 16 * 1024 * 1024 * 1024 // 16G config.StoreGlobalServerConfig(conf) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/memoryPressureInjectPoint", "return(100)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/memoryPressureInjectPoint", "return(100)") c.Assert(err, check.IsNil) - defer failpoint.Disable("github.com/pingcap/ticdc/cdc/sorter/unified/memoryPressureInjectPoint") //nolint:errcheck + defer failpoint.Disable("github.com/pingcap/tiflow/cdc/sorter/unified/memoryPressureInjectPoint") //nolint:errcheck backEndPool, err := newBackEndPool(sorterDir, "") c.Assert(err, check.IsNil) diff --git a/cdc/sorter/unified/file_backend.go b/cdc/sorter/unified/file_backend.go index 24ed9959163..67939cbeb10 100644 --- a/cdc/sorter/unified/file_backend.go +++ b/cdc/sorter/unified/file_backend.go @@ -23,9 +23,9 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sorter/encoding" - cerrors "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sorter/encoding" + cerrors "github.com/pingcap/tiflow/pkg/errors" "go.uber.org/zap" ) diff --git a/cdc/sorter/unified/file_backend_test.go b/cdc/sorter/unified/file_backend_test.go index 3ec9fce76da..b755dbe8871 100644 --- a/cdc/sorter/unified/file_backend_test.go +++ b/cdc/sorter/unified/file_backend_test.go @@ -18,10 +18,10 @@ import ( "os" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sorter/encoding" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sorter/encoding" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type fileBackendSuite struct{} diff --git a/cdc/sorter/unified/heap.go b/cdc/sorter/unified/heap.go index 6d75fab55fc..a8e1baec64f 100644 --- a/cdc/sorter/unified/heap.go +++ b/cdc/sorter/unified/heap.go @@ -13,7 +13,7 @@ package unified -import "github.com/pingcap/ticdc/cdc/model" +import "github.com/pingcap/tiflow/cdc/model" type sortItem struct { entry *model.PolymorphicEvent diff --git a/cdc/sorter/unified/heap_sorter.go b/cdc/sorter/unified/heap_sorter.go index a03f88d78ce..5fe35a6c5ab 100644 --- a/cdc/sorter/unified/heap_sorter.go +++ b/cdc/sorter/unified/heap_sorter.go @@ -23,11 +23,11 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/util" - "github.com/pingcap/ticdc/pkg/workerpool" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/util" + "github.com/pingcap/tiflow/pkg/workerpool" "go.uber.org/zap" ) diff --git a/cdc/sorter/unified/memory_backend.go b/cdc/sorter/unified/memory_backend.go index 27ca7f511b6..67d1ce7f3e6 100644 --- a/cdc/sorter/unified/memory_backend.go +++ b/cdc/sorter/unified/memory_backend.go @@ -18,7 +18,7 @@ import ( "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" "go.uber.org/zap" ) diff --git a/cdc/sorter/unified/memory_backend_test.go b/cdc/sorter/unified/memory_backend_test.go index d95346fa6d5..e44117665aa 100644 --- a/cdc/sorter/unified/memory_backend_test.go +++ b/cdc/sorter/unified/memory_backend_test.go @@ -19,8 +19,8 @@ import ( "time" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type memoryBackendSuite struct{} diff --git a/cdc/sorter/unified/merger.go b/cdc/sorter/unified/merger.go index 97ff7baa9ac..8be03a4db6a 100644 --- a/cdc/sorter/unified/merger.go +++ b/cdc/sorter/unified/merger.go @@ -25,10 +25,10 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/notify" - "github.com/pingcap/ticdc/pkg/util" + "github.com/pingcap/tiflow/cdc/model" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/notify" + "github.com/pingcap/tiflow/pkg/util" "github.com/tikv/client-go/v2/oracle" "go.uber.org/zap" "golang.org/x/sync/errgroup" diff --git a/cdc/sorter/unified/merger_test.go b/cdc/sorter/unified/merger_test.go index fa8813aeaec..095787189dc 100644 --- a/cdc/sorter/unified/merger_test.go +++ b/cdc/sorter/unified/merger_test.go @@ -21,8 +21,8 @@ import ( "github.com/pingcap/check" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" "go.uber.org/zap" "go.uber.org/zap/zapcore" "golang.org/x/sync/errgroup" @@ -93,7 +93,7 @@ func (b *mockFlushTaskBuilder) build() *flushTask { // It tests the most basic scenario. func (s *sorterSuite) TestMergerSingleHeap(c *check.C) { defer testleak.AfterTest(c)() - err := failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/sorterDebug", "return(true)") + err := failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/sorterDebug", "return(true)") if err != nil { log.Panic("Could not enable failpoint", zap.Error(err)) } @@ -164,7 +164,7 @@ func (s *sorterSuite) TestMergerSingleHeap(c *check.C) { // TestMergerSingleHeapRetire simulates a situation where the resolved event is not the last event in a flushTask func (s *sorterSuite) TestMergerSingleHeapRetire(c *check.C) { defer testleak.AfterTest(c)() - err := failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/sorterDebug", "return(true)") + err := failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/sorterDebug", "return(true)") if err != nil { log.Panic("Could not enable failpoint", zap.Error(err)) } @@ -237,14 +237,14 @@ func (s *sorterSuite) TestMergerSingleHeapRetire(c *check.C) { // Expects intermediate resolved events to be generated, so that the sink would not get stuck in a real life situation. func (s *sorterSuite) TestMergerSortDelay(c *check.C) { defer testleak.AfterTest(c)() - err := failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/sorterDebug", "return(true)") + err := failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/sorterDebug", "return(true)") c.Assert(err, check.IsNil) // enable the failpoint to simulate delays - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/sorterMergeDelay", "sleep(5)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/sorterMergeDelay", "sleep(5)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/sorter/unified/sorterMergeDelay") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/sorter/unified/sorterMergeDelay") }() log.SetLevel(zapcore.DebugLevel) @@ -317,14 +317,14 @@ func (s *sorterSuite) TestMergerSortDelay(c *check.C) { // Expects proper clean-up of the data. func (s *sorterSuite) TestMergerCancel(c *check.C) { defer testleak.AfterTest(c)() - err := failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/sorterDebug", "return(true)") + err := failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/sorterDebug", "return(true)") c.Assert(err, check.IsNil) // enable the failpoint to simulate delays - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/sorterMergeDelay", "sleep(10)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/sorterMergeDelay", "sleep(10)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/sorter/unified/sorterMergeDelay") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/sorter/unified/sorterMergeDelay") }() log.SetLevel(zapcore.DebugLevel) @@ -380,7 +380,7 @@ func (s *sorterSuite) TestMergerCancel(c *check.C) { // Expects proper clean-up of the data. func (s *sorterSuite) TestMergerCancelWithUnfinishedFlushTasks(c *check.C) { defer testleak.AfterTest(c)() - err := failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/sorterDebug", "return(true)") + err := failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/sorterDebug", "return(true)") c.Assert(err, check.IsNil) log.SetLevel(zapcore.DebugLevel) @@ -436,7 +436,7 @@ func (s *sorterSuite) TestMergerCancelWithUnfinishedFlushTasks(c *check.C) { // There is expected to be NO fatal error. func (s *sorterSuite) TestMergerCloseChannel(c *check.C) { defer testleak.AfterTest(c)() - err := failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/sorterDebug", "return(true)") + err := failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/sorterDebug", "return(true)") c.Assert(err, check.IsNil) log.SetLevel(zapcore.DebugLevel) @@ -482,9 +482,9 @@ func (s *sorterSuite) TestMergerCloseChannel(c *check.C) { // a significant period of time. func (s *sorterSuite) TestMergerOutputBlocked(c *check.C) { defer testleak.AfterTest(c)() - err := failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/sorterDebug", "return(true)") + err := failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/sorterDebug", "return(true)") c.Assert(err, check.IsNil) - defer failpoint.Disable("github.com/pingcap/ticdc/cdc/sorter/unified/sorterDebug") //nolint:errcheck + defer failpoint.Disable("github.com/pingcap/tiflow/cdc/sorter/unified/sorterDebug") //nolint:errcheck ctx, cancel := context.WithTimeout(context.TODO(), time.Second*25) defer cancel() diff --git a/cdc/sorter/unified/sorter_test.go b/cdc/sorter/unified/sorter_test.go index 3ef281dced9..af395b41d13 100644 --- a/cdc/sorter/unified/sorter_test.go +++ b/cdc/sorter/unified/sorter_test.go @@ -26,10 +26,10 @@ import ( "github.com/pingcap/check" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sorter" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sorter" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/util/testleak" "go.uber.org/zap" "go.uber.org/zap/zapcore" "golang.org/x/sync/errgroup" @@ -128,14 +128,14 @@ func (s *sorterSuite) TestSorterCancel(c *check.C) { } func testSorter(ctx context.Context, c *check.C, sorter sorter.EventSorter, count int) error { - err := failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/sorterDebug", "return(true)") + err := failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/sorterDebug", "return(true)") if err != nil { log.Panic("Could not enable failpoint", zap.Error(err)) } - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/pkg/util/InjectCheckDataDirSatisfied", ""), check.IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/pkg/util/InjectCheckDataDirSatisfied", ""), check.IsNil) defer func() { - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/pkg/util/InjectCheckDataDirSatisfied"), check.IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/pkg/util/InjectCheckDataDirSatisfied"), check.IsNil) }() ctx, cancel := context.WithCancel(ctx) @@ -309,17 +309,17 @@ func (s *sorterSuite) TestSorterCancelRestart(c *check.C) { c.Assert(err, check.IsNil) // enable the failpoint to simulate delays - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/asyncFlushStartDelay", "sleep(100)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/asyncFlushStartDelay", "sleep(100)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/sorter/unified/asyncFlushStartDelay") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/sorter/unified/asyncFlushStartDelay") }() // enable the failpoint to simulate delays - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/asyncFlushInProcessDelay", "1%sleep(1)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/asyncFlushInProcessDelay", "1%sleep(1)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/sorter/unified/asyncFlushInProcessDelay") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/sorter/unified/asyncFlushInProcessDelay") }() for i := 0; i < 5; i++ { @@ -358,10 +358,10 @@ func (s *sorterSuite) TestSorterIOError(c *check.C) { defer cancel() // enable the failpoint to simulate backEnd allocation error (usually would happen when creating a file) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/InjectErrorBackEndAlloc", "return(true)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/InjectErrorBackEndAlloc", "return(true)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/sorter/unified/InjectErrorBackEndAlloc") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/sorter/unified/InjectErrorBackEndAlloc") }() finishedCh := make(chan struct{}) @@ -379,12 +379,12 @@ func (s *sorterSuite) TestSorterIOError(c *check.C) { } UnifiedSorterCleanUp() - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/sorter/unified/InjectErrorBackEndAlloc") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/sorter/unified/InjectErrorBackEndAlloc") // enable the failpoint to simulate backEnd write error (usually would happen when writing to a file) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/InjectErrorBackEndWrite", "return(true)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/InjectErrorBackEndWrite", "return(true)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/sorter/unified/InjectErrorBackEndWrite") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/sorter/unified/InjectErrorBackEndWrite") }() // recreate the sorter @@ -435,16 +435,16 @@ func (s *sorterSuite) TestSorterErrorReportCorrect(c *check.C) { defer cancel() // enable the failpoint to simulate backEnd allocation error (usually would happen when creating a file) - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/InjectHeapSorterExitDelay", "sleep(2000)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/InjectHeapSorterExitDelay", "sleep(2000)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/sorter/unified/InjectHeapSorterExitDelay") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/sorter/unified/InjectHeapSorterExitDelay") }() - err = failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/InjectErrorBackEndAlloc", "return(true)") + err = failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/InjectErrorBackEndAlloc", "return(true)") c.Assert(err, check.IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/cdc/sorter/unified/InjectErrorBackEndAlloc") + _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/sorter/unified/InjectErrorBackEndAlloc") }() finishedCh := make(chan struct{}) diff --git a/cdc/sorter/unified/unified_sorter.go b/cdc/sorter/unified/unified_sorter.go index 200d7577cec..1cd502f7186 100644 --- a/cdc/sorter/unified/unified_sorter.go +++ b/cdc/sorter/unified/unified_sorter.go @@ -21,10 +21,10 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/util" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/util" "golang.org/x/sync/errgroup" ) diff --git a/chaos/Dockerfile.chaos b/chaos/Dockerfile.chaos index d1983f125f7..e8e22ad76a8 100644 --- a/chaos/Dockerfile.chaos +++ b/chaos/Dockerfile.chaos @@ -1,10 +1,10 @@ FROM golang:1.16-alpine as builder RUN apk add --no-cache git make bash -WORKDIR /go/src/github.com/pingcap/ticdc +WORKDIR /go/src/github.com/pingcap/tiflow COPY . . RUN make bank FROM alpine:3.12 RUN apk add --no-cache tzdata bash curl socat -COPY --from=builder /go/src/github.com/pingcap/ticdc/bin/bank /bank +COPY --from=builder /go/src/github.com/pingcap/tiflow/bin/bank /bank CMD [ "/bank" ] diff --git a/cmd/cdc/main.go b/cmd/cdc/main.go index 16d7a0e685d..9097cb6b245 100644 --- a/cmd/cdc/main.go +++ b/cmd/cdc/main.go @@ -14,8 +14,8 @@ package main import ( - "github.com/pingcap/ticdc/pkg/cmd" _ "github.com/pingcap/tidb/types/parser_driver" + "github.com/pingcap/tiflow/pkg/cmd" ) func main() { diff --git a/cmd/kafka-consumer/main.go b/cmd/kafka-consumer/main.go index 566063d6406..6d1d3ff324e 100644 --- a/cmd/kafka-consumer/main.go +++ b/cmd/kafka-consumer/main.go @@ -32,15 +32,15 @@ import ( "github.com/google/uuid" "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sink" - "github.com/pingcap/ticdc/cdc/sink/codec" - "github.com/pingcap/ticdc/pkg/config" - cdcfilter "github.com/pingcap/ticdc/pkg/filter" - "github.com/pingcap/ticdc/pkg/logutil" - "github.com/pingcap/ticdc/pkg/quotes" - "github.com/pingcap/ticdc/pkg/security" - "github.com/pingcap/ticdc/pkg/util" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sink" + "github.com/pingcap/tiflow/cdc/sink/codec" + "github.com/pingcap/tiflow/pkg/config" + cdcfilter "github.com/pingcap/tiflow/pkg/filter" + "github.com/pingcap/tiflow/pkg/logutil" + "github.com/pingcap/tiflow/pkg/quotes" + "github.com/pingcap/tiflow/pkg/security" + "github.com/pingcap/tiflow/pkg/util" "go.uber.org/zap" ) diff --git a/demo/java/README.md b/demo/java/README.md index cd545586d8f..db3761851c2 100644 --- a/demo/java/README.md +++ b/demo/java/README.md @@ -26,7 +26,7 @@ for (KafkaMessage kafkaMessage : kafkaMessages) { } ``` -[See com.pingcap.ticdc.cdc.TicdcEventDecoderTest.](src/test/java/com/pingcap/ticdc/cdc/TicdcEventDecoderTest.java). +[See com.pingcap.ticdc.cdc.TicdcEventDecoderTest.](src/test/java/com/pingcap/tiflow/cdc/TicdcEventDecoderTest.java). # How to install Prerequisites for building: @@ -36,7 +36,7 @@ Prerequisites for building: * Java 8 ``` -git clone git@github.com:pingcap/ticdc.git +git clone git@github.com:pingcap/tiflow.git cd ticdc/demo/java mvn install ``` diff --git a/dm/_utils/terror_gen/checker_template.go b/dm/_utils/terror_gen/checker_template.go index 84f00325bc8..668112c87cb 100644 --- a/dm/_utils/terror_gen/checker_template.go +++ b/dm/_utils/terror_gen/checker_template.go @@ -25,7 +25,7 @@ import ( "github.com/BurntSushi/toml" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) const ( diff --git a/dm/chaos/cases/cases.go b/dm/chaos/cases/cases.go index 7a07890f4c9..ea15972deae 100644 --- a/dm/chaos/cases/cases.go +++ b/dm/chaos/cases/cases.go @@ -19,9 +19,9 @@ import ( "golang.org/x/sync/errgroup" - config2 "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/utils" + config2 "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var ( diff --git a/dm/chaos/cases/config.go b/dm/chaos/cases/config.go index d7c19a3a4cf..fde1216e088 100644 --- a/dm/chaos/cases/config.go +++ b/dm/chaos/cases/config.go @@ -17,7 +17,7 @@ import ( "flag" "time" - config2 "github.com/pingcap/ticdc/dm/dm/config" + config2 "github.com/pingcap/tiflow/dm/dm/config" ) // config is used to run chaos tests. diff --git a/dm/chaos/cases/db.go b/dm/chaos/cases/db.go index e0cef8939b9..dcd6ee82547 100644 --- a/dm/chaos/cases/db.go +++ b/dm/chaos/cases/db.go @@ -25,11 +25,11 @@ import ( "github.com/pingcap/tidb/errno" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/retry" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/retry" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // dbConn holds a connection to a database and supports to reset the connection. diff --git a/dm/chaos/cases/diff.go b/dm/chaos/cases/diff.go index 218cc6dc7ef..e6b9d883bd2 100644 --- a/dm/chaos/cases/diff.go +++ b/dm/chaos/cases/diff.go @@ -24,7 +24,7 @@ import ( "github.com/pingcap/tidb-tools/pkg/diff" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/log" ) // diffDataLoop checks whether target has the same data with source via `sync-diff-inspector` multiple times. diff --git a/dm/chaos/cases/generator.go b/dm/chaos/cases/generator.go index a500bd8ccf0..65afba47cf7 100644 --- a/dm/chaos/cases/generator.go +++ b/dm/chaos/cases/generator.go @@ -18,7 +18,7 @@ import ( "fmt" "math/rand" - config2 "github.com/pingcap/ticdc/dm/dm/config" + config2 "github.com/pingcap/tiflow/dm/dm/config" ) const ( diff --git a/dm/chaos/cases/instance.go b/dm/chaos/cases/instance.go index 12142190aec..83fd99fea54 100644 --- a/dm/chaos/cases/instance.go +++ b/dm/chaos/cases/instance.go @@ -16,8 +16,8 @@ package main import ( "context" - config2 "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/conn" + config2 "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/conn" ) // set lesser sql_mode to tolerate some SQLs generated by go-sqlsmith. diff --git a/dm/chaos/cases/main.go b/dm/chaos/cases/main.go index 92d23cde904..442943f742f 100644 --- a/dm/chaos/cases/main.go +++ b/dm/chaos/cases/main.go @@ -28,8 +28,8 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/log" ) // main starts to run the test case logic after MySQL, TiDB and DM have been set up. diff --git a/dm/chaos/cases/member.go b/dm/chaos/cases/member.go index 1bf97b70cda..04b8c268bed 100644 --- a/dm/chaos/cases/member.go +++ b/dm/chaos/cases/member.go @@ -18,8 +18,8 @@ import ( "fmt" "time" - "github.com/pingcap/ticdc/dm/dm/master/scheduler" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/master/scheduler" + "github.com/pingcap/tiflow/dm/dm/pb" ) const ( diff --git a/dm/chaos/cases/source.go b/dm/chaos/cases/source.go index e149ad9b4a8..c5c1b53179a 100644 --- a/dm/chaos/cases/source.go +++ b/dm/chaos/cases/source.go @@ -21,8 +21,8 @@ import ( "strings" "time" - config2 "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" + config2 "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" ) // createSources does `operate-source create` operation for two sources. diff --git a/dm/chaos/cases/task.go b/dm/chaos/cases/task.go index ab69874fa65..ef00a021c54 100644 --- a/dm/chaos/cases/task.go +++ b/dm/chaos/cases/task.go @@ -28,11 +28,11 @@ import ( "go.uber.org/zap" "golang.org/x/sync/errgroup" - config2 "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/conn" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/utils" + config2 "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/conn" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/utils" ) const ( diff --git a/dm/checker/check_test.go b/dm/checker/check_test.go index 44f27f6777f..527846b8281 100644 --- a/dm/checker/check_test.go +++ b/dm/checker/check_test.go @@ -21,9 +21,9 @@ import ( "github.com/DATA-DOG/go-sqlmock" router "github.com/pingcap/tidb-tools/pkg/table-router" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/pkg/conn" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/pkg/conn" tc "github.com/pingcap/check" ) diff --git a/dm/checker/checker.go b/dm/checker/checker.go index 03242f767c8..6ffb82472d3 100644 --- a/dm/checker/checker.go +++ b/dm/checker/checker.go @@ -24,15 +24,15 @@ import ( "sync" "time" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/unit" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/conn" - fr "github.com/pingcap/ticdc/dm/pkg/func-rollback" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/unit" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/conn" + fr "github.com/pingcap/tiflow/dm/pkg/func-rollback" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" _ "github.com/go-sql-driver/mysql" // for mysql "github.com/pingcap/tidb-tools/pkg/check" diff --git a/dm/checker/cmd.go b/dm/checker/cmd.go index 0a95a605cb1..66064747944 100644 --- a/dm/checker/cmd.go +++ b/dm/checker/cmd.go @@ -16,9 +16,9 @@ package checker import ( "context" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var ( diff --git a/dm/cmd/dm-ctl/main.go b/dm/cmd/dm-ctl/main.go index d73487f7a98..65a503ecee3 100644 --- a/dm/cmd/dm-ctl/main.go +++ b/dm/cmd/dm-ctl/main.go @@ -19,11 +19,11 @@ import ( "os/signal" "syscall" - "github.com/pingcap/ticdc/dm/dm/ctl" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/ctl" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) func main() { diff --git a/dm/cmd/dm-master/main.go b/dm/cmd/dm-master/main.go index ea30b86e6f2..890492ef3b1 100644 --- a/dm/cmd/dm-master/main.go +++ b/dm/cmd/dm-master/main.go @@ -25,11 +25,11 @@ import ( "github.com/pingcap/errors" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/master" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/master" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) func main() { diff --git a/dm/cmd/dm-master/main_test.go b/dm/cmd/dm-master/main_test.go index 77e439ef0de..bfba20b094d 100644 --- a/dm/cmd/dm-master/main_test.go +++ b/dm/cmd/dm-master/main_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - _ "github.com/pingcap/ticdc/dm/pkg/printinit" + _ "github.com/pingcap/tiflow/dm/pkg/printinit" ) func TestRunMain(_ *testing.T) { diff --git a/dm/cmd/dm-portal/main.go b/dm/cmd/dm-portal/main.go index 1d6295cae4f..6bece1baf02 100644 --- a/dm/cmd/dm-portal/main.go +++ b/dm/cmd/dm-portal/main.go @@ -21,9 +21,9 @@ import ( "github.com/rakyll/statik/fs" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/portal" - _ "github.com/pingcap/ticdc/dm/dm/portal/statik" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/dm/portal" + _ "github.com/pingcap/tiflow/dm/dm/portal/statik" + "github.com/pingcap/tiflow/dm/pkg/log" ) func main() { diff --git a/dm/cmd/dm-syncer/config.go b/dm/cmd/dm-syncer/config.go index 14055016432..c1d2173974e 100644 --- a/dm/cmd/dm-syncer/config.go +++ b/dm/cmd/dm-syncer/config.go @@ -25,9 +25,9 @@ import ( "github.com/pingcap/tidb-tools/pkg/filter" router "github.com/pingcap/tidb-tools/pkg/table-router" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // commonConfig collects common item for both new config and old config. diff --git a/dm/cmd/dm-syncer/main.go b/dm/cmd/dm-syncer/main.go index 86c27d51387..0f89de19696 100644 --- a/dm/cmd/dm-syncer/main.go +++ b/dm/cmd/dm-syncer/main.go @@ -22,13 +22,13 @@ import ( "strings" "syscall" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/syncer" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/syncer" "github.com/pingcap/errors" globalLog "github.com/pingcap/log" diff --git a/dm/cmd/dm-worker/main.go b/dm/cmd/dm-worker/main.go index 410f14553bf..66e022a5ef7 100644 --- a/dm/cmd/dm-worker/main.go +++ b/dm/cmd/dm-worker/main.go @@ -27,11 +27,11 @@ import ( lightningLog "github.com/pingcap/tidb/br/pkg/lightning/log" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/worker" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/worker" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) func main() { diff --git a/dm/cmd/dm-worker/main_test.go b/dm/cmd/dm-worker/main_test.go index 76d7be520c2..81aa1f031a4 100644 --- a/dm/cmd/dm-worker/main_test.go +++ b/dm/cmd/dm-worker/main_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/utils" "go.uber.org/zap" ) diff --git a/dm/debug-tools/binlog-event-blackhole/fetcher.go b/dm/debug-tools/binlog-event-blackhole/fetcher.go index b5028b516a1..081e0a7e313 100644 --- a/dm/debug-tools/binlog-event-blackhole/fetcher.go +++ b/dm/debug-tools/binlog-event-blackhole/fetcher.go @@ -22,7 +22,7 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/log" ) // registerSlave register a slave connection on the master. diff --git a/dm/debug-tools/binlog-event-blackhole/main.go b/dm/debug-tools/binlog-event-blackhole/main.go index 0f8d9b8bb97..13bdf299aae 100644 --- a/dm/debug-tools/binlog-event-blackhole/main.go +++ b/dm/debug-tools/binlog-event-blackhole/main.go @@ -26,7 +26,7 @@ import ( "github.com/pingcap/errors" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/log" ) func main() { diff --git a/dm/dm/common/common.go b/dm/dm/common/common.go index f55d5aee8e8..006797a6f1b 100644 --- a/dm/dm/common/common.go +++ b/dm/dm/common/common.go @@ -19,7 +19,7 @@ import ( "path" "strings" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var ( diff --git a/dm/dm/config/checking_item.go b/dm/dm/config/checking_item.go index 9780b34362c..8723753eed9 100644 --- a/dm/dm/config/checking_item.go +++ b/dm/dm/config/checking_item.go @@ -17,7 +17,7 @@ import ( "bytes" "fmt" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // DM definition checking items diff --git a/dm/dm/config/source_config.go b/dm/dm/config/source_config.go index b200577cece..448ea3c3898 100644 --- a/dm/dm/config/source_config.go +++ b/dm/dm/config/source_config.go @@ -32,11 +32,11 @@ import ( bf "github.com/pingcap/tidb-tools/pkg/binlog-filter" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) const ( diff --git a/dm/dm/config/source_config_test.go b/dm/dm/config/source_config_test.go index 9f6bfd3f5b9..0ef3d901ebc 100644 --- a/dm/dm/config/source_config_test.go +++ b/dm/dm/config/source_config_test.go @@ -28,7 +28,7 @@ import ( . "github.com/pingcap/check" bf "github.com/pingcap/tidb-tools/pkg/binlog-filter" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // do not forget to update this path if the file removed/renamed. diff --git a/dm/dm/config/subtask.go b/dm/dm/config/subtask.go index bdc66bc5fa2..9a59285cb1a 100644 --- a/dm/dm/config/subtask.go +++ b/dm/dm/config/subtask.go @@ -29,10 +29,10 @@ import ( lcfg "github.com/pingcap/tidb/br/pkg/lightning/config" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/dumpling" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/dumpling" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // task modes. diff --git a/dm/dm/config/task.go b/dm/dm/config/task.go index 48dd784b746..091f93722c3 100644 --- a/dm/dm/config/task.go +++ b/dm/dm/config/task.go @@ -31,9 +31,9 @@ import ( "go.uber.org/zap" "gopkg.in/yaml.v2" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // Online DDL Scheme. diff --git a/dm/dm/config/task_converters.go b/dm/dm/config/task_converters.go index 92d5a91eb1c..dba66c811cd 100644 --- a/dm/dm/config/task_converters.go +++ b/dm/dm/config/task_converters.go @@ -22,9 +22,9 @@ import ( "github.com/pingcap/tidb-tools/pkg/filter" router "github.com/pingcap/tidb-tools/pkg/table-router" - "github.com/pingcap/ticdc/dm/openapi" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/openapi" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // TaskConfigToSubTaskConfigs generates sub task configs by TaskConfig. diff --git a/dm/dm/config/task_converters_test.go b/dm/dm/config/task_converters_test.go index 149c5d727e3..1b6eac3527d 100644 --- a/dm/dm/config/task_converters_test.go +++ b/dm/dm/config/task_converters_test.go @@ -19,8 +19,8 @@ import ( bf "github.com/pingcap/tidb-tools/pkg/binlog-filter" "github.com/pingcap/tidb-tools/pkg/filter" - "github.com/pingcap/ticdc/dm/openapi" - "github.com/pingcap/ticdc/dm/openapi/fixtures" + "github.com/pingcap/tiflow/dm/openapi" + "github.com/pingcap/tiflow/dm/openapi/fixtures" ) func (t *testConfig) TestTaskGetTargetDBCfg(c *check.C) { diff --git a/dm/dm/config/task_test.go b/dm/dm/config/task_test.go index 29b8e0b320d..8ace25f0278 100644 --- a/dm/dm/config/task_test.go +++ b/dm/dm/config/task_test.go @@ -25,7 +25,7 @@ import ( "github.com/pingcap/tidb-tools/pkg/filter" router "github.com/pingcap/tidb-tools/pkg/table-router" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" "github.com/coreos/go-semver/semver" ) diff --git a/dm/dm/ctl/common/config.go b/dm/dm/ctl/common/config.go index 1a4bcd78614..50c49044d1a 100644 --- a/dm/dm/ctl/common/config.go +++ b/dm/dm/ctl/common/config.go @@ -21,8 +21,8 @@ import ( "strings" "time" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/utils" "github.com/BurntSushi/toml" "github.com/pingcap/errors" diff --git a/dm/dm/ctl/common/operate_relay.go b/dm/dm/ctl/common/operate_relay.go index 5a0d88b4566..8e7c24c154b 100644 --- a/dm/dm/ctl/common/operate_relay.go +++ b/dm/dm/ctl/common/operate_relay.go @@ -16,7 +16,7 @@ package common import ( "context" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/pb" ) // OperateRelay does operation on relay unit. diff --git a/dm/dm/ctl/common/operate_task.go b/dm/dm/ctl/common/operate_task.go index 449cfcd65b1..dbfc4b29665 100644 --- a/dm/dm/ctl/common/operate_task.go +++ b/dm/dm/ctl/common/operate_task.go @@ -16,7 +16,7 @@ package common import ( "context" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/pb" ) // OperateTask does operation on task. diff --git a/dm/dm/ctl/common/util.go b/dm/dm/ctl/common/util.go index 03280895792..e6d9be81a55 100644 --- a/dm/dm/ctl/common/util.go +++ b/dm/dm/ctl/common/util.go @@ -38,12 +38,12 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/log" - parserpkg "github.com/pingcap/ticdc/dm/pkg/parser" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/log" + parserpkg "github.com/pingcap/tiflow/dm/pkg/parser" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var ( diff --git a/dm/dm/ctl/ctl.go b/dm/dm/ctl/ctl.go index 1abf5a22d22..0dcc2f7da74 100644 --- a/dm/dm/ctl/ctl.go +++ b/dm/dm/ctl/ctl.go @@ -19,10 +19,10 @@ import ( "os" "strings" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/ctl/master" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/ctl/master" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/utils" "github.com/chzyer/readline" "github.com/pingcap/errors" diff --git a/dm/dm/ctl/master/binlog.go b/dm/dm/ctl/master/binlog.go index f76f3d2f363..c02dc8d0969 100644 --- a/dm/dm/ctl/master/binlog.go +++ b/dm/dm/ctl/master/binlog.go @@ -14,8 +14,8 @@ package master import ( - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" "github.com/pingcap/errors" "github.com/spf13/cobra" diff --git a/dm/dm/ctl/master/check_task.go b/dm/dm/ctl/master/check_task.go index 75937c771b1..5cd0b5c2ae9 100644 --- a/dm/dm/ctl/master/check_task.go +++ b/dm/dm/ctl/master/check_task.go @@ -20,9 +20,9 @@ import ( "github.com/spf13/cobra" - "github.com/pingcap/ticdc/dm/checker" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/checker" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" ) // NewCheckTaskCmd creates a CheckTask command. diff --git a/dm/dm/ctl/master/config.go b/dm/dm/ctl/master/config.go index 87691eabb3f..c80506662fe 100644 --- a/dm/dm/ctl/master/config.go +++ b/dm/dm/ctl/master/config.go @@ -25,11 +25,11 @@ import ( "github.com/spf13/cobra" "go.etcd.io/etcd/clientv3" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/ha" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/ha" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var ( diff --git a/dm/dm/ctl/master/get_config.go b/dm/dm/ctl/master/get_config.go index 3301ecf4d95..bed923632a1 100644 --- a/dm/dm/ctl/master/get_config.go +++ b/dm/dm/ctl/master/get_config.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" ) const cmdGetTaskConfig = "get-task-config" diff --git a/dm/dm/ctl/master/handle_error.go b/dm/dm/ctl/master/handle_error.go index 68c752f1468..b9a296584fb 100644 --- a/dm/dm/ctl/master/handle_error.go +++ b/dm/dm/ctl/master/handle_error.go @@ -20,9 +20,9 @@ import ( "github.com/spf13/cobra" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/binlog" ) // NewHandleErrorCmd creates a HandleError command. diff --git a/dm/dm/ctl/master/list_member.go b/dm/dm/ctl/master/list_member.go index 6cb18ec4d75..ffec67d7183 100644 --- a/dm/dm/ctl/master/list_member.go +++ b/dm/dm/ctl/master/list_member.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" ) var listMemberFlags = ListMemberFlags{} diff --git a/dm/dm/ctl/master/offline_member.go b/dm/dm/ctl/master/offline_member.go index 334a8410b8b..972e002f597 100644 --- a/dm/dm/ctl/master/offline_member.go +++ b/dm/dm/ctl/master/offline_member.go @@ -17,8 +17,8 @@ import ( "context" "os" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" "github.com/pingcap/errors" "github.com/spf13/cobra" diff --git a/dm/dm/ctl/master/operate_leader.go b/dm/dm/ctl/master/operate_leader.go index 628322870f2..77c9c7a2591 100644 --- a/dm/dm/ctl/master/operate_leader.go +++ b/dm/dm/ctl/master/operate_leader.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" ) // NewOperateLeaderCmd creates a OperateLeader command. diff --git a/dm/dm/ctl/master/operate_schema.go b/dm/dm/ctl/master/operate_schema.go index cf85a1ff109..b57b7c035dc 100644 --- a/dm/dm/ctl/master/operate_schema.go +++ b/dm/dm/ctl/master/operate_schema.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" ) // NewOperateSchemaCmd creates a OperateSchema command. diff --git a/dm/dm/ctl/master/operate_source.go b/dm/dm/ctl/master/operate_source.go index 27b24f9937b..c50e405217d 100644 --- a/dm/dm/ctl/master/operate_source.go +++ b/dm/dm/ctl/master/operate_source.go @@ -22,11 +22,11 @@ import ( "github.com/spf13/cobra" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // NewOperateSourceCmd creates a OperateSource command. diff --git a/dm/dm/ctl/master/operate_task.go b/dm/dm/ctl/master/operate_task.go index 784fabd8c73..fa460e50f55 100644 --- a/dm/dm/ctl/master/operate_task.go +++ b/dm/dm/ctl/master/operate_task.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" ) const ( diff --git a/dm/dm/ctl/master/pause_relay.go b/dm/dm/ctl/master/pause_relay.go index afcaa8c2c23..8ee9cd5fb98 100644 --- a/dm/dm/ctl/master/pause_relay.go +++ b/dm/dm/ctl/master/pause_relay.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" ) // NewPauseRelayCmd creates a PauseRelay command. diff --git a/dm/dm/ctl/master/pause_task.go b/dm/dm/ctl/master/pause_task.go index 2ec08c58066..4961a7c57d9 100644 --- a/dm/dm/ctl/master/pause_task.go +++ b/dm/dm/ctl/master/pause_task.go @@ -16,7 +16,7 @@ package master import ( "github.com/spf13/cobra" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/pb" ) // NewPauseTaskCmd creates a PauseTask command. diff --git a/dm/dm/ctl/master/purge_relay.go b/dm/dm/ctl/master/purge_relay.go index 433b4c95d14..109ccfa767b 100644 --- a/dm/dm/ctl/master/purge_relay.go +++ b/dm/dm/ctl/master/purge_relay.go @@ -22,9 +22,9 @@ import ( "github.com/pingcap/errors" "github.com/spf13/cobra" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // NewPurgeRelayCmd creates a PurgeRelay command diff --git a/dm/dm/ctl/master/query_status.go b/dm/dm/ctl/master/query_status.go index 726958a5054..f5d11d333cb 100644 --- a/dm/dm/ctl/master/query_status.go +++ b/dm/dm/ctl/master/query_status.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" ) const stageError = "Error" diff --git a/dm/dm/ctl/master/query_status_test.go b/dm/dm/ctl/master/query_status_test.go index 2956ad4f4cc..7fc47dcb519 100644 --- a/dm/dm/ctl/master/query_status_test.go +++ b/dm/dm/ctl/master/query_status_test.go @@ -17,7 +17,7 @@ import ( "sort" "testing" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/pb" "github.com/pingcap/check" ) diff --git a/dm/dm/ctl/master/resume_relay.go b/dm/dm/ctl/master/resume_relay.go index 921b2f1577f..6b2d0101f60 100644 --- a/dm/dm/ctl/master/resume_relay.go +++ b/dm/dm/ctl/master/resume_relay.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" ) // NewResumeRelayCmd creates a ResumeRelay command. diff --git a/dm/dm/ctl/master/resume_task.go b/dm/dm/ctl/master/resume_task.go index 4715daa36c2..85fc516b743 100644 --- a/dm/dm/ctl/master/resume_task.go +++ b/dm/dm/ctl/master/resume_task.go @@ -16,7 +16,7 @@ package master import ( "github.com/spf13/cobra" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/pb" ) // NewResumeTaskCmd creates a ResumeTask command. diff --git a/dm/dm/ctl/master/show_ddl_locks.go b/dm/dm/ctl/master/show_ddl_locks.go index 9e42cc3e3d7..ebca2044130 100644 --- a/dm/dm/ctl/master/show_ddl_locks.go +++ b/dm/dm/ctl/master/show_ddl_locks.go @@ -18,8 +18,8 @@ import ( "errors" "os" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" "github.com/spf13/cobra" ) diff --git a/dm/dm/ctl/master/source_table_schema.go b/dm/dm/ctl/master/source_table_schema.go index c0700e915ad..91c5acd390d 100644 --- a/dm/dm/ctl/master/source_table_schema.go +++ b/dm/dm/ctl/master/source_table_schema.go @@ -14,8 +14,8 @@ package master import ( - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" "github.com/spf13/cobra" ) diff --git a/dm/dm/ctl/master/start_stop_relay.go b/dm/dm/ctl/master/start_stop_relay.go index 8cd101fce8b..749af913aeb 100644 --- a/dm/dm/ctl/master/start_stop_relay.go +++ b/dm/dm/ctl/master/start_stop_relay.go @@ -18,8 +18,8 @@ import ( "errors" "os" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" "github.com/spf13/cobra" ) diff --git a/dm/dm/ctl/master/start_task.go b/dm/dm/ctl/master/start_task.go index b8fc94c999f..21e286a41a5 100644 --- a/dm/dm/ctl/master/start_task.go +++ b/dm/dm/ctl/master/start_task.go @@ -21,12 +21,12 @@ import ( "github.com/spf13/cobra" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/checker" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/checker" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // NewStartTaskCmd creates a StartTask command. diff --git a/dm/dm/ctl/master/stop_task.go b/dm/dm/ctl/master/stop_task.go index 90b2390b8e4..1edd46b93af 100644 --- a/dm/dm/ctl/master/stop_task.go +++ b/dm/dm/ctl/master/stop_task.go @@ -16,7 +16,7 @@ package master import ( "github.com/spf13/cobra" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/pb" ) // NewStopTaskCmd creates a StopTask command. diff --git a/dm/dm/ctl/master/transfer_source.go b/dm/dm/ctl/master/transfer_source.go index 252710e5c36..a7947b883b3 100644 --- a/dm/dm/ctl/master/transfer_source.go +++ b/dm/dm/ctl/master/transfer_source.go @@ -18,8 +18,8 @@ import ( "errors" "os" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" "github.com/spf13/cobra" ) diff --git a/dm/dm/ctl/master/unlock_ddl_lock.go b/dm/dm/ctl/master/unlock_ddl_lock.go index 48fcb1ebead..d551b7b61fa 100644 --- a/dm/dm/ctl/master/unlock_ddl_lock.go +++ b/dm/dm/ctl/master/unlock_ddl_lock.go @@ -19,8 +19,8 @@ import ( "fmt" "os" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" "github.com/spf13/cobra" ) diff --git a/dm/dm/master/agent_pool.go b/dm/dm/master/agent_pool.go index a9d2c628471..4f4eee68196 100644 --- a/dm/dm/master/agent_pool.go +++ b/dm/dm/master/agent_pool.go @@ -17,7 +17,7 @@ import ( "context" "math" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/log" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/dm/dm/master/bootstrap.go b/dm/dm/master/bootstrap.go index 1b3609bc0f0..9c090843387 100644 --- a/dm/dm/master/bootstrap.go +++ b/dm/dm/master/bootstrap.go @@ -25,17 +25,17 @@ import ( "github.com/pingcap/errors" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/master/scheduler" - "github.com/pingcap/ticdc/dm/dm/master/workerrpc" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/upgrade" - "github.com/pingcap/ticdc/dm/pkg/v1dbschema" - "github.com/pingcap/ticdc/dm/pkg/v1workermeta" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/master/scheduler" + "github.com/pingcap/tiflow/dm/dm/master/workerrpc" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/upgrade" + "github.com/pingcap/tiflow/dm/pkg/v1dbschema" + "github.com/pingcap/tiflow/dm/pkg/v1workermeta" ) var ( diff --git a/dm/dm/master/bootstrap_test.go b/dm/dm/master/bootstrap_test.go index e6df89f539a..d4daaec6bd5 100644 --- a/dm/dm/master/bootstrap_test.go +++ b/dm/dm/master/bootstrap_test.go @@ -25,12 +25,12 @@ import ( . "github.com/pingcap/check" filter "github.com/pingcap/tidb-tools/pkg/binlog-filter" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/pbmock" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/pbmock" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) const ( diff --git a/dm/dm/master/config.go b/dm/dm/master/config.go index b35ec573645..e595906a986 100644 --- a/dm/dm/master/config.go +++ b/dm/dm/master/config.go @@ -29,10 +29,10 @@ import ( "go.etcd.io/etcd/embed" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) const ( diff --git a/dm/dm/master/config_test.go b/dm/dm/master/config_test.go index 051fb17a947..a1486644dd7 100644 --- a/dm/dm/master/config_test.go +++ b/dm/dm/master/config_test.go @@ -25,8 +25,8 @@ import ( "github.com/pingcap/check" "go.etcd.io/etcd/embed" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var ( diff --git a/dm/dm/master/election.go b/dm/dm/master/election.go index 0532fd6b2e6..d6bd3989c42 100644 --- a/dm/dm/master/election.go +++ b/dm/dm/master/election.go @@ -23,9 +23,9 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" - "github.com/pingcap/ticdc/dm/dm/master/metrics" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/dm/master/metrics" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/log" ) const ( diff --git a/dm/dm/master/election_test.go b/dm/dm/master/election_test.go index 754f3de4ac9..11a6c62aa8e 100644 --- a/dm/dm/master/election_test.go +++ b/dm/dm/master/election_test.go @@ -23,8 +23,8 @@ import ( "github.com/pingcap/failpoint" "github.com/tikv/pd/pkg/tempurl" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var _ = check.Suite(&testElectionSuite{}) @@ -78,9 +78,9 @@ func (t *testElectionSuite) TestFailToStartLeader(c *check.C) { c.Assert(leaderID, check.Equals, cfg1.Name) // fail to start scheduler/pessimism/optimism - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dm/master/FailToStartLeader", `return("dm-master-2")`), check.IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dm/master/FailToStartLeader", `return("dm-master-2")`), check.IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/dm/master/FailToStartLeader") + defer failpoint.Disable("github.com/pingcap/tiflow/dm/dm/master/FailToStartLeader") s1.election.Resign() time.Sleep(1 * time.Second) @@ -91,7 +91,7 @@ func (t *testElectionSuite) TestFailToStartLeader(c *check.C) { c.Assert(leaderID, check.Equals, cfg1.Name) //nolint:errcheck - failpoint.Disable("github.com/pingcap/ticdc/dm/dm/master/FailToStartLeader") + failpoint.Disable("github.com/pingcap/tiflow/dm/dm/master/FailToStartLeader") s1.election.Resign() time.Sleep(1 * time.Second) diff --git a/dm/dm/master/etcd.go b/dm/dm/master/etcd.go index 5447e1ffcca..bd7762cc4b7 100644 --- a/dm/dm/master/etcd.go +++ b/dm/dm/master/etcd.go @@ -26,9 +26,9 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) const ( diff --git a/dm/dm/master/etcd_test.go b/dm/dm/master/etcd_test.go index d16bfd1102a..e3a8a8b1572 100644 --- a/dm/dm/master/etcd_test.go +++ b/dm/dm/master/etcd_test.go @@ -27,9 +27,9 @@ import ( "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/embed" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var _ = check.Suite(&testEtcdSuite{}) diff --git a/dm/dm/master/http_handler.go b/dm/dm/master/http_handler.go index 33054c8f83f..e2bca8ff576 100644 --- a/dm/dm/master/http_handler.go +++ b/dm/dm/master/http_handler.go @@ -22,10 +22,10 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "google.golang.org/grpc" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // statusHandler handles process status. diff --git a/dm/dm/master/metrics/metrics.go b/dm/dm/master/metrics/metrics.go index 95f54524875..486ac22af1e 100644 --- a/dm/dm/master/metrics/metrics.go +++ b/dm/dm/master/metrics/metrics.go @@ -20,7 +20,7 @@ import ( cpu "github.com/pingcap/tidb-tools/pkg/utils" "github.com/prometheus/client_golang/prometheus" - "github.com/pingcap/ticdc/dm/pkg/metricsproxy" + "github.com/pingcap/tiflow/dm/pkg/metricsproxy" ) // used for ddlPendingCounter, no "Resolved" lock because they will be diff --git a/dm/dm/master/openapi.go b/dm/dm/master/openapi.go index 2c598ca46ef..66ae60fd39b 100644 --- a/dm/dm/master/openapi.go +++ b/dm/dm/master/openapi.go @@ -26,17 +26,17 @@ import ( echomiddleware "github.com/labstack/echo/v4/middleware" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/checker" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/master/scheduler" - "github.com/pingcap/ticdc/dm/dm/master/workerrpc" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/openapi" - "github.com/pingcap/ticdc/dm/pkg/conn" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/checker" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/master/scheduler" + "github.com/pingcap/tiflow/dm/dm/master/workerrpc" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/openapi" + "github.com/pingcap/tiflow/dm/pkg/conn" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) const ( diff --git a/dm/dm/master/openapi_test.go b/dm/dm/master/openapi_test.go index ad6b9723bce..de038b3df72 100644 --- a/dm/dm/master/openapi_test.go +++ b/dm/dm/master/openapi_test.go @@ -31,17 +31,17 @@ import ( "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/integration" - "github.com/pingcap/ticdc/dm/checker" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/master/workerrpc" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/pbmock" - "github.com/pingcap/ticdc/dm/openapi" - "github.com/pingcap/ticdc/dm/openapi/fixtures" - "github.com/pingcap/ticdc/dm/pkg/conn" - "github.com/pingcap/ticdc/dm/pkg/ha" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/checker" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/master/workerrpc" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/pbmock" + "github.com/pingcap/tiflow/dm/openapi" + "github.com/pingcap/tiflow/dm/openapi/fixtures" + "github.com/pingcap/tiflow/dm/pkg/conn" + "github.com/pingcap/tiflow/dm/pkg/ha" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var openAPITestSuite = check.SerialSuites(&openAPISuite{}) @@ -426,7 +426,7 @@ func (t *openAPISuite) TestRelayAPI(c *check.C) { func (t *openAPISuite) TestTaskAPI(c *check.C) { ctx, cancel := context.WithCancel(context.Background()) s := setupServer(ctx, c) - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dm/master/MockSkipAdjustTargetDB", `return(true)`), check.IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dm/master/MockSkipAdjustTargetDB", `return(true)`), check.IsNil) checker.CheckSyncConfigFunc = mockCheckSyncConfig ctrl := gomock.NewController(c) defer func() { @@ -536,7 +536,7 @@ func (t *openAPISuite) TestTaskAPI(c *check.C) { c.Assert(result.Code(), check.Equals, http.StatusNoContent) subTaskM = s.scheduler.GetSubTaskCfgsByTask(task.Name) c.Assert(len(subTaskM) == 0, check.IsTrue) - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/dm/master/MockSkipAdjustTargetDB"), check.IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/dm/master/MockSkipAdjustTargetDB"), check.IsNil) // list tasks result = testutil.NewRequest().Get(taskURL).Go(t.testT, s.echo) diff --git a/dm/dm/master/scheduler/scheduler.go b/dm/dm/master/scheduler/scheduler.go index b11dac80510..00fe67fd70b 100644 --- a/dm/dm/master/scheduler/scheduler.go +++ b/dm/dm/master/scheduler/scheduler.go @@ -24,14 +24,14 @@ import ( "go.etcd.io/etcd/clientv3" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/master/metrics" - "github.com/pingcap/ticdc/dm/dm/master/workerrpc" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/ha" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/master/metrics" + "github.com/pingcap/tiflow/dm/dm/master/workerrpc" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/ha" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // Scheduler schedules tasks for DM-worker instances, including: diff --git a/dm/dm/master/scheduler/scheduler_test.go b/dm/dm/master/scheduler/scheduler_test.go index 66581204c5d..5335a9daf47 100644 --- a/dm/dm/master/scheduler/scheduler_test.go +++ b/dm/dm/master/scheduler/scheduler_test.go @@ -26,13 +26,13 @@ import ( v3rpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/integration" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/master/workerrpc" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/ha" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/master/workerrpc" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/ha" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) const ( @@ -1212,11 +1212,11 @@ func (t *testScheduler) TestTransferSource(c *C) { // now we have (worker1, nil) (worker2, source2) (worker3, source3) (worker4, source1) // test fail halfway won't left old worker unbound - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dm/master/scheduler/failToReplaceSourceBound", `return()`), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dm/master/scheduler/failToReplaceSourceBound", `return()`), IsNil) c.Assert(s.TransferSource(sourceID1, workerName1), NotNil) c.Assert(s.bounds[sourceID1], DeepEquals, worker4) c.Assert(worker1.Stage(), Equals, WorkerFree) - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/dm/master/scheduler/failToReplaceSourceBound"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/dm/master/scheduler/failToReplaceSourceBound"), IsNil) // test can't transfer when there's any running task on the source s.expectSubTaskStages.Store("test", map[string]ha.Stage{sourceID1: {Expect: pb.Stage_Running}}) @@ -1380,12 +1380,12 @@ func (t *testScheduler) TestCloseAllWorkers(c *C) { c.Assert(err, IsNil) } - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dm/master/scheduler/failToRecoverWorkersBounds", "return"), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dm/master/scheduler/failToRecoverWorkersBounds", "return"), IsNil) // Test closed when fail to start c.Assert(s.Start(ctx, etcdTestCli), ErrorMatches, "failToRecoverWorkersBounds") c.Assert(s.workers, HasLen, 3) checkAllWorkersClosed(c, s, true) - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/dm/master/scheduler/failToRecoverWorkersBounds"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/dm/master/scheduler/failToRecoverWorkersBounds"), IsNil) s.workers = map[string]*Worker{} c.Assert(s.Start(ctx, etcdTestCli), IsNil) diff --git a/dm/dm/master/scheduler/worker.go b/dm/dm/master/scheduler/worker.go index fc100ecc1db..cbac851ef33 100644 --- a/dm/dm/master/scheduler/worker.go +++ b/dm/dm/master/scheduler/worker.go @@ -20,12 +20,12 @@ import ( "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/master/metrics" - "github.com/pingcap/ticdc/dm/dm/master/workerrpc" - "github.com/pingcap/ticdc/dm/pkg/ha" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/master/metrics" + "github.com/pingcap/tiflow/dm/dm/master/workerrpc" + "github.com/pingcap/tiflow/dm/pkg/ha" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // WorkerStage represents the stage of a DM-worker instance. diff --git a/dm/dm/master/scheduler/worker_test.go b/dm/dm/master/scheduler/worker_test.go index 0f113256665..fa571ebbcee 100644 --- a/dm/dm/master/scheduler/worker_test.go +++ b/dm/dm/master/scheduler/worker_test.go @@ -19,11 +19,11 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/master/workerrpc" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/ha" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/master/workerrpc" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/ha" + "github.com/pingcap/tiflow/dm/pkg/terror" ) type testWorker struct{} diff --git a/dm/dm/master/server.go b/dm/dm/master/server.go index fd9ebdb197b..1f50386f448 100644 --- a/dm/dm/master/server.go +++ b/dm/dm/master/server.go @@ -36,24 +36,24 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" - "github.com/pingcap/ticdc/dm/checker" - dmcommon "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/dm/config" - ctlcommon "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/master/metrics" - "github.com/pingcap/ticdc/dm/dm/master/scheduler" - "github.com/pingcap/ticdc/dm/dm/master/shardddl" - "github.com/pingcap/ticdc/dm/dm/master/workerrpc" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/unit" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/cputil" - "github.com/pingcap/ticdc/dm/pkg/election" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/checker" + dmcommon "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/dm/config" + ctlcommon "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/master/metrics" + "github.com/pingcap/tiflow/dm/dm/master/scheduler" + "github.com/pingcap/tiflow/dm/dm/master/shardddl" + "github.com/pingcap/tiflow/dm/dm/master/workerrpc" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/unit" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/cputil" + "github.com/pingcap/tiflow/dm/pkg/election" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) const ( diff --git a/dm/dm/master/server_test.go b/dm/dm/master/server_test.go index 8ee1bfb628f..842f9283221 100644 --- a/dm/dm/master/server_test.go +++ b/dm/dm/master/server_test.go @@ -44,24 +44,24 @@ import ( "go.etcd.io/etcd/integration" "google.golang.org/grpc" - "github.com/pingcap/ticdc/dm/checker" - common2 "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/master/scheduler" - "github.com/pingcap/ticdc/dm/dm/master/shardddl" - "github.com/pingcap/ticdc/dm/dm/master/workerrpc" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/pbmock" - "github.com/pingcap/ticdc/dm/pkg/conn" - "github.com/pingcap/ticdc/dm/pkg/cputil" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/ha" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/shardddl/optimism" - "github.com/pingcap/ticdc/dm/pkg/shardddl/pessimism" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/checker" + common2 "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/master/scheduler" + "github.com/pingcap/tiflow/dm/dm/master/shardddl" + "github.com/pingcap/tiflow/dm/dm/master/workerrpc" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/pbmock" + "github.com/pingcap/tiflow/dm/pkg/conn" + "github.com/pingcap/tiflow/dm/pkg/cputil" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/ha" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/shardddl/optimism" + "github.com/pingcap/tiflow/dm/pkg/shardddl/pessimism" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // use task config from integration test `sharding`. @@ -2074,12 +2074,12 @@ func (t *testMaster) subTaskStageMatch(c *check.C, s *scheduler.Scheduler, task, } func (t *testMaster) TestGRPCLongResponse(c *check.C) { - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dm/master/LongRPCResponse", `return()`), check.IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dm/master/LongRPCResponse", `return()`), check.IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/dm/master/LongRPCResponse") - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dm/ctl/common/SkipUpdateMasterClient", `return()`), check.IsNil) + defer failpoint.Disable("github.com/pingcap/tiflow/dm/dm/master/LongRPCResponse") + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dm/ctl/common/SkipUpdateMasterClient", `return()`), check.IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/dm/ctl/common/SkipUpdateMasterClient") + defer failpoint.Disable("github.com/pingcap/tiflow/dm/dm/ctl/common/SkipUpdateMasterClient") masterAddr := tempurl.Alloc()[len("http://"):] lis, err := net.Listen("tcp", masterAddr) diff --git a/dm/dm/master/shardddl/info.go b/dm/dm/master/shardddl/info.go index b4bbc7c1712..916e206c733 100644 --- a/dm/dm/master/shardddl/info.go +++ b/dm/dm/master/shardddl/info.go @@ -16,7 +16,7 @@ package shardddl import ( "sort" - "github.com/pingcap/ticdc/dm/pkg/shardddl/pessimism" + "github.com/pingcap/tiflow/dm/pkg/shardddl/pessimism" ) // PessimismInfoSlice attaches the methods of Interface to []pessimism.Info, diff --git a/dm/dm/master/shardddl/info_test.go b/dm/dm/master/shardddl/info_test.go index 49ddc0e104a..753a2eaae90 100644 --- a/dm/dm/master/shardddl/info_test.go +++ b/dm/dm/master/shardddl/info_test.go @@ -16,7 +16,7 @@ package shardddl import ( . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/shardddl/pessimism" + "github.com/pingcap/tiflow/dm/pkg/shardddl/pessimism" ) func (t *testPessimist) TestInfoSlice(c *C) { diff --git a/dm/dm/master/shardddl/optimist.go b/dm/dm/master/shardddl/optimist.go index eda57ea0332..bab8ef7e86d 100644 --- a/dm/dm/master/shardddl/optimist.go +++ b/dm/dm/master/shardddl/optimist.go @@ -26,15 +26,15 @@ import ( "go.etcd.io/etcd/clientv3" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/master/metrics" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/shardddl/optimism" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/master/metrics" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/shardddl/optimism" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // Optimist is used to coordinate the shard DDL migration in optimism mode. diff --git a/dm/dm/master/shardddl/optimist_test.go b/dm/dm/master/shardddl/optimist_test.go index b0ba6739437..873fe8c0794 100644 --- a/dm/dm/master/shardddl/optimist_test.go +++ b/dm/dm/master/shardddl/optimist_test.go @@ -30,11 +30,11 @@ import ( "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/integration" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/shardddl/optimism" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/shardddl/optimism" + "github.com/pingcap/tiflow/dm/pkg/utils" ) type testOptimist struct{} diff --git a/dm/dm/master/shardddl/pessimist.go b/dm/dm/master/shardddl/pessimist.go index e1f44df1e08..61f58a566ed 100644 --- a/dm/dm/master/shardddl/pessimist.go +++ b/dm/dm/master/shardddl/pessimist.go @@ -24,13 +24,13 @@ import ( "github.com/pingcap/failpoint" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/master/metrics" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/shardddl/pessimism" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/master/metrics" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/shardddl/pessimism" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var ( diff --git a/dm/dm/master/shardddl/pessimist_test.go b/dm/dm/master/shardddl/pessimist_test.go index 721e0a11c83..b2daee93b4c 100644 --- a/dm/dm/master/shardddl/pessimist_test.go +++ b/dm/dm/master/shardddl/pessimist_test.go @@ -25,13 +25,13 @@ import ( v3rpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/integration" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/shardddl/pessimism" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/shardddl/pessimism" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var ( diff --git a/dm/dm/master/workerrpc/interface.go b/dm/dm/master/workerrpc/interface.go index 94939b7504d..c704e4a04c2 100644 --- a/dm/dm/master/workerrpc/interface.go +++ b/dm/dm/master/workerrpc/interface.go @@ -17,7 +17,7 @@ import ( "context" "time" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/pb" ) // CmdType represents the concrete request type in Request or response type in Response. diff --git a/dm/dm/master/workerrpc/rawgrpc.go b/dm/dm/master/workerrpc/rawgrpc.go index b6f7d2f85c4..ace17d24b0a 100644 --- a/dm/dm/master/workerrpc/rawgrpc.go +++ b/dm/dm/master/workerrpc/rawgrpc.go @@ -22,9 +22,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/backoff" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // GRPCClient stores raw grpc connection and worker client. diff --git a/dm/dm/master/workerrpc/workerrpc_test.go b/dm/dm/master/workerrpc/workerrpc_test.go index bba2f148383..ab1d93113bf 100644 --- a/dm/dm/master/workerrpc/workerrpc_test.go +++ b/dm/dm/master/workerrpc/workerrpc_test.go @@ -23,10 +23,10 @@ import ( "github.com/pingcap/errors" "github.com/tikv/pd/pkg/tempurl" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/pbmock" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/pbmock" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var _ = Suite(&testWorkerRPCSuite{}) diff --git a/dm/dm/pbmock/dmmaster.go b/dm/dm/pbmock/dmmaster.go index e594da6a59c..e30c76f198f 100644 --- a/dm/dm/pbmock/dmmaster.go +++ b/dm/dm/pbmock/dmmaster.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/pingcap/ticdc/dm/dm/pb (interfaces: MasterClient,MasterServer) +// Source: github.com/pingcap/tiflow/dm/dm/pb (interfaces: MasterClient,MasterServer) // Package pbmock is a generated GoMock package. package pbmock @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - pb "github.com/pingcap/ticdc/dm/dm/pb" + pb "github.com/pingcap/tiflow/dm/dm/pb" grpc "google.golang.org/grpc" ) diff --git a/dm/dm/pbmock/dmworker.go b/dm/dm/pbmock/dmworker.go index 4e4b33aa3bd..31355d49404 100644 --- a/dm/dm/pbmock/dmworker.go +++ b/dm/dm/pbmock/dmworker.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/pingcap/ticdc/dm/dm/pb (interfaces: WorkerClient,WorkerServer) +// Source: github.com/pingcap/tiflow/dm/dm/pb (interfaces: WorkerClient,WorkerServer) // Package pbmock is a generated GoMock package. package pbmock @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - pb "github.com/pingcap/ticdc/dm/dm/pb" + pb "github.com/pingcap/tiflow/dm/dm/pb" grpc "google.golang.org/grpc" ) diff --git a/dm/dm/portal/api.go b/dm/dm/portal/api.go index 1a163dae022..e5eb688456e 100644 --- a/dm/dm/portal/api.go +++ b/dm/dm/portal/api.go @@ -36,9 +36,9 @@ import ( "go.uber.org/zap" "gopkg.in/yaml.v2" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/utils" ) const ( diff --git a/dm/dm/portal/api_test.go b/dm/dm/portal/api_test.go index 010ebe2ec74..c167b801156 100644 --- a/dm/dm/portal/api_test.go +++ b/dm/dm/portal/api_test.go @@ -34,7 +34,7 @@ import ( router "github.com/pingcap/tidb-tools/pkg/table-router" "github.com/pingcap/tidb/br/pkg/mock" - "github.com/pingcap/ticdc/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/config" ) var _ = Suite(&testPortalSuite{}) diff --git a/dm/dm/portal/config.go b/dm/dm/portal/config.go index d3c953bd512..d65541905de 100644 --- a/dm/dm/portal/config.go +++ b/dm/dm/portal/config.go @@ -26,9 +26,9 @@ import ( router "github.com/pingcap/tidb-tools/pkg/table-router" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // Config is the dm-portal's config. diff --git a/dm/dm/unit/unit.go b/dm/dm/unit/unit.go index 3b851d40d64..4451a652e86 100644 --- a/dm/dm/unit/unit.go +++ b/dm/dm/unit/unit.go @@ -18,10 +18,10 @@ import ( "strings" "time" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/terror" ) const ( diff --git a/dm/dm/unit/unit_test.go b/dm/dm/unit/unit_test.go index d1a44418564..b37118886b2 100644 --- a/dm/dm/unit/unit_test.go +++ b/dm/dm/unit/unit_test.go @@ -20,8 +20,8 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/terror" ) func TestSuite(t *testing.T) { diff --git a/dm/dm/worker/config.go b/dm/dm/worker/config.go index 9b738d0fb35..30947e5dcd6 100644 --- a/dm/dm/worker/config.go +++ b/dm/dm/worker/config.go @@ -25,10 +25,10 @@ import ( "github.com/BurntSushi/toml" "github.com/pingcap/failpoint" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // SampleConfigFile is sample config file of dm-worker. diff --git a/dm/dm/worker/config_test.go b/dm/dm/worker/config_test.go index ebbc3beabe5..30ccc607484 100644 --- a/dm/dm/worker/config_test.go +++ b/dm/dm/worker/config_test.go @@ -21,7 +21,7 @@ import ( "github.com/kami-zh/go-capturer" "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var ( diff --git a/dm/dm/worker/join.go b/dm/dm/worker/join.go index b88881fbcfd..ece56ec1a4d 100644 --- a/dm/dm/worker/join.go +++ b/dm/dm/worker/join.go @@ -23,11 +23,11 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/ha" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/ha" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // GetJoinURLs gets the endpoints from the join address. diff --git a/dm/dm/worker/metrics.go b/dm/dm/worker/metrics.go index 3ed9710d695..2a77ffd46dd 100644 --- a/dm/dm/worker/metrics.go +++ b/dm/dm/worker/metrics.go @@ -24,14 +24,14 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/dumpling" - "github.com/pingcap/ticdc/dm/loader" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/metricsproxy" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/relay" - syncer "github.com/pingcap/ticdc/dm/syncer/metrics" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/dumpling" + "github.com/pingcap/tiflow/dm/loader" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/metricsproxy" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/relay" + syncer "github.com/pingcap/tiflow/dm/syncer/metrics" ) const ( diff --git a/dm/dm/worker/relay.go b/dm/dm/worker/relay.go index a4ff098ecad..6fd3655ba7b 100644 --- a/dm/dm/worker/relay.go +++ b/dm/dm/worker/relay.go @@ -21,14 +21,14 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/relay" - "github.com/pingcap/ticdc/dm/relay/purger" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/relay" + "github.com/pingcap/tiflow/dm/relay/purger" ) // RelayHolder for relay unit. diff --git a/dm/dm/worker/relay_test.go b/dm/dm/worker/relay_test.go index 6c447c40048..9a8b94e7938 100644 --- a/dm/dm/worker/relay_test.go +++ b/dm/dm/worker/relay_test.go @@ -21,15 +21,15 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/unit" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/gtid" - pkgstreamer "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/relay" - "github.com/pingcap/ticdc/dm/relay/purger" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/unit" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/gtid" + pkgstreamer "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/relay" + "github.com/pingcap/tiflow/dm/relay/purger" ) type testRelay struct{} diff --git a/dm/dm/worker/server.go b/dm/dm/worker/server.go index e8227b2d56a..cac9331fdf4 100644 --- a/dm/dm/worker/server.go +++ b/dm/dm/worker/server.go @@ -20,18 +20,18 @@ import ( "sync" "time" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/unit" - "github.com/pingcap/ticdc/dm/pkg/binlog" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/ha" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/syncer" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/unit" + "github.com/pingcap/tiflow/dm/pkg/binlog" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/ha" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/syncer" "github.com/pingcap/errors" toolutils "github.com/pingcap/tidb-tools/pkg/utils" diff --git a/dm/dm/worker/server_test.go b/dm/dm/worker/server_test.go index 20d620c8e3f..c9458ece493 100644 --- a/dm/dm/worker/server_test.go +++ b/dm/dm/worker/server_test.go @@ -31,16 +31,16 @@ import ( v3rpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "google.golang.org/grpc" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/unit" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/ha" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/unit" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/ha" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // do not forget to update this path if the file removed/renamed. @@ -65,12 +65,12 @@ func (t *testServer) SetUpSuite(c *C) { c.Assert(err, IsNil) getMinLocForSubTaskFunc = getFakeLocForSubTask - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dm/worker/MockGetSourceCfgFromETCD", `return(true)`), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dm/worker/MockGetSourceCfgFromETCD", `return(true)`), IsNil) } func (t *testServer) TearDownSuite(c *C) { getMinLocForSubTaskFunc = getMinLocForSubTask - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/dm/worker/MockGetSourceCfgFromETCD"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/dm/worker/MockGetSourceCfgFromETCD"), IsNil) } func createMockETCD(dir string, host string) (*embed.Etcd, error) { @@ -295,7 +295,7 @@ func (t *testServer) TestHandleSourceBoundAfterError(c *C) { }), IsTrue) // enable failpoint - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/ha/FailToGetSourceCfg", `return(true)`), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/ha/FailToGetSourceCfg", `return(true)`), IsNil) sourceCfg := loadSourceConfigWithoutPassword(c) sourceCfg.EnableRelay = false _, err = ha.PutSourceCfg(etcdCli, sourceCfg) @@ -331,7 +331,7 @@ func (t *testServer) TestHandleSourceBoundAfterError(c *C) { // stop watching and disable failpoint cancel() wg.Wait() - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/ha/FailToGetSourceCfg"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/ha/FailToGetSourceCfg"), IsNil) _, err = ha.PutSourceBound(etcdCli, sourceBound) c.Assert(err, IsNil) diff --git a/dm/dm/worker/source_worker.go b/dm/dm/worker/source_worker.go index 11e626fda7d..9ea3e9385cc 100644 --- a/dm/dm/worker/source_worker.go +++ b/dm/dm/worker/source_worker.go @@ -27,17 +27,17 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/conn" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/ha" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/relay/purger" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/conn" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/ha" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/relay/purger" ) // SourceWorker manages a source(upstream) which is mainly related to subtasks and relay. diff --git a/dm/dm/worker/source_worker_test.go b/dm/dm/worker/source_worker_test.go index 0d65f19284f..2b234f7b924 100644 --- a/dm/dm/worker/source_worker_test.go +++ b/dm/dm/worker/source_worker_test.go @@ -26,14 +26,14 @@ import ( "github.com/tikv/pd/pkg/tempurl" "go.etcd.io/etcd/clientv3" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/unit" - "github.com/pingcap/ticdc/dm/pkg/conn" - "github.com/pingcap/ticdc/dm/pkg/ha" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/unit" + "github.com/pingcap/tiflow/dm/pkg/conn" + "github.com/pingcap/tiflow/dm/pkg/ha" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var emptyWorkerStatusInfoJSONLength = 25 @@ -122,12 +122,12 @@ func (t *testServer2) SetUpSuite(c *C) { c.Assert(err, IsNil) getMinLocForSubTaskFunc = getFakeLocForSubTask - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dm/worker/MockGetSourceCfgFromETCD", `return(true)`), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dm/worker/MockGetSourceCfgFromETCD", `return(true)`), IsNil) } func (t *testServer2) TearDownSuite(c *C) { getMinLocForSubTaskFunc = getMinLocForSubTask - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/dm/worker/MockGetSourceCfgFromETCD"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/dm/worker/MockGetSourceCfgFromETCD"), IsNil) } func (t *testServer2) TestTaskAutoResume(c *C) { @@ -162,18 +162,18 @@ func (t *testServer2) TestTaskAutoResume(c *C) { NewRelayHolder = NewRealRelayHolder }() - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dumpling/dumpUnitProcessForever", `return()`), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dumpling/dumpUnitProcessForever", `return()`), IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/dumpling/dumpUnitProcessForever") - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dm/worker/mockCreateUnitsDumpOnly", `return(true)`), IsNil) + defer failpoint.Disable("github.com/pingcap/tiflow/dm/dumpling/dumpUnitProcessForever") + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dm/worker/mockCreateUnitsDumpOnly", `return(true)`), IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/dm/worker/mockCreateUnitsDumpOnly") - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/loader/ignoreLoadCheckpointErr", `return()`), IsNil) + defer failpoint.Disable("github.com/pingcap/tiflow/dm/dm/worker/mockCreateUnitsDumpOnly") + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/loader/ignoreLoadCheckpointErr", `return()`), IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/loader/ignoreLoadCheckpointErr") - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dumpling/dumpUnitProcessWithError", `return("test auto resume inject error")`), IsNil) + defer failpoint.Disable("github.com/pingcap/tiflow/dm/loader/ignoreLoadCheckpointErr") + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dumpling/dumpUnitProcessWithError", `return("test auto resume inject error")`), IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/dumpling/dumpUnitProcessWithError") + defer failpoint.Disable("github.com/pingcap/tiflow/dm/dumpling/dumpUnitProcessWithError") s := NewServer(cfg) defer s.Close() @@ -210,7 +210,7 @@ func (t *testServer2) TestTaskAutoResume(c *C) { return false }), IsTrue) //nolint:errcheck - failpoint.Disable("github.com/pingcap/ticdc/dm/dumpling/dumpUnitProcessWithError") + failpoint.Disable("github.com/pingcap/tiflow/dm/dumpling/dumpUnitProcessWithError") rtsc, ok := s.getWorker(true).taskStatusChecker.(*realTaskStatusChecker) c.Assert(ok, IsTrue) @@ -251,7 +251,7 @@ func (t *testWorkerFunctionalities) SetUpSuite(c *C) { return []unit.Unit{mockDumper, mockLoader, mockSync} } getMinLocForSubTaskFunc = getFakeLocForSubTask - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dm/worker/MockGetSourceCfgFromETCD", `return(true)`), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dm/worker/MockGetSourceCfgFromETCD", `return(true)`), IsNil) } func (t *testWorkerFunctionalities) TearDownSuite(c *C) { @@ -259,7 +259,7 @@ func (t *testWorkerFunctionalities) TearDownSuite(c *C) { NewSubTask = NewRealSubTask createUnits = createRealUnits getMinLocForSubTaskFunc = getMinLocForSubTask - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/dm/worker/MockGetSourceCfgFromETCD"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/dm/worker/MockGetSourceCfgFromETCD"), IsNil) } func (t *testWorkerFunctionalities) TestWorkerFunctionalities(c *C) { @@ -424,14 +424,14 @@ func (t *testWorkerEtcdCompact) SetUpSuite(c *C) { mockSync := NewMockUnit(pb.UnitType_Sync) return []unit.Unit{mockDumper, mockLoader, mockSync} } - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dm/worker/MockGetSourceCfgFromETCD", `return(true)`), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dm/worker/MockGetSourceCfgFromETCD", `return(true)`), IsNil) } func (t *testWorkerEtcdCompact) TearDownSuite(c *C) { NewRelayHolder = NewRealRelayHolder NewSubTask = NewRealSubTask createUnits = createRealUnits - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/dm/worker/MockGetSourceCfgFromETCD"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/dm/worker/MockGetSourceCfgFromETCD"), IsNil) } func (t *testWorkerEtcdCompact) TestWatchSubtaskStageEtcdCompact(c *C) { diff --git a/dm/dm/worker/status.go b/dm/dm/worker/status.go index 4430a159beb..7940fa7a8ed 100644 --- a/dm/dm/worker/status.go +++ b/dm/dm/worker/status.go @@ -20,9 +20,9 @@ import ( "github.com/gogo/protobuf/jsonpb" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/binlog" ) // Status returns the status of the current sub task. diff --git a/dm/dm/worker/subtask.go b/dm/dm/worker/subtask.go index 81ef19296bb..c7a28751e2e 100644 --- a/dm/dm/worker/subtask.go +++ b/dm/dm/worker/subtask.go @@ -25,19 +25,19 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/unit" - "github.com/pingcap/ticdc/dm/dumpling" - "github.com/pingcap/ticdc/dm/loader" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/shardddl/pessimism" - "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/syncer" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/unit" + "github.com/pingcap/tiflow/dm/dumpling" + "github.com/pingcap/tiflow/dm/loader" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/shardddl/pessimism" + "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/syncer" ) const ( diff --git a/dm/dm/worker/subtask_test.go b/dm/dm/worker/subtask_test.go index d53cdaac6b0..88d9e7efd5c 100644 --- a/dm/dm/worker/subtask_test.go +++ b/dm/dm/worker/subtask_test.go @@ -18,15 +18,15 @@ import ( "strings" "time" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/unit" - "github.com/pingcap/ticdc/dm/dumpling" - "github.com/pingcap/ticdc/dm/loader" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/syncer" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/unit" + "github.com/pingcap/tiflow/dm/dumpling" + "github.com/pingcap/tiflow/dm/loader" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/syncer" . "github.com/pingcap/check" "github.com/pingcap/errors" diff --git a/dm/dm/worker/task_checker.go b/dm/dm/worker/task_checker.go index 3d82b6fafe0..2cacdc8e9a0 100644 --- a/dm/dm/worker/task_checker.go +++ b/dm/dm/worker/task_checker.go @@ -24,12 +24,12 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/backoff" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/retry" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/backoff" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/retry" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // Backoff related constants diff --git a/dm/dm/worker/task_checker_test.go b/dm/dm/worker/task_checker_test.go index b35fbe4b117..1a82bf4070a 100644 --- a/dm/dm/worker/task_checker_test.go +++ b/dm/dm/worker/task_checker_test.go @@ -21,11 +21,11 @@ import ( tmysql "github.com/pingcap/tidb/parser/mysql" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/unit" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/unit" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var _ = check.Suite(&testTaskCheckerSuite{}) diff --git a/dm/dm/worker/v1meta.go b/dm/dm/worker/v1meta.go index c8613e6fd5d..3b5c08e2e06 100644 --- a/dm/dm/worker/v1meta.go +++ b/dm/dm/worker/v1meta.go @@ -19,9 +19,9 @@ import ( "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/v1workermeta" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/v1workermeta" ) // OperateV1Meta implements WorkerServer.OperateV1Meta. diff --git a/dm/dumpling/dumpling.go b/dm/dumpling/dumpling.go index 05cf5280cc7..cab39480b0a 100644 --- a/dm/dumpling/dumpling.go +++ b/dm/dumpling/dumpling.go @@ -27,15 +27,15 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/unit" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/conn" - dutils "github.com/pingcap/ticdc/dm/pkg/dumpling" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/unit" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/conn" + dutils "github.com/pingcap/tiflow/dm/pkg/dumpling" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // Dumpling dumps full data from a MySQL-compatible database. diff --git a/dm/dumpling/dumpling_test.go b/dm/dumpling/dumpling_test.go index 6427353214d..ce5d658a1d0 100644 --- a/dm/dumpling/dumpling_test.go +++ b/dm/dumpling/dumpling_test.go @@ -22,9 +22,9 @@ import ( "github.com/pingcap/tidb-tools/pkg/filter" "github.com/pingcap/tidb/dumpling/export" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/log" . "github.com/pingcap/check" ) @@ -73,9 +73,9 @@ func (d *testDumplingSuite) TestDumpling(c *C) { c.Assert(err, IsNil) resultCh := make(chan pb.ProcessResult, 1) - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dumpling/dumpUnitProcessNoError", `return(true)`), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dumpling/dumpUnitProcessNoError", `return(true)`), IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/dumpling/dumpUnitProcessNoError") + defer failpoint.Disable("github.com/pingcap/tiflow/dm/dumpling/dumpUnitProcessNoError") dumpling.Process(ctx, resultCh) c.Assert(len(resultCh), Equals, 1) @@ -83,11 +83,11 @@ func (d *testDumplingSuite) TestDumpling(c *C) { c.Assert(result.IsCanceled, IsFalse) c.Assert(len(result.Errors), Equals, 0) //nolint:errcheck - failpoint.Disable("github.com/pingcap/ticdc/dm/dumpling/dumpUnitProcessNoError") + failpoint.Disable("github.com/pingcap/tiflow/dm/dumpling/dumpUnitProcessNoError") - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dumpling/dumpUnitProcessWithError", `return("unknown error")`), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dumpling/dumpUnitProcessWithError", `return("unknown error")`), IsNil) // nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/dumpling/dumpUnitProcessWithError") + defer failpoint.Disable("github.com/pingcap/tiflow/dm/dumpling/dumpUnitProcessWithError") // return error dumpling.Process(ctx, resultCh) @@ -97,15 +97,15 @@ func (d *testDumplingSuite) TestDumpling(c *C) { c.Assert(len(result.Errors), Equals, 1) c.Assert(result.Errors[0].Message, Equals, "unknown error") // nolint:errcheck - failpoint.Disable("github.com/pingcap/ticdc/dm/dumpling/dumpUnitProcessWithError") + failpoint.Disable("github.com/pingcap/tiflow/dm/dumpling/dumpUnitProcessWithError") // cancel - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dumpling/dumpUnitProcessCancel", `return("unknown error")`), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dumpling/dumpUnitProcessCancel", `return("unknown error")`), IsNil) // nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/dumpling/dumpUnitProcessCancel") - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/dumpling/dumpUnitProcessForever", `return(true)`), IsNil) + defer failpoint.Disable("github.com/pingcap/tiflow/dm/dumpling/dumpUnitProcessCancel") + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/dumpling/dumpUnitProcessForever", `return(true)`), IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/dumpling/dumpUnitProcessForever") + defer failpoint.Disable("github.com/pingcap/tiflow/dm/dumpling/dumpUnitProcessForever") ctx2, cancel2 := context.WithTimeout(context.Background(), 3*time.Second) defer cancel2() diff --git a/dm/dumpling/metrics.go b/dm/dumpling/metrics.go index be1cf40fc01..154728b98cd 100644 --- a/dm/dumpling/metrics.go +++ b/dm/dumpling/metrics.go @@ -19,7 +19,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/metricsproxy" + "github.com/pingcap/tiflow/dm/pkg/metricsproxy" ) // should alert. diff --git a/dm/dumpling/util.go b/dm/dumpling/util.go index a69ef652bea..a73ac959f51 100644 --- a/dm/dumpling/util.go +++ b/dm/dumpling/util.go @@ -22,8 +22,8 @@ import ( "github.com/pingcap/tidb/dumpling/export" "github.com/spf13/pflag" - dutils "github.com/pingcap/ticdc/dm/pkg/dumpling" - "github.com/pingcap/ticdc/dm/pkg/log" + dutils "github.com/pingcap/tiflow/dm/pkg/dumpling" + "github.com/pingcap/tiflow/dm/pkg/log" ) // ParseArgLikeBash parses list arguments like bash, which helps us to run diff --git a/dm/dumpling/util_test.go b/dm/dumpling/util_test.go index 67e90123c98..22b5927f28c 100644 --- a/dm/dumpling/util_test.go +++ b/dm/dumpling/util_test.go @@ -23,9 +23,9 @@ import ( "github.com/pingcap/tidb-tools/pkg/filter" tfilter "github.com/pingcap/tidb-tools/pkg/table-filter" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/conn" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/conn" + "github.com/pingcap/tiflow/dm/pkg/log" ) func (d *testDumplingSuite) TestParseArgs(c *C) { diff --git a/dm/loader/checkpoint.go b/dm/loader/checkpoint.go index c3f380ce1b7..8d5541bbace 100644 --- a/dm/loader/checkpoint.go +++ b/dm/loader/checkpoint.go @@ -20,12 +20,12 @@ import ( "sync" "time" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/cputil" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/cputil" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" "github.com/pingcap/tidb-tools/pkg/dbutil" "go.uber.org/zap" diff --git a/dm/loader/checkpoint_test.go b/dm/loader/checkpoint_test.go index 043bcc47a0c..976d984bcdc 100644 --- a/dm/loader/checkpoint_test.go +++ b/dm/loader/checkpoint_test.go @@ -21,10 +21,10 @@ import ( "github.com/DATA-DOG/go-sqlmock" . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/cputil" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/cputil" ) var _ = Suite(&testCheckPointSuite{}) diff --git a/dm/loader/convert_data.go b/dm/loader/convert_data.go index fcbdf368626..f97e841778f 100644 --- a/dm/loader/convert_data.go +++ b/dm/loader/convert_data.go @@ -22,10 +22,10 @@ import ( "strings" "unsafe" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - parserpkg "github.com/pingcap/ticdc/dm/pkg/parser" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + parserpkg "github.com/pingcap/tiflow/dm/pkg/parser" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" "github.com/pingcap/errors" cm "github.com/pingcap/tidb-tools/pkg/column-mapping" diff --git a/dm/loader/convert_data_test.go b/dm/loader/convert_data_test.go index 36e62c76a42..14b6cdb4dc4 100644 --- a/dm/loader/convert_data_test.go +++ b/dm/loader/convert_data_test.go @@ -17,7 +17,7 @@ import ( cm "github.com/pingcap/tidb-tools/pkg/column-mapping" router "github.com/pingcap/tidb-tools/pkg/table-router" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" . "github.com/pingcap/check" ) diff --git a/dm/loader/db.go b/dm/loader/db.go index d588c6a3626..5be41bba1bc 100644 --- a/dm/loader/db.go +++ b/dm/loader/db.go @@ -25,13 +25,13 @@ import ( tmysql "github.com/pingcap/tidb/parser/mysql" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/retry" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/retry" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // DBConn represents a live DB connection diff --git a/dm/loader/lightning.go b/dm/loader/lightning.go index e71fd4038b5..f92278f4c41 100644 --- a/dm/loader/lightning.go +++ b/dm/loader/lightning.go @@ -29,14 +29,14 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/unit" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/unit" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/utils" ) const ( diff --git a/dm/loader/loader.go b/dm/loader/loader.go index 2b80fba6ac7..ae03d03876c 100644 --- a/dm/loader/loader.go +++ b/dm/loader/loader.go @@ -28,15 +28,15 @@ import ( "go.etcd.io/etcd/clientv3" "golang.org/x/sync/errgroup" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/unit" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - fr "github.com/pingcap/ticdc/dm/pkg/func-rollback" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/unit" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + fr "github.com/pingcap/tiflow/dm/pkg/func-rollback" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" "github.com/pingcap/errors" "github.com/pingcap/failpoint" diff --git a/dm/loader/metrics.go b/dm/loader/metrics.go index 66c6a4c1a8d..7e00b854c58 100644 --- a/dm/loader/metrics.go +++ b/dm/loader/metrics.go @@ -16,7 +16,7 @@ package loader import ( "github.com/prometheus/client_golang/prometheus" - "github.com/pingcap/ticdc/dm/pkg/metricsproxy" + "github.com/pingcap/tiflow/dm/pkg/metricsproxy" ) var ( diff --git a/dm/loader/status.go b/dm/loader/status.go index 33a619ea30f..56f8ffcb7d4 100644 --- a/dm/loader/status.go +++ b/dm/loader/status.go @@ -18,8 +18,8 @@ import ( "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/binlog" ) // Status implements Unit.Status. diff --git a/dm/loader/status_test.go b/dm/loader/status_test.go index f756258dcc4..f6476c53b80 100644 --- a/dm/loader/status_test.go +++ b/dm/loader/status_test.go @@ -19,8 +19,8 @@ import ( . "github.com/pingcap/check" "go.uber.org/atomic" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/log" ) func (*testLoaderSuite) TestConcurrentStatus(c *C) { diff --git a/dm/loader/util.go b/dm/loader/util.go index e1830317843..523daae7b39 100644 --- a/dm/loader/util.go +++ b/dm/loader/util.go @@ -24,12 +24,12 @@ import ( "go.etcd.io/etcd/clientv3" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/dumpling" - "github.com/pingcap/ticdc/dm/pkg/ha" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/dumpling" + "github.com/pingcap/tiflow/dm/pkg/ha" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // SQLReplace works like strings.Replace but only supports one replacement. diff --git a/dm/openapi/fixtures/task.go b/dm/openapi/fixtures/task.go index 83c6ffb44fd..dd749ec6459 100644 --- a/dm/openapi/fixtures/task.go +++ b/dm/openapi/fixtures/task.go @@ -16,7 +16,7 @@ package fixtures import ( "encoding/json" - "github.com/pingcap/ticdc/dm/openapi" + "github.com/pingcap/tiflow/dm/openapi" ) var ( diff --git a/dm/openapi/task.go b/dm/openapi/task.go index 4b1b0963d0f..c24f60bccc7 100644 --- a/dm/openapi/task.go +++ b/dm/openapi/task.go @@ -14,7 +14,7 @@ package openapi import ( - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var defaultMetaSchema = "dm_meta" diff --git a/dm/openapi/task_test.go b/dm/openapi/task_test.go index c6458742722..e916ece4b1d 100644 --- a/dm/openapi/task_test.go +++ b/dm/openapi/task_test.go @@ -18,7 +18,7 @@ import ( "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var _ = check.Suite(&taskSuite{}) diff --git a/dm/pkg/backoff/backoff.go b/dm/pkg/backoff/backoff.go index 30dd74b20a8..6f7d01b4e66 100644 --- a/dm/pkg/backoff/backoff.go +++ b/dm/pkg/backoff/backoff.go @@ -18,7 +18,7 @@ import ( "math/rand" "time" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // Backoff is an exponential counter, it starts from `Min` duration, and after diff --git a/dm/pkg/backoff/backoff_test.go b/dm/pkg/backoff/backoff_test.go index fd0e0cf62f0..0e8110f8121 100644 --- a/dm/pkg/backoff/backoff_test.go +++ b/dm/pkg/backoff/backoff_test.go @@ -20,7 +20,7 @@ import ( "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) func TestT(t *testing.T) { diff --git a/dm/pkg/binlog/event/common.go b/dm/pkg/binlog/event/common.go index 5f291f248ec..c9280c89e6c 100644 --- a/dm/pkg/binlog/event/common.go +++ b/dm/pkg/binlog/event/common.go @@ -20,8 +20,8 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" "github.com/go-mysql-org/go-mysql/replication" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // DDLDMLResult represents a binlog event result for generated DDL/DML. diff --git a/dm/pkg/binlog/event/common_test.go b/dm/pkg/binlog/event/common_test.go index 1945cf67546..ab584675607 100644 --- a/dm/pkg/binlog/event/common_test.go +++ b/dm/pkg/binlog/event/common_test.go @@ -22,7 +22,7 @@ import ( "github.com/go-mysql-org/go-mysql/replication" . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/gtid" ) var _ = Suite(&testCommonSuite{}) diff --git a/dm/pkg/binlog/event/ddl.go b/dm/pkg/binlog/event/ddl.go index 0c331773b8e..7eed3b4ea92 100644 --- a/dm/pkg/binlog/event/ddl.go +++ b/dm/pkg/binlog/event/ddl.go @@ -20,8 +20,8 @@ import ( "github.com/go-mysql-org/go-mysql/replication" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // GenCreateDatabaseEvents generates binlog events for `CREATE DATABASE`. diff --git a/dm/pkg/binlog/event/ddl_test.go b/dm/pkg/binlog/event/ddl_test.go index 41503b4b80d..40c37227037 100644 --- a/dm/pkg/binlog/event/ddl_test.go +++ b/dm/pkg/binlog/event/ddl_test.go @@ -20,7 +20,7 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/gtid" ) var _ = Suite(&testDDLSuite{}) diff --git a/dm/pkg/binlog/event/dml.go b/dm/pkg/binlog/event/dml.go index b2c2acc14de..71259ce33ec 100644 --- a/dm/pkg/binlog/event/dml.go +++ b/dm/pkg/binlog/event/dml.go @@ -19,8 +19,8 @@ import ( "github.com/go-mysql-org/go-mysql/replication" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // DMLData represents data used to generate events for DML statements. diff --git a/dm/pkg/binlog/event/dml_test.go b/dm/pkg/binlog/event/dml_test.go index ec540ea11a8..a18a0516f3d 100644 --- a/dm/pkg/binlog/event/dml_test.go +++ b/dm/pkg/binlog/event/dml_test.go @@ -20,7 +20,7 @@ import ( "github.com/go-mysql-org/go-mysql/replication" . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/gtid" ) var _ = Suite(&testDMLSuite{}) diff --git a/dm/pkg/binlog/event/event.go b/dm/pkg/binlog/event/event.go index d2178016d49..63e0bf9bfb9 100644 --- a/dm/pkg/binlog/event/event.go +++ b/dm/pkg/binlog/event/event.go @@ -23,8 +23,8 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" "github.com/go-mysql-org/go-mysql/replication" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // flags used in RowsEvent. diff --git a/dm/pkg/binlog/event/event_test.go b/dm/pkg/binlog/event/event_test.go index b9c9177e6d9..7f849d5ee6c 100644 --- a/dm/pkg/binlog/event/event_test.go +++ b/dm/pkg/binlog/event/event_test.go @@ -27,7 +27,7 @@ import ( "github.com/go-mysql-org/go-mysql/replication" . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/gtid" ) var _ = Suite(&testEventSuite{}) diff --git a/dm/pkg/binlog/event/generator.go b/dm/pkg/binlog/event/generator.go index adcd6bb4a95..431ff3a97d9 100644 --- a/dm/pkg/binlog/event/generator.go +++ b/dm/pkg/binlog/event/generator.go @@ -17,8 +17,8 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" "github.com/go-mysql-org/go-mysql/replication" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // Generator represents a binlog events generator. diff --git a/dm/pkg/binlog/event/generator_test.go b/dm/pkg/binlog/event/generator_test.go index 973decf180d..bf7ce941279 100644 --- a/dm/pkg/binlog/event/generator_test.go +++ b/dm/pkg/binlog/event/generator_test.go @@ -22,7 +22,7 @@ import ( "github.com/go-mysql-org/go-mysql/replication" . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/gtid" ) var _ = Suite(&testGeneratorSuite{}) diff --git a/dm/pkg/binlog/event/helper.go b/dm/pkg/binlog/event/helper.go index d1294ce82d9..ec36c0adfd7 100644 --- a/dm/pkg/binlog/event/helper.go +++ b/dm/pkg/binlog/event/helper.go @@ -17,8 +17,8 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" "github.com/go-mysql-org/go-mysql/replication" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // GTIDsFromPreviousGTIDsEvent get GTID set from a PreviousGTIDsEvent. diff --git a/dm/pkg/binlog/event/helper_test.go b/dm/pkg/binlog/event/helper_test.go index 34fbaec9be1..750da640774 100644 --- a/dm/pkg/binlog/event/helper_test.go +++ b/dm/pkg/binlog/event/helper_test.go @@ -20,8 +20,8 @@ import ( "github.com/go-mysql-org/go-mysql/replication" . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var _ = Suite(&testHelperSuite{}) diff --git a/dm/pkg/binlog/event/sid_mysql.go b/dm/pkg/binlog/event/sid_mysql.go index abe99fa28e1..ff2f334eb4e 100644 --- a/dm/pkg/binlog/event/sid_mysql.go +++ b/dm/pkg/binlog/event/sid_mysql.go @@ -21,7 +21,7 @@ import ( "github.com/go-mysql-org/go-mysql/replication" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // SID represents a SERVER_UUID in GTIDEvent/PrevGTIDEvent. diff --git a/dm/pkg/binlog/event/util.go b/dm/pkg/binlog/event/util.go index 9e3a29e3897..2e83fde673d 100644 --- a/dm/pkg/binlog/event/util.go +++ b/dm/pkg/binlog/event/util.go @@ -31,7 +31,7 @@ import ( "github.com/pingcap/tidb/parser" "github.com/pingcap/tidb/parser/mysql" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // encodeTableMapColumnMeta generates the column_meta_def according to the column_type_def. diff --git a/dm/pkg/binlog/event/util_test.go b/dm/pkg/binlog/event/util_test.go index 76916a8c5d6..9bb657af40c 100644 --- a/dm/pkg/binlog/event/util_test.go +++ b/dm/pkg/binlog/event/util_test.go @@ -21,7 +21,7 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var _ = Suite(&testUtilSuite{}) diff --git a/dm/pkg/binlog/filename.go b/dm/pkg/binlog/filename.go index 6bd6b4a9f24..a6d02d3a483 100644 --- a/dm/pkg/binlog/filename.go +++ b/dm/pkg/binlog/filename.go @@ -18,7 +18,7 @@ import ( "strconv" "strings" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) const ( diff --git a/dm/pkg/binlog/position.go b/dm/pkg/binlog/position.go index 91c8fc6ac9a..7691f3cb73b 100644 --- a/dm/pkg/binlog/position.go +++ b/dm/pkg/binlog/position.go @@ -21,10 +21,10 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) const ( diff --git a/dm/pkg/binlog/position_test.go b/dm/pkg/binlog/position_test.go index d43b2af875c..715451718fb 100644 --- a/dm/pkg/binlog/position_test.go +++ b/dm/pkg/binlog/position_test.go @@ -19,7 +19,7 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/gtid" ) var _ = Suite(&testPositionSuite{}) diff --git a/dm/pkg/binlog/reader/file.go b/dm/pkg/binlog/reader/file.go index f5f06ae0123..bef16862573 100644 --- a/dm/pkg/binlog/reader/file.go +++ b/dm/pkg/binlog/reader/file.go @@ -28,10 +28,10 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/binlog/common" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/binlog/common" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // FileReader is a binlog event reader which reads binlog events from a file. diff --git a/dm/pkg/binlog/reader/file_test.go b/dm/pkg/binlog/reader/file_test.go index 1b0018f8b64..9685c7ed982 100644 --- a/dm/pkg/binlog/reader/file_test.go +++ b/dm/pkg/binlog/reader/file_test.go @@ -26,10 +26,10 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/dm/pkg/binlog/common" - "github.com/pingcap/ticdc/dm/pkg/binlog/event" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/binlog/common" + "github.com/pingcap/tiflow/dm/pkg/binlog/event" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var _ = Suite(&testFileReaderSuite{}) diff --git a/dm/pkg/binlog/reader/mock.go b/dm/pkg/binlog/reader/mock.go index 7b650d60f52..94ab389abde 100644 --- a/dm/pkg/binlog/reader/mock.go +++ b/dm/pkg/binlog/reader/mock.go @@ -19,7 +19,7 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" "github.com/go-mysql-org/go-mysql/replication" - "github.com/pingcap/ticdc/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/gtid" ) // MockReader is a binlog event reader which read binlog events from an input channel. diff --git a/dm/pkg/binlog/reader/reader.go b/dm/pkg/binlog/reader/reader.go index 7202aba81d7..0b131425bc7 100644 --- a/dm/pkg/binlog/reader/reader.go +++ b/dm/pkg/binlog/reader/reader.go @@ -19,7 +19,7 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" "github.com/go-mysql-org/go-mysql/replication" - "github.com/pingcap/ticdc/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/gtid" ) // Reader is a binlog event reader, it may read binlog events from a TCP stream, binlog files or any other in-memory buffer. diff --git a/dm/pkg/binlog/reader/tcp.go b/dm/pkg/binlog/reader/tcp.go index 7a27770f231..be44d0aaafa 100644 --- a/dm/pkg/binlog/reader/tcp.go +++ b/dm/pkg/binlog/reader/tcp.go @@ -29,11 +29,11 @@ import ( "github.com/pingcap/failpoint" - "github.com/pingcap/ticdc/dm/pkg/binlog/common" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/binlog/common" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var customID int64 diff --git a/dm/pkg/binlog/reader/tcp_test.go b/dm/pkg/binlog/reader/tcp_test.go index 9c94ea93185..9891263c969 100644 --- a/dm/pkg/binlog/reader/tcp_test.go +++ b/dm/pkg/binlog/reader/tcp_test.go @@ -24,8 +24,8 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/failpoint" - "github.com/pingcap/ticdc/dm/pkg/binlog/common" - "github.com/pingcap/ticdc/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/binlog/common" + "github.com/pingcap/tiflow/dm/pkg/gtid" ) var ( @@ -41,19 +41,19 @@ func TestSuite(t *testing.T) { type testTCPReaderSuite struct{} func (t *testTCPReaderSuite) SetUpSuite(c *C) { - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/binlog/reader/MockTCPReaderStartSyncByPos", "return(true)"), IsNil) - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/binlog/reader/MockTCPReaderStartSyncByGTID", "return(true)"), IsNil) - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/binlog/reader/MockTCPReaderClose", "return(true)"), IsNil) - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/binlog/reader/MockTCPReaderGetEvent", "return(true)"), IsNil) - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/binlog/reader/MockTCPReaderStatus", "return(true)"), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/binlog/reader/MockTCPReaderStartSyncByPos", "return(true)"), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/binlog/reader/MockTCPReaderStartSyncByGTID", "return(true)"), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/binlog/reader/MockTCPReaderClose", "return(true)"), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/binlog/reader/MockTCPReaderGetEvent", "return(true)"), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/binlog/reader/MockTCPReaderStatus", "return(true)"), IsNil) } func (t *testTCPReaderSuite) TearDownSuite(c *C) { - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/binlog/reader/MockTCPReaderStartSyncByPos"), IsNil) - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/binlog/reader/MockTCPReaderStartSyncByGTID"), IsNil) - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/binlog/reader/MockTCPReaderClose"), IsNil) - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/binlog/reader/MockTCPReaderGetEvent"), IsNil) - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/binlog/reader/MockTCPReaderStatus"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/binlog/reader/MockTCPReaderStartSyncByPos"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/binlog/reader/MockTCPReaderStartSyncByGTID"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/binlog/reader/MockTCPReaderClose"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/binlog/reader/MockTCPReaderGetEvent"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/binlog/reader/MockTCPReaderStatus"), IsNil) } func (t *testTCPReaderSuite) TestSyncPos(c *C) { diff --git a/dm/pkg/binlog/reader/util.go b/dm/pkg/binlog/reader/util.go index 702ba9d7a17..9d417746523 100644 --- a/dm/pkg/binlog/reader/util.go +++ b/dm/pkg/binlog/reader/util.go @@ -24,12 +24,12 @@ import ( "github.com/pingcap/failpoint" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/binlog/event" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/relay/common" + "github.com/pingcap/tiflow/dm/pkg/binlog/event" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/relay/common" ) // GetGTIDsForPosFromStreamer tries to get GTID sets for the specified binlog position (for the corresponding txn) from a Streamer. diff --git a/dm/pkg/binlog/status.go b/dm/pkg/binlog/status.go index 36c5ee6b0f5..0c00f142c98 100644 --- a/dm/pkg/binlog/status.go +++ b/dm/pkg/binlog/status.go @@ -20,7 +20,7 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // in MySQL, we can set `max_binlog_size` to control the max size of a binlog file. diff --git a/dm/pkg/binlog/writer/file.go b/dm/pkg/binlog/writer/file.go index 8295e89d223..a0834e82859 100644 --- a/dm/pkg/binlog/writer/file.go +++ b/dm/pkg/binlog/writer/file.go @@ -22,9 +22,9 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/binlog/common" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/binlog/common" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // FileWriter is a binlog event writer which writes binlog events to a file. diff --git a/dm/pkg/binlog/writer/file_test.go b/dm/pkg/binlog/writer/file_test.go index 3b8ba49fb23..fbdb9d4035e 100644 --- a/dm/pkg/binlog/writer/file_test.go +++ b/dm/pkg/binlog/writer/file_test.go @@ -23,8 +23,8 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/binlog/common" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/binlog/common" + "github.com/pingcap/tiflow/dm/pkg/log" ) func TestSuite(t *testing.T) { diff --git a/dm/pkg/conn/baseconn.go b/dm/pkg/conn/baseconn.go index 95641069d3e..34f62c877d4 100644 --- a/dm/pkg/conn/baseconn.go +++ b/dm/pkg/conn/baseconn.go @@ -25,12 +25,12 @@ import ( "github.com/pingcap/failpoint" "go.uber.org/zap" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/metricsproxy" - "github.com/pingcap/ticdc/dm/pkg/retry" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/metricsproxy" + "github.com/pingcap/tiflow/dm/pkg/retry" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // BaseConn is the basic connection we use in dm diff --git a/dm/pkg/conn/baseconn_test.go b/dm/pkg/conn/baseconn_test.go index e6b70bf90ce..67948010ef8 100644 --- a/dm/pkg/conn/baseconn_test.go +++ b/dm/pkg/conn/baseconn_test.go @@ -18,10 +18,10 @@ import ( "strings" "testing" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/metricsproxy" - "github.com/pingcap/ticdc/dm/pkg/retry" - "github.com/pingcap/ticdc/dm/pkg/terror" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/metricsproxy" + "github.com/pingcap/tiflow/dm/pkg/retry" + "github.com/pingcap/tiflow/dm/pkg/terror" "github.com/DATA-DOG/go-sqlmock" . "github.com/pingcap/check" diff --git a/dm/pkg/conn/basedb.go b/dm/pkg/conn/basedb.go index de3566afe7b..250adb6aaeb 100644 --- a/dm/pkg/conn/basedb.go +++ b/dm/pkg/conn/basedb.go @@ -26,10 +26,10 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/pingcap/failpoint" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/retry" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/retry" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" "github.com/go-sql-driver/mysql" toolutils "github.com/pingcap/tidb-tools/pkg/utils" diff --git a/dm/pkg/conn/basedb_test.go b/dm/pkg/conn/basedb_test.go index c6053a0bcc3..92860cde982 100644 --- a/dm/pkg/conn/basedb_test.go +++ b/dm/pkg/conn/basedb_test.go @@ -19,8 +19,8 @@ import ( sqlmock "github.com/DATA-DOG/go-sqlmock" - "github.com/pingcap/ticdc/dm/dm/config" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" + "github.com/pingcap/tiflow/dm/dm/config" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" ) var _ = Suite(&testBaseDBSuite{}) @@ -63,9 +63,9 @@ func (t *testBaseDBSuite) TestGetBaseConn(c *C) { } func (t *testBaseDBSuite) TestFailDBPing(c *C) { - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/conn/failDBPing", "return"), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/conn/failDBPing", "return"), IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/conn/failDBPing") + defer failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/conn/failDBPing") cfg := &config.DBConfig{User: "root", Host: "127.0.0.1", Port: 3306} cfg.Adjust() diff --git a/dm/pkg/conn/mockdb.go b/dm/pkg/conn/mockdb.go index 7c1e95af018..912d018462b 100644 --- a/dm/pkg/conn/mockdb.go +++ b/dm/pkg/conn/mockdb.go @@ -19,7 +19,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" check "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/config" ) type mockDBProvider struct { diff --git a/dm/pkg/conn/utils.go b/dm/pkg/conn/utils.go index 277fe573a00..0bc5a5226a3 100644 --- a/dm/pkg/conn/utils.go +++ b/dm/pkg/conn/utils.go @@ -19,7 +19,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/tidb-tools/pkg/dbutil" - "github.com/pingcap/ticdc/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/config" ) // FetchTimeZoneSetting fetch target db global time_zone setting. diff --git a/dm/pkg/conn/utils_test.go b/dm/pkg/conn/utils_test.go index 93c208593f7..b366fb2517d 100644 --- a/dm/pkg/conn/utils_test.go +++ b/dm/pkg/conn/utils_test.go @@ -18,7 +18,7 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/config" ) var _ = Suite(testUtilSuite{}) diff --git a/dm/pkg/context/context.go b/dm/pkg/context/context.go index 8a673d74071..dfc4c379fd7 100644 --- a/dm/pkg/context/context.go +++ b/dm/pkg/context/context.go @@ -17,7 +17,7 @@ import ( "context" "time" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/log" ) // Context is used to in dm to record some context field like diff --git a/dm/pkg/dumpling/utils.go b/dm/pkg/dumpling/utils.go index 37bd2300e64..fb8c60dc661 100644 --- a/dm/pkg/dumpling/utils.go +++ b/dm/pkg/dumpling/utils.go @@ -24,9 +24,9 @@ import ( "github.com/docker/go-units" "github.com/go-mysql-org/go-mysql/mysql" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // ParseMetaData parses mydumper's output meta file and returns binlog location. diff --git a/dm/pkg/dumpling/utils_test.go b/dm/pkg/dumpling/utils_test.go index 5563a80c3a8..7dd864519bb 100644 --- a/dm/pkg/dumpling/utils_test.go +++ b/dm/pkg/dumpling/utils_test.go @@ -20,8 +20,8 @@ import ( "github.com/go-mysql-org/go-mysql/mysql" . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var _ = Suite(&testSuite{}) diff --git a/dm/pkg/election/election.go b/dm/pkg/election/election.go index 588c469aa79..f5cef51e0d3 100644 --- a/dm/pkg/election/election.go +++ b/dm/pkg/election/election.go @@ -29,8 +29,8 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) const ( diff --git a/dm/pkg/election/election_test.go b/dm/pkg/election/election_test.go index 428d2cef3c9..bac257439b6 100644 --- a/dm/pkg/election/election_test.go +++ b/dm/pkg/election/election_test.go @@ -27,10 +27,10 @@ import ( "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/embed" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var _ = SerialSuites(&testElectionSuite{}) @@ -110,9 +110,9 @@ func testElection2After1(t *testElectionSuite, c *C, normalExit bool) { ctx1, cancel1 := context.WithCancel(context.Background()) defer cancel1() if !normalExit { - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/election/mockCampaignLoopExitedAbnormally", `return()`), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/election/mockCampaignLoopExitedAbnormally", `return()`), IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/election/mockCampaignLoopExitedAbnormally") + defer failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/election/mockCampaignLoopExitedAbnormally") } e1, err := NewElection(ctx1, cli, sessionTTL, key, ID1, addr1, t.notifyBlockTime) c.Assert(err, IsNil) @@ -131,7 +131,7 @@ func testElection2After1(t *testElectionSuite, c *C, normalExit bool) { c.Assert(leaderID, Equals, e1.ID()) c.Assert(leaderAddr, Equals, addr1) if !normalExit { - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/election/mockCampaignLoopExitedAbnormally"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/election/mockCampaignLoopExitedAbnormally"), IsNil) } // start e2 diff --git a/dm/pkg/encrypt/encrypt.go b/dm/pkg/encrypt/encrypt.go index 87520e20d59..a7023d874fb 100644 --- a/dm/pkg/encrypt/encrypt.go +++ b/dm/pkg/encrypt/encrypt.go @@ -20,7 +20,7 @@ import ( "crypto/rand" "encoding/hex" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var ( diff --git a/dm/pkg/etcdutil/etcdutil.go b/dm/pkg/etcdutil/etcdutil.go index 2e6ffd058d6..2907bbe9695 100644 --- a/dm/pkg/etcdutil/etcdutil.go +++ b/dm/pkg/etcdutil/etcdutil.go @@ -26,9 +26,9 @@ import ( v3rpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.uber.org/zap" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/retry" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/retry" ) const ( diff --git a/dm/pkg/etcdutil/etcdutil_test.go b/dm/pkg/etcdutil/etcdutil_test.go index bcc9c6c5f12..0d8afe3aa96 100644 --- a/dm/pkg/etcdutil/etcdutil_test.go +++ b/dm/pkg/etcdutil/etcdutil_test.go @@ -29,8 +29,8 @@ import ( "go.etcd.io/etcd/etcdserver/etcdserverpb" "go.etcd.io/etcd/integration" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var _ = Suite(&testEtcdUtilSuite{}) @@ -239,9 +239,9 @@ func (t *testEtcdUtilSuite) testDoOpsInOneTxnWithRetry(c *C) { c.Assert(resp.Responses, HasLen, 2) // enable failpoint - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/etcdutil/ErrNoSpace", `3*return()`), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/etcdutil/ErrNoSpace", `3*return()`), IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/etcdutil/ErrNoSpace") + defer failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/etcdutil/ErrNoSpace") // put again resp, rev2, err = DoOpsInOneCmpsTxnWithRetry(cli, []clientv3.Cmp{clientv3util.KeyMissing(key1), clientv3util.KeyMissing(key2)}, []clientv3.Op{ diff --git a/dm/pkg/func-rollback/rollback.go b/dm/pkg/func-rollback/rollback.go index 4c7a8e8e321..3f5935eb6e9 100644 --- a/dm/pkg/func-rollback/rollback.go +++ b/dm/pkg/func-rollback/rollback.go @@ -16,7 +16,7 @@ package rollback import ( "sync" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/log" "go.uber.org/zap" ) diff --git a/dm/pkg/gtid/gtid.go b/dm/pkg/gtid/gtid.go index b125ddec2a8..d1bd972083b 100644 --- a/dm/pkg/gtid/gtid.go +++ b/dm/pkg/gtid/gtid.go @@ -17,7 +17,7 @@ import ( "github.com/go-mysql-org/go-mysql/mysql" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // Set provide gtid operations for syncer. diff --git a/dm/pkg/gtid/gtid_test.go b/dm/pkg/gtid/gtid_test.go index cb7c88a2223..fbe731bdaa8 100644 --- a/dm/pkg/gtid/gtid_test.go +++ b/dm/pkg/gtid/gtid_test.go @@ -20,7 +20,7 @@ import ( "github.com/go-mysql-org/go-mysql/mysql" . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var _ = Suite(&testGTIDSuite{}) diff --git a/dm/pkg/ha/bound.go b/dm/pkg/ha/bound.go index db209dae42c..1a6da3bd7af 100644 --- a/dm/pkg/ha/bound.go +++ b/dm/pkg/ha/bound.go @@ -23,11 +23,11 @@ import ( "go.etcd.io/etcd/mvcc/mvccpb" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) const ( diff --git a/dm/pkg/ha/bound_test.go b/dm/pkg/ha/bound_test.go index caa17786c49..ec689fa2f4a 100644 --- a/dm/pkg/ha/bound_test.go +++ b/dm/pkg/ha/bound_test.go @@ -17,7 +17,7 @@ import ( "context" "time" - "github.com/pingcap/ticdc/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/config" . "github.com/pingcap/check" ) diff --git a/dm/pkg/ha/keepalive.go b/dm/pkg/ha/keepalive.go index 590c6663319..ada13ba86da 100644 --- a/dm/pkg/ha/keepalive.go +++ b/dm/pkg/ha/keepalive.go @@ -23,9 +23,9 @@ import ( "go.etcd.io/etcd/mvcc/mvccpb" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/log" ) var ( diff --git a/dm/pkg/ha/keepalive_test.go b/dm/pkg/ha/keepalive_test.go index b170b2600a4..3cbabc701b3 100644 --- a/dm/pkg/ha/keepalive_test.go +++ b/dm/pkg/ha/keepalive_test.go @@ -20,7 +20,7 @@ import ( "sync/atomic" "time" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/utils" . "github.com/pingcap/check" ) diff --git a/dm/pkg/ha/load_task.go b/dm/pkg/ha/load_task.go index 4f90935c38a..4d019600470 100644 --- a/dm/pkg/ha/load_task.go +++ b/dm/pkg/ha/load_task.go @@ -21,8 +21,8 @@ import ( "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/mvcc/mvccpb" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" ) // LoadTask uses to watch load worker events. diff --git a/dm/pkg/ha/ops.go b/dm/pkg/ha/ops.go index 4fc3c2956c5..2cdbbe8844c 100644 --- a/dm/pkg/ha/ops.go +++ b/dm/pkg/ha/ops.go @@ -17,8 +17,8 @@ import ( "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/mvcc/mvccpb" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" ) // PutRelayStageRelayConfigSourceBound puts the following data in one txn. diff --git a/dm/pkg/ha/ops_test.go b/dm/pkg/ha/ops_test.go index b23dd5f227e..d0730879f85 100644 --- a/dm/pkg/ha/ops_test.go +++ b/dm/pkg/ha/ops_test.go @@ -16,8 +16,8 @@ package ha import ( . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" ) func (t *testForEtcd) TestOpsEtcd(c *C) { diff --git a/dm/pkg/ha/relay.go b/dm/pkg/ha/relay.go index 937e1beea18..3b9bd029a60 100644 --- a/dm/pkg/ha/relay.go +++ b/dm/pkg/ha/relay.go @@ -21,11 +21,11 @@ import ( "go.etcd.io/etcd/mvcc/mvccpb" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // RelaySource represents the bound relationship between the DM-worker instance and its upstream relay source. diff --git a/dm/pkg/ha/relay_test.go b/dm/pkg/ha/relay_test.go index 3fdac9186b9..8fdd781b59c 100644 --- a/dm/pkg/ha/relay_test.go +++ b/dm/pkg/ha/relay_test.go @@ -14,7 +14,7 @@ package ha import ( - "github.com/pingcap/ticdc/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/config" . "github.com/pingcap/check" ) diff --git a/dm/pkg/ha/source.go b/dm/pkg/ha/source.go index 7cbdce48663..5224e5d04bb 100644 --- a/dm/pkg/ha/source.go +++ b/dm/pkg/ha/source.go @@ -19,10 +19,10 @@ import ( "github.com/pingcap/failpoint" "go.etcd.io/etcd/clientv3" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // PutSourceCfg puts the config of the upstream source into etcd. diff --git a/dm/pkg/ha/source_test.go b/dm/pkg/ha/source_test.go index dcc2fe96c0b..2dfd3120b21 100644 --- a/dm/pkg/ha/source_test.go +++ b/dm/pkg/ha/source_test.go @@ -25,7 +25,7 @@ import ( "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/integration" - "github.com/pingcap/ticdc/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/config" ) const ( diff --git a/dm/pkg/ha/stage.go b/dm/pkg/ha/stage.go index 1d3451af9dd..781de9667bf 100644 --- a/dm/pkg/ha/stage.go +++ b/dm/pkg/ha/stage.go @@ -21,12 +21,12 @@ import ( "go.etcd.io/etcd/mvcc/mvccpb" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // Stage represents the running stage for a relay or subtask. diff --git a/dm/pkg/ha/stage_test.go b/dm/pkg/ha/stage_test.go index 3b1b9a3d2c1..a92645bf530 100644 --- a/dm/pkg/ha/stage_test.go +++ b/dm/pkg/ha/stage_test.go @@ -19,8 +19,8 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" ) func (t *testForEtcd) TestStageJSON(c *C) { diff --git a/dm/pkg/ha/subtask.go b/dm/pkg/ha/subtask.go index afae7c11eb4..660a487bd87 100644 --- a/dm/pkg/ha/subtask.go +++ b/dm/pkg/ha/subtask.go @@ -18,10 +18,10 @@ import ( "go.etcd.io/etcd/clientv3" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // GetSubTaskCfg gets the subtask config of the specified source and task name. diff --git a/dm/pkg/ha/subtask_test.go b/dm/pkg/ha/subtask_test.go index 28548b43bf5..eb1e9f567e3 100644 --- a/dm/pkg/ha/subtask_test.go +++ b/dm/pkg/ha/subtask_test.go @@ -18,7 +18,7 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/config" ) const ( diff --git a/dm/pkg/ha/worker.go b/dm/pkg/ha/worker.go index 13171c349b8..e28f7663f19 100644 --- a/dm/pkg/ha/worker.go +++ b/dm/pkg/ha/worker.go @@ -19,8 +19,8 @@ import ( "go.etcd.io/etcd/clientv3" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" ) // WorkerInfo represents the node information of the DM-worker. diff --git a/dm/pkg/log/log.go b/dm/pkg/log/log.go index ba2482562c9..98920087430 100644 --- a/dm/pkg/log/log.go +++ b/dm/pkg/log/log.go @@ -24,8 +24,8 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/pingcap/ticdc/dm/pkg/helper" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/helper" + "github.com/pingcap/tiflow/dm/pkg/terror" ) const ( diff --git a/dm/pkg/parser/common.go b/dm/pkg/parser/common.go index 7f32b718915..a8f40a4c9b5 100644 --- a/dm/pkg/parser/common.go +++ b/dm/pkg/parser/common.go @@ -16,9 +16,9 @@ package parser import ( "bytes" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" "github.com/pingcap/tidb-tools/pkg/filter" "github.com/pingcap/tidb/parser" diff --git a/dm/pkg/parser/common_test.go b/dm/pkg/parser/common_test.go index 8450490ae38..ccdaf6737aa 100644 --- a/dm/pkg/parser/common_test.go +++ b/dm/pkg/parser/common_test.go @@ -20,8 +20,8 @@ import ( "github.com/pingcap/tidb-tools/pkg/filter" "github.com/pingcap/tidb/parser" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var _ = Suite(&testParserSuite{}) diff --git a/dm/pkg/retry/errors.go b/dm/pkg/retry/errors.go index 3bbbed36fb1..849329262c1 100644 --- a/dm/pkg/retry/errors.go +++ b/dm/pkg/retry/errors.go @@ -20,7 +20,7 @@ import ( "github.com/pingcap/errors" tmysql "github.com/pingcap/tidb/parser/mysql" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // some error reference: https://docs.pingcap.com/tidb/stable/tidb-limitations#limitations-on-a-single-table diff --git a/dm/pkg/retry/strategy.go b/dm/pkg/retry/strategy.go index 01838de8bd2..bbaceb65fb6 100644 --- a/dm/pkg/retry/strategy.go +++ b/dm/pkg/retry/strategy.go @@ -16,7 +16,7 @@ package retry import ( "time" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" ) // backoffStrategy represents enum of retry wait interval. diff --git a/dm/pkg/retry/strategy_test.go b/dm/pkg/retry/strategy_test.go index 3ca8f700805..eb087900b7f 100644 --- a/dm/pkg/retry/strategy_test.go +++ b/dm/pkg/retry/strategy_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/terror" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/terror" . "github.com/pingcap/check" "github.com/pingcap/tidb-tools/pkg/dbutil" diff --git a/dm/pkg/schema/tracker.go b/dm/pkg/schema/tracker.go index 27dd4f55361..2f7d3624091 100644 --- a/dm/pkg/schema/tracker.go +++ b/dm/pkg/schema/tracker.go @@ -33,10 +33,10 @@ import ( "github.com/pingcap/tidb/store/mockstore" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - dmterror "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + dmterror "github.com/pingcap/tiflow/dm/pkg/terror" ) const ( diff --git a/dm/pkg/schema/tracker_test.go b/dm/pkg/schema/tracker_test.go index b8262e30da8..621fdf48780 100644 --- a/dm/pkg/schema/tracker_test.go +++ b/dm/pkg/schema/tracker_test.go @@ -29,8 +29,8 @@ import ( "github.com/pingcap/tidb/parser/model" "go.uber.org/zap/zapcore" - "github.com/pingcap/ticdc/dm/pkg/conn" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/conn" + "github.com/pingcap/tiflow/dm/pkg/terror" ) func Test(t *testing.T) { diff --git a/dm/pkg/shardddl/optimism/column.go b/dm/pkg/shardddl/optimism/column.go index b7c869f422f..bddf728b841 100644 --- a/dm/pkg/shardddl/optimism/column.go +++ b/dm/pkg/shardddl/optimism/column.go @@ -18,8 +18,8 @@ import ( "go.etcd.io/etcd/clientv3" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" ) // GetAllDroppedColumns gets the all partially dropped columns. diff --git a/dm/pkg/shardddl/optimism/info.go b/dm/pkg/shardddl/optimism/info.go index ae703290c14..eb0179a7a58 100644 --- a/dm/pkg/shardddl/optimism/info.go +++ b/dm/pkg/shardddl/optimism/info.go @@ -23,9 +23,9 @@ import ( "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/mvcc/mvccpb" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/log" ) // TODO: much of the code in optimistic mode is very similar to pessimistic mode, we can try to combine them together. diff --git a/dm/pkg/shardddl/optimism/info_test.go b/dm/pkg/shardddl/optimism/info_test.go index a552ac939a0..63df2a422a1 100644 --- a/dm/pkg/shardddl/optimism/info_test.go +++ b/dm/pkg/shardddl/optimism/info_test.go @@ -30,8 +30,8 @@ import ( "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/integration" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" ) var etcdTestCli *clientv3.Client diff --git a/dm/pkg/shardddl/optimism/keeper.go b/dm/pkg/shardddl/optimism/keeper.go index 8fc57437784..b88493e78f1 100644 --- a/dm/pkg/shardddl/optimism/keeper.go +++ b/dm/pkg/shardddl/optimism/keeper.go @@ -20,8 +20,8 @@ import ( "github.com/pingcap/tidb-tools/pkg/schemacmp" "go.etcd.io/etcd/clientv3" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // LockKeeper used to keep and handle DDL lock conveniently. diff --git a/dm/pkg/shardddl/optimism/keeper_test.go b/dm/pkg/shardddl/optimism/keeper_test.go index adbba568ce4..6b686872c66 100644 --- a/dm/pkg/shardddl/optimism/keeper_test.go +++ b/dm/pkg/shardddl/optimism/keeper_test.go @@ -23,7 +23,7 @@ import ( "github.com/pingcap/tidb/util/mock" "go.etcd.io/etcd/integration" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/utils" ) type testKeeper struct{} diff --git a/dm/pkg/shardddl/optimism/lock.go b/dm/pkg/shardddl/optimism/lock.go index 55d65f4cf5b..7b9740ce126 100644 --- a/dm/pkg/shardddl/optimism/lock.go +++ b/dm/pkg/shardddl/optimism/lock.go @@ -23,9 +23,9 @@ import ( "go.etcd.io/etcd/clientv3" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/master/metrics" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/master/metrics" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // DropColumnStage represents whether drop column done for a sharding table. diff --git a/dm/pkg/shardddl/optimism/lock_test.go b/dm/pkg/shardddl/optimism/lock_test.go index 7987e9d35d2..1ed4ebc64a0 100644 --- a/dm/pkg/shardddl/optimism/lock_test.go +++ b/dm/pkg/shardddl/optimism/lock_test.go @@ -24,9 +24,9 @@ import ( "github.com/pingcap/tidb/util/mock" "go.etcd.io/etcd/integration" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) type testLock struct{} diff --git a/dm/pkg/shardddl/optimism/operation.go b/dm/pkg/shardddl/optimism/operation.go index 624c3a9f689..99dcd7dda52 100644 --- a/dm/pkg/shardddl/optimism/operation.go +++ b/dm/pkg/shardddl/optimism/operation.go @@ -21,8 +21,8 @@ import ( "go.etcd.io/etcd/clientv3/clientv3util" "go.etcd.io/etcd/mvcc/mvccpb" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" ) // ConflictStage represents the current shard DDL conflict stage in the optimistic mode. diff --git a/dm/pkg/shardddl/optimism/ops.go b/dm/pkg/shardddl/optimism/ops.go index dc727789445..7cd13bace1d 100644 --- a/dm/pkg/shardddl/optimism/ops.go +++ b/dm/pkg/shardddl/optimism/ops.go @@ -16,9 +16,9 @@ package optimism import ( "go.etcd.io/etcd/clientv3" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // PutSourceTablesInfo puts source tables and a shard DDL info. diff --git a/dm/pkg/shardddl/optimism/schema.go b/dm/pkg/shardddl/optimism/schema.go index 7f4008eef2c..c4f4167e4df 100644 --- a/dm/pkg/shardddl/optimism/schema.go +++ b/dm/pkg/shardddl/optimism/schema.go @@ -20,8 +20,8 @@ import ( "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/clientv3/clientv3util" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" ) // InitSchema represents the initial schema (schema before the lock constructed) of a merged table. diff --git a/dm/pkg/shardddl/optimism/table.go b/dm/pkg/shardddl/optimism/table.go index fd624e000ff..0951720fd77 100644 --- a/dm/pkg/shardddl/optimism/table.go +++ b/dm/pkg/shardddl/optimism/table.go @@ -21,8 +21,8 @@ import ( "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/mvcc/mvccpb" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" ) // SourceTables represents the upstream/sources tables for a data migration **subtask**. diff --git a/dm/pkg/shardddl/pessimism/info.go b/dm/pkg/shardddl/pessimism/info.go index 18bab7f2aec..066ab514500 100644 --- a/dm/pkg/shardddl/pessimism/info.go +++ b/dm/pkg/shardddl/pessimism/info.go @@ -21,9 +21,9 @@ import ( "go.etcd.io/etcd/clientv3/clientv3util" "go.etcd.io/etcd/mvcc/mvccpb" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // Info represents the shard DDL information. diff --git a/dm/pkg/shardddl/pessimism/info_test.go b/dm/pkg/shardddl/pessimism/info_test.go index bf4642d643b..43427197d3e 100644 --- a/dm/pkg/shardddl/pessimism/info_test.go +++ b/dm/pkg/shardddl/pessimism/info_test.go @@ -25,8 +25,8 @@ import ( "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/integration" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var etcdTestCli *clientv3.Client diff --git a/dm/pkg/shardddl/pessimism/keeper.go b/dm/pkg/shardddl/pessimism/keeper.go index 215c5661de1..3af1e6e88f7 100644 --- a/dm/pkg/shardddl/pessimism/keeper.go +++ b/dm/pkg/shardddl/pessimism/keeper.go @@ -16,8 +16,8 @@ package pessimism import ( "sync" - "github.com/pingcap/ticdc/dm/dm/master/metrics" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/master/metrics" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // LockKeeper used to keep and handle DDL lock conveniently. diff --git a/dm/pkg/shardddl/pessimism/lock.go b/dm/pkg/shardddl/pessimism/lock.go index b1485242ea7..3061e0c9f46 100644 --- a/dm/pkg/shardddl/pessimism/lock.go +++ b/dm/pkg/shardddl/pessimism/lock.go @@ -16,9 +16,9 @@ package pessimism import ( "sync" - "github.com/pingcap/ticdc/dm/dm/master/metrics" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/master/metrics" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // Lock represents the shard DDL lock in memory. diff --git a/dm/pkg/shardddl/pessimism/lock_test.go b/dm/pkg/shardddl/pessimism/lock_test.go index 2abf36f7671..322d0c37527 100644 --- a/dm/pkg/shardddl/pessimism/lock_test.go +++ b/dm/pkg/shardddl/pessimism/lock_test.go @@ -16,7 +16,7 @@ package pessimism import ( . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) type testLock struct{} diff --git a/dm/pkg/shardddl/pessimism/operation.go b/dm/pkg/shardddl/pessimism/operation.go index 9988dfcc163..7a7fc786c7d 100644 --- a/dm/pkg/shardddl/pessimism/operation.go +++ b/dm/pkg/shardddl/pessimism/operation.go @@ -21,8 +21,8 @@ import ( "go.etcd.io/etcd/clientv3/clientv3util" "go.etcd.io/etcd/mvcc/mvccpb" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" ) // Operation represents a shard DDL coordinate operation. diff --git a/dm/pkg/shardddl/pessimism/ops.go b/dm/pkg/shardddl/pessimism/ops.go index 359650ffa01..643afb06df5 100644 --- a/dm/pkg/shardddl/pessimism/ops.go +++ b/dm/pkg/shardddl/pessimism/ops.go @@ -18,8 +18,8 @@ import ( "go.etcd.io/etcd/clientv3" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" ) // TODO(csuzhangxc): assign terror code before merged into the master branch. diff --git a/dm/pkg/streamer/file.go b/dm/pkg/streamer/file.go index 8a426075efd..395e4fde9ef 100644 --- a/dm/pkg/streamer/file.go +++ b/dm/pkg/streamer/file.go @@ -24,10 +24,10 @@ import ( "github.com/BurntSushi/toml" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // FileCmp is a compare condition used when collecting binlog files. diff --git a/dm/pkg/streamer/file_test.go b/dm/pkg/streamer/file_test.go index f02a89043ae..a50df8d143e 100644 --- a/dm/pkg/streamer/file_test.go +++ b/dm/pkg/streamer/file_test.go @@ -26,8 +26,8 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var _ = Suite(&testFileSuite{}) diff --git a/dm/pkg/streamer/hub.go b/dm/pkg/streamer/hub.go index 0099c61cde9..1886baa5a64 100644 --- a/dm/pkg/streamer/hub.go +++ b/dm/pkg/streamer/hub.go @@ -18,9 +18,9 @@ import ( "strings" "sync" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var ( diff --git a/dm/pkg/streamer/reader.go b/dm/pkg/streamer/reader.go index f078f9e0d24..48a92f1d5e9 100644 --- a/dm/pkg/streamer/reader.go +++ b/dm/pkg/streamer/reader.go @@ -29,14 +29,14 @@ import ( "github.com/pingcap/errors" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/binlog/event" - "github.com/pingcap/ticdc/dm/pkg/binlog/reader" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/binlog/event" + "github.com/pingcap/tiflow/dm/pkg/binlog/reader" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // Meta represents binlog meta information in relay.meta. diff --git a/dm/pkg/streamer/reader_test.go b/dm/pkg/streamer/reader_test.go index 5e7942ac509..1a70eb09682 100644 --- a/dm/pkg/streamer/reader_test.go +++ b/dm/pkg/streamer/reader_test.go @@ -36,11 +36,11 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" - "github.com/pingcap/ticdc/dm/pkg/binlog/event" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/binlog/event" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var parseFileTimeout = 10 * time.Second @@ -61,11 +61,11 @@ func (t *testReaderSuite) SetUpSuite(c *C) { t.lastPos = 0 t.lastGTID, err = gtid.ParserGTID(gmysql.MySQLFlavor, "ba8f633f-1f15-11eb-b1c7-0242ac110002:0") c.Assert(err, IsNil) - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/streamer/SetHeartbeatInterval", "return(10000)"), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/streamer/SetHeartbeatInterval", "return(10000)"), IsNil) } func (t *testReaderSuite) TearDownSuite(c *C) { - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/streamer/SetHeartbeatInterval"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/streamer/SetHeartbeatInterval"), IsNil) } func (t *testReaderSuite) TestParseFileBase(c *C) { diff --git a/dm/pkg/streamer/streamer.go b/dm/pkg/streamer/streamer.go index 1398508300e..6a791eadbf4 100644 --- a/dm/pkg/streamer/streamer.go +++ b/dm/pkg/streamer/streamer.go @@ -17,11 +17,11 @@ import ( "context" "time" - "github.com/pingcap/ticdc/dm/pkg/binlog/common" - "github.com/pingcap/ticdc/dm/pkg/binlog/event" - "github.com/pingcap/ticdc/dm/pkg/binlog/reader" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/binlog/common" + "github.com/pingcap/tiflow/dm/pkg/binlog/event" + "github.com/pingcap/tiflow/dm/pkg/binlog/reader" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" "github.com/go-mysql-org/go-mysql/replication" "github.com/pingcap/failpoint" diff --git a/dm/pkg/streamer/streamer_test.go b/dm/pkg/streamer/streamer_test.go index 279d874fb92..67a89123fcc 100644 --- a/dm/pkg/streamer/streamer_test.go +++ b/dm/pkg/streamer/streamer_test.go @@ -22,8 +22,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" - "github.com/pingcap/ticdc/dm/pkg/binlog/event" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/binlog/event" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var _ = Suite(&testStreamerSuite{}) @@ -31,9 +31,9 @@ var _ = Suite(&testStreamerSuite{}) type testStreamerSuite struct{} func (t *testStreamerSuite) TestStreamer(c *C) { - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/streamer/SetHeartbeatInterval", "return(10000)"), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/streamer/SetHeartbeatInterval", "return(10000)"), IsNil) defer func() { - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/streamer/SetHeartbeatInterval"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/streamer/SetHeartbeatInterval"), IsNil) }() ctx, cancel := context.WithTimeout(context.Background(), time.Second) @@ -105,9 +105,9 @@ func (t *testStreamerSuite) TestStreamer(c *C) { } func (t *testStreamerSuite) TestHeartbeat(c *C) { - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/streamer/SetHeartbeatInterval", "return(1)"), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/streamer/SetHeartbeatInterval", "return(1)"), IsNil) defer func() { - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/streamer/SetHeartbeatInterval"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/streamer/SetHeartbeatInterval"), IsNil) }() ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) diff --git a/dm/pkg/streamer/util.go b/dm/pkg/streamer/util.go index bdd29073e19..84dd0b5ffb3 100644 --- a/dm/pkg/streamer/util.go +++ b/dm/pkg/streamer/util.go @@ -19,8 +19,8 @@ import ( "github.com/pingcap/errors" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // getNextUUID gets (the nextUUID and its suffix) after the current UUID. diff --git a/dm/pkg/upgrade/upgrade.go b/dm/pkg/upgrade/upgrade.go index b4e9ce336a3..79fe79aa2e8 100644 --- a/dm/pkg/upgrade/upgrade.go +++ b/dm/pkg/upgrade/upgrade.go @@ -22,14 +22,14 @@ import ( "go.etcd.io/etcd/clientv3" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/cputil" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/cputil" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // upgrades records all functions used to upgrade from one version to the later version. diff --git a/dm/pkg/upgrade/upgrade_test.go b/dm/pkg/upgrade/upgrade_test.go index 9b62e75df89..0504ccd79b5 100644 --- a/dm/pkg/upgrade/upgrade_test.go +++ b/dm/pkg/upgrade/upgrade_test.go @@ -22,7 +22,7 @@ import ( "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/integration" - "github.com/pingcap/ticdc/dm/dm/common" + "github.com/pingcap/tiflow/dm/dm/common" ) var ( diff --git a/dm/pkg/upgrade/version.go b/dm/pkg/upgrade/version.go index 2d203f4edf6..6d6d6f249a8 100644 --- a/dm/pkg/upgrade/version.go +++ b/dm/pkg/upgrade/version.go @@ -18,10 +18,10 @@ import ( "go.etcd.io/etcd/clientv3" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/pkg/etcdutil" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/pkg/etcdutil" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) const ( diff --git a/dm/pkg/utils/common.go b/dm/pkg/utils/common.go index b7cd414cc85..6f88836fd40 100644 --- a/dm/pkg/utils/common.go +++ b/dm/pkg/utils/common.go @@ -34,8 +34,8 @@ import ( "github.com/shopspring/decimal" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // TrimCtrlChars returns a slice of the string s with all leading diff --git a/dm/pkg/utils/db.go b/dm/pkg/utils/db.go index 456271a0c56..b9519b28a48 100644 --- a/dm/pkg/utils/db.go +++ b/dm/pkg/utils/db.go @@ -34,9 +34,9 @@ import ( tmysql "github.com/pingcap/tidb/parser/mysql" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) const ( diff --git a/dm/pkg/utils/db_test.go b/dm/pkg/utils/db_test.go index 2811c90c8a2..3687f1eaf82 100644 --- a/dm/pkg/utils/db_test.go +++ b/dm/pkg/utils/db_test.go @@ -26,7 +26,7 @@ import ( "github.com/pingcap/errors" tmysql "github.com/pingcap/tidb/parser/mysql" - "github.com/pingcap/ticdc/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/gtid" ) var _ = Suite(&testDBSuite{}) diff --git a/dm/pkg/utils/encrypt.go b/dm/pkg/utils/encrypt.go index fc409cfcd6b..db7078656ae 100644 --- a/dm/pkg/utils/encrypt.go +++ b/dm/pkg/utils/encrypt.go @@ -16,8 +16,8 @@ package utils import ( "encoding/base64" - "github.com/pingcap/ticdc/dm/pkg/encrypt" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/encrypt" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // Encrypt tries to encrypt plaintext to base64 encoded ciphertext. diff --git a/dm/pkg/utils/encrypt_test.go b/dm/pkg/utils/encrypt_test.go index 0019edd1e91..e179b5bf114 100644 --- a/dm/pkg/utils/encrypt_test.go +++ b/dm/pkg/utils/encrypt_test.go @@ -18,7 +18,7 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var _ = Suite(&testEncryptSuite{}) diff --git a/dm/pkg/utils/file.go b/dm/pkg/utils/file.go index c8dba92bd0a..27d08a8b645 100644 --- a/dm/pkg/utils/file.go +++ b/dm/pkg/utils/file.go @@ -22,8 +22,8 @@ import ( "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // IsFileExists checks if file exists. diff --git a/dm/pkg/utils/file_test.go b/dm/pkg/utils/file_test.go index 88047d2c840..bdcb49f5c81 100644 --- a/dm/pkg/utils/file_test.go +++ b/dm/pkg/utils/file_test.go @@ -19,7 +19,7 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var _ = Suite(&testFileSuite{}) diff --git a/dm/pkg/utils/printer.go b/dm/pkg/utils/printer.go index e4e4d6603f2..69bafe312b5 100644 --- a/dm/pkg/utils/printer.go +++ b/dm/pkg/utils/printer.go @@ -16,7 +16,7 @@ package utils import ( "fmt" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/log" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/dm/pkg/utils/printer_test.go b/dm/pkg/utils/printer_test.go index 8b39a04dd60..509aa650848 100644 --- a/dm/pkg/utils/printer_test.go +++ b/dm/pkg/utils/printer_test.go @@ -17,7 +17,7 @@ import ( capturer "github.com/kami-zh/go-capturer" . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/log" ) var _ = Suite(&testPrinterSuite{}) diff --git a/dm/pkg/utils/relay.go b/dm/pkg/utils/relay.go index b010e443fd4..ca9a9fa01c4 100644 --- a/dm/pkg/utils/relay.go +++ b/dm/pkg/utils/relay.go @@ -24,7 +24,7 @@ import ( "github.com/go-mysql-org/go-mysql/replication" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // not support to config yet. diff --git a/dm/pkg/utils/storage_unix.go b/dm/pkg/utils/storage_unix.go index 7b455ed5d19..4b255765e3f 100644 --- a/dm/pkg/utils/storage_unix.go +++ b/dm/pkg/utils/storage_unix.go @@ -21,7 +21,7 @@ import ( "golang.org/x/sys/unix" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // GetStorageSize gets storage's capacity and available size. diff --git a/dm/pkg/utils/storage_windows.go b/dm/pkg/utils/storage_windows.go index 4fb069a8085..7ea6b4185c2 100644 --- a/dm/pkg/utils/storage_windows.go +++ b/dm/pkg/utils/storage_windows.go @@ -20,7 +20,7 @@ import ( "syscall" "unsafe" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var ( diff --git a/dm/pkg/utils/time.go b/dm/pkg/utils/time.go index 7991f1e6f37..d333d21a285 100644 --- a/dm/pkg/utils/time.go +++ b/dm/pkg/utils/time.go @@ -20,7 +20,7 @@ import ( "github.com/pingcap/tidb-tools/pkg/dbutil" "github.com/pingcap/tidb/types" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // ParseTimeZone parse the time zone location by name or offset diff --git a/dm/pkg/utils/util.go b/dm/pkg/utils/util.go index 619609cee12..aba654f1133 100644 --- a/dm/pkg/utils/util.go +++ b/dm/pkg/utils/util.go @@ -30,9 +30,9 @@ import ( "go.uber.org/zap" "golang.org/x/net/http/httpproxy" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var ( diff --git a/dm/pkg/v1dbschema/schema.go b/dm/pkg/v1dbschema/schema.go index 6f1e32a9580..999f902f8dc 100644 --- a/dm/pkg/v1dbschema/schema.go +++ b/dm/pkg/v1dbschema/schema.go @@ -26,16 +26,16 @@ import ( "github.com/pingcap/tidb/errno" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/binlog/reader" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/cputil" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/binlog/reader" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/cputil" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // UpdateSchema updates the DB schema from v1.0.x to v2.0.x, including: diff --git a/dm/pkg/v1dbschema/schema_test.go b/dm/pkg/v1dbschema/schema_test.go index f4a10e857c5..bdd0522dfb2 100644 --- a/dm/pkg/v1dbschema/schema_test.go +++ b/dm/pkg/v1dbschema/schema_test.go @@ -24,10 +24,10 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/failpoint" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/gtid" ) func TestSuite(t *testing.T) { @@ -101,12 +101,12 @@ func (t *testSchema) TestSchemaV106ToV20x(c *C) { endGS, _ = gtid.ParserGTID(gmysql.MySQLFlavor, "ccb992ad-a557-11ea-ba6a-0242ac140002:1-16") ) - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/v1dbschema/MockGetGTIDsForPos", `return("ccb992ad-a557-11ea-ba6a-0242ac140002:10-16")`), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/v1dbschema/MockGetGTIDsForPos", `return("ccb992ad-a557-11ea-ba6a-0242ac140002:10-16")`), IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/v1dbschema/MockGetGTIDsForPos") - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/utils/GetGTIDPurged", `return("ccb992ad-a557-11ea-ba6a-0242ac140002:1-9")`), IsNil) + defer failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/v1dbschema/MockGetGTIDsForPos") + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/utils/GetGTIDPurged", `return("ccb992ad-a557-11ea-ba6a-0242ac140002:1-9")`), IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/utils/GetGTIDPurged") + defer failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/utils/GetGTIDPurged") // update schema without GTID enabled. // mock updateSyncerCheckpoint diff --git a/dm/pkg/v1workermeta/api.go b/dm/pkg/v1workermeta/api.go index 2aa8dca1f3a..8af0f361651 100644 --- a/dm/pkg/v1workermeta/api.go +++ b/dm/pkg/v1workermeta/api.go @@ -20,10 +20,10 @@ import ( "github.com/BurntSushi/toml" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // `var` rather than `const` for testing. diff --git a/dm/pkg/v1workermeta/api_test.go b/dm/pkg/v1workermeta/api_test.go index 1fe6cfc13af..1d13a81d3ec 100644 --- a/dm/pkg/v1workermeta/api_test.go +++ b/dm/pkg/v1workermeta/api_test.go @@ -21,9 +21,9 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) type testAPI struct{} diff --git a/dm/pkg/v1workermeta/db.go b/dm/pkg/v1workermeta/db.go index 5308377ae3c..694f93cd376 100644 --- a/dm/pkg/v1workermeta/db.go +++ b/dm/pkg/v1workermeta/db.go @@ -17,7 +17,7 @@ import ( "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/opt" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // kvConfig is the configuration of goleveldb. diff --git a/dm/pkg/v1workermeta/meta.go b/dm/pkg/v1workermeta/meta.go index f7f1fa53f30..9f3f0f986de 100644 --- a/dm/pkg/v1workermeta/meta.go +++ b/dm/pkg/v1workermeta/meta.go @@ -18,8 +18,8 @@ import ( "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // meta stores metadata of tasks. diff --git a/dm/pkg/v1workermeta/meta_test.go b/dm/pkg/v1workermeta/meta_test.go index 0cfbfafbf1c..2781b4ed3fb 100644 --- a/dm/pkg/v1workermeta/meta_test.go +++ b/dm/pkg/v1workermeta/meta_test.go @@ -20,9 +20,9 @@ import ( . "github.com/pingcap/check" "github.com/syndtr/goleveldb/leveldb" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/terror" ) func TestSuite(t *testing.T) { diff --git a/dm/relay/common/util.go b/dm/relay/common/util.go index d75c6fc1ac1..87a65e5738c 100644 --- a/dm/relay/common/util.go +++ b/dm/relay/common/util.go @@ -17,8 +17,8 @@ import ( "github.com/pingcap/tidb/parser" "github.com/pingcap/tidb/parser/ast" - parserpkg "github.com/pingcap/ticdc/dm/pkg/parser" - "github.com/pingcap/ticdc/dm/pkg/utils" + parserpkg "github.com/pingcap/tiflow/dm/pkg/parser" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // CheckIsDDL checks input SQL whether is a valid DDL statement. diff --git a/dm/relay/config.go b/dm/relay/config.go index 5efac22e0ad..965af3f53e9 100644 --- a/dm/relay/config.go +++ b/dm/relay/config.go @@ -16,9 +16,9 @@ package relay import ( "encoding/json" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/relay/retry" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/relay/retry" ) // Config is the configuration for Relay. diff --git a/dm/relay/meta.go b/dm/relay/meta.go index 1b46f0c293b..c48f2c5ae2b 100644 --- a/dm/relay/meta.go +++ b/dm/relay/meta.go @@ -23,10 +23,10 @@ import ( "github.com/BurntSushi/toml" "github.com/go-mysql-org/go-mysql/mysql" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var ( diff --git a/dm/relay/meta_test.go b/dm/relay/meta_test.go index e31ef1e8196..56c25f69875 100644 --- a/dm/relay/meta_test.go +++ b/dm/relay/meta_test.go @@ -21,7 +21,7 @@ import ( "github.com/go-mysql-org/go-mysql/mysql" . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/gtid" ) var _ = Suite(&testMetaSuite{}) diff --git a/dm/relay/metrics.go b/dm/relay/metrics.go index 9c670c6f4c6..a7d5753e7bb 100644 --- a/dm/relay/metrics.go +++ b/dm/relay/metrics.go @@ -20,10 +20,10 @@ import ( "github.com/pingcap/failpoint" "github.com/prometheus/client_golang/prometheus" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/metricsproxy" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/metricsproxy" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var ( diff --git a/dm/relay/purger/file.go b/dm/relay/purger/file.go index 5e8c2cdb4d7..1b2e0779fc4 100644 --- a/dm/relay/purger/file.go +++ b/dm/relay/purger/file.go @@ -20,10 +20,10 @@ import ( "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // subRelayFiles represents relay log files in one sub directory. diff --git a/dm/relay/purger/file_test.go b/dm/relay/purger/file_test.go index c926bd47a35..9675bdc750b 100644 --- a/dm/relay/purger/file_test.go +++ b/dm/relay/purger/file_test.go @@ -20,9 +20,9 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/utils" ) func (t *testPurgerSuite) TestPurgeRelayFilesBeforeFile(c *C) { diff --git a/dm/relay/purger/purger.go b/dm/relay/purger/purger.go index c869748536b..d7a5efb763b 100644 --- a/dm/relay/purger/purger.go +++ b/dm/relay/purger/purger.go @@ -22,12 +22,12 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // RelayOperator represents an operator for relay log files, like writer, reader. diff --git a/dm/relay/purger/purger_test.go b/dm/relay/purger/purger_test.go index c43def46daa..f3c7e0bf2ed 100644 --- a/dm/relay/purger/purger_test.go +++ b/dm/relay/purger/purger_test.go @@ -24,10 +24,10 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var _ = Suite(&testPurgerSuite{ diff --git a/dm/relay/purger/strategy.go b/dm/relay/purger/strategy.go index 2ee1e5955f8..dad84cdfe8b 100644 --- a/dm/relay/purger/strategy.go +++ b/dm/relay/purger/strategy.go @@ -13,7 +13,7 @@ package purger -import "github.com/pingcap/ticdc/dm/pkg/streamer" +import "github.com/pingcap/tiflow/dm/pkg/streamer" type strategyType uint32 diff --git a/dm/relay/purger/strategy_filename.go b/dm/relay/purger/strategy_filename.go index 6d346b1139d..aa90d5da005 100644 --- a/dm/relay/purger/strategy_filename.go +++ b/dm/relay/purger/strategy_filename.go @@ -20,10 +20,10 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var fakeTaskName = strategyFilename.String() diff --git a/dm/relay/purger/strategy_inactive.go b/dm/relay/purger/strategy_inactive.go index 0c404a2b29d..dc08a76a52a 100644 --- a/dm/relay/purger/strategy_inactive.go +++ b/dm/relay/purger/strategy_inactive.go @@ -20,9 +20,9 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // inactiveArgs represents args needed by inactiveStrategy. diff --git a/dm/relay/purger/strategy_space.go b/dm/relay/purger/strategy_space.go index ce281b01a35..e97303dc508 100644 --- a/dm/relay/purger/strategy_space.go +++ b/dm/relay/purger/strategy_space.go @@ -20,10 +20,10 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // spaceArgs represents args needed by spaceStrategy. diff --git a/dm/relay/purger/strategy_time.go b/dm/relay/purger/strategy_time.go index b52f143c37d..9ad03febb2e 100644 --- a/dm/relay/purger/strategy_time.go +++ b/dm/relay/purger/strategy_time.go @@ -21,9 +21,9 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // timeArgs represents args needed by timeStrategy. diff --git a/dm/relay/reader/reader.go b/dm/relay/reader/reader.go index e928ccdd823..11fc5c902af 100644 --- a/dm/relay/reader/reader.go +++ b/dm/relay/reader/reader.go @@ -21,11 +21,11 @@ import ( "github.com/go-mysql-org/go-mysql/replication" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/binlog/common" - br "github.com/pingcap/ticdc/dm/pkg/binlog/reader" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/binlog/common" + br "github.com/pingcap/tiflow/dm/pkg/binlog/reader" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // Result represents a read operation result. diff --git a/dm/relay/reader/reader_test.go b/dm/relay/reader/reader_test.go index e45f1d4eb76..617452d7cbf 100644 --- a/dm/relay/reader/reader_test.go +++ b/dm/relay/reader/reader_test.go @@ -22,7 +22,7 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" - br "github.com/pingcap/ticdc/dm/pkg/binlog/reader" + br "github.com/pingcap/tiflow/dm/pkg/binlog/reader" ) var _ = check.Suite(&testReaderSuite{}) diff --git a/dm/relay/relay.go b/dm/relay/relay.go index 0a9bfa5da32..5b30835ad60 100644 --- a/dm/relay/relay.go +++ b/dm/relay/relay.go @@ -32,22 +32,22 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/unit" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/binlog/common" - binlogReader "github.com/pingcap/ticdc/dm/pkg/binlog/reader" - "github.com/pingcap/ticdc/dm/pkg/conn" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - pkgstreamer "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/relay/reader" - "github.com/pingcap/ticdc/dm/relay/retry" - "github.com/pingcap/ticdc/dm/relay/transformer" - "github.com/pingcap/ticdc/dm/relay/writer" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/unit" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/binlog/common" + binlogReader "github.com/pingcap/tiflow/dm/pkg/binlog/reader" + "github.com/pingcap/tiflow/dm/pkg/conn" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + pkgstreamer "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/relay/reader" + "github.com/pingcap/tiflow/dm/relay/retry" + "github.com/pingcap/tiflow/dm/relay/transformer" + "github.com/pingcap/tiflow/dm/relay/writer" ) // used to fill RelayLogInfo. diff --git a/dm/relay/relay_test.go b/dm/relay/relay_test.go index 6e782e58e56..d9362229f68 100644 --- a/dm/relay/relay_test.go +++ b/dm/relay/relay_test.go @@ -32,16 +32,16 @@ import ( "github.com/pingcap/failpoint" "github.com/pingcap/tidb/parser" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/binlog/event" - "github.com/pingcap/ticdc/dm/pkg/conn" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/relay/reader" - "github.com/pingcap/ticdc/dm/relay/retry" - "github.com/pingcap/ticdc/dm/relay/transformer" - "github.com/pingcap/ticdc/dm/relay/writer" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/binlog/event" + "github.com/pingcap/tiflow/dm/pkg/conn" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/relay/reader" + "github.com/pingcap/tiflow/dm/relay/retry" + "github.com/pingcap/tiflow/dm/relay/transformer" + "github.com/pingcap/tiflow/dm/relay/writer" ) var _ = Suite(&testRelaySuite{}) @@ -168,9 +168,9 @@ func (t *testRelaySuite) TestTryRecoverLatestFile(c *C) { relayCfg = newRelayCfg(c, gmysql.MySQLFlavor) r = NewRelay(relayCfg).(*Relay) ) - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/utils/GetGTIDPurged", `return("406a3f61-690d-11e7-87c5-6c92bf46f384:1-122")`), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/utils/GetGTIDPurged", `return("406a3f61-690d-11e7-87c5-6c92bf46f384:1-122")`), IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/utils/GetGTIDPurged") + defer failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/utils/GetGTIDPurged") cfg := getDBConfigForTest() conn.InitMockDB(c) db, err := conn.DefaultDBProvider.Apply(cfg) @@ -295,9 +295,9 @@ func (t *testRelaySuite) TestTryRecoverMeta(c *C) { f.Close() // recover with empty GTIDs. - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/utils/GetGTIDPurged", `return("")`), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/utils/GetGTIDPurged", `return("")`), IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/utils/GetGTIDPurged") + defer failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/utils/GetGTIDPurged") c.Assert(r.tryRecoverLatestFile(context.Background(), parser2), IsNil) _, latestPos := r.meta.Pos() c.Assert(latestPos, DeepEquals, gmysql.Position{Name: filename, Pos: g.LatestPos}) @@ -595,9 +595,9 @@ func (t *testRelaySuite) TestReSetupMeta(c *C) { mockGetRandomServerID(mockDB) // mock AddGSetWithPurged mockDB.ExpectQuery("select @@GLOBAL.gtid_purged").WillReturnRows(sqlmock.NewRows([]string{"@@GLOBAL.gtid_purged"}).AddRow("")) - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/pkg/binlog/reader/MockGetEmptyPreviousGTIDFromGTIDSet", "return()"), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/pkg/binlog/reader/MockGetEmptyPreviousGTIDFromGTIDSet", "return()"), IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/pkg/binlog/reader/MockGetEmptyPreviousGTIDFromGTIDSet") + defer failpoint.Disable("github.com/pingcap/tiflow/dm/pkg/binlog/reader/MockGetEmptyPreviousGTIDFromGTIDSet") c.Assert(r.reSetupMeta(ctx), IsNil) uuid001 := fmt.Sprintf("%s.000001", uuid) t.verifyMetadata(c, r, uuid001, gmysql.Position{Name: r.cfg.BinLogName, Pos: 4}, emptyGTID.String(), []string{uuid001}) diff --git a/dm/relay/retry/reader.go b/dm/relay/retry/reader.go index b155aaf8b14..353d83ec830 100644 --- a/dm/relay/retry/reader.go +++ b/dm/relay/retry/reader.go @@ -17,9 +17,9 @@ import ( "context" "time" - "github.com/pingcap/ticdc/dm/pkg/backoff" - "github.com/pingcap/ticdc/dm/pkg/retry" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/backoff" + "github.com/pingcap/tiflow/dm/pkg/retry" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // ReaderRetryConfig is the configuration used for binlog reader retry backoff. diff --git a/dm/relay/transformer/transformer.go b/dm/relay/transformer/transformer.go index a9aa0d3c090..9ec7636ad50 100644 --- a/dm/relay/transformer/transformer.go +++ b/dm/relay/transformer/transformer.go @@ -18,7 +18,7 @@ import ( "github.com/go-mysql-org/go-mysql/replication" "github.com/pingcap/tidb/parser" - "github.com/pingcap/ticdc/dm/relay/common" + "github.com/pingcap/tiflow/dm/relay/common" ) const ( diff --git a/dm/relay/transformer/transformer_test.go b/dm/relay/transformer/transformer_test.go index cbf4fbfee8b..a6501773ea0 100644 --- a/dm/relay/transformer/transformer_test.go +++ b/dm/relay/transformer/transformer_test.go @@ -22,8 +22,8 @@ import ( "github.com/pingcap/check" "github.com/pingcap/tidb/parser" - "github.com/pingcap/ticdc/dm/pkg/binlog/event" - "github.com/pingcap/ticdc/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/binlog/event" + "github.com/pingcap/tiflow/dm/pkg/gtid" ) var _ = check.Suite(&testTransformerSuite{}) diff --git a/dm/relay/util.go b/dm/relay/util.go index 0f1b5e67906..9bfce99e985 100644 --- a/dm/relay/util.go +++ b/dm/relay/util.go @@ -18,7 +18,7 @@ import ( "database/sql" "strings" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // isNewServer checks whether is connecting to a new server. diff --git a/dm/relay/util_test.go b/dm/relay/util_test.go index cef391a13b1..5353cadf973 100644 --- a/dm/relay/util_test.go +++ b/dm/relay/util_test.go @@ -21,8 +21,8 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/conn" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/conn" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var _ = Suite(&testUtilSuite{}) diff --git a/dm/relay/writer/file.go b/dm/relay/writer/file.go index fc444245299..94c91d2588f 100644 --- a/dm/relay/writer/file.go +++ b/dm/relay/writer/file.go @@ -27,13 +27,13 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/binlog/common" - "github.com/pingcap/ticdc/dm/pkg/binlog/event" - bw "github.com/pingcap/ticdc/dm/pkg/binlog/writer" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/binlog/common" + "github.com/pingcap/tiflow/dm/pkg/binlog/event" + bw "github.com/pingcap/tiflow/dm/pkg/binlog/writer" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // FileConfig is the configuration used by the FileWriter. diff --git a/dm/relay/writer/file_test.go b/dm/relay/writer/file_test.go index 685672facb8..cb50424cf2d 100644 --- a/dm/relay/writer/file_test.go +++ b/dm/relay/writer/file_test.go @@ -27,10 +27,10 @@ import ( "github.com/pingcap/check" "github.com/pingcap/tidb/parser" - "github.com/pingcap/ticdc/dm/pkg/binlog/common" - "github.com/pingcap/ticdc/dm/pkg/binlog/event" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/binlog/common" + "github.com/pingcap/tiflow/dm/pkg/binlog/event" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" ) var _ = check.Suite(&testFileWriterSuite{}) diff --git a/dm/relay/writer/file_util.go b/dm/relay/writer/file_util.go index c8cf5a01d2d..75338da2570 100644 --- a/dm/relay/writer/file_util.go +++ b/dm/relay/writer/file_util.go @@ -26,11 +26,11 @@ import ( "github.com/google/uuid" "github.com/pingcap/tidb/parser" - "github.com/pingcap/ticdc/dm/pkg/binlog/event" - "github.com/pingcap/ticdc/dm/pkg/binlog/reader" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/relay/common" + "github.com/pingcap/tiflow/dm/pkg/binlog/event" + "github.com/pingcap/tiflow/dm/pkg/binlog/reader" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/relay/common" ) // checkBinlogHeaderExist checks if the file has a binlog file header. diff --git a/dm/relay/writer/file_util_test.go b/dm/relay/writer/file_util_test.go index 7b1d158a827..14e8e6e37cd 100644 --- a/dm/relay/writer/file_util_test.go +++ b/dm/relay/writer/file_util_test.go @@ -27,8 +27,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/tidb/parser" - "github.com/pingcap/ticdc/dm/pkg/binlog/event" - "github.com/pingcap/ticdc/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/binlog/event" + "github.com/pingcap/tiflow/dm/pkg/gtid" ) var _ = check.Suite(&testFileUtilSuite{}) diff --git a/dm/relay/writer/writer.go b/dm/relay/writer/writer.go index c06939f92ae..d38e768dd96 100644 --- a/dm/relay/writer/writer.go +++ b/dm/relay/writer/writer.go @@ -19,7 +19,7 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" "github.com/go-mysql-org/go-mysql/replication" - "github.com/pingcap/ticdc/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/gtid" ) const ( diff --git a/dm/syncer/causality.go b/dm/syncer/causality.go index c83b89b091f..24f1282ad44 100644 --- a/dm/syncer/causality.go +++ b/dm/syncer/causality.go @@ -18,8 +18,8 @@ import ( "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/syncer/metrics" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/syncer/metrics" ) // causality provides a simple mechanism to improve the concurrency of SQLs execution under the premise of ensuring correctness. diff --git a/dm/syncer/causality_test.go b/dm/syncer/causality_test.go index f90d73825e0..13e87eddb2d 100644 --- a/dm/syncer/causality_test.go +++ b/dm/syncer/causality_test.go @@ -21,11 +21,11 @@ import ( "github.com/pingcap/tidb/parser" "github.com/pingcap/tidb/util/mock" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/binlog" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/binlog" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/utils" ) func (s *testSyncerSuite) TestDetectConflict(c *C) { diff --git a/dm/syncer/checkpoint.go b/dm/syncer/checkpoint.go index 560fe80f778..e1160a9aa22 100644 --- a/dm/syncer/checkpoint.go +++ b/dm/syncer/checkpoint.go @@ -24,18 +24,18 @@ import ( "sync" "time" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/cputil" - "github.com/pingcap/ticdc/dm/pkg/dumpling" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/schema" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/syncer/dbconn" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/cputil" + "github.com/pingcap/tiflow/dm/pkg/dumpling" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/schema" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/syncer/dbconn" "github.com/go-mysql-org/go-mysql/mysql" "github.com/pingcap/failpoint" diff --git a/dm/syncer/checkpoint_test.go b/dm/syncer/checkpoint_test.go index 73ff6307321..4564d630bfd 100644 --- a/dm/syncer/checkpoint_test.go +++ b/dm/syncer/checkpoint_test.go @@ -21,15 +21,15 @@ import ( "path/filepath" "strings" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/cputil" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/retry" - "github.com/pingcap/ticdc/dm/pkg/schema" - "github.com/pingcap/ticdc/dm/syncer/dbconn" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/cputil" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/retry" + "github.com/pingcap/tiflow/dm/pkg/schema" + "github.com/pingcap/tiflow/dm/syncer/dbconn" "github.com/DATA-DOG/go-sqlmock" "github.com/go-mysql-org/go-mysql/mysql" diff --git a/dm/syncer/compactor.go b/dm/syncer/compactor.go index f9875e63dac..e8b96dbd2a4 100644 --- a/dm/syncer/compactor.go +++ b/dm/syncer/compactor.go @@ -20,8 +20,8 @@ import ( "github.com/pingcap/tidb-tools/pkg/filter" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/syncer/metrics" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/syncer/metrics" ) // compactor compacts multiple statements into one statement. diff --git a/dm/syncer/compactor_test.go b/dm/syncer/compactor_test.go index ade587c4802..99100e13727 100644 --- a/dm/syncer/compactor_test.go +++ b/dm/syncer/compactor_test.go @@ -24,11 +24,11 @@ import ( "github.com/pingcap/tidb/parser" "github.com/pingcap/tidb/util/mock" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/binlog" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/binlog" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // mockExecute mock a kv store. @@ -229,9 +229,9 @@ func (s *testSyncerSuite) TestCompactorSafeMode(c *C) { }, } - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/syncer/SkipFlushCompactor", `return()`), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/syncer/SkipFlushCompactor", `return()`), IsNil) //nolint:errcheck - defer failpoint.Disable("github.com/pingcap/ticdc/dm/syncer/SkipFlushCompactor") + defer failpoint.Disable("github.com/pingcap/tiflow/dm/syncer/SkipFlushCompactor") outCh := compactorWrap(inCh, syncer) diff --git a/dm/syncer/dbconn/db.go b/dm/syncer/dbconn/db.go index 1e5ff3bed2b..379ef4a6de2 100644 --- a/dm/syncer/dbconn/db.go +++ b/dm/syncer/dbconn/db.go @@ -22,14 +22,14 @@ import ( "github.com/pingcap/tidb-tools/pkg/dbutil" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/retry" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/syncer/metrics" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/retry" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/syncer/metrics" ) var retryTimeout = 3 * time.Second diff --git a/dm/syncer/dbconn/upstream_db.go b/dm/syncer/dbconn/upstream_db.go index 4303d198775..b8e704f14ed 100644 --- a/dm/syncer/dbconn/upstream_db.go +++ b/dm/syncer/dbconn/upstream_db.go @@ -23,13 +23,13 @@ import ( tmysql "github.com/pingcap/tidb/parser/mysql" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // UpStreamConn connect to upstream DB diff --git a/dm/syncer/dbconn/upstream_db_test.go b/dm/syncer/dbconn/upstream_db_test.go index d20e06f4855..9fd16b519cf 100644 --- a/dm/syncer/dbconn/upstream_db_test.go +++ b/dm/syncer/dbconn/upstream_db_test.go @@ -23,8 +23,8 @@ import ( "github.com/google/uuid" . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/utils" ) var _ = Suite(&testDBSuite{}) diff --git a/dm/syncer/ddl.go b/dm/syncer/ddl.go index 7776e8d4304..f8bc7d66530 100644 --- a/dm/syncer/ddl.go +++ b/dm/syncer/ddl.go @@ -23,11 +23,11 @@ import ( "github.com/pingcap/tidb/parser/ast" "go.uber.org/zap" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - parserpkg "github.com/pingcap/ticdc/dm/pkg/parser" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/syncer/metrics" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + parserpkg "github.com/pingcap/tiflow/dm/pkg/parser" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/syncer/metrics" ) func parseOneStmt(qec *queryEventContext) (stmt ast.StmtNode, err error) { diff --git a/dm/syncer/ddl_test.go b/dm/syncer/ddl_test.go index 0aca3dd8bbd..a07b5eb4b7e 100644 --- a/dm/syncer/ddl_test.go +++ b/dm/syncer/ddl_test.go @@ -30,13 +30,13 @@ import ( "github.com/pingcap/tidb/parser/ast" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - parserpkg "github.com/pingcap/ticdc/dm/pkg/parser" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - onlineddl "github.com/pingcap/ticdc/dm/syncer/online-ddl-tools" + "github.com/pingcap/tiflow/dm/dm/config" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + parserpkg "github.com/pingcap/tiflow/dm/pkg/parser" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + onlineddl "github.com/pingcap/tiflow/dm/syncer/online-ddl-tools" ) var _ = Suite(&testDDLSuite{}) diff --git a/dm/syncer/dml.go b/dm/syncer/dml.go index 9b96f5c0f7d..0323407754f 100644 --- a/dm/syncer/dml.go +++ b/dm/syncer/dml.go @@ -27,8 +27,8 @@ import ( "github.com/pingcap/tidb/parser/types" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // this type is used to generate DML SQL, opType is used to mark type in binlog. diff --git a/dm/syncer/dml_worker.go b/dm/syncer/dml_worker.go index c7ff1f3d405..175df8ce0a6 100644 --- a/dm/syncer/dml_worker.go +++ b/dm/syncer/dml_worker.go @@ -22,12 +22,12 @@ import ( "github.com/pingcap/tidb-tools/pkg/filter" "go.uber.org/zap" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/syncer/dbconn" - "github.com/pingcap/ticdc/dm/syncer/metrics" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/syncer/dbconn" + "github.com/pingcap/tiflow/dm/syncer/metrics" ) // DMLWorker is used to sync dml. diff --git a/dm/syncer/err-operator/operator.go b/dm/syncer/err-operator/operator.go index 6a68572e325..01e25106009 100644 --- a/dm/syncer/err-operator/operator.go +++ b/dm/syncer/err-operator/operator.go @@ -23,10 +23,10 @@ import ( "github.com/google/uuid" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // Operator contains an operation for specified binlog pos diff --git a/dm/syncer/err-operator/operator_test.go b/dm/syncer/err-operator/operator_test.go index c43beeb2c5f..c2abe9f731b 100644 --- a/dm/syncer/err-operator/operator_test.go +++ b/dm/syncer/err-operator/operator_test.go @@ -20,10 +20,10 @@ import ( "github.com/go-mysql-org/go-mysql/replication" . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var _ = Suite(&testOperatorSuite{}) diff --git a/dm/syncer/error.go b/dm/syncer/error.go index 3c13248f6e3..a1638b932a5 100644 --- a/dm/syncer/error.go +++ b/dm/syncer/error.go @@ -29,9 +29,9 @@ import ( tmysql "github.com/pingcap/tidb/parser/mysql" "go.uber.org/zap" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/syncer/dbconn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/syncer/dbconn" ) func ignoreDDLError(err error) bool { diff --git a/dm/syncer/error_test.go b/dm/syncer/error_test.go index 424292ff489..a6ca84e91f9 100644 --- a/dm/syncer/error_test.go +++ b/dm/syncer/error_test.go @@ -24,9 +24,9 @@ import ( "github.com/pingcap/tidb/infoschema" tmysql "github.com/pingcap/tidb/parser/mysql" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/syncer/dbconn" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/syncer/dbconn" ) func newMysqlErr(number uint16, message string) *mysql.MySQLError { diff --git a/dm/syncer/expr_filter_group.go b/dm/syncer/expr_filter_group.go index ee0904beb62..dee664b62bc 100644 --- a/dm/syncer/expr_filter_group.go +++ b/dm/syncer/expr_filter_group.go @@ -23,9 +23,9 @@ import ( "github.com/pingcap/tidb/util/chunk" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // ExprFilterGroup groups many related fields about expression filter. diff --git a/dm/syncer/expr_filter_group_test.go b/dm/syncer/expr_filter_group_test.go index c86ab6cbb95..b5b8924774f 100644 --- a/dm/syncer/expr_filter_group_test.go +++ b/dm/syncer/expr_filter_group_test.go @@ -19,10 +19,10 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/tidb-tools/pkg/filter" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/schema" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/schema" + "github.com/pingcap/tiflow/dm/pkg/utils" ) func (s *testFilterSuite) TestSkipDMLByExpression(c *C) { diff --git a/dm/syncer/filter.go b/dm/syncer/filter.go index 0021febf393..b224a5ee99c 100644 --- a/dm/syncer/filter.go +++ b/dm/syncer/filter.go @@ -19,9 +19,9 @@ import ( "github.com/pingcap/tidb-tools/pkg/filter" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - onlineddl "github.com/pingcap/ticdc/dm/syncer/online-ddl-tools" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + onlineddl "github.com/pingcap/tiflow/dm/syncer/online-ddl-tools" ) // skipQueryEvent if skip by binlog-filter: diff --git a/dm/syncer/filter_test.go b/dm/syncer/filter_test.go index b927b6b3d6a..383362f257b 100644 --- a/dm/syncer/filter_test.go +++ b/dm/syncer/filter_test.go @@ -24,12 +24,12 @@ import ( "github.com/pingcap/tidb-tools/pkg/filter" "github.com/pingcap/tidb/parser" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/schema" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/syncer/dbconn" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/schema" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/syncer/dbconn" ) type testFilterSuite struct { diff --git a/dm/syncer/handle_error.go b/dm/syncer/handle_error.go index e9fb163f0ea..86a481f204f 100644 --- a/dm/syncer/handle_error.go +++ b/dm/syncer/handle_error.go @@ -22,10 +22,10 @@ import ( "github.com/go-mysql-org/go-mysql/replication" "github.com/pingcap/tidb/parser/ast" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/binlog" - parserpkg "github.com/pingcap/ticdc/dm/pkg/parser" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/binlog" + parserpkg "github.com/pingcap/tiflow/dm/pkg/parser" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // HandleError handle error for syncer. diff --git a/dm/syncer/handle_error_test.go b/dm/syncer/handle_error_test.go index 99430545bb9..fd94d01c3a8 100644 --- a/dm/syncer/handle_error_test.go +++ b/dm/syncer/handle_error_test.go @@ -19,9 +19,9 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/conn" - "github.com/pingcap/ticdc/dm/syncer/dbconn" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/conn" + "github.com/pingcap/tiflow/dm/syncer/dbconn" ) func (s *testSyncerSuite) TestHandleError(c *C) { diff --git a/dm/syncer/job.go b/dm/syncer/job.go index 927dc91fd65..c907c302d76 100644 --- a/dm/syncer/job.go +++ b/dm/syncer/job.go @@ -20,7 +20,7 @@ import ( "github.com/go-mysql-org/go-mysql/replication" "github.com/pingcap/tidb-tools/pkg/filter" - "github.com/pingcap/ticdc/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/binlog" ) type opType byte diff --git a/dm/syncer/job_test.go b/dm/syncer/job_test.go index 798f62d1054..dcd43ef2324 100644 --- a/dm/syncer/job_test.go +++ b/dm/syncer/job_test.go @@ -19,7 +19,7 @@ import ( "github.com/pingcap/tidb/parser" "github.com/pingcap/tidb/util/mock" - "github.com/pingcap/ticdc/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/binlog" ) var _ = Suite(&testJobSuite{}) diff --git a/dm/syncer/metrics/metrics.go b/dm/syncer/metrics/metrics.go index 0e4c1739c61..979571bfd5b 100644 --- a/dm/syncer/metrics/metrics.go +++ b/dm/syncer/metrics/metrics.go @@ -16,7 +16,7 @@ package metrics import ( "github.com/prometheus/client_golang/prometheus" - "github.com/pingcap/ticdc/dm/pkg/metricsproxy" + "github.com/pingcap/tiflow/dm/pkg/metricsproxy" ) // for BinlogEventCost metric stage field. diff --git a/dm/syncer/mode.go b/dm/syncer/mode.go index 097e0ff2a9c..ba57b3722e0 100644 --- a/dm/syncer/mode.go +++ b/dm/syncer/mode.go @@ -19,8 +19,8 @@ import ( "github.com/pingcap/failpoint" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/unit" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" + "github.com/pingcap/tiflow/dm/dm/unit" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" ) func (s *Syncer) enableSafeModeInitializationPhase(tctx *tcontext.Context) { diff --git a/dm/syncer/online-ddl-tools/online_ddl.go b/dm/syncer/online-ddl-tools/online_ddl.go index d485d6f6805..6a27ae93c9e 100644 --- a/dm/syncer/online-ddl-tools/online_ddl.go +++ b/dm/syncer/online-ddl-tools/online_ddl.go @@ -19,14 +19,14 @@ import ( "regexp" "sync" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/cputil" - parserpkg "github.com/pingcap/ticdc/dm/pkg/parser" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/syncer/dbconn" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/cputil" + parserpkg "github.com/pingcap/tiflow/dm/pkg/parser" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/syncer/dbconn" "github.com/pingcap/failpoint" "github.com/pingcap/tidb-tools/pkg/dbutil" diff --git a/dm/syncer/optimist.go b/dm/syncer/optimist.go index ae383a728c6..aa8ac8885c8 100644 --- a/dm/syncer/optimist.go +++ b/dm/syncer/optimist.go @@ -22,9 +22,9 @@ import ( "github.com/pingcap/tidb/parser/model" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/shardddl/optimism" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/shardddl/optimism" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // initOptimisticShardDDL initializes the shard DDL support in the optimistic mode. diff --git a/dm/syncer/relay.go b/dm/syncer/relay.go index b067d41fe64..09ad4a50fda 100644 --- a/dm/syncer/relay.go +++ b/dm/syncer/relay.go @@ -20,11 +20,11 @@ import ( "github.com/go-mysql-org/go-mysql/mysql" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) func (s *Syncer) setInitActiveRelayLog(ctx context.Context) error { diff --git a/dm/syncer/safe-mode/mode.go b/dm/syncer/safe-mode/mode.go index 0adc1fddeb1..6550bdf0727 100644 --- a/dm/syncer/safe-mode/mode.go +++ b/dm/syncer/safe-mode/mode.go @@ -19,9 +19,9 @@ import ( "github.com/pingcap/tidb-tools/pkg/filter" "go.uber.org/zap" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // SafeMode controls whether enable safe-mode through a mechanism similar to reference-count diff --git a/dm/syncer/safe-mode/mode_test.go b/dm/syncer/safe-mode/mode_test.go index c50080e67ab..0ea7e33d59e 100644 --- a/dm/syncer/safe-mode/mode_test.go +++ b/dm/syncer/safe-mode/mode_test.go @@ -19,7 +19,7 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/tidb-tools/pkg/filter" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" ) var _ = Suite(&testModeSuite{}) diff --git a/dm/syncer/schema.go b/dm/syncer/schema.go index f23b6fa2154..a7d1c2360f5 100644 --- a/dm/syncer/schema.go +++ b/dm/syncer/schema.go @@ -24,12 +24,12 @@ import ( "github.com/pingcap/tidb/parser/model" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/schema" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/schema" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // OperateSchema operates schema for an upstream table. diff --git a/dm/syncer/shardddl/optimist.go b/dm/syncer/shardddl/optimist.go index 6cfd690d5ea..027626d3726 100644 --- a/dm/syncer/shardddl/optimist.go +++ b/dm/syncer/shardddl/optimist.go @@ -21,8 +21,8 @@ import ( "go.etcd.io/etcd/clientv3" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/shardddl/optimism" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/shardddl/optimism" ) // Optimist used to coordinate the shard DDL migration in optimism mode. diff --git a/dm/syncer/shardddl/optimist_test.go b/dm/syncer/shardddl/optimist_test.go index 2e4cbd20c5d..fa616f51bae 100644 --- a/dm/syncer/shardddl/optimist_test.go +++ b/dm/syncer/shardddl/optimist_test.go @@ -25,9 +25,9 @@ import ( "github.com/pingcap/tidb/sessionctx" "github.com/pingcap/tidb/util/mock" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/shardddl/optimism" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/shardddl/optimism" + "github.com/pingcap/tiflow/dm/pkg/terror" ) type testOptimist struct{} diff --git a/dm/syncer/shardddl/pessimist.go b/dm/syncer/shardddl/pessimist.go index c83a782a78a..4b7d104b68c 100644 --- a/dm/syncer/shardddl/pessimist.go +++ b/dm/syncer/shardddl/pessimist.go @@ -20,9 +20,9 @@ import ( "go.etcd.io/etcd/clientv3" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/shardddl/pessimism" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/shardddl/pessimism" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // Pessimist used to coordinate the shard DDL migration in pessimism mode. diff --git a/dm/syncer/shardddl/pessimist_test.go b/dm/syncer/shardddl/pessimist_test.go index e897277f210..a36450f8aa7 100644 --- a/dm/syncer/shardddl/pessimist_test.go +++ b/dm/syncer/shardddl/pessimist_test.go @@ -22,10 +22,10 @@ import ( "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/integration" - "github.com/pingcap/ticdc/dm/dm/common" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/shardddl/pessimism" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/dm/common" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/shardddl/pessimism" + "github.com/pingcap/tiflow/dm/pkg/terror" ) var etcdTestCli *clientv3.Client diff --git a/dm/syncer/sharding-meta/shardmeta.go b/dm/syncer/sharding-meta/shardmeta.go index b433d764d43..55bc1967f53 100644 --- a/dm/syncer/sharding-meta/shardmeta.go +++ b/dm/syncer/sharding-meta/shardmeta.go @@ -22,11 +22,11 @@ import ( "github.com/pingcap/tidb-tools/pkg/filter" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" ) // DDLItem records ddl information used in sharding sequence organization. diff --git a/dm/syncer/sharding-meta/shardmeta_test.go b/dm/syncer/sharding-meta/shardmeta_test.go index dee9b34e720..d861fad6465 100644 --- a/dm/syncer/sharding-meta/shardmeta_test.go +++ b/dm/syncer/sharding-meta/shardmeta_test.go @@ -20,7 +20,7 @@ import ( "github.com/go-mysql-org/go-mysql/mysql" "github.com/pingcap/check" - "github.com/pingcap/ticdc/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/binlog" ) var _ = check.Suite(&testShardMetaSuite{}) diff --git a/dm/syncer/sharding_group.go b/dm/syncer/sharding_group.go index 447f94efb7b..d330642a9f2 100644 --- a/dm/syncer/sharding_group.go +++ b/dm/syncer/sharding_group.go @@ -74,16 +74,16 @@ import ( "fmt" "sync" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/cputil" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/syncer/dbconn" - shardmeta "github.com/pingcap/ticdc/dm/syncer/sharding-meta" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/cputil" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/syncer/dbconn" + shardmeta "github.com/pingcap/tiflow/dm/syncer/sharding-meta" "github.com/pingcap/tidb-tools/pkg/dbutil" "github.com/pingcap/tidb-tools/pkg/filter" diff --git a/dm/syncer/sharding_group_test.go b/dm/syncer/sharding_group_test.go index 96d5b8b1028..10e54e96ae4 100644 --- a/dm/syncer/sharding_group_test.go +++ b/dm/syncer/sharding_group_test.go @@ -24,16 +24,16 @@ import ( "github.com/pingcap/tidb-tools/pkg/dbutil" "github.com/pingcap/tidb-tools/pkg/filter" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/cputil" - "github.com/pingcap/ticdc/dm/pkg/retry" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/syncer/dbconn" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/cputil" + "github.com/pingcap/tiflow/dm/pkg/retry" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/syncer/dbconn" ) var _ = Suite(&testShardingGroupSuite{}) diff --git a/dm/syncer/status.go b/dm/syncer/status.go index a95efba687e..4d564cf3173 100644 --- a/dm/syncer/status.go +++ b/dm/syncer/status.go @@ -20,11 +20,11 @@ import ( "github.com/pingcap/failpoint" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/syncer/metrics" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/syncer/metrics" ) // Status implements Unit.Status. diff --git a/dm/syncer/status_test.go b/dm/syncer/status_test.go index 97c1d2a3a99..eeff9034ee9 100644 --- a/dm/syncer/status_test.go +++ b/dm/syncer/status_test.go @@ -20,12 +20,12 @@ import ( . "github.com/pingcap/check" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/binlog" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/syncer/shardddl" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/binlog" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/syncer/shardddl" ) var _ = Suite(&statusSuite{}) diff --git a/dm/syncer/streamer_controller.go b/dm/syncer/streamer_controller.go index 063b8950903..06b1b46b744 100644 --- a/dm/syncer/streamer_controller.go +++ b/dm/syncer/streamer_controller.go @@ -25,15 +25,15 @@ import ( "github.com/pingcap/failpoint" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/binlog/common" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/retry" - "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/syncer/dbconn" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/binlog/common" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/retry" + "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/syncer/dbconn" ) // the minimal interval to retry reset binlog streamer. diff --git a/dm/syncer/syncer.go b/dm/syncer/syncer.go index 96437d3bf67..a73a160102d 100644 --- a/dm/syncer/syncer.go +++ b/dm/syncer/syncer.go @@ -45,31 +45,31 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/dm/config" - common2 "github.com/pingcap/ticdc/dm/dm/ctl/common" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/dm/unit" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/binlog/common" - "github.com/pingcap/ticdc/dm/pkg/binlog/event" - "github.com/pingcap/ticdc/dm/pkg/binlog/reader" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - fr "github.com/pingcap/ticdc/dm/pkg/func-rollback" - "github.com/pingcap/ticdc/dm/pkg/ha" - "github.com/pingcap/ticdc/dm/pkg/log" - parserpkg "github.com/pingcap/ticdc/dm/pkg/parser" - "github.com/pingcap/ticdc/dm/pkg/schema" - "github.com/pingcap/ticdc/dm/pkg/shardddl/pessimism" - "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/terror" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/syncer/dbconn" - operator "github.com/pingcap/ticdc/dm/syncer/err-operator" - "github.com/pingcap/ticdc/dm/syncer/metrics" - onlineddl "github.com/pingcap/ticdc/dm/syncer/online-ddl-tools" - sm "github.com/pingcap/ticdc/dm/syncer/safe-mode" - "github.com/pingcap/ticdc/dm/syncer/shardddl" + "github.com/pingcap/tiflow/dm/dm/config" + common2 "github.com/pingcap/tiflow/dm/dm/ctl/common" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/unit" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/binlog/common" + "github.com/pingcap/tiflow/dm/pkg/binlog/event" + "github.com/pingcap/tiflow/dm/pkg/binlog/reader" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + fr "github.com/pingcap/tiflow/dm/pkg/func-rollback" + "github.com/pingcap/tiflow/dm/pkg/ha" + "github.com/pingcap/tiflow/dm/pkg/log" + parserpkg "github.com/pingcap/tiflow/dm/pkg/parser" + "github.com/pingcap/tiflow/dm/pkg/schema" + "github.com/pingcap/tiflow/dm/pkg/shardddl/pessimism" + "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/syncer/dbconn" + operator "github.com/pingcap/tiflow/dm/syncer/err-operator" + "github.com/pingcap/tiflow/dm/syncer/metrics" + onlineddl "github.com/pingcap/tiflow/dm/syncer/online-ddl-tools" + sm "github.com/pingcap/tiflow/dm/syncer/safe-mode" + "github.com/pingcap/tiflow/dm/syncer/shardddl" ) var ( diff --git a/dm/syncer/syncer_test.go b/dm/syncer/syncer_test.go index 6bfb8564b68..f60f6a4581f 100644 --- a/dm/syncer/syncer_test.go +++ b/dm/syncer/syncer_test.go @@ -25,21 +25,21 @@ import ( "testing" "time" - "github.com/pingcap/ticdc/dm/dm/config" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/binlog/event" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/cputil" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/pkg/log" - parserpkg "github.com/pingcap/ticdc/dm/pkg/parser" - "github.com/pingcap/ticdc/dm/pkg/retry" - "github.com/pingcap/ticdc/dm/pkg/schema" - streamer2 "github.com/pingcap/ticdc/dm/pkg/streamer" - "github.com/pingcap/ticdc/dm/pkg/utils" - "github.com/pingcap/ticdc/dm/syncer/dbconn" + "github.com/pingcap/tiflow/dm/dm/config" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/binlog/event" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/cputil" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/pkg/log" + parserpkg "github.com/pingcap/tiflow/dm/pkg/parser" + "github.com/pingcap/tiflow/dm/pkg/retry" + "github.com/pingcap/tiflow/dm/pkg/schema" + streamer2 "github.com/pingcap/tiflow/dm/pkg/streamer" + "github.com/pingcap/tiflow/dm/pkg/utils" + "github.com/pingcap/tiflow/dm/syncer/dbconn" sqlmock "github.com/DATA-DOG/go-sqlmock" "github.com/go-mysql-org/go-mysql/mysql" @@ -1082,7 +1082,7 @@ func (s *testSyncerSuite) TestExitSafeModeByConfig(c *C) { checkPointMock.ExpectExec(".*INSERT INTO .* VALUES.* ON DUPLICATE KEY UPDATE.*").WillReturnResult(sqlmock.NewResult(0, 1)) checkPointMock.ExpectCommit() // disable 1-minute safe mode - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/dm/syncer/SafeModeInitPhaseSeconds", "return(0)"), IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/dm/syncer/SafeModeInitPhaseSeconds", "return(0)"), IsNil) go syncer.Process(ctx, resultCh) expectJobs := []*expectJob{ @@ -1155,7 +1155,7 @@ func (s *testSyncerSuite) TestExitSafeModeByConfig(c *C) { if err := checkPointMock.ExpectationsWereMet(); err != nil { c.Errorf("checkpointDB unfulfilled expectations: %s", err) } - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/dm/syncer/SafeModeInitPhaseSeconds"), IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/dm/syncer/SafeModeInitPhaseSeconds"), IsNil) } func (s *testSyncerSuite) TestRemoveMetadataIsFine(c *C) { diff --git a/dm/syncer/test_injector.go b/dm/syncer/test_injector.go index e19b917de48..0f77839b889 100644 --- a/dm/syncer/test_injector.go +++ b/dm/syncer/test_injector.go @@ -16,8 +16,8 @@ package syncer import ( "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/terror" ) // TestInjector is used to support inject test cases into syncer. diff --git a/dm/syncer/util.go b/dm/syncer/util.go index 4fc914437d3..c9b37893560 100644 --- a/dm/syncer/util.go +++ b/dm/syncer/util.go @@ -23,9 +23,9 @@ import ( "github.com/pingcap/tidb/parser/ast" "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/conn" - tcontext "github.com/pingcap/ticdc/dm/pkg/context" - "github.com/pingcap/ticdc/dm/pkg/terror" + "github.com/pingcap/tiflow/dm/pkg/conn" + tcontext "github.com/pingcap/tiflow/dm/pkg/context" + "github.com/pingcap/tiflow/dm/pkg/terror" ) func toBinlogType(enableRelay bool) BinlogType { diff --git a/dm/tests/_dmctl_tools/check_exit_safe_binlog.go b/dm/tests/_dmctl_tools/check_exit_safe_binlog.go index 8459353d03b..338a1cdfe3d 100644 --- a/dm/tests/_dmctl_tools/check_exit_safe_binlog.go +++ b/dm/tests/_dmctl_tools/check_exit_safe_binlog.go @@ -18,15 +18,15 @@ import ( "fmt" "os" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/log" "github.com/go-mysql-org/go-mysql/mysql" _ "github.com/go-sql-driver/mysql" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/dm/pkg/binlog" - "github.com/pingcap/ticdc/dm/pkg/gtid" - "github.com/pingcap/ticdc/dm/tests/utils" + "github.com/pingcap/tiflow/dm/pkg/binlog" + "github.com/pingcap/tiflow/dm/pkg/gtid" + "github.com/pingcap/tiflow/dm/tests/utils" ) var compareMap = map[string]map[int]struct{}{ diff --git a/dm/tests/_dmctl_tools/check_master_http_apis.go b/dm/tests/_dmctl_tools/check_master_http_apis.go index 9aa3a421ec4..5f4995fb878 100644 --- a/dm/tests/_dmctl_tools/check_master_http_apis.go +++ b/dm/tests/_dmctl_tools/check_master_http_apis.go @@ -19,7 +19,7 @@ import ( "net/http" "os" - "github.com/pingcap/ticdc/dm/tests/utils" + "github.com/pingcap/tiflow/dm/tests/utils" toolutils "github.com/pingcap/tidb-tools/pkg/utils" ) diff --git a/dm/tests/_dmctl_tools/check_master_online.go b/dm/tests/_dmctl_tools/check_master_online.go index b3977f73e04..eadea8ba9d3 100644 --- a/dm/tests/_dmctl_tools/check_master_online.go +++ b/dm/tests/_dmctl_tools/check_master_online.go @@ -22,8 +22,8 @@ import ( toolutils "github.com/pingcap/tidb-tools/pkg/utils" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/tests/utils" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/tests/utils" ) // use show-ddl-locks request to test DM-master is online diff --git a/dm/tests/_dmctl_tools/check_master_online_http.go b/dm/tests/_dmctl_tools/check_master_online_http.go index 62f33620c86..cdfee1ebc76 100644 --- a/dm/tests/_dmctl_tools/check_master_online_http.go +++ b/dm/tests/_dmctl_tools/check_master_online_http.go @@ -19,7 +19,7 @@ import ( "net/http" "os" - "github.com/pingcap/ticdc/dm/tests/utils" + "github.com/pingcap/tiflow/dm/tests/utils" toolutils "github.com/pingcap/tidb-tools/pkg/utils" ) diff --git a/dm/tests/_dmctl_tools/check_worker_online.go b/dm/tests/_dmctl_tools/check_worker_online.go index 5bc89eabc8c..a3ae201a641 100644 --- a/dm/tests/_dmctl_tools/check_worker_online.go +++ b/dm/tests/_dmctl_tools/check_worker_online.go @@ -22,8 +22,8 @@ import ( toolutils "github.com/pingcap/tidb-tools/pkg/utils" - "github.com/pingcap/ticdc/dm/dm/pb" - "github.com/pingcap/ticdc/dm/tests/utils" + "github.com/pingcap/tiflow/dm/dm/pb" + "github.com/pingcap/tiflow/dm/tests/utils" ) // use query status request to test DM-worker is online diff --git a/dm/tests/_utils/ha_cases_lib.sh b/dm/tests/_utils/ha_cases_lib.sh index dabfd7b05da..d9fb774a90b 100644 --- a/dm/tests/_utils/ha_cases_lib.sh +++ b/dm/tests/_utils/ha_cases_lib.sh @@ -160,7 +160,7 @@ function cleanup() { function isolate_master() { port=${master_ports[$(($1 - 1))]} if [ $2 = "isolate" ]; then - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/dm/master/FailToElect=return(\"master$1\")" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/dm/master/FailToElect=return(\"master$1\")" fi echo "kill dm-master$1" ps aux | grep dm-master$1 | awk '{print $2}' | xargs kill || true @@ -172,7 +172,7 @@ function isolate_master() { function isolate_worker() { port=${worker_ports[$(($1 - 1))]} if [ $2 = "isolate" ]; then - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/dm/worker/FailToKeepAlive=return(\"worker$1\")" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/dm/worker/FailToKeepAlive=return(\"worker$1\")" fi echo "kill dm-worker$1" ps aux | grep dm-worker$1 | awk '{print $2}' | xargs kill || true diff --git a/dm/tests/adjust_gtid/run.sh b/dm/tests/adjust_gtid/run.sh index f51a28a6e9d..88e493b05c2 100755 --- a/dm/tests/adjust_gtid/run.sh +++ b/dm/tests/adjust_gtid/run.sh @@ -58,7 +58,7 @@ function run() { check_rpc_alive $cur/../bin/check_master_online 127.0.0.1:$MASTER_PORT check_metric $MASTER_PORT 'start_leader_counter' 3 0 2 - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/syncer/AdjustGTIDExit=return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/syncer/AdjustGTIDExit=return(true)' run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT diff --git a/dm/tests/all_mode/run.sh b/dm/tests/all_mode/run.sh index 3d57c1fef24..8618c6700d6 100755 --- a/dm/tests/all_mode/run.sh +++ b/dm/tests/all_mode/run.sh @@ -65,7 +65,7 @@ function test_session_config() { function test_query_timeout() { echo "[$(date)] <<<<<< start test_query_timeout >>>>>>" - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/syncer/BlockSyncStatus=return(\"5s\")" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/syncer/BlockSyncStatus=return(\"5s\")" cp $cur/conf/dm-master.toml $WORK_DIR/dm-master.toml sed -i 's/rpc-timeout = "30s"/rpc-timeout = "3s"/g' $WORK_DIR/dm-master.toml @@ -160,7 +160,7 @@ function test_stop_task_before_checkpoint() { check_rpc_alive $cur/../bin/check_master_online 127.0.0.1:$MASTER_PORT check_metric $MASTER_PORT 'start_leader_counter' 3 0 2 - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/loader/WaitLoaderStopAfterInitCheckpoint=return(5)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/loader/WaitLoaderStopAfterInitCheckpoint=return(5)' run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT run_dm_worker $WORK_DIR/worker2 $WORKER2_PORT $cur/conf/dm-worker2.toml @@ -187,7 +187,7 @@ function test_stop_task_before_checkpoint() { check_port_offline $WORKER1_PORT 20 check_port_offline $WORKER2_PORT 20 - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/loader/WaitLoaderStopBeforeLoadCheckpoint=return(5)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/loader/WaitLoaderStopBeforeLoadCheckpoint=return(5)' run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml run_dm_worker $WORK_DIR/worker2 $WORKER2_PORT $cur/conf/dm-worker2.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT @@ -234,10 +234,10 @@ function test_fail_job_between_event() { # worker1 will be bound to source1 and fail when see the second row change in an event inject_points=( - "github.com/pingcap/ticdc/dm/dm/worker/TaskCheckInterval=return(\"500ms\")" - "github.com/pingcap/ticdc/dm/syncer/countJobFromOneEvent=return()" - "github.com/pingcap/ticdc/dm/syncer/flushFirstJob=return()" - "github.com/pingcap/ticdc/dm/syncer/failSecondJob=return()" + "github.com/pingcap/tiflow/dm/dm/worker/TaskCheckInterval=return(\"500ms\")" + "github.com/pingcap/tiflow/dm/syncer/countJobFromOneEvent=return()" + "github.com/pingcap/tiflow/dm/syncer/flushFirstJob=return()" + "github.com/pingcap/tiflow/dm/syncer/failSecondJob=return()" ) export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml @@ -246,10 +246,10 @@ function test_fail_job_between_event() { # worker2 will be bound to source2 and fail when see the second event in a GTID inject_points=( - "github.com/pingcap/ticdc/dm/dm/worker/TaskCheckInterval=return(\"500ms\")" - "github.com/pingcap/ticdc/dm/syncer/countJobFromOneGTID=return()" - "github.com/pingcap/ticdc/dm/syncer/flushFirstJob=return()" - "github.com/pingcap/ticdc/dm/syncer/failSecondJob=return()" + "github.com/pingcap/tiflow/dm/dm/worker/TaskCheckInterval=return(\"500ms\")" + "github.com/pingcap/tiflow/dm/syncer/countJobFromOneGTID=return()" + "github.com/pingcap/tiflow/dm/syncer/flushFirstJob=return()" + "github.com/pingcap/tiflow/dm/syncer/failSecondJob=return()" ) export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" run_dm_worker $WORK_DIR/worker2 $WORKER2_PORT $cur/conf/dm-worker2.toml @@ -330,8 +330,8 @@ function run() { test_stop_task_before_checkpoint inject_points=( - "github.com/pingcap/ticdc/dm/dm/worker/TaskCheckInterval=return(\"500ms\")" - "github.com/pingcap/ticdc/dm/relay/NewUpstreamServer=return(true)" + "github.com/pingcap/tiflow/dm/dm/worker/TaskCheckInterval=return(\"500ms\")" + "github.com/pingcap/tiflow/dm/relay/NewUpstreamServer=return(true)" ) export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" diff --git a/dm/tests/case_sensitive/run.sh b/dm/tests/case_sensitive/run.sh index 8c06720aee9..3fd1fdaea3d 100755 --- a/dm/tests/case_sensitive/run.sh +++ b/dm/tests/case_sensitive/run.sh @@ -10,8 +10,8 @@ API_VERSION="v1alpha1" function run() { run_sql_both_source "SET @@GLOBAL.SQL_MODE='ANSI_QUOTES,NO_AUTO_VALUE_ON_ZERO'" inject_points=( - "github.com/pingcap/ticdc/dm/dm/worker/TaskCheckInterval=return(\"500ms\")" - "github.com/pingcap/ticdc/dm/relay/NewUpstreamServer=return(true)" + "github.com/pingcap/tiflow/dm/dm/worker/TaskCheckInterval=return(\"500ms\")" + "github.com/pingcap/tiflow/dm/relay/NewUpstreamServer=return(true)" ) export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" diff --git a/dm/tests/checkpoint_transaction/run.sh b/dm/tests/checkpoint_transaction/run.sh index 2487558b220..5771945384a 100755 --- a/dm/tests/checkpoint_transaction/run.sh +++ b/dm/tests/checkpoint_transaction/run.sh @@ -7,7 +7,7 @@ source $cur/../_utils/test_prepare WORK_DIR=$TEST_DIR/$TEST_NAME function run() { - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/syncer/checkCheckpointInMiddleOfTransaction=return" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/syncer/checkCheckpointInMiddleOfTransaction=return" run_sql_file $cur/data/db1.prepare.sql $MYSQL_HOST1 $MYSQL_PORT1 $MYSQL_PASSWORD1 check_contains 'Query OK, 1 row affected' diff --git a/dm/tests/dmctl_basic/run.sh b/dm/tests/dmctl_basic/run.sh index 7af71ca292f..25b56a061f8 100755 --- a/dm/tests/dmctl_basic/run.sh +++ b/dm/tests/dmctl_basic/run.sh @@ -162,7 +162,7 @@ function test_operate_task_bound_to_a_source() { function run() { inject_points=( - "github.com/pingcap/ticdc/dm/pkg/streamer/SetHeartbeatInterval=return(1)" + "github.com/pingcap/tiflow/dm/pkg/streamer/SetHeartbeatInterval=return(1)" ) export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" diff --git a/dm/tests/drop_column_with_index/run.sh b/dm/tests/drop_column_with_index/run.sh index 3b7f95dc567..8c0ed0308c0 100755 --- a/dm/tests/drop_column_with_index/run.sh +++ b/dm/tests/drop_column_with_index/run.sh @@ -10,8 +10,8 @@ function run() { run_sql_file $cur/data/db1.prepare.sql $MYSQL_HOST1 $MYSQL_PORT1 $MYSQL_PASSWORD1 # need to return error three times, first for switch to remote binlog, second for auto retry inject_points=( - "github.com/pingcap/ticdc/dm/syncer/SyncerGetEventError=return" - "github.com/pingcap/ticdc/dm/syncer/GetEventError=3*return" + "github.com/pingcap/tiflow/dm/syncer/SyncerGetEventError=return" + "github.com/pingcap/tiflow/dm/syncer/GetEventError=3*return" ) export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" diff --git a/dm/tests/duplicate_event/run.sh b/dm/tests/duplicate_event/run.sh index f70b80c5805..1df98bc42c3 100644 --- a/dm/tests/duplicate_event/run.sh +++ b/dm/tests/duplicate_event/run.sh @@ -11,7 +11,7 @@ function run() { # with a 5 rows insert txn: 1 * FormatDesc + 1 * PreviousGTID + 1 * GTID + 1 * BEGIN + 5 * (Table_map + Write_rows) + 1 * XID # here we fail at the third write rows event, sync should retry and auto recover without any duplicate event - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/syncer/GetEventErrorInTxn=13*return(3)" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/syncer/GetEventErrorInTxn=13*return(3)" run_sql_file $cur/data/db1.prepare.sql $MYSQL_HOST1 $MYSQL_PORT1 $MYSQL_PASSWORD1 check_contains 'Query OK, 2 rows affected' @@ -41,7 +41,7 @@ function run() { # with a 5 rows insert txn: 1 * FormatDesc + 1 * PreviousGTID + 1 * GTID + 1 * BEGIN + 5 * (Table_map + Write_rows) + 1 * XID # here we fail at the third write rows event, sync should retry and auto recover without any duplicate event - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/relay/RelayGetEventFailed=15*return(3);github.com/pingcap/ticdc/dm/relay/retry/RelayAllowRetry=return" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/relay/RelayGetEventFailed=15*return(3);github.com/pingcap/tiflow/dm/relay/retry/RelayAllowRetry=return" run_dm_worker $WORK_DIR/worker2 $WORKER2_PORT $cur/conf/dm-worker2.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER2_PORT diff --git a/dm/tests/fake_rotate_event/run.sh b/dm/tests/fake_rotate_event/run.sh index 704ccf28f16..041f0acf04c 100755 --- a/dm/tests/fake_rotate_event/run.sh +++ b/dm/tests/fake_rotate_event/run.sh @@ -36,7 +36,7 @@ function run() { check_port_offline $WORKER1_PORT 20 # make fake rotate event and rewrite binlog filename to mysql-bin.000001 - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/syncer/MakeFakeRotateEvent=return("mysql-bin.000001")' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/syncer/MakeFakeRotateEvent=return("mysql-bin.000001")' run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT diff --git a/dm/tests/full_mode/run.sh b/dm/tests/full_mode/run.sh index 30a8344eadc..c72e7e46813 100755 --- a/dm/tests/full_mode/run.sh +++ b/dm/tests/full_mode/run.sh @@ -7,7 +7,7 @@ source $cur/../_utils/test_prepare WORK_DIR=$TEST_DIR/$TEST_NAME function fail_acquire_global_lock() { - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/dm/worker/TaskCheckInterval=return(\"500ms\")" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/dm/worker/TaskCheckInterval=return(\"500ms\")" run_sql_file $cur/data/db1.prepare.sql $MYSQL_HOST1 $MYSQL_PORT1 $MYSQL_PASSWORD1 check_contains 'Query OK, 2 rows affected' @@ -87,7 +87,7 @@ function escape_schema() { run_sql_file $cur/data/db2.prepare.user.sql $MYSQL_HOST2 $MYSQL_PORT2 $MYSQL_PASSWORD2 check_count 'Query OK, 0 rows affected' 7 - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/dumpling/SkipRemovingDumplingMetrics=return("")' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/dumpling/SkipRemovingDumplingMetrics=return("")' run_dm_master $WORK_DIR/master $MASTER_PORT $cur/conf/dm-master.toml check_rpc_alive $cur/../bin/check_master_online 127.0.0.1:$MASTER_PORT diff --git a/dm/tests/generate-mock.sh b/dm/tests/generate-mock.sh index ebdbbc79d47..cc4200a2779 100755 --- a/dm/tests/generate-mock.sh +++ b/dm/tests/generate-mock.sh @@ -19,7 +19,7 @@ for file in ./dm/dm/pb/*pb.go; do # extract public interface from pb source file ifs=$(grep -E "type [[:upper:]].*interface" "$file" | awk '{print $2}' 'ORS=,' | rev | cut -c 2- | rev) echo "generate mock for file $file" - "$MOCKGEN" -destination ./dm/dm/pbmock/"$prefix".go -package "$PACKAGE" github.com/pingcap/ticdc/dm/dm/pb "$ifs" + "$MOCKGEN" -destination ./dm/dm/pbmock/"$prefix".go -package "$PACKAGE" github.com/pingcap/tiflow/dm/dm/pb "$ifs" done echo "generate grpc mock code successfully" diff --git a/dm/tests/ha_cases_1/run.sh b/dm/tests/ha_cases_1/run.sh index 21dc947c5f6..85542699e8b 100755 --- a/dm/tests/ha_cases_1/run.sh +++ b/dm/tests/ha_cases_1/run.sh @@ -71,8 +71,8 @@ function test_kill_master() { } function test_kill_and_isolate_worker() { - inject_points=("github.com/pingcap/ticdc/dm/dm/worker/defaultKeepAliveTTL=return(1)" - "github.com/pingcap/ticdc/dm/dm/worker/defaultRelayKeepAliveTTL=return(2)" + inject_points=("github.com/pingcap/tiflow/dm/dm/worker/defaultKeepAliveTTL=return(1)" + "github.com/pingcap/tiflow/dm/dm/worker/defaultRelayKeepAliveTTL=return(2)" ) export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" echo "[$(date)] <<<<<< start test_kill_and_isolate_worker >>>>>>" diff --git a/dm/tests/import_goroutine_leak/run.sh b/dm/tests/import_goroutine_leak/run.sh index 35aa9544e9a..76c3854a35a 100644 --- a/dm/tests/import_goroutine_leak/run.sh +++ b/dm/tests/import_goroutine_leak/run.sh @@ -27,11 +27,11 @@ function run() { echo "dm-worker panic, doJob of import unit workers don't exit" # send to closed `runFatalChan` - inject_points=("github.com/pingcap/ticdc/dm/loader/LoadDataSlowDown=sleep(1000)" - "github.com/pingcap/ticdc/dm/loader/dispatchError=return(1)" - "github.com/pingcap/ticdc/dm/loader/executeSQLError=return(1)" - "github.com/pingcap/ticdc/dm/loader/returnDoJobError=return(1)" - "github.com/pingcap/ticdc/dm/loader/workerCantClose=return(1)" + inject_points=("github.com/pingcap/tiflow/dm/loader/LoadDataSlowDown=sleep(1000)" + "github.com/pingcap/tiflow/dm/loader/dispatchError=return(1)" + "github.com/pingcap/tiflow/dm/loader/executeSQLError=return(1)" + "github.com/pingcap/tiflow/dm/loader/returnDoJobError=return(1)" + "github.com/pingcap/tiflow/dm/loader/workerCantClose=return(1)" ) export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" @@ -59,11 +59,11 @@ function run() { echo "dm-worker panic again, workers of import unit don't exit" # send to closed `runFatalChan` - inject_points=("github.com/pingcap/ticdc/dm/loader/LoadDataSlowDown=sleep(1000)" - "github.com/pingcap/ticdc/dm/loader/dispatchError=return(1)" - "github.com/pingcap/ticdc/dm/loader/executeSQLError=return(1)" - "github.com/pingcap/ticdc/dm/loader/returnDoJobError=return(1)" - "github.com/pingcap/ticdc/dm/loader/dontWaitWorkerExit=return(1)" + inject_points=("github.com/pingcap/tiflow/dm/loader/LoadDataSlowDown=sleep(1000)" + "github.com/pingcap/tiflow/dm/loader/dispatchError=return(1)" + "github.com/pingcap/tiflow/dm/loader/executeSQLError=return(1)" + "github.com/pingcap/tiflow/dm/loader/returnDoJobError=return(1)" + "github.com/pingcap/tiflow/dm/loader/dontWaitWorkerExit=return(1)" ) export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml @@ -81,10 +81,10 @@ function run() { echo "restart dm-workers with errros to pause" # paused with injected error - inject_points=("github.com/pingcap/ticdc/dm/loader/LoadDataSlowDown=sleep(1000)" - "github.com/pingcap/ticdc/dm/loader/dispatchError=return(1)" - "github.com/pingcap/ticdc/dm/loader/executeSQLError=return(1)" - "github.com/pingcap/ticdc/dm/loader/returnDoJobError=return(1)" + inject_points=("github.com/pingcap/tiflow/dm/loader/LoadDataSlowDown=sleep(1000)" + "github.com/pingcap/tiflow/dm/loader/dispatchError=return(1)" + "github.com/pingcap/tiflow/dm/loader/executeSQLError=return(1)" + "github.com/pingcap/tiflow/dm/loader/returnDoJobError=return(1)" ) export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml @@ -99,10 +99,10 @@ function run() { check_port_offline $WORKER1_PORT 20 # use a small job chan size to block the sender - inject_points=("github.com/pingcap/ticdc/dm/loader/LoadDataSlowDown=sleep(1000)" - "github.com/pingcap/ticdc/dm/loader/executeSQLError=return(1)" - "github.com/pingcap/ticdc/dm/loader/returnDoJobError=return(1)" - "github.com/pingcap/ticdc/dm/loader/workerChanSize=return(10)" + inject_points=("github.com/pingcap/tiflow/dm/loader/LoadDataSlowDown=sleep(1000)" + "github.com/pingcap/tiflow/dm/loader/executeSQLError=return(1)" + "github.com/pingcap/tiflow/dm/loader/returnDoJobError=return(1)" + "github.com/pingcap/tiflow/dm/loader/workerChanSize=return(10)" ) export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml diff --git a/dm/tests/incremental_mode/run.sh b/dm/tests/incremental_mode/run.sh index b8b7dbbf171..34d5aab8b3b 100755 --- a/dm/tests/incremental_mode/run.sh +++ b/dm/tests/incremental_mode/run.sh @@ -15,7 +15,7 @@ function run() { run_sql_file $cur/data/db2.prepare.sql $MYSQL_HOST2 $MYSQL_PORT2 $MYSQL_PASSWORD2 check_contains 'Query OK, 3 rows affected' - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/dm/worker/defaultKeepAliveTTL=return(1)" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/dm/worker/defaultKeepAliveTTL=return(1)" run_dm_master $WORK_DIR/master $MASTER_PORT $cur/conf/dm-master.toml check_rpc_alive $cur/../bin/check_master_online 127.0.0.1:$MASTER_PORT @@ -155,7 +155,7 @@ function run() { sed -i "s/binlog-gtid-placeholder-2/$gtid2/g" $WORK_DIR/dm-task.yaml # test graceful display error - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/syncer/GetEventError=return' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/syncer/GetEventError=return' run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT run_dm_worker $WORK_DIR/worker2 $WORKER2_PORT $cur/conf/dm-worker2.toml @@ -171,7 +171,7 @@ function run() { check_port_offline $WORKER2_PORT 20 # only mock pull binlog failed once - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/syncer/WaitUserCancel=return(8);github.com/pingcap/ticdc/dm/syncer/GetEventError=1*return" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/syncer/WaitUserCancel=return(8);github.com/pingcap/tiflow/dm/syncer/GetEventError=1*return" run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT run_dm_worker $WORK_DIR/worker2 $WORKER2_PORT $cur/conf/dm-worker2.toml @@ -212,7 +212,7 @@ function run() { check_port_offline $WORKER1_PORT 20 check_port_offline $WORKER2_PORT 20 - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/syncer/FlushCheckpointStage=return(100)" # for all stages + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/syncer/FlushCheckpointStage=return(100)" # for all stages run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT run_dm_worker $WORK_DIR/worker2 $WORKER2_PORT $cur/conf/dm-worker2.toml diff --git a/dm/tests/initial_unit/run.sh b/dm/tests/initial_unit/run.sh index 1d499b8fc65..8260396a5c7 100644 --- a/dm/tests/initial_unit/run.sh +++ b/dm/tests/initial_unit/run.sh @@ -19,8 +19,8 @@ function prepare_data() { function run() { failpoints=( # 1152 is ErrAbortingConnection - "github.com/pingcap/ticdc/dm/syncer/LoadCheckpointFailed=return(1152)" - "github.com/pingcap/ticdc/dm/syncer/dbconn/GetMasterStatusFailed=return(1152)" + "github.com/pingcap/tiflow/dm/syncer/LoadCheckpointFailed=return(1152)" + "github.com/pingcap/tiflow/dm/syncer/dbconn/GetMasterStatusFailed=return(1152)" ) for ((i = 0; i < ${#failpoints[@]}; i++)); do diff --git a/dm/tests/lightning_mode/run.sh b/dm/tests/lightning_mode/run.sh index b15ce6fbc4a..11b26645816 100755 --- a/dm/tests/lightning_mode/run.sh +++ b/dm/tests/lightning_mode/run.sh @@ -12,8 +12,8 @@ function run() { run_sql_both_source "SET @@GLOBAL.SQL_MODE='ANSI_QUOTES,NO_AUTO_VALUE_ON_ZERO'" inject_points=( - "github.com/pingcap/ticdc/dm/dm/worker/TaskCheckInterval=return(\"500ms\")" - "github.com/pingcap/ticdc/dm/relay/NewUpstreamServer=return(true)" + "github.com/pingcap/tiflow/dm/dm/worker/TaskCheckInterval=return(\"500ms\")" + "github.com/pingcap/tiflow/dm/relay/NewUpstreamServer=return(true)" ) export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" diff --git a/dm/tests/load_interrupt/run.sh b/dm/tests/load_interrupt/run.sh index 7113b487dbb..79f8c79c44c 100755 --- a/dm/tests/load_interrupt/run.sh +++ b/dm/tests/load_interrupt/run.sh @@ -37,7 +37,7 @@ function test_save_checkpoint_failed() { prepare_datafile run_sql_file $WORK_DIR/db1.prepare.sql $MYSQL_HOST1 $MYSQL_PORT1 $MYSQL_PASSWORD1 - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/loader/loaderCPUpdateOffsetError=return()" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/loader/loaderCPUpdateOffsetError=return()" run_dm_master $WORK_DIR/master $MASTER_PORT $cur/conf/dm-master.toml check_rpc_alive $cur/../bin/check_master_online 127.0.0.1:$MASTER_PORT @@ -70,7 +70,7 @@ function run() { prepare_datafile run_sql_file $WORK_DIR/db1.prepare.sql $MYSQL_HOST1 $MYSQL_PORT1 $MYSQL_PASSWORD1 THRESHOLD=1024 - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/loader/LoadExceedOffsetExit=return($THRESHOLD)" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/loader/LoadExceedOffsetExit=return($THRESHOLD)" run_dm_master $WORK_DIR/master $MASTER_PORT $cur/conf/dm-master.toml check_rpc_alive $cur/../bin/check_master_online 127.0.0.1:$MASTER_PORT @@ -98,7 +98,7 @@ function run() { # check_row_count 1 # only failed at the first two time, will retry later and success - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/loader/LoadExecCreateTableFailed=3*return("1213")' # ER_LOCK_DEADLOCK, retryable error code + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/loader/LoadExecCreateTableFailed=3*return("1213")' # ER_LOCK_DEADLOCK, retryable error code run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT diff --git a/dm/tests/load_task/run.sh b/dm/tests/load_task/run.sh index 10b8d0d77db..9bd2c791920 100755 --- a/dm/tests/load_task/run.sh +++ b/dm/tests/load_task/run.sh @@ -31,7 +31,7 @@ function test_worker_restart() { "Please check if the previous worker is online." 1 # worker1 online - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/loader/LoadDataSlowDownByTask=return(\"load_task1\")" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/loader/LoadDataSlowDownByTask=return(\"load_task1\")" run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT @@ -80,7 +80,7 @@ function test_transfer_two_sources() { "\"unit\": \"Load\"" 1 # worker2 online - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/loader/LoadDataSlowDown=sleep(15000)" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/loader/LoadDataSlowDown=sleep(15000)" run_dm_worker $WORK_DIR/worker2 $WORKER2_PORT $cur/conf/dm-worker2.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER2_PORT @@ -182,7 +182,7 @@ function run() { check_rpc_alive $cur/../bin/check_master_online 127.0.0.1:$MASTER_PORT1 # worker1 loading load_task1 - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/loader/LoadDataSlowDownByTask=return(\"load_task1\")" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/loader/LoadDataSlowDownByTask=return(\"load_task1\")" run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT cp $cur/conf/source1.yaml $WORK_DIR/source1.yaml @@ -190,7 +190,7 @@ function run() { dmctl_operate_source create $WORK_DIR/source1.yaml $SOURCE_ID1 # worker2 loading load_task2 - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/loader/LoadDataSlowDownByTask=return(\"load_task2\")" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/loader/LoadDataSlowDownByTask=return(\"load_task2\")" run_dm_worker $WORK_DIR/worker2 $WORKER2_PORT $cur/conf/dm-worker2.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER2_PORT cp $cur/conf/source2.yaml $WORK_DIR/source2.yaml @@ -198,7 +198,7 @@ function run() { dmctl_operate_source create $WORK_DIR/source2.yaml $SOURCE_ID2 # worker3 loading load_task3 - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/loader/LoadDataSlowDownByTask=return(\"load_task3\")" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/loader/LoadDataSlowDownByTask=return(\"load_task3\")" run_dm_worker $WORK_DIR/worker3 $WORKER3_PORT $cur/conf/dm-worker3.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER3_PORT diff --git a/dm/tests/metrics/run.sh b/dm/tests/metrics/run.sh index c21f72c10f3..9372497d489 100755 --- a/dm/tests/metrics/run.sh +++ b/dm/tests/metrics/run.sh @@ -18,8 +18,8 @@ function run() { check_dashboard_datasource inject_points=( - "github.com/pingcap/ticdc/dm/syncer/BlockDDLJob=return(1)" - "github.com/pingcap/ticdc/dm/syncer/ShowLagInLog=return(1)" # test lag metric >= 1 beacuse we inject BlockDDLJob(ddl) to sleep(1) + "github.com/pingcap/tiflow/dm/syncer/BlockDDLJob=return(1)" + "github.com/pingcap/tiflow/dm/syncer/ShowLagInLog=return(1)" # test lag metric >= 1 beacuse we inject BlockDDLJob(ddl) to sleep(1) ) export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" @@ -75,8 +75,8 @@ function run() { rm -rf $WORK_DIR/worker1/log/dm-worker.log # clean up the old log rm -rf $WORK_DIR/worker2/log/dm-worker.log # clean up the old log inject_points=( - "github.com/pingcap/ticdc/dm/syncer/BlockExecuteSQLs=return(2)" - "github.com/pingcap/ticdc/dm/syncer/ShowLagInLog=return(2)" # test lag metric >= 2 beacuse we inject BlockExecuteSQLs to sleep(2) although skip lag is 0 (locally), but we use that lag of all dml/skip lag, so lag still >= 2 + "github.com/pingcap/tiflow/dm/syncer/BlockExecuteSQLs=return(2)" + "github.com/pingcap/tiflow/dm/syncer/ShowLagInLog=return(2)" # test lag metric >= 2 beacuse we inject BlockExecuteSQLs to sleep(2) although skip lag is 0 (locally), but we use that lag of all dml/skip lag, so lag still >= 2 ) export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" @@ -137,8 +137,8 @@ function run() { wait_pattern_exit dm-worker1.toml inject_points=( - "github.com/pingcap/ticdc/dm/syncer/noJobInQueueLog=return()" - "github.com/pingcap/ticdc/dm/syncer/IgnoreSomeTypeEvent=return(\"HeartbeatEvent\")" + "github.com/pingcap/tiflow/dm/syncer/noJobInQueueLog=return()" + "github.com/pingcap/tiflow/dm/syncer/IgnoreSomeTypeEvent=return(\"HeartbeatEvent\")" ) export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" rm -rf $WORK_DIR/worker1/log/dm-worker.log # clean up the old log diff --git a/dm/tests/new_relay/run.sh b/dm/tests/new_relay/run.sh index 43a2156185a..92e6b1053b8 100755 --- a/dm/tests/new_relay/run.sh +++ b/dm/tests/new_relay/run.sh @@ -28,7 +28,7 @@ function test_cant_dail_upstream() { kill_dm_worker - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/pkg/conn/failDBPing=return()" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/pkg/conn/failDBPing=return()" run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT @@ -85,7 +85,7 @@ function test_kill_dump_connection() { function run() { test_cant_dail_upstream - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/relay/ReportRelayLogSpaceInBackground=return(1)" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/relay/ReportRelayLogSpaceInBackground=return(1)" run_sql_file $cur/data/db1.prepare.sql $MYSQL_HOST1 $MYSQL_PORT1 $MYSQL_PASSWORD1 check_contains 'Query OK, 2 rows affected' diff --git a/dm/tests/online_ddl/run.sh b/dm/tests/online_ddl/run.sh index 69e6764c307..cbcca27f7fb 100755 --- a/dm/tests/online_ddl/run.sh +++ b/dm/tests/online_ddl/run.sh @@ -30,8 +30,8 @@ function run() { dmctl_operate_source create $WORK_DIR/source1.yaml $SOURCE_ID1 inject_points=( - "github.com/pingcap/ticdc/dm/syncer/online-ddl-tools/ExitAfterSaveOnlineDDL=return()" - "github.com/pingcap/ticdc/dm/syncer/ExitAfterSaveOnlineDDL=return()" + "github.com/pingcap/tiflow/dm/syncer/online-ddl-tools/ExitAfterSaveOnlineDDL=return()" + "github.com/pingcap/tiflow/dm/syncer/ExitAfterSaveOnlineDDL=return()" ) export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" run_dm_worker $WORK_DIR/worker2 $WORKER2_PORT $cur/conf/dm-worker2.toml diff --git a/dm/tests/only_dml/run.sh b/dm/tests/only_dml/run.sh index 52c666b7ad0..d735fb644b4 100755 --- a/dm/tests/only_dml/run.sh +++ b/dm/tests/only_dml/run.sh @@ -42,7 +42,7 @@ function insert_data() { } function run() { - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/pkg/streamer/SetHeartbeatInterval=return(1);github.com/pingcap/ticdc/dm/syncer/syncDMLBatchNotFull=return(true)" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/pkg/streamer/SetHeartbeatInterval=return(1);github.com/pingcap/tiflow/dm/syncer/syncDMLBatchNotFull=return(true)" run_sql_file $cur/data/db1.prepare.sql $MYSQL_HOST1 $MYSQL_PORT1 $MYSQL_PASSWORD1 check_contains 'Query OK, 1 row affected' diff --git a/dm/tests/print_status/run.sh b/dm/tests/print_status/run.sh index 891709ac6e4..539602c4300 100755 --- a/dm/tests/print_status/run.sh +++ b/dm/tests/print_status/run.sh @@ -14,9 +14,9 @@ function run() { # TableMapEvent, QueryEvent, GTIDEvent, and a specific Event in each group. # so we slow down 460 * 4 ms. Besides the log may be not flushed to disk asap, # we need to add some retry mechanism - inject_points=("github.com/pingcap/ticdc/dm/dm/worker/PrintStatusCheckSeconds=return(1)" - "github.com/pingcap/ticdc/dm/loader/LoadDataSlowDown=sleep(100)" - "github.com/pingcap/ticdc/dm/syncer/ProcessBinlogSlowDown=sleep(4)") + inject_points=("github.com/pingcap/tiflow/dm/dm/worker/PrintStatusCheckSeconds=return(1)" + "github.com/pingcap/tiflow/dm/loader/LoadDataSlowDown=sleep(100)" + "github.com/pingcap/tiflow/dm/syncer/ProcessBinlogSlowDown=sleep(4)") export GO_FAILPOINTS="$(join_string \; ${inject_points[@]})" run_dm_master $WORK_DIR/master $MASTER_PORT $cur/conf/dm-master.toml diff --git a/dm/tests/relay_interrupt/run.sh b/dm/tests/relay_interrupt/run.sh index 6d9abd39c8b..4ba58be24a9 100644 --- a/dm/tests/relay_interrupt/run.sh +++ b/dm/tests/relay_interrupt/run.sh @@ -23,8 +23,8 @@ function prepare_data2() { function run() { failpoints=( # 1152 is ErrAbortingConnection - "github.com/pingcap/ticdc/dm/pkg/utils/GetGlobalVariableFailed=return(\"server_uuid,1152\")" - "github.com/pingcap/ticdc/dm/pkg/utils/GetSessionVariableFailed=return(\"sql_mode,1152\")" + "github.com/pingcap/tiflow/dm/pkg/utils/GetGlobalVariableFailed=return(\"server_uuid,1152\")" + "github.com/pingcap/tiflow/dm/pkg/utils/GetSessionVariableFailed=return(\"sql_mode,1152\")" ) for ((i = 0; i < ${#failpoints[@]}; i++)); do @@ -103,7 +103,7 @@ function run() { echo "read binlog from relay log failed, and will use remote binlog" kill_dm_worker - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/pkg/streamer/GetEventFromLocalFailed=return()" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/pkg/streamer/GetEventFromLocalFailed=return()" run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT prepare_data2 $i diff --git a/dm/tests/retry_cancel/run.sh.todo b/dm/tests/retry_cancel/run.sh.todo index a185af81143..979854a85d7 100755 --- a/dm/tests/retry_cancel/run.sh.todo +++ b/dm/tests/retry_cancel/run.sh.todo @@ -14,7 +14,7 @@ function run() { check_contains 'Query OK, 2 rows affected' # inject error for loading data - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/pkg/conn/retryableError=return("retry_cancel")' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/pkg/conn/retryableError=return("retry_cancel")' run_dm_master $WORK_DIR/master $MASTER_PORT $cur/conf/dm-master.toml check_rpc_alive $cur/../bin/check_master_online 127.0.0.1:$MASTER_PORT @@ -55,7 +55,7 @@ function run() { # stop DM-worker, then update failpoint for checkpoint kill_dm_worker - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/pkg/conn/retryableError=return("UPDATE `dm_meta`.`test_loader_checkpoint`")' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/pkg/conn/retryableError=return("UPDATE `dm_meta`.`test_loader_checkpoint`")' # start DM-worker again run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml @@ -107,7 +107,7 @@ function run() { # ---------- test for incremental replication ---------- # stop DM-worker, then enable failponits kill_dm_worker - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/pkg/conn/retryableError=return(\"retry_cancel\")" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/pkg/conn/retryableError=return(\"retry_cancel\")" # run sql files to trigger incremental replication run_sql_file $cur/data/db1.increment.sql $MYSQL_HOST1 $MYSQL_PORT1 $MYSQL_PASSWORD1 diff --git a/dm/tests/safe_mode/run.sh b/dm/tests/safe_mode/run.sh index 4e50f8ad355..4d10cc0914b 100755 --- a/dm/tests/safe_mode/run.sh +++ b/dm/tests/safe_mode/run.sh @@ -97,7 +97,7 @@ function safe_mode_recover() { check_port_offline $WORKER1_PORT 20 check_port_offline $WORKER2_PORT 20 - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/syncer/SafeModeExit=return($i)" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/syncer/SafeModeExit=return($i)" run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT run_dm_worker $WORK_DIR/worker2 $WORKER2_PORT $cur/conf/dm-worker2.toml @@ -195,7 +195,7 @@ function run() { run_sql_file $cur/data/db2.prepare.sql $MYSQL_HOST2 $MYSQL_PORT2 $MYSQL_PASSWORD2 check_contains 'Query OK, 3 rows affected' - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/syncer/ReSyncExit=return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/syncer/ReSyncExit=return(true)' run_dm_master $WORK_DIR/master $MASTER_PORT $cur/conf/dm-master.toml check_rpc_alive $cur/../bin/check_master_online 127.0.0.1:$MASTER_PORT run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml @@ -220,7 +220,7 @@ function run() { check_port_offline $WORKER1_PORT 20 check_port_offline $WORKER2_PORT 20 - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/syncer/ShardSyncedExecutionExit=return(true);github.com/pingcap/ticdc/dm/syncer/SafeModeInitPhaseSeconds=return(300)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/syncer/ShardSyncedExecutionExit=return(true);github.com/pingcap/tiflow/dm/syncer/SafeModeInitPhaseSeconds=return(300)' run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml run_dm_worker $WORK_DIR/worker2 $WORKER2_PORT $cur/conf/dm-worker2.toml @@ -242,7 +242,7 @@ function run() { # DM-worker1 is sharding lock owner and exits if [ "$(check_port_return $WORKER1_PORT)" == "0" ]; then echo "DM-worker1 is sharding lock owner and detects it offline" - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/syncer/SafeModeInitPhaseSeconds=return(0)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/syncer/SafeModeInitPhaseSeconds=return(0)' run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT check_instance_id="1" @@ -252,7 +252,7 @@ function run() { # DM-worker2 is sharding lock owner and exits if [ "$(check_port_return $WORKER2_PORT)" == "0" ]; then echo "DM-worker2 is sharding lock owner and detects it offline" - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/syncer/SafeModeInitPhaseSeconds=return(0)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/syncer/SafeModeInitPhaseSeconds=return(0)' run_dm_worker $WORK_DIR/worker2 $WORKER2_PORT $cur/conf/dm-worker2.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER2_PORT check_instance_id="2" diff --git a/dm/tests/sequence_safe_mode/run.sh b/dm/tests/sequence_safe_mode/run.sh index 7461f4c6844..5a7f5d70793 100755 --- a/dm/tests/sequence_safe_mode/run.sh +++ b/dm/tests/sequence_safe_mode/run.sh @@ -12,7 +12,7 @@ function run() { run_sql_file $cur/data/db2.prepare.sql $MYSQL_HOST2 $MYSQL_PORT2 $MYSQL_PASSWORD2 check_contains 'Query OK, 3 rows affected' - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/syncer/ReSyncExit=return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/syncer/ReSyncExit=return(true)' run_dm_master $WORK_DIR/master $MASTER_PORT $cur/conf/dm-master.toml check_rpc_alive $cur/../bin/check_master_online 127.0.0.1:$MASTER_PORT run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml @@ -50,7 +50,7 @@ function run() { pkill -hup dm-worker.test 2>/dev/null || true wait_process_exit dm-worker.test - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/syncer/SequenceShardSyncedExecutionExit=return(true);github.com/pingcap/ticdc/dm/syncer/SafeModeInitPhaseSeconds=return(300)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/syncer/SequenceShardSyncedExecutionExit=return(true);github.com/pingcap/tiflow/dm/syncer/SafeModeInitPhaseSeconds=return(300)' echo "restart DM-worker after set SequenceShardSyncedExecutionExit failpoint" run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml @@ -71,7 +71,7 @@ function run() { # DM-worker1 is sharding lock owner and exits if [ "$(check_port_return $WORKER1_PORT)" == "0" ]; then echo "DM-worker1 is sharding lock owner and detects it offline" - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/syncer/SafeModeInitPhaseSeconds=return(0)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/syncer/SafeModeInitPhaseSeconds=return(0)' run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT check_instance_id="1" @@ -81,7 +81,7 @@ function run() { # DM-worker2 is sharding lock owner and exits if [ "$(check_port_return $WORKER2_PORT)" == "0" ]; then echo "DM-worker2 is sharding lock owner and detects it offline" - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/syncer/SafeModeInitPhaseSeconds=return(0)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/syncer/SafeModeInitPhaseSeconds=return(0)' run_dm_worker $WORK_DIR/worker2 $WORKER2_PORT $cur/conf/dm-worker2.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER2_PORT check_instance_id="2" diff --git a/dm/tests/sequence_sharding_optimistic/run.sh b/dm/tests/sequence_sharding_optimistic/run.sh index 0624684ab80..d414646e899 100755 --- a/dm/tests/sequence_sharding_optimistic/run.sh +++ b/dm/tests/sequence_sharding_optimistic/run.sh @@ -84,7 +84,7 @@ run() { # now, for optimistic shard DDL, different sources will reach a stage often not at the same time, # in order to simply the check and resume flow, only enable the failpoint for one DM-worker. - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/syncer/FlushCheckpointStage=return(100)" # for all stages + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/syncer/FlushCheckpointStage=return(100)" # for all stages echo "restart dm-worker1" ps aux | grep dm-worker1 | awk '{print $2}' | xargs kill || true check_port_offline $WORKER1_PORT 20 diff --git a/dm/tests/shardddl1/run.sh b/dm/tests/shardddl1/run.sh index 4b63801670d..3b81c3f8ba1 100644 --- a/dm/tests/shardddl1/run.sh +++ b/dm/tests/shardddl1/run.sh @@ -261,7 +261,7 @@ function DM_RemoveLock_CASE() { function DM_RemoveLock() { ps aux | grep dm-master | awk '{print $2}' | xargs kill || true check_master_port_offline 1 - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/dm/master/shardddl/SleepWhenRemoveLock=return(30)" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/dm/master/shardddl/SleepWhenRemoveLock=return(30)" run_dm_master $WORK_DIR/master $MASTER_PORT $cur/conf/dm-master.toml check_rpc_alive $cur/../bin/check_master_online 127.0.0.1:$MASTER_PORT run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \ @@ -597,7 +597,7 @@ function DM_COMPACT() { ps aux | grep dm-worker | awk '{print $2}' | xargs kill || true check_port_offline $WORKER1_PORT 20 check_port_offline $WORKER2_PORT 20 - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/syncer/BlockExecuteSQLs=return(1)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/syncer/BlockExecuteSQLs=return(1)' run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml run_dm_worker $WORK_DIR/worker2 $WORKER2_PORT $cur/conf/dm-worker2.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT diff --git a/dm/tests/shardddl2/run.sh b/dm/tests/shardddl2/run.sh index 5f095e78588..2c95319431c 100644 --- a/dm/tests/shardddl2/run.sh +++ b/dm/tests/shardddl2/run.sh @@ -248,7 +248,7 @@ function DM_DROP_COLUMN_EXEC_ERROR_CASE() { w="2" fi - restart_worker $w "github.com/pingcap/ticdc/dm/syncer/ExecDDLError=return()" + restart_worker $w "github.com/pingcap/tiflow/dm/syncer/ExecDDLError=return()" run_sql_source1 "insert into ${shardddl1}.${tb1} values(1,'aaa');" run_sql_source2 "insert into ${shardddl1}.${tb1} values(2,'bbb');" @@ -309,7 +309,7 @@ function DM_DROP_COLUMN_ALL_DONE_CASE() { w="2" fi - restart_worker $w "github.com/pingcap/ticdc/dm/syncer/ExecDDLError=return()" + restart_worker $w "github.com/pingcap/tiflow/dm/syncer/ExecDDLError=return()" run_sql_source1 "insert into ${shardddl1}.${tb1} values(1,'aaa');" run_sql_source2 "insert into ${shardddl1}.${tb1} values(2,'bbb');" diff --git a/dm/tests/sharding/run.sh b/dm/tests/sharding/run.sh index 45e8b99c54c..87805d50ab9 100755 --- a/dm/tests/sharding/run.sh +++ b/dm/tests/sharding/run.sh @@ -42,7 +42,7 @@ function run() { # # now, for pessimistic shard DDL, owner and non-owner will reach a stage often not at the same time, # in order to simply the check and resume flow, only enable the failpoint for one DM-worker. - export GO_FAILPOINTS="github.com/pingcap/ticdc/dm/syncer/FlushCheckpointStage=return(2)" + export GO_FAILPOINTS="github.com/pingcap/tiflow/dm/syncer/FlushCheckpointStage=return(2)" run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT dmctl_operate_source create $WORK_DIR/source1.yaml $SOURCE_ID1 diff --git a/dm/tests/sharding2/run.sh b/dm/tests/sharding2/run.sh index cf8c6530add..171c318a1c7 100755 --- a/dm/tests/sharding2/run.sh +++ b/dm/tests/sharding2/run.sh @@ -61,7 +61,7 @@ function run() { check_port_offline $WORKER1_PORT 20 check_port_offline $WORKER2_PORT 20 - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/syncer/ExitAfterDDLBeforeFlush=return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/syncer/ExitAfterDDLBeforeFlush=return(true)' run_sql_file $cur/data/db1.increment3.sql $MYSQL_HOST1 $MYSQL_PORT1 $MYSQL_PASSWORD1 run_sql_file $cur/data/db2.increment3.sql $MYSQL_HOST2 $MYSQL_PORT2 $MYSQL_PASSWORD2 @@ -75,7 +75,7 @@ function run() { check_port_offline $WORKER2_PORT 20 # mock recover relay writer - export GO_FAILPOINTS='github.com/pingcap/ticdc/dm/relay/writer/MockRecoverRelayWriter=return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/dm/relay/writer/MockRecoverRelayWriter=return(true)' run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $cur/conf/dm-worker1.toml check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT diff --git a/dm/tests/start_task/run.sh b/dm/tests/start_task/run.sh index 08d08952bc6..90e51cb24f7 100644 --- a/dm/tests/start_task/run.sh +++ b/dm/tests/start_task/run.sh @@ -66,8 +66,8 @@ function run() { lazy_init_tracker failpoints=( # 1152 is ErrAbortingConnection - "github.com/pingcap/ticdc/dm/pkg/utils/FetchTargetDoTablesFailed=return(1152)" - "github.com/pingcap/ticdc/dm/pkg/utils/FetchAllDoTablesFailed=return(1152)" + "github.com/pingcap/tiflow/dm/pkg/utils/FetchTargetDoTablesFailed=return(1152)" + "github.com/pingcap/tiflow/dm/pkg/utils/FetchAllDoTablesFailed=return(1152)" ) for ((i = 0; i < ${#failpoints[@]}; i++)); do diff --git a/dm/tests/utils/dmctl.go b/dm/tests/utils/dmctl.go index febae30f22c..b72f2f9d4e2 100644 --- a/dm/tests/utils/dmctl.go +++ b/dm/tests/utils/dmctl.go @@ -22,7 +22,7 @@ import ( "github.com/pingcap/errors" "google.golang.org/grpc" - "github.com/pingcap/ticdc/dm/dm/pb" + "github.com/pingcap/tiflow/dm/dm/pb" ) // CreateDmCtl creates a gRPC client to DM-master. diff --git a/dm/tests/utils/log.go b/dm/tests/utils/log.go index 3a1ed2dc6cd..051ce709931 100644 --- a/dm/tests/utils/log.go +++ b/dm/tests/utils/log.go @@ -18,7 +18,7 @@ import ( "go.uber.org/zap" - "github.com/pingcap/ticdc/dm/pkg/log" + "github.com/pingcap/tiflow/dm/pkg/log" ) // ExitWithError forces to exist the process, it's often used in integration tests. diff --git a/docs/design/2020-03-25-ticdc-high-availability-new-design-cn.md b/docs/design/2020-03-25-ticdc-high-availability-new-design-cn.md index 7ea25a8fd9c..f71e2975278 100644 --- a/docs/design/2020-03-25-ticdc-high-availability-new-design-cn.md +++ b/docs/design/2020-03-25-ticdc-high-availability-new-design-cn.md @@ -13,7 +13,7 @@ TiCDC 高可用是指任何一个 cdc 节点挂掉，都不影响集群整体的 本文总结已有代码发现的一些问题，并给出解决方案。 -> 注意，本文分析代码基于 [v4.0.0-beta.2](https://github.com/pingcap/ticdc/tree/v4.0.0-beta.2) 版本 +> 注意，本文分析代码基于 [v4.0.0-beta.2](https://github.com/pingcap/tiflow/tree/v4.0.0-beta.2) 版本 ## 问题 @@ -21,9 +21,9 @@ TiCDC 高可用是指任何一个 cdc 节点挂掉，都不影响集群整体的 一个 Session 是指节点与 etcd 之间维持的一种保持连接的状态。Session 中含有 Lease，并在节点存活期间保持心跳。节点挂掉后，Session 失效，与其中 Lease 关联的 Key 都被删除。这常用来服务发现中对服务节点是否存活的标识。 -起初，Capture 并没有使用 Session，而是仅仅在竞选 Owner 的时候创建了 Session。这样导致 Capture 挂掉后，其注册信息是无法被清理的。Capture 节点挂掉后（非正常退出），其负责的任务没有及时重新分配。这个问题在 PR [Refactor/capture watcher](https://github.com/pingcap/ticdc/pull/319) 中解决。 +起初，Capture 并没有使用 Session，而是仅仅在竞选 Owner 的时候创建了 Session。这样导致 Capture 挂掉后，其注册信息是无法被清理的。Capture 节点挂掉后（非正常退出），其负责的任务没有及时重新分配。这个问题在 PR [Refactor/capture watcher](https://github.com/pingcap/tiflow/pull/319) 中解决。 -另外，为了减少 RTO，我们引入了 Processor 的 Session，用来及时发现挂掉的 Processor。PR：[Reduce the RTO by watching the liveness of processors](https://github.com/pingcap/ticdc/pull/312) +另外，为了减少 RTO，我们引入了 Processor 的 Session，用来及时发现挂掉的 Processor。PR：[Reduce the RTO by watching the liveness of processors](https://github.com/pingcap/tiflow/pull/312) 因此，我们目前有三个 Session，一个是 Capture Session，用来维持 Capture 存活信息，一个是 Processor Session，用来维护 Processor 存活信息，还有一个是原来存在的 Manager Session，用来竞选 Owner。 diff --git a/docs/design/2021-10-13-ticdc-mq-sink-column-selector.md b/docs/design/2021-10-13-ticdc-mq-sink-column-selector.md index 7192a2453b9..f26d8ec7af0 100644 --- a/docs/design/2021-10-13-ticdc-mq-sink-column-selector.md +++ b/docs/design/2021-10-13-ticdc-mq-sink-column-selector.md @@ -1,7 +1,7 @@ # TiCDC Design Documents - Author(s): [hi-rustin](https://github.com/hi-rustin) -- Tracking Issue: https://github.com/pingcap/ticdc/issues/3082 +- Tracking Issue: https://github.com/pingcap/tiflow/issues/3082 ## Table of Contents diff --git a/docs/design/README.md b/docs/design/README.md index 70f8de37446..3eda8a36a09 100644 --- a/docs/design/README.md +++ b/docs/design/README.md @@ -16,14 +16,14 @@ A hastily-proposed design document can hurt its chances of acceptance. Low-quali Although there is no single way to prepare for submitting a design document, it is generally a good idea to pursue feedback from other project developers beforehand, to ascertain that the design document may be desirable; having a consistent impact on the project requires concerted effort toward consensus-building. -The most common preparations for writing and submitting a design document for now is [creating a discuss issue](https://github.com/pingcap/ticdc/issues/new/choose), which is going to be converted into a tracking issue of the design implementation. +The most common preparations for writing and submitting a design document for now is [creating a discuss issue](https://github.com/pingcap/tiflow/issues/new/choose), which is going to be converted into a tracking issue of the design implementation. ## What is the process? 1. Create a pull request with a design document based on the [template](./TEMPLATE.md) under this directory as `YYYY-MM-DD-my-feature.md`. 2. Discussion takes place, and the text is revised in response. 3. The design document is accepted or rejected when at least two committers reach consensus and no objection from the committer. -4. If accepted, [create a tracking issue](https://github.com/pingcap/ticdc/issues/new/choose) for the design document or convert one from a previous discuss issue. The tracking issue basically tracks subtasks and progress. And refer the tracking issue in the design document replacing placeholder in the template. +4. If accepted, [create a tracking issue](https://github.com/pingcap/tiflow/issues/new/choose) for the design document or convert one from a previous discuss issue. The tracking issue basically tracks subtasks and progress. And refer the tracking issue in the design document replacing placeholder in the template. 5. Merge the pull request of design. Please update the tracking issue according to the progress of succeeding implementation pull requests. diff --git a/docs/design/TEMPLATE.md b/docs/design/TEMPLATE.md index 4e4380e500f..a721bc68616 100644 --- a/docs/design/TEMPLATE.md +++ b/docs/design/TEMPLATE.md @@ -1,8 +1,8 @@ # TiCDC Design Documents - Author(s): [Author Name](http://github.com/your-github-id), [Co-Author Name](http://github.com/your-github-id), ... -- Discussion PR: https://github.com/pingcap/ticdc/pull/XXX -- Tracking Issue: https://github.com/pingcap/ticdc/issues/XXX +- Discussion PR: https://github.com/pingcap/tiflow/pull/XXX +- Tracking Issue: https://github.com/pingcap/tiflow/issues/XXX ## Table of Contents diff --git a/docs/design/package.json b/docs/design/package.json index 9cedcd2b15d..5a8d53b2360 100644 --- a/docs/design/package.json +++ b/docs/design/package.json @@ -8,7 +8,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com:pingcap/ticdc.git" + "url": "git+https://github.com:pingcap/tiflow.git" }, "keywords": [ "rfc" @@ -16,9 +16,9 @@ "author": "TiCDC Authors", "license": "Apache-2.0", "bugs": { - "url": "https://github.com/pingcap/ticdc/issues" + "url": "https://github.com/pingcap/tiflow/issues" }, - "homepage": "https://github.com/pingcap/ticdc/docs/design#readme", + "homepage": "https://github.com/pingcap/tiflow/docs/design#readme", "devDependencies": { "husky": "^5.0.9", "prettier": "^2.2.1" diff --git a/go.mod b/go.mod index 90b9c296732..e89a34a8f47 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/pingcap/ticdc +module github.com/pingcap/tiflow go 1.16 diff --git a/integration/framework/avro/kafka_docker_env.go b/integration/framework/avro/kafka_docker_env.go index c7de72441e7..9f504e9f368 100644 --- a/integration/framework/avro/kafka_docker_env.go +++ b/integration/framework/avro/kafka_docker_env.go @@ -22,7 +22,7 @@ import ( "github.com/integralist/go-findroot/find" "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" "go.uber.org/zap" ) diff --git a/integration/framework/avro/kafka_docker_env_test.go b/integration/framework/avro/kafka_docker_env_test.go index f6bf90755db..2662a55a3b9 100644 --- a/integration/framework/avro/kafka_docker_env_test.go +++ b/integration/framework/avro/kafka_docker_env_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/pingcap/log" - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" "github.com/stretchr/testify/require" ) diff --git a/integration/framework/avro/kafka_single_table.go b/integration/framework/avro/kafka_single_table.go index 7d9084038e5..0ace67e3c56 100644 --- a/integration/framework/avro/kafka_single_table.go +++ b/integration/framework/avro/kafka_single_table.go @@ -23,7 +23,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" "go.uber.org/zap" ) diff --git a/integration/framework/avro/kafka_single_table_test.go b/integration/framework/avro/kafka_single_table_test.go index bc09561e820..7d4f266e790 100644 --- a/integration/framework/avro/kafka_single_table_test.go +++ b/integration/framework/avro/kafka_single_table_test.go @@ -17,7 +17,7 @@ import ( "database/sql" "testing" - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" "github.com/stretchr/testify/require" ) diff --git a/integration/framework/canal/kafka_docker_env.go b/integration/framework/canal/kafka_docker_env.go index f8c21bdf8d4..d3ce414e42e 100644 --- a/integration/framework/canal/kafka_docker_env.go +++ b/integration/framework/canal/kafka_docker_env.go @@ -21,7 +21,7 @@ import ( "github.com/integralist/go-findroot/find" "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" "go.uber.org/zap" ) diff --git a/integration/framework/canal/kafka_docker_env_test.go b/integration/framework/canal/kafka_docker_env_test.go index 57d7b340355..e150076feaa 100644 --- a/integration/framework/canal/kafka_docker_env_test.go +++ b/integration/framework/canal/kafka_docker_env_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/pingcap/log" - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" "github.com/stretchr/testify/require" ) diff --git a/integration/framework/canal/kafka_single_table.go b/integration/framework/canal/kafka_single_table.go index ad15240af15..c7c256a7efc 100644 --- a/integration/framework/canal/kafka_single_table.go +++ b/integration/framework/canal/kafka_single_table.go @@ -18,7 +18,7 @@ import ( "time" "github.com/pingcap/log" - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" ) const ( diff --git a/integration/framework/canal/kafka_single_table_test.go b/integration/framework/canal/kafka_single_table_test.go index 91a96e67d7a..ed999aac93f 100644 --- a/integration/framework/canal/kafka_single_table_test.go +++ b/integration/framework/canal/kafka_single_table_test.go @@ -17,7 +17,7 @@ import ( "database/sql" "testing" - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" "github.com/stretchr/testify/require" ) diff --git a/integration/framework/docker_compose_op.go b/integration/framework/docker_compose_op.go index e42a7a570f4..8f729be09dc 100644 --- a/integration/framework/docker_compose_op.go +++ b/integration/framework/docker_compose_op.go @@ -21,8 +21,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/retry" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/retry" "go.uber.org/zap" "golang.org/x/net/context" ) diff --git a/integration/framework/docker_env.go b/integration/framework/docker_env.go index 1e687912839..40c3405ea0c 100644 --- a/integration/framework/docker_env.go +++ b/integration/framework/docker_env.go @@ -20,8 +20,8 @@ import ( "os/exec" "github.com/pingcap/log" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/retry" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/retry" "go.uber.org/zap" ) diff --git a/integration/framework/mysql/docker_env.go b/integration/framework/mysql/docker_env.go index 94a9ce16c8e..28e2ce66917 100644 --- a/integration/framework/mysql/docker_env.go +++ b/integration/framework/mysql/docker_env.go @@ -19,7 +19,7 @@ import ( "github.com/integralist/go-findroot/find" "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" "go.uber.org/zap" ) diff --git a/integration/framework/mysql/docker_env_test.go b/integration/framework/mysql/docker_env_test.go index 3ae307821c3..e99b0271190 100644 --- a/integration/framework/mysql/docker_env_test.go +++ b/integration/framework/mysql/docker_env_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/pingcap/log" - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" "github.com/stretchr/testify/require" ) diff --git a/integration/framework/mysql/single_table.go b/integration/framework/mysql/single_table.go index 3f6addc0b95..dc1ef419c49 100644 --- a/integration/framework/mysql/single_table.go +++ b/integration/framework/mysql/single_table.go @@ -18,7 +18,7 @@ import ( "time" "github.com/pingcap/log" - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" ) const ( diff --git a/integration/framework/mysql/single_table_test.go b/integration/framework/mysql/single_table_test.go index ef1f8b8c19d..188f4e95ed0 100644 --- a/integration/framework/mysql/single_table_test.go +++ b/integration/framework/mysql/single_table_test.go @@ -17,7 +17,7 @@ import ( "database/sql" "testing" - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" "github.com/stretchr/testify/require" ) diff --git a/integration/framework/sql_helper.go b/integration/framework/sql_helper.go index 2769c03c7d0..69a087110b1 100644 --- a/integration/framework/sql_helper.go +++ b/integration/framework/sql_helper.go @@ -24,7 +24,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/pkg/quotes" + "github.com/pingcap/tiflow/pkg/quotes" "go.uber.org/zap" "go.uber.org/zap/zapcore" "upper.io/db.v3/lib/sqlbuilder" diff --git a/integration/integration.go b/integration/integration.go index e77d59df08e..63527f4d797 100644 --- a/integration/integration.go +++ b/integration/integration.go @@ -17,11 +17,11 @@ import ( "flag" "github.com/pingcap/log" - "github.com/pingcap/ticdc/integration/framework" - "github.com/pingcap/ticdc/integration/framework/avro" - "github.com/pingcap/ticdc/integration/framework/canal" - "github.com/pingcap/ticdc/integration/framework/mysql" - "github.com/pingcap/ticdc/integration/tests" + "github.com/pingcap/tiflow/integration/framework" + "github.com/pingcap/tiflow/integration/framework/avro" + "github.com/pingcap/tiflow/integration/framework/canal" + "github.com/pingcap/tiflow/integration/framework/mysql" + "github.com/pingcap/tiflow/integration/tests" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) @@ -97,7 +97,7 @@ func testMySQL() { func testMySQLWithCheckingOldvValue() { env := mysql.NewDockerEnv(*dockerComposeFile) - env.DockerComposeOperator.ExecEnv = []string{"GO_FAILPOINTS=github.com/pingcap/ticdc/cdc/sink/SimpleMySQLSinkTester=return(ture)"} + env.DockerComposeOperator.ExecEnv = []string{"GO_FAILPOINTS=github.com/pingcap/tiflow/cdc/sink/SimpleMySQLSinkTester=return(ture)"} task := &mysql.SingleTableTask{TableName: "test", CheckOleValue: true} testCases := []framework.Task{ tests.NewSimpleCase(task), diff --git a/integration/tests/case_alter.go b/integration/tests/case_alter.go index 4dc972c88aa..34819c227c2 100644 --- a/integration/tests/case_alter.go +++ b/integration/tests/case_alter.go @@ -18,7 +18,7 @@ import ( "math/rand" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" ) // AlterCase is base impl of test case for alter operation diff --git a/integration/tests/case_composite_pkey.go b/integration/tests/case_composite_pkey.go index a969b47f4cd..b0252f8b5e0 100644 --- a/integration/tests/case_composite_pkey.go +++ b/integration/tests/case_composite_pkey.go @@ -15,7 +15,7 @@ package tests import ( "github.com/pingcap/errors" - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" ) // CompositePKeyCase is base impl of test case for composite primary keys diff --git a/integration/tests/case_date_time.go b/integration/tests/case_date_time.go index ac060b94036..a278a9a4965 100644 --- a/integration/tests/case_date_time.go +++ b/integration/tests/case_date_time.go @@ -18,10 +18,10 @@ import ( "time" "github.com/pingcap/log" - "github.com/pingcap/ticdc/integration/framework" - "github.com/pingcap/ticdc/integration/framework/avro" - "github.com/pingcap/ticdc/integration/framework/canal" - "github.com/pingcap/ticdc/integration/framework/mysql" + "github.com/pingcap/tiflow/integration/framework" + "github.com/pingcap/tiflow/integration/framework/avro" + "github.com/pingcap/tiflow/integration/framework/canal" + "github.com/pingcap/tiflow/integration/framework/mysql" ) // DateTimeCase is base impl of test case for different types data diff --git a/integration/tests/case_delete.go b/integration/tests/case_delete.go index e301abb3325..b48a2ea8ed2 100644 --- a/integration/tests/case_delete.go +++ b/integration/tests/case_delete.go @@ -17,7 +17,7 @@ import ( "errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" "go.uber.org/zap" ) diff --git a/integration/tests/case_many_types.go b/integration/tests/case_many_types.go index bcca8313891..5af2a25e815 100644 --- a/integration/tests/case_many_types.go +++ b/integration/tests/case_many_types.go @@ -18,10 +18,10 @@ import ( "math" "time" - "github.com/pingcap/ticdc/integration/framework" - "github.com/pingcap/ticdc/integration/framework/avro" - "github.com/pingcap/ticdc/integration/framework/canal" - "github.com/pingcap/ticdc/integration/framework/mysql" + "github.com/pingcap/tiflow/integration/framework" + "github.com/pingcap/tiflow/integration/framework/avro" + "github.com/pingcap/tiflow/integration/framework/canal" + "github.com/pingcap/tiflow/integration/framework/mysql" ) // ManyTypesCase is base impl of test case for different types data diff --git a/integration/tests/case_simple.go b/integration/tests/case_simple.go index dc78560020b..834a3233d5f 100644 --- a/integration/tests/case_simple.go +++ b/integration/tests/case_simple.go @@ -15,7 +15,7 @@ package tests import ( "github.com/pingcap/errors" - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" ) // SimpleCase is base impl of simple test case diff --git a/integration/tests/case_unsigned.go b/integration/tests/case_unsigned.go index 79660403ca0..7978678a5a5 100644 --- a/integration/tests/case_unsigned.go +++ b/integration/tests/case_unsigned.go @@ -14,7 +14,7 @@ package tests import ( - "github.com/pingcap/ticdc/integration/framework" + "github.com/pingcap/tiflow/integration/framework" ) // UnsignedCase is base impl of test case for unsigned int type data diff --git a/kafka_consumer/Dockerfile b/kafka_consumer/Dockerfile index 4eb646c42c7..d19b51b6007 100644 --- a/kafka_consumer/Dockerfile +++ b/kafka_consumer/Dockerfile @@ -1,9 +1,9 @@ FROM golang:1.13 as builder -WORKDIR /go/src/github.com/pingcap/ticdc +WORKDIR /go/src/github.com/pingcap/tiflow COPY . . RUN go mod download RUN make kafka_consumer FROM alpine:3.11 -COPY --from=builder /go/src/github.com/pingcap/ticdc/bin/cdc_kafka_consumer /cdc_kafka_consumer +COPY --from=builder /go/src/github.com/pingcap/tiflow/bin/cdc_kafka_consumer /cdc_kafka_consumer CMD [ "/cdc_kafka_consumer" ] diff --git a/pkg/actor/actor.go b/pkg/actor/actor.go index 7e5c609e77f..c3f559ee796 100644 --- a/pkg/actor/actor.go +++ b/pkg/actor/actor.go @@ -16,8 +16,8 @@ package actor import ( "context" - "github.com/pingcap/ticdc/pkg/actor/message" - cerrors "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/pkg/actor/message" + cerrors "github.com/pingcap/tiflow/pkg/errors" ) var errMailboxFull = cerrors.ErrMailboxFull.FastGenByArgs() diff --git a/pkg/actor/actor_test.go b/pkg/actor/actor_test.go index 709168728bf..a47dedb28e5 100644 --- a/pkg/actor/actor_test.go +++ b/pkg/actor/actor_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/actor/message" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/actor/message" "github.com/stretchr/testify/require" ) diff --git a/pkg/actor/message/message.go b/pkg/actor/message/message.go index 3e44a4f4604..4dd7d11fd0a 100644 --- a/pkg/actor/message/message.go +++ b/pkg/actor/message/message.go @@ -14,7 +14,7 @@ package message import ( - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" ) // Type is the type of Message diff --git a/pkg/actor/message/message_test.go b/pkg/actor/message/message_test.go index 4551ee9dfa1..10ad190ba79 100644 --- a/pkg/actor/message/message_test.go +++ b/pkg/actor/message/message_test.go @@ -17,7 +17,7 @@ import ( "encoding/json" "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" "github.com/stretchr/testify/require" ) diff --git a/pkg/actor/system.go b/pkg/actor/system.go index ef5dfe118a4..76a72ba3703 100644 --- a/pkg/actor/system.go +++ b/pkg/actor/system.go @@ -22,8 +22,8 @@ import ( "time" "github.com/pingcap/log" - "github.com/pingcap/ticdc/pkg/actor/message" - cerrors "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/pkg/actor/message" + cerrors "github.com/pingcap/tiflow/pkg/errors" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" "golang.org/x/sync/errgroup" diff --git a/pkg/actor/system_test.go b/pkg/actor/system_test.go index daeb0647039..63a038ffda0 100644 --- a/pkg/actor/system_test.go +++ b/pkg/actor/system_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/pingcap/ticdc/pkg/actor/message" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/actor/message" + "github.com/pingcap/tiflow/pkg/leakutil" dto "github.com/prometheus/client_model/go" "github.com/stretchr/testify/require" ) @@ -645,7 +645,7 @@ func TestSendAfterClose(t *testing.T) { } // Run the benchmark -// go test -benchmem -run='^$' -bench '^(BenchmarkActorSendReceive)$' github.com/pingcap/ticdc/pkg/actor +// go test -benchmem -run='^$' -bench '^(BenchmarkActorSendReceive)$' github.com/pingcap/tiflow/pkg/actor func BenchmarkActorSendReceive(b *testing.B) { ctx := context.Background() sys, router := makeTestSystem(b.Name(), b) @@ -687,7 +687,7 @@ func BenchmarkActorSendReceive(b *testing.B) { } // Run the benchmark -// go test -benchmem -run='^$' -bench '^(BenchmarkPollActor)$' github.com/pingcap/ticdc/pkg/actor +// go test -benchmem -run='^$' -bench '^(BenchmarkPollActor)$' github.com/pingcap/tiflow/pkg/actor func BenchmarkPollActor(b *testing.B) { ctx := context.Background() sys, router := makeTestSystem(b.Name(), b) diff --git a/pkg/applier/redo.go b/pkg/applier/redo.go index a4421250846..4538c739fc1 100644 --- a/pkg/applier/redo.go +++ b/pkg/applier/redo.go @@ -19,13 +19,13 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/redo" - "github.com/pingcap/ticdc/cdc/redo/reader" - "github.com/pingcap/ticdc/cdc/sink" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/filter" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/redo" + "github.com/pingcap/tiflow/cdc/redo/reader" + "github.com/pingcap/tiflow/cdc/sink" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/filter" "go.uber.org/zap" "golang.org/x/sync/errgroup" ) diff --git a/pkg/applier/redo_test.go b/pkg/applier/redo_test.go index e3a44270e88..b6572bdc65b 100644 --- a/pkg/applier/redo_test.go +++ b/pkg/applier/redo_test.go @@ -21,10 +21,10 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/phayes/freeport" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/redo" - "github.com/pingcap/ticdc/cdc/redo/reader" - "github.com/pingcap/ticdc/cdc/sink" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/redo" + "github.com/pingcap/tiflow/cdc/redo/reader" + "github.com/pingcap/tiflow/cdc/sink" "github.com/stretchr/testify/require" ) diff --git a/pkg/cmd/cli/cli.go b/pkg/cmd/cli/cli.go index 5386f084327..71e8d81b56c 100644 --- a/pkg/cmd/cli/cli.go +++ b/pkg/cmd/cli/cli.go @@ -20,9 +20,9 @@ import ( "github.com/chzyer/readline" "github.com/mattn/go-shellwords" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/cmd/util" - "github.com/pingcap/ticdc/pkg/logutil" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/cmd/util" + "github.com/pingcap/tiflow/pkg/logutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/cli/cli_capture.go b/pkg/cmd/cli/cli_capture.go index 0ab748182f4..c490acd6b00 100644 --- a/pkg/cmd/cli/cli_capture.go +++ b/pkg/cmd/cli/cli_capture.go @@ -14,9 +14,9 @@ package cli import ( - cmdcontext "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/cmd/util" + cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/cmd/util" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/cli/cli_capture_list.go b/pkg/cmd/cli/cli_capture_list.go index 4dc601c5e03..9f122b5b290 100644 --- a/pkg/cmd/cli/cli_capture_list.go +++ b/pkg/cmd/cli/cli_capture_list.go @@ -17,11 +17,11 @@ import ( "context" "github.com/pingcap/errors" - cmdcontext "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/cmd/util" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/etcd" + cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/cmd/util" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/etcd" "github.com/spf13/cobra" "go.etcd.io/etcd/clientv3/concurrency" ) diff --git a/pkg/cmd/cli/cli_changefeed.go b/pkg/cmd/cli/cli_changefeed.go index 88513074adf..99083ac9a86 100644 --- a/pkg/cmd/cli/cli_changefeed.go +++ b/pkg/cmd/cli/cli_changefeed.go @@ -14,9 +14,9 @@ package cli import ( - cmdcontext "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/cmd/util" + cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/cmd/util" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/cli/cli_changefeed_create.go b/pkg/cmd/cli/cli_changefeed_create.go index c49e4c8cb2e..47f4bac173a 100644 --- a/pkg/cmd/cli/cli_changefeed_create.go +++ b/pkg/cmd/cli/cli_changefeed_create.go @@ -23,20 +23,20 @@ import ( "github.com/google/uuid" "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sink" - cmdcontext "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/cmd/util" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/cyclic" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/filter" - "github.com/pingcap/ticdc/pkg/security" - "github.com/pingcap/ticdc/pkg/txnutil/gc" - ticdcutil "github.com/pingcap/ticdc/pkg/util" - "github.com/pingcap/ticdc/pkg/version" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sink" + cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/cmd/util" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/cyclic" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/filter" + "github.com/pingcap/tiflow/pkg/security" + "github.com/pingcap/tiflow/pkg/txnutil/gc" + ticdcutil "github.com/pingcap/tiflow/pkg/util" + "github.com/pingcap/tiflow/pkg/version" "github.com/spf13/cobra" "github.com/tikv/client-go/v2/oracle" pd "github.com/tikv/pd/client" diff --git a/pkg/cmd/cli/cli_changefeed_create_test.go b/pkg/cmd/cli/cli_changefeed_create_test.go index 229600ef98e..658346d38e6 100644 --- a/pkg/cmd/cli/cli_changefeed_create_test.go +++ b/pkg/cmd/cli/cli_changefeed_create_test.go @@ -20,8 +20,8 @@ import ( "testing" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/util/testleak" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/cli/cli_changefeed_cyclic.go b/pkg/cmd/cli/cli_changefeed_cyclic.go index 971be8e710c..cc565666e70 100644 --- a/pkg/cmd/cli/cli_changefeed_cyclic.go +++ b/pkg/cmd/cli/cli_changefeed_cyclic.go @@ -14,7 +14,7 @@ package cli import ( - "github.com/pingcap/ticdc/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/cmd/factory" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/cli/cli_changefeed_cyclic_create_marktables.go b/pkg/cmd/cli/cli_changefeed_cyclic_create_marktables.go index 889b93f465f..490db7257df 100644 --- a/pkg/cmd/cli/cli_changefeed_cyclic_create_marktables.go +++ b/pkg/cmd/cli/cli_changefeed_cyclic_create_marktables.go @@ -14,11 +14,11 @@ package cli import ( - "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/cyclic/mark" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/cyclic/mark" + "github.com/pingcap/tiflow/pkg/security" "github.com/spf13/cobra" "github.com/tikv/client-go/v2/oracle" pd "github.com/tikv/pd/client" diff --git a/pkg/cmd/cli/cli_changefeed_helper.go b/pkg/cmd/cli/cli_changefeed_helper.go index b3028fae76c..97599c32d88 100644 --- a/pkg/cmd/cli/cli_changefeed_helper.go +++ b/pkg/cmd/cli/cli_changefeed_helper.go @@ -21,16 +21,16 @@ import ( "time" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc" - "github.com/pingcap/ticdc/cdc/entry" - "github.com/pingcap/ticdc/cdc/kv" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/cmd/util" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/filter" - "github.com/pingcap/ticdc/pkg/httputil" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/cdc" + "github.com/pingcap/tiflow/cdc/entry" + "github.com/pingcap/tiflow/cdc/kv" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/cmd/util" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/filter" + "github.com/pingcap/tiflow/pkg/httputil" + "github.com/pingcap/tiflow/pkg/security" "github.com/spf13/cobra" "github.com/tikv/client-go/v2/oracle" ) diff --git a/pkg/cmd/cli/cli_changefeed_helper_test.go b/pkg/cmd/cli/cli_changefeed_helper_test.go index c4eba8ea1c6..d75651f0a7c 100644 --- a/pkg/cmd/cli/cli_changefeed_helper_test.go +++ b/pkg/cmd/cli/cli_changefeed_helper_test.go @@ -18,7 +18,7 @@ import ( "path/filepath" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/cli/cli_changefeed_list.go b/pkg/cmd/cli/cli_changefeed_list.go index 7225b0aa6c5..4e123a1a617 100644 --- a/pkg/cmd/cli/cli_changefeed_list.go +++ b/pkg/cmd/cli/cli_changefeed_list.go @@ -17,12 +17,12 @@ import ( "encoding/json" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc" - "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/cmd/util" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/cdc" + "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/cmd/util" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/security" "github.com/spf13/cobra" "go.uber.org/zap" ) diff --git a/pkg/cmd/cli/cli_changefeed_pause.go b/pkg/cmd/cli/cli_changefeed_pause.go index c7868d67bbc..99cb9ff4e0c 100644 --- a/pkg/cmd/cli/cli_changefeed_pause.go +++ b/pkg/cmd/cli/cli_changefeed_pause.go @@ -14,11 +14,11 @@ package cli import ( - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/security" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/cli/cli_changefeed_query.go b/pkg/cmd/cli/cli_changefeed_query.go index 06058ff654c..aae9b471709 100644 --- a/pkg/cmd/cli/cli_changefeed_query.go +++ b/pkg/cmd/cli/cli_changefeed_query.go @@ -15,13 +15,13 @@ package cli import ( "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/cmd/util" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/cmd/util" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/security" "github.com/spf13/cobra" "go.uber.org/zap" ) diff --git a/pkg/cmd/cli/cli_changefeed_remove.go b/pkg/cmd/cli/cli_changefeed_remove.go index 86cc137ec5f..2abf814bfc4 100644 --- a/pkg/cmd/cli/cli_changefeed_remove.go +++ b/pkg/cmd/cli/cli_changefeed_remove.go @@ -14,11 +14,11 @@ package cli import ( - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/security" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/cli/cli_changefeed_resume.go b/pkg/cmd/cli/cli_changefeed_resume.go index 71760060aea..f5c20886a4c 100644 --- a/pkg/cmd/cli/cli_changefeed_resume.go +++ b/pkg/cmd/cli/cli_changefeed_resume.go @@ -17,12 +17,12 @@ import ( "context" "encoding/json" - "github.com/pingcap/ticdc/cdc" - "github.com/pingcap/ticdc/cdc/model" - cmdcontext "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/cdc" + "github.com/pingcap/tiflow/cdc/model" + cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/security" "github.com/spf13/cobra" pd "github.com/tikv/pd/client" ) diff --git a/pkg/cmd/cli/cli_changefeed_statistics.go b/pkg/cmd/cli/cli_changefeed_statistics.go index 7d396b6697f..148304a9027 100644 --- a/pkg/cmd/cli/cli_changefeed_statistics.go +++ b/pkg/cmd/cli/cli_changefeed_statistics.go @@ -17,11 +17,11 @@ import ( "fmt" "time" - "github.com/pingcap/ticdc/pkg/etcd" + "github.com/pingcap/tiflow/pkg/etcd" - "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/cmd/util" + "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/cmd/util" "github.com/spf13/cobra" "github.com/tikv/client-go/v2/oracle" pd "github.com/tikv/pd/client" diff --git a/pkg/cmd/cli/cli_changefeed_update.go b/pkg/cmd/cli/cli_changefeed_update.go index 7387685fee0..31c2e8905c4 100644 --- a/pkg/cmd/cli/cli_changefeed_update.go +++ b/pkg/cmd/cli/cli_changefeed_update.go @@ -17,15 +17,15 @@ import ( "fmt" "strings" - "github.com/pingcap/ticdc/pkg/etcd" + "github.com/pingcap/tiflow/pkg/etcd" "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cmdcontext "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/cdc/model" + cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/security" "github.com/r3labs/diff" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/pkg/cmd/cli/cli_changefeed_update_test.go b/pkg/cmd/cli/cli_changefeed_update_test.go index 5808d299198..0ff3445be8a 100644 --- a/pkg/cmd/cli/cli_changefeed_update_test.go +++ b/pkg/cmd/cli/cli_changefeed_update_test.go @@ -20,8 +20,8 @@ import ( "github.com/pingcap/check" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type changefeedUpdateSuite struct{} diff --git a/pkg/cmd/cli/cli_processor.go b/pkg/cmd/cli/cli_processor.go index fd5dd036656..f2aa924cb20 100644 --- a/pkg/cmd/cli/cli_processor.go +++ b/pkg/cmd/cli/cli_processor.go @@ -14,9 +14,9 @@ package cli import ( - cmdcontext "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/cmd/util" + cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/cmd/util" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/cli/cli_processor_list.go b/pkg/cmd/cli/cli_processor_list.go index 64c71b60684..bd8a1ff18e2 100644 --- a/pkg/cmd/cli/cli_processor_list.go +++ b/pkg/cmd/cli/cli_processor_list.go @@ -14,10 +14,10 @@ package cli import ( - "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/cmd/util" - "github.com/pingcap/ticdc/pkg/etcd" + "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/cmd/util" + "github.com/pingcap/tiflow/pkg/etcd" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/cli/cli_processor_query.go b/pkg/cmd/cli/cli_processor_query.go index f52a4958942..0d4d704449c 100644 --- a/pkg/cmd/cli/cli_processor_query.go +++ b/pkg/cmd/cli/cli_processor_query.go @@ -14,12 +14,12 @@ package cli import ( - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/cmd/util" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/etcd" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/cmd/util" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/etcd" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/cli/cli_test.go b/pkg/cmd/cli/cli_test.go index 2ffcee94206..8e900b70707 100644 --- a/pkg/cmd/cli/cli_test.go +++ b/pkg/cmd/cli/cli_test.go @@ -17,7 +17,7 @@ import ( "os" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type cliSuite struct{} diff --git a/pkg/cmd/cli/cli_tso.go b/pkg/cmd/cli/cli_tso.go index 61b31c2c127..45fdd81b640 100644 --- a/pkg/cmd/cli/cli_tso.go +++ b/pkg/cmd/cli/cli_tso.go @@ -14,7 +14,7 @@ package cli import ( - "github.com/pingcap/ticdc/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/cmd/factory" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/cli/cli_tso_query.go b/pkg/cmd/cli/cli_tso_query.go index 0a57924371f..2bfb2764abf 100644 --- a/pkg/cmd/cli/cli_tso_query.go +++ b/pkg/cmd/cli/cli_tso_query.go @@ -14,8 +14,8 @@ package cli import ( - "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" "github.com/spf13/cobra" "github.com/tikv/client-go/v2/oracle" pd "github.com/tikv/pd/client" diff --git a/pkg/cmd/cli/cli_unsafe.go b/pkg/cmd/cli/cli_unsafe.go index d8ea6c11077..354fb3db993 100644 --- a/pkg/cmd/cli/cli_unsafe.go +++ b/pkg/cmd/cli/cli_unsafe.go @@ -18,7 +18,7 @@ import ( "strings" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/cmd/factory" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/cli/cli_unsafe_delete_service_gc_safepoint.go b/pkg/cmd/cli/cli_unsafe_delete_service_gc_safepoint.go index 3be4ce95c06..0ccd0cc2e26 100644 --- a/pkg/cmd/cli/cli_unsafe_delete_service_gc_safepoint.go +++ b/pkg/cmd/cli/cli_unsafe_delete_service_gc_safepoint.go @@ -15,9 +15,9 @@ package cli import ( "github.com/pingcap/errors" - "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/txnutil/gc" + "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/txnutil/gc" "github.com/spf13/cobra" pd "github.com/tikv/pd/client" ) diff --git a/pkg/cmd/cli/cli_unsafe_reset.go b/pkg/cmd/cli/cli_unsafe_reset.go index 5d1bf957f87..98a0d76beaa 100644 --- a/pkg/cmd/cli/cli_unsafe_reset.go +++ b/pkg/cmd/cli/cli_unsafe_reset.go @@ -15,10 +15,10 @@ package cli import ( "github.com/pingcap/errors" - "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/txnutil/gc" + "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/txnutil/gc" "github.com/spf13/cobra" pd "github.com/tikv/pd/client" ) diff --git a/pkg/cmd/cli/cli_unsafe_show_metadata.go b/pkg/cmd/cli/cli_unsafe_show_metadata.go index 6040d62adce..3fa726696e0 100644 --- a/pkg/cmd/cli/cli_unsafe_show_metadata.go +++ b/pkg/cmd/cli/cli_unsafe_show_metadata.go @@ -15,9 +15,9 @@ package cli import ( "github.com/pingcap/errors" - "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/factory" - "github.com/pingcap/ticdc/pkg/etcd" + "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/factory" + "github.com/pingcap/tiflow/pkg/etcd" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/cmd.go b/pkg/cmd/cmd.go index 7d4fda63517..681ce28b2a0 100644 --- a/pkg/cmd/cmd.go +++ b/pkg/cmd/cmd.go @@ -16,10 +16,10 @@ package cmd import ( "os" - "github.com/pingcap/ticdc/pkg/cmd/cli" - "github.com/pingcap/ticdc/pkg/cmd/redo" - "github.com/pingcap/ticdc/pkg/cmd/server" - "github.com/pingcap/ticdc/pkg/cmd/version" + "github.com/pingcap/tiflow/pkg/cmd/cli" + "github.com/pingcap/tiflow/pkg/cmd/redo" + "github.com/pingcap/tiflow/pkg/cmd/server" + "github.com/pingcap/tiflow/pkg/cmd/version" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/factory/factory.go b/pkg/cmd/factory/factory.go index 1a9429267cc..48eb31be6d5 100644 --- a/pkg/cmd/factory/factory.go +++ b/pkg/cmd/factory/factory.go @@ -17,9 +17,9 @@ import ( "crypto/tls" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/pkg/cmd/util" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/pkg/cmd/util" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/security" "github.com/spf13/cobra" pd "github.com/tikv/pd/client" "google.golang.org/grpc" diff --git a/pkg/cmd/factory/factory_impl.go b/pkg/cmd/factory/factory_impl.go index 0f13c21cf9d..fc4e9c77518 100644 --- a/pkg/cmd/factory/factory_impl.go +++ b/pkg/cmd/factory/factory_impl.go @@ -19,10 +19,10 @@ import ( "time" "github.com/pingcap/errors" - cmdconetxt "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/security" - "github.com/pingcap/ticdc/pkg/version" + cmdconetxt "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/security" + "github.com/pingcap/tiflow/pkg/version" pd "github.com/tikv/pd/client" "go.etcd.io/etcd/clientv3" etcdlogutil "go.etcd.io/etcd/pkg/logutil" @@ -102,7 +102,7 @@ func (f *factoryImpl) EtcdClient() (*etcd.CDCEtcdClient, error) { LogConfig: &logConfig, DialTimeout: 30 * time.Second, // TODO(hi-rustin): add gRPC metrics to Options. - // See also: https://github.com/pingcap/ticdc/pull/2341#discussion_r673018537. + // See also: https://github.com/pingcap/tiflow/pull/2341#discussion_r673018537. DialOptions: []grpc.DialOption{ grpcTLSOption, grpc.WithBlock(), @@ -141,7 +141,7 @@ func (f factoryImpl) PdClient() (pd.Client, error) { pdClient, err := pd.NewClientWithContext( ctx, pdEndpoints, credential.PDSecurityOption(), // TODO(hi-rustin): add gRPC metrics to Options. - // See also: https://github.com/pingcap/ticdc/pull/2341#discussion_r673032407. + // See also: https://github.com/pingcap/tiflow/pull/2341#discussion_r673032407. pd.WithGRPCDialOptions( grpcTLSOption, grpc.WithBlock(), diff --git a/pkg/cmd/redo/apply.go b/pkg/cmd/redo/apply.go index 1cbcc6ee92a..55993334694 100644 --- a/pkg/cmd/redo/apply.go +++ b/pkg/cmd/redo/apply.go @@ -14,8 +14,8 @@ package redo import ( - "github.com/pingcap/ticdc/pkg/applier" - cmdcontext "github.com/pingcap/ticdc/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/applier" + cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/redo/meta.go b/pkg/cmd/redo/meta.go index 1e87e9f1a97..e0ab7fd9ec8 100644 --- a/pkg/cmd/redo/meta.go +++ b/pkg/cmd/redo/meta.go @@ -14,8 +14,8 @@ package redo import ( - "github.com/pingcap/ticdc/pkg/applier" - cmdcontext "github.com/pingcap/ticdc/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/applier" + cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/redo/redo.go b/pkg/cmd/redo/redo.go index 5da0cbaf5c9..597c68126ae 100644 --- a/pkg/cmd/redo/redo.go +++ b/pkg/cmd/redo/redo.go @@ -14,8 +14,8 @@ package redo import ( - "github.com/pingcap/ticdc/pkg/cmd/util" - "github.com/pingcap/ticdc/pkg/logutil" + "github.com/pingcap/tiflow/pkg/cmd/util" + "github.com/pingcap/tiflow/pkg/logutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go index 38ed5220165..f7d0e67f327 100644 --- a/pkg/cmd/server/server.go +++ b/pkg/cmd/server/server.go @@ -22,17 +22,17 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc" - "github.com/pingcap/ticdc/cdc/sorter/unified" - cmdcontext "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/cmd/util" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/logutil" - "github.com/pingcap/ticdc/pkg/security" - ticdcutil "github.com/pingcap/ticdc/pkg/util" - "github.com/pingcap/ticdc/pkg/version" ticonfig "github.com/pingcap/tidb/config" + "github.com/pingcap/tiflow/cdc" + "github.com/pingcap/tiflow/cdc/sorter/unified" + cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/cmd/util" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/logutil" + "github.com/pingcap/tiflow/pkg/security" + ticdcutil "github.com/pingcap/tiflow/pkg/util" + "github.com/pingcap/tiflow/pkg/version" "github.com/spf13/cobra" "github.com/spf13/pflag" "go.uber.org/zap" diff --git a/pkg/cmd/server/server_test.go b/pkg/cmd/server/server_test.go index 08cac96c4cf..e0be7fb6600 100644 --- a/pkg/cmd/server/server_test.go +++ b/pkg/cmd/server/server_test.go @@ -21,9 +21,9 @@ import ( "time" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/util/testleak" ticonfig "github.com/pingcap/tidb/config" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/util/testleak" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/util/helper.go b/pkg/cmd/util/helper.go index 4ecce522704..94348175270 100644 --- a/pkg/cmd/util/helper.go +++ b/pkg/cmd/util/helper.go @@ -25,10 +25,10 @@ import ( "github.com/BurntSushi/toml" "github.com/pingcap/errors" "github.com/pingcap/log" - cmdconetxt "github.com/pingcap/ticdc/pkg/cmd/context" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/logutil" - "github.com/pingcap/ticdc/pkg/version" + cmdconetxt "github.com/pingcap/tiflow/pkg/cmd/context" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/logutil" + "github.com/pingcap/tiflow/pkg/version" "github.com/spf13/cobra" "go.uber.org/zap" "golang.org/x/net/http/httpproxy" diff --git a/pkg/cmd/util/helper_test.go b/pkg/cmd/util/helper_test.go index fdf45cdcc02..e16367b9ee4 100644 --- a/pkg/cmd/util/helper_test.go +++ b/pkg/cmd/util/helper_test.go @@ -21,8 +21,8 @@ import ( "testing" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/util/testleak" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/version/version.go b/pkg/cmd/version/version.go index f08e10a58fa..c5c31efc089 100644 --- a/pkg/cmd/version/version.go +++ b/pkg/cmd/version/version.go @@ -14,7 +14,7 @@ package version import ( - "github.com/pingcap/ticdc/pkg/version" + "github.com/pingcap/tiflow/pkg/version" "github.com/spf13/cobra" ) diff --git a/pkg/config/config.go b/pkg/config/config.go index c1c41b61481..f0b9d8a508b 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -23,9 +23,9 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/pkg/config/outdated" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/pkg/config/outdated" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/security" "go.uber.org/zap" ) diff --git a/pkg/config/main_test.go b/pkg/config/main_test.go index 7dc1da8e834..ce570fc725a 100644 --- a/pkg/config/main_test.go +++ b/pkg/config/main_test.go @@ -16,7 +16,7 @@ package config import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/config/sorter.go b/pkg/config/sorter.go index 7ddef8b9218..8639dcc313b 100644 --- a/pkg/config/sorter.go +++ b/pkg/config/sorter.go @@ -13,7 +13,7 @@ package config -import cerror "github.com/pingcap/ticdc/pkg/errors" +import cerror "github.com/pingcap/tiflow/pkg/errors" // SorterConfig represents sorter config for a changefeed type SorterConfig struct { diff --git a/pkg/context/context.go b/pkg/context/context.go index 1930d3f5db4..c840be8778f 100644 --- a/pkg/context/context.go +++ b/pkg/context/context.go @@ -18,13 +18,13 @@ import ( "time" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/kv" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/pdtime" - "github.com/pingcap/ticdc/pkg/version" tidbkv "github.com/pingcap/tidb/kv" + "github.com/pingcap/tiflow/cdc/kv" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/pdtime" + "github.com/pingcap/tiflow/pkg/version" "github.com/tikv/client-go/v2/oracle" pd "github.com/tikv/pd/client" "go.uber.org/zap" diff --git a/pkg/context/context_test.go b/pkg/context/context_test.go index 184459e5b18..069fb0c9dcc 100644 --- a/pkg/context/context_test.go +++ b/pkg/context/context_test.go @@ -19,8 +19,8 @@ import ( "time" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" "github.com/stretchr/testify/require" ) diff --git a/pkg/context/main_test.go b/pkg/context/main_test.go index 7b35690d10e..5a362d91cee 100644 --- a/pkg/context/main_test.go +++ b/pkg/context/main_test.go @@ -16,7 +16,7 @@ package context import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/cyclic/filter.go b/pkg/cyclic/filter.go index daf4b1f3a0b..816c027284c 100644 --- a/pkg/cyclic/filter.go +++ b/pkg/cyclic/filter.go @@ -15,8 +15,8 @@ package cyclic import ( "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/cyclic/mark" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/cyclic/mark" "go.uber.org/zap" ) diff --git a/pkg/cyclic/filter_test.go b/pkg/cyclic/filter_test.go index 755c22b4605..c5351a6454e 100644 --- a/pkg/cyclic/filter_test.go +++ b/pkg/cyclic/filter_test.go @@ -17,8 +17,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/cyclic/mark" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/cyclic/mark" "github.com/stretchr/testify/require" ) diff --git a/pkg/cyclic/main_test.go b/pkg/cyclic/main_test.go index f5518e600ec..4412d154447 100644 --- a/pkg/cyclic/main_test.go +++ b/pkg/cyclic/main_test.go @@ -16,7 +16,7 @@ package cyclic import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/cyclic/mark/main_test.go b/pkg/cyclic/mark/main_test.go index 7592c6e95a4..6606ac1c1d9 100644 --- a/pkg/cyclic/mark/main_test.go +++ b/pkg/cyclic/mark/main_test.go @@ -16,7 +16,7 @@ package mark import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/cyclic/mark/mark.go b/pkg/cyclic/mark/mark.go index aa39ddaa259..6a027d04f10 100644 --- a/pkg/cyclic/mark/mark.go +++ b/pkg/cyclic/mark/mark.go @@ -22,9 +22,9 @@ import ( "github.com/go-sql-driver/mysql" "github.com/pingcap/errors" "github.com/pingcap/log" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/quotes" - "github.com/pingcap/ticdc/pkg/security" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/quotes" + "github.com/pingcap/tiflow/pkg/security" "go.uber.org/zap" ) diff --git a/pkg/cyclic/replication.go b/pkg/cyclic/replication.go index 1c8f3dedfbb..7392f3c3add 100644 --- a/pkg/cyclic/replication.go +++ b/pkg/cyclic/replication.go @@ -23,10 +23,10 @@ import ( "fmt" "strings" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/cyclic/mark" - "github.com/pingcap/ticdc/pkg/quotes" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/cyclic/mark" + "github.com/pingcap/tiflow/pkg/quotes" ) // RelaxSQLMode returns relaxed SQL mode, "STRICT_TRANS_TABLES" is removed. diff --git a/pkg/cyclic/replication_test.go b/pkg/cyclic/replication_test.go index 4017f5390ed..5855c7fd386 100644 --- a/pkg/cyclic/replication_test.go +++ b/pkg/cyclic/replication_test.go @@ -16,9 +16,9 @@ package cyclic import ( "testing" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/cyclic/mark" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/cyclic/mark" "github.com/stretchr/testify/require" ) diff --git a/pkg/errors/main_test.go b/pkg/errors/main_test.go index 5f60c43031f..95cbe6c4b89 100644 --- a/pkg/errors/main_test.go +++ b/pkg/errors/main_test.go @@ -16,7 +16,7 @@ package errors import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/etcd/client.go b/pkg/etcd/client.go index 94a693da8d0..23a0e219a58 100644 --- a/pkg/etcd/client.go +++ b/pkg/etcd/client.go @@ -18,8 +18,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/retry" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/retry" "github.com/prometheus/client_golang/prometheus" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" diff --git a/pkg/etcd/client_test.go b/pkg/etcd/client_test.go index dd310bad3ec..fbc9b3268b9 100644 --- a/pkg/etcd/client_test.go +++ b/pkg/etcd/client_test.go @@ -19,7 +19,7 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" "go.etcd.io/etcd/clientv3" ) diff --git a/pkg/etcd/etcd.go b/pkg/etcd/etcd.go index 2e4bd6f838b..f16841563b9 100644 --- a/pkg/etcd/etcd.go +++ b/pkg/etcd/etcd.go @@ -20,9 +20,9 @@ import ( "time" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/util" + "github.com/pingcap/tiflow/cdc/model" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/util" "github.com/prometheus/client_golang/prometheus" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/clientv3/concurrency" diff --git a/pkg/etcd/etcd_test.go b/pkg/etcd/etcd_test.go index 3ba1e422e5e..0aac6963e07 100644 --- a/pkg/etcd/etcd_test.go +++ b/pkg/etcd/etcd_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "github.com/pingcap/ticdc/cdc/model" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/util" + "github.com/pingcap/tiflow/cdc/model" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/util" "go.etcd.io/etcd/clientv3/concurrency" "go.etcd.io/etcd/pkg/logutil" "go.uber.org/zap" @@ -30,7 +30,7 @@ import ( "golang.org/x/sync/errgroup" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/embed" ) diff --git a/pkg/etcd/etcdkey.go b/pkg/etcd/etcdkey.go index 8b91dc36921..b08d14758e9 100644 --- a/pkg/etcd/etcdkey.go +++ b/pkg/etcd/etcdkey.go @@ -17,7 +17,7 @@ import ( "strings" "github.com/pingcap/log" - cerror "github.com/pingcap/ticdc/pkg/errors" + cerror "github.com/pingcap/tiflow/pkg/errors" ) const ( diff --git a/pkg/etcd/etcdkey_test.go b/pkg/etcd/etcdkey_test.go index ba137f96f46..3c754638749 100644 --- a/pkg/etcd/etcdkey_test.go +++ b/pkg/etcd/etcdkey_test.go @@ -15,7 +15,7 @@ package etcd import ( "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type etcdkeySuite struct{} diff --git a/pkg/filelock/filelock.go b/pkg/filelock/filelock.go index 9f9630b6fc4..51dffa5a003 100644 --- a/pkg/filelock/filelock.go +++ b/pkg/filelock/filelock.go @@ -18,7 +18,7 @@ import ( "syscall" "github.com/pingcap/errors" - cerrors "github.com/pingcap/ticdc/pkg/errors" + cerrors "github.com/pingcap/tiflow/pkg/errors" ) // FileLock represents a file lock created by `flock`. diff --git a/pkg/filelock/filelock_test.go b/pkg/filelock/filelock_test.go index e414580b6cb..b4a033858ea 100644 --- a/pkg/filelock/filelock_test.go +++ b/pkg/filelock/filelock_test.go @@ -17,7 +17,7 @@ import ( "testing" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type fileLockSuite struct{} diff --git a/pkg/filter/filter.go b/pkg/filter/filter.go index afe5913c5cf..7ed7ffe14ea 100644 --- a/pkg/filter/filter.go +++ b/pkg/filter/filter.go @@ -14,12 +14,12 @@ package filter import ( - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/cyclic/mark" - cerror "github.com/pingcap/ticdc/pkg/errors" filterV1 "github.com/pingcap/tidb-tools/pkg/filter" filterV2 "github.com/pingcap/tidb-tools/pkg/table-filter" "github.com/pingcap/tidb/parser/model" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/cyclic/mark" + cerror "github.com/pingcap/tiflow/pkg/errors" ) // Filter is a event filter implementation. diff --git a/pkg/filter/filter_test.go b/pkg/filter/filter_test.go index 89978efba57..619c64adb76 100644 --- a/pkg/filter/filter_test.go +++ b/pkg/filter/filter_test.go @@ -16,7 +16,7 @@ package filter import ( "testing" - "github.com/pingcap/ticdc/pkg/config" + "github.com/pingcap/tiflow/pkg/config" "github.com/pingcap/tidb/parser/model" "github.com/stretchr/testify/require" diff --git a/pkg/filter/main_test.go b/pkg/filter/main_test.go index 63ca3092f24..78b342c14ef 100644 --- a/pkg/filter/main_test.go +++ b/pkg/filter/main_test.go @@ -16,7 +16,7 @@ package filter import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/flags/main_test.go b/pkg/flags/main_test.go index 8ab6dc50cdd..87c2c6bb44b 100644 --- a/pkg/flags/main_test.go +++ b/pkg/flags/main_test.go @@ -16,7 +16,7 @@ package flags import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/flags/urls.go b/pkg/flags/urls.go index 2cbd26cdc5e..912e745a344 100644 --- a/pkg/flags/urls.go +++ b/pkg/flags/urls.go @@ -17,7 +17,7 @@ import ( "strings" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/pkg/types" + "github.com/pingcap/tiflow/pkg/types" ) // URLsValue define a slice of URLs as a type diff --git a/pkg/httputil/httputil.go b/pkg/httputil/httputil.go index d60298307a0..012a84dc4d6 100644 --- a/pkg/httputil/httputil.go +++ b/pkg/httputil/httputil.go @@ -16,7 +16,7 @@ package httputil import ( "net/http" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/pkg/security" ) // Client wraps an HTTP client and support TLS requests. diff --git a/pkg/httputil/httputil_test.go b/pkg/httputil/httputil_test.go index 38899ba1741..7c76ae7f0f2 100644 --- a/pkg/httputil/httputil_test.go +++ b/pkg/httputil/httputil_test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "testing" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/pkg/security" "github.com/stretchr/testify/require" "github.com/pingcap/tidb-tools/pkg/utils" diff --git a/pkg/httputil/main_test.go b/pkg/httputil/main_test.go index 7b585e9c242..b9ba503f7fc 100644 --- a/pkg/httputil/main_test.go +++ b/pkg/httputil/main_test.go @@ -16,7 +16,7 @@ package httputil import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/leakutil/leak_helper_test.go b/pkg/leakutil/leak_helper_test.go index bb753690127..940cc065cbd 100644 --- a/pkg/leakutil/leak_helper_test.go +++ b/pkg/leakutil/leak_helper_test.go @@ -29,7 +29,7 @@ func TestSetUpLeakTest(t *testing.T) { func TestMain(m *testing.M) { opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/pingcap/ticdc/pkg/leakutil.TestSetUpLeakTest.func1"), + goleak.IgnoreTopFunction("github.com/pingcap/tiflow/pkg/leakutil.TestSetUpLeakTest.func1"), } SetUpLeakTest(m, opts...) diff --git a/pkg/logutil/log.go b/pkg/logutil/log.go index 7790a2090a8..4daa3eb8f54 100644 --- a/pkg/logutil/log.go +++ b/pkg/logutil/log.go @@ -194,8 +194,8 @@ func initGRPCLogger(level zapcore.Level) error { logger := log.L().With(zap.String("name", "grpc")) // For gRPC 1.26.0, logging call stack: // - // github.com/pingcap/ticdc/pkg/util.levelToFunc.func1 - // github.com/pingcap/ticdc/pkg/util.(*grpcLoggerWriter).Write + // github.com/pingcap/tiflow/pkg/util.levelToFunc.func1 + // github.com/pingcap/tiflow/pkg/util.(*grpcLoggerWriter).Write // log.(*Logger).Output // log.(*Logger).Printf // google.golang.org/grpc/grpclog.(*loggerT).Infof diff --git a/pkg/logutil/log_test.go b/pkg/logutil/log_test.go index 3d41eea5bed..22acf2d4eb9 100644 --- a/pkg/logutil/log_test.go +++ b/pkg/logutil/log_test.go @@ -21,7 +21,7 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/pkg/notify/main_test.go b/pkg/notify/main_test.go index 59abd4ea67c..90da6a0613e 100644 --- a/pkg/notify/main_test.go +++ b/pkg/notify/main_test.go @@ -16,7 +16,7 @@ package notify import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/notify/notify.go b/pkg/notify/notify.go index 477aa67d0cd..5b58a6759c6 100644 --- a/pkg/notify/notify.go +++ b/pkg/notify/notify.go @@ -17,7 +17,7 @@ import ( "sync" "time" - "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/pkg/errors" ) // Notifier provides a one-to-many notification mechanism diff --git a/pkg/notify/notify_test.go b/pkg/notify/notify_test.go index 0ab41aeb61c..ddf2ae9403d 100644 --- a/pkg/notify/notify_test.go +++ b/pkg/notify/notify_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/pkg/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/orchestrator/etcd_worker.go b/pkg/orchestrator/etcd_worker.go index 102fe84db11..077f9ceb27e 100644 --- a/pkg/orchestrator/etcd_worker.go +++ b/pkg/orchestrator/etcd_worker.go @@ -21,9 +21,9 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/orchestrator/util" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/orchestrator/util" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/clientv3/concurrency" "go.etcd.io/etcd/mvcc/mvccpb" diff --git a/pkg/orchestrator/etcd_worker_bank_test.go b/pkg/orchestrator/etcd_worker_bank_test.go index 6a7f3daec32..49a7561a50e 100644 --- a/pkg/orchestrator/etcd_worker_bank_test.go +++ b/pkg/orchestrator/etcd_worker_bank_test.go @@ -24,9 +24,9 @@ import ( "github.com/pingcap/check" "github.com/pingcap/log" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/orchestrator/util" - "github.com/pingcap/ticdc/pkg/util/testleak" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/orchestrator/util" + "github.com/pingcap/tiflow/pkg/util/testleak" "go.uber.org/zap" ) diff --git a/pkg/orchestrator/etcd_worker_test.go b/pkg/orchestrator/etcd_worker_test.go index ad0711f386d..1161399e877 100644 --- a/pkg/orchestrator/etcd_worker_test.go +++ b/pkg/orchestrator/etcd_worker_test.go @@ -26,10 +26,10 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" "github.com/pingcap/log" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/orchestrator/util" - "github.com/pingcap/ticdc/pkg/util/testleak" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/orchestrator/util" + "github.com/pingcap/tiflow/pkg/util/testleak" "github.com/prometheus/client_golang/prometheus" "go.etcd.io/etcd/clientv3" "go.uber.org/zap" diff --git a/pkg/orchestrator/interfaces.go b/pkg/orchestrator/interfaces.go index 6bf0eaf7b6e..4ab21ba6420 100644 --- a/pkg/orchestrator/interfaces.go +++ b/pkg/orchestrator/interfaces.go @@ -16,7 +16,7 @@ package orchestrator import ( "context" - "github.com/pingcap/ticdc/pkg/orchestrator/util" + "github.com/pingcap/tiflow/pkg/orchestrator/util" ) // Reactor is a stateful transform of states. diff --git a/pkg/orchestrator/reactor_state.go b/pkg/orchestrator/reactor_state.go index 9dc513d541a..3ee96d15a6f 100644 --- a/pkg/orchestrator/reactor_state.go +++ b/pkg/orchestrator/reactor_state.go @@ -19,10 +19,10 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/orchestrator/util" + "github.com/pingcap/tiflow/cdc/model" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/orchestrator/util" "go.uber.org/zap" ) diff --git a/pkg/orchestrator/reactor_state_test.go b/pkg/orchestrator/reactor_state_test.go index 2541388d2ea..0124e31f28f 100644 --- a/pkg/orchestrator/reactor_state_test.go +++ b/pkg/orchestrator/reactor_state_test.go @@ -19,10 +19,10 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/pingcap/check" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/orchestrator/util" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/orchestrator/util" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type stateSuite struct{} diff --git a/pkg/orchestrator/reactor_state_tester.go b/pkg/orchestrator/reactor_state_tester.go index 5149cd34097..72b5f5e2c0a 100644 --- a/pkg/orchestrator/reactor_state_tester.go +++ b/pkg/orchestrator/reactor_state_tester.go @@ -16,8 +16,8 @@ package orchestrator import ( "github.com/pingcap/check" "github.com/pingcap/errors" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/orchestrator/util" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/orchestrator/util" ) // ReactorStateTester is a helper struct for unit-testing an implementer of ReactorState diff --git a/pkg/orchestrator/util/key_utils_test.go b/pkg/orchestrator/util/key_utils_test.go index baa74594819..d84e3304382 100644 --- a/pkg/orchestrator/util/key_utils_test.go +++ b/pkg/orchestrator/util/key_utils_test.go @@ -17,7 +17,7 @@ import ( "testing" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" ) func Test(t *testing.T) { check.TestingT(t) } diff --git a/pkg/pdtime/acquirer.go b/pkg/pdtime/acquirer.go index 3fae739fa9d..4f9a3ad93ad 100644 --- a/pkg/pdtime/acquirer.go +++ b/pkg/pdtime/acquirer.go @@ -20,7 +20,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/pkg/retry" + "github.com/pingcap/tiflow/pkg/retry" "github.com/tikv/client-go/v2/oracle" pd "github.com/tikv/pd/client" "go.uber.org/zap" diff --git a/pkg/pdtime/main_test.go b/pkg/pdtime/main_test.go index 229d3e567f5..24c9b4e26ad 100644 --- a/pkg/pdtime/main_test.go +++ b/pkg/pdtime/main_test.go @@ -16,7 +16,7 @@ package pdtime import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/pipeline/context.go b/pkg/pipeline/context.go index e1c927e04a3..12c2f69d6c8 100644 --- a/pkg/pipeline/context.go +++ b/pkg/pipeline/context.go @@ -13,7 +13,7 @@ package pipeline -import "github.com/pingcap/ticdc/pkg/context" +import "github.com/pingcap/tiflow/pkg/context" // NodeContext adds two functions from `coutext.Context` and created by pipeline type NodeContext interface { diff --git a/pkg/pipeline/main_test.go b/pkg/pipeline/main_test.go index f030ba777fb..218b606dcf5 100644 --- a/pkg/pipeline/main_test.go +++ b/pkg/pipeline/main_test.go @@ -16,7 +16,7 @@ package pipeline import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/pipeline/message.go b/pkg/pipeline/message.go index 37d26a9ddbb..c7602fe3fab 100644 --- a/pkg/pipeline/message.go +++ b/pkg/pipeline/message.go @@ -13,7 +13,7 @@ package pipeline -import "github.com/pingcap/ticdc/cdc/model" +import "github.com/pingcap/tiflow/cdc/model" // MessageType is the type of Message type MessageType int diff --git a/pkg/pipeline/pipeline.go b/pkg/pipeline/pipeline.go index ead3f445b22..2155984d373 100644 --- a/pkg/pipeline/pipeline.go +++ b/pkg/pipeline/pipeline.go @@ -19,8 +19,8 @@ import ( "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/pkg/context" - cerror "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/pkg/context" + cerror "github.com/pingcap/tiflow/pkg/errors" "go.uber.org/zap" ) diff --git a/pkg/pipeline/pipeline_test.go b/pkg/pipeline/pipeline_test.go index 65402b13bae..26ad07362e2 100644 --- a/pkg/pipeline/pipeline_test.go +++ b/pkg/pipeline/pipeline_test.go @@ -21,9 +21,9 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/context" - cerror "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/context" + cerror "github.com/pingcap/tiflow/pkg/errors" "github.com/stretchr/testify/require" "go.uber.org/zap" ) @@ -446,7 +446,7 @@ func (n *forward) Destroy(ctx NodeContext) error { } // Run the benchmark -// go test -benchmem -run='^$' -bench '^(BenchmarkPipeline)$' github.com/pingcap/ticdc/pkg/pipeline +// go test -benchmem -run='^$' -bench '^(BenchmarkPipeline)$' github.com/pingcap/tiflow/pkg/pipeline func BenchmarkPipeline(b *testing.B) { ctx := context.NewContext(stdCtx.Background(), &context.GlobalVars{}) runnersSize, outputChannelSize := 2, 64 diff --git a/pkg/pipeline/runner.go b/pkg/pipeline/runner.go index ce8b32f595b..3de79a3c6f5 100644 --- a/pkg/pipeline/runner.go +++ b/pkg/pipeline/runner.go @@ -18,7 +18,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/pkg/context" + "github.com/pingcap/tiflow/pkg/context" "go.uber.org/zap" ) diff --git a/pkg/pipeline/test.go b/pkg/pipeline/test.go index c640a4a27dd..ae9373c7fb8 100644 --- a/pkg/pipeline/test.go +++ b/pkg/pipeline/test.go @@ -13,7 +13,7 @@ package pipeline -import "github.com/pingcap/ticdc/pkg/context" +import "github.com/pingcap/tiflow/pkg/context" // SendMessageToNode4Test sends messages to specified `Node` through `Receive` in order. // This function is only for testing. diff --git a/pkg/quotes/main_test.go b/pkg/quotes/main_test.go index f24c77d5755..379e87fe51d 100644 --- a/pkg/quotes/main_test.go +++ b/pkg/quotes/main_test.go @@ -16,7 +16,7 @@ package quotes import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/regionspan/span.go b/pkg/regionspan/span.go index 79fcb5eef7e..ed1dc39cf0c 100644 --- a/pkg/regionspan/span.go +++ b/pkg/regionspan/span.go @@ -19,10 +19,10 @@ import ( "fmt" "github.com/pingcap/log" - cerror "github.com/pingcap/ticdc/pkg/errors" "github.com/pingcap/tidb/kv" "github.com/pingcap/tidb/tablecodec" "github.com/pingcap/tidb/util/codec" + cerror "github.com/pingcap/tiflow/pkg/errors" "go.uber.org/zap" ) diff --git a/pkg/retry/main_test.go b/pkg/retry/main_test.go index 69b296d23ff..e9f7b820f77 100644 --- a/pkg/retry/main_test.go +++ b/pkg/retry/main_test.go @@ -16,7 +16,7 @@ package retry import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/retry/retry_with_opt.go b/pkg/retry/retry_with_opt.go index 7bf666777b1..c5482ebe130 100644 --- a/pkg/retry/retry_with_opt.go +++ b/pkg/retry/retry_with_opt.go @@ -20,7 +20,7 @@ import ( "time" "github.com/pingcap/errors" - cerror "github.com/pingcap/ticdc/pkg/errors" + cerror "github.com/pingcap/tiflow/pkg/errors" ) // Operation is the action need to retry diff --git a/pkg/scheduler/interface.go b/pkg/scheduler/interface.go index b3c83188bc2..c444f1ca0ae 100644 --- a/pkg/scheduler/interface.go +++ b/pkg/scheduler/interface.go @@ -15,7 +15,7 @@ package scheduler import ( "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" ) // Scheduler is an abstraction for anything that provide the schedule table feature diff --git a/pkg/scheduler/main_test.go b/pkg/scheduler/main_test.go index 144a3f1f152..a98b8c7c955 100644 --- a/pkg/scheduler/main_test.go +++ b/pkg/scheduler/main_test.go @@ -16,7 +16,7 @@ package scheduler import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/scheduler/table_number.go b/pkg/scheduler/table_number.go index 99ae38c5f18..7bfe59b9ace 100644 --- a/pkg/scheduler/table_number.go +++ b/pkg/scheduler/table_number.go @@ -13,7 +13,7 @@ package scheduler -import "github.com/pingcap/ticdc/cdc/model" +import "github.com/pingcap/tiflow/cdc/model" // TableNumberScheduler provides a feature that scheduling by the table number type TableNumberScheduler struct { diff --git a/pkg/scheduler/table_number_test.go b/pkg/scheduler/table_number_test.go index 2a65e2d38c8..dcba54d9599 100644 --- a/pkg/scheduler/table_number_test.go +++ b/pkg/scheduler/table_number_test.go @@ -17,7 +17,7 @@ import ( "fmt" "testing" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" "github.com/stretchr/testify/require" ) diff --git a/pkg/scheduler/workload.go b/pkg/scheduler/workload.go index ce84e22369b..a340d8db55b 100644 --- a/pkg/scheduler/workload.go +++ b/pkg/scheduler/workload.go @@ -16,7 +16,7 @@ package scheduler import ( "math" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" ) type workloads map[model.CaptureID]model.TaskWorkload diff --git a/pkg/scheduler/workload_test.go b/pkg/scheduler/workload_test.go index 3c752e413b8..9c924623cc7 100644 --- a/pkg/scheduler/workload_test.go +++ b/pkg/scheduler/workload_test.go @@ -17,7 +17,7 @@ import ( "fmt" "testing" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" "github.com/stretchr/testify/require" ) diff --git a/pkg/security/credential.go b/pkg/security/credential.go index 31908ce8169..0961c6be6dd 100644 --- a/pkg/security/credential.go +++ b/pkg/security/credential.go @@ -19,8 +19,8 @@ import ( "encoding/pem" "os" - cerror "github.com/pingcap/ticdc/pkg/errors" "github.com/pingcap/tidb-tools/pkg/utils" + cerror "github.com/pingcap/tiflow/pkg/errors" pd "github.com/tikv/pd/client" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/pkg/tcpserver/main_test.go b/pkg/tcpserver/main_test.go index 6008181e554..6e0c2d2220a 100644 --- a/pkg/tcpserver/main_test.go +++ b/pkg/tcpserver/main_test.go @@ -16,7 +16,7 @@ package tcpserver import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/tcpserver/tcp_server.go b/pkg/tcpserver/tcp_server.go index 6115ead1ede..24ce5b102ee 100644 --- a/pkg/tcpserver/tcp_server.go +++ b/pkg/tcpserver/tcp_server.go @@ -22,8 +22,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/security" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/security" "github.com/soheilhy/cmux" "go.uber.org/zap" "golang.org/x/sync/errgroup" diff --git a/pkg/tcpserver/tcp_server_test.go b/pkg/tcpserver/tcp_server_test.go index 654fade8489..8e873219cc8 100644 --- a/pkg/tcpserver/tcp_server_test.go +++ b/pkg/tcpserver/tcp_server_test.go @@ -27,8 +27,8 @@ import ( grpcTestingProto "github.com/grpc-ecosystem/go-grpc-middleware/testing/testproto" "github.com/integralist/go-findroot/find" "github.com/phayes/freeport" - "github.com/pingcap/ticdc/pkg/httputil" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/pkg/httputil" + "github.com/pingcap/tiflow/pkg/security" "github.com/stretchr/testify/require" "google.golang.org/grpc" ) diff --git a/pkg/txnutil/gc/gc_manager.go b/pkg/txnutil/gc/gc_manager.go index 1a158fa6f9d..0e4887b2261 100644 --- a/pkg/txnutil/gc/gc_manager.go +++ b/pkg/txnutil/gc/gc_manager.go @@ -20,10 +20,10 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/config" - cdcContext "github.com/pingcap/ticdc/pkg/context" - cerror "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/config" + cdcContext "github.com/pingcap/tiflow/pkg/context" + cerror "github.com/pingcap/tiflow/pkg/errors" "github.com/tikv/client-go/v2/oracle" pd "github.com/tikv/pd/client" "go.uber.org/zap" diff --git a/pkg/txnutil/gc/gc_manager_test.go b/pkg/txnutil/gc/gc_manager_test.go index d650aa72443..368f879cd39 100644 --- a/pkg/txnutil/gc/gc_manager_test.go +++ b/pkg/txnutil/gc/gc_manager_test.go @@ -18,13 +18,13 @@ import ( "testing" "time" - "github.com/pingcap/ticdc/pkg/pdtime" + "github.com/pingcap/tiflow/pkg/pdtime" "github.com/pingcap/check" "github.com/pingcap/errors" - cdcContext "github.com/pingcap/ticdc/pkg/context" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/util/testleak" + cdcContext "github.com/pingcap/tiflow/pkg/context" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/util/testleak" "github.com/tikv/client-go/v2/oracle" ) diff --git a/pkg/txnutil/gc/gc_service.go b/pkg/txnutil/gc/gc_service.go index 56f51ee3d24..85e21d91909 100644 --- a/pkg/txnutil/gc/gc_service.go +++ b/pkg/txnutil/gc/gc_service.go @@ -19,8 +19,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/retry" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/retry" pd "github.com/tikv/pd/client" "go.uber.org/zap" ) diff --git a/pkg/txnutil/gc/gc_service_test.go b/pkg/txnutil/gc/gc_service_test.go index 97aed0edddd..d32214a8b3e 100644 --- a/pkg/txnutil/gc/gc_service_test.go +++ b/pkg/txnutil/gc/gc_service_test.go @@ -19,7 +19,7 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" pd "github.com/tikv/pd/client" ) diff --git a/pkg/types/main_test.go b/pkg/types/main_test.go index 3d61dcf48e4..fd2845744b6 100644 --- a/pkg/types/main_test.go +++ b/pkg/types/main_test.go @@ -16,7 +16,7 @@ package types import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/types/urls.go b/pkg/types/urls.go index 824e4ceadd9..b1d02927917 100644 --- a/pkg/types/urls.go +++ b/pkg/types/urls.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/pingcap/errors" - cerror "github.com/pingcap/ticdc/pkg/errors" + cerror "github.com/pingcap/tiflow/pkg/errors" ) // URLs defines a slice of URLs as a type diff --git a/pkg/util/bitflag_test.go b/pkg/util/bitflag_test.go index e2a86b3ce99..b0308c32608 100644 --- a/pkg/util/bitflag_test.go +++ b/pkg/util/bitflag_test.go @@ -15,7 +15,7 @@ package util import ( "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" ) const ( diff --git a/pkg/util/ctx_test.go b/pkg/util/ctx_test.go index 889c8ac799b..9ab83004a61 100644 --- a/pkg/util/ctx_test.go +++ b/pkg/util/ctx_test.go @@ -17,8 +17,8 @@ import ( "context" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/util/testleak" "github.com/pingcap/tidb/store/mockstore" + "github.com/pingcap/tiflow/pkg/util/testleak" "go.uber.org/zap" ) diff --git a/pkg/util/fileutil.go b/pkg/util/fileutil.go index 1ed97fe1c2f..20e64e5d738 100644 --- a/pkg/util/fileutil.go +++ b/pkg/util/fileutil.go @@ -22,8 +22,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/pkg/config" - cerror "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/pkg/config" + cerror "github.com/pingcap/tiflow/pkg/errors" ) const ( diff --git a/pkg/util/fileutil_test.go b/pkg/util/fileutil_test.go index bc52919bba8..8b1809de80b 100644 --- a/pkg/util/fileutil_test.go +++ b/pkg/util/fileutil_test.go @@ -21,8 +21,8 @@ import ( "github.com/pingcap/check" "github.com/pingcap/failpoint" - "github.com/pingcap/ticdc/pkg/config" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/config" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type fileUtilSuite struct{} @@ -97,8 +97,8 @@ func (s *fileUtilSuite) TestCheckDataDirSatisfied(c *check.C) { conf.DataDir = dir config.StoreGlobalServerConfig(conf) - c.Assert(failpoint.Enable("github.com/pingcap/ticdc/pkg/util/InjectCheckDataDirSatisfied", ""), check.IsNil) + c.Assert(failpoint.Enable("github.com/pingcap/tiflow/pkg/util/InjectCheckDataDirSatisfied", ""), check.IsNil) err := CheckDataDirSatisfied() c.Assert(err, check.IsNil) - c.Assert(failpoint.Disable("github.com/pingcap/ticdc/pkg/util/InjectCheckDataDirSatisfied"), check.IsNil) + c.Assert(failpoint.Disable("github.com/pingcap/tiflow/pkg/util/InjectCheckDataDirSatisfied"), check.IsNil) } diff --git a/pkg/util/overlap_merge_test.go b/pkg/util/overlap_merge_test.go index 5c84674718d..db8f329cf03 100644 --- a/pkg/util/overlap_merge_test.go +++ b/pkg/util/overlap_merge_test.go @@ -18,7 +18,7 @@ import ( "fmt" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type overlapSuite struct{} diff --git a/pkg/util/test_helper_test.go b/pkg/util/test_helper_test.go index 5b78d437dc2..07f9307c3fb 100644 --- a/pkg/util/test_helper_test.go +++ b/pkg/util/test_helper_test.go @@ -21,7 +21,7 @@ import ( "time" "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" ) func Test(t *testing.T) { diff --git a/pkg/util/testleak/leaktest.go b/pkg/util/testleak/leaktest.go index b7cb125148e..9bbb7a6122c 100644 --- a/pkg/util/testleak/leaktest.go +++ b/pkg/util/testleak/leaktest.go @@ -53,11 +53,11 @@ func interestingGoroutines() (gs []string) { // library used by sarama, ref: https://github.com/rcrowley/go-metrics/pull/266 "github.com/rcrowley/go-metrics.(*meterArbiter).tick", // TODO: remove these two lines after unified sorter is fixed - "github.com/pingcap/ticdc/cdc/sorter/unified.newBackEndPool", - "github.com/pingcap/ticdc/cdc/sorter/unified.(*heapSorter).flush", + "github.com/pingcap/tiflow/cdc/sorter/unified.newBackEndPool", + "github.com/pingcap/tiflow/cdc/sorter/unified.(*heapSorter).flush", // kv client region worker pool - "github.com/pingcap/ticdc/cdc/kv.RunWorkerPool", - "github.com/pingcap/ticdc/pkg/workerpool.(*defaultPoolImpl).Run", + "github.com/pingcap/tiflow/cdc/kv.RunWorkerPool", + "github.com/pingcap/tiflow/pkg/workerpool.(*defaultPoolImpl).Run", // library used by log "gopkg.in/natefinch/lumberjack%2ev2.(*Logger).millRun", } diff --git a/pkg/util/tz.go b/pkg/util/tz.go index b1e18043542..77d03e17306 100644 --- a/pkg/util/tz.go +++ b/pkg/util/tz.go @@ -18,8 +18,8 @@ import ( "strings" "time" - cerror "github.com/pingcap/ticdc/pkg/errors" "github.com/pingcap/tidb/util/timeutil" + cerror "github.com/pingcap/tiflow/pkg/errors" ) // GetTimezone returns the timezone specified by the name diff --git a/pkg/util/tz_test.go b/pkg/util/tz_test.go index aa25a33c285..885b3fa1404 100644 --- a/pkg/util/tz_test.go +++ b/pkg/util/tz_test.go @@ -15,7 +15,7 @@ package util import ( "github.com/pingcap/check" - "github.com/pingcap/ticdc/pkg/util/testleak" + "github.com/pingcap/tiflow/pkg/util/testleak" ) type tzSuite struct{} diff --git a/pkg/version/check.go b/pkg/version/check.go index 29e4a1be5d9..63e9e29c2b5 100644 --- a/pkg/version/check.go +++ b/pkg/version/check.go @@ -25,10 +25,10 @@ import ( "github.com/coreos/go-semver/semver" "github.com/pingcap/kvproto/pkg/metapb" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/httputil" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/cdc/model" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/httputil" + "github.com/pingcap/tiflow/pkg/security" pd "github.com/tikv/pd/client" "go.uber.org/zap" ) diff --git a/pkg/version/check_test.go b/pkg/version/check_test.go index 545a4d1e9b3..bd9c54404e0 100644 --- a/pkg/version/check_test.go +++ b/pkg/version/check_test.go @@ -23,7 +23,7 @@ import ( "github.com/coreos/go-semver/semver" "github.com/pingcap/kvproto/pkg/metapb" - "github.com/pingcap/ticdc/cdc/model" + "github.com/pingcap/tiflow/cdc/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" pd "github.com/tikv/pd/client" diff --git a/pkg/version/main_test.go b/pkg/version/main_test.go index 943c56a67bf..74534184dad 100644 --- a/pkg/version/main_test.go +++ b/pkg/version/main_test.go @@ -16,7 +16,7 @@ package version import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/version/version.go b/pkg/version/version.go index 3c6d4b960cc..ba4d2f78e8a 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -18,7 +18,7 @@ import ( "github.com/coreos/go-semver/semver" "github.com/pingcap/log" - "github.com/pingcap/ticdc/pkg/util" + "github.com/pingcap/tiflow/pkg/util" "go.uber.org/zap" ) diff --git a/pkg/workerpool/async_pool_impl.go b/pkg/workerpool/async_pool_impl.go index e2bf3ab6113..87c027e56b8 100644 --- a/pkg/workerpool/async_pool_impl.go +++ b/pkg/workerpool/async_pool_impl.go @@ -19,8 +19,8 @@ import ( "sync/atomic" "github.com/pingcap/errors" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/retry" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/retry" "golang.org/x/sync/errgroup" ) diff --git a/pkg/workerpool/main_test.go b/pkg/workerpool/main_test.go index 97d7fb65de2..33b6d827a5f 100644 --- a/pkg/workerpool/main_test.go +++ b/pkg/workerpool/main_test.go @@ -16,7 +16,7 @@ package workerpool import ( "testing" - "github.com/pingcap/ticdc/pkg/leakutil" + "github.com/pingcap/tiflow/pkg/leakutil" ) func TestMain(m *testing.M) { diff --git a/pkg/workerpool/pool_impl.go b/pkg/workerpool/pool_impl.go index 5927c12069d..2f10a4c8b65 100644 --- a/pkg/workerpool/pool_impl.go +++ b/pkg/workerpool/pool_impl.go @@ -22,8 +22,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/notify" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/notify" "go.uber.org/zap" "golang.org/x/sync/errgroup" "golang.org/x/time/rate" diff --git a/pkg/workerpool/pool_test.go b/pkg/workerpool/pool_test.go index 3aad1b0b1f7..9e2592f89d2 100644 --- a/pkg/workerpool/pool_test.go +++ b/pkg/workerpool/pool_test.go @@ -23,7 +23,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - cerror "github.com/pingcap/ticdc/pkg/errors" + cerror "github.com/pingcap/tiflow/pkg/errors" "github.com/stretchr/testify/require" "go.uber.org/zap" "golang.org/x/sync/errgroup" @@ -196,10 +196,10 @@ func TestCancelHandle(t *testing.T) { } } - err := failpoint.Enable("github.com/pingcap/ticdc/pkg/workerpool/addEventDelayPoint", "1*sleep(500)") + err := failpoint.Enable("github.com/pingcap/tiflow/pkg/workerpool/addEventDelayPoint", "1*sleep(500)") require.Nil(t, err) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/pkg/workerpool/addEventDelayPoint") + _ = failpoint.Disable("github.com/pingcap/tiflow/pkg/workerpool/addEventDelayPoint") }() handle.Unregister() @@ -228,10 +228,10 @@ func TestCancelTimer(t *testing.T) { return pool.Run(ctx) }) - err := failpoint.Enable("github.com/pingcap/ticdc/pkg/workerpool/unregisterDelayPoint", "sleep(5000)") + err := failpoint.Enable("github.com/pingcap/tiflow/pkg/workerpool/unregisterDelayPoint", "sleep(5000)") require.Nil(t, err) defer func() { - _ = failpoint.Disable("github.com/pingcap/ticdc/pkg/workerpool/unregisterDelayPoint") + _ = failpoint.Disable("github.com/pingcap/tiflow/pkg/workerpool/unregisterDelayPoint") }() handle := pool.RegisterEvent(func(ctx context.Context, event interface{}) error { @@ -541,7 +541,7 @@ func TestSynchronizeLog(t *testing.T) { } // Benchmark workerpool with ping-pong workflow. -// go test -benchmem -run='^$' -bench '^(BenchmarkWorkerpool)$' github.com/pingcap/ticdc/pkg/workerpool +// go test -benchmem -run='^$' -bench '^(BenchmarkWorkerpool)$' github.com/pingcap/tiflow/pkg/workerpool func BenchmarkWorkerpool(b *testing.B) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() diff --git a/testing_utils/cdc_state_checker/cdc_monitor.go b/testing_utils/cdc_state_checker/cdc_monitor.go index 5eac68220a3..5c2ee8a6dcf 100644 --- a/testing_utils/cdc_state_checker/cdc_monitor.go +++ b/testing_utils/cdc_state_checker/cdc_monitor.go @@ -19,9 +19,9 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/orchestrator" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/orchestrator" + "github.com/pingcap/tiflow/pkg/security" "github.com/prometheus/client_golang/prometheus" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/pkg/logutil" diff --git a/testing_utils/cdc_state_checker/main.go b/testing_utils/cdc_state_checker/main.go index 096f9aadca2..13c6364027b 100644 --- a/testing_utils/cdc_state_checker/main.go +++ b/testing_utils/cdc_state_checker/main.go @@ -19,7 +19,7 @@ import ( "strings" "github.com/pingcap/log" - "github.com/pingcap/ticdc/pkg/security" + "github.com/pingcap/tiflow/pkg/security" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/testing_utils/cdc_state_checker/reactor.go b/testing_utils/cdc_state_checker/reactor.go index 2c0acd8d1e8..619b19fdf00 100644 --- a/testing_utils/cdc_state_checker/reactor.go +++ b/testing_utils/cdc_state_checker/reactor.go @@ -18,8 +18,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/orchestrator" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/orchestrator" "go.uber.org/zap" ) diff --git a/testing_utils/cdc_state_checker/state.go b/testing_utils/cdc_state_checker/state.go index f0bdd75810e..313f24d41fc 100644 --- a/testing_utils/cdc_state_checker/state.go +++ b/testing_utils/cdc_state_checker/state.go @@ -19,10 +19,10 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/pkg/etcd" - "github.com/pingcap/ticdc/pkg/orchestrator" - "github.com/pingcap/ticdc/pkg/orchestrator/util" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/pkg/etcd" + "github.com/pingcap/tiflow/pkg/orchestrator" + "github.com/pingcap/tiflow/pkg/orchestrator/util" "go.uber.org/zap" ) diff --git a/testing_utils/many_sorters_test/many_sorters.go b/testing_utils/many_sorters_test/many_sorters.go index 1772bc6f37d..dc4f3ae314c 100644 --- a/testing_utils/many_sorters_test/many_sorters.go +++ b/testing_utils/many_sorters_test/many_sorters.go @@ -26,11 +26,11 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sorter" - "github.com/pingcap/ticdc/cdc/sorter/unified" - "github.com/pingcap/ticdc/pkg/config" - cerrors "github.com/pingcap/ticdc/pkg/errors" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sorter" + "github.com/pingcap/tiflow/cdc/sorter/unified" + "github.com/pingcap/tiflow/pkg/config" + cerrors "github.com/pingcap/tiflow/pkg/errors" "go.uber.org/zap" "go.uber.org/zap/zapcore" "golang.org/x/sync/errgroup" @@ -45,7 +45,7 @@ var ( func main() { flag.Parse() - err := failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/sorterDebug", "return(true)") + err := failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/sorterDebug", "return(true)") if err != nil { log.Fatal("Could not enable failpoint", zap.Error(err)) } diff --git a/testing_utils/sorter_stress_test/sorter_stress.go b/testing_utils/sorter_stress_test/sorter_stress.go index 57ace85345f..f32988cf2e4 100644 --- a/testing_utils/sorter_stress_test/sorter_stress.go +++ b/testing_utils/sorter_stress_test/sorter_stress.go @@ -25,10 +25,10 @@ import ( "github.com/pingcap/failpoint" "github.com/pingcap/log" - "github.com/pingcap/ticdc/cdc/model" - "github.com/pingcap/ticdc/cdc/sorter" - "github.com/pingcap/ticdc/cdc/sorter/unified" - "github.com/pingcap/ticdc/pkg/config" + "github.com/pingcap/tiflow/cdc/model" + "github.com/pingcap/tiflow/cdc/sorter" + "github.com/pingcap/tiflow/cdc/sorter/unified" + "github.com/pingcap/tiflow/pkg/config" "go.uber.org/zap" "golang.org/x/sync/errgroup" ) @@ -43,7 +43,7 @@ var ( func main() { flag.Parse() log.SetLevel(zap.DebugLevel) - err := failpoint.Enable("github.com/pingcap/ticdc/cdc/sorter/unified/sorterDebug", "return(true)") + err := failpoint.Enable("github.com/pingcap/tiflow/cdc/sorter/unified/sorterDebug", "return(true)") if err != nil { log.Fatal("Could not enable failpoint", zap.Error(err)) } diff --git a/tests/integration_tests/_utils/run_cdc_cli_tso_query b/tests/integration_tests/_utils/run_cdc_cli_tso_query index 33ab8282e28..fe30a544ff5 100755 --- a/tests/integration_tests/_utils/run_cdc_cli_tso_query +++ b/tests/integration_tests/_utils/run_cdc_cli_tso_query @@ -23,7 +23,7 @@ pd_port=${2} tso=$(run_cdc_cli tso query --pd=http://${pd_host}:${pd_port}) # make sure get tso only # the tso got above is: -# "427768583921860609 PASS coverage: 2.7% of statements in github.com/pingcap/ticdc/..." +# "427768583921860609 PASS coverage: 2.7% of statements in github.com/pingcap/tiflow/..." # and only "427768583921860609" is a real tso echo $tso | awk -F " " '{print $1}' diff --git a/tests/integration_tests/availability/owner.sh b/tests/integration_tests/availability/owner.sh index 5eed09aae63..d8975521862 100755 --- a/tests/integration_tests/availability/owner.sh +++ b/tests/integration_tests/availability/owner.sh @@ -159,7 +159,7 @@ function test_owner_cleanup_stale_tasks() { function test_owner_retryable_error() { echo "run test case test_owner_retryable_error" - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/capture/capture-campaign-compacted-error=1*return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/capture/capture-campaign-compacted-error=1*return(true)' # start a capture server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix test_owner_retryable_error.server1 @@ -171,7 +171,7 @@ function test_owner_retryable_error() { echo "owner pid:" $owner_pid echo "owner id" $owner_id - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/owner/owner-run-with-error=1*return(true);github.com/pingcap/ticdc/cdc/capture/capture-resign-failed=1*return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/owner/owner-run-with-error=1*return(true);github.com/pingcap/tiflow/cdc/capture/capture-resign-failed=1*return(true)' # run another server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix test_owner_retryable_error.server2 --addr "127.0.0.1:8301" @@ -196,7 +196,7 @@ function test_owner_retryable_error() { function test_gap_between_watch_capture() { echo "run test case test_gap_between_watch_capture" - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/owner/sleep-in-owner-tick=1*sleep(6000)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/owner/sleep-in-owner-tick=1*sleep(6000)' # start a capture server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix test_gap_between_watch_capture.server1 diff --git a/tests/integration_tests/bank/case.go b/tests/integration_tests/bank/case.go index 54220be7559..c3aa41fab05 100644 --- a/tests/integration_tests/bank/case.go +++ b/tests/integration_tests/bank/case.go @@ -25,8 +25,8 @@ import ( _ "github.com/go-sql-driver/mysql" // MySQL driver "github.com/pingcap/errors" "github.com/pingcap/log" - cerror "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/retry" + cerror "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/retry" "go.uber.org/zap" "golang.org/x/sync/errgroup" ) diff --git a/tests/integration_tests/capture_session_done_during_task/run.sh b/tests/integration_tests/capture_session_done_during_task/run.sh index 89c5ad36f3b..0205d74943d 100644 --- a/tests/integration_tests/capture_session_done_during_task/run.sh +++ b/tests/integration_tests/capture_session_done_during_task/run.sh @@ -28,7 +28,7 @@ function run() { run_sql "CREATE table capture_session_done_during_task.t (id int primary key auto_increment, a int)" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} start_ts=$(run_cdc_cli_tso_query ${UP_PD_HOST_1} ${UP_PD_PORT_1}) run_sql "INSERT INTO capture_session_done_during_task.t values (),(),(),(),(),(),()" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/processor/processorManagerHandleNewChangefeedDelay=sleep(2000)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/processor/processorManagerHandleNewChangefeedDelay=sleep(2000)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --addr "127.0.0.1:8300" --pd $pd_addr changefeed_id=$(cdc cli changefeed create --pd=$pd_addr --start-ts=$start_ts --sink-uri="$SINK_URI" 2>&1 | tail -n2 | head -n1 | awk '{print $2}') # wait task is dispatched diff --git a/tests/integration_tests/capture_suicide_while_balance_table/run.sh b/tests/integration_tests/capture_suicide_while_balance_table/run.sh index 8e0597921bd..3accdee5b4f 100644 --- a/tests/integration_tests/capture_suicide_while_balance_table/run.sh +++ b/tests/integration_tests/capture_suicide_while_balance_table/run.sh @@ -36,7 +36,7 @@ function run() { pd_addr="http://$UP_PD_HOST_1:$UP_PD_PORT_1" run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --pd $pd_addr --logsuffix 1 --addr "127.0.0.1:8300" - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/sink/MySQLSinkHangLongTime=1*return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/sink/MySQLSinkHangLongTime=1*return(true)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --pd $pd_addr --logsuffix 2 --addr "127.0.0.1:8301" SINK_URI="mysql://normal:123456@127.0.0.1:3306/?max-txn-row=1" diff --git a/tests/integration_tests/cdc/cdc.go b/tests/integration_tests/cdc/cdc.go index a62dcad8b98..6b7f56cb36f 100644 --- a/tests/integration_tests/cdc/cdc.go +++ b/tests/integration_tests/cdc/cdc.go @@ -20,8 +20,8 @@ import ( _ "github.com/go-sql-driver/mysql" "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/tests/integration_tests/dailytest" - "github.com/pingcap/ticdc/tests/integration_tests/util" + "github.com/pingcap/tiflow/tests/integration_tests/dailytest" + "github.com/pingcap/tiflow/tests/integration_tests/util" ) func main() { diff --git a/tests/integration_tests/changefeed_auto_stop/run.sh b/tests/integration_tests/changefeed_auto_stop/run.sh index f6a55182405..19ce910a00b 100755 --- a/tests/integration_tests/changefeed_auto_stop/run.sh +++ b/tests/integration_tests/changefeed_auto_stop/run.sh @@ -44,7 +44,7 @@ function run() { done run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1" --addr "127.0.0.1:8301" --pd "http://${UP_PD_HOST_1}:${UP_PD_PORT_1}" - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/processor/pipeline/ProcessorSyncResolvedError=1*return(true);github.com/pingcap/ticdc/cdc/processor/ProcessorUpdatePositionDelaying=sleep(1000)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/processor/pipeline/ProcessorSyncResolvedError=1*return(true);github.com/pingcap/tiflow/cdc/processor/ProcessorUpdatePositionDelaying=sleep(1000)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "2" --addr "127.0.0.1:8302" --pd "http://${UP_PD_HOST_1}:${UP_PD_PORT_1}" export GO_FAILPOINTS='' diff --git a/tests/integration_tests/changefeed_error/run.sh b/tests/integration_tests/changefeed_error/run.sh index c4a32f48088..6c5b878c187 100755 --- a/tests/integration_tests/changefeed_error/run.sh +++ b/tests/integration_tests/changefeed_error/run.sh @@ -114,7 +114,7 @@ function run() { start_ts=$(run_cdc_cli_tso_query ${UP_PD_HOST_1} ${UP_PD_PORT_1}) run_sql "CREATE DATABASE changefeed_error;" ${UP_TIDB_HOST} ${UP_TIDB_PORT} go-ycsb load mysql -P $CUR/conf/workload -p mysql.host=${UP_TIDB_HOST} -p mysql.port=${UP_TIDB_PORT} -p mysql.user=root -p mysql.db=changefeed_error - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/owner/NewChangefeedNoRetryError=1*return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/owner/NewChangefeedNoRetryError=1*return(true)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY capture_pid=$(ps -C $CDC_BINARY -o pid= | awk '{print $1}') @@ -138,7 +138,7 @@ function run() { go-ycsb load mysql -P $CUR/conf/workload -p mysql.host=${UP_TIDB_HOST} -p mysql.port=${UP_TIDB_PORT} -p mysql.user=root -p mysql.db=changefeed_error check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/owner/NewChangefeedRetryError=return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/owner/NewChangefeedRetryError=return(true)' kill $capture_pid ensure $MAX_RETRIES check_no_capture http://${UP_PD_HOST_1}:${UP_PD_PORT_1} run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY @@ -151,7 +151,7 @@ function run() { cleanup_process $CDC_BINARY # owner DDL error case - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/owner/InjectChangefeedDDLError=return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/owner/InjectChangefeedDDLError=return(true)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY changefeedid_1="changefeed-error-1" run_cdc_cli changefeed create --start-ts=$start_ts --sink-uri="$SINK_URI" -c $changefeedid_1 @@ -163,7 +163,7 @@ function run() { cleanup_process $CDC_BINARY # updating GC safepoint failure case - export GO_FAILPOINTS='github.com/pingcap/ticdc/pkg/txnutil/gc/InjectActualGCSafePoint=return(9223372036854775807)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/pkg/txnutil/gc/InjectActualGCSafePoint=return(9223372036854775807)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY changefeedid_2="changefeed-error-2" diff --git a/tests/integration_tests/changefeed_fast_fail/run.sh b/tests/integration_tests/changefeed_fast_fail/run.sh index 273368f5130..a5bdaa60d17 100644 --- a/tests/integration_tests/changefeed_fast_fail/run.sh +++ b/tests/integration_tests/changefeed_fast_fail/run.sh @@ -44,7 +44,7 @@ function run() { start_ts=$(run_cdc_cli_tso_query ${UP_PD_HOST_1} ${UP_PD_PORT_1}) run_sql "CREATE DATABASE changefeed_error;" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/owner/InjectChangefeedFastFailError=return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/owner/InjectChangefeedFastFailError=return(true)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY SINK_URI="mysql://normal:123456@127.0.0.1:3306/?max-txn-row=1" diff --git a/tests/integration_tests/consistent_replicate_nfs/run.sh b/tests/integration_tests/consistent_replicate_nfs/run.sh index ccbef125e92..3219102055a 100644 --- a/tests/integration_tests/consistent_replicate_nfs/run.sh +++ b/tests/integration_tests/consistent_replicate_nfs/run.sh @@ -57,7 +57,7 @@ function run() { # Inject the failpoint to prevent sink execution, but the global resolved can be moved forward. # Then we can apply redo log to reach an eventual consistent state in downstream. cleanup_process $CDC_BINARY - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/sink/MySQLSinkHangLongTime=return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/sink/MySQLSinkHangLongTime=return(true)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY run_sql "create table consistent_replicate_nfs.USERTABLE2 like consistent_replicate_nfs.USERTABLE" ${UP_TIDB_HOST} ${UP_TIDB_PORT} diff --git a/tests/integration_tests/consistent_replicate_s3/run.sh b/tests/integration_tests/consistent_replicate_s3/run.sh index e9fef40ae2b..653bb21101c 100644 --- a/tests/integration_tests/consistent_replicate_s3/run.sh +++ b/tests/integration_tests/consistent_replicate_s3/run.sh @@ -90,7 +90,7 @@ function run() { # Inject the failpoint to prevent sink execution, but the global resolved can be moved forward. # Then we can apply redo log to reach an eventual consistent state in downstream. cleanup_process $CDC_BINARY - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/sink/MySQLSinkHangLongTime=return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/sink/MySQLSinkHangLongTime=return(true)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY run_sql "create table consistent_replicate_s3.USERTABLE2 like consistent_replicate_s3.USERTABLE" ${UP_TIDB_HOST} ${UP_TIDB_PORT} diff --git a/tests/integration_tests/dailytest/db.go b/tests/integration_tests/dailytest/db.go index c0c7694bc79..e3831054186 100644 --- a/tests/integration_tests/dailytest/db.go +++ b/tests/integration_tests/dailytest/db.go @@ -23,8 +23,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/tests/integration_tests/util" "github.com/pingcap/tidb/parser/mysql" + "github.com/pingcap/tiflow/tests/integration_tests/util" "go.uber.org/zap/zapcore" ) diff --git a/tests/integration_tests/ddl_puller_lag/run.sh b/tests/integration_tests/ddl_puller_lag/run.sh index e25f38489de..8f9595d7e0a 100644 --- a/tests/integration_tests/ddl_puller_lag/run.sh +++ b/tests/integration_tests/ddl_puller_lag/run.sh @@ -21,7 +21,7 @@ function prepare() { run_sql "CREATE table test.ddl_puller_lag1(id int primary key, val int);" run_sql "CREATE table test.ddl_puller_lag2(id int primary key, val int);" - run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --failpoint 'github.com/pingcap/ticdc/cdc/processor/processorDDLResolved=1*sleep(180000)' + run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --failpoint 'github.com/pingcap/tiflow/cdc/processor/processorDDLResolved=1*sleep(180000)' TOPIC_NAME="ticdc-ddl-puller-lag-test-$RANDOM" case $SINK_TYPE in diff --git a/tests/integration_tests/force_replicate_table/run.sh b/tests/integration_tests/force_replicate_table/run.sh index 76e5581be2f..1b3e7ea04ef 100755 --- a/tests/integration_tests/force_replicate_table/run.sh +++ b/tests/integration_tests/force_replicate_table/run.sh @@ -72,7 +72,7 @@ function run() { table="force_replicate_table.t$i" check_table_exists $table ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} done - # data could be duplicated due to https://github.com/pingcap/ticdc/issues/964, + # data could be duplicated due to https://github.com/pingcap/tiflow/issues/964, # so we just check downstream contains all data in upstream. for i in $(seq 0 6); do ensure 5 check_data_subset "force_replicate_table.t$i" \ diff --git a/tests/integration_tests/gc_safepoint/run.sh b/tests/integration_tests/gc_safepoint/run.sh index c483b21c74e..fa28076e00b 100755 --- a/tests/integration_tests/gc_safepoint/run.sh +++ b/tests/integration_tests/gc_safepoint/run.sh @@ -86,7 +86,7 @@ function run() { kafka) SINK_URI="kafka://127.0.0.1:9092/$TOPIC_NAME?partition-num=4&kafka-version=${KAFKA_VERSION}&max-message-bytes=10485760" ;; *) SINK_URI="mysql://normal:123456@127.0.0.1:3306/?max-txn-row=1" ;; esac - export GO_FAILPOINTS='github.com/pingcap/ticdc/pkg/txnutil/gc/InjectGcSafepointUpdateInterval=return(500)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/pkg/txnutil/gc/InjectGcSafepointUpdateInterval=return(500)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --addr "127.0.0.1:8300" --pd $pd_addr changefeed_id=$(cdc cli changefeed create --pd=$pd_addr --sink-uri="$SINK_URI" 2>&1 | tail -n2 | head -n1 | awk '{print $2}') if [ "$SINK_TYPE" == "kafka" ]; then diff --git a/tests/integration_tests/kafka_sink_error_resume/run.sh b/tests/integration_tests/kafka_sink_error_resume/run.sh index 7039c16c042..1020d5cd233 100755 --- a/tests/integration_tests/kafka_sink_error_resume/run.sh +++ b/tests/integration_tests/kafka_sink_error_resume/run.sh @@ -39,7 +39,7 @@ function run() { TOPIC_NAME="ticdc-kafka-sink-error-resume-test-$RANDOM" SINK_URI="kafka://127.0.0.1:9092/$TOPIC_NAME?partition-num=4&kafka-version=${KAFKA_VERSION}&max-message-bytes=10485760" - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/sink/producer/kafka/KafkaSinkAsyncSendError=4*return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/sink/producer/kafka/KafkaSinkAsyncSendError=4*return(true)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --addr "127.0.0.1:8300" --pd $pd_addr changefeed_id=$(cdc cli changefeed create --pd=$pd_addr --sink-uri="$SINK_URI" 2>&1 | tail -n2 | head -n1 | awk '{print $2}') run_kafka_consumer $WORK_DIR "kafka://127.0.0.1:9092/$TOPIC_NAME?partition-num=4&version=${KAFKA_VERSION}&max-message-bytes=10485760" diff --git a/tests/integration_tests/kill_owner_with_ddl/run.sh b/tests/integration_tests/kill_owner_with_ddl/run.sh index 22757000f23..b13f8dbc8fc 100755 --- a/tests/integration_tests/kill_owner_with_ddl/run.sh +++ b/tests/integration_tests/kill_owner_with_ddl/run.sh @@ -56,7 +56,7 @@ function run() { run_sql "CREATE table kill_owner_with_ddl.t1 (id int primary key auto_increment, val int);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} check_table_exists "kill_owner_with_ddl.t1" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/sink/MySQLSinkExecDDLDelay=return(true);github.com/pingcap/ticdc/cdc/capture/ownerFlushIntervalInject=return(10)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/sink/MySQLSinkExecDDLDelay=return(true);github.com/pingcap/tiflow/cdc/capture/ownerFlushIntervalInject=return(10)' kill_cdc_and_restart $pd_addr $WORK_DIR $CDC_BINARY for i in $(seq 2 3); do diff --git a/tests/integration_tests/kv_client_stream_reconnect/run.sh b/tests/integration_tests/kv_client_stream_reconnect/run.sh index ce4c102b463..ab39329419e 100644 --- a/tests/integration_tests/kv_client_stream_reconnect/run.sh +++ b/tests/integration_tests/kv_client_stream_reconnect/run.sh @@ -24,7 +24,7 @@ function run() { esac # this will be triggered every 5s in kv client - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/kv/kvClientForceReconnect=return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/kv/kvClientForceReconnect=return(true)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --addr "127.0.0.1:8300" --pd $pd_addr changefeed_id=$(cdc cli changefeed create --pd=$pd_addr --sink-uri="$SINK_URI" 2>&1 | tail -n2 | head -n1 | awk '{print $2}') if [ "$SINK_TYPE" == "kafka" ]; then diff --git a/tests/integration_tests/many_pk_or_uk/main.go b/tests/integration_tests/many_pk_or_uk/main.go index 152e40acaba..aa00fe72812 100644 --- a/tests/integration_tests/many_pk_or_uk/main.go +++ b/tests/integration_tests/many_pk_or_uk/main.go @@ -23,7 +23,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/tests/integration_tests/util" + "github.com/pingcap/tiflow/tests/integration_tests/util" ) func main() { diff --git a/tests/integration_tests/move_table/main.go b/tests/integration_tests/move_table/main.go index 5b0e84cd1cc..4510fa90ed6 100644 --- a/tests/integration_tests/move_table/main.go +++ b/tests/integration_tests/move_table/main.go @@ -24,12 +24,12 @@ import ( "strings" "time" - "github.com/pingcap/ticdc/pkg/etcd" + "github.com/pingcap/tiflow/pkg/etcd" "github.com/pingcap/errors" "github.com/pingcap/log" - cerrors "github.com/pingcap/ticdc/pkg/errors" - "github.com/pingcap/ticdc/pkg/retry" + cerrors "github.com/pingcap/tiflow/pkg/errors" + "github.com/pingcap/tiflow/pkg/retry" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/pkg/logutil" "go.uber.org/zap" diff --git a/tests/integration_tests/multi_source/main.go b/tests/integration_tests/multi_source/main.go index 3324d5ee5ba..db14e10ff76 100644 --- a/tests/integration_tests/multi_source/main.go +++ b/tests/integration_tests/multi_source/main.go @@ -28,7 +28,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/tests/integration_tests/util" + "github.com/pingcap/tiflow/tests/integration_tests/util" "go.uber.org/zap" ) diff --git a/tests/integration_tests/owner_remove_table_error/run.sh b/tests/integration_tests/owner_remove_table_error/run.sh index bae27f0a874..5ba75eb1ef1 100644 --- a/tests/integration_tests/owner_remove_table_error/run.sh +++ b/tests/integration_tests/owner_remove_table_error/run.sh @@ -25,7 +25,7 @@ function run() { pd_addr="http://$UP_PD_HOST_1:$UP_PD_PORT_1" SINK_URI="mysql://normal:123456@127.0.0.1:3306/?max-txn-row=1" - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/owner/OwnerRemoveTableError=1*return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/owner/OwnerRemoveTableError=1*return(true)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --addr "127.0.0.1:8300" --pd $pd_addr changefeed_id=$(cdc cli changefeed create --pd=$pd_addr --sink-uri="$SINK_URI" 2>&1 | tail -n2 | head -n1 | awk '{print $2}') diff --git a/tests/integration_tests/processor_err_chan/run.sh b/tests/integration_tests/processor_err_chan/run.sh index f4962fb3c52..7e9ca97176c 100644 --- a/tests/integration_tests/processor_err_chan/run.sh +++ b/tests/integration_tests/processor_err_chan/run.sh @@ -47,7 +47,7 @@ function run() { run_sql "CREATE table processor_err_chan.t$i (id int primary key auto_increment)" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} done - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/processor/pipeline/ProcessorAddTableError=1*return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/processor/pipeline/ProcessorAddTableError=1*return(true)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --addr "127.0.0.1:8300" --pd $pd_addr changefeed_id=$(cdc cli changefeed create --pd=$pd_addr --sink-uri="$SINK_URI" 2>&1 | tail -n2 | head -n1 | awk '{print $2}') diff --git a/tests/integration_tests/processor_panic/main.go b/tests/integration_tests/processor_panic/main.go index c6aef27aa22..430a87d5b8d 100644 --- a/tests/integration_tests/processor_panic/main.go +++ b/tests/integration_tests/processor_panic/main.go @@ -22,8 +22,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/ticdc/pkg/quotes" - "github.com/pingcap/ticdc/tests/integration_tests/util" + "github.com/pingcap/tiflow/pkg/quotes" + "github.com/pingcap/tiflow/tests/integration_tests/util" "go.uber.org/zap" "golang.org/x/sync/errgroup" ) diff --git a/tests/integration_tests/processor_panic/run.sh b/tests/integration_tests/processor_panic/run.sh index ac4167a3572..20f9aa6fd8b 100644 --- a/tests/integration_tests/processor_panic/run.sh +++ b/tests/integration_tests/processor_panic/run.sh @@ -19,7 +19,7 @@ function prepare() { start_ts=$(run_cdc_cli_tso_query ${UP_PD_HOST_1} ${UP_PD_PORT_1}) run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix 1 --addr 127.0.0.1:8300 --restart true \ - --failpoint 'github.com/pingcap/ticdc/cdc/processor/pipeline/ProcessorSyncResolvedPreEmit=return(true)' + --failpoint 'github.com/pingcap/tiflow/cdc/processor/pipeline/ProcessorSyncResolvedPreEmit=return(true)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix 2 --addr 127.0.0.1:8301 diff --git a/tests/integration_tests/processor_resolved_ts_fallback/run.sh b/tests/integration_tests/processor_resolved_ts_fallback/run.sh index 251c058d40e..b99754b42d6 100755 --- a/tests/integration_tests/processor_resolved_ts_fallback/run.sh +++ b/tests/integration_tests/processor_resolved_ts_fallback/run.sh @@ -18,7 +18,7 @@ function run() { start_tidb_cluster --workdir $WORK_DIR cd $WORK_DIR - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/sink/SinkFlushDMLPanic=return(true);github.com/pingcap/ticdc/cdc/sink/producer/kafka/SinkFlushDMLPanic=return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/sink/SinkFlushDMLPanic=return(true);github.com/pingcap/tiflow/cdc/sink/producer/kafka/SinkFlushDMLPanic=return(true)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1" --addr "127.0.0.1:8301" --pd "http://${UP_PD_HOST_1}:${UP_PD_PORT_1}" TOPIC_NAME="ticdc-processor-resolved-ts-fallback-test-$RANDOM" diff --git a/tests/integration_tests/processor_stop_delay/run.sh b/tests/integration_tests/processor_stop_delay/run.sh index 55a8f57e48f..89d23b963fb 100644 --- a/tests/integration_tests/processor_stop_delay/run.sh +++ b/tests/integration_tests/processor_stop_delay/run.sh @@ -20,7 +20,7 @@ function run() { kafka) SINK_URI="kafka://127.0.0.1:9092/$TOPIC_NAME?partition-num=4&kafka-version=${KAFKA_VERSION}&max-message-bytes=10485760" ;; *) SINK_URI="mysql://normal:123456@127.0.0.1:3306/?max-txn-row=1" ;; esac - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/processor/processorStopDelay=1*sleep(10000)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/processor/processorStopDelay=1*sleep(10000)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --addr "127.0.0.1:8300" --pd $pd_addr changefeed_id=$(cdc cli changefeed create --pd=$pd_addr --sink-uri="$SINK_URI" 2>&1 | tail -n2 | head -n1 | awk '{print $2}') diff --git a/tests/integration_tests/resolve_lock/main.go b/tests/integration_tests/resolve_lock/main.go index f02ed745270..f75da489d54 100644 --- a/tests/integration_tests/resolve_lock/main.go +++ b/tests/integration_tests/resolve_lock/main.go @@ -31,11 +31,11 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/kvproto/pkg/kvrpcpb" "github.com/pingcap/log" - "github.com/pingcap/ticdc/tests/integration_tests/util" "github.com/pingcap/tidb/kv" "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/store/driver" "github.com/pingcap/tidb/tablecodec" + "github.com/pingcap/tiflow/tests/integration_tests/util" "github.com/tikv/client-go/v2/oracle" "github.com/tikv/client-go/v2/tikv" "github.com/tikv/client-go/v2/tikvrpc" diff --git a/tests/integration_tests/sink_hang/run.sh b/tests/integration_tests/sink_hang/run.sh index ac386512890..83d78c9c050 100644 --- a/tests/integration_tests/sink_hang/run.sh +++ b/tests/integration_tests/sink_hang/run.sh @@ -42,7 +42,7 @@ function run() { *) SINK_URI="mysql://normal:123456@127.0.0.1:3306/?max-txn-row=1" ;; esac - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/sink/MySQLSinkHangLongTime=1*return(true);github.com/pingcap/ticdc/cdc/sink/MySQLSinkExecDMLError=9*return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/sink/MySQLSinkHangLongTime=1*return(true);github.com/pingcap/tiflow/cdc/sink/MySQLSinkExecDMLError=9*return(true)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --addr "127.0.0.1:8300" --pd $pd_addr changefeed_id=$(cdc cli changefeed create --pd=$pd_addr --sink-uri="$SINK_URI" 2>&1 | tail -n2 | head -n1 | awk '{print $2}') if [ "$SINK_TYPE" == "kafka" ]; then diff --git a/tests/integration_tests/sink_retry/run.sh b/tests/integration_tests/sink_retry/run.sh index 0f19d3fb016..88b0219257a 100755 --- a/tests/integration_tests/sink_retry/run.sh +++ b/tests/integration_tests/sink_retry/run.sh @@ -21,7 +21,7 @@ function run() { start_ts=$(run_cdc_cli_tso_query ${UP_PD_HOST_1} ${UP_PD_PORT_1}) run_sql "CREATE DATABASE sink_retry;" go-ycsb load mysql -P $CUR/conf/workload -p mysql.host=${UP_TIDB_HOST} -p mysql.port=${UP_TIDB_PORT} -p mysql.user=root -p mysql.db=sink_retry - export GO_FAILPOINTS='github.com/pingcap/ticdc/cdc/sink/MySQLSinkTxnRandomError=25%return(true)' + export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/sink/MySQLSinkTxnRandomError=25%return(true)' run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY TOPIC_NAME="ticdc-sink-retry-test-$RANDOM" diff --git a/tools/check/check-errdoc.sh b/tools/check/check-errdoc.sh index 243a0668ab1..3ebf7269eca 100755 --- a/tools/check/check-errdoc.sh +++ b/tools/check/check-errdoc.sh @@ -17,5 +17,5 @@ set -euo pipefail cd -P . cp errors.toml /tmp/errors.toml.before -./tools/bin/errdoc-gen --source . --module github.com/pingcap/ticdc --output errors.toml --ignore proto,dm +./tools/bin/errdoc-gen --source . --module github.com/pingcap/tiflow --output errors.toml --ignore proto,dm diff -q errors.toml /tmp/errors.toml.before