From cb7f2fa6fdb3df2738c2ee035f5d404e982607cc Mon Sep 17 00:00:00 2001 From: congqixia Date: Sat, 22 Feb 2025 23:15:58 +0800 Subject: [PATCH] enhance: Use v2 package name for pkg module (#39990) Related to #39095 https://go.dev/doc/modules/version-numbers Update pkg version according to golang dep version convention --------- Signed-off-by: Congqi Xia --- cmd/components/data_coord.go | 6 +-- cmd/components/data_node.go | 6 +-- cmd/components/index_coord.go | 4 +- cmd/components/index_node.go | 6 +-- cmd/components/proxy.go | 6 +-- cmd/components/query_coord.go | 6 +-- cmd/components/query_node.go | 6 +-- cmd/components/root_coord.go | 6 +-- cmd/components/streaming_node.go | 2 +- cmd/components/util.go | 6 +-- cmd/main.go | 2 +- cmd/milvus/help.go | 2 +- cmd/milvus/mck.go | 16 +++---- cmd/milvus/run.go | 8 ++-- cmd/milvus/stop.go | 4 +- cmd/milvus/util.go | 8 ++-- cmd/roles/roles.go | 30 ++++++------ cmd/roles/roles_test.go | 2 +- cmd/tools/config/generate.go | 6 +-- cmd/tools/config/generate_test.go | 4 +- cmd/tools/config/main.go | 2 +- cmd/tools/config/printer.go | 2 +- cmd/tools/datameta/main.go | 8 ++-- cmd/tools/migration/allocator/allocator.go | 2 +- .../migration/allocator/atomic_allocator.go | 2 +- cmd/tools/migration/backend/backend.go | 2 +- cmd/tools/migration/backend/etcd.go | 4 +- cmd/tools/migration/backend/etcd210.go | 6 +-- cmd/tools/migration/backend/etcd220.go | 2 +- cmd/tools/migration/configs/config.go | 4 +- cmd/tools/migration/meta/210_to_220.go | 12 ++--- cmd/tools/migration/meta/meta.go | 2 +- cmd/tools/migration/meta/meta210.go | 4 +- cmd/tools/migration/meta/meta220.go | 4 +- cmd/tools/migration/migration/constant.go | 2 +- cmd/tools/migration/migration/runner.go | 2 +- cmd/tools/migration/mmap/mmap_230_240.go | 2 +- cmd/tools/migration/mmap/tool/main.go | 12 ++--- cmd/tools/migration/utils/util.go | 2 +- go.mod | 4 +- internal/allocator/cached_allocator.go | 2 +- internal/allocator/global_id_allocator.go | 4 +- .../allocator/global_id_allocator_test.go | 2 +- internal/allocator/id_allocator.go | 4 +- internal/allocator/id_allocator_test.go | 4 +- internal/allocator/interface.go | 2 +- internal/allocator/local_allocator_test.go | 2 +- internal/allocator/remote_interface.go | 2 +- internal/coordinator/coordclient/registry.go | 14 +++--- .../coordinator/coordclient/registry_test.go | 10 ++-- .../coordinator/coordclient/test_utility.go | 2 +- .../snmanager/streaming_node_manager.go | 10 ++-- .../snmanager/streaming_node_manager_test.go | 4 +- internal/datacoord/allocator/allocator.go | 10 ++-- .../datacoord/allocator/allocator_test.go | 4 +- internal/datacoord/analyze_meta.go | 8 ++-- internal/datacoord/analyze_meta_test.go | 4 +- .../datacoord/broker/coordinator_broker.go | 10 ++-- .../broker/coordinator_broker_test.go | 4 +- internal/datacoord/broker/mock_broker.go | 2 +- internal/datacoord/channel.go | 4 +- internal/datacoord/channel_manager.go | 14 +++--- internal/datacoord/channel_manager_test.go | 10 ++-- internal/datacoord/channel_store.go | 12 ++--- internal/datacoord/channel_store_test.go | 10 ++-- internal/datacoord/cluster.go | 8 ++-- internal/datacoord/cluster_test.go | 6 +-- internal/datacoord/compaction.go | 16 +++---- internal/datacoord/compaction_l0_view.go | 2 +- internal/datacoord/compaction_l0_view_test.go | 4 +- .../datacoord/compaction_policy_clustering.go | 6 +-- .../compaction_policy_clustering_test.go | 6 +-- internal/datacoord/compaction_policy_l0.go | 8 ++-- .../datacoord/compaction_policy_l0_test.go | 6 +-- .../datacoord/compaction_policy_single.go | 4 +- .../compaction_policy_single_test.go | 4 +- internal/datacoord/compaction_queue.go | 4 +- internal/datacoord/compaction_queue_test.go | 2 +- internal/datacoord/compaction_task.go | 2 +- .../datacoord/compaction_task_clustering.go | 18 ++++---- .../compaction_task_clustering_test.go | 10 ++-- internal/datacoord/compaction_task_l0.go | 10 ++-- internal/datacoord/compaction_task_l0_test.go | 4 +- internal/datacoord/compaction_task_meta.go | 10 ++-- .../datacoord/compaction_task_meta_test.go | 4 +- internal/datacoord/compaction_task_mix.go | 8 ++-- .../datacoord/compaction_task_mix_test.go | 4 +- internal/datacoord/compaction_test.go | 8 ++-- internal/datacoord/compaction_trigger.go | 16 +++---- internal/datacoord/compaction_trigger_test.go | 12 ++--- internal/datacoord/compaction_trigger_v2.go | 8 ++-- .../datacoord/compaction_trigger_v2_test.go | 10 ++-- internal/datacoord/compaction_view.go | 2 +- internal/datacoord/errors_test.go | 4 +- internal/datacoord/garbage_collector.go | 20 ++++---- internal/datacoord/garbage_collector_test.go | 14 +++--- internal/datacoord/handler.go | 14 +++--- internal/datacoord/handler_test.go | 14 +++--- internal/datacoord/import_checker.go | 14 +++--- internal/datacoord/import_checker_test.go | 16 +++---- internal/datacoord/import_job.go | 10 ++-- internal/datacoord/import_meta.go | 4 +- internal/datacoord/import_meta_test.go | 6 +-- internal/datacoord/import_scheduler.go | 10 ++-- internal/datacoord/import_scheduler_test.go | 4 +- internal/datacoord/import_task.go | 10 ++-- internal/datacoord/import_util.go | 14 +++--- internal/datacoord/import_util_test.go | 16 +++---- .../datacoord/index_engine_version_manager.go | 4 +- internal/datacoord/index_meta.go | 24 +++++----- internal/datacoord/index_meta_test.go | 8 ++-- internal/datacoord/index_service.go | 24 +++++----- internal/datacoord/index_service_test.go | 10 ++-- internal/datacoord/job_manager.go | 10 ++-- internal/datacoord/job_manager_test.go | 4 +- internal/datacoord/meta.go | 32 ++++++------- internal/datacoord/meta_test.go | 20 ++++---- internal/datacoord/meta_util.go | 2 +- internal/datacoord/metrics_info.go | 20 ++++---- internal/datacoord/metrics_info_test.go | 12 ++--- internal/datacoord/mock_channel_manager.go | 2 +- internal/datacoord/mock_cluster.go | 2 +- internal/datacoord/mock_compaction_meta.go | 2 +- .../datacoord/mock_compaction_plan_context.go | 2 +- internal/datacoord/mock_handler.go | 2 +- internal/datacoord/mock_stats_job_manager.go | 2 +- internal/datacoord/mock_sub_cluster.go | 2 +- internal/datacoord/mock_test.go | 20 ++++---- internal/datacoord/partition_stats_meta.go | 8 ++-- .../datacoord/partition_stats_meta_test.go | 2 +- internal/datacoord/policy.go | 4 +- internal/datacoord/policy_test.go | 4 +- .../datacoord/segment_allocation_policy.go | 8 ++-- .../segment_allocation_policy_test.go | 8 ++-- internal/datacoord/segment_info.go | 6 +-- internal/datacoord/segment_info_test.go | 2 +- internal/datacoord/segment_manager.go | 12 ++--- internal/datacoord/segment_manager_test.go | 14 +++--- internal/datacoord/segment_operator.go | 2 +- internal/datacoord/segment_operator_test.go | 2 +- internal/datacoord/server.go | 24 +++++----- internal/datacoord/server_test.go | 24 +++++----- internal/datacoord/services.go | 26 +++++------ internal/datacoord/services_test.go | 16 +++---- .../datacoord/session/datanode_manager.go | 20 ++++---- .../session/datanode_manager_test.go | 10 ++-- .../datacoord/session/indexnode_manager.go | 14 +++--- .../session/indexnode_manager_test.go | 10 ++-- .../session/mock_data_node_manager.go | 4 +- internal/datacoord/session/session.go | 2 +- internal/datacoord/stats_task_meta.go | 12 ++--- internal/datacoord/stats_task_meta_test.go | 6 +-- internal/datacoord/sync_segments_scheduler.go | 8 ++-- .../datacoord/sync_segments_scheduler_test.go | 4 +- internal/datacoord/task_analyze.go | 10 ++-- internal/datacoord/task_index.go | 16 +++---- internal/datacoord/task_scheduler.go | 10 ++-- internal/datacoord/task_scheduler_test.go | 12 ++--- internal/datacoord/task_stats.go | 10 ++-- internal/datacoord/task_stats_test.go | 8 ++-- internal/datacoord/types.go | 2 +- internal/datacoord/util.go | 20 ++++---- internal/datacoord/util_test.go | 8 ++-- internal/datanode/allocator/allocator.go | 2 +- internal/datanode/allocator/allocator_test.go | 4 +- internal/datanode/channel/channel_manager.go | 12 ++--- .../datanode/channel/channel_manager_test.go | 14 +++--- .../datanode/channel/mock_channel_manager.go | 2 +- .../compaction/clustering_compactor.go | 30 ++++++------ .../compaction/clustering_compactor_test.go | 12 ++--- internal/datanode/compaction/compactor.go | 4 +- .../datanode/compaction/compactor_common.go | 8 ++-- .../compaction/compactor_common_test.go | 2 +- internal/datanode/compaction/executor.go | 12 ++--- internal/datanode/compaction/executor_test.go | 6 +-- internal/datanode/compaction/l0_compactor.go | 18 ++++---- .../datanode/compaction/l0_compactor_test.go | 12 ++--- internal/datanode/compaction/load_stats.go | 6 +-- internal/datanode/compaction/merge_sort.go | 12 ++--- internal/datanode/compaction/mix_compactor.go | 16 +++---- .../datanode/compaction/mix_compactor_test.go | 12 ++--- .../datanode/compaction/mock_compactor.go | 2 +- .../datanode/compaction/segment_writer.go | 12 ++--- .../compaction/segment_writer_bench_test.go | 6 +-- .../compaction/segment_writer_test.go | 4 +- internal/datanode/data_node.go | 20 ++++---- internal/datanode/data_node_test.go | 14 +++--- internal/datanode/importv2/hash.go | 4 +- internal/datanode/importv2/pool.go | 8 ++-- internal/datanode/importv2/pool_test.go | 4 +- internal/datanode/importv2/scheduler.go | 8 ++-- internal/datanode/importv2/scheduler_test.go | 10 ++-- internal/datanode/importv2/task.go | 4 +- internal/datanode/importv2/task_import.go | 14 +++--- internal/datanode/importv2/task_l0_import.go | 12 ++--- .../datanode/importv2/task_l0_import_test.go | 10 ++-- .../datanode/importv2/task_l0_preimport.go | 14 +++--- internal/datanode/importv2/task_manager.go | 2 +- .../datanode/importv2/task_manager_test.go | 2 +- internal/datanode/importv2/task_preimport.go | 14 +++--- internal/datanode/importv2/util.go | 12 ++--- internal/datanode/importv2/util_test.go | 4 +- .../datanode/iterators/deltalog_iterator.go | 2 +- internal/datanode/iterators/iterator.go | 2 +- internal/datanode/metrics_info.go | 12 ++--- .../msghandlerimpl/msg_handler_impl.go | 14 +++--- .../msghandlerimpl/msg_handler_impl_test.go | 2 +- internal/datanode/services.go | 24 +++++----- internal/datanode/services_test.go | 16 +++---- internal/datanode/util/cache.go | 2 +- internal/datanode/util/cache_test.go | 4 +- internal/datanode/util/meta_util.go | 4 +- internal/distributed/connection_manager.go | 16 +++---- .../distributed/connection_manager_test.go | 16 +++---- .../distributed/datacoord/client/client.go | 20 ++++---- .../datacoord/client/client_test.go | 14 +++--- internal/distributed/datacoord/service.go | 26 +++++------ .../distributed/datacoord/service_test.go | 12 ++--- .../distributed/datanode/client/client.go | 14 +++--- .../datanode/client/client_test.go | 4 +- internal/distributed/datanode/service.go | 22 ++++----- internal/distributed/datanode/service_test.go | 10 ++-- .../distributed/indexnode/client/client.go | 14 +++--- .../indexnode/client/client_test.go | 12 ++--- internal/distributed/indexnode/service.go | 20 ++++---- .../distributed/indexnode/service_test.go | 10 ++-- internal/distributed/proxy/client/client.go | 14 +++--- .../distributed/proxy/client/client_test.go | 8 ++-- .../distributed/proxy/httpserver/constant.go | 2 +- .../proxy/httpserver/handler_v1.go | 12 ++--- .../proxy/httpserver/handler_v1_test.go | 8 ++-- .../proxy/httpserver/handler_v2.go | 18 ++++---- .../proxy/httpserver/handler_v2_test.go | 8 ++-- .../proxy/httpserver/request_v2.go | 2 +- .../httpserver/resource_group_handler_v2.go | 2 +- .../resource_group_handler_v2_test.go | 4 +- .../proxy/httpserver/timeout_middleware.go | 2 +- .../distributed/proxy/httpserver/utils.go | 18 ++++---- .../utils_bench_serialize_vectors_test.go | 4 +- .../proxy/httpserver/utils_test.go | 4 +- .../proxy/httpserver/wrap_request.go | 2 +- .../distributed/proxy/listener_manager.go | 6 +-- internal/distributed/proxy/service.go | 24 +++++----- internal/distributed/proxy/service_test.go | 10 ++-- .../distributed/querycoord/client/client.go | 14 +++--- .../querycoord/client/client_test.go | 8 ++-- internal/distributed/querycoord/service.go | 24 +++++----- .../distributed/querycoord/service_test.go | 10 ++-- .../distributed/querynode/client/client.go | 14 +++--- .../querynode/client/client_test.go | 4 +- internal/distributed/querynode/service.go | 22 ++++----- .../distributed/querynode/service_test.go | 8 ++-- .../distributed/rootcoord/client/client.go | 16 +++---- .../rootcoord/client/client_test.go | 8 ++-- internal/distributed/rootcoord/service.go | 26 +++++------ .../distributed/rootcoord/service_test.go | 10 ++-- internal/distributed/streaming/append.go | 6 +-- internal/distributed/streaming/broadcast.go | 6 +-- .../streaming/internal/consumer/consumer.go | 4 +- .../internal/consumer/consumer_impl.go | 8 ++-- .../internal/consumer/consumer_test.go | 8 ++-- .../streaming/internal/consumer/handler.go | 2 +- .../internal/consumer/message_handler.go | 2 +- .../streaming/internal/consumer/metrics.go | 4 +- .../streaming/internal/producer/metrics.go | 4 +- .../streaming/internal/producer/producer.go | 10 ++-- .../internal/producer/producer_resuming.go | 2 +- .../internal/producer/producer_test.go | 6 +-- internal/distributed/streaming/streaming.go | 6 +-- .../distributed/streaming/streaming_test.go | 12 ++--- internal/distributed/streaming/txn.go | 4 +- internal/distributed/streaming/util.go | 4 +- internal/distributed/streaming/wal.go | 10 ++-- internal/distributed/streaming/wal_test.go | 10 ++-- internal/distributed/streamingnode/service.go | 28 +++++------ internal/distributed/utils/util.go | 4 +- internal/distributed/utils/util_test.go | 2 +- internal/flushcommon/broker/broker.go | 6 +-- internal/flushcommon/broker/datacoord.go | 16 +++---- internal/flushcommon/broker/datacoord_test.go | 10 ++-- internal/flushcommon/broker/mock_broker.go | 4 +- internal/flushcommon/io/binlog_io.go | 8 ++-- internal/flushcommon/io/binlog_io_test.go | 2 +- internal/flushcommon/io/io_pool.go | 10 ++-- internal/flushcommon/io/io_pool_test.go | 8 ++-- internal/flushcommon/io/mock_binlogio.go | 2 +- internal/flushcommon/metacache/actions.go | 6 +-- .../flushcommon/metacache/bm25_stats_test.go | 2 +- internal/flushcommon/metacache/meta_cache.go | 4 +- .../flushcommon/metacache/meta_cache_test.go | 6 +-- .../flushcommon/metacache/mock_meta_cache.go | 2 +- .../metacache/pkoracle/bloom_filter_set.go | 2 +- .../pkoracle/bloom_filter_set_test.go | 2 +- .../metacache/pkoracle/lazy_pk_stats.go | 2 +- internal/flushcommon/metacache/segment.go | 2 +- .../flushcommon/metacache/segment_test.go | 2 +- .../flushcommon/pipeline/data_sync_service.go | 18 ++++---- .../pipeline/data_sync_service_test.go | 14 +++--- .../pipeline/flow_graph_dd_node.go | 16 +++---- .../pipeline/flow_graph_dd_node_test.go | 12 ++--- .../flow_graph_dmstream_input_node.go | 22 ++++----- .../flow_graph_dmstream_input_node_test.go | 6 +-- .../pipeline/flow_graph_embedding_node.go | 4 +- .../flow_graph_embedding_node_test.go | 4 +- .../pipeline/flow_graph_manager.go | 12 ++--- .../pipeline/flow_graph_manager_test.go | 16 +++---- .../pipeline/flow_graph_message.go | 4 +- .../pipeline/flow_graph_message_test.go | 2 +- .../flushcommon/pipeline/flow_graph_node.go | 2 +- .../pipeline/flow_graph_time_tick_node.go | 6 +-- .../pipeline/flow_graph_write_node.go | 6 +-- .../flushcommon/pipeline/testutils_test.go | 16 +++---- .../syncmgr/key_lock_dispatcher.go | 4 +- internal/flushcommon/syncmgr/meta_writer.go | 10 ++-- .../flushcommon/syncmgr/meta_writer_test.go | 6 +-- .../flushcommon/syncmgr/mock_pack_writer.go | 2 +- .../flushcommon/syncmgr/mock_sync_manager.go | 2 +- internal/flushcommon/syncmgr/options.go | 2 +- internal/flushcommon/syncmgr/pack_writer.go | 10 ++-- .../flushcommon/syncmgr/pack_writer_test.go | 6 +-- internal/flushcommon/syncmgr/serializer.go | 4 +- .../flushcommon/syncmgr/storage_serializer.go | 6 +-- .../syncmgr/storage_serializer_test.go | 8 ++-- internal/flushcommon/syncmgr/sync_manager.go | 10 ++-- .../flushcommon/syncmgr/sync_manager_test.go | 10 ++-- internal/flushcommon/syncmgr/task.go | 20 ++++---- internal/flushcommon/syncmgr/task_test.go | 12 ++--- .../flushcommon/util/checkpoint_updater.go | 6 +-- .../util/checkpoint_updater_test.go | 2 +- internal/flushcommon/util/msg_handler.go | 4 +- internal/flushcommon/util/rate_collector.go | 8 ++-- .../flushcommon/util/rate_collector_test.go | 2 +- internal/flushcommon/util/timetick_sender.go | 10 ++-- .../flushcommon/util/timetick_sender_test.go | 4 +- internal/flushcommon/util/util.go | 6 +-- .../flushcommon/writebuffer/delta_buffer.go | 4 +- .../writebuffer/delta_buffer_test.go | 4 +- .../flushcommon/writebuffer/insert_buffer.go | 6 +-- .../writebuffer/insert_buffer_test.go | 8 ++-- .../writebuffer/l0_write_buffer.go | 16 +++---- .../writebuffer/l0_write_buffer_test.go | 12 ++--- internal/flushcommon/writebuffer/manager.go | 14 +++--- .../flushcommon/writebuffer/manager_test.go | 10 ++-- .../flushcommon/writebuffer/mock_manager.go | 2 +- .../writebuffer/mock_write_buffer.go | 2 +- internal/flushcommon/writebuffer/options.go | 2 +- .../flushcommon/writebuffer/segment_buffer.go | 2 +- .../flushcommon/writebuffer/sync_policy.go | 4 +- .../writebuffer/sync_policy_test.go | 6 +-- .../flushcommon/writebuffer/write_buffer.go | 16 +++---- .../writebuffer/write_buffer_test.go | 8 ++-- internal/http/healthz/healthz_handler.go | 2 +- internal/http/server.go | 8 ++-- internal/http/server_test.go | 6 +-- internal/indexnode/chunk_mgr_factory.go | 4 +- internal/indexnode/chunkmgr_mock.go | 10 ++-- internal/indexnode/index_test.go | 6 +-- internal/indexnode/indexnode.go | 20 ++++---- .../indexnode/indexnode_component_mock.go | 2 +- internal/indexnode/indexnode_service.go | 18 ++++---- internal/indexnode/indexnode_service_test.go | 10 ++-- internal/indexnode/indexnode_test.go | 10 ++-- internal/indexnode/metrics_info.go | 12 ++--- internal/indexnode/metrics_info_test.go | 2 +- internal/indexnode/task.go | 2 +- internal/indexnode/task_analyze.go | 14 +++--- internal/indexnode/task_index.go | 22 ++++----- internal/indexnode/task_scheduler.go | 10 ++-- internal/indexnode/task_scheduler_test.go | 4 +- internal/indexnode/task_stats.go | 22 ++++----- internal/indexnode/task_stats_test.go | 12 ++--- internal/indexnode/task_test.go | 16 +++---- internal/indexnode/taskinfo_ops.go | 8 ++-- internal/indexnode/taskinfo_ops_test.go | 4 +- internal/kv/etcd/embed_etcd_config_test.go | 4 +- internal/kv/etcd/embed_etcd_kv.go | 10 ++-- internal/kv/etcd/embed_etcd_kv_test.go | 10 ++-- internal/kv/etcd/embed_etcd_restart_test.go | 4 +- internal/kv/etcd/etcd_kv.go | 12 ++--- internal/kv/etcd/etcd_kv_test.go | 8 ++-- internal/kv/etcd/metakv_factory.go | 8 ++-- internal/kv/etcd/util.go | 4 +- internal/kv/etcd/util_test.go | 2 +- internal/kv/mem/mem_kv.go | 6 +-- internal/kv/mem/mem_kv_test.go | 4 +- internal/kv/mock_snapshot_kv.go | 4 +- internal/kv/mock_snapshot_kv_test.go | 2 +- internal/kv/mocks/meta_kv.go | 2 +- internal/kv/mocks/txn_kv.go | 2 +- internal/kv/mocks/watch_kv.go | 2 +- internal/kv/tikv/main_test.go | 2 +- internal/kv/tikv/txn_tikv.go | 14 +++--- internal/kv/tikv/txn_tikv_test.go | 2 +- internal/metastore/catalog.go | 10 ++-- internal/metastore/kv/binlog/binlog.go | 10 ++-- internal/metastore/kv/binlog/binlog_test.go | 8 ++-- internal/metastore/kv/datacoord/kv_catalog.go | 20 ++++---- .../metastore/kv/datacoord/kv_catalog_test.go | 10 ++-- internal/metastore/kv/datacoord/util.go | 8 ++-- .../metastore/kv/querycoord/kv_catalog.go | 12 ++--- .../kv/querycoord/kv_catalog_test.go | 8 ++-- internal/metastore/kv/rootcoord/kv_catalog.go | 26 +++++------ .../metastore/kv/rootcoord/kv_catalog_test.go | 20 ++++---- .../kv/rootcoord/rootcoord_constant.go | 2 +- .../metastore/kv/rootcoord/suffix_snapshot.go | 20 ++++---- .../kv/rootcoord/suffix_snapshot_test.go | 8 ++-- .../metastore/kv/streamingcoord/kv_catalog.go | 8 ++-- .../kv/streamingcoord/kv_catalog_test.go | 4 +- .../metastore/kv/streamingnode/kv_catalog.go | 10 ++-- .../kv/streamingnode/kv_catalog_test.go | 4 +- .../metastore/mocks/mock_datacoord_catalog.go | 4 +- .../mocks/mock_querycoord_catalog.go | 2 +- internal/metastore/model/alias.go | 2 +- internal/metastore/model/alias_test.go | 2 +- internal/metastore/model/collection.go | 4 +- internal/metastore/model/collection_test.go | 4 +- internal/metastore/model/credential.go | 2 +- internal/metastore/model/credential_test.go | 2 +- internal/metastore/model/database.go | 6 +-- internal/metastore/model/database_test.go | 2 +- internal/metastore/model/field.go | 2 +- internal/metastore/model/index.go | 2 +- internal/metastore/model/index_test.go | 2 +- internal/metastore/model/load_info.go | 2 +- internal/metastore/model/partition.go | 4 +- internal/metastore/model/segment_index.go | 4 +- .../metastore/model/segment_index_test.go | 2 +- .../mock_streaming/mock_Broadcast.go | 4 +- .../mock_streaming/mock_WALAccesser.go | 4 +- .../flushcommon/mock_util/mock_MsgHandler.go | 2 +- internal/mocks/mock_datacoord.go | 6 +-- internal/mocks/mock_datacoord_client.go | 6 +-- internal/mocks/mock_datanode.go | 4 +- internal/mocks/mock_datanode_client.go | 4 +- internal/mocks/mock_indexnode.go | 4 +- internal/mocks/mock_indexnode_client.go | 4 +- .../mock_StreamingCoordCataLog.go | 2 +- .../mock_StreamingNodeCataLog.go | 2 +- internal/mocks/mock_proxy.go | 4 +- internal/mocks/mock_proxy_client.go | 4 +- internal/mocks/mock_querycoord.go | 4 +- internal/mocks/mock_querycoord_client.go | 4 +- internal/mocks/mock_querynode.go | 4 +- internal/mocks/mock_querynode_client.go | 4 +- internal/mocks/mock_rootcoord.go | 38 +++++++++++++-- internal/mocks/mock_rootcoord_client.go | 6 +-- .../client/mock_broadcast/mock_Watcher.go | 2 +- .../mock_client/mock_BroadcastService.go | 6 +-- .../server/mock_balancer/mock_Balancer.go | 4 +- .../mock_broadcaster/mock_AppendOperator.go | 2 +- .../server/mock_broadcaster/mock_Watcher.go | 2 +- .../handler/mock_assignment/mock_Watcher.go | 2 +- .../handler/mock_producer/mock_Producer.go | 4 +- .../client/mock_manager/mock_ManagerClient.go | 2 +- .../server/mock_wal/mock_Scanner.go | 4 +- .../streamingnode/server/mock_wal/mock_WAL.go | 4 +- .../server/mock_walmanager/mock_Manager.go | 2 +- .../mock_inspector/mock_SealOperator.go | 2 +- .../mock_TimeTickSyncOperator.go | 2 +- .../wal/mock_interceptors/mock_Interceptor.go | 2 +- .../mock_InterceptorWithReady.go | 2 +- internal/mocks/util/mock_segcore/mock_data.go | 32 ++++++------- .../parser/planparserv2/check_identical.go | 4 +- .../planparserv2/check_identical_test.go | 4 +- .../convert_field_data_to_generic_value.go | 2 +- ...onvert_field_data_to_generic_value_test.go | 2 +- .../planparserv2/fill_expression_value.go | 4 +- .../fill_expression_value_test.go | 2 +- .../planparserv2/logical_expr_visitor.go | 2 +- internal/parser/planparserv2/node_ret.go | 2 +- internal/parser/planparserv2/operators.go | 2 +- .../parser/planparserv2/parser_visitor.go | 4 +- internal/parser/planparserv2/pattern_match.go | 2 +- .../parser/planparserv2/pattern_match_test.go | 2 +- .../parser/planparserv2/plan_parser_v2.go | 8 ++-- .../planparserv2/plan_parser_v2_test.go | 6 +-- internal/parser/planparserv2/pool.go | 2 +- internal/parser/planparserv2/show_visitor.go | 4 +- internal/parser/planparserv2/utils.go | 4 +- internal/parser/planparserv2/utils_test.go | 2 +- internal/proxy/accesslog/benchmark_test.go | 6 +-- internal/proxy/accesslog/formater_test.go | 10 ++-- internal/proxy/accesslog/formatter.go | 2 +- internal/proxy/accesslog/global.go | 6 +-- internal/proxy/accesslog/global_test.go | 4 +- internal/proxy/accesslog/info/grpc_info.go | 4 +- .../proxy/accesslog/info/grpc_info_test.go | 8 ++-- internal/proxy/accesslog/info/restful_info.go | 2 +- .../proxy/accesslog/info/restful_info_test.go | 4 +- internal/proxy/accesslog/info/util.go | 4 +- internal/proxy/accesslog/minio_handler.go | 6 +-- .../proxy/accesslog/minio_handler_test.go | 2 +- internal/proxy/accesslog/writer.go | 4 +- internal/proxy/accesslog/writer_test.go | 2 +- internal/proxy/authentication_interceptor.go | 10 ++-- .../proxy/authentication_interceptor_test.go | 6 +-- internal/proxy/cgo_util.go | 6 +-- internal/proxy/channels_mgr.go | 12 ++--- internal/proxy/channels_mgr_test.go | 4 +- internal/proxy/channels_time_ticker.go | 4 +- internal/proxy/channels_time_ticker_test.go | 6 +-- internal/proxy/condition_test.go | 2 +- internal/proxy/connection/manager.go | 6 +-- internal/proxy/connection/manager_test.go | 2 +- internal/proxy/connection/util.go | 4 +- internal/proxy/count_reducer.go | 4 +- internal/proxy/count_reducer_test.go | 2 +- internal/proxy/data_coord_mock_test.go | 14 +++--- internal/proxy/database_interceptor_test.go | 2 +- internal/proxy/default_limit_reducer.go | 8 ++-- internal/proxy/dummyreq_test.go | 2 +- internal/proxy/hook_interceptor.go | 6 +-- internal/proxy/http_req_impl.go | 14 +++--- internal/proxy/http_req_impl_test.go | 6 +-- internal/proxy/impl.go | 46 +++++++++---------- internal/proxy/impl_test.go | 30 ++++++------ internal/proxy/interface_def.go | 2 +- internal/proxy/lb_balancer.go | 2 +- internal/proxy/lb_policy.go | 10 ++-- internal/proxy/lb_policy_test.go | 12 ++--- internal/proxy/look_aside_balancer.go | 10 ++-- internal/proxy/look_aside_balancer_test.go | 4 +- internal/proxy/management.go | 8 ++-- internal/proxy/management_test.go | 6 +-- internal/proxy/meta_cache.go | 30 ++++++------ internal/proxy/meta_cache_adapter.go | 2 +- internal/proxy/meta_cache_test.go | 18 ++++---- internal/proxy/meta_cache_testonly.go | 6 +-- internal/proxy/metrics_info.go | 16 +++---- internal/proxy/metrics_info_test.go | 10 ++-- internal/proxy/mock_cache.go | 4 +- internal/proxy/mock_channels_manager.go | 2 +- internal/proxy/mock_lb_balancer.go | 2 +- internal/proxy/mock_lb_policy.go | 2 +- internal/proxy/mock_msgstream_test.go | 2 +- internal/proxy/mock_test.go | 16 +++---- internal/proxy/mock_tso_test.go | 2 +- internal/proxy/msg_pack.go | 14 +++--- internal/proxy/msg_pack_test.go | 10 ++-- internal/proxy/privilege_cache.go | 2 +- internal/proxy/privilege_interceptor.go | 10 ++-- internal/proxy/privilege_interceptor_test.go | 10 ++-- internal/proxy/proxy.go | 26 +++++------ internal/proxy/proxy_rpc_test.go | 14 +++--- internal/proxy/proxy_test.go | 38 +++++++-------- internal/proxy/rate_limit_interceptor.go | 14 +++--- internal/proxy/rate_limit_interceptor_test.go | 6 +-- internal/proxy/reScorer.go | 8 ++-- internal/proxy/reducer.go | 4 +- internal/proxy/reducer_test.go | 2 +- internal/proxy/repack_func.go | 2 +- internal/proxy/repack_func_test.go | 2 +- internal/proxy/replicate_stream_manager.go | 8 ++-- .../proxy/replicate_stream_manager_test.go | 6 +-- internal/proxy/rootcoord_mock_test.go | 18 ++++---- internal/proxy/roundrobin_balancer.go | 4 +- internal/proxy/roundrobin_balancer_test.go | 2 +- internal/proxy/search_reduce_util.go | 12 ++--- internal/proxy/search_util.go | 10 ++-- internal/proxy/segment.go | 10 ++-- internal/proxy/segment_test.go | 4 +- internal/proxy/shard_client.go | 6 +-- internal/proxy/shard_client_test.go | 4 +- internal/proxy/simple_rate_limiter.go | 18 ++++---- internal/proxy/simple_rate_limiter_test.go | 10 ++-- internal/proxy/task.go | 22 ++++----- internal/proxy/task_alias.go | 6 +-- internal/proxy/task_alias_test.go | 6 +-- internal/proxy/task_database.go | 14 +++--- internal/proxy/task_database_test.go | 12 ++--- internal/proxy/task_delete.go | 24 +++++----- internal/proxy/task_delete_streaming.go | 10 ++-- internal/proxy/task_delete_test.go | 18 ++++---- internal/proxy/task_flush.go | 10 ++-- internal/proxy/task_flush_streaming.go | 12 ++--- internal/proxy/task_import.go | 14 +++--- internal/proxy/task_index.go | 22 ++++----- internal/proxy/task_index_test.go | 16 +++---- internal/proxy/task_insert.go | 16 +++---- internal/proxy/task_insert_streaming.go | 12 ++--- internal/proxy/task_insert_test.go | 10 ++-- internal/proxy/task_policies.go | 4 +- internal/proxy/task_query.go | 26 +++++------ internal/proxy/task_query_test.go | 18 ++++---- internal/proxy/task_scheduler.go | 16 +++---- internal/proxy/task_scheduler_test.go | 6 +-- internal/proxy/task_search.go | 26 +++++------ internal/proxy/task_search_test.go | 20 ++++---- internal/proxy/task_statistic.go | 22 ++++----- internal/proxy/task_statistic_test.go | 12 ++--- internal/proxy/task_test.go | 30 ++++++------ internal/proxy/task_upsert.go | 18 ++++---- internal/proxy/task_upsert_streaming.go | 10 ++-- internal/proxy/task_upsert_test.go | 10 ++-- internal/proxy/timestamp.go | 10 ++-- internal/proxy/timestamp_test.go | 2 +- internal/proxy/trace_log_interceptor.go | 4 +- internal/proxy/trace_log_interceptor_test.go | 4 +- internal/proxy/util.go | 30 ++++++------ internal/proxy/util_test.go | 24 +++++----- internal/proxy/validate_util.go | 14 +++--- internal/proxy/validate_util_test.go | 10 ++-- internal/querycoordv2/.mockery.yaml | 2 +- internal/querycoordv2/api_testonly.go | 2 +- internal/querycoordv2/balance/balance.go | 2 +- internal/querycoordv2/balance/balance_test.go | 6 +-- .../balance/channel_level_score_balancer.go | 6 +-- .../channel_level_score_balancer_test.go | 12 ++--- .../balance/multi_target_balance.go | 6 +-- .../balance/multi_target_balancer_test.go | 6 +-- .../balance/rowcount_based_balancer.go | 4 +- .../balance/rowcount_based_balancer_test.go | 14 +++--- .../balance/score_based_balancer.go | 4 +- .../balance/score_based_balancer_test.go | 12 ++--- .../streaming_query_node_channel_helper.go | 2 +- ...treaming_query_node_channel_helper_test.go | 6 +-- internal/querycoordv2/balance/utils.go | 4 +- .../querycoordv2/checkers/balance_checker.go | 10 ++-- .../checkers/balance_checker_test.go | 10 ++-- .../querycoordv2/checkers/channel_checker.go | 6 +-- .../checkers/channel_checker_test.go | 8 ++-- internal/querycoordv2/checkers/controller.go | 2 +- .../checkers/controller_base_test.go | 6 +-- .../querycoordv2/checkers/controller_test.go | 8 ++-- .../querycoordv2/checkers/index_checker.go | 10 ++-- .../checkers/index_checker_test.go | 12 ++--- .../querycoordv2/checkers/leader_checker.go | 6 +-- .../checkers/leader_checker_test.go | 10 ++-- .../querycoordv2/checkers/segment_checker.go | 10 ++-- .../checkers/segment_checker_test.go | 10 ++-- internal/querycoordv2/dist/dist_controller.go | 2 +- .../querycoordv2/dist/dist_controller_test.go | 12 ++--- internal/querycoordv2/dist/dist_handler.go | 16 +++---- .../querycoordv2/dist/dist_handler_test.go | 8 ++-- internal/querycoordv2/handlers.go | 16 +++---- internal/querycoordv2/handlers_test.go | 4 +- internal/querycoordv2/job/job_load.go | 16 +++---- internal/querycoordv2/job/job_release.go | 8 ++-- internal/querycoordv2/job/job_sync.go | 4 +- internal/querycoordv2/job/job_test.go | 14 +++--- internal/querycoordv2/job/job_update.go | 6 +-- internal/querycoordv2/job/scheduler.go | 4 +- internal/querycoordv2/job/undo.go | 2 +- internal/querycoordv2/job/utils.go | 4 +- .../querycoordv2/meta/channel_dist_manager.go | 6 +-- .../meta/channel_dist_manager_test.go | 8 ++-- .../querycoordv2/meta/collection_manager.go | 16 +++---- .../meta/collection_manager_test.go | 14 +++--- .../querycoordv2/meta/coordinator_broker.go | 22 ++++----- .../meta/coordinator_broker_test.go | 14 +++--- internal/querycoordv2/meta/dist_manager.go | 4 +- .../querycoordv2/meta/dist_manager_test.go | 6 +-- .../querycoordv2/meta/failed_load_cache.go | 4 +- .../meta/failed_load_cache_test.go | 2 +- .../querycoordv2/meta/leader_view_manager.go | 6 +-- .../meta/leader_view_manager_test.go | 8 ++-- internal/querycoordv2/meta/mock_broker.go | 8 ++-- .../querycoordv2/meta/mock_target_manager.go | 4 +- internal/querycoordv2/meta/replica.go | 6 +-- internal/querycoordv2/meta/replica_manager.go | 16 +++---- .../meta/replica_manager_helper.go | 2 +- .../meta/replica_manager_helper_test.go | 4 +- .../querycoordv2/meta/replica_manager_test.go | 12 ++--- internal/querycoordv2/meta/replica_test.go | 4 +- internal/querycoordv2/meta/resource_group.go | 4 +- .../querycoordv2/meta/resource_group_test.go | 4 +- .../querycoordv2/meta/resource_manager.go | 16 +++---- .../meta/resource_manager_test.go | 14 +++--- .../querycoordv2/meta/segment_dist_manager.go | 10 ++-- .../meta/segment_dist_manager_test.go | 6 +-- internal/querycoordv2/meta/target.go | 12 ++--- internal/querycoordv2/meta/target_manager.go | 22 ++++----- .../querycoordv2/meta/target_manager_test.go | 14 +++--- internal/querycoordv2/mocks/mock_querynode.go | 4 +- internal/querycoordv2/mocks/querynode.go | 8 ++-- .../observers/collection_observer.go | 14 +++--- .../observers/collection_observer_test.go | 14 +++--- .../observers/leader_cache_observer.go | 8 ++-- .../observers/leader_cache_observer_test.go | 6 +-- .../observers/replica_observer.go | 6 +-- .../observers/replica_observer_test.go | 10 ++-- .../observers/resource_observer.go | 4 +- .../observers/resource_observer_test.go | 6 +-- .../querycoordv2/observers/target_observer.go | 14 +++--- .../observers/target_observer_test.go | 14 +++--- .../querycoordv2/observers/task_dispatcher.go | 6 +-- .../observers/task_dispatcher_test.go | 4 +- internal/querycoordv2/ops_service_test.go | 16 +++---- internal/querycoordv2/ops_services.go | 8 ++-- internal/querycoordv2/params/params.go | 2 +- internal/querycoordv2/server.go | 28 +++++------ internal/querycoordv2/server_test.go | 20 ++++---- internal/querycoordv2/services.go | 18 ++++---- internal/querycoordv2/services_test.go | 18 ++++---- internal/querycoordv2/session/cluster.go | 6 +-- internal/querycoordv2/session/cluster_test.go | 6 +-- internal/querycoordv2/session/mock_cluster.go | 2 +- internal/querycoordv2/session/node_manager.go | 2 +- internal/querycoordv2/task/action.go | 4 +- internal/querycoordv2/task/executor.go | 18 ++++---- internal/querycoordv2/task/scheduler.go | 20 ++++---- internal/querycoordv2/task/task.go | 8 ++-- internal/querycoordv2/task/task_test.go | 24 +++++----- internal/querycoordv2/task/utils.go | 12 ++--- internal/querycoordv2/task/utils_test.go | 4 +- internal/querycoordv2/utils/checker.go | 2 +- internal/querycoordv2/utils/meta.go | 6 +-- internal/querycoordv2/utils/meta_test.go | 8 ++-- internal/querycoordv2/utils/test.go | 6 +-- internal/querycoordv2/utils/types.go | 10 ++-- internal/querycoordv2/utils/types_test.go | 4 +- internal/querycoordv2/utils/util.go | 10 ++-- internal/querycoordv2/utils/util_test.go | 4 +- internal/querynodev2/cluster/manager.go | 6 +-- internal/querynodev2/cluster/mock_worker.go | 4 +- internal/querynodev2/cluster/worker.go | 10 ++-- internal/querynodev2/cluster/worker_test.go | 6 +-- internal/querynodev2/collector/average.go | 2 +- internal/querynodev2/collector/collector.go | 6 +-- internal/querynodev2/delegator/delegator.go | 32 ++++++------- .../querynodev2/delegator/delegator_data.go | 42 ++++++++--------- .../delegator/delegator_data_test.go | 28 +++++------ .../querynodev2/delegator/delegator_test.go | 18 ++++---- .../deletebuffer/list_delete_buffer.go | 2 +- .../delegator/deletebuffer/skiplist_buffer.go | 2 +- .../querynodev2/delegator/delta_forward.go | 22 ++++----- .../delegator/delta_forward_test.go | 18 ++++---- .../querynodev2/delegator/distribution.go | 8 ++-- .../querynodev2/delegator/exclude_info.go | 2 +- internal/querynodev2/delegator/idf_oracle.go | 4 +- .../querynodev2/delegator/idf_oracle_test.go | 2 +- .../querynodev2/delegator/mock_delegator.go | 4 +- .../querynodev2/delegator/scalar_pruner.go | 2 +- .../querynodev2/delegator/segment_pruner.go | 22 ++++----- .../delegator/segment_pruner_test.go | 6 +-- internal/querynodev2/delegator/snapshot.go | 4 +- internal/querynodev2/delegator/types.go | 4 +- internal/querynodev2/delegator/util.go | 8 ++-- internal/querynodev2/handlers.go | 18 ++++---- internal/querynodev2/handlers_test.go | 8 ++-- internal/querynodev2/local_worker.go | 6 +-- internal/querynodev2/local_worker_test.go | 10 ++-- internal/querynodev2/metrics_info.go | 14 +++--- internal/querynodev2/metrics_info_test.go | 12 ++--- internal/querynodev2/mock_data.go | 6 +-- internal/querynodev2/pipeline/delete_node.go | 6 +-- .../querynodev2/pipeline/delete_node_test.go | 2 +- .../querynodev2/pipeline/embedding_node.go | 8 ++-- .../pipeline/embedding_node_test.go | 6 +-- internal/querynodev2/pipeline/filter_node.go | 12 ++--- .../querynodev2/pipeline/filter_node_test.go | 6 +-- .../querynodev2/pipeline/filter_policy.go | 2 +- internal/querynodev2/pipeline/insert_node.go | 8 ++-- .../querynodev2/pipeline/insert_node_test.go | 4 +- internal/querynodev2/pipeline/manager.go | 18 ++++---- internal/querynodev2/pipeline/manager_test.go | 10 ++-- internal/querynodev2/pipeline/message.go | 6 +-- internal/querynodev2/pipeline/mock_data.go | 6 +-- internal/querynodev2/pipeline/pipeline.go | 8 ++-- .../querynodev2/pipeline/pipeline_test.go | 10 ++-- internal/querynodev2/pipeline/type.go | 6 +-- .../querynodev2/pkoracle/bloom_filter_set.go | 6 +-- .../pkoracle/bloom_filter_set_test.go | 2 +- internal/querynodev2/pkoracle/candidate.go | 4 +- internal/querynodev2/pkoracle/pk_oracle.go | 2 +- .../querynodev2/pkoracle/pk_oracle_test.go | 2 +- internal/querynodev2/segments/cgo_util.go | 4 +- internal/querynodev2/segments/collection.go | 14 +++--- .../querynodev2/segments/count_reducer.go | 4 +- .../segments/count_reducer_test.go | 4 +- .../segments/default_limit_reducer.go | 6 +-- .../segments/disk_usage_fetcher.go | 6 +-- .../querynodev2/segments/index_attr_cache.go | 12 ++--- .../segments/index_attr_cache_test.go | 10 ++-- .../segments/load_field_data_info.go | 2 +- .../querynodev2/segments/load_index_info.go | 6 +-- internal/querynodev2/segments/manager.go | 22 ++++----- internal/querynodev2/segments/manager_test.go | 8 ++-- .../segments/metricsutil/observer.go | 6 +-- .../segments/metricsutil/record.go | 2 +- .../segments/metricsutil/record_test.go | 2 +- .../segments/mock_collection_manager.go | 4 +- internal/querynodev2/segments/mock_loader.go | 6 +-- internal/querynodev2/segments/mock_segment.go | 8 ++-- .../segments/mock_segment_manager.go | 2 +- internal/querynodev2/segments/pool.go | 10 ++-- internal/querynodev2/segments/pool_test.go | 8 ++-- internal/querynodev2/segments/reducer.go | 12 ++--- internal/querynodev2/segments/reducer_test.go | 4 +- internal/querynodev2/segments/result.go | 16 +++---- .../querynodev2/segments/result_sorter.go | 4 +- internal/querynodev2/segments/result_test.go | 12 ++--- internal/querynodev2/segments/retrieve.go | 18 ++++---- .../querynodev2/segments/retrieve_test.go | 10 ++-- internal/querynodev2/segments/search.go | 8 ++-- .../querynodev2/segments/search_reduce.go | 8 ++-- .../segments/search_reduce_test.go | 2 +- internal/querynodev2/segments/search_test.go | 6 +-- internal/querynodev2/segments/segment.go | 32 ++++++------- internal/querynodev2/segments/segment_do.go | 4 +- .../querynodev2/segments/segment_filter.go | 6 +-- .../querynodev2/segments/segment_interface.go | 10 ++-- internal/querynodev2/segments/segment_l0.go | 12 ++--- .../querynodev2/segments/segment_loader.go | 32 ++++++------- .../segments/segment_loader_test.go | 16 +++---- internal/querynodev2/segments/segment_test.go | 8 ++-- .../segments/state/load_state_lock.go | 4 +- .../segments/state/load_state_lock_test.go | 2 +- internal/querynodev2/segments/utils.go | 20 ++++---- internal/querynodev2/segments/utils_test.go | 8 ++-- internal/querynodev2/segments/validate.go | 4 +- internal/querynodev2/server.go | 24 +++++----- internal/querynodev2/server_test.go | 8 ++-- internal/querynodev2/services.go | 34 +++++++------- internal/querynodev2/services_test.go | 30 ++++++------ .../querynodev2/tasks/query_stream_task.go | 4 +- internal/querynodev2/tasks/query_task.go | 16 +++---- internal/querynodev2/tasks/search_task.go | 18 ++++---- .../querynodev2/tasks/search_task_test.go | 2 +- internal/registry/in_mem_resolver.go | 2 +- internal/rootcoord/alter_collection_task.go | 10 ++-- .../rootcoord/alter_collection_task_test.go | 4 +- internal/rootcoord/alter_database_task.go | 14 +++--- .../rootcoord/alter_database_task_test.go | 8 ++-- internal/rootcoord/broadcast_task.go | 12 ++--- internal/rootcoord/broker.go | 14 +++--- internal/rootcoord/broker_test.go | 8 ++-- internal/rootcoord/constrant.go | 2 +- internal/rootcoord/constrant_test.go | 4 +- internal/rootcoord/create_collection_task.go | 22 ++++----- .../rootcoord/create_collection_task_test.go | 12 ++--- internal/rootcoord/create_db_task.go | 4 +- internal/rootcoord/create_db_task_test.go | 4 +- internal/rootcoord/create_partition_task.go | 4 +- .../rootcoord/create_partition_task_test.go | 4 +- .../describe_collection_task_test.go | 2 +- internal/rootcoord/describe_db_task.go | 6 +-- internal/rootcoord/describe_db_task_test.go | 4 +- internal/rootcoord/dml_channels.go | 12 ++--- internal/rootcoord/dml_channels_test.go | 8 ++-- internal/rootcoord/drop_alias_task_test.go | 2 +- internal/rootcoord/drop_collection_task.go | 8 ++-- .../rootcoord/drop_collection_task_test.go | 4 +- internal/rootcoord/drop_db_task.go | 2 +- internal/rootcoord/drop_db_task_test.go | 2 +- internal/rootcoord/drop_partition_task.go | 6 +-- .../rootcoord/drop_partition_task_test.go | 2 +- internal/rootcoord/expire_cache.go | 6 +-- internal/rootcoord/expire_cache_test.go | 2 +- internal/rootcoord/field_id.go | 2 +- internal/rootcoord/garbage_collector.go | 6 +-- internal/rootcoord/garbage_collector_test.go | 6 +-- internal/rootcoord/has_collection_task.go | 2 +- internal/rootcoord/has_partition_task.go | 4 +- internal/rootcoord/has_partition_task_test.go | 2 +- internal/rootcoord/list_db_task.go | 10 ++-- internal/rootcoord/list_db_task_test.go | 6 +-- internal/rootcoord/meta_table.go | 24 +++++----- internal/rootcoord/meta_table_test.go | 14 +++--- internal/rootcoord/metrics_info.go | 10 ++-- internal/rootcoord/mock_test.go | 26 +++++------ internal/rootcoord/mocks/meta_table.go | 6 +-- internal/rootcoord/name_db.go | 4 +- internal/rootcoord/quota_center.go | 24 +++++----- internal/rootcoord/quota_center_test.go | 20 ++++---- internal/rootcoord/rbac_task.go | 12 ++--- internal/rootcoord/redo.go | 2 +- internal/rootcoord/root_coord.go | 40 ++++++++-------- internal/rootcoord/root_coord_test.go | 26 +++++------ internal/rootcoord/scheduler.go | 6 +-- internal/rootcoord/scheduler_test.go | 4 +- internal/rootcoord/show_collection_task.go | 12 ++--- .../rootcoord/show_collection_task_test.go | 6 +-- internal/rootcoord/show_partition_task.go | 6 +-- .../rootcoord/show_partition_task_test.go | 4 +- internal/rootcoord/step.go | 8 ++-- internal/rootcoord/step_executor.go | 4 +- internal/rootcoord/step_executor_test.go | 2 +- internal/rootcoord/task.go | 4 +- internal/rootcoord/task_test.go | 2 +- internal/rootcoord/timestamp_bench_test.go | 10 ++-- internal/rootcoord/timeticksync.go | 16 +++---- internal/rootcoord/timeticksync_test.go | 6 +-- internal/rootcoord/undo.go | 2 +- internal/rootcoord/util.go | 14 +++--- internal/rootcoord/util_test.go | 6 +-- internal/storage/aliyun/aliyun.go | 2 +- internal/storage/azure_object_storage.go | 4 +- internal/storage/binlog_iterator.go | 2 +- internal/storage/binlog_iterator_test.go | 6 +-- internal/storage/binlog_reader.go | 2 +- internal/storage/binlog_test.go | 10 ++-- internal/storage/binlog_util.go | 2 +- internal/storage/binlog_writer.go | 2 +- internal/storage/data_codec.go | 10 ++-- internal/storage/data_codec_test.go | 8 ++-- internal/storage/data_sorter.go | 2 +- internal/storage/data_sorter_test.go | 4 +- internal/storage/delta_data.go | 2 +- internal/storage/event_data.go | 6 +-- internal/storage/event_header.go | 6 +-- internal/storage/event_test.go | 8 ++-- internal/storage/event_writer.go | 2 +- internal/storage/event_writer_test.go | 2 +- internal/storage/factory.go | 2 +- internal/storage/field_stats.go | 8 ++-- internal/storage/field_stats_test.go | 6 +-- internal/storage/field_value.go | 6 +-- internal/storage/gcp_native_object_storage.go | 6 +-- internal/storage/index_data_codec.go | 4 +- internal/storage/index_data_codec_test.go | 6 +-- internal/storage/insert_data.go | 6 +-- internal/storage/insert_data_test.go | 6 +-- internal/storage/local_chunk_manager.go | 4 +- internal/storage/minio_object_storage.go | 6 +-- internal/storage/payload_reader.go | 6 +-- internal/storage/payload_test.go | 4 +- internal/storage/payload_writer.go | 6 +-- internal/storage/pk_statistics.go | 2 +- internal/storage/primary_key.go | 4 +- internal/storage/primary_keys.go | 2 +- internal/storage/print_binlog.go | 2 +- internal/storage/print_binlog_test.go | 10 ++-- internal/storage/remote_chunk_manager.go | 10 ++-- internal/storage/remote_chunk_manager_test.go | 2 +- internal/storage/rw.go | 4 +- internal/storage/schema.go | 2 +- internal/storage/serde.go | 2 +- internal/storage/serde_events.go | 16 +++---- internal/storage/serde_events_test.go | 4 +- internal/storage/serde_events_v2.go | 4 +- internal/storage/serde_events_v2_test.go | 2 +- internal/storage/serde_test.go | 2 +- internal/storage/sort.go | 2 +- internal/storage/sort_test.go | 2 +- internal/storage/stats.go | 10 ++-- internal/storage/stats_test.go | 6 +-- internal/storage/storage_test.go | 2 +- internal/storage/utils.go | 14 +++--- internal/storage/utils_test.go | 8 ++-- internal/storagev2/packed/packed_test.go | 2 +- internal/storagev2/packed/util.go | 2 +- .../client/assignment/assignment_impl.go | 10 ++-- .../client/assignment/assignment_test.go | 8 ++-- .../client/assignment/discoverer.go | 8 ++-- .../client/assignment/watcher.go | 6 +-- .../client/broadcast/broadcast_impl.go | 12 ++--- .../client/broadcast/broadcast_test.go | 6 +-- .../client/broadcast/grpc_watcher.go | 10 ++-- .../client/broadcast/grpc_watcher_test.go | 10 ++-- .../client/broadcast/watcher.go | 2 +- .../client/broadcast/watcher_resuming.go | 8 ++-- .../client/broadcast/watcher_resuming_test.go | 6 +-- internal/streamingcoord/client/client.go | 14 +++--- internal/streamingcoord/client/client_test.go | 4 +- .../server/balancer/balancer.go | 4 +- .../server/balancer/balancer_impl.go | 12 ++--- .../server/balancer/balancer_test.go | 10 ++-- .../server/balancer/channel/manager.go | 10 ++-- .../server/balancer/channel/manager_test.go | 6 +-- .../server/balancer/channel/metrics.go | 8 ++-- .../server/balancer/channel/pchannel.go | 4 +- .../server/balancer/channel/pchannel_test.go | 4 +- .../balancer/policy/pchannel_count_fair.go | 2 +- .../policy/pchannel_count_fair_test.go | 2 +- .../server/balancer/policy_registry.go | 4 +- .../streamingcoord/server/balancer/request.go | 4 +- .../server/broadcaster/broadcast_manager.go | 8 ++-- .../server/broadcaster/broadcast_task.go | 8 ++-- .../server/broadcaster/broadcaster.go | 4 +- .../server/broadcaster/broadcaster_impl.go | 16 +++---- .../server/broadcaster/broadcaster_test.go | 16 +++---- .../broadcaster/registry/append_operator.go | 6 +-- .../broadcaster/registry/test_utility.go | 2 +- .../streamingcoord/server/broadcaster/task.go | 8 ++-- .../server/broadcaster/watcher.go | 6 +-- internal/streamingcoord/server/builder.go | 6 +-- .../server/resource/resource.go | 6 +-- .../server/resource/test_utility.go | 2 +- internal/streamingcoord/server/server.go | 8 ++-- .../server/service/assignment.go | 8 ++-- .../server/service/broadcast.go | 8 ++-- .../broadcast_watch_grpc_server_helper.go | 4 +- .../broadcast/broadcast_watch_server.go | 4 +- .../service/broadcast/broadcast_watch_test.go | 8 ++-- .../discover/discover_grpc_server_helper.go | 6 +-- .../service/discover/discover_server.go | 6 +-- .../service/discover/discover_server_test.go | 8 ++-- .../streamingcoord/server/service_test.go | 6 +-- .../client/handler/assignment/watcher.go | 2 +- .../client/handler/assignment/watcher_impl.go | 6 +-- .../client/handler/assignment/watcher_test.go | 4 +- .../client/handler/consumer/consumer_impl.go | 12 ++--- .../client/handler/consumer/consumer_test.go | 18 ++++---- .../client/handler/handler_client.go | 16 +++---- .../client/handler/handler_client_impl.go | 10 ++-- .../client/handler/handler_client_test.go | 16 +++---- .../handler/producer/produce_grpc_client.go | 6 +-- .../client/handler/producer/producer.go | 4 +- .../client/handler/producer/producer_impl.go | 10 ++-- .../client/handler/producer/producer_test.go | 12 ++--- .../client/handler/registry/wal_manager.go | 12 ++--- .../handler/registry/wal_manager_test.go | 8 ++-- .../client/manager/manager_client.go | 12 ++--- .../client/manager/manager_client_impl.go | 8 ++-- .../client/manager/manager_test.go | 12 ++--- internal/streamingnode/server/builder.go | 4 +- .../flusherimpl/data_service_wrapper.go | 6 +-- .../flusher/flusherimpl/flusher_components.go | 14 +++--- .../flusher/flusherimpl/msg_handler_impl.go | 14 +++--- .../flusherimpl/msg_handler_impl_test.go | 4 +- .../flusherimpl/pchannel_checkpoint.go | 10 ++-- .../flusherimpl/pchannel_checkpoint_test.go | 8 ++-- .../server/flusher/flusherimpl/pool.go | 2 +- .../server/flusher/flusherimpl/util.go | 16 +++---- .../flusherimpl/vchannel_checkpoint.go | 2 +- .../flusherimpl/vchannel_checkpoint_test.go | 4 +- .../server/flusher/flusherimpl/wal_flusher.go | 12 ++--- .../flusher/flusherimpl/wal_flusher_test.go | 20 ++++---- .../streamingnode/server/resource/resource.go | 6 +-- .../server/resource/resource_test.go | 4 +- .../server/resource/test_utility.go | 4 +- internal/streamingnode/server/server.go | 10 ++-- .../streamingnode/server/service/handler.go | 2 +- .../consumer/consume_grpc_server_helper.go | 2 +- .../handler/consumer/consume_server.go | 10 ++-- .../handler/consumer/consume_server_test.go | 16 +++---- .../service/handler/consumer/metrics.go | 4 +- .../service/handler/producer/metrics.go | 6 +-- .../producer/produce_grpc_server_helper.go | 2 +- .../handler/producer/produce_server.go | 8 ++-- .../handler/producer/produce_server_test.go | 16 +++---- .../streamingnode/server/service/manager.go | 4 +- .../server/wal/adaptor/builder.go | 2 +- .../server/wal/adaptor/old_version_message.go | 8 ++-- .../wal/adaptor/old_version_message_test.go | 8 ++-- .../server/wal/adaptor/opener.go | 6 +-- .../server/wal/adaptor/opener_test.go | 12 ++--- .../server/wal/adaptor/scanner_adaptor.go | 14 +++--- .../wal/adaptor/scanner_adaptor_test.go | 6 +-- .../server/wal/adaptor/scanner_registry.go | 4 +- .../server/wal/adaptor/scanner_switchable.go | 10 ++-- .../server/wal/adaptor/wal_adaptor.go | 14 +++--- .../server/wal/adaptor/wal_adaptor_test.go | 12 ++--- .../server/wal/adaptor/wal_test.go | 16 +++---- internal/streamingnode/server/wal/builder.go | 2 +- .../wal/interceptors/chain_interceptor.go | 2 +- .../interceptors/chain_interceptor_test.go | 2 +- .../flusher/flusher_interceptor.go | 2 +- .../server/wal/interceptors/interceptor.go | 6 +-- .../wal/interceptors/redo/redo_interceptor.go | 2 +- .../wal/interceptors/segment/builder.go | 4 +- .../interceptors/segment/inspector/impls.go | 8 ++-- .../segment/inspector/inspector.go | 2 +- .../segment/inspector/inspector_test.go | 4 +- .../segment/manager/partition_manager.go | 16 +++---- .../segment/manager/partition_managers.go | 12 ++--- .../segment/manager/pchannel_manager.go | 14 +++--- .../segment/manager/pchannel_manager_test.go | 18 ++++---- .../segment/manager/seal_queue.go | 8 ++-- .../segment/manager/segment_manager.go | 6 +-- .../policy/segment_limitation_policy.go | 2 +- .../segment/policy/segment_seal_policy.go | 2 +- .../segment/segment_assign_interceptor.go | 10 ++-- .../segment/stats/signal_notifier.go | 4 +- .../wal/interceptors/segment/stats/stats.go | 2 +- .../wal/interceptors/timetick/ack/ack.go | 4 +- .../interceptors/timetick/ack/ack_details.go | 2 +- .../timetick/ack/ack_details_test.go | 2 +- .../wal/interceptors/timetick/ack/ack_test.go | 12 ++--- .../wal/interceptors/timetick/ack/detail.go | 2 +- .../interceptors/timetick/ack/detail_test.go | 4 +- .../timetick/ack/last_confirmed.go | 4 +- .../wal/interceptors/timetick/ack/manager.go | 4 +- .../interceptors/timetick/inspector/impls.go | 10 ++-- .../timetick/inspector/inspector.go | 2 +- .../timetick/inspector/inspector_test.go | 4 +- .../timetick/inspector/notifier.go | 6 +-- .../timetick/inspector/notifier_test.go | 2 +- .../timetick/mvcc/mvcc_manager.go | 2 +- .../timetick/mvcc/mvcc_manager_test.go | 4 +- .../timetick/timetick_interceptor.go | 4 +- .../interceptors/timetick/timetick_message.go | 4 +- .../timetick/timetick_sync_operator.go | 10 ++-- .../timetick/timetick_sync_operator_test.go | 12 ++--- .../server/wal/interceptors/txn/session.go | 4 +- .../wal/interceptors/txn/session_test.go | 10 ++-- .../wal/interceptors/txn/txn_manager.go | 10 ++-- .../wal/interceptors/wab/pending_queue.go | 2 +- .../interceptors/wab/pending_queue_test.go | 4 +- .../server/wal/interceptors/wab/reader.go | 2 +- .../interceptors/wab/write_ahead_buffer.go | 6 +-- .../wab/write_ahead_buffer_test.go | 8 ++-- .../server/wal/metricsutil/segment.go | 6 +-- .../server/wal/metricsutil/timetick.go | 8 ++-- .../server/wal/metricsutil/txn.go | 8 ++-- .../server/wal/metricsutil/wal_scan.go | 8 ++-- .../server/wal/metricsutil/wal_write.go | 8 ++-- .../server/wal/registry/registry.go | 2 +- internal/streamingnode/server/wal/scanner.go | 6 +-- .../server/wal/utility/context.go | 2 +- .../server/wal/utility/context_test.go | 4 +- .../server/wal/utility/message_heap.go | 4 +- .../server/wal/utility/message_heap_test.go | 6 +-- .../server/wal/utility/pending_queue.go | 4 +- .../server/wal/utility/pending_queue_test.go | 4 +- .../server/wal/utility/reorder_buffer.go | 4 +- .../server/wal/utility/reorder_buffer_test.go | 4 +- .../server/wal/utility/txn_buffer.go | 4 +- .../server/wal/utility/txn_buffer_test.go | 12 ++--- .../vchantempstore/vchannel_temp_storage.go | 10 ++-- .../vchannel_temp_storage_test.go | 4 +- internal/streamingnode/server/wal/wal.go | 4 +- .../server/walmanager/manager.go | 2 +- .../server/walmanager/manager_impl.go | 6 +-- .../server/walmanager/manager_impl_test.go | 8 ++-- .../server/walmanager/wal_lifetime.go | 4 +- .../server/walmanager/wal_lifetime_test.go | 6 +-- .../server/walmanager/wal_state.go | 4 +- .../server/walmanager/wal_state_pair_test.go | 4 +- .../server/walmanager/wal_state_test.go | 2 +- internal/tso/global_allocator.go | 8 ++-- internal/tso/global_allocator_test.go | 4 +- internal/tso/tso.go | 8 ++-- internal/types/types.go | 14 +++--- internal/util/analyzecgowrapper/analyze.go | 4 +- internal/util/analyzecgowrapper/helper.go | 4 +- .../util/bloomfilter/bloom_filter_test.go | 2 +- internal/util/cgo/errors.go | 2 +- internal/util/cgo/executor.go | 6 +-- internal/util/cgo/futures.go | 2 +- internal/util/cgo/futures_test.go | 4 +- internal/util/cgo/manager_active.go | 4 +- internal/util/cgo/pool.go | 6 +-- internal/util/cgoconverter/bytes_converter.go | 2 +- .../util/cgoconverter/bytes_converter_test.go | 2 +- internal/util/clustering/clustering.go | 8 ++-- .../util/componentutil/component_service.go | 4 +- internal/util/componentutil/componentutil.go | 6 +-- .../util/componentutil/componentutil_test.go | 4 +- internal/util/ctokenizer/helper.go | 4 +- .../util/ctokenizer/text_schema_validator.go | 2 +- internal/util/dependency/factory.go | 10 ++-- internal/util/dependency/factory_test.go | 2 +- .../util/dependency/kv/kv_client_handler.go | 4 +- internal/util/dependency/mock_factory.go | 4 +- internal/util/exprutil/expr_checker.go | 2 +- internal/util/exprutil/expr_checker_test.go | 8 ++-- internal/util/flowgraph/flow_graph_test.go | 2 +- internal/util/flowgraph/input_node.go | 12 ++--- internal/util/flowgraph/input_node_test.go | 10 ++-- internal/util/flowgraph/message.go | 2 +- internal/util/flowgraph/message_test.go | 2 +- internal/util/flowgraph/node.go | 4 +- internal/util/flowgraph/node_test.go | 4 +- internal/util/flowgraph/type_def.go | 2 +- .../util/function/ali_embedding_provider.go | 2 +- .../function/bedrock_embedding_provider.go | 2 +- internal/util/function/bm25_function.go | 2 +- .../function/cohere_embedding_provider.go | 2 +- internal/util/function/function_executor.go | 6 +-- .../util/function/function_executor_test.go | 6 +-- .../function/openai_embedding_provider.go | 2 +- .../util/function/text_embedding_function.go | 2 +- .../function/text_embedding_function_test.go | 2 +- .../function/vertexai_embedding_provider.go | 2 +- .../function/voyageai_embedding_provider.go | 2 +- internal/util/funcutil/count_util.go | 4 +- internal/util/funcutil/count_util_test.go | 4 +- internal/util/grpcclient/auth.go | 2 +- internal/util/grpcclient/client.go | 22 ++++----- internal/util/grpcclient/client_test.go | 8 ++-- .../util/grpcclient/local_grpc_client_test.go | 2 +- internal/util/hookutil/hook.go | 6 +-- internal/util/hookutil/hook_test.go | 2 +- internal/util/idalloc/allocator.go | 2 +- internal/util/idalloc/allocator_test.go | 6 +-- internal/util/idalloc/basic_allocator.go | 8 ++-- internal/util/idalloc/basic_allocator_test.go | 6 +-- .../idalloc/test_mock_root_coord_client.go | 6 +-- internal/util/importutilv2/binlog/filter.go | 4 +- .../util/importutilv2/binlog/l0_reader.go | 6 +-- .../importutilv2/binlog/l0_reader_test.go | 2 +- internal/util/importutilv2/binlog/reader.go | 4 +- .../util/importutilv2/binlog/reader_test.go | 6 +-- internal/util/importutilv2/binlog/util.go | 4 +- internal/util/importutilv2/common/util.go | 2 +- .../util/importutilv2/common/util_test.go | 2 +- internal/util/importutilv2/csv/reader.go | 4 +- internal/util/importutilv2/csv/reader_test.go | 4 +- internal/util/importutilv2/csv/row_parser.go | 6 +-- .../util/importutilv2/csv/row_parser_test.go | 2 +- internal/util/importutilv2/json/reader.go | 2 +- .../util/importutilv2/json/reader_test.go | 4 +- internal/util/importutilv2/json/row_parser.go | 6 +-- .../util/importutilv2/json/row_parser_test.go | 2 +- .../util/importutilv2/numpy/field_reader.go | 6 +-- internal/util/importutilv2/numpy/reader.go | 2 +- .../util/importutilv2/numpy/reader_test.go | 6 +-- internal/util/importutilv2/numpy/util.go | 2 +- internal/util/importutilv2/option.go | 6 +-- internal/util/importutilv2/option_test.go | 2 +- .../util/importutilv2/parquet/field_reader.go | 6 +-- internal/util/importutilv2/parquet/reader.go | 4 +- .../util/importutilv2/parquet/reader_test.go | 6 +-- internal/util/importutilv2/parquet/util.go | 4 +- internal/util/importutilv2/reader.go | 4 +- internal/util/importutilv2/util.go | 4 +- .../util/indexcgowrapper/build_index_info.go | 4 +- .../util/indexcgowrapper/codec_index_test.go | 10 ++-- internal/util/indexcgowrapper/helper.go | 4 +- internal/util/indexcgowrapper/index.go | 6 +-- internal/util/indexcgowrapper/index_test.go | 4 +- .../util/indexparamcheck/base_checker_test.go | 4 +- .../indexparamcheck/bin_flat_checker_test.go | 4 +- .../bin_ivf_flat_checker_test.go | 4 +- .../indexparamcheck/bitmap_index_checker.go | 2 +- .../indexparamcheck/cagra_checker_test.go | 4 +- internal/util/indexparamcheck/constraints.go | 4 +- .../indexparamcheck/diskann_checker_test.go | 4 +- .../util/indexparamcheck/flat_checker_test.go | 4 +- .../util/indexparamcheck/hnsw_checker_test.go | 4 +- .../indexparamcheck/hybrid_index_checker.go | 4 +- .../indexparamcheck/index_checker_test.go | 2 +- internal/util/indexparamcheck/index_type.go | 2 +- .../util/indexparamcheck/index_type_test.go | 2 +- .../util/indexparamcheck/inverted_checker.go | 6 +-- .../indexparamcheck/ivf_base_checker_test.go | 4 +- .../indexparamcheck/ivf_pq_checker_test.go | 4 +- .../indexparamcheck/ivf_sq_checker_test.go | 4 +- .../raft_brute_force_checker_test.go | 6 +-- .../raft_ivf_flat_checker_test.go | 6 +-- .../raft_ivf_pq_checker_test.go | 6 +-- .../indexparamcheck/scann_checker_test.go | 4 +- .../sparse_float_vector_base_checker_test.go | 2 +- .../util/indexparamcheck/stl_sort_checker.go | 2 +- internal/util/indexparamcheck/trie_checker.go | 2 +- internal/util/indexparamcheck/utils.go | 6 +-- internal/util/indexparamcheck/utils_test.go | 8 ++-- .../indexparamcheck/vector_index_checker.go | 8 ++-- internal/util/initcore/init_core.go | 4 +- internal/util/initcore/init_core_test.go | 2 +- internal/util/metrics/c_registry.go | 2 +- internal/util/metrics/thread.go | 4 +- internal/util/metrics/utils.go | 4 +- internal/util/mock/grpc_datanode_client.go | 4 +- internal/util/mock/grpc_querycoord_client.go | 4 +- internal/util/mock/grpc_querynode_client.go | 4 +- internal/util/mock/grpc_rootcoord_client.go | 12 ++--- internal/util/mock/grpcclient.go | 10 ++-- internal/util/nullutil/nullutil.go | 2 +- internal/util/pipeline/node.go | 2 +- internal/util/pipeline/pipeline.go | 4 +- internal/util/pipeline/pipeline_test.go | 2 +- internal/util/pipeline/stream_pipeline.go | 22 ++++----- .../util/pipeline/stream_pipeline_test.go | 6 +-- .../proxyutil/mock_proxy_client_manager.go | 4 +- .../util/proxyutil/proxy_client_manager.go | 14 +++--- .../proxyutil/proxy_client_manager_test.go | 6 +-- internal/util/proxyutil/proxy_watcher.go | 8 ++-- internal/util/proxyutil/proxy_watcher_test.go | 6 +-- internal/util/quota/quota_constant.go | 10 ++-- internal/util/quota/quota_constant_test.go | 4 +- .../util/ratelimitutil/rate_limiter_tree.go | 10 ++-- .../ratelimitutil/rate_limiter_tree_test.go | 10 ++-- .../util/searchutil/optimizers/query_hook.go | 14 +++--- .../searchutil/optimizers/query_hook_test.go | 12 ++--- .../scheduler/concurrent_safe_scheduler.go | 12 ++--- .../concurrent_safe_scheduler_test.go | 6 +-- .../util/searchutil/scheduler/fifo_policy.go | 2 +- .../searchutil/scheduler/mock_task_test.go | 4 +- .../util/searchutil/scheduler/policy_test.go | 2 +- internal/util/searchutil/scheduler/tasks.go | 2 +- .../scheduler/user_task_polling_policy.go | 4 +- internal/util/segcore/cgo_util.go | 2 +- internal/util/segcore/cgo_util_test.go | 2 +- internal/util/segcore/collection.go | 2 +- internal/util/segcore/collection_test.go | 2 +- internal/util/segcore/plan.go | 8 ++-- internal/util/segcore/plan_test.go | 8 ++-- internal/util/segcore/reduce_test.go | 16 +++---- internal/util/segcore/requests.go | 6 +-- internal/util/segcore/requests_test.go | 2 +- internal/util/segcore/responses.go | 2 +- internal/util/segcore/segment.go | 2 +- internal/util/segcore/segment_test.go | 8 ++-- internal/util/segmentutil/utils.go | 4 +- internal/util/sessionutil/session_util.go | 8 ++-- .../util/sessionutil/session_util_test.go | 12 ++--- .../service/attributes/attributes.go | 2 +- .../service/attributes/attributes_test.go | 2 +- .../balancer/picker/server_id_builder.go | 2 +- .../balancer/picker/server_id_picker.go | 2 +- .../balancer/picker/server_id_picker_test.go | 4 +- .../service/contextutil/create_consumer.go | 2 +- .../contextutil/create_consumer_test.go | 2 +- .../service/contextutil/create_producer.go | 2 +- .../contextutil/create_producer_test.go | 2 +- .../channel_assignment_discoverer.go | 6 +-- .../channel_assignment_discoverer_test.go | 6 +-- .../service/discoverer/discoverer.go | 2 +- .../service/discoverer/session_discoverer.go | 4 +- .../discoverer/session_discoverer_test.go | 4 +- .../service/interceptor/client.go | 2 +- .../service/interceptor/server.go | 2 +- .../streamingutil/service/lazygrpc/conn.go | 4 +- .../streamingutil/service/resolver/builder.go | 4 +- .../service/resolver/builder_test.go | 2 +- .../resolver/resolver_with_discoverer.go | 6 +-- .../resolver/resolver_with_discoverer_test.go | 4 +- .../resolver/watch_based_grpc_resolver.go | 4 +- .../watch_based_grpc_resolver_test.go | 4 +- .../status/client_stream_wrapper_test.go | 2 +- .../util/streamingutil/status/rpc_error.go | 2 +- .../streamingutil/status/rpc_error_test.go | 2 +- .../streamingutil/status/streaming_error.go | 4 +- .../status/streaming_error_test.go | 2 +- internal/util/streamingutil/util/topic.go | 4 +- .../util/streamingutil/util/topic_test.go | 2 +- .../util/streamingutil/util/wal_selector.go | 4 +- internal/util/streamrpc/in_memory_streamer.go | 4 +- internal/util/streamrpc/streamer.go | 4 +- internal/util/streamrpc/streamer_test.go | 2 +- internal/util/testutil/test_util.go | 8 ++-- internal/util/tsoutil/tso.go | 2 +- internal/util/typeutil/hash.go | 4 +- internal/util/typeutil/result_helper.go | 2 +- internal/util/typeutil/result_helper_test.go | 8 ++-- internal/util/typeutil/retrieve_result.go | 6 +-- internal/util/typeutil/storage.go | 8 ++-- internal/util/vecindexmgr/vector_index_mgr.go | 2 +- internal/util/wrappers/qn_wrapper.go | 4 +- internal/util/wrappers/qn_wrapper_test.go | 6 +-- pkg/.mockery_pkg.yaml | 12 ++--- pkg/common/common.go | 2 +- pkg/common/mock_testonly.go | 2 +- pkg/config/config.go | 2 +- pkg/config/env_source.go | 2 +- pkg/config/etcd_source.go | 4 +- pkg/config/etcd_source_test.go | 2 +- pkg/config/file_source.go | 2 +- pkg/config/manager.go | 4 +- pkg/config/refresher.go | 2 +- pkg/eventlog/global.go | 4 +- pkg/eventlog/grpc.go | 6 +-- pkg/eventlog/handler.go | 2 +- pkg/go.mod | 2 +- pkg/kv/kv.go | 4 +- pkg/kv/rocksdb/rocks_iterator.go | 2 +- pkg/kv/rocksdb/rocksdb_kv.go | 8 ++-- pkg/kv/rocksdb/rocksdb_kv_test.go | 6 +-- pkg/metrics/datacoord_metrics.go | 2 +- pkg/metrics/datanode_metrics.go | 2 +- pkg/metrics/grpc_stats_handler.go | 2 +- pkg/metrics/indexnode_metrics.go | 2 +- pkg/metrics/proxy_metrics.go | 2 +- pkg/metrics/querycoord_metrics.go | 2 +- pkg/metrics/querynode_metrics.go | 2 +- pkg/metrics/rootcoord_metrics.go | 2 +- pkg/metrics/streaming_service_metrics.go | 2 +- pkg/mocks/mock_kv/mock_MetaKv.go | 2 +- ...k_StreamingCoordAssignmentServiceClient.go | 2 +- ...ignmentService_AssignmentDiscoverClient.go | 2 +- ...ignmentService_AssignmentDiscoverServer.go | 2 +- ...ck_StreamingCoordBroadcastServiceClient.go | 2 +- ...eamingCoordBroadcastService_WatchClient.go | 2 +- ...eamingCoordBroadcastService_WatchServer.go | 2 +- .../mock_StreamingNodeHandlerServiceClient.go | 2 +- ...reamingNodeHandlerService_ConsumeClient.go | 2 +- ...reamingNodeHandlerService_ConsumeServer.go | 2 +- ...reamingNodeHandlerService_ProduceClient.go | 2 +- ...reamingNodeHandlerService_ProduceServer.go | 2 +- .../mock_StreamingNodeManagerServiceClient.go | 2 +- .../mock_walimpls/mock_OpenerBuilderImpls.go | 2 +- .../mock_walimpls/mock_OpenerImpls.go | 2 +- .../mock_walimpls/mock_ScannerImpls.go | 2 +- .../streaming/mock_walimpls/mock_WALImpls.go | 6 +-- .../mock_message/mock_ImmutableMessage.go | 2 +- .../mock_message/mock_ImmutableTxnMessage.go | 2 +- .../util/mock_message/mock_MessageID.go | 2 +- .../util/mock_message/mock_MutableMessage.go | 2 +- .../mock_AssignmentDiscoverWatcher.go | 2 +- .../mock_AssignmentRebalanceTrigger.go | 2 +- pkg/mq/mqimpl/rocksmq/client/client.go | 2 +- pkg/mq/mqimpl/rocksmq/client/client_impl.go | 6 +-- .../mqimpl/rocksmq/client/client_impl_test.go | 8 ++-- pkg/mq/mqimpl/rocksmq/client/consumer.go | 4 +- pkg/mq/mqimpl/rocksmq/client/consumer_impl.go | 4 +- .../rocksmq/client/consumer_impl_test.go | 2 +- pkg/mq/mqimpl/rocksmq/client/producer.go | 2 +- pkg/mq/mqimpl/rocksmq/client/producer_impl.go | 6 +-- pkg/mq/mqimpl/rocksmq/client/rmq_message.go | 6 +-- pkg/mq/mqimpl/rocksmq/client/streaming.go | 6 +-- .../mqimpl/rocksmq/client/streaming_test.go | 4 +- pkg/mq/mqimpl/rocksmq/client/test_helper.go | 6 +-- pkg/mq/mqimpl/rocksmq/server/global_rmq.go | 2 +- pkg/mq/mqimpl/rocksmq/server/rmq_id.go | 4 +- pkg/mq/mqimpl/rocksmq/server/rocksmq_impl.go | 18 ++++---- .../rocksmq/server/rocksmq_impl_test.go | 8 ++-- .../rocksmq/server/rocksmq_retention.go | 8 ++-- .../rocksmq/server/rocksmq_retention_test.go | 4 +- pkg/mq/msgdispatcher/client.go | 16 +++---- pkg/mq/msgdispatcher/client_test.go | 4 +- pkg/mq/msgdispatcher/dispatcher.go | 16 +++---- pkg/mq/msgdispatcher/dispatcher_test.go | 4 +- pkg/mq/msgdispatcher/manager.go | 16 +++---- pkg/mq/msgdispatcher/manager_test.go | 8 ++-- pkg/mq/msgdispatcher/mock_client.go | 2 +- pkg/mq/msgdispatcher/mock_test.go | 8 ++-- pkg/mq/msgdispatcher/target.go | 8 ++-- pkg/mq/msgdispatcher/target_test.go | 6 +-- pkg/mq/msgstream/common_mq_factory.go | 4 +- pkg/mq/msgstream/factory_stream_test.go | 4 +- pkg/mq/msgstream/factory_test.go | 6 +-- pkg/mq/msgstream/mock_msgstream.go | 2 +- pkg/mq/msgstream/mq_factory.go | 20 ++++---- pkg/mq/msgstream/mq_factory_test.go | 2 +- pkg/mq/msgstream/mq_kafka_msgstream_test.go | 6 +-- pkg/mq/msgstream/mq_msgstream.go | 18 ++++---- pkg/mq/msgstream/mq_msgstream_test.go | 16 +++---- pkg/mq/msgstream/mq_rocksmq_msgstream_test.go | 8 ++-- pkg/mq/msgstream/mqwrapper/client.go | 2 +- pkg/mq/msgstream/mqwrapper/consumer.go | 2 +- .../msgstream/mqwrapper/kafka/kafka_client.go | 14 +++--- .../mqwrapper/kafka/kafka_client_test.go | 12 ++--- .../mqwrapper/kafka/kafka_consumer.go | 10 ++-- .../mqwrapper/kafka/kafka_consumer_test.go | 4 +- pkg/mq/msgstream/mqwrapper/kafka/kafka_id.go | 4 +- .../mqwrapper/kafka/kafka_message.go | 2 +- .../mqwrapper/kafka/kafka_producer.go | 12 ++--- .../mqwrapper/kafka/kafka_producer_test.go | 2 +- pkg/mq/msgstream/mqwrapper/nmq/nmq_client.go | 10 ++-- .../mqwrapper/nmq/nmq_client_test.go | 4 +- .../msgstream/mqwrapper/nmq/nmq_consumer.go | 8 ++-- .../mqwrapper/nmq/nmq_consumer_test.go | 4 +- pkg/mq/msgstream/mqwrapper/nmq/nmq_id.go | 4 +- pkg/mq/msgstream/mqwrapper/nmq/nmq_message.go | 2 +- .../msgstream/mqwrapper/nmq/nmq_producer.go | 10 ++-- .../mqwrapper/nmq/nmq_producer_test.go | 2 +- pkg/mq/msgstream/mqwrapper/nmq/nmq_server.go | 4 +- .../mqwrapper/nmq/nmq_server_test.go | 2 +- pkg/mq/msgstream/mqwrapper/producer.go | 2 +- .../mqwrapper/pulsar/pulsar_client.go | 10 ++-- .../mqwrapper/pulsar/pulsar_client_test.go | 12 ++--- .../mqwrapper/pulsar/pulsar_consumer.go | 8 ++-- .../mqwrapper/pulsar/pulsar_consumer_test.go | 4 +- .../msgstream/mqwrapper/pulsar/pulsar_id.go | 2 +- .../mqwrapper/pulsar/pulsar_message.go | 2 +- .../mqwrapper/pulsar/pulsar_producer.go | 8 ++-- .../mqwrapper/pulsar/pulsar_producer_test.go | 2 +- pkg/mq/msgstream/mqwrapper/rmq/rmq_client.go | 14 +++--- .../mqwrapper/rmq/rmq_client_test.go | 10 ++-- .../msgstream/mqwrapper/rmq/rmq_consumer.go | 6 +-- .../msgstream/mqwrapper/rmq/rmq_producer.go | 12 ++--- pkg/mq/msgstream/msg.go | 6 +-- pkg/mq/msgstream/msgstream.go | 8 ++-- pkg/mq/msgstream/msgstream_util.go | 12 ++--- pkg/mq/msgstream/msgstream_util_test.go | 2 +- pkg/mq/msgstream/stream_bench_test.go | 10 ++-- pkg/mq/msgstream/stream_test.go | 8 ++-- pkg/proto/cgo_msg.proto | 2 +- pkg/proto/cgopb/cgo_msg.pb.go | 7 +-- pkg/proto/clustering.proto | 2 +- pkg/proto/clusteringpb/clustering.pb.go | 8 ++-- pkg/proto/data_coord.proto | 2 +- pkg/proto/datapb/data_coord.pb.go | 12 ++--- pkg/proto/datapb/data_coord_grpc.pb.go | 4 +- pkg/proto/etcd_meta.proto | 2 +- pkg/proto/etcdpb/etcd_meta.pb.go | 7 +-- pkg/proto/index_cgo_msg.proto | 2 +- pkg/proto/index_coord.proto | 2 +- pkg/proto/indexcgopb/index_cgo_msg.pb.go | 7 +-- pkg/proto/indexpb/index_coord.pb.go | 9 ++-- pkg/proto/indexpb/index_coord_grpc.pb.go | 2 +- pkg/proto/internal.proto | 2 +- pkg/proto/internalpb/internal.pb.go | 8 ++-- pkg/proto/messages.proto | 2 +- pkg/proto/messagespb/messages.pb.go | 6 +-- pkg/proto/plan.proto | 2 +- pkg/proto/planpb/plan.pb.go | 6 +-- pkg/proto/proxy.proto | 2 +- pkg/proto/proxypb/proxy.pb.go | 10 ++-- pkg/proto/proxypb/proxy_grpc.pb.go | 2 +- pkg/proto/query_coord.proto | 2 +- pkg/proto/querypb/query_coord.pb.go | 13 +++--- pkg/proto/querypb/query_coord_grpc.pb.go | 2 +- pkg/proto/root_coord.proto | 2 +- pkg/proto/rootcoordpb/root_coord.pb.go | 14 +++--- pkg/proto/rootcoordpb/root_coord_grpc.pb.go | 4 +- pkg/proto/segcore.proto | 2 +- pkg/proto/segcorepb/segcore.pb.go | 8 ++-- pkg/proto/storagev2pb/storagev2.pb.go | 7 +-- pkg/proto/streaming.proto | 2 +- pkg/proto/streamingpb/streaming.pb.go | 9 ++-- pkg/proto/worker.proto | 2 +- pkg/proto/workerpb/worker.pb.go | 12 ++--- pkg/proto/workerpb/worker_grpc.pb.go | 2 +- .../util/message/adaptor/broadcast_message.go | 4 +- pkg/streaming/util/message/adaptor/handler.go | 8 ++-- .../util/message/adaptor/handler_test.go | 6 +-- pkg/streaming/util/message/adaptor/message.go | 4 +- .../util/message/adaptor/message_id.go | 16 +++---- .../util/message/adaptor/message_id_test.go | 6 +-- .../util/message/adaptor/message_test.go | 6 +-- .../util/message/adaptor/message_type.go | 2 +- .../util/message/adaptor/ts_msg_newer.go | 4 +- pkg/streaming/util/message/broadcast.go | 4 +- pkg/streaming/util/message/builder.go | 6 +-- .../util/message/message_builder_test.go | 4 +- pkg/streaming/util/message/message_id.go | 2 +- pkg/streaming/util/message/message_id_test.go | 4 +- pkg/streaming/util/message/message_impl.go | 2 +- pkg/streaming/util/message/message_type.go | 2 +- .../util/message/specialized_message.go | 2 +- .../util/message/specialized_message_test.go | 4 +- pkg/streaming/util/message/test_case.go | 2 +- pkg/streaming/util/message/txn.go | 2 +- pkg/streaming/util/message/txn_test.go | 6 +-- pkg/streaming/util/options/deliver.go | 6 +-- pkg/streaming/util/options/deliver_test.go | 6 +-- pkg/streaming/util/types/pchannel_info.go | 2 +- .../util/types/pchannel_info_test.go | 2 +- pkg/streaming/util/types/responses.go | 6 +-- pkg/streaming/util/types/streaming_node.go | 4 +- .../walimpls/helper/scanner_helper.go | 2 +- pkg/streaming/walimpls/helper/wal_helper.go | 6 +-- .../walimpls/helper/wal_helper_test.go | 4 +- pkg/streaming/walimpls/impls/kafka/builder.go | 8 ++-- .../walimpls/impls/kafka/kafka_test.go | 8 ++-- .../walimpls/impls/kafka/message_id.go | 2 +- .../walimpls/impls/kafka/message_id_test.go | 2 +- pkg/streaming/walimpls/impls/kafka/opener.go | 8 ++-- pkg/streaming/walimpls/impls/kafka/scanner.go | 6 +-- pkg/streaming/walimpls/impls/kafka/wal.go | 8 ++-- .../walimpls/impls/pulsar/builder.go | 10 ++-- .../walimpls/impls/pulsar/message_id.go | 2 +- .../walimpls/impls/pulsar/message_id_test.go | 2 +- pkg/streaming/walimpls/impls/pulsar/opener.go | 4 +- .../walimpls/impls/pulsar/pulsar_test.go | 8 ++-- .../walimpls/impls/pulsar/scanner.go | 6 +-- pkg/streaming/walimpls/impls/pulsar/wal.go | 8 ++-- pkg/streaming/walimpls/impls/rmq/builder.go | 10 ++-- .../walimpls/impls/rmq/message_id.go | 2 +- .../walimpls/impls/rmq/message_id_test.go | 2 +- pkg/streaming/walimpls/impls/rmq/opener.go | 6 +-- pkg/streaming/walimpls/impls/rmq/rmq_test.go | 10 ++-- pkg/streaming/walimpls/impls/rmq/scanner.go | 10 ++-- pkg/streaming/walimpls/impls/rmq/wal.go | 12 ++--- .../walimpls/impls/walimplstest/builder.go | 6 +-- .../walimpls/impls/walimplstest/message_id.go | 2 +- .../impls/walimplstest/message_log.go | 6 +-- .../walimpls/impls/walimplstest/opener.go | 4 +- .../walimpls/impls/walimplstest/scanner.go | 6 +-- .../walimpls/impls/walimplstest/wal.go | 8 ++-- .../walimpls/impls/walimplstest/wal_test.go | 2 +- pkg/streaming/walimpls/opener.go | 2 +- pkg/streaming/walimpls/registry/registry.go | 4 +- pkg/streaming/walimpls/registry/wal_test.go | 2 +- pkg/streaming/walimpls/scanner.go | 4 +- pkg/streaming/walimpls/test_framework.go | 6 +-- pkg/streaming/walimpls/wal.go | 4 +- pkg/tracer/tracer.go | 4 +- pkg/tracer/tracer_test.go | 2 +- pkg/tracer/util.go | 2 +- pkg/util/cache/cache.go | 10 ++-- pkg/util/cache/cache_test.go | 4 +- pkg/util/compressor/compressor_test.go | 2 +- pkg/util/conc/options.go | 2 +- pkg/util/conc/pool.go | 6 +-- pkg/util/conc/pool_test.go | 2 +- pkg/util/constant.go | 4 +- pkg/util/contextutil/context_util.go | 4 +- pkg/util/contextutil/context_util_test.go | 4 +- pkg/util/distance/calc_distance_amd64.go | 4 +- pkg/util/etcd/etcd_server.go | 2 +- pkg/util/etcd/etcd_util.go | 6 +-- pkg/util/expr/expr.go | 4 +- pkg/util/expr/expr_test.go | 2 +- pkg/util/funcutil/func.go | 6 +-- pkg/util/funcutil/func_test.go | 4 +- pkg/util/funcutil/parallel.go | 2 +- pkg/util/funcutil/parallel_test.go | 2 +- pkg/util/funcutil/policy.go | 4 +- pkg/util/funcutil/slice.go | 2 +- pkg/util/gc/gc_tuner.go | 4 +- pkg/util/hardware/hardware_info.go | 4 +- pkg/util/hardware/hardware_info_test.go | 2 +- pkg/util/hardware/mem_info.go | 2 +- pkg/util/hardware/mem_info_darwin.go | 2 +- pkg/util/indexparams/index_params.go | 10 ++-- pkg/util/indexparams/index_params_test.go | 6 +-- pkg/util/interceptor/cluster_interceptor.go | 4 +- .../interceptor/cluster_interceptor_test.go | 4 +- pkg/util/interceptor/interceptor_test.go | 2 +- pkg/util/interceptor/server_id_interceptor.go | 2 +- .../interceptor/server_id_interceptor_test.go | 4 +- pkg/util/lifetime/lifetime_test.go | 2 +- pkg/util/lifetime/safe_chan.go | 2 +- pkg/util/lifetime/safe_chan_test.go | 2 +- pkg/util/lifetime/state.go | 4 +- pkg/util/lock/key_lock.go | 2 +- pkg/util/lock/metric_mutex.go | 6 +-- pkg/util/lock/metrics_mutex_test.go | 2 +- pkg/util/logutil/grpc_interceptor.go | 2 +- pkg/util/logutil/grpc_interceptor_test.go | 2 +- pkg/util/logutil/logutil.go | 2 +- pkg/util/logutil/logutil_test.go | 2 +- pkg/util/merr/errors_test.go | 2 +- pkg/util/merr/utils.go | 4 +- pkg/util/metautil/binlog.go | 4 +- pkg/util/metautil/binlog_test.go | 2 +- pkg/util/metautil/channel.go | 4 +- pkg/util/metautil/segment_index.go | 2 +- pkg/util/metricsinfo/metric_request.go | 6 +-- pkg/util/metricsinfo/metric_request_test.go | 2 +- pkg/util/metricsinfo/metrics_info_test.go | 4 +- pkg/util/metricsinfo/quota_metric.go | 2 +- pkg/util/metricsinfo/topology.go | 2 +- pkg/util/metricsinfo/topology_test.go | 4 +- pkg/util/metricsinfo/utils.go | 6 +-- pkg/util/netutil/listener.go | 2 +- pkg/util/parameterutil/get_max_len.go | 6 +-- pkg/util/parameterutil/get_max_len_test.go | 2 +- pkg/util/paramtable/autoindex_param.go | 8 ++-- pkg/util/paramtable/autoindex_param_test.go | 4 +- pkg/util/paramtable/base_table.go | 8 ++-- pkg/util/paramtable/base_table_test.go | 2 +- pkg/util/paramtable/component_param.go | 10 ++-- pkg/util/paramtable/component_param_test.go | 4 +- pkg/util/paramtable/grpc_param.go | 4 +- pkg/util/paramtable/grpc_param_test.go | 2 +- pkg/util/paramtable/hook_config.go | 4 +- pkg/util/paramtable/knowhere_param.go | 2 +- pkg/util/paramtable/param_item.go | 4 +- pkg/util/paramtable/quota_param.go | 2 +- pkg/util/paramtable/rbac_param.go | 2 +- pkg/util/paramtable/role_param.go | 4 +- pkg/util/paramtable/role_param_test.go | 2 +- pkg/util/paramtable/runtime.go | 2 +- pkg/util/paramtable/service_param.go | 8 ++-- pkg/util/paramtable/service_param_test.go | 8 ++-- pkg/util/retry/retry.go | 6 +-- pkg/util/retry/retry_test.go | 2 +- pkg/util/testutils/embed_etcd.go | 2 +- pkg/util/testutils/gen_data.go | 4 +- pkg/util/tikv/tikv_util.go | 2 +- pkg/util/timerecord/group_checker.go | 2 +- pkg/util/timerecord/time_recorder.go | 2 +- pkg/util/tsoutil/tso.go | 2 +- pkg/util/tsoutil/tso_test.go | 2 +- pkg/util/typeutil/convension.go | 4 +- pkg/util/typeutil/conversion_test.go | 2 +- pkg/util/typeutil/field_schema.go | 2 +- pkg/util/typeutil/hash.go | 2 +- pkg/util/typeutil/kv_pair_helper_test.go | 2 +- pkg/util/typeutil/schema.go | 4 +- pkg/util/typeutil/schema_test.go | 4 +- pkg/util/vralloc/alloc.go | 2 +- pkg/util/vralloc/alloc_test.go | 4 +- tests/integration/alias/alias_test.go | 4 +- tests/integration/balance/balance_test.go | 14 +++--- .../balance/channel_exclusive_balance_test.go | 12 ++--- .../bloomfilter/bloom_filter_test.go | 10 ++-- .../channel_balance/channel_balance_test.go | 6 +-- .../clustering_compaction_null_data_test.go | 14 +++--- .../compaction/clustering_compaction_test.go | 14 +++--- .../integration/compaction/compaction_test.go | 2 +- .../compaction/l0_compaction_test.go | 14 +++--- .../compaction/l2_single_compaction_test.go | 14 +++--- .../compaction/mix_compaction_test.go | 14 +++--- .../search_after_coord_down_test.go | 12 ++--- .../coordrecovery/coord_recovery_test.go | 10 ++-- .../cross_cluster_routing_test.go | 14 +++--- tests/integration/datanode/compaction_test.go | 8 ++-- tests/integration/datanode/datanode_test.go | 10 ++-- .../integration/expression/expression_test.go | 10 ++-- .../integration/getvector/get_vector_test.go | 8 ++-- .../hellomilvus/hello_milvus_test.go | 10 ++-- .../integration/httpserver/httpserver_test.go | 6 +-- .../hybridsearch/hybridsearch_test.go | 10 ++-- tests/integration/import/binlog_test.go | 16 +++---- .../integration/import/dynamic_field_test.go | 12 ++--- tests/integration/import/import_test.go | 12 ++--- tests/integration/import/multi_vector_test.go | 12 ++--- .../integration/import/partition_key_test.go | 12 ++--- tests/integration/import/util_test.go | 8 ++-- .../indexstat/get_index_statistics_test.go | 6 +-- tests/integration/insert/insert_test.go | 10 ++-- .../internaltls/internaltls_test.go | 12 ++--- tests/integration/jsonexpr/json_expr_test.go | 10 ++-- .../levelzero/delete_on_growing_test.go | 10 ++-- .../levelzero/delete_partition_key_test.go | 10 ++-- tests/integration/levelzero/levelzero_test.go | 6 +-- .../materialized_view_test.go | 12 ++--- tests/integration/meta_watcher.go | 6 +-- tests/integration/meta_watcher_test.go | 8 ++-- tests/integration/minicluster_v2.go | 8 ++-- tests/integration/null_data/null_data_test.go | 10 ++-- tests/integration/ops/suspend_node_test.go | 6 +-- .../partialsearch/partial_search_test.go | 16 +++---- .../partitionkey/partition_key_test.go | 8 ++-- tests/integration/querynode/querynode_test.go | 10 ++-- .../rangesearch/range_search_test.go | 10 ++-- .../ratelimit/db_properties_test.go | 12 ++--- tests/integration/ratelimit/flush_test.go | 10 ++-- .../integration/rbac/privilege_group_test.go | 6 +-- tests/integration/rbac/rbac_backup_test.go | 8 ++-- tests/integration/rbac/rbac_basic_test.go | 6 +-- .../refreshconfig/refresh_config_test.go | 6 +-- .../replicas/balance/replica_test.go | 10 ++-- tests/integration/replicas/load/load_test.go | 12 ++--- tests/integration/rg/resource_group_test.go | 4 +- .../manual_rolling_upgrade_test.go | 12 ++--- .../seal_by_total_growing_test.go | 12 ++--- .../sealpolicies/seal_policies_test.go | 2 +- tests/integration/sparse/sparse_test.go | 10 ++-- .../integration/stats_task/stats_task_test.go | 14 +++--- .../streaming/hello_streaming_test.go | 12 ++--- tests/integration/suite.go | 6 +-- tests/integration/target/target_test.go | 14 +++--- tests/integration/upsert/upsert_test.go | 10 ++-- tests/integration/util_collection.go | 8 ++-- tests/integration/util_index.go | 2 +- tests/integration/util_insert.go | 2 +- tests/integration/util_query.go | 10 ++-- tests/integration/util_schema.go | 2 +- 1726 files changed, 6092 insertions(+), 6055 deletions(-) diff --git a/cmd/components/data_coord.go b/cmd/components/data_coord.go index 8f291d0daa..c30e1fc4ed 100644 --- a/cmd/components/data_coord.go +++ b/cmd/components/data_coord.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" grpcdatacoordclient "github.com/milvus-io/milvus/internal/distributed/datacoord" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // DataCoord implements grpc server of DataCoord server diff --git a/cmd/components/data_node.go b/cmd/components/data_node.go index f410bbd0b5..af2b56c98c 100644 --- a/cmd/components/data_node.go +++ b/cmd/components/data_node.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" grpcdatanode "github.com/milvus-io/milvus/internal/distributed/datanode" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // DataNode implements DataNode grpc server diff --git a/cmd/components/index_coord.go b/cmd/components/index_coord.go index bcc2c8d458..0531f13d87 100644 --- a/cmd/components/index_coord.go +++ b/cmd/components/index_coord.go @@ -21,8 +21,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // IndexCoord implements IndexCoord grpc server diff --git a/cmd/components/index_node.go b/cmd/components/index_node.go index c0f4e6c45b..41c4fa4abb 100644 --- a/cmd/components/index_node.go +++ b/cmd/components/index_node.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" grpcindexnode "github.com/milvus-io/milvus/internal/distributed/indexnode" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // IndexNode implements IndexNode grpc server diff --git a/cmd/components/proxy.go b/cmd/components/proxy.go index 60baf10295..6b5ee8c795 100644 --- a/cmd/components/proxy.go +++ b/cmd/components/proxy.go @@ -27,9 +27,9 @@ import ( grpcproxy "github.com/milvus-io/milvus/internal/distributed/proxy" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/indexparamcheck" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Proxy implements Proxy grpc server diff --git a/cmd/components/query_coord.go b/cmd/components/query_coord.go index 5b07d4d114..a7f2838bfe 100644 --- a/cmd/components/query_coord.go +++ b/cmd/components/query_coord.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" grpcquerycoord "github.com/milvus-io/milvus/internal/distributed/querycoord" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // QueryCoord implements QueryCoord grpc server diff --git a/cmd/components/query_node.go b/cmd/components/query_node.go index fa048e466a..2cc399b479 100644 --- a/cmd/components/query_node.go +++ b/cmd/components/query_node.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" grpcquerynode "github.com/milvus-io/milvus/internal/distributed/querynode" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // QueryNode implements QueryNode grpc server diff --git a/cmd/components/root_coord.go b/cmd/components/root_coord.go index ab81b5818b..2078a2801b 100644 --- a/cmd/components/root_coord.go +++ b/cmd/components/root_coord.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" rc "github.com/milvus-io/milvus/internal/distributed/rootcoord" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // RootCoord implements RoodCoord grpc server diff --git a/cmd/components/streaming_node.go b/cmd/components/streaming_node.go index 2b0d63bdc1..4fa102f092 100644 --- a/cmd/components/streaming_node.go +++ b/cmd/components/streaming_node.go @@ -21,7 +21,7 @@ import ( "github.com/milvus-io/milvus/internal/distributed/streamingnode" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type StreamingNode struct { diff --git a/cmd/components/util.go b/cmd/components/util.go index a3b3843a4c..d7d7459b74 100644 --- a/cmd/components/util.go +++ b/cmd/components/util.go @@ -11,9 +11,9 @@ import ( "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var errStopTimeout = errors.New("stop timeout") diff --git a/cmd/main.go b/cmd/main.go index ce2f0309a4..e5a9199f42 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -28,7 +28,7 @@ import ( "github.com/milvus-io/milvus/cmd/asan" "github.com/milvus-io/milvus/cmd/milvus" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func main() { diff --git a/cmd/milvus/help.go b/cmd/milvus/help.go index 73735abf7d..0fc8ae6611 100644 --- a/cmd/milvus/help.go +++ b/cmd/milvus/help.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/cmd/milvus/mck.go b/cmd/milvus/mck.go index b200becd1f..87416f5169 100644 --- a/cmd/milvus/mck.go +++ b/cmd/milvus/mck.go @@ -19,14 +19,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/logutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/logutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) const ( diff --git a/cmd/milvus/run.go b/cmd/milvus/run.go index aca5deade4..d574a42a0c 100644 --- a/cmd/milvus/run.go +++ b/cmd/milvus/run.go @@ -10,10 +10,10 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" ) type run struct{} diff --git a/cmd/milvus/stop.go b/cmd/milvus/stop.go index 1392125e6f..9943f8610e 100644 --- a/cmd/milvus/stop.go +++ b/cmd/milvus/stop.go @@ -8,8 +8,8 @@ import ( "path" "syscall" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/cmd/milvus/util.go b/cmd/milvus/util.go index 70707d64ed..052f750226 100644 --- a/cmd/milvus/util.go +++ b/cmd/milvus/util.go @@ -22,10 +22,10 @@ import ( "github.com/milvus-io/milvus/cmd/roles" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func makeRuntimeDir(dir string) error { diff --git a/cmd/roles/roles.go b/cmd/roles/roles.go index 355c30eb13..88d067639b 100644 --- a/cmd/roles/roles.go +++ b/cmd/roles/roles.go @@ -43,21 +43,21 @@ import ( kvfactory "github.com/milvus-io/milvus/internal/util/dependency/kv" "github.com/milvus-io/milvus/internal/util/initcore" internalmetrics "github.com/milvus-io/milvus/internal/util/metrics" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - rocksmqimpl "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/nmq" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/expr" - "github.com/milvus-io/milvus/pkg/util/gc" - "github.com/milvus-io/milvus/pkg/util/generic" - "github.com/milvus-io/milvus/pkg/util/logutil" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - _ "github.com/milvus-io/milvus/pkg/util/symbolizer" // support symbolizer and crash dump - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + rocksmqimpl "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper/nmq" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/expr" + "github.com/milvus-io/milvus/pkg/v2/util/gc" + "github.com/milvus-io/milvus/pkg/v2/util/generic" + "github.com/milvus-io/milvus/pkg/v2/util/logutil" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + _ "github.com/milvus-io/milvus/pkg/v2/util/symbolizer" // support symbolizer and crash dump + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // all milvus related metrics is in a separate registry diff --git a/cmd/roles/roles_test.go b/cmd/roles/roles_test.go index f577639033..8def76959c 100644 --- a/cmd/roles/roles_test.go +++ b/cmd/roles/roles_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestRoles(t *testing.T) { diff --git a/cmd/tools/config/generate.go b/cmd/tools/config/generate.go index 9560592ee4..7b1f176fd8 100644 --- a/cmd/tools/config/generate.go +++ b/cmd/tools/config/generate.go @@ -13,9 +13,9 @@ import ( "go.uber.org/zap" "golang.org/x/exp/slices" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type DocContent struct { diff --git a/cmd/tools/config/generate_test.go b/cmd/tools/config/generate_test.go index 48aae3bdd0..77c63dcbaa 100644 --- a/cmd/tools/config/generate_test.go +++ b/cmd/tools/config/generate_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // Assert the milvus.yaml file is consistent to paramtable diff --git a/cmd/tools/config/main.go b/cmd/tools/config/main.go index 2e2d81e647..ca7a30b7fa 100644 --- a/cmd/tools/config/main.go +++ b/cmd/tools/config/main.go @@ -6,7 +6,7 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) const ( diff --git a/cmd/tools/config/printer.go b/cmd/tools/config/printer.go index 2030069486..28c615fffd 100644 --- a/cmd/tools/config/printer.go +++ b/cmd/tools/config/printer.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) func ShowYaml(filepath string) { diff --git a/cmd/tools/datameta/main.go b/cmd/tools/datameta/main.go index 4b36a6c4c4..67f4c79dea 100644 --- a/cmd/tools/datameta/main.go +++ b/cmd/tools/datameta/main.go @@ -11,10 +11,10 @@ import ( "google.golang.org/protobuf/proto" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) var ( diff --git a/cmd/tools/migration/allocator/allocator.go b/cmd/tools/migration/allocator/allocator.go index 005009f267..eb50222870 100644 --- a/cmd/tools/migration/allocator/allocator.go +++ b/cmd/tools/migration/allocator/allocator.go @@ -1,6 +1,6 @@ package allocator -import "github.com/milvus-io/milvus/pkg/util/typeutil" +import "github.com/milvus-io/milvus/pkg/v2/util/typeutil" type Allocator interface { AllocID() (typeutil.UniqueID, error) diff --git a/cmd/tools/migration/allocator/atomic_allocator.go b/cmd/tools/migration/allocator/atomic_allocator.go index cce5a4c0b3..e1dcd70a77 100644 --- a/cmd/tools/migration/allocator/atomic_allocator.go +++ b/cmd/tools/migration/allocator/atomic_allocator.go @@ -3,7 +3,7 @@ package allocator import ( "go.uber.org/atomic" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/cmd/tools/migration/backend/backend.go b/cmd/tools/migration/backend/backend.go index 91c33e431d..5f482cc63d 100644 --- a/cmd/tools/migration/backend/backend.go +++ b/cmd/tools/migration/backend/backend.go @@ -8,7 +8,7 @@ import ( "github.com/milvus-io/milvus/cmd/tools/migration/configs" "github.com/milvus-io/milvus/cmd/tools/migration/meta" "github.com/milvus-io/milvus/cmd/tools/migration/versions" - "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/v2/util" ) type Backend interface { diff --git a/cmd/tools/migration/backend/etcd.go b/cmd/tools/migration/backend/etcd.go index 840c477f6c..a370a02c31 100644 --- a/cmd/tools/migration/backend/etcd.go +++ b/cmd/tools/migration/backend/etcd.go @@ -7,8 +7,8 @@ import ( "github.com/milvus-io/milvus/cmd/tools/migration/configs" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" ) type etcdBasedBackend struct { diff --git a/cmd/tools/migration/backend/etcd210.go b/cmd/tools/migration/backend/etcd210.go index 88fea0ca8a..7b2d2b0733 100644 --- a/cmd/tools/migration/backend/etcd210.go +++ b/cmd/tools/migration/backend/etcd210.go @@ -20,9 +20,9 @@ import ( "github.com/milvus-io/milvus/internal/metastore/kv/rootcoord" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/storage" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // etcd210 implements Backend. diff --git a/cmd/tools/migration/backend/etcd220.go b/cmd/tools/migration/backend/etcd220.go index 7aa5713f70..130fde7244 100644 --- a/cmd/tools/migration/backend/etcd220.go +++ b/cmd/tools/migration/backend/etcd220.go @@ -8,7 +8,7 @@ import ( "github.com/milvus-io/milvus/cmd/tools/migration/meta" "github.com/milvus-io/milvus/internal/metastore/kv/querycoord" "github.com/milvus-io/milvus/internal/metastore/kv/rootcoord" - "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/v2/util" ) // etcd220 implements Backend. diff --git a/cmd/tools/migration/configs/config.go b/cmd/tools/migration/configs/config.go index 8a1b59df62..1d7af14a4f 100644 --- a/cmd/tools/migration/configs/config.go +++ b/cmd/tools/migration/configs/config.go @@ -5,8 +5,8 @@ import ( "strconv" "github.com/milvus-io/milvus/cmd/tools/migration/console" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) const ( diff --git a/cmd/tools/migration/meta/210_to_220.go b/cmd/tools/migration/meta/210_to_220.go index ac1cf6f5f9..1b2b1bba5c 100644 --- a/cmd/tools/migration/meta/210_to_220.go +++ b/cmd/tools/migration/meta/210_to_220.go @@ -13,12 +13,12 @@ import ( "github.com/milvus-io/milvus/cmd/tools/migration/legacy/legacypb" "github.com/milvus-io/milvus/cmd/tools/migration/versions" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func alias210ToAlias220(record *pb.CollectionInfo, ts Timestamp) *model.Alias { diff --git a/cmd/tools/migration/meta/meta.go b/cmd/tools/migration/meta/meta.go index f76e6b174e..e44d3dd241 100644 --- a/cmd/tools/migration/meta/meta.go +++ b/cmd/tools/migration/meta/meta.go @@ -3,7 +3,7 @@ package meta import ( "github.com/blang/semver/v4" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ( diff --git a/cmd/tools/migration/meta/meta210.go b/cmd/tools/migration/meta/meta210.go index 2c735898c8..d27f1c8ee9 100644 --- a/cmd/tools/migration/meta/meta210.go +++ b/cmd/tools/migration/meta/meta210.go @@ -10,8 +10,8 @@ import ( "github.com/milvus-io/milvus/cmd/tools/migration/legacy/legacypb" "github.com/milvus-io/milvus/internal/metastore/kv/rootcoord" "github.com/milvus-io/milvus/internal/metastore/model" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util" ) type FieldIndexesWithSchema struct { diff --git a/cmd/tools/migration/meta/meta220.go b/cmd/tools/migration/meta/meta220.go index 8616dc151c..ec867741c0 100644 --- a/cmd/tools/migration/meta/meta220.go +++ b/cmd/tools/migration/meta/meta220.go @@ -9,8 +9,8 @@ import ( "github.com/milvus-io/milvus/internal/metastore/kv/querycoord" "github.com/milvus-io/milvus/internal/metastore/kv/rootcoord" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util" ) type ( diff --git a/cmd/tools/migration/migration/constant.go b/cmd/tools/migration/migration/constant.go index 012a333f16..3448843d30 100644 --- a/cmd/tools/migration/migration/constant.go +++ b/cmd/tools/migration/migration/constant.go @@ -1,6 +1,6 @@ package migration -import "github.com/milvus-io/milvus/pkg/util/typeutil" +import "github.com/milvus-io/milvus/pkg/v2/util/typeutil" const ( Role = "migration" diff --git a/cmd/tools/migration/migration/runner.go b/cmd/tools/migration/migration/runner.go index 7d0d791203..0b19551cb0 100644 --- a/cmd/tools/migration/migration/runner.go +++ b/cmd/tools/migration/migration/runner.go @@ -16,7 +16,7 @@ import ( "github.com/milvus-io/milvus/cmd/tools/migration/console" "github.com/milvus-io/milvus/cmd/tools/migration/versions" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" ) type Runner struct { diff --git a/cmd/tools/migration/mmap/mmap_230_240.go b/cmd/tools/migration/mmap/mmap_230_240.go index 59b7b3808b..d8d80b336f 100644 --- a/cmd/tools/migration/mmap/mmap_230_240.go +++ b/cmd/tools/migration/mmap/mmap_230_240.go @@ -10,7 +10,7 @@ import ( "github.com/milvus-io/milvus/internal/rootcoord" "github.com/milvus-io/milvus/internal/tso" "github.com/milvus-io/milvus/internal/util/vecindexmgr" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) // In Milvus 2.3.x, querynode.MmapDirPath is used to enable mmap and save mmap files. diff --git a/cmd/tools/migration/mmap/tool/main.go b/cmd/tools/migration/mmap/tool/main.go index db8e2a2fa8..8e1d0ffe21 100644 --- a/cmd/tools/migration/mmap/tool/main.go +++ b/cmd/tools/migration/mmap/tool/main.go @@ -16,12 +16,12 @@ import ( "github.com/milvus-io/milvus/internal/rootcoord" "github.com/milvus-io/milvus/internal/tso" "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tikv" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tikv" ) func main() { diff --git a/cmd/tools/migration/utils/util.go b/cmd/tools/migration/utils/util.go index e9dc2caa57..b668dc9be1 100644 --- a/cmd/tools/migration/utils/util.go +++ b/cmd/tools/migration/utils/util.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/milvus-io/milvus/internal/metastore/kv/rootcoord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ( diff --git a/go.mod b/go.mod index 762afb11fd..0e8df1d3a2 100644 --- a/go.mod +++ b/go.mod @@ -73,7 +73,7 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/jolestar/go-commons-pool/v2 v2.1.2 github.com/magiconair/properties v1.8.5 - github.com/milvus-io/milvus/pkg v0.0.2-0.20241126032235-cb6542339e84 + github.com/milvus-io/milvus/pkg/v2 v2.0.0-00010101000000-000000000000 github.com/pkg/errors v0.9.1 github.com/remeh/sizedwaitgroup v1.0.0 github.com/shirou/gopsutil/v4 v4.24.10 @@ -286,7 +286,7 @@ replace ( github.com/go-kit/kit => github.com/go-kit/kit v0.1.0 github.com/greatroar/blobloom => github.com/milvus-io/blobloom v0.0.0-20240603110411-471ae49f3b93 github.com/ianlancetaylor/cgosymbolizer => github.com/milvus-io/cgosymbolizer v0.0.0-20240722103217-b7dee0e50119 - github.com/milvus-io/milvus/pkg => ./pkg + github.com/milvus-io/milvus/pkg/v2 => ./pkg github.com/streamnative/pulsarctl => github.com/xiaofan-luan/pulsarctl v0.5.1 github.com/tecbot/gorocksdb => github.com/milvus-io/gorocksdb v0.0.0-20220624081344-8c5f4212846b // indirect ) diff --git a/internal/allocator/cached_allocator.go b/internal/allocator/cached_allocator.go index f6e8da7f59..e9d9a5d87b 100644 --- a/internal/allocator/cached_allocator.go +++ b/internal/allocator/cached_allocator.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) const ( diff --git a/internal/allocator/global_id_allocator.go b/internal/allocator/global_id_allocator.go index cd95412d5d..8b150e1f36 100644 --- a/internal/allocator/global_id_allocator.go +++ b/internal/allocator/global_id_allocator.go @@ -18,8 +18,8 @@ package allocator import ( "github.com/milvus-io/milvus/internal/tso" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type GlobalIDAllocatorInterface interface { diff --git a/internal/allocator/global_id_allocator_test.go b/internal/allocator/global_id_allocator_test.go index 74d856313e..02a71a1e8f 100644 --- a/internal/allocator/global_id_allocator_test.go +++ b/internal/allocator/global_id_allocator_test.go @@ -26,7 +26,7 @@ import ( "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var gTestIDAllocator *GlobalIDAllocator diff --git a/internal/allocator/id_allocator.go b/internal/allocator/id_allocator.go index 3ad76b1dc3..57e843099f 100644 --- a/internal/allocator/id_allocator.go +++ b/internal/allocator/id_allocator.go @@ -24,8 +24,8 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" ) const ( diff --git a/internal/allocator/id_allocator_test.go b/internal/allocator/id_allocator_test.go index 67c0af28e4..1c3904c01e 100644 --- a/internal/allocator/id_allocator_test.go +++ b/internal/allocator/id_allocator_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type mockIDAllocator struct{} diff --git a/internal/allocator/interface.go b/internal/allocator/interface.go index 4742ceea86..efdc0c908a 100644 --- a/internal/allocator/interface.go +++ b/internal/allocator/interface.go @@ -17,7 +17,7 @@ package allocator import ( - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // UniqueID is alias of typeutil.UniqueID diff --git a/internal/allocator/local_allocator_test.go b/internal/allocator/local_allocator_test.go index 6747b3bf88..843b91a2c3 100644 --- a/internal/allocator/local_allocator_test.go +++ b/internal/allocator/local_allocator_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestLocalAllocator(t *testing.T) { diff --git a/internal/allocator/remote_interface.go b/internal/allocator/remote_interface.go index c5ab4fb0ef..c4add6a7c2 100644 --- a/internal/allocator/remote_interface.go +++ b/internal/allocator/remote_interface.go @@ -21,7 +21,7 @@ import ( "google.golang.org/grpc" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" ) type remoteInterface interface { diff --git a/internal/coordinator/coordclient/registry.go b/internal/coordinator/coordclient/registry.go index 7602d1c710..f3a632307c 100644 --- a/internal/coordinator/coordclient/registry.go +++ b/internal/coordinator/coordclient/registry.go @@ -11,13 +11,13 @@ import ( rcc "github.com/milvus-io/milvus/internal/distributed/rootcoord/client" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/grpcclient" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // localClient is a client that can access local server directly diff --git a/internal/coordinator/coordclient/registry_test.go b/internal/coordinator/coordclient/registry_test.go index d796c11a92..e6eee0314c 100644 --- a/internal/coordinator/coordclient/registry_test.go +++ b/internal/coordinator/coordclient/registry_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestRegistry(t *testing.T) { diff --git a/internal/coordinator/coordclient/test_utility.go b/internal/coordinator/coordclient/test_utility.go index b5832cdf2f..662aa8b636 100644 --- a/internal/coordinator/coordclient/test_utility.go +++ b/internal/coordinator/coordclient/test_utility.go @@ -5,7 +5,7 @@ package coordclient import ( "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) // ResetRegistration resets the global local client to initial state. diff --git a/internal/coordinator/snmanager/streaming_node_manager.go b/internal/coordinator/snmanager/streaming_node_manager.go index efed218e5d..254d49c775 100644 --- a/internal/coordinator/snmanager/streaming_node_manager.go +++ b/internal/coordinator/snmanager/streaming_node_manager.go @@ -8,11 +8,11 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/streamingcoord/server/balancer" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var StaticStreamingNodeManager = newStreamingNodeManager() diff --git a/internal/coordinator/snmanager/streaming_node_manager_test.go b/internal/coordinator/snmanager/streaming_node_manager_test.go index b26fb6a63c..5ecb9844d5 100644 --- a/internal/coordinator/snmanager/streaming_node_manager_test.go +++ b/internal/coordinator/snmanager/streaming_node_manager_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/milvus-io/milvus/internal/mocks/streamingcoord/server/mock_balancer" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type pChannelInfoAssigned struct { diff --git a/internal/datacoord/allocator/allocator.go b/internal/datacoord/allocator/allocator.go index e816a3f295..9e9ae8eef9 100644 --- a/internal/datacoord/allocator/allocator.go +++ b/internal/datacoord/allocator/allocator.go @@ -22,11 +22,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Allocator is the interface that allocating `UniqueID` or `Timestamp` diff --git a/internal/datacoord/allocator/allocator_test.go b/internal/datacoord/allocator/allocator_test.go index 6f2d6cd432..3804136bfa 100644 --- a/internal/datacoord/allocator/allocator_test.go +++ b/internal/datacoord/allocator/allocator_test.go @@ -27,8 +27,8 @@ import ( "google.golang.org/grpc" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type RootCoordAllocatorSuite struct { diff --git a/internal/datacoord/analyze_meta.go b/internal/datacoord/analyze_meta.go index bca8b6e4b4..980808887e 100644 --- a/internal/datacoord/analyze_meta.go +++ b/internal/datacoord/analyze_meta.go @@ -25,10 +25,10 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus/internal/metastore" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) type analyzeMeta struct { diff --git a/internal/datacoord/analyze_meta_test.go b/internal/datacoord/analyze_meta_test.go index 6244e6f3b0..ec4a3111f3 100644 --- a/internal/datacoord/analyze_meta_test.go +++ b/internal/datacoord/analyze_meta_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus/internal/metastore/mocks" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" ) type AnalyzeMetaSuite struct { diff --git a/internal/datacoord/broker/coordinator_broker.go b/internal/datacoord/broker/coordinator_broker.go index 1ecf2699b9..1aaaf07883 100644 --- a/internal/datacoord/broker/coordinator_broker.go +++ b/internal/datacoord/broker/coordinator_broker.go @@ -26,11 +26,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) //go:generate mockery --name=Broker --structname=MockBroker --output=./ --filename=mock_coordinator_broker.go --with-expecter --inpackage diff --git a/internal/datacoord/broker/coordinator_broker_test.go b/internal/datacoord/broker/coordinator_broker_test.go index ec9ee63264..c358a82fe2 100644 --- a/internal/datacoord/broker/coordinator_broker_test.go +++ b/internal/datacoord/broker/coordinator_broker_test.go @@ -29,8 +29,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type BrokerSuite struct { diff --git a/internal/datacoord/broker/mock_broker.go b/internal/datacoord/broker/mock_broker.go index c820b946f5..bf73466d52 100644 --- a/internal/datacoord/broker/mock_broker.go +++ b/internal/datacoord/broker/mock_broker.go @@ -8,7 +8,7 @@ import ( milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mock "github.com/stretchr/testify/mock" - rootcoordpb "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" + rootcoordpb "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" ) // MockBroker is an autogenerated mock type for the Broker type diff --git a/internal/datacoord/channel.go b/internal/datacoord/channel.go index 91833fa0a7..f85e77702b 100644 --- a/internal/datacoord/channel.go +++ b/internal/datacoord/channel.go @@ -24,8 +24,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) type ROChannel interface { diff --git a/internal/datacoord/channel_manager.go b/internal/datacoord/channel_manager.go index a5d9c016be..9d205715ae 100644 --- a/internal/datacoord/channel_manager.go +++ b/internal/datacoord/channel_manager.go @@ -29,13 +29,13 @@ import ( "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ChannelManager interface { diff --git a/internal/datacoord/channel_manager_test.go b/internal/datacoord/channel_manager_test.go index 4cf58131ca..566682daec 100644 --- a/internal/datacoord/channel_manager_test.go +++ b/internal/datacoord/channel_manager_test.go @@ -31,11 +31,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" globalIDAllocator "github.com/milvus-io/milvus/internal/allocator" kvmock "github.com/milvus-io/milvus/internal/kv/mocks" - "github.com/milvus-io/milvus/pkg/kv/predicates" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/kv/predicates" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestChannelManagerSuite(t *testing.T) { diff --git a/internal/datacoord/channel_store.go b/internal/datacoord/channel_store.go index d7bf8e1929..7d018d15dc 100644 --- a/internal/datacoord/channel_store.go +++ b/internal/datacoord/channel_store.go @@ -29,12 +29,12 @@ import ( "go.uber.org/zap/zapcore" "google.golang.org/protobuf/proto" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // ROChannelStore is a read only channel store for channels and nodes. diff --git a/internal/datacoord/channel_store_test.go b/internal/datacoord/channel_store_test.go index b5409a04b2..4300e30e4d 100644 --- a/internal/datacoord/channel_store_test.go +++ b/internal/datacoord/channel_store_test.go @@ -14,11 +14,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/kv/mocks" - "github.com/milvus-io/milvus/pkg/kv/predicates" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/kv/predicates" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" ) func TestStateChannelStore(t *testing.T) { diff --git a/internal/datacoord/cluster.go b/internal/datacoord/cluster.go index 8b42e4c158..554f197992 100644 --- a/internal/datacoord/cluster.go +++ b/internal/datacoord/cluster.go @@ -26,10 +26,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/datacoord/session" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // Cluster provides interfaces to interact with datanode cluster diff --git a/internal/datacoord/cluster_test.go b/internal/datacoord/cluster_test.go index 2e4bbd66e3..a91e5d21c8 100644 --- a/internal/datacoord/cluster_test.go +++ b/internal/datacoord/cluster_test.go @@ -29,9 +29,9 @@ import ( "github.com/milvus-io/milvus/internal/datacoord/session" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/kv/mocks" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" ) func TestCluster(t *testing.T) { diff --git a/internal/datacoord/compaction.go b/internal/datacoord/compaction.go index b37ab7c501..9013ccf5d7 100644 --- a/internal/datacoord/compaction.go +++ b/internal/datacoord/compaction.go @@ -30,14 +30,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/datacoord/allocator" "github.com/milvus-io/milvus/internal/datacoord/session" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // TODO: we just warn about the long executing/queuing tasks diff --git a/internal/datacoord/compaction_l0_view.go b/internal/datacoord/compaction_l0_view.go index 5f70ef7102..ea7fadd93a 100644 --- a/internal/datacoord/compaction_l0_view.go +++ b/internal/datacoord/compaction_l0_view.go @@ -6,7 +6,7 @@ import ( "github.com/samber/lo" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // The LevelZeroSegments keeps the min group diff --git a/internal/datacoord/compaction_l0_view_test.go b/internal/datacoord/compaction_l0_view_test.go index 78d21e5e38..13408def93 100644 --- a/internal/datacoord/compaction_l0_view_test.go +++ b/internal/datacoord/compaction_l0_view_test.go @@ -9,8 +9,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) func TestLevelZeroSegmentsViewSuite(t *testing.T) { diff --git a/internal/datacoord/compaction_policy_clustering.go b/internal/datacoord/compaction_policy_clustering.go index 7ddca486ba..7ae6272912 100644 --- a/internal/datacoord/compaction_policy_clustering.go +++ b/internal/datacoord/compaction_policy_clustering.go @@ -28,9 +28,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/datacoord/allocator" "github.com/milvus-io/milvus/internal/util/clustering" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type clusteringCompactionPolicy struct { diff --git a/internal/datacoord/compaction_policy_clustering_test.go b/internal/datacoord/compaction_policy_clustering_test.go index 5617c0d5cb..f2b612a0f8 100644 --- a/internal/datacoord/compaction_policy_clustering_test.go +++ b/internal/datacoord/compaction_policy_clustering_test.go @@ -29,9 +29,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/datacoord/allocator" "github.com/milvus-io/milvus/internal/metastore/mocks" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestClusteringCompactionPolicySuite(t *testing.T) { diff --git a/internal/datacoord/compaction_policy_l0.go b/internal/datacoord/compaction_policy_l0.go index 493f32e9fa..4c46ef3309 100644 --- a/internal/datacoord/compaction_policy_l0.go +++ b/internal/datacoord/compaction_policy_l0.go @@ -8,10 +8,10 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type l0CompactionPolicy struct { diff --git a/internal/datacoord/compaction_policy_l0_test.go b/internal/datacoord/compaction_policy_l0_test.go index 94a0806b4c..cba4eedce9 100644 --- a/internal/datacoord/compaction_policy_l0_test.go +++ b/internal/datacoord/compaction_policy_l0_test.go @@ -25,9 +25,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestL0CompactionPolicySuite(t *testing.T) { diff --git a/internal/datacoord/compaction_policy_single.go b/internal/datacoord/compaction_policy_single.go index a7b8549f31..2a78c5a572 100644 --- a/internal/datacoord/compaction_policy_single.go +++ b/internal/datacoord/compaction_policy_single.go @@ -25,8 +25,8 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/datacoord/allocator" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) // singleCompactionPolicy is to compact one segment with too many delta logs diff --git a/internal/datacoord/compaction_policy_single_test.go b/internal/datacoord/compaction_policy_single_test.go index bc1aad4abc..d651ac9f0f 100644 --- a/internal/datacoord/compaction_policy_single_test.go +++ b/internal/datacoord/compaction_policy_single_test.go @@ -25,8 +25,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/datacoord/allocator" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestSingleCompactionPolicySuite(t *testing.T) { diff --git a/internal/datacoord/compaction_queue.go b/internal/datacoord/compaction_queue.go index e3b06790a1..5ff1ecc13f 100644 --- a/internal/datacoord/compaction_queue.go +++ b/internal/datacoord/compaction_queue.go @@ -22,8 +22,8 @@ import ( "github.com/cockroachdb/errors" "github.com/samber/lo" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/lock" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/lock" ) type Item[T any] struct { diff --git a/internal/datacoord/compaction_queue_test.go b/internal/datacoord/compaction_queue_test.go index 8dfb50b2a8..96df67f8fc 100644 --- a/internal/datacoord/compaction_queue_test.go +++ b/internal/datacoord/compaction_queue_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) func TestCompactionQueue(t *testing.T) { diff --git a/internal/datacoord/compaction_task.go b/internal/datacoord/compaction_task.go index 6b8e79a84d..1d179ecfb1 100644 --- a/internal/datacoord/compaction_task.go +++ b/internal/datacoord/compaction_task.go @@ -17,7 +17,7 @@ package datacoord import ( - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) type CompactionTask interface { diff --git a/internal/datacoord/compaction_task_clustering.go b/internal/datacoord/compaction_task_clustering.go index d6769aa7aa..0888539e18 100644 --- a/internal/datacoord/compaction_task_clustering.go +++ b/internal/datacoord/compaction_task_clustering.go @@ -33,15 +33,15 @@ import ( "github.com/milvus-io/milvus/internal/datacoord/allocator" "github.com/milvus-io/milvus/internal/datacoord/session" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ CompactionTask = (*clusteringCompactionTask)(nil) diff --git a/internal/datacoord/compaction_task_clustering_test.go b/internal/datacoord/compaction_task_clustering_test.go index cd87008be2..a5ff710ada 100644 --- a/internal/datacoord/compaction_task_clustering_test.go +++ b/internal/datacoord/compaction_task_clustering_test.go @@ -36,11 +36,11 @@ import ( "github.com/milvus-io/milvus/internal/metastore/kv/datacoord" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" ) func TestClusteringCompactionTaskSuite(t *testing.T) { diff --git a/internal/datacoord/compaction_task_l0.go b/internal/datacoord/compaction_task_l0.go index 7dbb42e16d..42bf2d099d 100644 --- a/internal/datacoord/compaction_task_l0.go +++ b/internal/datacoord/compaction_task_l0.go @@ -30,11 +30,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/datacoord/allocator" "github.com/milvus-io/milvus/internal/datacoord/session" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var _ CompactionTask = (*l0CompactionTask)(nil) diff --git a/internal/datacoord/compaction_task_l0_test.go b/internal/datacoord/compaction_task_l0_test.go index e8a2a6c298..b821c048f9 100644 --- a/internal/datacoord/compaction_task_l0_test.go +++ b/internal/datacoord/compaction_task_l0_test.go @@ -28,8 +28,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/datacoord/allocator" "github.com/milvus-io/milvus/internal/datacoord/session" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func TestL0CompactionTaskSuite(t *testing.T) { diff --git a/internal/datacoord/compaction_task_meta.go b/internal/datacoord/compaction_task_meta.go index e23a2a2b23..d635a83429 100644 --- a/internal/datacoord/compaction_task_meta.go +++ b/internal/datacoord/compaction_task_meta.go @@ -29,11 +29,11 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func newCompactionTaskStats(task *datapb.CompactionTask) *metricsinfo.CompactionTask { diff --git a/internal/datacoord/compaction_task_meta_test.go b/internal/datacoord/compaction_task_meta_test.go index d25b71b76d..5cd08ba5a4 100644 --- a/internal/datacoord/compaction_task_meta_test.go +++ b/internal/datacoord/compaction_task_meta_test.go @@ -26,8 +26,8 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore/mocks" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" ) func TestCompactionTaskMetaSuite(t *testing.T) { diff --git a/internal/datacoord/compaction_task_mix.go b/internal/datacoord/compaction_task_mix.go index 336fd49cb6..7dea339d95 100644 --- a/internal/datacoord/compaction_task_mix.go +++ b/internal/datacoord/compaction_task_mix.go @@ -13,10 +13,10 @@ import ( "github.com/milvus-io/milvus/internal/datacoord/allocator" "github.com/milvus-io/milvus/internal/datacoord/session" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var _ CompactionTask = (*mixCompactionTask)(nil) diff --git a/internal/datacoord/compaction_task_mix_test.go b/internal/datacoord/compaction_task_mix_test.go index 7143dab41c..fdd859c25e 100644 --- a/internal/datacoord/compaction_task_mix_test.go +++ b/internal/datacoord/compaction_task_mix_test.go @@ -11,8 +11,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/datacoord/allocator" "github.com/milvus-io/milvus/internal/datacoord/session" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func TestMixCompactionTaskSuite(t *testing.T) { diff --git a/internal/datacoord/compaction_test.go b/internal/datacoord/compaction_test.go index a0b039dcaa..b50edf0e37 100644 --- a/internal/datacoord/compaction_test.go +++ b/internal/datacoord/compaction_test.go @@ -32,10 +32,10 @@ import ( "github.com/milvus-io/milvus/internal/datacoord/session" "github.com/milvus-io/milvus/internal/metastore/kv/binlog" "github.com/milvus-io/milvus/internal/metastore/kv/datacoord" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestCompactionPlanHandlerSuite(t *testing.T) { diff --git a/internal/datacoord/compaction_trigger.go b/internal/datacoord/compaction_trigger.go index 121920a527..0f5fb2a934 100644 --- a/internal/datacoord/compaction_trigger.go +++ b/internal/datacoord/compaction_trigger.go @@ -29,14 +29,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/datacoord/allocator" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/lifetime" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/logutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/lifetime" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/logutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type compactTime struct { diff --git a/internal/datacoord/compaction_trigger_test.go b/internal/datacoord/compaction_trigger_test.go index 94e7e798e5..e2256659c3 100644 --- a/internal/datacoord/compaction_trigger_test.go +++ b/internal/datacoord/compaction_trigger_test.go @@ -36,12 +36,12 @@ import ( "github.com/milvus-io/milvus/internal/datacoord/allocator" "github.com/milvus-io/milvus/internal/metastore/mocks" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/lifetime" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/lifetime" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type spyCompactionHandler struct { diff --git a/internal/datacoord/compaction_trigger_v2.go b/internal/datacoord/compaction_trigger_v2.go index c59bf27384..ea656c5a1e 100644 --- a/internal/datacoord/compaction_trigger_v2.go +++ b/internal/datacoord/compaction_trigger_v2.go @@ -25,10 +25,10 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/datacoord/allocator" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/logutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/logutil" ) type CompactionTriggerType int8 diff --git a/internal/datacoord/compaction_trigger_v2_test.go b/internal/datacoord/compaction_trigger_v2_test.go index 18ff9c7143..c7e53f8e0f 100644 --- a/internal/datacoord/compaction_trigger_v2_test.go +++ b/internal/datacoord/compaction_trigger_v2_test.go @@ -17,11 +17,11 @@ import ( "github.com/milvus-io/milvus/internal/datacoord/allocator" "github.com/milvus-io/milvus/internal/metastore/mocks" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestCompactionTriggerManagerSuite(t *testing.T) { diff --git a/internal/datacoord/compaction_view.go b/internal/datacoord/compaction_view.go index 667f474bf3..9e96508ac1 100644 --- a/internal/datacoord/compaction_view.go +++ b/internal/datacoord/compaction_view.go @@ -23,7 +23,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) type CompactionView interface { diff --git a/internal/datacoord/errors_test.go b/internal/datacoord/errors_test.go index 5e1d722b44..3ac081bd07 100644 --- a/internal/datacoord/errors_test.go +++ b/internal/datacoord/errors_test.go @@ -21,8 +21,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestMsgDataCoordIsUnhealthy(t *testing.T) { diff --git a/internal/datacoord/garbage_collector.go b/internal/datacoord/garbage_collector.go index f99ba6096c..75fcf00cbb 100644 --- a/internal/datacoord/garbage_collector.go +++ b/internal/datacoord/garbage_collector.go @@ -33,16 +33,16 @@ import ( "github.com/milvus-io/milvus/internal/metastore/kv/binlog" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // GcOption garbage collection options diff --git a/internal/datacoord/garbage_collector_test.go b/internal/datacoord/garbage_collector_test.go index e27536405b..c63dca9600 100644 --- a/internal/datacoord/garbage_collector_test.go +++ b/internal/datacoord/garbage_collector_test.go @@ -47,13 +47,13 @@ import ( "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func Test_garbageCollector_basic(t *testing.T) { diff --git a/internal/datacoord/handler.go b/internal/datacoord/handler.go index 11990c8b97..99361bdfa9 100644 --- a/internal/datacoord/handler.go +++ b/internal/datacoord/handler.go @@ -25,13 +25,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Handler handles some channel method for ChannelManager diff --git a/internal/datacoord/handler_test.go b/internal/datacoord/handler_test.go index 06b332cea1..3aaf7a78f4 100644 --- a/internal/datacoord/handler_test.go +++ b/internal/datacoord/handler_test.go @@ -14,13 +14,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/metastore/model" mocks2 "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) func TestGetQueryVChanPositionsRetrieveM2N(t *testing.T) { diff --git a/internal/datacoord/import_checker.go b/internal/datacoord/import_checker.go index 7909151205..4568d86eb0 100644 --- a/internal/datacoord/import_checker.go +++ b/internal/datacoord/import_checker.go @@ -28,13 +28,13 @@ import ( "github.com/milvus-io/milvus/internal/datacoord/allocator" "github.com/milvus-io/milvus/internal/datacoord/broker" "github.com/milvus-io/milvus/internal/util/importutilv2" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type ImportChecker interface { diff --git a/internal/datacoord/import_checker_test.go b/internal/datacoord/import_checker_test.go index 0f33718979..07d662f11d 100644 --- a/internal/datacoord/import_checker_test.go +++ b/internal/datacoord/import_checker_test.go @@ -33,14 +33,14 @@ import ( "github.com/milvus-io/milvus/internal/datacoord/allocator" broker2 "github.com/milvus-io/milvus/internal/datacoord/broker" "github.com/milvus-io/milvus/internal/metastore/mocks" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type ImportCheckerSuite struct { diff --git a/internal/datacoord/import_job.go b/internal/datacoord/import_job.go index c94141617f..884b5e82c8 100644 --- a/internal/datacoord/import_job.go +++ b/internal/datacoord/import_job.go @@ -25,11 +25,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/importutilv2" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type ImportJobFilter func(job ImportJob) bool diff --git a/internal/datacoord/import_meta.go b/internal/datacoord/import_meta.go index 4d547896d2..cacdae0997 100644 --- a/internal/datacoord/import_meta.go +++ b/internal/datacoord/import_meta.go @@ -26,8 +26,8 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) type ImportMeta interface { diff --git a/internal/datacoord/import_meta_test.go b/internal/datacoord/import_meta_test.go index a51992d04e..b863899107 100644 --- a/internal/datacoord/import_meta_test.go +++ b/internal/datacoord/import_meta_test.go @@ -28,9 +28,9 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore/mocks" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" ) func TestImportMeta_Restore(t *testing.T) { diff --git a/internal/datacoord/import_scheduler.go b/internal/datacoord/import_scheduler.go index 00b3a8e2d4..871733a25c 100644 --- a/internal/datacoord/import_scheduler.go +++ b/internal/datacoord/import_scheduler.go @@ -30,11 +30,11 @@ import ( "github.com/milvus-io/milvus/internal/datacoord/allocator" "github.com/milvus-io/milvus/internal/datacoord/session" "github.com/milvus-io/milvus/internal/metastore/kv/binlog" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/lock" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/lock" ) const ( diff --git a/internal/datacoord/import_scheduler_test.go b/internal/datacoord/import_scheduler_test.go index b5a928f305..ac739167b1 100644 --- a/internal/datacoord/import_scheduler_test.go +++ b/internal/datacoord/import_scheduler_test.go @@ -31,8 +31,8 @@ import ( "github.com/milvus-io/milvus/internal/datacoord/broker" "github.com/milvus-io/milvus/internal/datacoord/session" "github.com/milvus-io/milvus/internal/metastore/mocks" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) type ImportSchedulerSuite struct { diff --git a/internal/datacoord/import_task.go b/internal/datacoord/import_task.go index a8c0877205..61ad6de759 100644 --- a/internal/datacoord/import_task.go +++ b/internal/datacoord/import_task.go @@ -20,11 +20,11 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) type TaskType int diff --git a/internal/datacoord/import_util.go b/internal/datacoord/import_util.go index 0f49bcbfe3..c7949f45dd 100644 --- a/internal/datacoord/import_util.go +++ b/internal/datacoord/import_util.go @@ -33,13 +33,13 @@ import ( "github.com/milvus-io/milvus/internal/datacoord/allocator" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/importutilv2" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) func WrapTaskLog(task ImportTask, fields ...zap.Field) []zap.Field { diff --git a/internal/datacoord/import_util_test.go b/internal/datacoord/import_util_test.go index 73ea2dc7f8..31af868a69 100644 --- a/internal/datacoord/import_util_test.go +++ b/internal/datacoord/import_util_test.go @@ -39,14 +39,14 @@ import ( mocks2 "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/importutilv2" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) func TestImportUtil_NewPreImportTasks(t *testing.T) { diff --git a/internal/datacoord/index_engine_version_manager.go b/internal/datacoord/index_engine_version_manager.go index 77c6c44e8e..0b836b4281 100644 --- a/internal/datacoord/index_engine_version_manager.go +++ b/internal/datacoord/index_engine_version_manager.go @@ -6,8 +6,8 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/lock" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/lock" ) type IndexEngineVersionManager interface { diff --git a/internal/datacoord/index_meta.go b/internal/datacoord/index_meta.go index 446a47d677..799301a437 100644 --- a/internal/datacoord/index_meta.go +++ b/internal/datacoord/index_meta.go @@ -38,18 +38,18 @@ import ( "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/util/indexparamcheck" "github.com/milvus-io/milvus/internal/util/vecindexmgr" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/indexparams" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/indexparams" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type indexMeta struct { diff --git a/internal/datacoord/index_meta_test.go b/internal/datacoord/index_meta_test.go index 34d41620cd..a686d0016f 100644 --- a/internal/datacoord/index_meta_test.go +++ b/internal/datacoord/index_meta_test.go @@ -34,10 +34,10 @@ import ( "github.com/milvus-io/milvus/internal/metastore/kv/datacoord" catalogmocks "github.com/milvus-io/milvus/internal/metastore/mocks" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" ) func TestReloadFromKV(t *testing.T) { diff --git a/internal/datacoord/index_service.go b/internal/datacoord/index_service.go index 3bf4f07765..81f81ea4bd 100644 --- a/internal/datacoord/index_service.go +++ b/internal/datacoord/index_service.go @@ -31,18 +31,18 @@ import ( "github.com/milvus-io/milvus/internal/parser/planparserv2" "github.com/milvus-io/milvus/internal/util/indexparamcheck" "github.com/milvus-io/milvus/internal/util/vecindexmgr" - "github.com/milvus-io/milvus/pkg/common" - pkgcommon "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + pkgcommon "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // serverID return the session serverID diff --git a/internal/datacoord/index_service_test.go b/internal/datacoord/index_service_test.go index e5ec2d70cf..82176d1954 100644 --- a/internal/datacoord/index_service_test.go +++ b/internal/datacoord/index_service_test.go @@ -42,11 +42,11 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/indexparamcheck" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func TestServerId(t *testing.T) { diff --git a/internal/datacoord/job_manager.go b/internal/datacoord/job_manager.go index 827db4ca37..1f42079aee 100644 --- a/internal/datacoord/job_manager.go +++ b/internal/datacoord/job_manager.go @@ -9,11 +9,11 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/datacoord/allocator" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type StatsJobManager interface { diff --git a/internal/datacoord/job_manager_test.go b/internal/datacoord/job_manager_test.go index 1c8d480b61..3da5886e8b 100644 --- a/internal/datacoord/job_manager_test.go +++ b/internal/datacoord/job_manager_test.go @@ -14,8 +14,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/datacoord/allocator" "github.com/milvus-io/milvus/internal/metastore/mocks" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" ) type jobManagerSuite struct { diff --git a/internal/datacoord/meta.go b/internal/datacoord/meta.go index 0c1f0be588..bd5aa004b1 100644 --- a/internal/datacoord/meta.go +++ b/internal/datacoord/meta.go @@ -38,22 +38,22 @@ import ( "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/segmentutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type CompactionMeta interface { diff --git a/internal/datacoord/meta_test.go b/internal/datacoord/meta_test.go index cb86048350..e4ad6d6acd 100644 --- a/internal/datacoord/meta_test.go +++ b/internal/datacoord/meta_test.go @@ -40,16 +40,16 @@ import ( mocks2 "github.com/milvus-io/milvus/internal/metastore/mocks" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" ) // MetaReloadSuite tests meta reload & meta creation related logic diff --git a/internal/datacoord/meta_util.go b/internal/datacoord/meta_util.go index 036d985608..0de2881421 100644 --- a/internal/datacoord/meta_util.go +++ b/internal/datacoord/meta_util.go @@ -16,7 +16,7 @@ package datacoord -import "github.com/milvus-io/milvus/pkg/proto/datapb" +import "github.com/milvus-io/milvus/pkg/v2/proto/datapb" // reviseVChannelInfo will revise the datapb.VchannelInfo for upgrade compatibility from 2.0.2 func reviseVChannelInfo(vChannel *datapb.VchannelInfo) { diff --git a/internal/datacoord/metrics_info.go b/internal/datacoord/metrics_info.go index 209f101d57..b6b32db5cb 100644 --- a/internal/datacoord/metrics_info.go +++ b/internal/datacoord/metrics_info.go @@ -32,16 +32,16 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/metrics" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" - "github.com/milvus-io/milvus/pkg/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/uniquegenerator" ) // getQuotaMetrics returns DataCoordQuotaMetrics. diff --git a/internal/datacoord/metrics_info_test.go b/internal/datacoord/metrics_info_test.go index b4577948e9..5c732fa183 100644 --- a/internal/datacoord/metrics_info_test.go +++ b/internal/datacoord/metrics_info_test.go @@ -32,12 +32,12 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type mockMetricDataNodeClient struct { diff --git a/internal/datacoord/mock_channel_manager.go b/internal/datacoord/mock_channel_manager.go index bde3063473..2586c1e196 100644 --- a/internal/datacoord/mock_channel_manager.go +++ b/internal/datacoord/mock_channel_manager.go @@ -5,7 +5,7 @@ package datacoord import ( context "context" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/datacoord/mock_cluster.go b/internal/datacoord/mock_cluster.go index 19f67df9f9..eb41111ed1 100644 --- a/internal/datacoord/mock_cluster.go +++ b/internal/datacoord/mock_cluster.go @@ -5,7 +5,7 @@ package datacoord import ( context "context" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" mock "github.com/stretchr/testify/mock" session "github.com/milvus-io/milvus/internal/datacoord/session" diff --git a/internal/datacoord/mock_compaction_meta.go b/internal/datacoord/mock_compaction_meta.go index 59a519d107..10e11453c8 100644 --- a/internal/datacoord/mock_compaction_meta.go +++ b/internal/datacoord/mock_compaction_meta.go @@ -5,7 +5,7 @@ package datacoord import ( context "context" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/datacoord/mock_compaction_plan_context.go b/internal/datacoord/mock_compaction_plan_context.go index 16e45b2146..5c36dcb99d 100644 --- a/internal/datacoord/mock_compaction_plan_context.go +++ b/internal/datacoord/mock_compaction_plan_context.go @@ -5,7 +5,7 @@ package datacoord import ( context "context" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/datacoord/mock_handler.go b/internal/datacoord/mock_handler.go index 264448b8f4..cb5fe55c3d 100644 --- a/internal/datacoord/mock_handler.go +++ b/internal/datacoord/mock_handler.go @@ -5,7 +5,7 @@ package datacoord import ( context "context" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/datacoord/mock_stats_job_manager.go b/internal/datacoord/mock_stats_job_manager.go index be0eac953b..19a1013028 100644 --- a/internal/datacoord/mock_stats_job_manager.go +++ b/internal/datacoord/mock_stats_job_manager.go @@ -3,7 +3,7 @@ package datacoord import ( - indexpb "github.com/milvus-io/milvus/pkg/proto/indexpb" + indexpb "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/datacoord/mock_sub_cluster.go b/internal/datacoord/mock_sub_cluster.go index 36b891bbe9..7ae9424625 100644 --- a/internal/datacoord/mock_sub_cluster.go +++ b/internal/datacoord/mock_sub_cluster.go @@ -5,7 +5,7 @@ package datacoord import ( context "context" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/datacoord/mock_test.go b/internal/datacoord/mock_test.go index 0ec9e78440..38cea70791 100644 --- a/internal/datacoord/mock_test.go +++ b/internal/datacoord/mock_test.go @@ -33,16 +33,16 @@ import ( "github.com/milvus-io/milvus/internal/datacoord/broker" memkv "github.com/milvus-io/milvus/internal/kv/mem" "github.com/milvus-io/milvus/internal/metastore/kv/datacoord" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ kv.MetaKv = &metaMemoryKV{} diff --git a/internal/datacoord/partition_stats_meta.go b/internal/datacoord/partition_stats_meta.go index fde6618ade..d14962ea81 100644 --- a/internal/datacoord/partition_stats_meta.go +++ b/internal/datacoord/partition_stats_meta.go @@ -8,10 +8,10 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/metastore" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) const emptyPartitionStatsVersion = int64(0) diff --git a/internal/datacoord/partition_stats_meta_test.go b/internal/datacoord/partition_stats_meta_test.go index f0ca84b3ba..1e22ccdc97 100644 --- a/internal/datacoord/partition_stats_meta_test.go +++ b/internal/datacoord/partition_stats_meta_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus/internal/metastore/mocks" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) type PartitionStatsMetaSuite struct { diff --git a/internal/datacoord/policy.go b/internal/datacoord/policy.go index 43c256807b..c458097b86 100644 --- a/internal/datacoord/policy.go +++ b/internal/datacoord/policy.go @@ -23,8 +23,8 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // filterNode filters out node-channel info where node ID == `nodeID`. diff --git a/internal/datacoord/policy_test.go b/internal/datacoord/policy_test.go index d3ea88c1bd..87b8777284 100644 --- a/internal/datacoord/policy_test.go +++ b/internal/datacoord/policy_test.go @@ -25,8 +25,8 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) func TestPolicySuite(t *testing.T) { diff --git a/internal/datacoord/segment_allocation_policy.go b/internal/datacoord/segment_allocation_policy.go index 6564d1a16b..d80ba9db47 100644 --- a/internal/datacoord/segment_allocation_policy.go +++ b/internal/datacoord/segment_allocation_policy.go @@ -27,10 +27,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type calUpperLimitPolicy func(schema *schemapb.CollectionSchema) (int, error) diff --git a/internal/datacoord/segment_allocation_policy_test.go b/internal/datacoord/segment_allocation_policy_test.go index 97b304d268..b3bf6b4b54 100644 --- a/internal/datacoord/segment_allocation_policy_test.go +++ b/internal/datacoord/segment_allocation_policy_test.go @@ -26,10 +26,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) func TestUpperLimitCalBySchema(t *testing.T) { diff --git a/internal/datacoord/segment_info.go b/internal/datacoord/segment_info.go index 650be39888..8a395b4d17 100644 --- a/internal/datacoord/segment_info.go +++ b/internal/datacoord/segment_info.go @@ -28,9 +28,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // SegmentsInfo wraps a map, which maintains ID to SegmentInfo relation diff --git a/internal/datacoord/segment_info_test.go b/internal/datacoord/segment_info_test.go index 293a571b53..21d1d80eed 100644 --- a/internal/datacoord/segment_info_test.go +++ b/internal/datacoord/segment_info_test.go @@ -6,7 +6,7 @@ import ( "github.com/samber/lo" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) func TestCompactionTo(t *testing.T) { diff --git a/internal/datacoord/segment_manager.go b/internal/datacoord/segment_manager.go index 4bb45081d1..0177ae221b 100644 --- a/internal/datacoord/segment_manager.go +++ b/internal/datacoord/segment_manager.go @@ -29,12 +29,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/datacoord/allocator" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // allocPool pool of Allocation, to reduce allocation of Allocation diff --git a/internal/datacoord/segment_manager_test.go b/internal/datacoord/segment_manager_test.go index 871e2b6d51..c5b38addba 100644 --- a/internal/datacoord/segment_manager_test.go +++ b/internal/datacoord/segment_manager_test.go @@ -37,13 +37,13 @@ import ( mockkv "github.com/milvus-io/milvus/internal/kv/mocks" "github.com/milvus-io/milvus/internal/metastore/kv/datacoord" "github.com/milvus-io/milvus/internal/metastore/mocks" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestManagerOptions(t *testing.T) { diff --git a/internal/datacoord/segment_operator.go b/internal/datacoord/segment_operator.go index a3beba9868..0a99190736 100644 --- a/internal/datacoord/segment_operator.go +++ b/internal/datacoord/segment_operator.go @@ -16,7 +16,7 @@ package datacoord -import "github.com/milvus-io/milvus/pkg/proto/datapb" +import "github.com/milvus-io/milvus/pkg/v2/proto/datapb" // SegmentOperator is function type to update segment info. type SegmentOperator func(segment *SegmentInfo) bool diff --git a/internal/datacoord/segment_operator_test.go b/internal/datacoord/segment_operator_test.go index 3d7bf4f055..82cb5b7e50 100644 --- a/internal/datacoord/segment_operator_test.go +++ b/internal/datacoord/segment_operator_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) type TestSegmentOperatorSuite struct { diff --git a/internal/datacoord/server.go b/internal/datacoord/server.go index 61928a0b6a..d9fadff3bc 100644 --- a/internal/datacoord/server.go +++ b/internal/datacoord/server.go @@ -52,18 +52,18 @@ import ( "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/expr" - "github.com/milvus-io/milvus/pkg/util/logutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/expr" + "github.com/milvus-io/milvus/pkg/v2/util/logutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/datacoord/server_test.go b/internal/datacoord/server_test.go index 8fca418b0e..5ae91b005a 100644 --- a/internal/datacoord/server_test.go +++ b/internal/datacoord/server_test.go @@ -52,18 +52,18 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tikv" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tikv" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestMain(m *testing.M) { diff --git a/internal/datacoord/services.go b/internal/datacoord/services.go index 8af2266060..9af39eb17d 100644 --- a/internal/datacoord/services.go +++ b/internal/datacoord/services.go @@ -37,19 +37,19 @@ import ( "github.com/milvus-io/milvus/internal/util/importutilv2" "github.com/milvus-io/milvus/internal/util/segmentutil" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // GetTimeTickChannel legacy API, returns time tick channel name diff --git a/internal/datacoord/services_test.go b/internal/datacoord/services_test.go index f3ebb030f4..ff51bd9967 100644 --- a/internal/datacoord/services_test.go +++ b/internal/datacoord/services_test.go @@ -28,14 +28,14 @@ import ( mocks2 "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/mocks/distributed/mock_streaming" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type ServerSuite struct { diff --git a/internal/datacoord/session/datanode_manager.go b/internal/datacoord/session/datanode_manager.go index 7dff99a594..b6f2c11d4e 100644 --- a/internal/datacoord/session/datanode_manager.go +++ b/internal/datacoord/session/datanode_manager.go @@ -30,16 +30,16 @@ import ( grpcdatanodeclient "github.com/milvus-io/milvus/internal/distributed/datanode/client" "github.com/milvus-io/milvus/internal/metastore/kv/binlog" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/datacoord/session/datanode_manager_test.go b/internal/datacoord/session/datanode_manager_test.go index bc2170567d..f1259d11a6 100644 --- a/internal/datacoord/session/datanode_manager_test.go +++ b/internal/datacoord/session/datanode_manager_test.go @@ -26,11 +26,11 @@ import ( "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" ) func TestDataNodeManagerSuite(t *testing.T) { diff --git a/internal/datacoord/session/indexnode_manager.go b/internal/datacoord/session/indexnode_manager.go index 65f42828a4..13ce6b38d2 100644 --- a/internal/datacoord/session/indexnode_manager.go +++ b/internal/datacoord/session/indexnode_manager.go @@ -26,13 +26,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" indexnodeclient "github.com/milvus-io/milvus/internal/distributed/indexnode/client" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - typeutil "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + typeutil "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func defaultIndexNodeCreatorFunc(ctx context.Context, addr string, nodeID int64) (types.IndexNodeClient, error) { diff --git a/internal/datacoord/session/indexnode_manager_test.go b/internal/datacoord/session/indexnode_manager_test.go index 909a470b5e..71bf022322 100644 --- a/internal/datacoord/session/indexnode_manager_test.go +++ b/internal/datacoord/session/indexnode_manager_test.go @@ -26,11 +26,11 @@ import ( "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - typeutil "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + typeutil "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestIndexNodeManager_AddNode(t *testing.T) { diff --git a/internal/datacoord/session/mock_data_node_manager.go b/internal/datacoord/session/mock_data_node_manager.go index 56ff76589f..c53fa7f770 100644 --- a/internal/datacoord/session/mock_data_node_manager.go +++ b/internal/datacoord/session/mock_data_node_manager.go @@ -5,10 +5,10 @@ package session import ( context "context" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" mock "github.com/stretchr/testify/mock" - typeutil "github.com/milvus-io/milvus/pkg/util/typeutil" + typeutil "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // MockDataNodeManager is an autogenerated mock type for the DataNodeManager type diff --git a/internal/datacoord/session/session.go b/internal/datacoord/session/session.go index a77254eff0..5f8048f8f1 100644 --- a/internal/datacoord/session/session.go +++ b/internal/datacoord/session/session.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/lock" ) var errDisposed = errors.New("client is disposed") diff --git a/internal/datacoord/stats_task_meta.go b/internal/datacoord/stats_task_meta.go index d5de7063d7..9a9fbc1557 100644 --- a/internal/datacoord/stats_task_meta.go +++ b/internal/datacoord/stats_task_meta.go @@ -26,12 +26,12 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus/internal/metastore" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) type statsTaskMeta struct { diff --git a/internal/datacoord/stats_task_meta_test.go b/internal/datacoord/stats_task_meta_test.go index 01f7977418..347459363a 100644 --- a/internal/datacoord/stats_task_meta_test.go +++ b/internal/datacoord/stats_task_meta_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus/internal/metastore/mocks" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" ) type statsTaskMetaSuite struct { diff --git a/internal/datacoord/sync_segments_scheduler.go b/internal/datacoord/sync_segments_scheduler.go index 712b8a3345..f50256a5c4 100644 --- a/internal/datacoord/sync_segments_scheduler.go +++ b/internal/datacoord/sync_segments_scheduler.go @@ -25,10 +25,10 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/datacoord/session" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/logutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/logutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type SyncSegmentsScheduler struct { diff --git a/internal/datacoord/sync_segments_scheduler_test.go b/internal/datacoord/sync_segments_scheduler_test.go index 9786c9c30c..e6fd509d90 100644 --- a/internal/datacoord/sync_segments_scheduler_test.go +++ b/internal/datacoord/sync_segments_scheduler_test.go @@ -28,8 +28,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/datacoord/session" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/lock" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/lock" ) type SyncSegmentsSchedulerSuite struct { diff --git a/internal/datacoord/task_analyze.go b/internal/datacoord/task_analyze.go index 0a1cac94f5..b9e41449ad 100644 --- a/internal/datacoord/task_analyze.go +++ b/internal/datacoord/task_analyze.go @@ -29,11 +29,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ Task = (*analyzeTask)(nil) diff --git a/internal/datacoord/task_index.go b/internal/datacoord/task_index.go index a333302642..d5e0737ba0 100644 --- a/internal/datacoord/task_index.go +++ b/internal/datacoord/task_index.go @@ -28,14 +28,14 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/vecindexmgr" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/indexparams" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/indexparams" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type indexBuildTask struct { diff --git a/internal/datacoord/task_scheduler.go b/internal/datacoord/task_scheduler.go index def9b04bb8..f4cf2f0085 100644 --- a/internal/datacoord/task_scheduler.go +++ b/internal/datacoord/task_scheduler.go @@ -28,11 +28,11 @@ import ( "github.com/milvus-io/milvus/internal/datacoord/allocator" "github.com/milvus-io/milvus/internal/datacoord/session" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/lock" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/lock" ) const ( diff --git a/internal/datacoord/task_scheduler_test.go b/internal/datacoord/task_scheduler_test.go index 7d49f232b5..9a1fbf96ca 100644 --- a/internal/datacoord/task_scheduler_test.go +++ b/internal/datacoord/task_scheduler_test.go @@ -35,12 +35,12 @@ import ( catalogmocks "github.com/milvus-io/milvus/internal/metastore/mocks" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var ( diff --git a/internal/datacoord/task_stats.go b/internal/datacoord/task_stats.go index 5242493f60..33ac2d77ee 100644 --- a/internal/datacoord/task_stats.go +++ b/internal/datacoord/task_stats.go @@ -24,11 +24,11 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type statsTask struct { diff --git a/internal/datacoord/task_stats_test.go b/internal/datacoord/task_stats_test.go index 252402d87e..a4fc31814d 100644 --- a/internal/datacoord/task_stats_test.go +++ b/internal/datacoord/task_stats_test.go @@ -31,10 +31,10 @@ import ( "github.com/milvus-io/milvus/internal/datacoord/allocator" catalogmocks "github.com/milvus-io/milvus/internal/metastore/mocks" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" ) type statsTaskSuite struct { diff --git a/internal/datacoord/types.go b/internal/datacoord/types.go index e3a14cba79..b0a4200a83 100644 --- a/internal/datacoord/types.go +++ b/internal/datacoord/types.go @@ -21,7 +21,7 @@ import ( "time" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" ) type Task interface { diff --git a/internal/datacoord/util.go b/internal/datacoord/util.go index d7c504c99c..a22fa66603 100644 --- a/internal/datacoord/util.go +++ b/internal/datacoord/util.go @@ -29,16 +29,16 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/util/vecindexmgr" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Response response interface for verification diff --git a/internal/datacoord/util_test.go b/internal/datacoord/util_test.go index e48db0f513..daf10e9fe1 100644 --- a/internal/datacoord/util_test.go +++ b/internal/datacoord/util_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type UtilSuite struct { diff --git a/internal/datanode/allocator/allocator.go b/internal/datanode/allocator/allocator.go index df3408add7..d40f83d1d6 100644 --- a/internal/datanode/allocator/allocator.go +++ b/internal/datanode/allocator/allocator.go @@ -21,7 +21,7 @@ import ( gAllocator "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type UniqueID = typeutil.UniqueID diff --git a/internal/datanode/allocator/allocator_test.go b/internal/datanode/allocator/allocator_test.go index 87844f4a2d..577b98f0ac 100644 --- a/internal/datanode/allocator/allocator_test.go +++ b/internal/datanode/allocator/allocator_test.go @@ -25,8 +25,8 @@ import ( "google.golang.org/grpc" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func TestGetGenerator(t *testing.T) { diff --git a/internal/datanode/channel/channel_manager.go b/internal/datanode/channel/channel_manager.go index 01f2e5f347..d909f9c230 100644 --- a/internal/datanode/channel/channel_manager.go +++ b/internal/datanode/channel/channel_manager.go @@ -26,12 +26,12 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/pipeline" "github.com/milvus-io/milvus/internal/flushcommon/util" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/lifetime" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/lifetime" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ( diff --git a/internal/datanode/channel/channel_manager_test.go b/internal/datanode/channel/channel_manager_test.go index 3b2c938b4b..bb59f153a7 100644 --- a/internal/datanode/channel/channel_manager_test.go +++ b/internal/datanode/channel/channel_manager_test.go @@ -36,13 +36,13 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/writebuffer" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestMain(t *testing.M) { diff --git a/internal/datanode/channel/mock_channel_manager.go b/internal/datanode/channel/mock_channel_manager.go index efc39da872..8809b3ec02 100644 --- a/internal/datanode/channel/mock_channel_manager.go +++ b/internal/datanode/channel/mock_channel_manager.go @@ -3,7 +3,7 @@ package channel import ( - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/datanode/compaction/clustering_compactor.go b/internal/datanode/compaction/clustering_compactor.go index c8fc77e32c..d59a20dde6 100644 --- a/internal/datanode/compaction/clustering_compactor.go +++ b/internal/datanode/compaction/clustering_compactor.go @@ -42,21 +42,21 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/io" "github.com/milvus-io/milvus/internal/metastore/kv/binlog" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/clusteringpb" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/clusteringpb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/datanode/compaction/clustering_compactor_test.go b/internal/datanode/compaction/clustering_compactor_test.go index 9a79db3208..6fd5f89bf8 100644 --- a/internal/datanode/compaction/clustering_compactor_test.go +++ b/internal/datanode/compaction/clustering_compactor_test.go @@ -34,12 +34,12 @@ import ( "github.com/milvus-io/milvus/internal/datanode/allocator" "github.com/milvus-io/milvus/internal/flushcommon/io" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestClusteringCompactionTaskSuite(t *testing.T) { diff --git a/internal/datanode/compaction/compactor.go b/internal/datanode/compaction/compactor.go index b04a2afdec..c270742be8 100644 --- a/internal/datanode/compaction/compactor.go +++ b/internal/datanode/compaction/compactor.go @@ -17,8 +17,8 @@ package compaction import ( - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) //go:generate mockery --name=Compactor --structname=MockCompactor --output=./ --filename=mock_compactor.go --with-expecter --inpackage diff --git a/internal/datanode/compaction/compactor_common.go b/internal/datanode/compaction/compactor_common.go index 031c390433..22d9d66e59 100644 --- a/internal/datanode/compaction/compactor_common.go +++ b/internal/datanode/compaction/compactor_common.go @@ -29,10 +29,10 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/io" "github.com/milvus-io/milvus/internal/metastore/kv/binlog" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const compactionBatchSize = 100 diff --git a/internal/datanode/compaction/compactor_common_test.go b/internal/datanode/compaction/compactor_common_test.go index 122bdc8307..0cab30a7b3 100644 --- a/internal/datanode/compaction/compactor_common_test.go +++ b/internal/datanode/compaction/compactor_common_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) func TestCompactorCommonTaskSuite(t *testing.T) { diff --git a/internal/datanode/compaction/executor.go b/internal/datanode/compaction/executor.go index 6df00b5179..372d5ea7db 100644 --- a/internal/datanode/compaction/executor.go +++ b/internal/datanode/compaction/executor.go @@ -25,12 +25,12 @@ import ( "go.uber.org/zap" "golang.org/x/sync/semaphore" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/datanode/compaction/executor_test.go b/internal/datanode/compaction/executor_test.go index e8f9f32c50..c2f0f6f134 100644 --- a/internal/datanode/compaction/executor_test.go +++ b/internal/datanode/compaction/executor_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestCompactionExecutor(t *testing.T) { diff --git a/internal/datanode/compaction/l0_compactor.go b/internal/datanode/compaction/l0_compactor.go index 3afc6d963e..eee4d96615 100644 --- a/internal/datanode/compaction/l0_compactor.go +++ b/internal/datanode/compaction/l0_compactor.go @@ -33,15 +33,15 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/metacache/pkoracle" "github.com/milvus-io/milvus/internal/metastore/kv/binlog" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type LevelZeroCompactionTask struct { diff --git a/internal/datanode/compaction/l0_compactor_test.go b/internal/datanode/compaction/l0_compactor_test.go index 168f5ee089..afcf2f429c 100644 --- a/internal/datanode/compaction/l0_compactor_test.go +++ b/internal/datanode/compaction/l0_compactor_test.go @@ -32,12 +32,12 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/metacache/pkoracle" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestLevelZeroCompactionTaskSuite(t *testing.T) { diff --git a/internal/datanode/compaction/load_stats.go b/internal/datanode/compaction/load_stats.go index 3a58ad7908..8cc7860d89 100644 --- a/internal/datanode/compaction/load_stats.go +++ b/internal/datanode/compaction/load_stats.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func LoadBM25Stats(ctx context.Context, chunkManager storage.ChunkManager, schema *schemapb.CollectionSchema, segmentID int64, statsBinlogs []*datapb.FieldBinlog) (map[int64]*storage.BM25Stats, error) { diff --git a/internal/datanode/compaction/merge_sort.go b/internal/datanode/compaction/merge_sort.go index ac77fb73e7..d9678d37ae 100644 --- a/internal/datanode/compaction/merge_sort.go +++ b/internal/datanode/compaction/merge_sort.go @@ -14,12 +14,12 @@ import ( "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/flushcommon/io" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func mergeSortMultipleSegments(ctx context.Context, diff --git a/internal/datanode/compaction/mix_compactor.go b/internal/datanode/compaction/mix_compactor.go index da77b2c257..0bfc99b651 100644 --- a/internal/datanode/compaction/mix_compactor.go +++ b/internal/datanode/compaction/mix_compactor.go @@ -34,14 +34,14 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/io" "github.com/milvus-io/milvus/internal/metastore/kv/binlog" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type mixCompactionTask struct { diff --git a/internal/datanode/compaction/mix_compactor_test.go b/internal/datanode/compaction/mix_compactor_test.go index 6fe4d963eb..0ed8a2fa29 100644 --- a/internal/datanode/compaction/mix_compactor_test.go +++ b/internal/datanode/compaction/mix_compactor_test.go @@ -36,12 +36,12 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/metacache" "github.com/milvus-io/milvus/internal/flushcommon/metacache/pkoracle" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestMixCompactionTaskSuite(t *testing.T) { diff --git a/internal/datanode/compaction/mock_compactor.go b/internal/datanode/compaction/mock_compactor.go index 394fceb43f..c151208903 100644 --- a/internal/datanode/compaction/mock_compactor.go +++ b/internal/datanode/compaction/mock_compactor.go @@ -3,7 +3,7 @@ package compaction import ( - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/datanode/compaction/segment_writer.go b/internal/datanode/compaction/segment_writer.go index 02bd34d643..fda0fb78bc 100644 --- a/internal/datanode/compaction/segment_writer.go +++ b/internal/datanode/compaction/segment_writer.go @@ -35,12 +35,12 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/writebuffer" "github.com/milvus-io/milvus/internal/metastore/kv/binlog" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Not concurrent safe. diff --git a/internal/datanode/compaction/segment_writer_bench_test.go b/internal/datanode/compaction/segment_writer_bench_test.go index 2c9df3daeb..573d3989ff 100644 --- a/internal/datanode/compaction/segment_writer_bench_test.go +++ b/internal/datanode/compaction/segment_writer_bench_test.go @@ -30,9 +30,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func testSegmentWriterBatchSize(b *testing.B, batchSize int) { diff --git a/internal/datanode/compaction/segment_writer_test.go b/internal/datanode/compaction/segment_writer_test.go index 605252bdbf..ecb08aab7c 100644 --- a/internal/datanode/compaction/segment_writer_test.go +++ b/internal/datanode/compaction/segment_writer_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) func TestSegmentWriterSuite(t *testing.T) { diff --git a/internal/datanode/data_node.go b/internal/datanode/data_node.go index 5e9b40dd87..1ca5041fb5 100644 --- a/internal/datanode/data_node.go +++ b/internal/datanode/data_node.go @@ -53,16 +53,16 @@ import ( "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/expr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/expr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/datanode/data_node_test.go b/internal/datanode/data_node_test.go index dbe9a70273..086d8ec9e5 100644 --- a/internal/datanode/data_node_test.go +++ b/internal/datanode/data_node_test.go @@ -40,13 +40,13 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestMain(t *testing.M) { diff --git a/internal/datanode/importv2/hash.go b/internal/datanode/importv2/hash.go index a4c37f739e..2492ba53b8 100644 --- a/internal/datanode/importv2/hash.go +++ b/internal/datanode/importv2/hash.go @@ -21,8 +21,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type HashedData [][]*storage.InsertData // [vchannelIndex][partitionIndex]*storage.InsertData diff --git a/internal/datanode/importv2/pool.go b/internal/datanode/importv2/pool.go index 121aae28d8..3beb04b926 100644 --- a/internal/datanode/importv2/pool.go +++ b/internal/datanode/importv2/pool.go @@ -23,10 +23,10 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var ( diff --git a/internal/datanode/importv2/pool_test.go b/internal/datanode/importv2/pool_test.go index 4449a5031c..1a3d53e20c 100644 --- a/internal/datanode/importv2/pool_test.go +++ b/internal/datanode/importv2/pool_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestResizePools(t *testing.T) { diff --git a/internal/datanode/importv2/scheduler.go b/internal/datanode/importv2/scheduler.go index 1b4a88512a..94aa47d739 100644 --- a/internal/datanode/importv2/scheduler.go +++ b/internal/datanode/importv2/scheduler.go @@ -24,10 +24,10 @@ import ( "github.com/samber/lo" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type Scheduler interface { diff --git a/internal/datanode/importv2/scheduler_test.go b/internal/datanode/importv2/scheduler_test.go index 2eb11c4b49..250513cde2 100644 --- a/internal/datanode/importv2/scheduler_test.go +++ b/internal/datanode/importv2/scheduler_test.go @@ -38,11 +38,11 @@ import ( "github.com/milvus-io/milvus/internal/util/function" "github.com/milvus-io/milvus/internal/util/importutilv2" "github.com/milvus-io/milvus/internal/util/testutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type sampleRow struct { diff --git a/internal/datanode/importv2/task.go b/internal/datanode/importv2/task.go index 105ce35ac8..00382a0613 100644 --- a/internal/datanode/importv2/task.go +++ b/internal/datanode/importv2/task.go @@ -21,8 +21,8 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/conc" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" ) type TaskType int diff --git a/internal/datanode/importv2/task_import.go b/internal/datanode/importv2/task_import.go index 7d5fc67e93..65861e0ff9 100644 --- a/internal/datanode/importv2/task_import.go +++ b/internal/datanode/importv2/task_import.go @@ -32,13 +32,13 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/syncmgr" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/importutilv2" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ImportTask struct { diff --git a/internal/datanode/importv2/task_l0_import.go b/internal/datanode/importv2/task_l0_import.go index b9727d5d46..8f72832841 100644 --- a/internal/datanode/importv2/task_l0_import.go +++ b/internal/datanode/importv2/task_l0_import.go @@ -33,12 +33,12 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/syncmgr" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/importutilv2/binlog" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type L0ImportTask struct { diff --git a/internal/datanode/importv2/task_l0_import_test.go b/internal/datanode/importv2/task_l0_import_test.go index 8548ba604a..67225502ee 100644 --- a/internal/datanode/importv2/task_l0_import_test.go +++ b/internal/datanode/importv2/task_l0_import_test.go @@ -31,11 +31,11 @@ import ( "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/importutilv2" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type L0ImportSuite struct { diff --git a/internal/datanode/importv2/task_l0_preimport.go b/internal/datanode/importv2/task_l0_preimport.go index 6a7e52ff8e..b49f2dab77 100644 --- a/internal/datanode/importv2/task_l0_preimport.go +++ b/internal/datanode/importv2/task_l0_preimport.go @@ -29,13 +29,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/importutilv2/binlog" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type L0PreImportTask struct { diff --git a/internal/datanode/importv2/task_manager.go b/internal/datanode/importv2/task_manager.go index 25b1c4f6cd..cf935e3eac 100644 --- a/internal/datanode/importv2/task_manager.go +++ b/internal/datanode/importv2/task_manager.go @@ -19,7 +19,7 @@ package importv2 import ( "sync" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) type TaskManager interface { diff --git a/internal/datanode/importv2/task_manager_test.go b/internal/datanode/importv2/task_manager_test.go index 4c7faa3aa0..9fe6590ce7 100644 --- a/internal/datanode/importv2/task_manager_test.go +++ b/internal/datanode/importv2/task_manager_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) func TestImportManager(t *testing.T) { diff --git a/internal/datanode/importv2/task_preimport.go b/internal/datanode/importv2/task_preimport.go index c36e2093cb..db884a4179 100644 --- a/internal/datanode/importv2/task_preimport.go +++ b/internal/datanode/importv2/task_preimport.go @@ -30,13 +30,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/importutilv2" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type PreImportTask struct { diff --git a/internal/datanode/importv2/util.go b/internal/datanode/importv2/util.go index a554c33ba3..545e729b51 100644 --- a/internal/datanode/importv2/util.go +++ b/internal/datanode/importv2/util.go @@ -34,12 +34,12 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/syncmgr" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/function" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func WrapTaskNotFoundError(taskID int64) error { diff --git a/internal/datanode/importv2/util_test.go b/internal/datanode/importv2/util_test.go index 0c5a293151..3dd4330dc4 100644 --- a/internal/datanode/importv2/util_test.go +++ b/internal/datanode/importv2/util_test.go @@ -25,8 +25,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/util/testutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) func Test_AppendSystemFieldsData(t *testing.T) { diff --git a/internal/datanode/iterators/deltalog_iterator.go b/internal/datanode/iterators/deltalog_iterator.go index 1f5f8e6619..5afee2b32b 100644 --- a/internal/datanode/iterators/deltalog_iterator.go +++ b/internal/datanode/iterators/deltalog_iterator.go @@ -7,7 +7,7 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) var _ Iterator = (*DeltalogIterator)(nil) diff --git a/internal/datanode/iterators/iterator.go b/internal/datanode/iterators/iterator.go index 158db4ad80..f98a5140c7 100644 --- a/internal/datanode/iterators/iterator.go +++ b/internal/datanode/iterators/iterator.go @@ -4,7 +4,7 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/internal/datanode/metrics_info.go b/internal/datanode/metrics_info.go index 4872b6f6c5..207a42194c 100644 --- a/internal/datanode/metrics_info.go +++ b/internal/datanode/metrics_info.go @@ -23,12 +23,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/flushcommon/util" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/ratelimitutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // getQuotaMetrics returns DataNodeQuotaMetrics. diff --git a/internal/datanode/msghandlerimpl/msg_handler_impl.go b/internal/datanode/msghandlerimpl/msg_handler_impl.go index c8c6c3a681..db7f8ba6ac 100644 --- a/internal/datanode/msghandlerimpl/msg_handler_impl.go +++ b/internal/datanode/msghandlerimpl/msg_handler_impl.go @@ -29,13 +29,13 @@ import ( "github.com/milvus-io/milvus/internal/distributed/streaming" "github.com/milvus-io/milvus/internal/flushcommon/broker" "github.com/milvus-io/milvus/internal/flushcommon/util" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) type msgHandlerImpl struct { diff --git a/internal/datanode/msghandlerimpl/msg_handler_impl_test.go b/internal/datanode/msghandlerimpl/msg_handler_impl_test.go index 5b7367b4d4..56f65fc597 100644 --- a/internal/datanode/msghandlerimpl/msg_handler_impl_test.go +++ b/internal/datanode/msghandlerimpl/msg_handler_impl_test.go @@ -28,7 +28,7 @@ import ( "github.com/milvus-io/milvus/internal/distributed/streaming" "github.com/milvus-io/milvus/internal/flushcommon/broker" "github.com/milvus-io/milvus/internal/mocks/distributed/mock_streaming" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMsgHandlerImpl(t *testing.T) { diff --git a/internal/datanode/services.go b/internal/datanode/services.go index db781c2e18..19271d40b9 100644 --- a/internal/datanode/services.go +++ b/internal/datanode/services.go @@ -35,18 +35,18 @@ import ( "github.com/milvus-io/milvus/internal/metastore/kv/binlog" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/importutilv2" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // WatchDmChannels is not in use diff --git a/internal/datanode/services_test.go b/internal/datanode/services_test.go index 290efa9f45..b87e6c6892 100644 --- a/internal/datanode/services_test.go +++ b/internal/datanode/services_test.go @@ -41,14 +41,14 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/util" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type DataNodeServicesSuite struct { diff --git a/internal/datanode/util/cache.go b/internal/datanode/util/cache.go index 6c3933c3bf..4b40b41b6a 100644 --- a/internal/datanode/util/cache.go +++ b/internal/datanode/util/cache.go @@ -17,7 +17,7 @@ package util import ( - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Cache stores flushing segments' ids to prevent flushing the same segment again and again. diff --git a/internal/datanode/util/cache_test.go b/internal/datanode/util/cache_test.go index 5fced5177d..9073bb49a9 100644 --- a/internal/datanode/util/cache_test.go +++ b/internal/datanode/util/cache_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestMain(t *testing.M) { diff --git a/internal/datanode/util/meta_util.go b/internal/datanode/util/meta_util.go index 4dc158d133..a7f78d82f0 100644 --- a/internal/datanode/util/meta_util.go +++ b/internal/datanode/util/meta_util.go @@ -18,8 +18,8 @@ package util import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" ) // ReviseVChannelInfo will revise the datapb.VchannelInfo for upgrade compatibility from 2.0.2 diff --git a/internal/distributed/connection_manager.go b/internal/distributed/connection_manager.go index 262eba88fb..9d903f3d59 100644 --- a/internal/distributed/connection_manager.go +++ b/internal/distributed/connection_manager.go @@ -33,14 +33,14 @@ import ( "google.golang.org/grpc/credentials/insecure" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // ConnectionManager handles connection to other components of the system diff --git a/internal/distributed/connection_manager_test.go b/internal/distributed/connection_manager_test.go index daebf0e231..24e8572dc5 100644 --- a/internal/distributed/connection_manager_test.go +++ b/internal/distributed/connection_manager_test.go @@ -32,14 +32,14 @@ import ( "google.golang.org/grpc" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestMain(t *testing.M) { diff --git a/internal/distributed/datacoord/client/client.go b/internal/distributed/datacoord/client/client.go index 674d75fc91..03d78764e8 100644 --- a/internal/distributed/datacoord/client/client.go +++ b/internal/distributed/datacoord/client/client.go @@ -30,16 +30,16 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/grpcclient" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var Params *paramtable.ComponentParam = paramtable.Get() diff --git a/internal/distributed/datacoord/client/client_test.go b/internal/distributed/datacoord/client/client_test.go index 84c46ca1a4..dd3434c8e7 100644 --- a/internal/distributed/datacoord/client/client_test.go +++ b/internal/distributed/datacoord/client/client_test.go @@ -32,13 +32,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var mockErr = errors.New("mock grpc err") diff --git a/internal/distributed/datacoord/service.go b/internal/distributed/datacoord/service.go index 947d0f2587..952c628e01 100644 --- a/internal/distributed/datacoord/service.go +++ b/internal/distributed/datacoord/service.go @@ -38,19 +38,19 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" _ "github.com/milvus-io/milvus/internal/util/grpcclient" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/interceptor" - "github.com/milvus-io/milvus/pkg/util/logutil" - "github.com/milvus-io/milvus/pkg/util/netutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tikv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/interceptor" + "github.com/milvus-io/milvus/pkg/v2/util/logutil" + "github.com/milvus-io/milvus/pkg/v2/util/netutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tikv" ) // Server is the grpc server of datacoord diff --git a/internal/distributed/datacoord/service_test.go b/internal/distributed/datacoord/service_test.go index d55539ff62..057eb779ef 100644 --- a/internal/distributed/datacoord/service_test.go +++ b/internal/distributed/datacoord/service_test.go @@ -29,12 +29,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/coordinator/coordclient" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tikv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tikv" ) func Test_NewServer(t *testing.T) { diff --git a/internal/distributed/datanode/client/client.go b/internal/distributed/datanode/client/client.go index 05e09fd526..a51d0d202a 100644 --- a/internal/distributed/datanode/client/client.go +++ b/internal/distributed/datanode/client/client.go @@ -29,13 +29,13 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/grpcclient" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var Params *paramtable.ComponentParam = paramtable.Get() diff --git a/internal/distributed/datanode/client/client_test.go b/internal/distributed/datanode/client/client_test.go index 412a030cb7..79e3c2f2c2 100644 --- a/internal/distributed/datanode/client/client_test.go +++ b/internal/distributed/datanode/client/client_test.go @@ -25,8 +25,8 @@ import ( "google.golang.org/grpc" "github.com/milvus-io/milvus/internal/util/mock" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func Test_NewClient(t *testing.T) { diff --git a/internal/distributed/datanode/service.go b/internal/distributed/datanode/service.go index bd77a592c8..6502a0471d 100644 --- a/internal/distributed/datanode/service.go +++ b/internal/distributed/datanode/service.go @@ -39,17 +39,17 @@ import ( "github.com/milvus-io/milvus/internal/util/componentutil" "github.com/milvus-io/milvus/internal/util/dependency" _ "github.com/milvus-io/milvus/internal/util/grpcclient" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/interceptor" - "github.com/milvus-io/milvus/pkg/util/logutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/netutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/interceptor" + "github.com/milvus-io/milvus/pkg/v2/util/logutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/netutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type Server struct { diff --git a/internal/distributed/datanode/service_test.go b/internal/distributed/datanode/service_test.go index 4203cce694..75f6a9d32b 100644 --- a/internal/distributed/datanode/service_test.go +++ b/internal/distributed/datanode/service_test.go @@ -29,11 +29,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/internal/distributed/indexnode/client/client.go b/internal/distributed/indexnode/client/client.go index 22ed7b10d4..8d6037c732 100644 --- a/internal/distributed/indexnode/client/client.go +++ b/internal/distributed/indexnode/client/client.go @@ -29,13 +29,13 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/grpcclient" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var Params *paramtable.ComponentParam = paramtable.Get() diff --git a/internal/distributed/indexnode/client/client_test.go b/internal/distributed/indexnode/client/client_test.go index 6747ea55ce..afed40c903 100644 --- a/internal/distributed/indexnode/client/client_test.go +++ b/internal/distributed/indexnode/client/client_test.go @@ -29,12 +29,12 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMain(m *testing.M) { diff --git a/internal/distributed/indexnode/service.go b/internal/distributed/indexnode/service.go index 0b6c8900b1..f0f02af630 100644 --- a/internal/distributed/indexnode/service.go +++ b/internal/distributed/indexnode/service.go @@ -36,16 +36,16 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" _ "github.com/milvus-io/milvus/internal/util/grpcclient" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/interceptor" - "github.com/milvus-io/milvus/pkg/util/logutil" - "github.com/milvus-io/milvus/pkg/util/netutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/interceptor" + "github.com/milvus-io/milvus/pkg/v2/util/logutil" + "github.com/milvus-io/milvus/pkg/v2/util/netutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // Server is the grpc wrapper of IndexNode. diff --git a/internal/distributed/indexnode/service_test.go b/internal/distributed/indexnode/service_test.go index 20a48f7d0e..7543ea7ad8 100644 --- a/internal/distributed/indexnode/service_test.go +++ b/internal/distributed/indexnode/service_test.go @@ -27,11 +27,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestIndexNodeServer(t *testing.T) { diff --git a/internal/distributed/proxy/client/client.go b/internal/distributed/proxy/client/client.go index d8f8bcb6fd..90ee5d3b26 100644 --- a/internal/distributed/proxy/client/client.go +++ b/internal/distributed/proxy/client/client.go @@ -29,13 +29,13 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/grpcclient" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var Params *paramtable.ComponentParam = paramtable.Get() diff --git a/internal/distributed/proxy/client/client_test.go b/internal/distributed/proxy/client/client_test.go index 1716665c2e..f30b6a9c70 100644 --- a/internal/distributed/proxy/client/client_test.go +++ b/internal/distributed/proxy/client/client_test.go @@ -26,10 +26,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func Test_NewClient(t *testing.T) { diff --git a/internal/distributed/proxy/httpserver/constant.go b/internal/distributed/proxy/httpserver/constant.go index 3407510b03..687fd2a8f6 100644 --- a/internal/distributed/proxy/httpserver/constant.go +++ b/internal/distributed/proxy/httpserver/constant.go @@ -19,7 +19,7 @@ package httpserver import ( "time" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) // v2 diff --git a/internal/distributed/proxy/httpserver/handler_v1.go b/internal/distributed/proxy/httpserver/handler_v1.go index 2776316dcc..53a6187107 100644 --- a/internal/distributed/proxy/httpserver/handler_v1.go +++ b/internal/distributed/proxy/httpserver/handler_v1.go @@ -35,12 +35,12 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/proxy" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/requestutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/requestutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var RestRequestInterceptorErr = errors.New("interceptor error placeholder") diff --git a/internal/distributed/proxy/httpserver/handler_v1_test.go b/internal/distributed/proxy/httpserver/handler_v1_test.go index 973c32590c..e792289993 100644 --- a/internal/distributed/proxy/httpserver/handler_v1_test.go +++ b/internal/distributed/proxy/httpserver/handler_v1_test.go @@ -39,10 +39,10 @@ import ( "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proxy" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) const ( diff --git a/internal/distributed/proxy/httpserver/handler_v2.go b/internal/distributed/proxy/httpserver/handler_v2.go index 4dfb8eb559..98ad13fe1d 100644 --- a/internal/distributed/proxy/httpserver/handler_v2.go +++ b/internal/distributed/proxy/httpserver/handler_v2.go @@ -44,15 +44,15 @@ import ( "github.com/milvus-io/milvus/internal/proxy" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/hookutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/requestutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/requestutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type HandlersV2 struct { diff --git a/internal/distributed/proxy/httpserver/handler_v2_test.go b/internal/distributed/proxy/httpserver/handler_v2_test.go index 28422ce1c0..1f4cb2b9ca 100644 --- a/internal/distributed/proxy/httpserver/handler_v2_test.go +++ b/internal/distributed/proxy/httpserver/handler_v2_test.go @@ -37,10 +37,10 @@ import ( "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proxy" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) const ( diff --git a/internal/distributed/proxy/httpserver/request_v2.go b/internal/distributed/proxy/httpserver/request_v2.go index 82a10047a3..771a031b27 100644 --- a/internal/distributed/proxy/httpserver/request_v2.go +++ b/internal/distributed/proxy/httpserver/request_v2.go @@ -22,7 +22,7 @@ import ( "github.com/gin-gonic/gin" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type EmptyReq struct{} diff --git a/internal/distributed/proxy/httpserver/resource_group_handler_v2.go b/internal/distributed/proxy/httpserver/resource_group_handler_v2.go index 33a618e259..a060b30d5d 100644 --- a/internal/distributed/proxy/httpserver/resource_group_handler_v2.go +++ b/internal/distributed/proxy/httpserver/resource_group_handler_v2.go @@ -26,7 +26,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/rgpb" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) func toKVPair(data map[string]string) []*commonpb.KeyValuePair { diff --git a/internal/distributed/proxy/httpserver/resource_group_handler_v2_test.go b/internal/distributed/proxy/httpserver/resource_group_handler_v2_test.go index da6980fbb6..9b8569421e 100644 --- a/internal/distributed/proxy/httpserver/resource_group_handler_v2_test.go +++ b/internal/distributed/proxy/httpserver/resource_group_handler_v2_test.go @@ -29,8 +29,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func validateRequestBodyTestCases(t *testing.T, testEngine *gin.Engine, queryTestCases []requestBodyTestCase, allowInt64 bool) { diff --git a/internal/distributed/proxy/httpserver/timeout_middleware.go b/internal/distributed/proxy/httpserver/timeout_middleware.go index e2211f24dd..a9303b99d7 100644 --- a/internal/distributed/proxy/httpserver/timeout_middleware.go +++ b/internal/distributed/proxy/httpserver/timeout_middleware.go @@ -27,7 +27,7 @@ import ( "github.com/gin-gonic/gin" mhttp "github.com/milvus-io/milvus/internal/http" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func defaultResponse(c *gin.Context) { diff --git a/internal/distributed/proxy/httpserver/utils.go b/internal/distributed/proxy/httpserver/utils.go index 64b92899fd..c42eaa4765 100644 --- a/internal/distributed/proxy/httpserver/utils.go +++ b/internal/distributed/proxy/httpserver/utils.go @@ -40,15 +40,15 @@ import ( "github.com/milvus-io/milvus/internal/proxy" "github.com/milvus-io/milvus/internal/proxy/accesslog" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/parameterutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/parameterutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func HTTPReturn(c *gin.Context, code int, result gin.H) { diff --git a/internal/distributed/proxy/httpserver/utils_bench_serialize_vectors_test.go b/internal/distributed/proxy/httpserver/utils_bench_serialize_vectors_test.go index 6c6865c0fe..0334094959 100644 --- a/internal/distributed/proxy/httpserver/utils_bench_serialize_vectors_test.go +++ b/internal/distributed/proxy/httpserver/utils_bench_serialize_vectors_test.go @@ -26,8 +26,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) /* diff --git a/internal/distributed/proxy/httpserver/utils_test.go b/internal/distributed/proxy/httpserver/utils_test.go index 0b87e5661e..340a00c8e1 100644 --- a/internal/distributed/proxy/httpserver/utils_test.go +++ b/internal/distributed/proxy/httpserver/utils_test.go @@ -31,8 +31,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/distributed/proxy/httpserver/wrap_request.go b/internal/distributed/proxy/httpserver/wrap_request.go index 3d04c88687..eb8b944b6d 100644 --- a/internal/distributed/proxy/httpserver/wrap_request.go +++ b/internal/distributed/proxy/httpserver/wrap_request.go @@ -26,7 +26,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // We wrap original protobuf structure for 2 reasons: diff --git a/internal/distributed/proxy/listener_manager.go b/internal/distributed/proxy/listener_manager.go index 8d79d546a5..ee2fc15245 100644 --- a/internal/distributed/proxy/listener_manager.go +++ b/internal/distributed/proxy/listener_manager.go @@ -28,9 +28,9 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/netutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/netutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // newListenerManager creates a new listener diff --git a/internal/distributed/proxy/service.go b/internal/distributed/proxy/service.go index b1d5c5b97b..7c1def3f94 100644 --- a/internal/distributed/proxy/service.go +++ b/internal/distributed/proxy/service.go @@ -61,18 +61,18 @@ import ( "github.com/milvus-io/milvus/internal/util/dependency" _ "github.com/milvus-io/milvus/internal/util/grpcclient" "github.com/milvus-io/milvus/internal/util/hookutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/interceptor" - "github.com/milvus-io/milvus/pkg/util/logutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/interceptor" + "github.com/milvus-io/milvus/pkg/v2/util/logutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var ( diff --git a/internal/distributed/proxy/service_test.go b/internal/distributed/proxy/service_test.go index b8e9f931b5..b51a8ea539 100644 --- a/internal/distributed/proxy/service_test.go +++ b/internal/distributed/proxy/service_test.go @@ -49,11 +49,11 @@ import ( "github.com/milvus-io/milvus/internal/proxy" "github.com/milvus-io/milvus/internal/util/hookutil" milvusmock "github.com/milvus-io/milvus/internal/util/mock" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/uniquegenerator" ) func TestMain(m *testing.M) { diff --git a/internal/distributed/querycoord/client/client.go b/internal/distributed/querycoord/client/client.go index 7b768cd37a..92cd860757 100644 --- a/internal/distributed/querycoord/client/client.go +++ b/internal/distributed/querycoord/client/client.go @@ -29,13 +29,13 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/grpcclient" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var Params *paramtable.ComponentParam = paramtable.Get() diff --git a/internal/distributed/querycoord/client/client_test.go b/internal/distributed/querycoord/client/client_test.go index 10c5db90d9..8b3029a049 100644 --- a/internal/distributed/querycoord/client/client_test.go +++ b/internal/distributed/querycoord/client/client_test.go @@ -30,10 +30,10 @@ import ( "google.golang.org/grpc" "github.com/milvus-io/milvus/internal/util/mock" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMain(m *testing.M) { diff --git a/internal/distributed/querycoord/service.go b/internal/distributed/querycoord/service.go index 558aa97e06..20b50e5e38 100644 --- a/internal/distributed/querycoord/service.go +++ b/internal/distributed/querycoord/service.go @@ -37,18 +37,18 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" _ "github.com/milvus-io/milvus/internal/util/grpcclient" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/interceptor" - "github.com/milvus-io/milvus/pkg/util/logutil" - "github.com/milvus-io/milvus/pkg/util/netutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tikv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/interceptor" + "github.com/milvus-io/milvus/pkg/v2/util/logutil" + "github.com/milvus-io/milvus/pkg/v2/util/netutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tikv" ) // Server is the grpc server of QueryCoord. diff --git a/internal/distributed/querycoord/service_test.go b/internal/distributed/querycoord/service_test.go index ec53b7dbc8..a941200004 100644 --- a/internal/distributed/querycoord/service_test.go +++ b/internal/distributed/querycoord/service_test.go @@ -30,11 +30,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/coordinator/coordclient" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tikv" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tikv" ) // ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/internal/distributed/querynode/client/client.go b/internal/distributed/querynode/client/client.go index 4da097c066..0f6b4f55ae 100644 --- a/internal/distributed/querynode/client/client.go +++ b/internal/distributed/querynode/client/client.go @@ -29,13 +29,13 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/grpcclient" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var Params *paramtable.ComponentParam = paramtable.Get() diff --git a/internal/distributed/querynode/client/client_test.go b/internal/distributed/querynode/client/client_test.go index 779382bb36..1062b516ac 100644 --- a/internal/distributed/querynode/client/client_test.go +++ b/internal/distributed/querynode/client/client_test.go @@ -25,8 +25,8 @@ import ( "google.golang.org/grpc" "github.com/milvus-io/milvus/internal/util/mock" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func Test_NewClient(t *testing.T) { diff --git a/internal/distributed/querynode/service.go b/internal/distributed/querynode/service.go index 5e49e5a396..a42b393943 100644 --- a/internal/distributed/querynode/service.go +++ b/internal/distributed/querynode/service.go @@ -36,17 +36,17 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" _ "github.com/milvus-io/milvus/internal/util/grpcclient" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/interceptor" - "github.com/milvus-io/milvus/pkg/util/logutil" - "github.com/milvus-io/milvus/pkg/util/netutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/interceptor" + "github.com/milvus-io/milvus/pkg/v2/util/logutil" + "github.com/milvus-io/milvus/pkg/v2/util/netutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // UniqueID is an alias for type typeutil.UniqueID, used as a unique identifier for the request. diff --git a/internal/distributed/querynode/service_test.go b/internal/distributed/querynode/service_test.go index 3ac49214b7..4e9546adeb 100644 --- a/internal/distributed/querynode/service_test.go +++ b/internal/distributed/querynode/service_test.go @@ -30,10 +30,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type MockRootCoord struct { diff --git a/internal/distributed/rootcoord/client/client.go b/internal/distributed/rootcoord/client/client.go index 97d839756d..726d4ecf50 100644 --- a/internal/distributed/rootcoord/client/client.go +++ b/internal/distributed/rootcoord/client/client.go @@ -31,14 +31,14 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/grpcclient" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var Params *paramtable.ComponentParam = paramtable.Get() diff --git a/internal/distributed/rootcoord/client/client_test.go b/internal/distributed/rootcoord/client/client_test.go index 299ddd03bd..2512e4149f 100644 --- a/internal/distributed/rootcoord/client/client_test.go +++ b/internal/distributed/rootcoord/client/client_test.go @@ -30,10 +30,10 @@ import ( "google.golang.org/grpc" "github.com/milvus-io/milvus/internal/util/mock" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMain(m *testing.M) { diff --git a/internal/distributed/rootcoord/service.go b/internal/distributed/rootcoord/service.go index 983986cb1c..6b07d9da2d 100644 --- a/internal/distributed/rootcoord/service.go +++ b/internal/distributed/rootcoord/service.go @@ -38,19 +38,19 @@ import ( "github.com/milvus-io/milvus/internal/util/dependency" _ "github.com/milvus-io/milvus/internal/util/grpcclient" streamingserviceinterceptor "github.com/milvus-io/milvus/internal/util/streamingutil/service/interceptor" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/interceptor" - "github.com/milvus-io/milvus/pkg/util/logutil" - "github.com/milvus-io/milvus/pkg/util/netutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tikv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/interceptor" + "github.com/milvus-io/milvus/pkg/v2/util/logutil" + "github.com/milvus-io/milvus/pkg/v2/util/netutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tikv" ) // Server grpc wrapper diff --git a/internal/distributed/rootcoord/service_test.go b/internal/distributed/rootcoord/service_test.go index 917fa9d836..2fdbd16650 100644 --- a/internal/distributed/rootcoord/service_test.go +++ b/internal/distributed/rootcoord/service_test.go @@ -37,11 +37,11 @@ import ( "github.com/milvus-io/milvus/internal/types" kvfactory "github.com/milvus-io/milvus/internal/util/dependency/kv" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tikv" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tikv" ) type mockCore struct { diff --git a/internal/distributed/streaming/append.go b/internal/distributed/streaming/append.go index 59616fa3da..5b917ba3b0 100644 --- a/internal/distributed/streaming/append.go +++ b/internal/distributed/streaming/append.go @@ -4,9 +4,9 @@ import ( "context" "github.com/milvus-io/milvus/internal/distributed/streaming/internal/producer" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) // appendToWAL appends the message to the wal. diff --git a/internal/distributed/streaming/broadcast.go b/internal/distributed/streaming/broadcast.go index 7d9bcea739..c7afb18941 100644 --- a/internal/distributed/streaming/broadcast.go +++ b/internal/distributed/streaming/broadcast.go @@ -3,9 +3,9 @@ package streaming import ( "context" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ Broadcast = broadcast{} diff --git a/internal/distributed/streaming/internal/consumer/consumer.go b/internal/distributed/streaming/internal/consumer/consumer.go index a521f4f1af..63daa6275e 100644 --- a/internal/distributed/streaming/internal/consumer/consumer.go +++ b/internal/distributed/streaming/internal/consumer/consumer.go @@ -1,8 +1,8 @@ package consumer import ( - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" ) var _ ResumableConsumer = (*resumableConsumerImpl)(nil) diff --git a/internal/distributed/streaming/internal/consumer/consumer_impl.go b/internal/distributed/streaming/internal/consumer/consumer_impl.go index 14632e3187..6653086fce 100644 --- a/internal/distributed/streaming/internal/consumer/consumer_impl.go +++ b/internal/distributed/streaming/internal/consumer/consumer_impl.go @@ -10,10 +10,10 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/client/handler" "github.com/milvus-io/milvus/internal/streamingnode/client/handler/consumer" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) var errGracefulShutdown = errors.New("graceful shutdown") diff --git a/internal/distributed/streaming/internal/consumer/consumer_test.go b/internal/distributed/streaming/internal/consumer/consumer_test.go index ffe4d01177..a32c401746 100644 --- a/internal/distributed/streaming/internal/consumer/consumer_test.go +++ b/internal/distributed/streaming/internal/consumer/consumer_test.go @@ -11,10 +11,10 @@ import ( "github.com/milvus-io/milvus/internal/mocks/streamingnode/client/handler/mock_consumer" "github.com/milvus-io/milvus/internal/streamingnode/client/handler" "github.com/milvus-io/milvus/internal/streamingnode/client/handler/consumer" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/message/adaptor" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message/adaptor" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" ) func TestResumableConsumer(t *testing.T) { diff --git a/internal/distributed/streaming/internal/consumer/handler.go b/internal/distributed/streaming/internal/consumer/handler.go index c78bbd2de8..fb5b698a85 100644 --- a/internal/distributed/streaming/internal/consumer/handler.go +++ b/internal/distributed/streaming/internal/consumer/handler.go @@ -1,7 +1,7 @@ package consumer import ( - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) // nopCloseHandler is a handler that do nothing when close. diff --git a/internal/distributed/streaming/internal/consumer/message_handler.go b/internal/distributed/streaming/internal/consumer/message_handler.go index e790ad2c6d..9c42d89a26 100644 --- a/internal/distributed/streaming/internal/consumer/message_handler.go +++ b/internal/distributed/streaming/internal/consumer/message_handler.go @@ -1,7 +1,7 @@ package consumer import ( - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) // timeTickOrderMessageHandler is a message handler that will record the last sent message id. diff --git a/internal/distributed/streaming/internal/consumer/metrics.go b/internal/distributed/streaming/internal/consumer/metrics.go index 4e0c185bc1..f825d1be01 100644 --- a/internal/distributed/streaming/internal/consumer/metrics.go +++ b/internal/distributed/streaming/internal/consumer/metrics.go @@ -3,8 +3,8 @@ package consumer import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // newConsumerMetrics creates a new producer metrics. diff --git a/internal/distributed/streaming/internal/producer/metrics.go b/internal/distributed/streaming/internal/producer/metrics.go index 7eae6a6869..8f90c0bcb8 100644 --- a/internal/distributed/streaming/internal/producer/metrics.go +++ b/internal/distributed/streaming/internal/producer/metrics.go @@ -6,8 +6,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // newProducerMetrics creates a new producer metrics. diff --git a/internal/distributed/streaming/internal/producer/producer.go b/internal/distributed/streaming/internal/producer/producer.go index 19eb0aaef8..97c061d757 100644 --- a/internal/distributed/streaming/internal/producer/producer.go +++ b/internal/distributed/streaming/internal/producer/producer.go @@ -13,11 +13,11 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/client/handler" "github.com/milvus-io/milvus/internal/streamingnode/client/handler/producer" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var errGracefulShutdown = errors.New("graceful shutdown") diff --git a/internal/distributed/streaming/internal/producer/producer_resuming.go b/internal/distributed/streaming/internal/producer/producer_resuming.go index c0469225f1..1c867a7aad 100644 --- a/internal/distributed/streaming/internal/producer/producer_resuming.go +++ b/internal/distributed/streaming/internal/producer/producer_resuming.go @@ -8,7 +8,7 @@ import ( "github.com/milvus-io/milvus/internal/distributed/streaming/internal/errs" "github.com/milvus-io/milvus/internal/streamingnode/client/handler" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) // newProducerWithResumingError creates a new producer with resuming error. diff --git a/internal/distributed/streaming/internal/producer/producer_test.go b/internal/distributed/streaming/internal/producer/producer_test.go index 7ef50b7fc2..5ff050a411 100644 --- a/internal/distributed/streaming/internal/producer/producer_test.go +++ b/internal/distributed/streaming/internal/producer/producer_test.go @@ -12,9 +12,9 @@ import ( "github.com/milvus-io/milvus/internal/mocks/streamingnode/client/handler/mock_producer" "github.com/milvus-io/milvus/internal/streamingnode/client/handler" "github.com/milvus-io/milvus/internal/streamingnode/client/handler/producer" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) func TestResumableProducer(t *testing.T) { diff --git a/internal/distributed/streaming/streaming.go b/internal/distributed/streaming/streaming.go index ba96862f04..9da127ad06 100644 --- a/internal/distributed/streaming/streaming.go +++ b/internal/distributed/streaming/streaming.go @@ -6,9 +6,9 @@ import ( "github.com/milvus-io/milvus/internal/streamingcoord/server/broadcaster/registry" kvfactory "github.com/milvus-io/milvus/internal/util/dependency/kv" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) var singleton WALAccesser = nil diff --git a/internal/distributed/streaming/streaming_test.go b/internal/distributed/streaming/streaming_test.go index 12a3710778..5ad171e9b7 100644 --- a/internal/distributed/streaming/streaming_test.go +++ b/internal/distributed/streaming/streaming_test.go @@ -13,12 +13,12 @@ import ( "github.com/milvus-io/milvus/internal/distributed/streaming" "github.com/milvus-io/milvus/internal/util/streamingutil" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/message/adaptor" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - _ "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/pulsar" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message/adaptor" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + _ "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/pulsar" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var vChannels = []string{ diff --git a/internal/distributed/streaming/txn.go b/internal/distributed/streaming/txn.go index b0d86468c8..483af18dd8 100644 --- a/internal/distributed/streaming/txn.go +++ b/internal/distributed/streaming/txn.go @@ -5,8 +5,8 @@ import ( "sync" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) var _ Txn = (*txnImpl)(nil) diff --git a/internal/distributed/streaming/util.go b/internal/distributed/streaming/util.go index 02ba8e4584..68a1edddb2 100644 --- a/internal/distributed/streaming/util.go +++ b/internal/distributed/streaming/util.go @@ -4,8 +4,8 @@ import ( "context" "sync" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) type ( diff --git a/internal/distributed/streaming/wal.go b/internal/distributed/streaming/wal.go index fbd7ab469d..ed036bf8b5 100644 --- a/internal/distributed/streaming/wal.go +++ b/internal/distributed/streaming/wal.go @@ -14,11 +14,11 @@ import ( "github.com/milvus-io/milvus/internal/util/streamingutil" "github.com/milvus-io/milvus/internal/util/streamingutil/status" "github.com/milvus-io/milvus/internal/util/streamingutil/util" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ErrWALAccesserClosed = status.NewOnShutdownError("wal accesser closed") diff --git a/internal/distributed/streaming/wal_test.go b/internal/distributed/streaming/wal_test.go index 9e6a2d3695..7f3a4d1f3d 100644 --- a/internal/distributed/streaming/wal_test.go +++ b/internal/distributed/streaming/wal_test.go @@ -14,11 +14,11 @@ import ( "github.com/milvus-io/milvus/internal/mocks/streamingcoord/mock_client" "github.com/milvus-io/milvus/internal/mocks/streamingnode/client/handler/mock_producer" "github.com/milvus-io/milvus/internal/mocks/streamingnode/client/mock_handler" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/distributed/streamingnode/service.go b/internal/distributed/streamingnode/service.go index 4464eb9c32..f2ff87e9d1 100644 --- a/internal/distributed/streamingnode/service.go +++ b/internal/distributed/streamingnode/service.go @@ -45,20 +45,20 @@ import ( kvfactory "github.com/milvus-io/milvus/internal/util/dependency/kv" "github.com/milvus-io/milvus/internal/util/sessionutil" streamingserviceinterceptor "github.com/milvus-io/milvus/internal/util/streamingutil/service/interceptor" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/interceptor" - "github.com/milvus-io/milvus/pkg/util/logutil" - "github.com/milvus-io/milvus/pkg/util/netutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/tikv" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/interceptor" + "github.com/milvus-io/milvus/pkg/v2/util/logutil" + "github.com/milvus-io/milvus/pkg/v2/util/netutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/tikv" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Server is the grpc server of streamingnode. diff --git a/internal/distributed/utils/util.go b/internal/distributed/utils/util.go index 894d6f0199..cf338dbb41 100644 --- a/internal/distributed/utils/util.go +++ b/internal/distributed/utils/util.go @@ -11,8 +11,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func GracefulStopGRPCServer(s *grpc.Server) { diff --git a/internal/distributed/utils/util_test.go b/internal/distributed/utils/util_test.go index cf65f3feb1..ba89418480 100644 --- a/internal/distributed/utils/util_test.go +++ b/internal/distributed/utils/util_test.go @@ -5,7 +5,7 @@ import ( "google.golang.org/grpc" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestGracefulStopGrpcServer(t *testing.T) { diff --git a/internal/flushcommon/broker/broker.go b/internal/flushcommon/broker/broker.go index 5af668ea29..b08c34ded9 100644 --- a/internal/flushcommon/broker/broker.go +++ b/internal/flushcommon/broker/broker.go @@ -5,9 +5,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Broker is the interface for datanode to interact with other components. diff --git a/internal/flushcommon/broker/datacoord.go b/internal/flushcommon/broker/datacoord.go index 3be9e374e0..fcd9708912 100644 --- a/internal/flushcommon/broker/datacoord.go +++ b/internal/flushcommon/broker/datacoord.go @@ -12,14 +12,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/metastore/kv/binlog" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type dataCoordBroker struct { diff --git a/internal/flushcommon/broker/datacoord_test.go b/internal/flushcommon/broker/datacoord_test.go index 31d6df389e..2ede261b66 100644 --- a/internal/flushcommon/broker/datacoord_test.go +++ b/internal/flushcommon/broker/datacoord_test.go @@ -14,11 +14,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type dataCoordSuite struct { diff --git a/internal/flushcommon/broker/mock_broker.go b/internal/flushcommon/broker/mock_broker.go index 97ea094914..030c7c34f4 100644 --- a/internal/flushcommon/broker/mock_broker.go +++ b/internal/flushcommon/broker/mock_broker.go @@ -5,8 +5,8 @@ package broker import ( context "context" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" mock "github.com/stretchr/testify/mock" diff --git a/internal/flushcommon/io/binlog_io.go b/internal/flushcommon/io/binlog_io.go index 73eb866bb5..5088162f5e 100644 --- a/internal/flushcommon/io/binlog_io.go +++ b/internal/flushcommon/io/binlog_io.go @@ -25,10 +25,10 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type BinlogIO interface { diff --git a/internal/flushcommon/io/binlog_io_test.go b/internal/flushcommon/io/binlog_io_test.go index df5cc6fbe1..d4b0fa5493 100644 --- a/internal/flushcommon/io/binlog_io_test.go +++ b/internal/flushcommon/io/binlog_io_test.go @@ -9,7 +9,7 @@ import ( "golang.org/x/net/context" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) const binlogIOTestDir = "/tmp/milvus_test/binlog_io" diff --git a/internal/flushcommon/io/io_pool.go b/internal/flushcommon/io/io_pool.go index 966bb9efce..e9d2f3953b 100644 --- a/internal/flushcommon/io/io_pool.go +++ b/internal/flushcommon/io/io_pool.go @@ -7,11 +7,11 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var ( diff --git a/internal/flushcommon/io/io_pool_test.go b/internal/flushcommon/io/io_pool_test.go index 4c72f7b361..30f3bee2a0 100644 --- a/internal/flushcommon/io/io_pool_test.go +++ b/internal/flushcommon/io/io_pool_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestGetOrCreateIOPool(t *testing.T) { diff --git a/internal/flushcommon/io/mock_binlogio.go b/internal/flushcommon/io/mock_binlogio.go index 7e041f5740..011ae78967 100644 --- a/internal/flushcommon/io/mock_binlogio.go +++ b/internal/flushcommon/io/mock_binlogio.go @@ -5,7 +5,7 @@ package io import ( context "context" - conc "github.com/milvus-io/milvus/pkg/util/conc" + conc "github.com/milvus-io/milvus/pkg/v2/util/conc" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/flushcommon/metacache/actions.go b/internal/flushcommon/metacache/actions.go index c6219c6f8c..845d0bd4c1 100644 --- a/internal/flushcommon/metacache/actions.go +++ b/internal/flushcommon/metacache/actions.go @@ -20,9 +20,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type segmentCriterion struct { diff --git a/internal/flushcommon/metacache/bm25_stats_test.go b/internal/flushcommon/metacache/bm25_stats_test.go index bf4fb79053..7cd3ee1693 100644 --- a/internal/flushcommon/metacache/bm25_stats_test.go +++ b/internal/flushcommon/metacache/bm25_stats_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type BM25StatsSetSuite struct { diff --git a/internal/flushcommon/metacache/meta_cache.go b/internal/flushcommon/metacache/meta_cache.go index 52c83d553d..29638d61a4 100644 --- a/internal/flushcommon/metacache/meta_cache.go +++ b/internal/flushcommon/metacache/meta_cache.go @@ -26,8 +26,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/flushcommon/metacache/pkoracle" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) //go:generate mockery --name=MetaCache --structname=MockMetaCache --output=./ --filename=mock_meta_cache.go --with-expecter --inpackage diff --git a/internal/flushcommon/metacache/meta_cache_test.go b/internal/flushcommon/metacache/meta_cache_test.go index a01ed49374..e309fd3f47 100644 --- a/internal/flushcommon/metacache/meta_cache_test.go +++ b/internal/flushcommon/metacache/meta_cache_test.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/flushcommon/metacache/pkoracle" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type MetaCacheSuite struct { diff --git a/internal/flushcommon/metacache/mock_meta_cache.go b/internal/flushcommon/metacache/mock_meta_cache.go index 1a05e2ca31..0acbfd0a6b 100644 --- a/internal/flushcommon/metacache/mock_meta_cache.go +++ b/internal/flushcommon/metacache/mock_meta_cache.go @@ -3,7 +3,7 @@ package metacache import ( - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" mock "github.com/stretchr/testify/mock" pkoracle "github.com/milvus-io/milvus/internal/flushcommon/metacache/pkoracle" diff --git a/internal/flushcommon/metacache/pkoracle/bloom_filter_set.go b/internal/flushcommon/metacache/pkoracle/bloom_filter_set.go index 11abe9de06..df81759c01 100644 --- a/internal/flushcommon/metacache/pkoracle/bloom_filter_set.go +++ b/internal/flushcommon/metacache/pkoracle/bloom_filter_set.go @@ -23,7 +23,7 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/bloomfilter" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var _ PkStat = (*BloomFilterSet)(nil) diff --git a/internal/flushcommon/metacache/pkoracle/bloom_filter_set_test.go b/internal/flushcommon/metacache/pkoracle/bloom_filter_set_test.go index d0c324ad2f..10c0800a98 100644 --- a/internal/flushcommon/metacache/pkoracle/bloom_filter_set_test.go +++ b/internal/flushcommon/metacache/pkoracle/bloom_filter_set_test.go @@ -24,7 +24,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type BloomFilterSetSuite struct { diff --git a/internal/flushcommon/metacache/pkoracle/lazy_pk_stats.go b/internal/flushcommon/metacache/pkoracle/lazy_pk_stats.go index 1171fd2328..62fbcaecc4 100644 --- a/internal/flushcommon/metacache/pkoracle/lazy_pk_stats.go +++ b/internal/flushcommon/metacache/pkoracle/lazy_pk_stats.go @@ -21,7 +21,7 @@ import ( "go.uber.org/atomic" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) var _ PkStat = (*LazyPkStats)(nil) diff --git a/internal/flushcommon/metacache/segment.go b/internal/flushcommon/metacache/segment.go index 35ca13069c..bfd15b58d5 100644 --- a/internal/flushcommon/metacache/segment.go +++ b/internal/flushcommon/metacache/segment.go @@ -21,7 +21,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/flushcommon/metacache/pkoracle" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) type SegmentInfo struct { diff --git a/internal/flushcommon/metacache/segment_test.go b/internal/flushcommon/metacache/segment_test.go index 3a0abb23c6..61237c7b8a 100644 --- a/internal/flushcommon/metacache/segment_test.go +++ b/internal/flushcommon/metacache/segment_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus/internal/flushcommon/metacache/pkoracle" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) type SegmentSuite struct { diff --git a/internal/flushcommon/pipeline/data_sync_service.go b/internal/flushcommon/pipeline/data_sync_service.go index 4854e670a9..1fbda3040a 100644 --- a/internal/flushcommon/pipeline/data_sync_service.go +++ b/internal/flushcommon/pipeline/data_sync_service.go @@ -35,15 +35,15 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/flowgraph" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // DataSyncService controls a flowgraph for a specific collection diff --git a/internal/flushcommon/pipeline/data_sync_service_test.go b/internal/flushcommon/pipeline/data_sync_service_test.go index 958e872ef7..e919aec98a 100644 --- a/internal/flushcommon/pipeline/data_sync_service_test.go +++ b/internal/flushcommon/pipeline/data_sync_service_test.go @@ -41,13 +41,13 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var dataSyncServiceTestDir = "/tmp/milvus_test/data_sync_service" diff --git a/internal/flushcommon/pipeline/flow_graph_dd_node.go b/internal/flushcommon/pipeline/flow_graph_dd_node.go index f9cd966868..a256f2cee8 100644 --- a/internal/flushcommon/pipeline/flow_graph_dd_node.go +++ b/internal/flushcommon/pipeline/flow_graph_dd_node.go @@ -32,14 +32,14 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/util" "github.com/milvus-io/milvus/internal/util/flowgraph" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/streaming/util/message/adaptor" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message/adaptor" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // make sure ddNode implements flowgraph.Node diff --git a/internal/flushcommon/pipeline/flow_graph_dd_node_test.go b/internal/flushcommon/pipeline/flow_graph_dd_node_test.go index 61e18a6127..76fe3bd9ee 100644 --- a/internal/flushcommon/pipeline/flow_graph_dd_node_test.go +++ b/internal/flushcommon/pipeline/flow_graph_dd_node_test.go @@ -30,12 +30,12 @@ import ( "github.com/milvus-io/milvus/internal/datanode/compaction" "github.com/milvus-io/milvus/internal/mocks/flushcommon/mock_util" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/message/adaptor" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message/adaptor" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/flushcommon/pipeline/flow_graph_dmstream_input_node.go b/internal/flushcommon/pipeline/flow_graph_dmstream_input_node.go index 8ed0876288..f0c8d55a86 100644 --- a/internal/flushcommon/pipeline/flow_graph_dmstream_input_node.go +++ b/internal/flushcommon/pipeline/flow_graph_dmstream_input_node.go @@ -28,17 +28,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/flowgraph" - pkgcommon "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + pkgcommon "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // DmInputNode receives messages from message streams, packs messages between two timeticks, and passes all diff --git a/internal/flushcommon/pipeline/flow_graph_dmstream_input_node_test.go b/internal/flushcommon/pipeline/flow_graph_dmstream_input_node_test.go index 2b0cca3923..ac447003a3 100644 --- a/internal/flushcommon/pipeline/flow_graph_dmstream_input_node_test.go +++ b/internal/flushcommon/pipeline/flow_graph_dmstream_input_node_test.go @@ -25,9 +25,9 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type mockMsgStreamFactory struct { diff --git a/internal/flushcommon/pipeline/flow_graph_embedding_node.go b/internal/flushcommon/pipeline/flow_graph_embedding_node.go index 87e9701e53..084598d429 100644 --- a/internal/flushcommon/pipeline/flow_graph_embedding_node.go +++ b/internal/flushcommon/pipeline/flow_graph_embedding_node.go @@ -25,8 +25,8 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/writebuffer" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/function" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // TODO support set EmbddingType diff --git a/internal/flushcommon/pipeline/flow_graph_embedding_node_test.go b/internal/flushcommon/pipeline/flow_graph_embedding_node_test.go index 274631228f..709534e2b1 100644 --- a/internal/flushcommon/pipeline/flow_graph_embedding_node_test.go +++ b/internal/flushcommon/pipeline/flow_graph_embedding_node_test.go @@ -25,8 +25,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" ) func TestEmbeddingNode_BM25_Operator(t *testing.T) { diff --git a/internal/flushcommon/pipeline/flow_graph_manager.go b/internal/flushcommon/pipeline/flow_graph_manager.go index 9a93b0c771..52c92216db 100644 --- a/internal/flushcommon/pipeline/flow_graph_manager.go +++ b/internal/flushcommon/pipeline/flow_graph_manager.go @@ -24,12 +24,12 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/util" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type FlowgraphManager interface { diff --git a/internal/flushcommon/pipeline/flow_graph_manager_test.go b/internal/flushcommon/pipeline/flow_graph_manager_test.go index 3a06492768..bd39fe1b48 100644 --- a/internal/flushcommon/pipeline/flow_graph_manager_test.go +++ b/internal/flushcommon/pipeline/flow_graph_manager_test.go @@ -37,14 +37,14 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/metrics" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestMain(t *testing.M) { diff --git a/internal/flushcommon/pipeline/flow_graph_message.go b/internal/flushcommon/pipeline/flow_graph_message.go index 18877e5b12..cabe788a31 100644 --- a/internal/flushcommon/pipeline/flow_graph_message.go +++ b/internal/flushcommon/pipeline/flow_graph_message.go @@ -22,8 +22,8 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/writebuffer" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ( diff --git a/internal/flushcommon/pipeline/flow_graph_message_test.go b/internal/flushcommon/pipeline/flow_graph_message_test.go index 30dac9708f..8b69770e66 100644 --- a/internal/flushcommon/pipeline/flow_graph_message_test.go +++ b/internal/flushcommon/pipeline/flow_graph_message_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus/internal/flushcommon/util" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestInsertMsg_TimeTick(te *testing.T) { diff --git a/internal/flushcommon/pipeline/flow_graph_node.go b/internal/flushcommon/pipeline/flow_graph_node.go index 3c8a246b2c..10f5d13e33 100644 --- a/internal/flushcommon/pipeline/flow_graph_node.go +++ b/internal/flushcommon/pipeline/flow_graph_node.go @@ -20,7 +20,7 @@ import ( "sync/atomic" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) type ( diff --git a/internal/flushcommon/pipeline/flow_graph_time_tick_node.go b/internal/flushcommon/pipeline/flow_graph_time_tick_node.go index 72f7d4b84b..c7ba46a2c2 100644 --- a/internal/flushcommon/pipeline/flow_graph_time_tick_node.go +++ b/internal/flushcommon/pipeline/flow_graph_time_tick_node.go @@ -30,9 +30,9 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/util" "github.com/milvus-io/milvus/internal/flushcommon/writebuffer" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) // make sure ttNode implements flowgraph.Node diff --git a/internal/flushcommon/pipeline/flow_graph_write_node.go b/internal/flushcommon/pipeline/flow_graph_write_node.go index 46e1a5a4aa..3ace91d5c4 100644 --- a/internal/flushcommon/pipeline/flow_graph_write_node.go +++ b/internal/flushcommon/pipeline/flow_graph_write_node.go @@ -16,9 +16,9 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/util" "github.com/milvus-io/milvus/internal/flushcommon/writebuffer" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type writeNode struct { diff --git a/internal/flushcommon/pipeline/testutils_test.go b/internal/flushcommon/pipeline/testutils_test.go index d9323ca59a..145e2c225c 100644 --- a/internal/flushcommon/pipeline/testutils_test.go +++ b/internal/flushcommon/pipeline/testutils_test.go @@ -35,14 +35,14 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const returnError = "ReturnError" diff --git a/internal/flushcommon/syncmgr/key_lock_dispatcher.go b/internal/flushcommon/syncmgr/key_lock_dispatcher.go index 9dbeead8fe..67b7d184ab 100644 --- a/internal/flushcommon/syncmgr/key_lock_dispatcher.go +++ b/internal/flushcommon/syncmgr/key_lock_dispatcher.go @@ -4,8 +4,8 @@ import ( "context" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/lock" ) type Task interface { diff --git a/internal/flushcommon/syncmgr/meta_writer.go b/internal/flushcommon/syncmgr/meta_writer.go index 6cc8f19b36..3030df7899 100644 --- a/internal/flushcommon/syncmgr/meta_writer.go +++ b/internal/flushcommon/syncmgr/meta_writer.go @@ -10,11 +10,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/flushcommon/broker" "github.com/milvus-io/milvus/internal/flushcommon/metacache" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) // MetaWriter is the interface for SyncManager to write segment sync meta. diff --git a/internal/flushcommon/syncmgr/meta_writer_test.go b/internal/flushcommon/syncmgr/meta_writer_test.go index 3db8ce1f0d..3cfdad4f25 100644 --- a/internal/flushcommon/syncmgr/meta_writer_test.go +++ b/internal/flushcommon/syncmgr/meta_writer_test.go @@ -11,9 +11,9 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/broker" "github.com/milvus-io/milvus/internal/flushcommon/metacache" "github.com/milvus-io/milvus/internal/flushcommon/metacache/pkoracle" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) type MetaWriterSuite struct { diff --git a/internal/flushcommon/syncmgr/mock_pack_writer.go b/internal/flushcommon/syncmgr/mock_pack_writer.go index c6f0c07945..5c5e5de3db 100644 --- a/internal/flushcommon/syncmgr/mock_pack_writer.go +++ b/internal/flushcommon/syncmgr/mock_pack_writer.go @@ -5,7 +5,7 @@ package syncmgr import ( context "context" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/flushcommon/syncmgr/mock_sync_manager.go b/internal/flushcommon/syncmgr/mock_sync_manager.go index 0078c8a23c..1ab59e8ce1 100644 --- a/internal/flushcommon/syncmgr/mock_sync_manager.go +++ b/internal/flushcommon/syncmgr/mock_sync_manager.go @@ -5,7 +5,7 @@ package syncmgr import ( context "context" - conc "github.com/milvus-io/milvus/pkg/util/conc" + conc "github.com/milvus-io/milvus/pkg/v2/util/conc" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/flushcommon/syncmgr/options.go b/internal/flushcommon/syncmgr/options.go index 4a95e50ae4..c331eaec1d 100644 --- a/internal/flushcommon/syncmgr/options.go +++ b/internal/flushcommon/syncmgr/options.go @@ -4,7 +4,7 @@ import ( "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/flushcommon/metacache" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) func NewSyncTask() *SyncTask { diff --git a/internal/flushcommon/syncmgr/pack_writer.go b/internal/flushcommon/syncmgr/pack_writer.go index 422f744318..93c8f8f346 100644 --- a/internal/flushcommon/syncmgr/pack_writer.go +++ b/internal/flushcommon/syncmgr/pack_writer.go @@ -26,11 +26,11 @@ import ( "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/flushcommon/metacache" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) type PackWriter interface { diff --git a/internal/flushcommon/syncmgr/pack_writer_test.go b/internal/flushcommon/syncmgr/pack_writer_test.go index 5c57aa0844..d9e66483c0 100644 --- a/internal/flushcommon/syncmgr/pack_writer_test.go +++ b/internal/flushcommon/syncmgr/pack_writer_test.go @@ -31,9 +31,9 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/metacache" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestNextID(t *testing.T) { diff --git a/internal/flushcommon/syncmgr/serializer.go b/internal/flushcommon/syncmgr/serializer.go index 69f7171b2a..9f5386133e 100644 --- a/internal/flushcommon/syncmgr/serializer.go +++ b/internal/flushcommon/syncmgr/serializer.go @@ -24,8 +24,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/flushcommon/metacache" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Serializer is the interface for storage/storageV2 implementation to encoding diff --git a/internal/flushcommon/syncmgr/storage_serializer.go b/internal/flushcommon/syncmgr/storage_serializer.go index e866a58bf0..abcc2cdd26 100644 --- a/internal/flushcommon/syncmgr/storage_serializer.go +++ b/internal/flushcommon/syncmgr/storage_serializer.go @@ -27,9 +27,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/flushcommon/metacache" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type storageV1Serializer struct { diff --git a/internal/flushcommon/syncmgr/storage_serializer_test.go b/internal/flushcommon/syncmgr/storage_serializer_test.go index 51d3618329..28a6ca5014 100644 --- a/internal/flushcommon/syncmgr/storage_serializer_test.go +++ b/internal/flushcommon/syncmgr/storage_serializer_test.go @@ -33,10 +33,10 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/metacache" "github.com/milvus-io/milvus/internal/flushcommon/metacache/pkoracle" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type StorageV1SerializerSuite struct { diff --git a/internal/flushcommon/syncmgr/sync_manager.go b/internal/flushcommon/syncmgr/sync_manager.go index d82583ad8e..f334f625e0 100644 --- a/internal/flushcommon/syncmgr/sync_manager.go +++ b/internal/flushcommon/syncmgr/sync_manager.go @@ -15,11 +15,11 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/metacache" "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type SyncManagerOption struct { diff --git a/internal/flushcommon/syncmgr/sync_manager_test.go b/internal/flushcommon/syncmgr/sync_manager_test.go index af021748e7..39ec0dea12 100644 --- a/internal/flushcommon/syncmgr/sync_manager_test.go +++ b/internal/flushcommon/syncmgr/sync_manager_test.go @@ -21,11 +21,11 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/metacache/pkoracle" "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type SyncManagerSuite struct { diff --git a/internal/flushcommon/syncmgr/task.go b/internal/flushcommon/syncmgr/task.go index c98e08ad2a..1a9911992d 100644 --- a/internal/flushcommon/syncmgr/task.go +++ b/internal/flushcommon/syncmgr/task.go @@ -29,16 +29,16 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/metacache" "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type SyncTask struct { diff --git a/internal/flushcommon/syncmgr/task_test.go b/internal/flushcommon/syncmgr/task_test.go index 595a1557f8..beb68b7623 100644 --- a/internal/flushcommon/syncmgr/task_test.go +++ b/internal/flushcommon/syncmgr/task_test.go @@ -38,12 +38,12 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type SyncTaskSuite struct { diff --git a/internal/flushcommon/util/checkpoint_updater.go b/internal/flushcommon/util/checkpoint_updater.go index 31341e6b56..be426000b0 100644 --- a/internal/flushcommon/util/checkpoint_updater.go +++ b/internal/flushcommon/util/checkpoint_updater.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/flushcommon/broker" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/flushcommon/util/checkpoint_updater_test.go b/internal/flushcommon/util/checkpoint_updater_test.go index a7266f8de0..a92a29f3e8 100644 --- a/internal/flushcommon/util/checkpoint_updater_test.go +++ b/internal/flushcommon/util/checkpoint_updater_test.go @@ -29,7 +29,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/flushcommon/broker" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type ChannelCPUpdaterSuite struct { diff --git a/internal/flushcommon/util/msg_handler.go b/internal/flushcommon/util/msg_handler.go index d976ebac7b..4b2991e311 100644 --- a/internal/flushcommon/util/msg_handler.go +++ b/internal/flushcommon/util/msg_handler.go @@ -20,8 +20,8 @@ import ( "context" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) type MsgHandler interface { diff --git a/internal/flushcommon/util/rate_collector.go b/internal/flushcommon/util/rate_collector.go index 4736eb2209..36330f17b5 100644 --- a/internal/flushcommon/util/rate_collector.go +++ b/internal/flushcommon/util/rate_collector.go @@ -21,10 +21,10 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/ratelimitutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // rateCol is global RateCollector in DataNode. diff --git a/internal/flushcommon/util/rate_collector_test.go b/internal/flushcommon/util/rate_collector_test.go index f672b5869e..ef855fc512 100644 --- a/internal/flushcommon/util/rate_collector_test.go +++ b/internal/flushcommon/util/rate_collector_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestRateCollector(t *testing.T) { diff --git a/internal/flushcommon/util/timetick_sender.go b/internal/flushcommon/util/timetick_sender.go index d18e464433..761862e32a 100644 --- a/internal/flushcommon/util/timetick_sender.go +++ b/internal/flushcommon/util/timetick_sender.go @@ -27,11 +27,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/flushcommon/broker" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type StatsUpdater interface { diff --git a/internal/flushcommon/util/timetick_sender_test.go b/internal/flushcommon/util/timetick_sender_test.go index 0edaf29078..46077e788d 100644 --- a/internal/flushcommon/util/timetick_sender_test.go +++ b/internal/flushcommon/util/timetick_sender_test.go @@ -30,8 +30,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/flushcommon/broker" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) func TestTimetickManagerNormal(t *testing.T) { diff --git a/internal/flushcommon/util/util.go b/internal/flushcommon/util/util.go index 273586a11c..ee5c9802be 100644 --- a/internal/flushcommon/util/util.go +++ b/internal/flushcommon/util/util.go @@ -30,9 +30,9 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type PipelineParams struct { diff --git a/internal/flushcommon/writebuffer/delta_buffer.go b/internal/flushcommon/writebuffer/delta_buffer.go index f5a8f488a7..d19f5385a5 100644 --- a/internal/flushcommon/writebuffer/delta_buffer.go +++ b/internal/flushcommon/writebuffer/delta_buffer.go @@ -5,8 +5,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type DeltaBuffer struct { diff --git a/internal/flushcommon/writebuffer/delta_buffer_test.go b/internal/flushcommon/writebuffer/delta_buffer_test.go index 7fdbb7f41c..555b8e8042 100644 --- a/internal/flushcommon/writebuffer/delta_buffer_test.go +++ b/internal/flushcommon/writebuffer/delta_buffer_test.go @@ -10,8 +10,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type DeltaBufferSuite struct { diff --git a/internal/flushcommon/writebuffer/insert_buffer.go b/internal/flushcommon/writebuffer/insert_buffer.go index 6023311dfb..803e61f8f6 100644 --- a/internal/flushcommon/writebuffer/insert_buffer.go +++ b/internal/flushcommon/writebuffer/insert_buffer.go @@ -9,9 +9,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/flushcommon/writebuffer/insert_buffer_test.go b/internal/flushcommon/writebuffer/insert_buffer_test.go index a50016b6c9..a68d994231 100644 --- a/internal/flushcommon/writebuffer/insert_buffer_test.go +++ b/internal/flushcommon/writebuffer/insert_buffer_test.go @@ -11,10 +11,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type InsertBufferSuite struct { diff --git a/internal/flushcommon/writebuffer/l0_write_buffer.go b/internal/flushcommon/writebuffer/l0_write_buffer.go index 94b91f770d..3dbfe42ebe 100644 --- a/internal/flushcommon/writebuffer/l0_write_buffer.go +++ b/internal/flushcommon/writebuffer/l0_write_buffer.go @@ -15,14 +15,14 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/syncmgr" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type l0WriteBuffer struct { diff --git a/internal/flushcommon/writebuffer/l0_write_buffer_test.go b/internal/flushcommon/writebuffer/l0_write_buffer_test.go index eccfdca421..5d1eaeda37 100644 --- a/internal/flushcommon/writebuffer/l0_write_buffer_test.go +++ b/internal/flushcommon/writebuffer/l0_write_buffer_test.go @@ -17,12 +17,12 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/metacache" "github.com/milvus-io/milvus/internal/flushcommon/syncmgr" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/testutils" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type L0WriteBufferSuite struct { diff --git a/internal/flushcommon/writebuffer/manager.go b/internal/flushcommon/writebuffer/manager.go index 1b998784ed..ad7eac1026 100644 --- a/internal/flushcommon/writebuffer/manager.go +++ b/internal/flushcommon/writebuffer/manager.go @@ -10,13 +10,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/flushcommon/metacache" "github.com/milvus-io/milvus/internal/flushcommon/syncmgr" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/lifetime" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/lifetime" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // BufferManager is the interface for WriteBuffer management. diff --git a/internal/flushcommon/writebuffer/manager_test.go b/internal/flushcommon/writebuffer/manager_test.go index af53ba786e..c69c20de5d 100644 --- a/internal/flushcommon/writebuffer/manager_test.go +++ b/internal/flushcommon/writebuffer/manager_test.go @@ -15,11 +15,11 @@ import ( "github.com/milvus-io/milvus/internal/datanode/allocator" "github.com/milvus-io/milvus/internal/flushcommon/metacache" "github.com/milvus-io/milvus/internal/flushcommon/syncmgr" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type ManagerSuite struct { diff --git a/internal/flushcommon/writebuffer/mock_manager.go b/internal/flushcommon/writebuffer/mock_manager.go index dc305f8aac..8f3f1b0096 100644 --- a/internal/flushcommon/writebuffer/mock_manager.go +++ b/internal/flushcommon/writebuffer/mock_manager.go @@ -10,7 +10,7 @@ import ( msgpb "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - msgstream "github.com/milvus-io/milvus/pkg/mq/msgstream" + msgstream "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" ) // MockBufferManager is an autogenerated mock type for the BufferManager type diff --git a/internal/flushcommon/writebuffer/mock_write_buffer.go b/internal/flushcommon/writebuffer/mock_write_buffer.go index 7fcff70474..82b54061cd 100644 --- a/internal/flushcommon/writebuffer/mock_write_buffer.go +++ b/internal/flushcommon/writebuffer/mock_write_buffer.go @@ -8,7 +8,7 @@ import ( msgpb "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" mock "github.com/stretchr/testify/mock" - msgstream "github.com/milvus-io/milvus/pkg/mq/msgstream" + msgstream "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" ) // MockWriteBuffer is an autogenerated mock type for the WriteBuffer type diff --git a/internal/flushcommon/writebuffer/options.go b/internal/flushcommon/writebuffer/options.go index 52f3361cf4..7eef60da28 100644 --- a/internal/flushcommon/writebuffer/options.go +++ b/internal/flushcommon/writebuffer/options.go @@ -6,7 +6,7 @@ import ( "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/flushcommon/metacache" "github.com/milvus-io/milvus/internal/flushcommon/syncmgr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type WriteBufferOption func(opt *writeBufferOption) diff --git a/internal/flushcommon/writebuffer/segment_buffer.go b/internal/flushcommon/writebuffer/segment_buffer.go index 8b17e98703..ccf1e1df83 100644 --- a/internal/flushcommon/writebuffer/segment_buffer.go +++ b/internal/flushcommon/writebuffer/segment_buffer.go @@ -6,7 +6,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type segmentBuffer struct { diff --git a/internal/flushcommon/writebuffer/sync_policy.go b/internal/flushcommon/writebuffer/sync_policy.go index 2ca3e55a16..a7d2ee551f 100644 --- a/internal/flushcommon/writebuffer/sync_policy.go +++ b/internal/flushcommon/writebuffer/sync_policy.go @@ -10,8 +10,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/flushcommon/metacache" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type SyncPolicy interface { diff --git a/internal/flushcommon/writebuffer/sync_policy_test.go b/internal/flushcommon/writebuffer/sync_policy_test.go index d9edc5d741..3d1263bc6c 100644 --- a/internal/flushcommon/writebuffer/sync_policy_test.go +++ b/internal/flushcommon/writebuffer/sync_policy_test.go @@ -11,9 +11,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/flushcommon/metacache" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type SyncPolicySuite struct { diff --git a/internal/flushcommon/writebuffer/write_buffer.go b/internal/flushcommon/writebuffer/write_buffer.go index e1681c5d51..2fef983494 100644 --- a/internal/flushcommon/writebuffer/write_buffer.go +++ b/internal/flushcommon/writebuffer/write_buffer.go @@ -19,14 +19,14 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/syncmgr" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/flushcommon/writebuffer/write_buffer_test.go b/internal/flushcommon/writebuffer/write_buffer_test.go index 55d595a01e..0fc9aee2df 100644 --- a/internal/flushcommon/writebuffer/write_buffer_test.go +++ b/internal/flushcommon/writebuffer/write_buffer_test.go @@ -14,10 +14,10 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/metacache" "github.com/milvus-io/milvus/internal/flushcommon/metacache/pkoracle" "github.com/milvus-io/milvus/internal/flushcommon/syncmgr" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type WriteBufferSuite struct { diff --git a/internal/http/healthz/healthz_handler.go b/internal/http/healthz/healthz_handler.go index 4e203d20a3..ff7ac205c3 100644 --- a/internal/http/healthz/healthz_handler.go +++ b/internal/http/healthz/healthz_handler.go @@ -27,7 +27,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) // GetComponentStatesInterface defines the interface that get states from component. diff --git a/internal/http/server.go b/internal/http/server.go index f9932f72a7..aa26abe0c7 100644 --- a/internal/http/server.go +++ b/internal/http/server.go @@ -30,10 +30,10 @@ import ( "github.com/milvus-io/milvus/internal/http/healthz" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/eventlog" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/expr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/eventlog" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/expr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) const ( diff --git a/internal/http/server_test.go b/internal/http/server_test.go index e2d1090c0d..789e2fc916 100644 --- a/internal/http/server_test.go +++ b/internal/http/server_test.go @@ -36,9 +36,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/http/healthz" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/expr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/expr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type HTTPServerTestSuite struct { diff --git a/internal/indexnode/chunk_mgr_factory.go b/internal/indexnode/chunk_mgr_factory.go index 98a4c70308..ccada1df2c 100644 --- a/internal/indexnode/chunk_mgr_factory.go +++ b/internal/indexnode/chunk_mgr_factory.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type StorageFactory interface { diff --git a/internal/indexnode/chunkmgr_mock.go b/internal/indexnode/chunkmgr_mock.go index bc470ad0d4..bc17acf597 100644 --- a/internal/indexnode/chunkmgr_mock.go +++ b/internal/indexnode/chunkmgr_mock.go @@ -12,11 +12,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func init() { diff --git a/internal/indexnode/index_test.go b/internal/indexnode/index_test.go index c522851fb5..63a1489623 100644 --- a/internal/indexnode/index_test.go +++ b/internal/indexnode/index_test.go @@ -7,9 +7,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func generateFloatVectors(nb, dim int) []float32 { diff --git a/internal/indexnode/indexnode.go b/internal/indexnode/indexnode.go index bc2c5b5c07..33696c516e 100644 --- a/internal/indexnode/indexnode.go +++ b/internal/indexnode/indexnode.go @@ -49,16 +49,16 @@ import ( "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/initcore" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/expr" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/lifetime" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/expr" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/lifetime" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // TODO add comments diff --git a/internal/indexnode/indexnode_component_mock.go b/internal/indexnode/indexnode_component_mock.go index d64ea843d3..5013b5019f 100644 --- a/internal/indexnode/indexnode_component_mock.go +++ b/internal/indexnode/indexnode_component_mock.go @@ -4,7 +4,7 @@ import ( "context" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type mockIndexNodeComponent struct { diff --git a/internal/indexnode/indexnode_service.go b/internal/indexnode/indexnode_service.go index 151e114598..554f4e72ca 100644 --- a/internal/indexnode/indexnode_service.go +++ b/internal/indexnode/indexnode_service.go @@ -30,15 +30,15 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/flushcommon/io" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func (i *IndexNode) CreateJob(ctx context.Context, req *workerpb.CreateJobRequest) (*commonpb.Status, error) { diff --git a/internal/indexnode/indexnode_service_test.go b/internal/indexnode/indexnode_service_test.go index 0033aa5d38..d78e19d573 100644 --- a/internal/indexnode/indexnode_service_test.go +++ b/internal/indexnode/indexnode_service_test.go @@ -25,11 +25,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" ) func TestAbnormalIndexNode(t *testing.T) { diff --git a/internal/indexnode/indexnode_test.go b/internal/indexnode/indexnode_test.go index e6272edd46..cc8e0752c2 100644 --- a/internal/indexnode/indexnode_test.go +++ b/internal/indexnode/indexnode_test.go @@ -31,11 +31,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/metastore/kv/binlog" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestComponentState(t *testing.T) { diff --git a/internal/indexnode/metrics_info.go b/internal/indexnode/metrics_info.go index 55ae1ff498..e454c867b5 100644 --- a/internal/indexnode/metrics_info.go +++ b/internal/indexnode/metrics_info.go @@ -22,12 +22,12 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // TODO(dragondriver): maybe IndexNode should be an interface so that we can mock it in the test cases diff --git a/internal/indexnode/metrics_info_test.go b/internal/indexnode/metrics_info_test.go index 8bf6bb5bab..d80ff19f7d 100644 --- a/internal/indexnode/metrics_info_test.go +++ b/internal/indexnode/metrics_info_test.go @@ -19,7 +19,7 @@ package indexnode import ( "testing" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) func TestGetSystemInfoMetrics(t *testing.T) { diff --git a/internal/indexnode/task.go b/internal/indexnode/task.go index e659747b80..b1c16fe40b 100644 --- a/internal/indexnode/task.go +++ b/internal/indexnode/task.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" ) var ( diff --git a/internal/indexnode/task_analyze.go b/internal/indexnode/task_analyze.go index 01176d6270..c6e9af1c80 100644 --- a/internal/indexnode/task_analyze.go +++ b/internal/indexnode/task_analyze.go @@ -25,13 +25,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/analyzecgowrapper" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/clusteringpb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/clusteringpb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) var _ task = (*analyzeTask)(nil) diff --git a/internal/indexnode/task_index.go b/internal/indexnode/task_index.go index 9cb0d53daa..57861f19f0 100644 --- a/internal/indexnode/task_index.go +++ b/internal/indexnode/task_index.go @@ -31,17 +31,17 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/indexcgowrapper" "github.com/milvus-io/milvus/internal/util/vecindexmgr" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/indexcgopb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/indexparams" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/indexcgopb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/indexparams" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) // IndexBuildTask is used to record the information of the index tasks. diff --git a/internal/indexnode/task_scheduler.go b/internal/indexnode/task_scheduler.go index 7f6db70427..cd98bed2c4 100644 --- a/internal/indexnode/task_scheduler.go +++ b/internal/indexnode/task_scheduler.go @@ -26,11 +26,11 @@ import ( "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // TaskQueue is a queue used to store tasks. diff --git a/internal/indexnode/task_scheduler_test.go b/internal/indexnode/task_scheduler_test.go index 22a9de4d7c..c68044f815 100644 --- a/internal/indexnode/task_scheduler_test.go +++ b/internal/indexnode/task_scheduler_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type fakeTaskState int diff --git a/internal/indexnode/task_stats.go b/internal/indexnode/task_stats.go index 49db3ec121..e71d985934 100644 --- a/internal/indexnode/task_stats.go +++ b/internal/indexnode/task_stats.go @@ -36,17 +36,17 @@ import ( "github.com/milvus-io/milvus/internal/metastore/kv/binlog" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/indexcgowrapper" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexcgopb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - _ "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexcgopb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + _ "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ task = (*statsTask)(nil) diff --git a/internal/indexnode/task_stats_test.go b/internal/indexnode/task_stats_test.go index 0c4f984744..4e199905cd 100644 --- a/internal/indexnode/task_stats_test.go +++ b/internal/indexnode/task_stats_test.go @@ -31,12 +31,12 @@ import ( "github.com/milvus-io/milvus/internal/datanode/compaction" "github.com/milvus-io/milvus/internal/flushcommon/io" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestTaskStatsSuite(t *testing.T) { diff --git a/internal/indexnode/task_test.go b/internal/indexnode/task_test.go index 9db8a58e03..511696fdb9 100644 --- a/internal/indexnode/task_test.go +++ b/internal/indexnode/task_test.go @@ -26,14 +26,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) type IndexBuildTaskSuite struct { diff --git a/internal/indexnode/taskinfo_ops.go b/internal/indexnode/taskinfo_ops.go index 64ee7aea81..20282ba37c 100644 --- a/internal/indexnode/taskinfo_ops.go +++ b/internal/indexnode/taskinfo_ops.go @@ -23,10 +23,10 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" ) type indexTaskInfo struct { diff --git a/internal/indexnode/taskinfo_ops_test.go b/internal/indexnode/taskinfo_ops_test.go index f286a1b87d..9c4f167e4e 100644 --- a/internal/indexnode/taskinfo_ops_test.go +++ b/internal/indexnode/taskinfo_ops_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" ) type statsTaskInfoSuite struct { diff --git a/internal/kv/etcd/embed_etcd_config_test.go b/internal/kv/etcd/embed_etcd_config_test.go index 72c9ee156d..902e518a9b 100644 --- a/internal/kv/etcd/embed_etcd_config_test.go +++ b/internal/kv/etcd/embed_etcd_config_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" embed_etcd_kv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestEtcdConfigLoad(te *testing.T) { diff --git a/internal/kv/etcd/embed_etcd_kv.go b/internal/kv/etcd/embed_etcd_kv.go index 1c982d1f77..3f55ab761c 100644 --- a/internal/kv/etcd/embed_etcd_kv.go +++ b/internal/kv/etcd/embed_etcd_kv.go @@ -29,10 +29,10 @@ import ( "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/kv/predicates" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/kv/predicates" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // implementation assertion @@ -72,7 +72,6 @@ func NewEmbededEtcdKV(cfg *embed.Config, rootPath string, options ...Option) (*E e, err = embed.StartEtcd(cfg) return err }) - if err != nil { return nil, err } @@ -102,7 +101,6 @@ func NewEmbededEtcdKV(cfg *embed.Config, rootPath string, options ...Option) (*E return errors.New("Embedded etcd took too long to start") } }) - if err != nil { return nil, err } diff --git a/internal/kv/etcd/embed_etcd_kv_test.go b/internal/kv/etcd/embed_etcd_kv_test.go index f18351417e..ec6cc63daf 100644 --- a/internal/kv/etcd/embed_etcd_kv_test.go +++ b/internal/kv/etcd/embed_etcd_kv_test.go @@ -30,11 +30,11 @@ import ( "golang.org/x/exp/maps" embed_etcd_kv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/kv/predicates" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/kv/predicates" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestEmbedEtcd(te *testing.T) { diff --git a/internal/kv/etcd/embed_etcd_restart_test.go b/internal/kv/etcd/embed_etcd_restart_test.go index a93db26e7e..1a0904ba2e 100644 --- a/internal/kv/etcd/embed_etcd_restart_test.go +++ b/internal/kv/etcd/embed_etcd_restart_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" embed_etcd_kv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestEtcdRestartLoad(te *testing.T) { diff --git a/internal/kv/etcd/etcd_kv.go b/internal/kv/etcd/etcd_kv.go index 22dcc125d3..0baf2015f0 100644 --- a/internal/kv/etcd/etcd_kv.go +++ b/internal/kv/etcd/etcd_kv.go @@ -26,12 +26,12 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/kv/predicates" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/kv/predicates" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) const ( diff --git a/internal/kv/etcd/etcd_kv_test.go b/internal/kv/etcd/etcd_kv_test.go index 123a0a209c..324a3d28ef 100644 --- a/internal/kv/etcd/etcd_kv_test.go +++ b/internal/kv/etcd/etcd_kv_test.go @@ -32,10 +32,10 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" "golang.org/x/exp/maps" - "github.com/milvus-io/milvus/pkg/kv/predicates" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/kv/predicates" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var Params = paramtable.Get() diff --git a/internal/kv/etcd/metakv_factory.go b/internal/kv/etcd/metakv_factory.go index 8c575c81a7..9cad46de11 100644 --- a/internal/kv/etcd/metakv_factory.go +++ b/internal/kv/etcd/metakv_factory.go @@ -22,10 +22,10 @@ import ( "go.etcd.io/etcd/server/v3/embed" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // NewWatchKVFactory returns an object that implements the kv.WatchKV interface using etcd. diff --git a/internal/kv/etcd/util.go b/internal/kv/etcd/util.go index bc0a34ef37..82fb9307cb 100644 --- a/internal/kv/etcd/util.go +++ b/internal/kv/etcd/util.go @@ -6,8 +6,8 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" - "github.com/milvus-io/milvus/pkg/kv/predicates" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/kv/predicates" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func parsePredicates(rootPath string, preds ...predicates.Predicate) ([]clientv3.Cmp, error) { diff --git a/internal/kv/etcd/util_test.go b/internal/kv/etcd/util_test.go index f39b7a162a..ece99cfafb 100644 --- a/internal/kv/etcd/util_test.go +++ b/internal/kv/etcd/util_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus/pkg/kv/predicates" + "github.com/milvus-io/milvus/pkg/v2/kv/predicates" ) type EtcdKVUtilSuite struct { diff --git a/internal/kv/mem/mem_kv.go b/internal/kv/mem/mem_kv.go index 7b8381c252..3a66bf9e4d 100644 --- a/internal/kv/mem/mem_kv.go +++ b/internal/kv/mem/mem_kv.go @@ -23,9 +23,9 @@ import ( "github.com/google/btree" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/kv/predicates" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/kv/predicates" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // implementation assertion diff --git a/internal/kv/mem/mem_kv_test.go b/internal/kv/mem/mem_kv_test.go index 4d81294c5e..7b16b1fd18 100644 --- a/internal/kv/mem/mem_kv_test.go +++ b/internal/kv/mem/mem_kv_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/kv/predicates" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/kv/predicates" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func TestMemoryKV_SaveAndLoadBytes(t *testing.T) { diff --git a/internal/kv/mock_snapshot_kv.go b/internal/kv/mock_snapshot_kv.go index c23c7a68ad..64dff9ae0b 100644 --- a/internal/kv/mock_snapshot_kv.go +++ b/internal/kv/mock_snapshot_kv.go @@ -3,8 +3,8 @@ package kv import ( "context" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ kv.SnapShotKV = &mockSnapshotKV{} diff --git a/internal/kv/mock_snapshot_kv_test.go b/internal/kv/mock_snapshot_kv_test.go index 19fabf54b0..538748028a 100644 --- a/internal/kv/mock_snapshot_kv_test.go +++ b/internal/kv/mock_snapshot_kv_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func Test_mockSnapshotKV_Save(t *testing.T) { diff --git a/internal/kv/mocks/meta_kv.go b/internal/kv/mocks/meta_kv.go index 82813bf3cb..ece71aad3a 100644 --- a/internal/kv/mocks/meta_kv.go +++ b/internal/kv/mocks/meta_kv.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - predicates "github.com/milvus-io/milvus/pkg/kv/predicates" + predicates "github.com/milvus-io/milvus/pkg/v2/kv/predicates" ) // MetaKv is an autogenerated mock type for the MetaKv type diff --git a/internal/kv/mocks/txn_kv.go b/internal/kv/mocks/txn_kv.go index 7a149148fd..9bc41776ff 100644 --- a/internal/kv/mocks/txn_kv.go +++ b/internal/kv/mocks/txn_kv.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - predicates "github.com/milvus-io/milvus/pkg/kv/predicates" + predicates "github.com/milvus-io/milvus/pkg/v2/kv/predicates" ) // TxnKV is an autogenerated mock type for the TxnKV type diff --git a/internal/kv/mocks/watch_kv.go b/internal/kv/mocks/watch_kv.go index 60a38a5f97..1685d18d93 100644 --- a/internal/kv/mocks/watch_kv.go +++ b/internal/kv/mocks/watch_kv.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - predicates "github.com/milvus-io/milvus/pkg/kv/predicates" + predicates "github.com/milvus-io/milvus/pkg/v2/kv/predicates" ) // WatchKV is an autogenerated mock type for the WatchKV type diff --git a/internal/kv/tikv/main_test.go b/internal/kv/tikv/main_test.go index f2ffe690e4..d132611535 100644 --- a/internal/kv/tikv/main_test.go +++ b/internal/kv/tikv/main_test.go @@ -24,7 +24,7 @@ import ( tilib "github.com/tikv/client-go/v2/tikv" "github.com/tikv/client-go/v2/txnkv" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var txnClient *txnkv.Client diff --git a/internal/kv/tikv/txn_tikv.go b/internal/kv/tikv/txn_tikv.go index 47af16f469..6086da9f30 100644 --- a/internal/kv/tikv/txn_tikv.go +++ b/internal/kv/tikv/txn_tikv.go @@ -32,13 +32,13 @@ import ( "github.com/tikv/client-go/v2/txnkv/txnsnapshot" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/kv/predicates" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/kv/predicates" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) // A quick note is that we are using loggingErr at our outermost scope in order to perform logging diff --git a/internal/kv/tikv/txn_tikv_test.go b/internal/kv/tikv/txn_tikv_test.go index fd62f4ffc1..caabead599 100644 --- a/internal/kv/tikv/txn_tikv_test.go +++ b/internal/kv/tikv/txn_tikv_test.go @@ -30,7 +30,7 @@ import ( "github.com/tikv/client-go/v2/txnkv/transaction" "golang.org/x/exp/maps" - "github.com/milvus-io/milvus/pkg/kv/predicates" + "github.com/milvus-io/milvus/pkg/v2/kv/predicates" ) func TestTiKVLoad(te *testing.T) { diff --git a/internal/metastore/catalog.go b/internal/metastore/catalog.go index 488b525c3f..a469044161 100644 --- a/internal/metastore/catalog.go +++ b/internal/metastore/catalog.go @@ -6,11 +6,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) //go:generate mockery --name=RootCoordCatalog diff --git a/internal/metastore/kv/binlog/binlog.go b/internal/metastore/kv/binlog/binlog.go index 2e4feef029..7ff0700f3b 100644 --- a/internal/metastore/kv/binlog/binlog.go +++ b/internal/metastore/kv/binlog/binlog.go @@ -22,11 +22,11 @@ import ( "strings" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func CompressSaveBinlogPaths(req *datapb.SaveBinlogPathsRequest) error { diff --git a/internal/metastore/kv/binlog/binlog_test.go b/internal/metastore/kv/binlog/binlog_test.go index 174861055d..2e03bc2078 100644 --- a/internal/metastore/kv/binlog/binlog_test.go +++ b/internal/metastore/kv/binlog/binlog_test.go @@ -25,10 +25,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var ( diff --git a/internal/metastore/kv/datacoord/kv_catalog.go b/internal/metastore/kv/datacoord/kv_catalog.go index 5d4666d2ce..e9bc357c8c 100644 --- a/internal/metastore/kv/datacoord/kv_catalog.go +++ b/internal/metastore/kv/datacoord/kv_catalog.go @@ -36,16 +36,16 @@ import ( "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/segmentutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type Catalog struct { diff --git a/internal/metastore/kv/datacoord/kv_catalog_test.go b/internal/metastore/kv/datacoord/kv_catalog_test.go index b330a60ae0..853f77b145 100644 --- a/internal/metastore/kv/datacoord/kv_catalog_test.go +++ b/internal/metastore/kv/datacoord/kv_catalog_test.go @@ -40,11 +40,11 @@ import ( "github.com/milvus-io/milvus/internal/kv/mocks" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/pkg/kv/predicates" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/kv/predicates" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var ( diff --git a/internal/metastore/kv/datacoord/util.go b/internal/metastore/kv/datacoord/util.go index 716285a24d..e28008c77a 100644 --- a/internal/metastore/kv/datacoord/util.go +++ b/internal/metastore/kv/datacoord/util.go @@ -24,10 +24,10 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/segmentutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func ValidateSegment(segment *datapb.SegmentInfo) error { diff --git a/internal/metastore/kv/querycoord/kv_catalog.go b/internal/metastore/kv/querycoord/kv_catalog.go index 82bab53e6d..470cdc3fd3 100644 --- a/internal/metastore/kv/querycoord/kv_catalog.go +++ b/internal/metastore/kv/querycoord/kv_catalog.go @@ -13,12 +13,12 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/compressor" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/compressor" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var ErrInvalidKey = errors.New("invalid load info key") diff --git a/internal/metastore/kv/querycoord/kv_catalog_test.go b/internal/metastore/kv/querycoord/kv_catalog_test.go index e2a0f1e33e..490806bfa4 100644 --- a/internal/metastore/kv/querycoord/kv_catalog_test.go +++ b/internal/metastore/kv/querycoord/kv_catalog_test.go @@ -13,10 +13,10 @@ import ( etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/kv/mocks" . "github.com/milvus-io/milvus/internal/querycoordv2/params" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type CatalogTestSuite struct { diff --git a/internal/metastore/kv/rootcoord/kv_catalog.go b/internal/metastore/kv/rootcoord/kv_catalog.go index 81196da20f..5fa3f4e2ca 100644 --- a/internal/metastore/kv/rootcoord/kv_catalog.go +++ b/internal/metastore/kv/rootcoord/kv_catalog.go @@ -17,19 +17,19 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // prefix/collection/collection_id -> CollectionInfo diff --git a/internal/metastore/kv/rootcoord/kv_catalog_test.go b/internal/metastore/kv/rootcoord/kv_catalog_test.go index bd1aaa2e2c..af93892210 100644 --- a/internal/metastore/kv/rootcoord/kv_catalog_test.go +++ b/internal/metastore/kv/rootcoord/kv_catalog_test.go @@ -26,16 +26,16 @@ import ( "github.com/milvus-io/milvus/internal/kv/mocks" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/internal/metastore/kv/rootcoord/rootcoord_constant.go b/internal/metastore/kv/rootcoord/rootcoord_constant.go index 7ea71f4fe4..faadc855c8 100644 --- a/internal/metastore/kv/rootcoord/rootcoord_constant.go +++ b/internal/metastore/kv/rootcoord/rootcoord_constant.go @@ -3,7 +3,7 @@ package rootcoord import ( "fmt" - "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/v2/util" ) const ( diff --git a/internal/metastore/kv/rootcoord/suffix_snapshot.go b/internal/metastore/kv/rootcoord/suffix_snapshot.go index 2f3d2b2fd5..756ce3c6ec 100644 --- a/internal/metastore/kv/rootcoord/suffix_snapshot.go +++ b/internal/metastore/kv/rootcoord/suffix_snapshot.go @@ -30,16 +30,16 @@ import ( "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // SuffixSnapshotTombstone special value for tombstone mark diff --git a/internal/metastore/kv/rootcoord/suffix_snapshot_test.go b/internal/metastore/kv/rootcoord/suffix_snapshot_test.go index 00887efb00..287b06930f 100644 --- a/internal/metastore/kv/rootcoord/suffix_snapshot_test.go +++ b/internal/metastore/kv/rootcoord/suffix_snapshot_test.go @@ -33,10 +33,10 @@ import ( etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/kv/mocks" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var snapshotPrefix = "snapshots" diff --git a/internal/metastore/kv/streamingcoord/kv_catalog.go b/internal/metastore/kv/streamingcoord/kv_catalog.go index a09ee0a4f4..c7c2f3b013 100644 --- a/internal/metastore/kv/streamingcoord/kv_catalog.go +++ b/internal/metastore/kv/streamingcoord/kv_catalog.go @@ -8,10 +8,10 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus/internal/metastore" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" ) // NewCataLog creates a new catalog instance diff --git a/internal/metastore/kv/streamingcoord/kv_catalog_test.go b/internal/metastore/kv/streamingcoord/kv_catalog_test.go index c9434918fa..9d23c2d24c 100644 --- a/internal/metastore/kv/streamingcoord/kv_catalog_test.go +++ b/internal/metastore/kv/streamingcoord/kv_catalog_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/milvus-io/milvus/pkg/mocks/mock_kv" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/mocks/mock_kv" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) func TestCatalog(t *testing.T) { diff --git a/internal/metastore/kv/streamingnode/kv_catalog.go b/internal/metastore/kv/streamingnode/kv_catalog.go index 1ac42dd39f..cc87794ebd 100644 --- a/internal/metastore/kv/streamingnode/kv_catalog.go +++ b/internal/metastore/kv/streamingnode/kv_catalog.go @@ -9,11 +9,11 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus/internal/metastore" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // NewCataLog creates a new streaming-node catalog instance. diff --git a/internal/metastore/kv/streamingnode/kv_catalog_test.go b/internal/metastore/kv/streamingnode/kv_catalog_test.go index 2c6117b44f..aaf031cb4f 100644 --- a/internal/metastore/kv/streamingnode/kv_catalog_test.go +++ b/internal/metastore/kv/streamingnode/kv_catalog_test.go @@ -10,8 +10,8 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus/internal/kv/mocks" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func TestCatalogConsumeCheckpoint(t *testing.T) { diff --git a/internal/metastore/mocks/mock_datacoord_catalog.go b/internal/metastore/mocks/mock_datacoord_catalog.go index 698c4ffcaa..6f51cf8688 100644 --- a/internal/metastore/mocks/mock_datacoord_catalog.go +++ b/internal/metastore/mocks/mock_datacoord_catalog.go @@ -5,8 +5,8 @@ package mocks import ( context "context" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" - indexpb "github.com/milvus-io/milvus/pkg/proto/indexpb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + indexpb "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" metastore "github.com/milvus-io/milvus/internal/metastore" diff --git a/internal/metastore/mocks/mock_querycoord_catalog.go b/internal/metastore/mocks/mock_querycoord_catalog.go index b4def3b48f..cff47d60eb 100644 --- a/internal/metastore/mocks/mock_querycoord_catalog.go +++ b/internal/metastore/mocks/mock_querycoord_catalog.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - querypb "github.com/milvus-io/milvus/pkg/proto/querypb" + querypb "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) // QueryCoordCatalog is an autogenerated mock type for the QueryCoordCatalog type diff --git a/internal/metastore/model/alias.go b/internal/metastore/model/alias.go index f0422c8158..105e13e713 100644 --- a/internal/metastore/model/alias.go +++ b/internal/metastore/model/alias.go @@ -1,6 +1,6 @@ package model -import pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" +import pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" type Alias struct { Name string diff --git a/internal/metastore/model/alias_test.go b/internal/metastore/model/alias_test.go index 0b6aaac704..eeba11ae3a 100644 --- a/internal/metastore/model/alias_test.go +++ b/internal/metastore/model/alias_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" ) func TestAlias_Available(t *testing.T) { diff --git a/internal/metastore/model/collection.go b/internal/metastore/model/collection.go index 3c18b8b798..a4b8db05e1 100644 --- a/internal/metastore/model/collection.go +++ b/internal/metastore/model/collection.go @@ -21,8 +21,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/common" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" ) type Collection struct { diff --git a/internal/metastore/model/collection_test.go b/internal/metastore/model/collection_test.go index 78ed5600a8..aac8397078 100644 --- a/internal/metastore/model/collection_test.go +++ b/internal/metastore/model/collection_test.go @@ -23,8 +23,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/common" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" ) var ( diff --git a/internal/metastore/model/credential.go b/internal/metastore/model/credential.go index 8f28055f07..8fda165b3f 100644 --- a/internal/metastore/model/credential.go +++ b/internal/metastore/model/credential.go @@ -1,6 +1,6 @@ package model -import "github.com/milvus-io/milvus/pkg/proto/internalpb" +import "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" type Credential struct { Username string diff --git a/internal/metastore/model/credential_test.go b/internal/metastore/model/credential_test.go index b155b8c8d5..035281170b 100644 --- a/internal/metastore/model/credential_test.go +++ b/internal/metastore/model/credential_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" ) var ( diff --git a/internal/metastore/model/database.go b/internal/metastore/model/database.go index 5ea4b3077a..2499939055 100644 --- a/internal/metastore/model/database.go +++ b/internal/metastore/model/database.go @@ -4,9 +4,9 @@ import ( "time" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/common" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/v2/common" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util" ) type Database struct { diff --git a/internal/metastore/model/database_test.go b/internal/metastore/model/database_test.go index 57df5e60c1..c5e4e9994d 100644 --- a/internal/metastore/model/database_test.go +++ b/internal/metastore/model/database_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" ) var ( diff --git a/internal/metastore/model/field.go b/internal/metastore/model/field.go index 49766675c7..0ca5575677 100644 --- a/internal/metastore/model/field.go +++ b/internal/metastore/model/field.go @@ -3,7 +3,7 @@ package model import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) type Field struct { diff --git a/internal/metastore/model/index.go b/internal/metastore/model/index.go index 8b16f44105..9b61bcf580 100644 --- a/internal/metastore/model/index.go +++ b/internal/metastore/model/index.go @@ -4,7 +4,7 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" ) type Index struct { diff --git a/internal/metastore/model/index_test.go b/internal/metastore/model/index_test.go index 2d7af8cb47..9806d4255f 100644 --- a/internal/metastore/model/index_test.go +++ b/internal/metastore/model/index_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" ) var ( diff --git a/internal/metastore/model/load_info.go b/internal/metastore/model/load_info.go index eb2eba9eaa..7ae2113d85 100644 --- a/internal/metastore/model/load_info.go +++ b/internal/metastore/model/load_info.go @@ -1,6 +1,6 @@ package model -import "github.com/milvus-io/milvus/pkg/proto/querypb" +import "github.com/milvus-io/milvus/pkg/v2/proto/querypb" type CollectionLoadInfo struct { CollectionID int64 diff --git a/internal/metastore/model/partition.go b/internal/metastore/model/partition.go index 8033aa37aa..e7f9f921e9 100644 --- a/internal/metastore/model/partition.go +++ b/internal/metastore/model/partition.go @@ -1,8 +1,8 @@ package model import ( - "github.com/milvus-io/milvus/pkg/common" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/common" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" ) type Partition struct { diff --git a/internal/metastore/model/segment_index.go b/internal/metastore/model/segment_index.go index 5f32d5e86f..4b8c70acb8 100644 --- a/internal/metastore/model/segment_index.go +++ b/internal/metastore/model/segment_index.go @@ -2,8 +2,8 @@ package model import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" ) type SegmentIndex struct { diff --git a/internal/metastore/model/segment_index_test.go b/internal/metastore/model/segment_index_test.go index 8161dde737..60bcc987c7 100644 --- a/internal/metastore/model/segment_index_test.go +++ b/internal/metastore/model/segment_index_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" ) var ( diff --git a/internal/mocks/distributed/mock_streaming/mock_Broadcast.go b/internal/mocks/distributed/mock_streaming/mock_Broadcast.go index 6cb94f17a0..37e19e554e 100644 --- a/internal/mocks/distributed/mock_streaming/mock_Broadcast.go +++ b/internal/mocks/distributed/mock_streaming/mock_Broadcast.go @@ -5,10 +5,10 @@ package mock_streaming import ( context "context" - message "github.com/milvus-io/milvus/pkg/streaming/util/message" + message "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" mock "github.com/stretchr/testify/mock" - types "github.com/milvus-io/milvus/pkg/streaming/util/types" + types "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) // MockBroadcast is an autogenerated mock type for the Broadcast type diff --git a/internal/mocks/distributed/mock_streaming/mock_WALAccesser.go b/internal/mocks/distributed/mock_streaming/mock_WALAccesser.go index 628ff352d8..6f9d178849 100644 --- a/internal/mocks/distributed/mock_streaming/mock_WALAccesser.go +++ b/internal/mocks/distributed/mock_streaming/mock_WALAccesser.go @@ -5,12 +5,12 @@ package mock_streaming import ( context "context" - message "github.com/milvus-io/milvus/pkg/streaming/util/message" + message "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" mock "github.com/stretchr/testify/mock" streaming "github.com/milvus-io/milvus/internal/distributed/streaming" - types "github.com/milvus-io/milvus/pkg/streaming/util/types" + types "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) // MockWALAccesser is an autogenerated mock type for the WALAccesser type diff --git a/internal/mocks/flushcommon/mock_util/mock_MsgHandler.go b/internal/mocks/flushcommon/mock_util/mock_MsgHandler.go index 8103238813..ef2cc09f02 100644 --- a/internal/mocks/flushcommon/mock_util/mock_MsgHandler.go +++ b/internal/mocks/flushcommon/mock_util/mock_MsgHandler.go @@ -5,7 +5,7 @@ package mock_util import ( context "context" - message "github.com/milvus-io/milvus/pkg/streaming/util/message" + message "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" mock "github.com/stretchr/testify/mock" diff --git a/internal/mocks/mock_datacoord.go b/internal/mocks/mock_datacoord.go index 4a329051b0..fa06349688 100644 --- a/internal/mocks/mock_datacoord.go +++ b/internal/mocks/mock_datacoord.go @@ -8,11 +8,11 @@ import ( commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" clientv3 "go.etcd.io/etcd/client/v3" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" - indexpb "github.com/milvus-io/milvus/pkg/proto/indexpb" + indexpb "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" diff --git a/internal/mocks/mock_datacoord_client.go b/internal/mocks/mock_datacoord_client.go index 1b9ee18198..15197837a2 100644 --- a/internal/mocks/mock_datacoord_client.go +++ b/internal/mocks/mock_datacoord_client.go @@ -7,13 +7,13 @@ import ( commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" grpc "google.golang.org/grpc" - indexpb "github.com/milvus-io/milvus/pkg/proto/indexpb" + indexpb "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" diff --git a/internal/mocks/mock_datanode.go b/internal/mocks/mock_datanode.go index 0152b7aea8..9c3d6aac90 100644 --- a/internal/mocks/mock_datanode.go +++ b/internal/mocks/mock_datanode.go @@ -8,9 +8,9 @@ import ( commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" clientv3 "go.etcd.io/etcd/client/v3" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" diff --git a/internal/mocks/mock_datanode_client.go b/internal/mocks/mock_datanode_client.go index 1018edb68b..948db62946 100644 --- a/internal/mocks/mock_datanode_client.go +++ b/internal/mocks/mock_datanode_client.go @@ -7,11 +7,11 @@ import ( commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" grpc "google.golang.org/grpc" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" diff --git a/internal/mocks/mock_indexnode.go b/internal/mocks/mock_indexnode.go index 7e3702e929..3f726a49c2 100644 --- a/internal/mocks/mock_indexnode.go +++ b/internal/mocks/mock_indexnode.go @@ -8,13 +8,13 @@ import ( commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" clientv3 "go.etcd.io/etcd/client/v3" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mock "github.com/stretchr/testify/mock" - workerpb "github.com/milvus-io/milvus/pkg/proto/workerpb" + workerpb "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" ) // MockIndexNode is an autogenerated mock type for the IndexNodeComponent type diff --git a/internal/mocks/mock_indexnode_client.go b/internal/mocks/mock_indexnode_client.go index cde97fd139..5090a8944d 100644 --- a/internal/mocks/mock_indexnode_client.go +++ b/internal/mocks/mock_indexnode_client.go @@ -9,13 +9,13 @@ import ( grpc "google.golang.org/grpc" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mock "github.com/stretchr/testify/mock" - workerpb "github.com/milvus-io/milvus/pkg/proto/workerpb" + workerpb "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" ) // MockIndexNodeClient is an autogenerated mock type for the IndexNodeClient type diff --git a/internal/mocks/mock_metastore/mock_StreamingCoordCataLog.go b/internal/mocks/mock_metastore/mock_StreamingCoordCataLog.go index 17a0600992..6321eacbd5 100644 --- a/internal/mocks/mock_metastore/mock_StreamingCoordCataLog.go +++ b/internal/mocks/mock_metastore/mock_StreamingCoordCataLog.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - streamingpb "github.com/milvus-io/milvus/pkg/proto/streamingpb" + streamingpb "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // MockStreamingCoordCataLog is an autogenerated mock type for the StreamingCoordCataLog type diff --git a/internal/mocks/mock_metastore/mock_StreamingNodeCataLog.go b/internal/mocks/mock_metastore/mock_StreamingNodeCataLog.go index f40c0a4fc1..7650371903 100644 --- a/internal/mocks/mock_metastore/mock_StreamingNodeCataLog.go +++ b/internal/mocks/mock_metastore/mock_StreamingNodeCataLog.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - streamingpb "github.com/milvus-io/milvus/pkg/proto/streamingpb" + streamingpb "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // MockStreamingNodeCataLog is an autogenerated mock type for the StreamingNodeCataLog type diff --git a/internal/mocks/mock_proxy.go b/internal/mocks/mock_proxy.go index b58e6dcdb5..0403a6b49f 100644 --- a/internal/mocks/mock_proxy.go +++ b/internal/mocks/mock_proxy.go @@ -10,13 +10,13 @@ import ( federpb "github.com/milvus-io/milvus-proto/go-api/v2/federpb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mock "github.com/stretchr/testify/mock" - proxypb "github.com/milvus-io/milvus/pkg/proto/proxypb" + proxypb "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" types "github.com/milvus-io/milvus/internal/types" ) diff --git a/internal/mocks/mock_proxy_client.go b/internal/mocks/mock_proxy_client.go index 88326888bb..158143ef23 100644 --- a/internal/mocks/mock_proxy_client.go +++ b/internal/mocks/mock_proxy_client.go @@ -9,13 +9,13 @@ import ( grpc "google.golang.org/grpc" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mock "github.com/stretchr/testify/mock" - proxypb "github.com/milvus-io/milvus/pkg/proto/proxypb" + proxypb "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" ) // MockProxyClient is an autogenerated mock type for the ProxyClient type diff --git a/internal/mocks/mock_querycoord.go b/internal/mocks/mock_querycoord.go index 506bbc052e..0410121b23 100644 --- a/internal/mocks/mock_querycoord.go +++ b/internal/mocks/mock_querycoord.go @@ -8,13 +8,13 @@ import ( commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" clientv3 "go.etcd.io/etcd/client/v3" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mock "github.com/stretchr/testify/mock" - querypb "github.com/milvus-io/milvus/pkg/proto/querypb" + querypb "github.com/milvus-io/milvus/pkg/v2/proto/querypb" txnkv "github.com/tikv/client-go/v2/txnkv" diff --git a/internal/mocks/mock_querycoord_client.go b/internal/mocks/mock_querycoord_client.go index e776de67f5..edf426923a 100644 --- a/internal/mocks/mock_querycoord_client.go +++ b/internal/mocks/mock_querycoord_client.go @@ -9,13 +9,13 @@ import ( grpc "google.golang.org/grpc" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mock "github.com/stretchr/testify/mock" - querypb "github.com/milvus-io/milvus/pkg/proto/querypb" + querypb "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) // MockQueryCoordClient is an autogenerated mock type for the QueryCoordClient type diff --git a/internal/mocks/mock_querynode.go b/internal/mocks/mock_querynode.go index c434ad119e..aead5a45d6 100644 --- a/internal/mocks/mock_querynode.go +++ b/internal/mocks/mock_querynode.go @@ -8,13 +8,13 @@ import ( commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" clientv3 "go.etcd.io/etcd/client/v3" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mock "github.com/stretchr/testify/mock" - querypb "github.com/milvus-io/milvus/pkg/proto/querypb" + querypb "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) // MockQueryNode is an autogenerated mock type for the QueryNodeComponent type diff --git a/internal/mocks/mock_querynode_client.go b/internal/mocks/mock_querynode_client.go index 8ed6720d06..9924fda6fe 100644 --- a/internal/mocks/mock_querynode_client.go +++ b/internal/mocks/mock_querynode_client.go @@ -9,13 +9,13 @@ import ( grpc "google.golang.org/grpc" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mock "github.com/stretchr/testify/mock" - querypb "github.com/milvus-io/milvus/pkg/proto/querypb" + querypb "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) // MockQueryNodeClient is an autogenerated mock type for the QueryNodeClient type diff --git a/internal/mocks/mock_rootcoord.go b/internal/mocks/mock_rootcoord.go index 06ffeebe6d..36c061fd5e 100644 --- a/internal/mocks/mock_rootcoord.go +++ b/internal/mocks/mock_rootcoord.go @@ -10,15 +10,15 @@ import ( grpc "google.golang.org/grpc" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mock "github.com/stretchr/testify/mock" - proxypb "github.com/milvus-io/milvus/pkg/proto/proxypb" + proxypb "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" - rootcoordpb "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" + rootcoordpb "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" txnkv "github.com/tikv/client-go/v2/txnkv" @@ -1926,6 +1926,38 @@ func (_c *RootCoord_GetTimeTickChannel_Call) RunAndReturn(run func(context.Conte return _c } +// GracefulStop provides a mock function with given fields: +func (_m *RootCoord) GracefulStop() { + _m.Called() +} + +// RootCoord_GracefulStop_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GracefulStop' +type RootCoord_GracefulStop_Call struct { + *mock.Call +} + +// GracefulStop is a helper method to define mock.On call +func (_e *RootCoord_Expecter) GracefulStop() *RootCoord_GracefulStop_Call { + return &RootCoord_GracefulStop_Call{Call: _e.mock.On("GracefulStop")} +} + +func (_c *RootCoord_GracefulStop_Call) Run(run func()) *RootCoord_GracefulStop_Call { + _c.Call.Run(func(args mock.Arguments) { + run() + }) + return _c +} + +func (_c *RootCoord_GracefulStop_Call) Return() *RootCoord_GracefulStop_Call { + _c.Call.Return() + return _c +} + +func (_c *RootCoord_GracefulStop_Call) RunAndReturn(run func()) *RootCoord_GracefulStop_Call { + _c.Call.Return(run) + return _c +} + // HasCollection provides a mock function with given fields: _a0, _a1 func (_m *RootCoord) HasCollection(_a0 context.Context, _a1 *milvuspb.HasCollectionRequest) (*milvuspb.BoolResponse, error) { ret := _m.Called(_a0, _a1) diff --git a/internal/mocks/mock_rootcoord_client.go b/internal/mocks/mock_rootcoord_client.go index 99dbc65cfd..d797d17aa8 100644 --- a/internal/mocks/mock_rootcoord_client.go +++ b/internal/mocks/mock_rootcoord_client.go @@ -9,15 +9,15 @@ import ( grpc "google.golang.org/grpc" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mock "github.com/stretchr/testify/mock" - proxypb "github.com/milvus-io/milvus/pkg/proto/proxypb" + proxypb "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" - rootcoordpb "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" + rootcoordpb "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" ) // MockRootCoordClient is an autogenerated mock type for the RootCoordClient type diff --git a/internal/mocks/streamingcoord/client/mock_broadcast/mock_Watcher.go b/internal/mocks/streamingcoord/client/mock_broadcast/mock_Watcher.go index 273d5f1713..53929c2797 100644 --- a/internal/mocks/streamingcoord/client/mock_broadcast/mock_Watcher.go +++ b/internal/mocks/streamingcoord/client/mock_broadcast/mock_Watcher.go @@ -5,7 +5,7 @@ package mock_broadcast import ( context "context" - messagespb "github.com/milvus-io/milvus/pkg/proto/messagespb" + messagespb "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/mocks/streamingcoord/mock_client/mock_BroadcastService.go b/internal/mocks/streamingcoord/mock_client/mock_BroadcastService.go index 850eab8ad0..4570458b8f 100644 --- a/internal/mocks/streamingcoord/mock_client/mock_BroadcastService.go +++ b/internal/mocks/streamingcoord/mock_client/mock_BroadcastService.go @@ -5,12 +5,12 @@ package mock_client import ( context "context" - messagespb "github.com/milvus-io/milvus/pkg/proto/messagespb" - message "github.com/milvus-io/milvus/pkg/streaming/util/message" + messagespb "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + message "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" mock "github.com/stretchr/testify/mock" - types "github.com/milvus-io/milvus/pkg/streaming/util/types" + types "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) // MockBroadcastService is an autogenerated mock type for the BroadcastService type diff --git a/internal/mocks/streamingcoord/server/mock_balancer/mock_Balancer.go b/internal/mocks/streamingcoord/server/mock_balancer/mock_Balancer.go index eb48a01a75..dbf89e90c4 100644 --- a/internal/mocks/streamingcoord/server/mock_balancer/mock_Balancer.go +++ b/internal/mocks/streamingcoord/server/mock_balancer/mock_Balancer.go @@ -5,10 +5,10 @@ package mock_balancer import ( context "context" - types "github.com/milvus-io/milvus/pkg/streaming/util/types" + types "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" mock "github.com/stretchr/testify/mock" - typeutil "github.com/milvus-io/milvus/pkg/util/typeutil" + typeutil "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // MockBalancer is an autogenerated mock type for the Balancer type diff --git a/internal/mocks/streamingcoord/server/mock_broadcaster/mock_AppendOperator.go b/internal/mocks/streamingcoord/server/mock_broadcaster/mock_AppendOperator.go index 8f049c5616..0b0daf9572 100644 --- a/internal/mocks/streamingcoord/server/mock_broadcaster/mock_AppendOperator.go +++ b/internal/mocks/streamingcoord/server/mock_broadcaster/mock_AppendOperator.go @@ -5,7 +5,7 @@ package mock_broadcaster import ( context "context" - message "github.com/milvus-io/milvus/pkg/streaming/util/message" + message "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" mock "github.com/stretchr/testify/mock" streaming "github.com/milvus-io/milvus/internal/distributed/streaming" diff --git a/internal/mocks/streamingcoord/server/mock_broadcaster/mock_Watcher.go b/internal/mocks/streamingcoord/server/mock_broadcaster/mock_Watcher.go index 4af7779bee..e3ff3e2d3b 100644 --- a/internal/mocks/streamingcoord/server/mock_broadcaster/mock_Watcher.go +++ b/internal/mocks/streamingcoord/server/mock_broadcaster/mock_Watcher.go @@ -5,7 +5,7 @@ package mock_broadcaster import ( context "context" - messagespb "github.com/milvus-io/milvus/pkg/proto/messagespb" + messagespb "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/mocks/streamingnode/client/handler/mock_assignment/mock_Watcher.go b/internal/mocks/streamingnode/client/handler/mock_assignment/mock_Watcher.go index 084a0ad6a2..b582820cb1 100644 --- a/internal/mocks/streamingnode/client/handler/mock_assignment/mock_Watcher.go +++ b/internal/mocks/streamingnode/client/handler/mock_assignment/mock_Watcher.go @@ -5,7 +5,7 @@ package mock_assignment import ( context "context" - types "github.com/milvus-io/milvus/pkg/streaming/util/types" + types "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/mocks/streamingnode/client/handler/mock_producer/mock_Producer.go b/internal/mocks/streamingnode/client/handler/mock_producer/mock_Producer.go index 36d0a3714d..82dbc50b48 100644 --- a/internal/mocks/streamingnode/client/handler/mock_producer/mock_Producer.go +++ b/internal/mocks/streamingnode/client/handler/mock_producer/mock_Producer.go @@ -5,10 +5,10 @@ package mock_producer import ( context "context" - message "github.com/milvus-io/milvus/pkg/streaming/util/message" + message "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" mock "github.com/stretchr/testify/mock" - types "github.com/milvus-io/milvus/pkg/streaming/util/types" + types "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) // MockProducer is an autogenerated mock type for the Producer type diff --git a/internal/mocks/streamingnode/client/mock_manager/mock_ManagerClient.go b/internal/mocks/streamingnode/client/mock_manager/mock_ManagerClient.go index 0fd793afa7..f4e1bda989 100644 --- a/internal/mocks/streamingnode/client/mock_manager/mock_ManagerClient.go +++ b/internal/mocks/streamingnode/client/mock_manager/mock_ManagerClient.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - types "github.com/milvus-io/milvus/pkg/streaming/util/types" + types "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) // MockManagerClient is an autogenerated mock type for the ManagerClient type diff --git a/internal/mocks/streamingnode/server/mock_wal/mock_Scanner.go b/internal/mocks/streamingnode/server/mock_wal/mock_Scanner.go index 5f86b858ad..468e46dda3 100644 --- a/internal/mocks/streamingnode/server/mock_wal/mock_Scanner.go +++ b/internal/mocks/streamingnode/server/mock_wal/mock_Scanner.go @@ -3,10 +3,10 @@ package mock_wal import ( - message "github.com/milvus-io/milvus/pkg/streaming/util/message" + message "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" mock "github.com/stretchr/testify/mock" - types "github.com/milvus-io/milvus/pkg/streaming/util/types" + types "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) // MockScanner is an autogenerated mock type for the Scanner type diff --git a/internal/mocks/streamingnode/server/mock_wal/mock_WAL.go b/internal/mocks/streamingnode/server/mock_wal/mock_WAL.go index fbd68c797a..18b20c45ba 100644 --- a/internal/mocks/streamingnode/server/mock_wal/mock_WAL.go +++ b/internal/mocks/streamingnode/server/mock_wal/mock_WAL.go @@ -5,10 +5,10 @@ package mock_wal import ( context "context" - message "github.com/milvus-io/milvus/pkg/streaming/util/message" + message "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" mock "github.com/stretchr/testify/mock" - types "github.com/milvus-io/milvus/pkg/streaming/util/types" + types "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" wal "github.com/milvus-io/milvus/internal/streamingnode/server/wal" ) diff --git a/internal/mocks/streamingnode/server/mock_walmanager/mock_Manager.go b/internal/mocks/streamingnode/server/mock_walmanager/mock_Manager.go index 7d06eacb29..038faaca59 100644 --- a/internal/mocks/streamingnode/server/mock_walmanager/mock_Manager.go +++ b/internal/mocks/streamingnode/server/mock_walmanager/mock_Manager.go @@ -5,7 +5,7 @@ package mock_walmanager import ( context "context" - types "github.com/milvus-io/milvus/pkg/streaming/util/types" + types "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" mock "github.com/stretchr/testify/mock" wal "github.com/milvus-io/milvus/internal/streamingnode/server/wal" diff --git a/internal/mocks/streamingnode/server/wal/interceptors/segment/mock_inspector/mock_SealOperator.go b/internal/mocks/streamingnode/server/wal/interceptors/segment/mock_inspector/mock_SealOperator.go index 33e1babadc..e120692282 100644 --- a/internal/mocks/streamingnode/server/wal/interceptors/segment/mock_inspector/mock_SealOperator.go +++ b/internal/mocks/streamingnode/server/wal/interceptors/segment/mock_inspector/mock_SealOperator.go @@ -9,7 +9,7 @@ import ( stats "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/segment/stats" - types "github.com/milvus-io/milvus/pkg/streaming/util/types" + types "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) // MockSealOperator is an autogenerated mock type for the SealOperator type diff --git a/internal/mocks/streamingnode/server/wal/interceptors/timetick/mock_inspector/mock_TimeTickSyncOperator.go b/internal/mocks/streamingnode/server/wal/interceptors/timetick/mock_inspector/mock_TimeTickSyncOperator.go index 460529f6fb..f05452ae7c 100644 --- a/internal/mocks/streamingnode/server/wal/interceptors/timetick/mock_inspector/mock_TimeTickSyncOperator.go +++ b/internal/mocks/streamingnode/server/wal/interceptors/timetick/mock_inspector/mock_TimeTickSyncOperator.go @@ -9,7 +9,7 @@ import ( mvcc "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/timetick/mvcc" - types "github.com/milvus-io/milvus/pkg/streaming/util/types" + types "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" wab "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/wab" ) diff --git a/internal/mocks/streamingnode/server/wal/mock_interceptors/mock_Interceptor.go b/internal/mocks/streamingnode/server/wal/mock_interceptors/mock_Interceptor.go index 72811537a7..4f78455948 100644 --- a/internal/mocks/streamingnode/server/wal/mock_interceptors/mock_Interceptor.go +++ b/internal/mocks/streamingnode/server/wal/mock_interceptors/mock_Interceptor.go @@ -5,7 +5,7 @@ package mock_interceptors import ( context "context" - message "github.com/milvus-io/milvus/pkg/streaming/util/message" + message "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/mocks/streamingnode/server/wal/mock_interceptors/mock_InterceptorWithReady.go b/internal/mocks/streamingnode/server/wal/mock_interceptors/mock_InterceptorWithReady.go index ccc49f8eef..de2e8d9a26 100644 --- a/internal/mocks/streamingnode/server/wal/mock_interceptors/mock_InterceptorWithReady.go +++ b/internal/mocks/streamingnode/server/wal/mock_interceptors/mock_InterceptorWithReady.go @@ -5,7 +5,7 @@ package mock_interceptors import ( context "context" - message "github.com/milvus-io/milvus/pkg/streaming/util/message" + message "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/mocks/util/mock_segcore/mock_data.go b/internal/mocks/util/mock_segcore/mock_data.go index 03362385cd..79097dcd13 100644 --- a/internal/mocks/util/mock_segcore/mock_data.go +++ b/internal/mocks/util/mock_segcore/mock_data.go @@ -37,22 +37,22 @@ import ( storage "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/indexcgowrapper" "github.com/milvus-io/milvus/internal/util/segcore" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/testutils" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/parser/planparserv2/check_identical.go b/internal/parser/planparserv2/check_identical.go index 15808f322e..b003cf3687 100644 --- a/internal/parser/planparserv2/check_identical.go +++ b/internal/parser/planparserv2/check_identical.go @@ -3,8 +3,8 @@ package planparserv2 import ( "reflect" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) // CheckPredicatesIdentical check if two exprs are identical. diff --git a/internal/parser/planparserv2/check_identical_test.go b/internal/parser/planparserv2/check_identical_test.go index 7df0bd2e11..e45b186c41 100644 --- a/internal/parser/planparserv2/check_identical_test.go +++ b/internal/parser/planparserv2/check_identical_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestCheckIdentical(t *testing.T) { diff --git a/internal/parser/planparserv2/convert_field_data_to_generic_value.go b/internal/parser/planparserv2/convert_field_data_to_generic_value.go index 31482b71b3..c9e4f052a0 100644 --- a/internal/parser/planparserv2/convert_field_data_to_generic_value.go +++ b/internal/parser/planparserv2/convert_field_data_to_generic_value.go @@ -6,7 +6,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" ) func convertArrayValue(templateName string, templateValue *schemapb.TemplateArrayValue) (*planpb.GenericValue, error) { diff --git a/internal/parser/planparserv2/convert_field_data_to_generic_value_test.go b/internal/parser/planparserv2/convert_field_data_to_generic_value_test.go index 339d2d8dcb..bc8a43fd1a 100644 --- a/internal/parser/planparserv2/convert_field_data_to_generic_value_test.go +++ b/internal/parser/planparserv2/convert_field_data_to_generic_value_test.go @@ -7,7 +7,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" ) type convertTestcase struct { diff --git a/internal/parser/planparserv2/fill_expression_value.go b/internal/parser/planparserv2/fill_expression_value.go index c1b02a7492..2ba36f7ede 100644 --- a/internal/parser/planparserv2/fill_expression_value.go +++ b/internal/parser/planparserv2/fill_expression_value.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func FillExpressionValue(expr *planpb.Expr, templateValues map[string]*planpb.GenericValue) error { diff --git a/internal/parser/planparserv2/fill_expression_value_test.go b/internal/parser/planparserv2/fill_expression_value_test.go index 3fd6e5ddb8..63b0e5bc07 100644 --- a/internal/parser/planparserv2/fill_expression_value_test.go +++ b/internal/parser/planparserv2/fill_expression_value_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type FillExpressionValueSuite struct { diff --git a/internal/parser/planparserv2/logical_expr_visitor.go b/internal/parser/planparserv2/logical_expr_visitor.go index 92b5920b6a..3d31dfeaea 100644 --- a/internal/parser/planparserv2/logical_expr_visitor.go +++ b/internal/parser/planparserv2/logical_expr_visitor.go @@ -1,6 +1,6 @@ package planparserv2 -import "github.com/milvus-io/milvus/pkg/proto/planpb" +import "github.com/milvus-io/milvus/pkg/v2/proto/planpb" type LogicalExprVisitor interface { VisitExpr(expr *planpb.Expr) interface{} diff --git a/internal/parser/planparserv2/node_ret.go b/internal/parser/planparserv2/node_ret.go index e76587de1e..8df1ed9ef0 100644 --- a/internal/parser/planparserv2/node_ret.go +++ b/internal/parser/planparserv2/node_ret.go @@ -2,7 +2,7 @@ package planparserv2 import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" ) type ExprWithType struct { diff --git a/internal/parser/planparserv2/operators.go b/internal/parser/planparserv2/operators.go index 3d0f2c58a0..da5890f436 100644 --- a/internal/parser/planparserv2/operators.go +++ b/internal/parser/planparserv2/operators.go @@ -6,7 +6,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" parser "github.com/milvus-io/milvus/internal/parser/planparserv2/generated" - "github.com/milvus-io/milvus/pkg/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" ) var arithExprMap = map[int]planpb.ArithOpType{ diff --git a/internal/parser/planparserv2/parser_visitor.go b/internal/parser/planparserv2/parser_visitor.go index ad5a94d5e6..1905630650 100644 --- a/internal/parser/planparserv2/parser_visitor.go +++ b/internal/parser/planparserv2/parser_visitor.go @@ -10,8 +10,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" parser "github.com/milvus-io/milvus/internal/parser/planparserv2/generated" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ParserVisitor struct { diff --git a/internal/parser/planparserv2/pattern_match.go b/internal/parser/planparserv2/pattern_match.go index e74f81f85f..bec94a8f20 100644 --- a/internal/parser/planparserv2/pattern_match.go +++ b/internal/parser/planparserv2/pattern_match.go @@ -1,7 +1,7 @@ package planparserv2 import ( - "github.com/milvus-io/milvus/pkg/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" ) var wildcards = map[byte]struct{}{ diff --git a/internal/parser/planparserv2/pattern_match_test.go b/internal/parser/planparserv2/pattern_match_test.go index fb97de29c7..88380bdd14 100644 --- a/internal/parser/planparserv2/pattern_match_test.go +++ b/internal/parser/planparserv2/pattern_match_test.go @@ -3,7 +3,7 @@ package planparserv2 import ( "testing" - "github.com/milvus-io/milvus/pkg/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" ) func Test_hasWildcards(t *testing.T) { diff --git a/internal/parser/planparserv2/plan_parser_v2.go b/internal/parser/planparserv2/plan_parser_v2.go index caacb7b6bb..c48057443a 100644 --- a/internal/parser/planparserv2/plan_parser_v2.go +++ b/internal/parser/planparserv2/plan_parser_v2.go @@ -11,10 +11,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" planparserv2 "github.com/milvus-io/milvus/internal/parser/planparserv2/generated" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/internal/parser/planparserv2/plan_parser_v2_test.go b/internal/parser/planparserv2/plan_parser_v2_test.go index 36d0df46ad..d2a368f38b 100644 --- a/internal/parser/planparserv2/plan_parser_v2_test.go +++ b/internal/parser/planparserv2/plan_parser_v2_test.go @@ -13,9 +13,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func newTestSchema(EnableDynamicField bool) *schemapb.CollectionSchema { diff --git a/internal/parser/planparserv2/pool.go b/internal/parser/planparserv2/pool.go index 4fa65d59e8..b87cbbebfe 100644 --- a/internal/parser/planparserv2/pool.go +++ b/internal/parser/planparserv2/pool.go @@ -7,7 +7,7 @@ import ( pool "github.com/jolestar/go-commons-pool/v2" antlrparser "github.com/milvus-io/milvus/internal/parser/planparserv2/generated" - "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" ) var ( diff --git a/internal/parser/planparserv2/show_visitor.go b/internal/parser/planparserv2/show_visitor.go index ed647b1d3e..9cf67ad457 100644 --- a/internal/parser/planparserv2/show_visitor.go +++ b/internal/parser/planparserv2/show_visitor.go @@ -4,8 +4,8 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" ) type ShowExprVisitor struct{} diff --git a/internal/parser/planparserv2/utils.go b/internal/parser/planparserv2/utils.go index 2dea26cd30..0c399d589f 100644 --- a/internal/parser/planparserv2/utils.go +++ b/internal/parser/planparserv2/utils.go @@ -9,8 +9,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func IsBool(n *planpb.GenericValue) bool { diff --git a/internal/parser/planparserv2/utils_test.go b/internal/parser/planparserv2/utils_test.go index 6902b47526..cf962ca073 100644 --- a/internal/parser/planparserv2/utils_test.go +++ b/internal/parser/planparserv2/utils_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" ) func Test_relationalCompatible(t *testing.T) { diff --git a/internal/proxy/accesslog/benchmark_test.go b/internal/proxy/accesslog/benchmark_test.go index 0b1f79e092..145f162835 100644 --- a/internal/proxy/accesslog/benchmark_test.go +++ b/internal/proxy/accesslog/benchmark_test.go @@ -12,9 +12,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/proxy/accesslog/info" "github.com/milvus-io/milvus/internal/proxy/connection" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type TestData struct { diff --git a/internal/proxy/accesslog/formater_test.go b/internal/proxy/accesslog/formater_test.go index e9e2f92d24..3a54740b93 100644 --- a/internal/proxy/accesslog/formater_test.go +++ b/internal/proxy/accesslog/formater_test.go @@ -32,11 +32,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/proxy/accesslog/info" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type LogFormatterSuite struct { diff --git a/internal/proxy/accesslog/formatter.go b/internal/proxy/accesslog/formatter.go index ba9cd155a4..e5456fbc85 100644 --- a/internal/proxy/accesslog/formatter.go +++ b/internal/proxy/accesslog/formatter.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/milvus-io/milvus/internal/proxy/accesslog/info" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) const ( diff --git a/internal/proxy/accesslog/global.go b/internal/proxy/accesslog/global.go index 25d65f57f0..327f1a593f 100644 --- a/internal/proxy/accesslog/global.go +++ b/internal/proxy/accesslog/global.go @@ -26,9 +26,9 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/proxy/accesslog/info" - configEvent "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + configEvent "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var ( diff --git a/internal/proxy/accesslog/global_test.go b/internal/proxy/accesslog/global_test.go index e90265c2f6..9aab706f1c 100644 --- a/internal/proxy/accesslog/global_test.go +++ b/internal/proxy/accesslog/global_test.go @@ -33,8 +33,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/proxy/accesslog/info" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMain(m *testing.M) { diff --git a/internal/proxy/accesslog/info/grpc_info.go b/internal/proxy/accesslog/info/grpc_info.go index 6b061ea57b..3908b3b03b 100644 --- a/internal/proxy/accesslog/info/grpc_info.go +++ b/internal/proxy/accesslog/info/grpc_info.go @@ -34,8 +34,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/proxy/connection" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/requestutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/requestutil" ) type GrpcAccessInfo struct { diff --git a/internal/proxy/accesslog/info/grpc_info_test.go b/internal/proxy/accesslog/info/grpc_info_test.go index e97312f518..f10619c9e7 100644 --- a/internal/proxy/accesslog/info/grpc_info_test.go +++ b/internal/proxy/accesslog/info/grpc_info_test.go @@ -32,10 +32,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/proxy/connection" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type GrpcAccessInfoSuite struct { diff --git a/internal/proxy/accesslog/info/restful_info.go b/internal/proxy/accesslog/info/restful_info.go index 87fe74f6b6..201cc34383 100644 --- a/internal/proxy/accesslog/info/restful_info.go +++ b/internal/proxy/accesslog/info/restful_info.go @@ -24,7 +24,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/milvus-io/milvus/pkg/util/requestutil" + "github.com/milvus-io/milvus/pkg/v2/util/requestutil" ) const ( diff --git a/internal/proxy/accesslog/info/restful_info_test.go b/internal/proxy/accesslog/info/restful_info_test.go index a96776b7ca..f2e49dd9dc 100644 --- a/internal/proxy/accesslog/info/restful_info_test.go +++ b/internal/proxy/accesslog/info/restful_info_test.go @@ -27,8 +27,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type RestfulAccessInfoSuite struct { diff --git a/internal/proxy/accesslog/info/util.go b/internal/proxy/accesslog/info/util.go index dfb8ed2d15..70d905360b 100644 --- a/internal/proxy/accesslog/info/util.go +++ b/internal/proxy/accesslog/info/util.go @@ -24,8 +24,8 @@ import ( "go.uber.org/atomic" "google.golang.org/grpc/metadata" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" ) var ClusterPrefix atomic.String diff --git a/internal/proxy/accesslog/minio_handler.go b/internal/proxy/accesslog/minio_handler.go index 44eedd19ec..5defd980bb 100644 --- a/internal/proxy/accesslog/minio_handler.go +++ b/internal/proxy/accesslog/minio_handler.go @@ -29,9 +29,9 @@ import ( "github.com/minio/minio-go/v7/pkg/credentials" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) type config struct { diff --git a/internal/proxy/accesslog/minio_handler_test.go b/internal/proxy/accesslog/minio_handler_test.go index 9947cefbb1..c3e8e0dc93 100644 --- a/internal/proxy/accesslog/minio_handler_test.go +++ b/internal/proxy/accesslog/minio_handler_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMinioHandler_ConnectError(t *testing.T) { diff --git a/internal/proxy/accesslog/writer.go b/internal/proxy/accesslog/writer.go index 6b5da43834..9b77141275 100644 --- a/internal/proxy/accesslog/writer.go +++ b/internal/proxy/accesslog/writer.go @@ -28,8 +28,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) const megabyte = 1024 * 1024 diff --git a/internal/proxy/accesslog/writer_test.go b/internal/proxy/accesslog/writer_test.go index 45d5425802..534852e685 100644 --- a/internal/proxy/accesslog/writer_test.go +++ b/internal/proxy/accesslog/writer_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func getText(size int) []byte { diff --git a/internal/proxy/authentication_interceptor.go b/internal/proxy/authentication_interceptor.go index 7bd39d3f7b..210a70e3a9 100644 --- a/internal/proxy/authentication_interceptor.go +++ b/internal/proxy/authentication_interceptor.go @@ -14,11 +14,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/util/hookutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func parseMD(rawToken string) (username, password string) { diff --git a/internal/proxy/authentication_interceptor_test.go b/internal/proxy/authentication_interceptor_test.go index 9e237d3f5f..42b327c85f 100644 --- a/internal/proxy/authentication_interceptor_test.go +++ b/internal/proxy/authentication_interceptor_test.go @@ -11,9 +11,9 @@ import ( "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/util/hookutil" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // validAuth validates the authentication diff --git a/internal/proxy/cgo_util.go b/internal/proxy/cgo_util.go index 1f929d29b4..6ae963d89f 100644 --- a/internal/proxy/cgo_util.go +++ b/internal/proxy/cgo_util.go @@ -32,9 +32,9 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" ) var ( diff --git a/internal/proxy/channels_mgr.go b/internal/proxy/channels_mgr.go index 375649e5b6..2ed7da60e6 100644 --- a/internal/proxy/channels_mgr.go +++ b/internal/proxy/channels_mgr.go @@ -27,12 +27,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // channelsMgr manages the pchans, vchans and related message stream of collections. diff --git a/internal/proxy/channels_mgr_test.go b/internal/proxy/channels_mgr_test.go index db5e89f323..30c65a550c 100644 --- a/internal/proxy/channels_mgr_test.go +++ b/internal/proxy/channels_mgr_test.go @@ -27,8 +27,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func Test_removeDuplicate(t *testing.T) { diff --git a/internal/proxy/channels_time_ticker.go b/internal/proxy/channels_time_ticker.go index c229010989..028460b0f7 100644 --- a/internal/proxy/channels_time_ticker.go +++ b/internal/proxy/channels_time_ticker.go @@ -23,8 +23,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // ticker can update ts only when the minTs are greater than the ts of ticker, we can use maxTs to update current later diff --git a/internal/proxy/channels_time_ticker_test.go b/internal/proxy/channels_time_ticker_test.go index a5600e9a5f..1074438719 100644 --- a/internal/proxy/channels_time_ticker_test.go +++ b/internal/proxy/channels_time_ticker_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func newGetStatisticsFunc(pchans []pChan) getPChanStatisticsFuncType { diff --git a/internal/proxy/condition_test.go b/internal/proxy/condition_test.go index 13dba5b651..623fdb095e 100644 --- a/internal/proxy/condition_test.go +++ b/internal/proxy/condition_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) func TestTaskCondition_Ctx(t *testing.T) { diff --git a/internal/proxy/connection/manager.go b/internal/proxy/connection/manager.go index 2707256f6f..dba6364aa4 100644 --- a/internal/proxy/connection/manager.go +++ b/internal/proxy/connection/manager.go @@ -10,9 +10,9 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type connectionManager struct { diff --git a/internal/proxy/connection/manager_test.go b/internal/proxy/connection/manager_test.go index 98af4476ff..3e68f2600f 100644 --- a/internal/proxy/connection/manager_test.go +++ b/internal/proxy/connection/manager_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestConnectionManager(t *testing.T) { diff --git a/internal/proxy/connection/util.go b/internal/proxy/connection/util.go index 50d7e5118f..424aac5525 100644 --- a/internal/proxy/connection/util.go +++ b/internal/proxy/connection/util.go @@ -10,8 +10,8 @@ import ( "google.golang.org/grpc/metadata" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) func ZapClientInfo(info *commonpb.ClientInfo) []zap.Field { diff --git a/internal/proxy/count_reducer.go b/internal/proxy/count_reducer.go index c1dc96edd5..389efb6d37 100644 --- a/internal/proxy/count_reducer.go +++ b/internal/proxy/count_reducer.go @@ -3,8 +3,8 @@ package proxy import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type cntReducer struct { diff --git a/internal/proxy/count_reducer_test.go b/internal/proxy/count_reducer_test.go index 814823cc9a..a66703c8c7 100644 --- a/internal/proxy/count_reducer_test.go +++ b/internal/proxy/count_reducer_test.go @@ -7,7 +7,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/pkg/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" ) func Test_cntReducer_Reduce(t *testing.T) { diff --git a/internal/proxy/data_coord_mock_test.go b/internal/proxy/data_coord_mock_test.go index 0d2f8cdce9..d291f066ea 100644 --- a/internal/proxy/data_coord_mock_test.go +++ b/internal/proxy/data_coord_mock_test.go @@ -25,13 +25,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" - "github.com/milvus-io/milvus/pkg/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/uniquegenerator" ) type DataCoordMock struct { diff --git a/internal/proxy/database_interceptor_test.go b/internal/proxy/database_interceptor_test.go index d5c84e721f..e80203d000 100644 --- a/internal/proxy/database_interceptor_test.go +++ b/internal/proxy/database_interceptor_test.go @@ -11,7 +11,7 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/v2/util" ) func TestDatabaseInterceptor(t *testing.T) { diff --git a/internal/proxy/default_limit_reducer.go b/internal/proxy/default_limit_reducer.go index ee95d2aa3f..b7aee52973 100644 --- a/internal/proxy/default_limit_reducer.go +++ b/internal/proxy/default_limit_reducer.go @@ -5,10 +5,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type defaultLimitReducer struct { diff --git a/internal/proxy/dummyreq_test.go b/internal/proxy/dummyreq_test.go index 6e4ac7cf07..49c4c2458f 100644 --- a/internal/proxy/dummyreq_test.go +++ b/internal/proxy/dummyreq_test.go @@ -23,7 +23,7 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) func Test_parseDummyRequestType(t *testing.T) { diff --git a/internal/proxy/hook_interceptor.go b/internal/proxy/hook_interceptor.go index bb4c19c6fb..969bb68694 100644 --- a/internal/proxy/hook_interceptor.go +++ b/internal/proxy/hook_interceptor.go @@ -11,9 +11,9 @@ import ( "google.golang.org/grpc/status" "github.com/milvus-io/milvus/internal/util/hookutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func UnaryServerHookInterceptor() grpc.UnaryServerInterceptor { diff --git a/internal/proxy/http_req_impl.go b/internal/proxy/http_req_impl.go index 6b202b09b0..4a4ab0a56e 100644 --- a/internal/proxy/http_req_impl.go +++ b/internal/proxy/http_req_impl.go @@ -31,13 +31,13 @@ import ( "github.com/milvus-io/milvus/internal/proxy/connection" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/internal/proxy/http_req_impl_test.go b/internal/proxy/http_req_impl_test.go index 7ccc5f5edd..1dc2dd91fc 100644 --- a/internal/proxy/http_req_impl_test.go +++ b/internal/proxy/http_req_impl_test.go @@ -16,9 +16,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proxy/connection" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestGetConfigs(t *testing.T) { diff --git a/internal/proxy/impl.go b/internal/proxy/impl.go index a95c1d62b0..bd1940f0c2 100644 --- a/internal/proxy/impl.go +++ b/internal/proxy/impl.go @@ -48,29 +48,29 @@ import ( "github.com/milvus-io/milvus/internal/util/ctokenizer" "github.com/milvus-io/milvus/internal/util/hookutil" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/logutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/ratelimitutil" - "github.com/milvus-io/milvus/pkg/util/requestutil" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/logutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/v2/util/requestutil" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const moduleName = "Proxy" diff --git a/internal/proxy/impl_test.go b/internal/proxy/impl_test.go index a4735c8b86..62627cb60a 100644 --- a/internal/proxy/impl_test.go +++ b/internal/proxy/impl_test.go @@ -47,21 +47,21 @@ import ( "github.com/milvus-io/milvus/internal/mocks/distributed/mock_streaming" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - mqcommon "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/ratelimitutil" - "github.com/milvus-io/milvus/pkg/util/resource" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + mqcommon "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/v2/util/resource" ) func TestProxy_InvalidateCollectionMetaCache_remove_stream(t *testing.T) { diff --git a/internal/proxy/interface_def.go b/internal/proxy/interface_def.go index 8766270e35..36cbbe0302 100644 --- a/internal/proxy/interface_def.go +++ b/internal/proxy/interface_def.go @@ -21,7 +21,7 @@ import ( "google.golang.org/grpc" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" ) // use interface tsoAllocator to keep other components testable diff --git a/internal/proxy/lb_balancer.go b/internal/proxy/lb_balancer.go index 6cc8aea486..2432ff0a9d 100644 --- a/internal/proxy/lb_balancer.go +++ b/internal/proxy/lb_balancer.go @@ -19,7 +19,7 @@ package proxy import ( "context" - "github.com/milvus-io/milvus/pkg/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" ) type LBBalancer interface { diff --git a/internal/proxy/lb_policy.go b/internal/proxy/lb_policy.go index d069ddbf91..c0743c298a 100644 --- a/internal/proxy/lb_policy.go +++ b/internal/proxy/lb_policy.go @@ -25,11 +25,11 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type executeFunc func(context.Context, UniqueID, types.QueryNodeClient, string) error diff --git a/internal/proxy/lb_policy_test.go b/internal/proxy/lb_policy_test.go index 086b50449c..43f4308bea 100644 --- a/internal/proxy/lb_policy_test.go +++ b/internal/proxy/lb_policy_test.go @@ -34,12 +34,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type LBPolicySuite struct { diff --git a/internal/proxy/look_aside_balancer.go b/internal/proxy/look_aside_balancer.go index ac5bcdab3c..ddc3b8d0a3 100644 --- a/internal/proxy/look_aside_balancer.go +++ b/internal/proxy/look_aside_balancer.go @@ -27,11 +27,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type CostMetrics struct { diff --git a/internal/proxy/look_aside_balancer_test.go b/internal/proxy/look_aside_balancer_test.go index 72cad81f00..095aee083f 100644 --- a/internal/proxy/look_aside_balancer_test.go +++ b/internal/proxy/look_aside_balancer_test.go @@ -30,8 +30,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type LookAsideBalancerSuite struct { diff --git a/internal/proxy/management.go b/internal/proxy/management.go index f431268221..e9d06836b2 100644 --- a/internal/proxy/management.go +++ b/internal/proxy/management.go @@ -27,10 +27,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" management "github.com/milvus-io/milvus/internal/http" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // this file contains proxy management restful API handler diff --git a/internal/proxy/management_test.go b/internal/proxy/management_test.go index be62146823..a23c6dd551 100644 --- a/internal/proxy/management_test.go +++ b/internal/proxy/management_test.go @@ -31,9 +31,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" management "github.com/milvus-io/milvus/internal/http" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type ProxyManagementSuite struct { diff --git a/internal/proxy/meta_cache.go b/internal/proxy/meta_cache.go index bd4f5fabab..7abe1d18ce 100644 --- a/internal/proxy/meta_cache.go +++ b/internal/proxy/meta_cache.go @@ -33,21 +33,21 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/expr" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/expr" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Cache is the interface for system meta data cache diff --git a/internal/proxy/meta_cache_adapter.go b/internal/proxy/meta_cache_adapter.go index da63272e74..dd1799e42c 100644 --- a/internal/proxy/meta_cache_adapter.go +++ b/internal/proxy/meta_cache_adapter.go @@ -24,7 +24,7 @@ import ( "github.com/casbin/casbin/v2/model" jsonadapter "github.com/casbin/json-adapter/v2" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // MetaCacheCasbinAdapter is the implementation of `persist.Adapter` with Cache diff --git a/internal/proxy/meta_cache_test.go b/internal/proxy/meta_cache_test.go index ec570d9a78..ab69646cee 100644 --- a/internal/proxy/meta_cache_test.go +++ b/internal/proxy/meta_cache_test.go @@ -36,15 +36,15 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var dbName = GetCurDBNameFromContextOrDefault(context.Background()) diff --git a/internal/proxy/meta_cache_testonly.go b/internal/proxy/meta_cache_testonly.go index 3ef06ad3fa..bfa6a625ab 100644 --- a/internal/proxy/meta_cache_testonly.go +++ b/internal/proxy/meta_cache_testonly.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func AddRootUserToAdminRole() { diff --git a/internal/proxy/metrics_info.go b/internal/proxy/metrics_info.go index d17c20ac42..0e61f2b1f6 100644 --- a/internal/proxy/metrics_info.go +++ b/internal/proxy/metrics_info.go @@ -23,14 +23,14 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/ratelimitutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ( diff --git a/internal/proxy/metrics_info_test.go b/internal/proxy/metrics_info_test.go index fbe746485b..61497ca792 100644 --- a/internal/proxy/metrics_info_test.go +++ b/internal/proxy/metrics_info_test.go @@ -25,11 +25,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/typeutil" - "github.com/milvus-io/milvus/pkg/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/uniquegenerator" ) func TestProxy_metrics(t *testing.T) { diff --git a/internal/proxy/mock_cache.go b/internal/proxy/mock_cache.go index 647bd55eaf..eb5c3d3a12 100644 --- a/internal/proxy/mock_cache.go +++ b/internal/proxy/mock_cache.go @@ -5,10 +5,10 @@ package proxy import ( context "context" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" mock "github.com/stretchr/testify/mock" - typeutil "github.com/milvus-io/milvus/pkg/util/typeutil" + typeutil "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // MockCache is an autogenerated mock type for the Cache type diff --git a/internal/proxy/mock_channels_manager.go b/internal/proxy/mock_channels_manager.go index 441272ac9c..a21686b1ab 100644 --- a/internal/proxy/mock_channels_manager.go +++ b/internal/proxy/mock_channels_manager.go @@ -5,7 +5,7 @@ package proxy import ( context "context" - msgstream "github.com/milvus-io/milvus/pkg/mq/msgstream" + msgstream "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/proxy/mock_lb_balancer.go b/internal/proxy/mock_lb_balancer.go index 9a729786e0..556ede06c2 100644 --- a/internal/proxy/mock_lb_balancer.go +++ b/internal/proxy/mock_lb_balancer.go @@ -5,7 +5,7 @@ package proxy import ( context "context" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/proxy/mock_lb_policy.go b/internal/proxy/mock_lb_policy.go index 6492c75e5c..541d545385 100644 --- a/internal/proxy/mock_lb_policy.go +++ b/internal/proxy/mock_lb_policy.go @@ -5,7 +5,7 @@ package proxy import ( context "context" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/proxy/mock_msgstream_test.go b/internal/proxy/mock_msgstream_test.go index 7c16e7efdf..06180485f1 100644 --- a/internal/proxy/mock_msgstream_test.go +++ b/internal/proxy/mock_msgstream_test.go @@ -5,7 +5,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" ) type mockMsgStream struct { diff --git a/internal/proxy/mock_test.go b/internal/proxy/mock_test.go index 20ca656cd3..6bf8bd45df 100644 --- a/internal/proxy/mock_test.go +++ b/internal/proxy/mock_test.go @@ -26,14 +26,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/testutils" - "github.com/milvus-io/milvus/pkg/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/util/uniquegenerator" ) type mockTimestampAllocatorInterface struct { diff --git a/internal/proxy/mock_tso_test.go b/internal/proxy/mock_tso_test.go index b69029b217..f10ac4ec2a 100644 --- a/internal/proxy/mock_tso_test.go +++ b/internal/proxy/mock_tso_test.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - rootcoordpb "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" + rootcoordpb "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" ) // mockTimestampAllocator is an autogenerated mock type for the timestampAllocatorInterface type diff --git a/internal/proxy/msg_pack.go b/internal/proxy/msg_pack.go index fb079a08d8..a6ec674e61 100644 --- a/internal/proxy/msg_pack.go +++ b/internal/proxy/msg_pack.go @@ -29,13 +29,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func genInsertMsgsByPartition(ctx context.Context, diff --git a/internal/proxy/msg_pack_test.go b/internal/proxy/msg_pack_test.go index 6f3d5f90a0..9156dce025 100644 --- a/internal/proxy/msg_pack_test.go +++ b/internal/proxy/msg_pack_test.go @@ -30,11 +30,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" ) func TestRepackInsertData(t *testing.T) { diff --git a/internal/proxy/privilege_cache.go b/internal/proxy/privilege_cache.go index 611dd0fb5b..a67c775eee 100644 --- a/internal/proxy/privilege_cache.go +++ b/internal/proxy/privilege_cache.go @@ -22,7 +22,7 @@ import ( "go.uber.org/atomic" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/internal/proxy/privilege_interceptor.go b/internal/proxy/privilege_interceptor.go index fc358d3baf..7dc27fbb44 100644 --- a/internal/proxy/privilege_interceptor.go +++ b/internal/proxy/privilege_interceptor.go @@ -17,11 +17,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/contextutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/contextutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type PrivilegeFunc func(ctx context.Context, req interface{}) (context.Context, error) diff --git a/internal/proxy/privilege_interceptor_test.go b/internal/proxy/privilege_interceptor_test.go index 322a661d8c..766bc286d4 100644 --- a/internal/proxy/privilege_interceptor_test.go +++ b/internal/proxy/privilege_interceptor_test.go @@ -11,11 +11,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestUnaryServerInterceptor(t *testing.T) { diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go index 14876a237f..dad9fa1401 100644 --- a/internal/proxy/proxy.go +++ b/internal/proxy/proxy.go @@ -41,19 +41,19 @@ import ( "github.com/milvus-io/milvus/internal/util/hookutil" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/expr" - "github.com/milvus-io/milvus/pkg/util/logutil" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/ratelimitutil" - "github.com/milvus-io/milvus/pkg/util/resource" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/expr" + "github.com/milvus-io/milvus/pkg/v2/util/logutil" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/v2/util/resource" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // UniqueID is alias of typeutil.UniqueID diff --git a/internal/proxy/proxy_rpc_test.go b/internal/proxy/proxy_rpc_test.go index 9cbc44617b..d7f745dc03 100644 --- a/internal/proxy/proxy_rpc_test.go +++ b/internal/proxy/proxy_rpc_test.go @@ -12,13 +12,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" grpcproxyclient "github.com/milvus-io/milvus/internal/distributed/proxy/client" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestProxyRpcLimit(t *testing.T) { diff --git a/internal/proxy/proxy_test.go b/internal/proxy/proxy_test.go index ec43a557a2..5f8669ca34 100644 --- a/internal/proxy/proxy_test.go +++ b/internal/proxy/proxy_test.go @@ -61,25 +61,25 @@ import ( "github.com/milvus-io/milvus/internal/util/componentutil" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/testutils" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/proxy/rate_limit_interceptor.go b/internal/proxy/rate_limit_interceptor.go index 339702e4c4..0626434a48 100644 --- a/internal/proxy/rate_limit_interceptor.go +++ b/internal/proxy/rate_limit_interceptor.go @@ -27,13 +27,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/importutilv2" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/requestutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/requestutil" ) // RateLimitInterceptor returns a new unary server interceptors that performs request rate limiting. diff --git a/internal/proxy/rate_limit_interceptor_test.go b/internal/proxy/rate_limit_interceptor_test.go index 74ddf4f6c3..4b142d6d81 100644 --- a/internal/proxy/rate_limit_interceptor_test.go +++ b/internal/proxy/rate_limit_interceptor_test.go @@ -28,9 +28,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type limiterMock struct { diff --git a/internal/proxy/reScorer.go b/internal/proxy/reScorer.go index 53d16aef9b..f53bd2a293 100644 --- a/internal/proxy/reScorer.go +++ b/internal/proxy/reScorer.go @@ -13,10 +13,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) type rankType int diff --git a/internal/proxy/reducer.go b/internal/proxy/reducer.go index 857785728d..291e0a5857 100644 --- a/internal/proxy/reducer.go +++ b/internal/proxy/reducer.go @@ -5,8 +5,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" ) type milvusReducer interface { diff --git a/internal/proxy/reducer_test.go b/internal/proxy/reducer_test.go index e6b3c1377e..5ea510963a 100644 --- a/internal/proxy/reducer_test.go +++ b/internal/proxy/reducer_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" ) func Test_createMilvusReducer(t *testing.T) { diff --git a/internal/proxy/repack_func.go b/internal/proxy/repack_func.go index 5b5b9e5ab2..844156d82d 100644 --- a/internal/proxy/repack_func.go +++ b/internal/proxy/repack_func.go @@ -19,7 +19,7 @@ package proxy import ( "fmt" - "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" ) // insertRepackFunc deprecated, use defaultInsertRepackFunc instead. diff --git a/internal/proxy/repack_func_test.go b/internal/proxy/repack_func_test.go index ffc01e4b79..5fe888a30e 100644 --- a/internal/proxy/repack_func_test.go +++ b/internal/proxy/repack_func_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" ) func Test_insertRepackFunc(t *testing.T) { diff --git a/internal/proxy/replicate_stream_manager.go b/internal/proxy/replicate_stream_manager.go index 0dce25d311..3d0d045b8e 100644 --- a/internal/proxy/replicate_stream_manager.go +++ b/internal/proxy/replicate_stream_manager.go @@ -6,10 +6,10 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/resource" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/resource" ) const ( diff --git a/internal/proxy/replicate_stream_manager_test.go b/internal/proxy/replicate_stream_manager_test.go index a1064ae156..f9ec60f5df 100644 --- a/internal/proxy/replicate_stream_manager_test.go +++ b/internal/proxy/replicate_stream_manager_test.go @@ -8,9 +8,9 @@ import ( "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/resource" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/resource" ) func TestReplicateManager(t *testing.T) { diff --git a/internal/proxy/rootcoord_mock_test.go b/internal/proxy/rootcoord_mock_test.go index 8cdf98c80b..fe923b3aad 100644 --- a/internal/proxy/rootcoord_mock_test.go +++ b/internal/proxy/rootcoord_mock_test.go @@ -31,15 +31,15 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" - "github.com/milvus-io/milvus/pkg/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/uniquegenerator" ) type collectionMeta struct { diff --git a/internal/proxy/roundrobin_balancer.go b/internal/proxy/roundrobin_balancer.go index 59d28b0106..af4794f727 100644 --- a/internal/proxy/roundrobin_balancer.go +++ b/internal/proxy/roundrobin_balancer.go @@ -20,8 +20,8 @@ import ( "go.uber.org/atomic" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type RoundRobinBalancer struct { diff --git a/internal/proxy/roundrobin_balancer_test.go b/internal/proxy/roundrobin_balancer_test.go index f30cbf3e36..444d7fd2c3 100644 --- a/internal/proxy/roundrobin_balancer_test.go +++ b/internal/proxy/roundrobin_balancer_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type RoundRobinBalancerSuite struct { diff --git a/internal/proxy/search_reduce_util.go b/internal/proxy/search_reduce_util.go index d398a2dd24..c3bf38f9ab 100644 --- a/internal/proxy/search_reduce_util.go +++ b/internal/proxy/search_reduce_util.go @@ -12,12 +12,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/reduce" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func reduceSearchResult(ctx context.Context, subSearchResultData []*schemapb.SearchResultData, reduceInfo *reduce.ResultInfo) (*milvuspb.SearchResults, error) { diff --git a/internal/proxy/search_util.go b/internal/proxy/search_util.go index bb4b254d24..37c9980b85 100644 --- a/internal/proxy/search_util.go +++ b/internal/proxy/search_util.go @@ -14,11 +14,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type rankParams struct { diff --git a/internal/proxy/segment.go b/internal/proxy/segment.go index a0adb2c01a..fb38c1b347 100644 --- a/internal/proxy/segment.go +++ b/internal/proxy/segment.go @@ -29,11 +29,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/proxy/segment_test.go b/internal/proxy/segment_test.go index 009d8e522a..1f78c1e59d 100644 --- a/internal/proxy/segment_test.go +++ b/internal/proxy/segment_test.go @@ -28,8 +28,8 @@ import ( "google.golang.org/grpc" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type mockDataCoord struct { diff --git a/internal/proxy/shard_client.go b/internal/proxy/shard_client.go index 83a94cf38b..6af461149c 100644 --- a/internal/proxy/shard_client.go +++ b/internal/proxy/shard_client.go @@ -12,9 +12,9 @@ import ( "github.com/milvus-io/milvus/internal/registry" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type queryNodeCreatorFunc func(ctx context.Context, addr string, nodeID int64) (types.QueryNodeClient, error) diff --git a/internal/proxy/shard_client_test.go b/internal/proxy/shard_client_test.go index ddc8308954..ef593778c4 100644 --- a/internal/proxy/shard_client_test.go +++ b/internal/proxy/shard_client_test.go @@ -10,8 +10,8 @@ import ( "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestShardClientMgr(t *testing.T) { diff --git a/internal/proxy/simple_rate_limiter.go b/internal/proxy/simple_rate_limiter.go index 77fa3430f7..c62ada7e57 100644 --- a/internal/proxy/simple_rate_limiter.go +++ b/internal/proxy/simple_rate_limiter.go @@ -29,15 +29,15 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/util/quota" rlinternal "github.com/milvus-io/milvus/internal/util/ratelimitutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/ratelimitutil" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // SimpleLimiter is implemented based on Limiter interface diff --git a/internal/proxy/simple_rate_limiter_test.go b/internal/proxy/simple_rate_limiter_test.go index b53e717cd9..4881c22fff 100644 --- a/internal/proxy/simple_rate_limiter_test.go +++ b/internal/proxy/simple_rate_limiter_test.go @@ -27,11 +27,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" rlinternal "github.com/milvus-io/milvus/internal/util/ratelimitutil" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/ratelimitutil" ) func TestSimpleRateLimiter(t *testing.T) { diff --git a/internal/proxy/task.go b/internal/proxy/task.go index 6a96be3cbc..c46b94eb3b 100644 --- a/internal/proxy/task.go +++ b/internal/proxy/task.go @@ -32,17 +32,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/ctokenizer" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/proxy/task_alias.go b/internal/proxy/task_alias.go index c8b9164620..8578905496 100644 --- a/internal/proxy/task_alias.go +++ b/internal/proxy/task_alias.go @@ -22,9 +22,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // CreateAliasTask contains task information of CreateAlias diff --git a/internal/proxy/task_alias_test.go b/internal/proxy/task_alias_test.go index 70d3567da8..3c802f6888 100644 --- a/internal/proxy/task_alias_test.go +++ b/internal/proxy/task_alias_test.go @@ -25,9 +25,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/uniquegenerator" ) func TestCreateAlias_all(t *testing.T) { diff --git a/internal/proxy/task_database.go b/internal/proxy/task_database.go index 442ff4fa67..6d9a4a19df 100644 --- a/internal/proxy/task_database.go +++ b/internal/proxy/task_database.go @@ -9,13 +9,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type createDatabaseTask struct { diff --git a/internal/proxy/task_database_test.go b/internal/proxy/task_database_test.go index 73d67c3984..e56b4fdf2e 100644 --- a/internal/proxy/task_database_test.go +++ b/internal/proxy/task_database_test.go @@ -13,12 +13,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestCreateDatabaseTask(t *testing.T) { diff --git a/internal/proxy/task_delete.go b/internal/proxy/task_delete.go index 98b990d09d..3969ab553a 100644 --- a/internal/proxy/task_delete.go +++ b/internal/proxy/task_delete.go @@ -20,18 +20,18 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/exprutil" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type BaseDeleteTask = msgstream.DeleteMsg diff --git a/internal/proxy/task_delete_streaming.go b/internal/proxy/task_delete_streaming.go index a46a02e648..a9907957a2 100644 --- a/internal/proxy/task_delete_streaming.go +++ b/internal/proxy/task_delete_streaming.go @@ -8,11 +8,11 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/distributed/streaming" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type deleteTaskByStreamingService struct { diff --git a/internal/proxy/task_delete_test.go b/internal/proxy/task_delete_test.go index e3bb764398..e88fb79cbe 100644 --- a/internal/proxy/task_delete_test.go +++ b/internal/proxy/task_delete_test.go @@ -18,15 +18,15 @@ import ( "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/parser/planparserv2" "github.com/milvus-io/milvus/internal/util/streamrpc" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func Test_getPrimaryKeysFromPlan(t *testing.T) { diff --git a/internal/proxy/task_flush.go b/internal/proxy/task_flush.go index 7bc3500dff..d36ab509b2 100644 --- a/internal/proxy/task_flush.go +++ b/internal/proxy/task_flush.go @@ -25,11 +25,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type flushTask struct { diff --git a/internal/proxy/task_flush_streaming.go b/internal/proxy/task_flush_streaming.go index 245cab5c04..428bd39442 100644 --- a/internal/proxy/task_flush_streaming.go +++ b/internal/proxy/task_flush_streaming.go @@ -27,12 +27,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/distributed/streaming" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type flushTaskByStreamingService struct { diff --git a/internal/proxy/task_import.go b/internal/proxy/task_import.go index 82c9fe9b81..214abe8c0a 100644 --- a/internal/proxy/task_import.go +++ b/internal/proxy/task_import.go @@ -31,13 +31,13 @@ import ( "github.com/milvus-io/milvus/internal/distributed/streaming" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/importutilv2" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type importTask struct { diff --git a/internal/proxy/task_index.go b/internal/proxy/task_index.go index ccb7f3460c..17880cfe45 100644 --- a/internal/proxy/task_index.go +++ b/internal/proxy/task_index.go @@ -29,17 +29,17 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/indexparamcheck" "github.com/milvus-io/milvus/internal/util/vecindexmgr" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/indexparams" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/indexparams" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/proxy/task_index_test.go b/internal/proxy/task_index_test.go index f169143d80..555f14ee93 100644 --- a/internal/proxy/task_index_test.go +++ b/internal/proxy/task_index_test.go @@ -34,14 +34,14 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/util/indexparamcheck" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestMain(m *testing.M) { diff --git a/internal/proxy/task_insert.go b/internal/proxy/task_insert.go index 1fcfc77460..e610a6894b 100644 --- a/internal/proxy/task_insert.go +++ b/internal/proxy/task_insert.go @@ -13,14 +13,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/util/function" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type insertTask struct { diff --git a/internal/proxy/task_insert_streaming.go b/internal/proxy/task_insert_streaming.go index 6116839b0e..d0e7c9cc66 100644 --- a/internal/proxy/task_insert_streaming.go +++ b/internal/proxy/task_insert_streaming.go @@ -10,12 +10,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/distributed/streaming" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type insertTaskByStreamingService struct { diff --git a/internal/proxy/task_insert_test.go b/internal/proxy/task_insert_test.go index 8e10cc74d0..03888917ab 100644 --- a/internal/proxy/task_insert_test.go +++ b/internal/proxy/task_insert_test.go @@ -13,11 +13,11 @@ import ( "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/util/function" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" ) func TestInsertTask_CheckAligned(t *testing.T) { diff --git a/internal/proxy/task_policies.go b/internal/proxy/task_policies.go index 1c49a08ce6..1522024309 100644 --- a/internal/proxy/task_policies.go +++ b/internal/proxy/task_policies.go @@ -8,8 +8,8 @@ import ( "golang.org/x/sync/errgroup" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // type pickShardPolicy func(ctx context.Context, mgr shardClientMgr, query func(UniqueID, types.QueryNode) error, leaders []nodeInfo) error diff --git a/internal/proxy/task_query.go b/internal/proxy/task_query.go index ecf1c7424b..9905c5440a 100644 --- a/internal/proxy/task_query.go +++ b/internal/proxy/task_query.go @@ -19,19 +19,19 @@ import ( "github.com/milvus-io/milvus/internal/util/exprutil" "github.com/milvus-io/milvus/internal/util/reduce" typeutil2 "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/proxy/task_query_test.go b/internal/proxy/task_query_test.go index 43ffb2a096..ab806c2a5d 100644 --- a/internal/proxy/task_query_test.go +++ b/internal/proxy/task_query_test.go @@ -33,15 +33,15 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/util/reduce" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/testutils" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestQueryTask_all(t *testing.T) { diff --git a/internal/proxy/task_scheduler.go b/internal/proxy/task_scheduler.go index 4e3b66e3ff..8cfe2cf514 100644 --- a/internal/proxy/task_scheduler.go +++ b/internal/proxy/task_scheduler.go @@ -26,14 +26,14 @@ import ( "go.opentelemetry.io/otel" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type taskQueue interface { diff --git a/internal/proxy/task_scheduler_test.go b/internal/proxy/task_scheduler_test.go index 7c8a027611..7c68c57013 100644 --- a/internal/proxy/task_scheduler_test.go +++ b/internal/proxy/task_scheduler_test.go @@ -30,9 +30,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) func TestBaseTaskQueue(t *testing.T) { diff --git a/internal/proxy/task_search.go b/internal/proxy/task_search.go index 65ca2cb548..809cdbe968 100644 --- a/internal/proxy/task_search.go +++ b/internal/proxy/task_search.go @@ -21,19 +21,19 @@ import ( "github.com/milvus-io/milvus/internal/util/exprutil" "github.com/milvus-io/milvus/internal/util/function" "github.com/milvus-io/milvus/internal/util/reduce" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/proxy/task_search_test.go b/internal/proxy/task_search_test.go index 69def228b8..4faf373e38 100644 --- a/internal/proxy/task_search_test.go +++ b/internal/proxy/task_search_test.go @@ -42,16 +42,16 @@ import ( "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/function" "github.com/milvus-io/milvus/internal/util/reduce" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestSearchTask_PostExecute(t *testing.T) { diff --git a/internal/proxy/task_statistic.go b/internal/proxy/task_statistic.go index 5a1e9136e2..1467cccfcb 100644 --- a/internal/proxy/task_statistic.go +++ b/internal/proxy/task_statistic.go @@ -13,17 +13,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/proxy/task_statistic_test.go b/internal/proxy/task_statistic_test.go index bdfc998878..e30c0f63b1 100644 --- a/internal/proxy/task_statistic_test.go +++ b/internal/proxy/task_statistic_test.go @@ -29,12 +29,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type StatisticTaskSuite struct { diff --git a/internal/proxy/task_test.go b/internal/proxy/task_test.go index 6c8841f62f..f663b99b36 100644 --- a/internal/proxy/task_test.go +++ b/internal/proxy/task_test.go @@ -40,21 +40,21 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/testutils" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" - "github.com/milvus-io/milvus/pkg/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/uniquegenerator" ) // TODO(dragondriver): add more test cases diff --git a/internal/proxy/task_upsert.go b/internal/proxy/task_upsert.go index 76670dcae5..537ac7a2ae 100644 --- a/internal/proxy/task_upsert.go +++ b/internal/proxy/task_upsert.go @@ -30,15 +30,15 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/util/function" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type upsertTask struct { diff --git a/internal/proxy/task_upsert_streaming.go b/internal/proxy/task_upsert_streaming.go index 454f10314e..50e3f0eee4 100644 --- a/internal/proxy/task_upsert_streaming.go +++ b/internal/proxy/task_upsert_streaming.go @@ -8,11 +8,11 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/distributed/streaming" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type upsertTaskByStreamingService struct { diff --git a/internal/proxy/task_upsert_test.go b/internal/proxy/task_upsert_test.go index 586980793b..4750af4bcd 100644 --- a/internal/proxy/task_upsert_test.go +++ b/internal/proxy/task_upsert_test.go @@ -30,11 +30,11 @@ import ( "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/util/function" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" ) func TestUpsertTask_CheckAligned(t *testing.T) { diff --git a/internal/proxy/timestamp.go b/internal/proxy/timestamp.go index e368bd3a07..5de1084f18 100644 --- a/internal/proxy/timestamp.go +++ b/internal/proxy/timestamp.go @@ -23,11 +23,11 @@ import ( "time" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) // timestampAllocator implements tsoAllocator. diff --git a/internal/proxy/timestamp_test.go b/internal/proxy/timestamp_test.go index 635e2c86ea..34a2f7d139 100644 --- a/internal/proxy/timestamp_test.go +++ b/internal/proxy/timestamp_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/v2/util/uniquegenerator" ) func TestNewTimestampAllocator(t *testing.T) { diff --git a/internal/proxy/trace_log_interceptor.go b/internal/proxy/trace_log_interceptor.go index 4fc9a0f91d..cf5b2f5c05 100644 --- a/internal/proxy/trace_log_interceptor.go +++ b/internal/proxy/trace_log_interceptor.go @@ -26,8 +26,8 @@ import ( "google.golang.org/grpc" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/requestutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/requestutil" ) func TraceLogInterceptor(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) { diff --git a/internal/proxy/trace_log_interceptor_test.go b/internal/proxy/trace_log_interceptor_test.go index c1159a83b4..41f9cf5c25 100644 --- a/internal/proxy/trace_log_interceptor_test.go +++ b/internal/proxy/trace_log_interceptor_test.go @@ -30,8 +30,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestTraceLogInterceptor(t *testing.T) { diff --git a/internal/proxy/util.go b/internal/proxy/util.go index 5f0a6e6c90..b46874d261 100644 --- a/internal/proxy/util.go +++ b/internal/proxy/util.go @@ -42,21 +42,21 @@ import ( "github.com/milvus-io/milvus/internal/util/hookutil" "github.com/milvus-io/milvus/internal/util/indexparamcheck" typeutil2 "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/contextutil" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/contextutil" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/proxy/util_test.go b/internal/proxy/util_test.go index edb7f2d586..5449b1ff80 100644 --- a/internal/proxy/util_test.go +++ b/internal/proxy/util_test.go @@ -37,18 +37,18 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestValidateCollectionName(t *testing.T) { diff --git a/internal/proxy/validate_util.go b/internal/proxy/validate_util.go index 45c2763c21..e4f3687bb7 100644 --- a/internal/proxy/validate_util.go +++ b/internal/proxy/validate_util.go @@ -9,13 +9,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/nullutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/parameterutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/parameterutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type validateUtil struct { diff --git a/internal/proxy/validate_util_test.go b/internal/proxy/validate_util_test.go index e22de6cf16..e0bf391b09 100644 --- a/internal/proxy/validate_util_test.go +++ b/internal/proxy/validate_util_test.go @@ -13,11 +13,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/testutils" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func Test_verifyLengthPerRow(t *testing.T) { diff --git a/internal/querycoordv2/.mockery.yaml b/internal/querycoordv2/.mockery.yaml index ab9c1ee5d5..20033eba57 100644 --- a/internal/querycoordv2/.mockery.yaml +++ b/internal/querycoordv2/.mockery.yaml @@ -28,7 +28,7 @@ packages: github.com/milvus-io/milvus/internal/querycoordv2/task: interfaces: Scheduler: - github.com/milvus-io/milvus/pkg/proto/querypb: + github.com/milvus-io/milvus/pkg/v2/proto/querypb: interfaces: QueryNodeServer: config: diff --git a/internal/querycoordv2/api_testonly.go b/internal/querycoordv2/api_testonly.go index d8673700fd..a46893087a 100644 --- a/internal/querycoordv2/api_testonly.go +++ b/internal/querycoordv2/api_testonly.go @@ -20,7 +20,7 @@ package querycoordv2 import ( - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) func (s *Server) StopCheckerForTestOnly() { diff --git a/internal/querycoordv2/balance/balance.go b/internal/querycoordv2/balance/balance.go index 5ba140258b..eca2cc1e45 100644 --- a/internal/querycoordv2/balance/balance.go +++ b/internal/querycoordv2/balance/balance.go @@ -28,7 +28,7 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type SegmentAssignPlan struct { diff --git a/internal/querycoordv2/balance/balance_test.go b/internal/querycoordv2/balance/balance_test.go index 6a7df24e0d..d8f460e29c 100644 --- a/internal/querycoordv2/balance/balance_test.go +++ b/internal/querycoordv2/balance/balance_test.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type BalanceTestSuite struct { diff --git a/internal/querycoordv2/balance/channel_level_score_balancer.go b/internal/querycoordv2/balance/channel_level_score_balancer.go index e16d8ad2b2..8b661fff09 100644 --- a/internal/querycoordv2/balance/channel_level_score_balancer.go +++ b/internal/querycoordv2/balance/channel_level_score_balancer.go @@ -29,9 +29,9 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // score based segment use (collection_row_count + global_row_count * factor) as node' score diff --git a/internal/querycoordv2/balance/channel_level_score_balancer_test.go b/internal/querycoordv2/balance/channel_level_score_balancer_test.go index 44dae9a1c9..c1f92ac75f 100644 --- a/internal/querycoordv2/balance/channel_level_score_balancer_test.go +++ b/internal/querycoordv2/balance/channel_level_score_balancer_test.go @@ -30,12 +30,12 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type ChannelLevelScoreBalancerTestSuite struct { diff --git a/internal/querycoordv2/balance/multi_target_balance.go b/internal/querycoordv2/balance/multi_target_balance.go index 051ae6ebbf..6fe5d7a1a5 100644 --- a/internal/querycoordv2/balance/multi_target_balance.go +++ b/internal/querycoordv2/balance/multi_target_balance.go @@ -16,9 +16,9 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func init() { diff --git a/internal/querycoordv2/balance/multi_target_balancer_test.go b/internal/querycoordv2/balance/multi_target_balancer_test.go index ba3be06613..4fc6345085 100644 --- a/internal/querycoordv2/balance/multi_target_balancer_test.go +++ b/internal/querycoordv2/balance/multi_target_balancer_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type MultiTargetBalancerTestSuite struct { diff --git a/internal/querycoordv2/balance/rowcount_based_balancer.go b/internal/querycoordv2/balance/rowcount_based_balancer.go index 6b62714a62..abfdaa5e04 100644 --- a/internal/querycoordv2/balance/rowcount_based_balancer.go +++ b/internal/querycoordv2/balance/rowcount_based_balancer.go @@ -31,8 +31,8 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type RowCountBasedBalancer struct { diff --git a/internal/querycoordv2/balance/rowcount_based_balancer_test.go b/internal/querycoordv2/balance/rowcount_based_balancer_test.go index d49ca4c4bd..9302903e0f 100644 --- a/internal/querycoordv2/balance/rowcount_based_balancer_test.go +++ b/internal/querycoordv2/balance/rowcount_based_balancer_test.go @@ -32,13 +32,13 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type RowCountBasedBalancerTestSuite struct { diff --git a/internal/querycoordv2/balance/score_based_balancer.go b/internal/querycoordv2/balance/score_based_balancer.go index c36156a70d..e233ca59be 100644 --- a/internal/querycoordv2/balance/score_based_balancer.go +++ b/internal/querycoordv2/balance/score_based_balancer.go @@ -31,8 +31,8 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // score based segment use (collection_row_count + global_row_count * factor) as node' score diff --git a/internal/querycoordv2/balance/score_based_balancer_test.go b/internal/querycoordv2/balance/score_based_balancer_test.go index f24d8394b2..ec4a32c226 100644 --- a/internal/querycoordv2/balance/score_based_balancer_test.go +++ b/internal/querycoordv2/balance/score_based_balancer_test.go @@ -32,12 +32,12 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type ScoreBasedBalancerTestSuite struct { diff --git a/internal/querycoordv2/balance/streaming_query_node_channel_helper.go b/internal/querycoordv2/balance/streaming_query_node_channel_helper.go index 5a8d755d56..5d3a012629 100644 --- a/internal/querycoordv2/balance/streaming_query_node_channel_helper.go +++ b/internal/querycoordv2/balance/streaming_query_node_channel_helper.go @@ -7,7 +7,7 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) func assignChannelToWALLocatedFirstForNodeInfo( diff --git a/internal/querycoordv2/balance/streaming_query_node_channel_helper_test.go b/internal/querycoordv2/balance/streaming_query_node_channel_helper_test.go index edc8aeed0f..d6a85ea0f1 100644 --- a/internal/querycoordv2/balance/streaming_query_node_channel_helper_test.go +++ b/internal/querycoordv2/balance/streaming_query_node_channel_helper_test.go @@ -11,9 +11,9 @@ import ( "github.com/milvus-io/milvus/internal/mocks/streamingcoord/server/mock_balancer" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestAssignChannelToWALLocatedFirst(t *testing.T) { diff --git a/internal/querycoordv2/balance/utils.go b/internal/querycoordv2/balance/utils.go index ebec9ced37..18b9fd2565 100644 --- a/internal/querycoordv2/balance/utils.go +++ b/internal/querycoordv2/balance/utils.go @@ -25,8 +25,8 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/task" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) const ( diff --git a/internal/querycoordv2/checkers/balance_checker.go b/internal/querycoordv2/checkers/balance_checker.go index 48cd3b5f79..54b43ccc30 100644 --- a/internal/querycoordv2/checkers/balance_checker.go +++ b/internal/querycoordv2/checkers/balance_checker.go @@ -30,11 +30,11 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // BalanceChecker checks the cluster distribution and generates balance tasks. diff --git a/internal/querycoordv2/checkers/balance_checker_test.go b/internal/querycoordv2/checkers/balance_checker_test.go index d95d60fb90..8b62b6c781 100644 --- a/internal/querycoordv2/checkers/balance_checker_test.go +++ b/internal/querycoordv2/checkers/balance_checker_test.go @@ -33,11 +33,11 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type BalanceCheckerTestSuite struct { diff --git a/internal/querycoordv2/checkers/channel_checker.go b/internal/querycoordv2/checkers/channel_checker.go index 1e869b30c1..0745dbdfaa 100644 --- a/internal/querycoordv2/checkers/channel_checker.go +++ b/internal/querycoordv2/checkers/channel_checker.go @@ -31,9 +31,9 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // TODO(sunby): have too much similar codes with SegmentChecker diff --git a/internal/querycoordv2/checkers/channel_checker_test.go b/internal/querycoordv2/checkers/channel_checker_test.go index bf6d72aecd..1619a27ed5 100644 --- a/internal/querycoordv2/checkers/channel_checker_test.go +++ b/internal/querycoordv2/checkers/channel_checker_test.go @@ -32,10 +32,10 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type ChannelCheckerTestSuite struct { diff --git a/internal/querycoordv2/checkers/controller.go b/internal/querycoordv2/checkers/controller.go index 2cc46e5f1f..5df2c5ca0d 100644 --- a/internal/querycoordv2/checkers/controller.go +++ b/internal/querycoordv2/checkers/controller.go @@ -30,7 +30,7 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) var errTypeNotFound = errors.New("checker type not found") diff --git a/internal/querycoordv2/checkers/controller_base_test.go b/internal/querycoordv2/checkers/controller_base_test.go index 0d8e301492..2116c43246 100644 --- a/internal/querycoordv2/checkers/controller_base_test.go +++ b/internal/querycoordv2/checkers/controller_base_test.go @@ -29,9 +29,9 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type ControllerBaseTestSuite struct { diff --git a/internal/querycoordv2/checkers/controller_test.go b/internal/querycoordv2/checkers/controller_test.go index 004ed61665..420e69ae65 100644 --- a/internal/querycoordv2/checkers/controller_test.go +++ b/internal/querycoordv2/checkers/controller_test.go @@ -33,10 +33,10 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type CheckerControllerSuite struct { diff --git a/internal/querycoordv2/checkers/index_checker.go b/internal/querycoordv2/checkers/index_checker.go index 3063db475d..010ed2de17 100644 --- a/internal/querycoordv2/checkers/index_checker.go +++ b/internal/querycoordv2/checkers/index_checker.go @@ -28,11 +28,11 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const MaxSegmentNumPerGetIndexInfoRPC = 1024 diff --git a/internal/querycoordv2/checkers/index_checker_test.go b/internal/querycoordv2/checkers/index_checker_test.go index 1747698aae..2414f08ff0 100644 --- a/internal/querycoordv2/checkers/index_checker_test.go +++ b/internal/querycoordv2/checkers/index_checker_test.go @@ -31,12 +31,12 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type IndexCheckerSuite struct { diff --git a/internal/querycoordv2/checkers/leader_checker.go b/internal/querycoordv2/checkers/leader_checker.go index fe3f453760..fd5a886594 100644 --- a/internal/querycoordv2/checkers/leader_checker.go +++ b/internal/querycoordv2/checkers/leader_checker.go @@ -27,9 +27,9 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) var _ Checker = (*LeaderChecker)(nil) diff --git a/internal/querycoordv2/checkers/leader_checker_test.go b/internal/querycoordv2/checkers/leader_checker_test.go index 1d44938f76..6efd1f8212 100644 --- a/internal/querycoordv2/checkers/leader_checker_test.go +++ b/internal/querycoordv2/checkers/leader_checker_test.go @@ -31,11 +31,11 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type LeaderCheckerTestSuite struct { diff --git a/internal/querycoordv2/checkers/segment_checker.go b/internal/querycoordv2/checkers/segment_checker.go index e9d0f25c5f..50e638dd35 100644 --- a/internal/querycoordv2/checkers/segment_checker.go +++ b/internal/querycoordv2/checkers/segment_checker.go @@ -32,11 +32,11 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) const initialTargetVersion = int64(0) diff --git a/internal/querycoordv2/checkers/segment_checker_test.go b/internal/querycoordv2/checkers/segment_checker_test.go index 30000c1801..a94a0e5727 100644 --- a/internal/querycoordv2/checkers/segment_checker_test.go +++ b/internal/querycoordv2/checkers/segment_checker_test.go @@ -33,11 +33,11 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type SegmentCheckerTestSuite struct { diff --git a/internal/querycoordv2/dist/dist_controller.go b/internal/querycoordv2/dist/dist_controller.go index 5f46f04125..484713094d 100644 --- a/internal/querycoordv2/dist/dist_controller.go +++ b/internal/querycoordv2/dist/dist_controller.go @@ -25,7 +25,7 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) type Controller interface { diff --git a/internal/querycoordv2/dist/dist_controller_test.go b/internal/querycoordv2/dist/dist_controller_test.go index 352cfbe1c3..f05041edf3 100644 --- a/internal/querycoordv2/dist/dist_controller_test.go +++ b/internal/querycoordv2/dist/dist_controller_test.go @@ -31,12 +31,12 @@ import ( . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type DistControllerTestSuite struct { diff --git a/internal/querycoordv2/dist/dist_handler.go b/internal/querycoordv2/dist/dist_handler.go index a42397057b..5aeb268a23 100644 --- a/internal/querycoordv2/dist/dist_handler.go +++ b/internal/querycoordv2/dist/dist_handler.go @@ -32,14 +32,14 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type TriggerUpdateTargetVersion = func(collectionID int64) diff --git a/internal/querycoordv2/dist/dist_handler_test.go b/internal/querycoordv2/dist/dist_handler_test.go index 2e3c6f82ec..c34da497ff 100644 --- a/internal/querycoordv2/dist/dist_handler_test.go +++ b/internal/querycoordv2/dist/dist_handler_test.go @@ -28,10 +28,10 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type DistHandlerSuite struct { diff --git a/internal/querycoordv2/handlers.go b/internal/querycoordv2/handlers.go index 894893fada..70da653358 100644 --- a/internal/querycoordv2/handlers.go +++ b/internal/querycoordv2/handlers.go @@ -35,14 +35,14 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" - "github.com/milvus-io/milvus/pkg/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/uniquegenerator" ) // checkAnyReplicaAvailable checks if the collection has enough distinct available shards. These shards diff --git a/internal/querycoordv2/handlers_test.go b/internal/querycoordv2/handlers_test.go index 2789f644d8..338f678da3 100644 --- a/internal/querycoordv2/handlers_test.go +++ b/internal/querycoordv2/handlers_test.go @@ -27,8 +27,8 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" ) func TestGetChannelsFromQueryNode(t *testing.T) { diff --git a/internal/querycoordv2/job/job_load.go b/internal/querycoordv2/job/job_load.go index 73815c920f..1e7fe56236 100644 --- a/internal/querycoordv2/job/job_load.go +++ b/internal/querycoordv2/job/job_load.go @@ -32,14 +32,14 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/observers" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/eventlog" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/eventlog" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type LoadCollectionJob struct { diff --git a/internal/querycoordv2/job/job_release.go b/internal/querycoordv2/job/job_release.go index 515eed97e6..57d216c8d2 100644 --- a/internal/querycoordv2/job/job_release.go +++ b/internal/querycoordv2/job/job_release.go @@ -29,10 +29,10 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/observers" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/util/proxyutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) type ReleaseCollectionJob struct { diff --git a/internal/querycoordv2/job/job_sync.go b/internal/querycoordv2/job/job_sync.go index d4a9511a62..75610df08f 100644 --- a/internal/querycoordv2/job/job_sync.go +++ b/internal/querycoordv2/job/job_sync.go @@ -26,8 +26,8 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/observers" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) type SyncNewCreatedPartitionJob struct { diff --git a/internal/querycoordv2/job/job_test.go b/internal/querycoordv2/job/job_test.go index 723268c1ad..3642cff155 100644 --- a/internal/querycoordv2/job/job_test.go +++ b/internal/querycoordv2/job/job_test.go @@ -39,13 +39,13 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" "github.com/milvus-io/milvus/internal/util/proxyutil" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/querycoordv2/job/job_update.go b/internal/querycoordv2/job/job_update.go index dcdf0e7240..e8742efdfd 100644 --- a/internal/querycoordv2/job/job_update.go +++ b/internal/querycoordv2/job/job_update.go @@ -25,9 +25,9 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/observers" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type UpdateLoadConfigJob struct { diff --git a/internal/querycoordv2/job/scheduler.go b/internal/querycoordv2/job/scheduler.go index 5ee70a6508..41352edd4f 100644 --- a/internal/querycoordv2/job/scheduler.go +++ b/internal/querycoordv2/job/scheduler.go @@ -23,8 +23,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // JobScheduler schedules jobs, diff --git a/internal/querycoordv2/job/undo.go b/internal/querycoordv2/job/undo.go index d7d5427e3c..b5510ad5be 100644 --- a/internal/querycoordv2/job/undo.go +++ b/internal/querycoordv2/job/undo.go @@ -23,7 +23,7 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/observers" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) type UndoList struct { diff --git a/internal/querycoordv2/job/utils.go b/internal/querycoordv2/job/utils.go index a98abfbe8f..608af21c9f 100644 --- a/internal/querycoordv2/job/utils.go +++ b/internal/querycoordv2/job/utils.go @@ -26,8 +26,8 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/checkers" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/observers" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // waitCollectionReleased blocks until diff --git a/internal/querycoordv2/meta/channel_dist_manager.go b/internal/querycoordv2/meta/channel_dist_manager.go index 3900b6ab11..64bb240aee 100644 --- a/internal/querycoordv2/meta/channel_dist_manager.go +++ b/internal/querycoordv2/meta/channel_dist_manager.go @@ -23,9 +23,9 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus/internal/util/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type channelDistCriterion struct { diff --git a/internal/querycoordv2/meta/channel_dist_manager_test.go b/internal/querycoordv2/meta/channel_dist_manager_test.go index 4d7ebf7b09..29431b3503 100644 --- a/internal/querycoordv2/meta/channel_dist_manager_test.go +++ b/internal/querycoordv2/meta/channel_dist_manager_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ChannelDistManagerSuite struct { diff --git a/internal/querycoordv2/meta/collection_manager.go b/internal/querycoordv2/meta/collection_manager.go index 3337c1b25c..c130fa78f9 100644 --- a/internal/querycoordv2/meta/collection_manager.go +++ b/internal/querycoordv2/meta/collection_manager.go @@ -31,14 +31,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/metastore" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/eventlog" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/eventlog" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type Collection struct { diff --git a/internal/querycoordv2/meta/collection_manager_test.go b/internal/querycoordv2/meta/collection_manager_test.go index be22916f11..27057c623f 100644 --- a/internal/querycoordv2/meta/collection_manager_test.go +++ b/internal/querycoordv2/meta/collection_manager_test.go @@ -33,13 +33,13 @@ import ( "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/kv/querycoord" . "github.com/milvus-io/milvus/internal/querycoordv2/params" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type CollectionManagerSuite struct { diff --git a/internal/querycoordv2/meta/coordinator_broker.go b/internal/querycoordv2/meta/coordinator_broker.go index b0524ae65f..85a29e7c7a 100644 --- a/internal/querycoordv2/meta/coordinator_broker.go +++ b/internal/querycoordv2/meta/coordinator_broker.go @@ -29,17 +29,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/metastore/kv/binlog" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - . "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + . "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type Broker interface { diff --git a/internal/querycoordv2/meta/coordinator_broker_test.go b/internal/querycoordv2/meta/coordinator_broker_test.go index 70903f3532..1d8aebba77 100644 --- a/internal/querycoordv2/meta/coordinator_broker_test.go +++ b/internal/querycoordv2/meta/coordinator_broker_test.go @@ -30,13 +30,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type CoordinatorBrokerRootCoordSuite struct { diff --git a/internal/querycoordv2/meta/dist_manager.go b/internal/querycoordv2/meta/dist_manager.go index 83f8f4ae7c..6ce7a54243 100644 --- a/internal/querycoordv2/meta/dist_manager.go +++ b/internal/querycoordv2/meta/dist_manager.go @@ -20,8 +20,8 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" ) type DistributionManager struct { diff --git a/internal/querycoordv2/meta/dist_manager_test.go b/internal/querycoordv2/meta/dist_manager_test.go index 50b58df19b..f7e2bae77d 100644 --- a/internal/querycoordv2/meta/dist_manager_test.go +++ b/internal/querycoordv2/meta/dist_manager_test.go @@ -7,9 +7,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" ) func TestGetDistributionJSON(t *testing.T) { diff --git a/internal/querycoordv2/meta/failed_load_cache.go b/internal/querycoordv2/meta/failed_load_cache.go index 9b06264950..33abea1cd2 100644 --- a/internal/querycoordv2/meta/failed_load_cache.go +++ b/internal/querycoordv2/meta/failed_load_cache.go @@ -22,8 +22,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) const expireTime = 24 * time.Hour diff --git a/internal/querycoordv2/meta/failed_load_cache_test.go b/internal/querycoordv2/meta/failed_load_cache_test.go index 59d841b9c1..877e433616 100644 --- a/internal/querycoordv2/meta/failed_load_cache_test.go +++ b/internal/querycoordv2/meta/failed_load_cache_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func TestFailedLoadCache(t *testing.T) { diff --git a/internal/querycoordv2/meta/leader_view_manager.go b/internal/querycoordv2/meta/leader_view_manager.go index a96bad95d1..af4e02a080 100644 --- a/internal/querycoordv2/meta/leader_view_manager.go +++ b/internal/querycoordv2/meta/leader_view_manager.go @@ -21,9 +21,9 @@ import ( "github.com/samber/lo" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type lvCriterion struct { diff --git a/internal/querycoordv2/meta/leader_view_manager_test.go b/internal/querycoordv2/meta/leader_view_manager_test.go index 5825228aa2..9335dedc38 100644 --- a/internal/querycoordv2/meta/leader_view_manager_test.go +++ b/internal/querycoordv2/meta/leader_view_manager_test.go @@ -26,10 +26,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type LeaderViewManagerSuite struct { diff --git a/internal/querycoordv2/meta/mock_broker.go b/internal/querycoordv2/meta/mock_broker.go index 921417bbb5..5eb877d94f 100644 --- a/internal/querycoordv2/meta/mock_broker.go +++ b/internal/querycoordv2/meta/mock_broker.go @@ -5,16 +5,16 @@ package meta import ( context "context" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" - indexpb "github.com/milvus-io/milvus/pkg/proto/indexpb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + indexpb "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mock "github.com/stretchr/testify/mock" - querypb "github.com/milvus-io/milvus/pkg/proto/querypb" + querypb "github.com/milvus-io/milvus/pkg/v2/proto/querypb" - rootcoordpb "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" + rootcoordpb "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" ) // MockBroker is an autogenerated mock type for the Broker type diff --git a/internal/querycoordv2/meta/mock_target_manager.go b/internal/querycoordv2/meta/mock_target_manager.go index 4fdb9896e9..d82a61f157 100644 --- a/internal/querycoordv2/meta/mock_target_manager.go +++ b/internal/querycoordv2/meta/mock_target_manager.go @@ -6,11 +6,11 @@ import ( context "context" metastore "github.com/milvus-io/milvus/internal/metastore" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" mock "github.com/stretchr/testify/mock" - typeutil "github.com/milvus-io/milvus/pkg/util/typeutil" + typeutil "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // MockTargetManager is an autogenerated mock type for the TargetManagerInterface type diff --git a/internal/querycoordv2/meta/replica.go b/internal/querycoordv2/meta/replica.go index ff28590d09..76761677f1 100644 --- a/internal/querycoordv2/meta/replica.go +++ b/internal/querycoordv2/meta/replica.go @@ -3,9 +3,9 @@ package meta import ( "google.golang.org/protobuf/proto" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // NilReplica is used to represent a nil replica. diff --git a/internal/querycoordv2/meta/replica_manager.go b/internal/querycoordv2/meta/replica_manager.go index 5a8b22936c..390be03030 100644 --- a/internal/querycoordv2/meta/replica_manager.go +++ b/internal/querycoordv2/meta/replica_manager.go @@ -27,14 +27,14 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ReplicaManager struct { diff --git a/internal/querycoordv2/meta/replica_manager_helper.go b/internal/querycoordv2/meta/replica_manager_helper.go index be280d0959..203b949837 100644 --- a/internal/querycoordv2/meta/replica_manager_helper.go +++ b/internal/querycoordv2/meta/replica_manager_helper.go @@ -3,7 +3,7 @@ package meta import ( "sort" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // collectionAssignmentHelper is a helper to manage the replica assignment in same collection. diff --git a/internal/querycoordv2/meta/replica_manager_helper_test.go b/internal/querycoordv2/meta/replica_manager_helper_test.go index f704929204..fa9605d3c2 100644 --- a/internal/querycoordv2/meta/replica_manager_helper_test.go +++ b/internal/querycoordv2/meta/replica_manager_helper_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type expectedReplicaPlan struct { diff --git a/internal/querycoordv2/meta/replica_manager_test.go b/internal/querycoordv2/meta/replica_manager_test.go index 1a1fa74853..7c4d6e567a 100644 --- a/internal/querycoordv2/meta/replica_manager_test.go +++ b/internal/querycoordv2/meta/replica_manager_test.go @@ -33,12 +33,12 @@ import ( "github.com/milvus-io/milvus/internal/metastore/kv/querycoord" "github.com/milvus-io/milvus/internal/metastore/mocks" . "github.com/milvus-io/milvus/internal/querycoordv2/params" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type collectionLoadConfig struct { diff --git a/internal/querycoordv2/meta/replica_test.go b/internal/querycoordv2/meta/replica_test.go index 7f4cbdc547..e7ef34ec6d 100644 --- a/internal/querycoordv2/meta/replica_test.go +++ b/internal/querycoordv2/meta/replica_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type ReplicaSuite struct { diff --git a/internal/querycoordv2/meta/resource_group.go b/internal/querycoordv2/meta/resource_group.go index 7cd01afd00..4e76f70ddf 100644 --- a/internal/querycoordv2/meta/resource_group.go +++ b/internal/querycoordv2/meta/resource_group.go @@ -6,8 +6,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/rgpb" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/internal/querycoordv2/meta/resource_group_test.go b/internal/querycoordv2/meta/resource_group_test.go index 2d97432f05..1e7da01b57 100644 --- a/internal/querycoordv2/meta/resource_group_test.go +++ b/internal/querycoordv2/meta/resource_group_test.go @@ -8,8 +8,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/rgpb" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestResourceGroup(t *testing.T) { diff --git a/internal/querycoordv2/meta/resource_manager.go b/internal/querycoordv2/meta/resource_manager.go index f24141aa16..aaa30d0bd6 100644 --- a/internal/querycoordv2/meta/resource_manager.go +++ b/internal/querycoordv2/meta/resource_manager.go @@ -32,14 +32,14 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ErrNodeNotEnough = errors.New("nodes not enough") diff --git a/internal/querycoordv2/meta/resource_manager_test.go b/internal/querycoordv2/meta/resource_manager_test.go index 06441222bc..507cb441dc 100644 --- a/internal/querycoordv2/meta/resource_manager_test.go +++ b/internal/querycoordv2/meta/resource_manager_test.go @@ -31,13 +31,13 @@ import ( "github.com/milvus-io/milvus/internal/metastore/kv/querycoord" "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ResourceManagerSuite struct { diff --git a/internal/querycoordv2/meta/segment_dist_manager.go b/internal/querycoordv2/meta/segment_dist_manager.go index ac9dd562d7..dc65928545 100644 --- a/internal/querycoordv2/meta/segment_dist_manager.go +++ b/internal/querycoordv2/meta/segment_dist_manager.go @@ -23,11 +23,11 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus/internal/util/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type segDistCriterion struct { diff --git a/internal/querycoordv2/meta/segment_dist_manager_test.go b/internal/querycoordv2/meta/segment_dist_manager_test.go index ca872ff052..f53c649745 100644 --- a/internal/querycoordv2/meta/segment_dist_manager_test.go +++ b/internal/querycoordv2/meta/segment_dist_manager_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" ) type SegmentDistManagerSuite struct { diff --git a/internal/querycoordv2/meta/target.go b/internal/querycoordv2/meta/target.go index 224fd0c77a..359cf0ad3e 100644 --- a/internal/querycoordv2/meta/target.go +++ b/internal/querycoordv2/meta/target.go @@ -23,12 +23,12 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/util/metrics" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // CollectionTarget collection target is immutable, diff --git a/internal/querycoordv2/meta/target_manager.go b/internal/querycoordv2/meta/target_manager.go index 8213ee869c..cdd53f8166 100644 --- a/internal/querycoordv2/meta/target_manager.go +++ b/internal/querycoordv2/meta/target_manager.go @@ -28,17 +28,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/metastore" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type TargetScope = int32 diff --git a/internal/querycoordv2/meta/target_manager_test.go b/internal/querycoordv2/meta/target_manager_test.go index 7fec53bf9d..90e51a0e2b 100644 --- a/internal/querycoordv2/meta/target_manager_test.go +++ b/internal/querycoordv2/meta/target_manager_test.go @@ -33,13 +33,13 @@ import ( "github.com/milvus-io/milvus/internal/metastore/kv/querycoord" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type TargetManagerSuite struct { diff --git a/internal/querycoordv2/mocks/mock_querynode.go b/internal/querycoordv2/mocks/mock_querynode.go index 7489be08f3..2905ea7924 100644 --- a/internal/querycoordv2/mocks/mock_querynode.go +++ b/internal/querycoordv2/mocks/mock_querynode.go @@ -7,13 +7,13 @@ import ( commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mock "github.com/stretchr/testify/mock" - querypb "github.com/milvus-io/milvus/pkg/proto/querypb" + querypb "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) // MockQueryNodeServer is an autogenerated mock type for the QueryNodeServer type diff --git a/internal/querycoordv2/mocks/querynode.go b/internal/querycoordv2/mocks/querynode.go index ee1b21b3f5..9a3a6ebce2 100644 --- a/internal/querycoordv2/mocks/querynode.go +++ b/internal/querycoordv2/mocks/querynode.go @@ -31,10 +31,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type MockQueryNode struct { diff --git a/internal/querycoordv2/observers/collection_observer.go b/internal/querycoordv2/observers/collection_observer.go index f09287f9e1..ef44d8f548 100644 --- a/internal/querycoordv2/observers/collection_observer.go +++ b/internal/querycoordv2/observers/collection_observer.go @@ -32,13 +32,13 @@ import ( . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/utils" "github.com/milvus-io/milvus/internal/util/proxyutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/eventlog" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/eventlog" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type CollectionObserver struct { diff --git a/internal/querycoordv2/observers/collection_observer_test.go b/internal/querycoordv2/observers/collection_observer_test.go index 771b92e53a..a89bcd4650 100644 --- a/internal/querycoordv2/observers/collection_observer_test.go +++ b/internal/querycoordv2/observers/collection_observer_test.go @@ -34,13 +34,13 @@ import ( . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/util/proxyutil" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type CollectionObserverSuite struct { diff --git a/internal/querycoordv2/observers/leader_cache_observer.go b/internal/querycoordv2/observers/leader_cache_observer.go index fc5c7cb944..096c3f1d15 100644 --- a/internal/querycoordv2/observers/leader_cache_observer.go +++ b/internal/querycoordv2/observers/leader_cache_observer.go @@ -24,10 +24,10 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/util/proxyutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type CollectionShardLeaderCache = map[string]*querypb.ShardLeadersList diff --git a/internal/querycoordv2/observers/leader_cache_observer_test.go b/internal/querycoordv2/observers/leader_cache_observer_test.go index 6d782f30b7..237f8f27ca 100644 --- a/internal/querycoordv2/observers/leader_cache_observer_test.go +++ b/internal/querycoordv2/observers/leader_cache_observer_test.go @@ -27,9 +27,9 @@ import ( "go.uber.org/atomic" "github.com/milvus-io/milvus/internal/util/proxyutil" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type LeaderCacheObserverTestSuite struct { diff --git a/internal/querycoordv2/observers/replica_observer.go b/internal/querycoordv2/observers/replica_observer.go index c330ce1ee9..1d42407aa9 100644 --- a/internal/querycoordv2/observers/replica_observer.go +++ b/internal/querycoordv2/observers/replica_observer.go @@ -28,9 +28,9 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/utils" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // check replica, find read only nodes and remove it from replica if all segment/channel has been moved diff --git a/internal/querycoordv2/observers/replica_observer_test.go b/internal/querycoordv2/observers/replica_observer_test.go index e0a3e2e200..80c1f0c0ff 100644 --- a/internal/querycoordv2/observers/replica_observer_test.go +++ b/internal/querycoordv2/observers/replica_observer_test.go @@ -33,11 +33,11 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ReplicaObserverSuite struct { diff --git a/internal/querycoordv2/observers/resource_observer.go b/internal/querycoordv2/observers/resource_observer.go index c06abde495..86b9171cb8 100644 --- a/internal/querycoordv2/observers/resource_observer.go +++ b/internal/querycoordv2/observers/resource_observer.go @@ -25,8 +25,8 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/params" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) // ResourceObserver is used to observe resource group status. diff --git a/internal/querycoordv2/observers/resource_observer_test.go b/internal/querycoordv2/observers/resource_observer_test.go index 42f7149b8d..9f7d366b26 100644 --- a/internal/querycoordv2/observers/resource_observer_test.go +++ b/internal/querycoordv2/observers/resource_observer_test.go @@ -31,9 +31,9 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type ResourceObserverSuite struct { diff --git a/internal/querycoordv2/observers/target_observer.go b/internal/querycoordv2/observers/target_observer.go index c7ecb6a678..84d859edbe 100644 --- a/internal/querycoordv2/observers/target_observer.go +++ b/internal/querycoordv2/observers/target_observer.go @@ -30,13 +30,13 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type targetOp int diff --git a/internal/querycoordv2/observers/target_observer_test.go b/internal/querycoordv2/observers/target_observer_test.go index 615e182ab4..f2ac304589 100644 --- a/internal/querycoordv2/observers/target_observer_test.go +++ b/internal/querycoordv2/observers/target_observer_test.go @@ -31,13 +31,13 @@ import ( . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type TargetObserverSuite struct { diff --git a/internal/querycoordv2/observers/task_dispatcher.go b/internal/querycoordv2/observers/task_dispatcher.go index 29ede76b1b..be4d5d2a0a 100644 --- a/internal/querycoordv2/observers/task_dispatcher.go +++ b/internal/querycoordv2/observers/task_dispatcher.go @@ -20,9 +20,9 @@ import ( "context" "sync" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // taskDispatcher is the utility to provide task dedup and dispatch feature diff --git a/internal/querycoordv2/observers/task_dispatcher_test.go b/internal/querycoordv2/observers/task_dispatcher_test.go index 31394aff85..889a620c29 100644 --- a/internal/querycoordv2/observers/task_dispatcher_test.go +++ b/internal/querycoordv2/observers/task_dispatcher_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type taskDispatcherSuite struct { diff --git a/internal/querycoordv2/ops_service_test.go b/internal/querycoordv2/ops_service_test.go index 85849e81f3..fdad2e491e 100644 --- a/internal/querycoordv2/ops_service_test.go +++ b/internal/querycoordv2/ops_service_test.go @@ -42,14 +42,14 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/utils" "github.com/milvus-io/milvus/internal/util/proxyutil" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type OpsServiceSuite struct { diff --git a/internal/querycoordv2/ops_services.go b/internal/querycoordv2/ops_services.go index a4acfa50f7..9257f57e04 100644 --- a/internal/querycoordv2/ops_services.go +++ b/internal/querycoordv2/ops_services.go @@ -29,10 +29,10 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func (s *Server) ListCheckers(ctx context.Context, req *querypb.ListCheckersRequest) (*querypb.ListCheckersResponse, error) { diff --git a/internal/querycoordv2/params/params.go b/internal/querycoordv2/params/params.go index 0e1b0d1ab5..6f8020482e 100644 --- a/internal/querycoordv2/params/params.go +++ b/internal/querycoordv2/params/params.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/errors" kvfactory "github.com/milvus-io/milvus/internal/util/dependency/kv" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var Params *paramtable.ComponentParam = paramtable.Get() diff --git a/internal/querycoordv2/server.go b/internal/querycoordv2/server.go index c99a9bf696..e9733bcbcf 100644 --- a/internal/querycoordv2/server.go +++ b/internal/querycoordv2/server.go @@ -56,20 +56,20 @@ import ( "github.com/milvus-io/milvus/internal/util/proxyutil" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/expr" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/expr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Only for re-export diff --git a/internal/querycoordv2/server_test.go b/internal/querycoordv2/server_test.go index f3f810ae63..9942b1273b 100644 --- a/internal/querycoordv2/server_test.go +++ b/internal/querycoordv2/server_test.go @@ -43,16 +43,16 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tikv" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tikv" ) func TestMain(m *testing.M) { diff --git a/internal/querycoordv2/services.go b/internal/querycoordv2/services.go index 3f91347fc4..3c75f02c20 100644 --- a/internal/querycoordv2/services.go +++ b/internal/querycoordv2/services.go @@ -34,15 +34,15 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/utils" "github.com/milvus-io/milvus/internal/util/componentutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/internal/querycoordv2/services_test.go b/internal/querycoordv2/services_test.go index 77ee08d734..36b7d27b4e 100644 --- a/internal/querycoordv2/services_test.go +++ b/internal/querycoordv2/services_test.go @@ -47,15 +47,15 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/utils" "github.com/milvus-io/milvus/internal/util/proxyutil" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ServiceSuite struct { diff --git a/internal/querycoordv2/session/cluster.go b/internal/querycoordv2/session/cluster.go index b0bd868d1e..d7561ec36d 100644 --- a/internal/querycoordv2/session/cluster.go +++ b/internal/querycoordv2/session/cluster.go @@ -30,9 +30,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" grpcquerynodeclient "github.com/milvus-io/milvus/internal/distributed/querynode/client" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var ErrNodeNotFound = errors.New("NodeNotFound") diff --git a/internal/querycoordv2/session/cluster_test.go b/internal/querycoordv2/session/cluster_test.go index 8c25aed9f9..cec8205a64 100644 --- a/internal/querycoordv2/session/cluster_test.go +++ b/internal/querycoordv2/session/cluster_test.go @@ -31,9 +31,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/querycoordv2/mocks" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) const bufSize = 1024 * 1024 diff --git a/internal/querycoordv2/session/mock_cluster.go b/internal/querycoordv2/session/mock_cluster.go index 377d31b576..6700569c31 100644 --- a/internal/querycoordv2/session/mock_cluster.go +++ b/internal/querycoordv2/session/mock_cluster.go @@ -11,7 +11,7 @@ import ( mock "github.com/stretchr/testify/mock" - querypb "github.com/milvus-io/milvus/pkg/proto/querypb" + querypb "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) // MockCluster is an autogenerated mock type for the Cluster type diff --git a/internal/querycoordv2/session/node_manager.go b/internal/querycoordv2/session/node_manager.go index 8d5bf6e023..f5f94c92ff 100644 --- a/internal/querycoordv2/session/node_manager.go +++ b/internal/querycoordv2/session/node_manager.go @@ -25,7 +25,7 @@ import ( "go.uber.org/atomic" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/v2/metrics" ) type Manager interface { diff --git a/internal/querycoordv2/task/action.go b/internal/querycoordv2/task/action.go index a9c3d76615..2bc4d73cf3 100644 --- a/internal/querycoordv2/task/action.go +++ b/internal/querycoordv2/task/action.go @@ -23,8 +23,8 @@ import ( "go.uber.org/atomic" "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ActionType int32 diff --git a/internal/querycoordv2/task/executor.go b/internal/querycoordv2/task/executor.go index 2ab1843dd7..b70437019d 100644 --- a/internal/querycoordv2/task/executor.go +++ b/internal/querycoordv2/task/executor.go @@ -33,15 +33,15 @@ import ( . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/indexparams" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/indexparams" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // segmentsVersion is used for the flushed segments should not be included in the watch dm channel request diff --git a/internal/querycoordv2/task/scheduler.go b/internal/querycoordv2/task/scheduler.go index 3b609c3a8c..4072d7407b 100644 --- a/internal/querycoordv2/task/scheduler.go +++ b/internal/querycoordv2/task/scheduler.go @@ -32,16 +32,16 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/timerecord" - . "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + . "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/querycoordv2/task/task.go b/internal/querycoordv2/task/task.go index c5fa610c20..6fcbfb3eba 100644 --- a/internal/querycoordv2/task/task.go +++ b/internal/querycoordv2/task/task.go @@ -29,10 +29,10 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ( diff --git a/internal/querycoordv2/task/task_test.go b/internal/querycoordv2/task/task_test.go index fde2e516f7..81b62cf540 100644 --- a/internal/querycoordv2/task/task_test.go +++ b/internal/querycoordv2/task/task_test.go @@ -39,18 +39,18 @@ import ( . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/testutils" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type distribution struct { diff --git a/internal/querycoordv2/task/utils.go b/internal/querycoordv2/task/utils.go index 6c4f26673d..e072b0b95c 100644 --- a/internal/querycoordv2/task/utils.go +++ b/internal/querycoordv2/task/utils.go @@ -29,12 +29,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // idSource helper type for using id as task source diff --git a/internal/querycoordv2/task/utils_test.go b/internal/querycoordv2/task/utils_test.go index 61c6651929..56869c26df 100644 --- a/internal/querycoordv2/task/utils_test.go +++ b/internal/querycoordv2/task/utils_test.go @@ -26,8 +26,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) type UtilsSuite struct { diff --git a/internal/querycoordv2/utils/checker.go b/internal/querycoordv2/utils/checker.go index 0234ff2e98..a91dcd703e 100644 --- a/internal/querycoordv2/utils/checker.go +++ b/internal/querycoordv2/utils/checker.go @@ -18,7 +18,7 @@ package utils import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/querycoordv2/utils/meta.go b/internal/querycoordv2/utils/meta.go index 9f47b801bb..3b8e0486f8 100644 --- a/internal/querycoordv2/utils/meta.go +++ b/internal/querycoordv2/utils/meta.go @@ -28,9 +28,9 @@ import ( "github.com/milvus-io/milvus/internal/coordinator/snmanager" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func GetPartitions(ctx context.Context, targetMgr meta.TargetManagerInterface, collectionID int64) ([]int64, error) { diff --git a/internal/querycoordv2/utils/meta_test.go b/internal/querycoordv2/utils/meta_test.go index 03bbf58c8b..e39356b9b4 100644 --- a/internal/querycoordv2/utils/meta_test.go +++ b/internal/querycoordv2/utils/meta_test.go @@ -32,10 +32,10 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestSpawnReplicasWithRG(t *testing.T) { diff --git a/internal/querycoordv2/utils/test.go b/internal/querycoordv2/utils/test.go index 2333874aac..a4fdb7fc41 100644 --- a/internal/querycoordv2/utils/test.go +++ b/internal/querycoordv2/utils/test.go @@ -19,9 +19,9 @@ package utils import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func CreateTestLeaderView(id, collection int64, channel string, segments map[int64]int64, growings map[int64]*meta.Segment) *meta.LeaderView { diff --git a/internal/querycoordv2/utils/types.go b/internal/querycoordv2/utils/types.go index 91768acdb9..21d4b75353 100644 --- a/internal/querycoordv2/utils/types.go +++ b/internal/querycoordv2/utils/types.go @@ -24,11 +24,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) func MergeMetaSegmentIntoSegmentInfo(info *querypb.SegmentInfo, segments ...*meta.Segment) { diff --git a/internal/querycoordv2/utils/types_test.go b/internal/querycoordv2/utils/types_test.go index 6c3afbb52b..a1aa91a6a1 100644 --- a/internal/querycoordv2/utils/types_test.go +++ b/internal/querycoordv2/utils/types_test.go @@ -24,8 +24,8 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) func Test_packLoadSegmentRequest(t *testing.T) { diff --git a/internal/querycoordv2/utils/util.go b/internal/querycoordv2/utils/util.go index 8d13056c41..ab56fddac9 100644 --- a/internal/querycoordv2/utils/util.go +++ b/internal/querycoordv2/utils/util.go @@ -26,11 +26,11 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func CheckNodeAvailable(nodeID int64, info *session.NodeInfo) error { diff --git a/internal/querycoordv2/utils/util_test.go b/internal/querycoordv2/utils/util_test.go index 7be3065f54..0bf778bd99 100644 --- a/internal/querycoordv2/utils/util_test.go +++ b/internal/querycoordv2/utils/util_test.go @@ -25,8 +25,8 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) type UtilTestSuite struct { diff --git a/internal/querynodev2/cluster/manager.go b/internal/querynodev2/cluster/manager.go index b239f24736..4e8e9130f4 100644 --- a/internal/querynodev2/cluster/manager.go +++ b/internal/querynodev2/cluster/manager.go @@ -23,9 +23,9 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Manager is the interface for worker manager. diff --git a/internal/querynodev2/cluster/mock_worker.go b/internal/querynodev2/cluster/mock_worker.go index dc59eea025..f710f517aa 100644 --- a/internal/querynodev2/cluster/mock_worker.go +++ b/internal/querynodev2/cluster/mock_worker.go @@ -5,10 +5,10 @@ package cluster import ( context "context" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" mock "github.com/stretchr/testify/mock" - querypb "github.com/milvus-io/milvus/pkg/proto/querypb" + querypb "github.com/milvus-io/milvus/pkg/v2/proto/querypb" streamrpc "github.com/milvus-io/milvus/internal/util/streamrpc" ) diff --git a/internal/querynodev2/cluster/worker.go b/internal/querynodev2/cluster/worker.go index 472590d003..6033a2014f 100644 --- a/internal/querynodev2/cluster/worker.go +++ b/internal/querynodev2/cluster/worker.go @@ -27,11 +27,11 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/streamrpc" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // Worker is the interface definition for querynode worker role. diff --git a/internal/querynodev2/cluster/worker_test.go b/internal/querynodev2/cluster/worker_test.go index 290415a345..db0ee9db2b 100644 --- a/internal/querynodev2/cluster/worker_test.go +++ b/internal/querynodev2/cluster/worker_test.go @@ -35,9 +35,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/util/streamrpc" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type RemoteWorkerSuite struct { diff --git a/internal/querynodev2/collector/average.go b/internal/querynodev2/collector/average.go index ac9c642e39..d3312e4e30 100644 --- a/internal/querynodev2/collector/average.go +++ b/internal/querynodev2/collector/average.go @@ -19,7 +19,7 @@ package collector import ( "sync" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type averageData struct { diff --git a/internal/querynodev2/collector/collector.go b/internal/querynodev2/collector/collector.go index 90e43d73a0..5154817ad1 100644 --- a/internal/querynodev2/collector/collector.go +++ b/internal/querynodev2/collector/collector.go @@ -19,9 +19,9 @@ package collector import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/ratelimitutil" ) var Average *averageCollector diff --git a/internal/querynodev2/delegator/delegator.go b/internal/querynodev2/delegator/delegator.go index 44fcbe4af0..5b1086840e 100644 --- a/internal/querynodev2/delegator/delegator.go +++ b/internal/querynodev2/delegator/delegator.go @@ -46,22 +46,22 @@ import ( "github.com/milvus-io/milvus/internal/util/searchutil/optimizers" "github.com/milvus-io/milvus/internal/util/streamingutil" "github.com/milvus-io/milvus/internal/util/streamrpc" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/lifetime" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/lifetime" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // ShardDelegator is the interface definition. diff --git a/internal/querynodev2/delegator/delegator_data.go b/internal/querynodev2/delegator/delegator_data.go index 3ff0ca1949..086c97715f 100644 --- a/internal/querynodev2/delegator/delegator_data.go +++ b/internal/querynodev2/delegator/delegator_data.go @@ -39,27 +39,27 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - mqcommon "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/message/adaptor" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + mqcommon "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message/adaptor" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // delegator data related part diff --git a/internal/querynodev2/delegator/delegator_data_test.go b/internal/querynodev2/delegator/delegator_data_test.go index ff8b977939..fa139073e4 100644 --- a/internal/querynodev2/delegator/delegator_data_test.go +++ b/internal/querynodev2/delegator/delegator_data_test.go @@ -44,20 +44,20 @@ import ( "github.com/milvus-io/milvus/internal/util/bloomfilter" "github.com/milvus-io/milvus/internal/util/function" "github.com/milvus-io/milvus/internal/util/initcore" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type DelegatorDataSuite struct { diff --git a/internal/querynodev2/delegator/delegator_test.go b/internal/querynodev2/delegator/delegator_test.go index d7cf7cb896..db9dcac770 100644 --- a/internal/querynodev2/delegator/delegator_test.go +++ b/internal/querynodev2/delegator/delegator_test.go @@ -36,15 +36,15 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/streamrpc" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type DelegatorSuite struct { diff --git a/internal/querynodev2/delegator/deletebuffer/list_delete_buffer.go b/internal/querynodev2/delegator/deletebuffer/list_delete_buffer.go index 2a17e1ec6e..9b0506cb9a 100644 --- a/internal/querynodev2/delegator/deletebuffer/list_delete_buffer.go +++ b/internal/querynodev2/delegator/deletebuffer/list_delete_buffer.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/v2/metrics" ) func NewListDeleteBuffer[T timed](startTs uint64, sizePerBlock int64, labels []string) DeleteBuffer[T] { diff --git a/internal/querynodev2/delegator/deletebuffer/skiplist_buffer.go b/internal/querynodev2/delegator/deletebuffer/skiplist_buffer.go index 94a64aef7a..a0ad7a5c9b 100644 --- a/internal/querynodev2/delegator/deletebuffer/skiplist_buffer.go +++ b/internal/querynodev2/delegator/deletebuffer/skiplist_buffer.go @@ -1,6 +1,6 @@ package deletebuffer -import "github.com/milvus-io/milvus/pkg/util/typeutil" +import "github.com/milvus-io/milvus/pkg/v2/util/typeutil" // deleteBuffer caches L0 delete buffer for remote segments. type deleteBuffer struct { diff --git a/internal/querynodev2/delegator/delta_forward.go b/internal/querynodev2/delegator/delta_forward.go index a42353d455..9498ccc9df 100644 --- a/internal/querynodev2/delegator/delta_forward.go +++ b/internal/querynodev2/delegator/delta_forward.go @@ -32,17 +32,17 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/pkoracle" "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/querynodev2/delegator/delta_forward_test.go b/internal/querynodev2/delegator/delta_forward_test.go index 6dbd07710c..7f7f5215be 100644 --- a/internal/querynodev2/delegator/delta_forward_test.go +++ b/internal/querynodev2/delegator/delta_forward_test.go @@ -32,15 +32,15 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/pkoracle" "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type StreamingForwardSuite struct { diff --git a/internal/querynodev2/delegator/distribution.go b/internal/querynodev2/delegator/distribution.go index 64c055433e..4a07290749 100644 --- a/internal/querynodev2/delegator/distribution.go +++ b/internal/querynodev2/delegator/distribution.go @@ -23,10 +23,10 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/querynodev2/delegator/exclude_info.go b/internal/querynodev2/delegator/exclude_info.go index ad116f8872..d2040ca394 100644 --- a/internal/querynodev2/delegator/exclude_info.go +++ b/internal/querynodev2/delegator/exclude_info.go @@ -24,7 +24,7 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) type ExcludedSegments struct { diff --git a/internal/querynodev2/delegator/idf_oracle.go b/internal/querynodev2/delegator/idf_oracle.go index ca6aebb17f..a3ebca8d97 100644 --- a/internal/querynodev2/delegator/idf_oracle.go +++ b/internal/querynodev2/delegator/idf_oracle.go @@ -27,8 +27,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) type IDFOracle interface { diff --git a/internal/querynodev2/delegator/idf_oracle_test.go b/internal/querynodev2/delegator/idf_oracle_test.go index 43b26a3463..52881147f2 100644 --- a/internal/querynodev2/delegator/idf_oracle_test.go +++ b/internal/querynodev2/delegator/idf_oracle_test.go @@ -24,7 +24,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type IDFOracleSuite struct { diff --git a/internal/querynodev2/delegator/mock_delegator.go b/internal/querynodev2/delegator/mock_delegator.go index d61bf0a598..3df854a310 100644 --- a/internal/querynodev2/delegator/mock_delegator.go +++ b/internal/querynodev2/delegator/mock_delegator.go @@ -5,12 +5,12 @@ package delegator import ( context "context" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" mock "github.com/stretchr/testify/mock" msgpb "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - querypb "github.com/milvus-io/milvus/pkg/proto/querypb" + querypb "github.com/milvus-io/milvus/pkg/v2/proto/querypb" streamrpc "github.com/milvus-io/milvus/internal/util/streamrpc" ) diff --git a/internal/querynodev2/delegator/scalar_pruner.go b/internal/querynodev2/delegator/scalar_pruner.go index 640cf478a0..ce46ff9a35 100644 --- a/internal/querynodev2/delegator/scalar_pruner.go +++ b/internal/querynodev2/delegator/scalar_pruner.go @@ -5,7 +5,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" ) type EvalCtx struct { diff --git a/internal/querynodev2/delegator/segment_pruner.go b/internal/querynodev2/delegator/segment_pruner.go index e49a50ce17..a8b4c0efbe 100644 --- a/internal/querynodev2/delegator/segment_pruner.go +++ b/internal/querynodev2/delegator/segment_pruner.go @@ -16,17 +16,17 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/clustering" "github.com/milvus-io/milvus/internal/util/exprutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/util/distance" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/util/distance" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type PruneInfo struct { diff --git a/internal/querynodev2/delegator/segment_pruner_test.go b/internal/querynodev2/delegator/segment_pruner_test.go index 530deeb63d..354d863667 100644 --- a/internal/querynodev2/delegator/segment_pruner_test.go +++ b/internal/querynodev2/delegator/segment_pruner_test.go @@ -13,9 +13,9 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/clustering" "github.com/milvus-io/milvus/internal/util/testutil" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type SegmentPrunerSuite struct { diff --git a/internal/querynodev2/delegator/snapshot.go b/internal/querynodev2/delegator/snapshot.go index ae6e88e423..6a92916968 100644 --- a/internal/querynodev2/delegator/snapshot.go +++ b/internal/querynodev2/delegator/snapshot.go @@ -22,8 +22,8 @@ import ( "github.com/samber/lo" "go.uber.org/atomic" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // SnapshotItem group segmentEntry slice diff --git a/internal/querynodev2/delegator/types.go b/internal/querynodev2/delegator/types.go index c5e7c0e1f4..e3d238a5b2 100644 --- a/internal/querynodev2/delegator/types.go +++ b/internal/querynodev2/delegator/types.go @@ -6,8 +6,8 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/querynodev2/delegator/util.go b/internal/querynodev2/delegator/util.go index 0413d5bbf9..127c0436b6 100644 --- a/internal/querynodev2/delegator/util.go +++ b/internal/querynodev2/delegator/util.go @@ -7,10 +7,10 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func BuildSparseFieldData(field *schemapb.FieldSchema, sparseArray *schemapb.SparseFloatArray) *schemapb.FieldData { diff --git a/internal/querynodev2/handlers.go b/internal/querynodev2/handlers.go index 817777606a..8fe014859d 100644 --- a/internal/querynodev2/handlers.go +++ b/internal/querynodev2/handlers.go @@ -31,15 +31,15 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/tasks" "github.com/milvus-io/milvus/internal/util/reduce" "github.com/milvus-io/milvus/internal/util/streamrpc" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) func loadL0Segments(ctx context.Context, delegator delegator.ShardDelegator, req *querypb.WatchDmChannelsRequest) error { diff --git a/internal/querynodev2/handlers_test.go b/internal/querynodev2/handlers_test.go index 78a9c68deb..9e1d63a22f 100644 --- a/internal/querynodev2/handlers_test.go +++ b/internal/querynodev2/handlers_test.go @@ -28,10 +28,10 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type HandlersSuite struct { diff --git a/internal/querynodev2/local_worker.go b/internal/querynodev2/local_worker.go index 4044050d3c..1571e82dfa 100644 --- a/internal/querynodev2/local_worker.go +++ b/internal/querynodev2/local_worker.go @@ -21,9 +21,9 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/cluster" "github.com/milvus-io/milvus/internal/util/streamrpc" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) var _ cluster.Worker = &LocalWorker{} diff --git a/internal/querynodev2/local_worker_test.go b/internal/querynodev2/local_worker_test.go index 47bcfdcb25..0a19f21663 100644 --- a/internal/querynodev2/local_worker_test.go +++ b/internal/querynodev2/local_worker_test.go @@ -30,11 +30,11 @@ import ( "github.com/milvus-io/milvus/internal/mocks/util/mock_segcore" "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type LocalWorkerTestSuite struct { diff --git a/internal/querynodev2/metrics_info.go b/internal/querynodev2/metrics_info.go index 6609d52676..57f98606a6 100644 --- a/internal/querynodev2/metrics_info.go +++ b/internal/querynodev2/metrics_info.go @@ -29,13 +29,13 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/collector" "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/querynodev2/segments" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/ratelimitutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func getRateMetric() ([]metricsinfo.RateMetric, error) { diff --git a/internal/querynodev2/metrics_info_test.go b/internal/querynodev2/metrics_info_test.go index 3b9984d665..0e5d367dc8 100644 --- a/internal/querynodev2/metrics_info_test.go +++ b/internal/querynodev2/metrics_info_test.go @@ -27,12 +27,12 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/querynodev2/pipeline" "github.com/milvus-io/milvus/internal/querynodev2/segments" - "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestGetPipelineJSON(t *testing.T) { diff --git a/internal/querynodev2/mock_data.go b/internal/querynodev2/mock_data.go index 7de63e97a9..597132cbef 100644 --- a/internal/querynodev2/mock_data.go +++ b/internal/querynodev2/mock_data.go @@ -25,9 +25,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // ---------- unittest util functions ---------- diff --git a/internal/querynodev2/pipeline/delete_node.go b/internal/querynodev2/pipeline/delete_node.go index 5607fdd7ec..aedda284d5 100644 --- a/internal/querynodev2/pipeline/delete_node.go +++ b/internal/querynodev2/pipeline/delete_node.go @@ -25,9 +25,9 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/storage" base "github.com/milvus-io/milvus/internal/util/pipeline" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type deleteNode struct { diff --git a/internal/querynodev2/pipeline/delete_node_test.go b/internal/querynodev2/pipeline/delete_node_test.go index da3607b848..3c8d70024c 100644 --- a/internal/querynodev2/pipeline/delete_node_test.go +++ b/internal/querynodev2/pipeline/delete_node_test.go @@ -25,7 +25,7 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/querynodev2/segments" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type DeleteNodeSuite struct { diff --git a/internal/querynodev2/pipeline/embedding_node.go b/internal/querynodev2/pipeline/embedding_node.go index 76ef66e9c6..813be6b943 100644 --- a/internal/querynodev2/pipeline/embedding_node.go +++ b/internal/querynodev2/pipeline/embedding_node.go @@ -29,10 +29,10 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/function" base "github.com/milvus-io/milvus/internal/util/pipeline" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type embeddingNode struct { diff --git a/internal/querynodev2/pipeline/embedding_node_test.go b/internal/querynodev2/pipeline/embedding_node_test.go index 19ab5c5139..5d74afca18 100644 --- a/internal/querynodev2/pipeline/embedding_node_test.go +++ b/internal/querynodev2/pipeline/embedding_node_test.go @@ -30,9 +30,9 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/util/function" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // test of embedding node diff --git a/internal/querynodev2/pipeline/filter_node.go b/internal/querynodev2/pipeline/filter_node.go index 786e893d7b..0cd2d44628 100644 --- a/internal/querynodev2/pipeline/filter_node.go +++ b/internal/querynodev2/pipeline/filter_node.go @@ -26,12 +26,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/querynodev2/delegator" base "github.com/milvus-io/milvus/internal/util/pipeline" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) // filterNode filter the invalid message of pipeline diff --git a/internal/querynodev2/pipeline/filter_node_test.go b/internal/querynodev2/pipeline/filter_node_test.go index 022f161d7e..42dfbbf041 100644 --- a/internal/querynodev2/pipeline/filter_node_test.go +++ b/internal/querynodev2/pipeline/filter_node_test.go @@ -25,9 +25,9 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/querynodev2/segments" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // test of filter node diff --git a/internal/querynodev2/pipeline/filter_policy.go b/internal/querynodev2/pipeline/filter_policy.go index 90cf6b9ffb..6a78c754a4 100644 --- a/internal/querynodev2/pipeline/filter_policy.go +++ b/internal/querynodev2/pipeline/filter_policy.go @@ -17,7 +17,7 @@ package pipeline import ( - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // MsgFilter will return error if Msg was invalid diff --git a/internal/querynodev2/pipeline/insert_node.go b/internal/querynodev2/pipeline/insert_node.go index 1e5c238f19..264928f253 100644 --- a/internal/querynodev2/pipeline/insert_node.go +++ b/internal/querynodev2/pipeline/insert_node.go @@ -28,10 +28,10 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/storage" base "github.com/milvus-io/milvus/internal/util/pipeline" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type insertNode struct { diff --git a/internal/querynodev2/pipeline/insert_node_test.go b/internal/querynodev2/pipeline/insert_node_test.go index 6985610026..4a174db587 100644 --- a/internal/querynodev2/pipeline/insert_node_test.go +++ b/internal/querynodev2/pipeline/insert_node_test.go @@ -27,8 +27,8 @@ import ( "github.com/milvus-io/milvus/internal/mocks/util/mock_segcore" "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/querynodev2/segments" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type InsertNodeSuite struct { diff --git a/internal/querynodev2/pipeline/manager.go b/internal/querynodev2/pipeline/manager.go index e7ebaddbb1..9207d3c9df 100644 --- a/internal/querynodev2/pipeline/manager.go +++ b/internal/querynodev2/pipeline/manager.go @@ -23,15 +23,15 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/querynodev2/delegator" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Manager manage pipeline in querynode diff --git a/internal/querynodev2/pipeline/manager_test.go b/internal/querynodev2/pipeline/manager_test.go index 33eaab9b28..66ff77b687 100644 --- a/internal/querynodev2/pipeline/manager_test.go +++ b/internal/querynodev2/pipeline/manager_test.go @@ -27,11 +27,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/querynodev2/segments" - "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type PipelineManagerTestSuite struct { diff --git a/internal/querynodev2/pipeline/message.go b/internal/querynodev2/pipeline/message.go index 0afae129ea..f8ef5a128f 100644 --- a/internal/querynodev2/pipeline/message.go +++ b/internal/querynodev2/pipeline/message.go @@ -20,9 +20,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/querynodev2/collector" "github.com/milvus-io/milvus/internal/querynodev2/delegator" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" ) type insertNodeMsg struct { diff --git a/internal/querynodev2/pipeline/mock_data.go b/internal/querynodev2/pipeline/mock_data.go index f0090d9abc..90d91cd8ef 100644 --- a/internal/querynodev2/pipeline/mock_data.go +++ b/internal/querynodev2/pipeline/mock_data.go @@ -22,9 +22,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" ) const defaultDim = 128 diff --git a/internal/querynodev2/pipeline/pipeline.go b/internal/querynodev2/pipeline/pipeline.go index add94d4b9c..408d4241ce 100644 --- a/internal/querynodev2/pipeline/pipeline.go +++ b/internal/querynodev2/pipeline/pipeline.go @@ -19,10 +19,10 @@ package pipeline import ( "github.com/milvus-io/milvus/internal/querynodev2/delegator" base "github.com/milvus-io/milvus/internal/util/pipeline" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // pipeline used for querynode diff --git a/internal/querynodev2/pipeline/pipeline_test.go b/internal/querynodev2/pipeline/pipeline_test.go index 1c5e2ee039..1da1bf813a 100644 --- a/internal/querynodev2/pipeline/pipeline_test.go +++ b/internal/querynodev2/pipeline/pipeline_test.go @@ -30,11 +30,11 @@ import ( "github.com/milvus-io/milvus/internal/mocks/util/mock_segcore" "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/querynodev2/segments" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type PipelineTestSuite struct { diff --git a/internal/querynodev2/pipeline/type.go b/internal/querynodev2/pipeline/type.go index 9b822d16f6..d2737174e4 100644 --- a/internal/querynodev2/pipeline/type.go +++ b/internal/querynodev2/pipeline/type.go @@ -23,9 +23,9 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/storage" base "github.com/milvus-io/milvus/internal/util/pipeline" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/querynodev2/pkoracle/bloom_filter_set.go b/internal/querynodev2/pkoracle/bloom_filter_set.go index ef64da02ed..cf546ea9b1 100644 --- a/internal/querynodev2/pkoracle/bloom_filter_set.go +++ b/internal/querynodev2/pkoracle/bloom_filter_set.go @@ -25,9 +25,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/bloomfilter" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var _ Candidate = (*BloomFilterSet)(nil) diff --git a/internal/querynodev2/pkoracle/bloom_filter_set_test.go b/internal/querynodev2/pkoracle/bloom_filter_set_test.go index 2bde478cbd..b5b37d9e24 100644 --- a/internal/querynodev2/pkoracle/bloom_filter_set_test.go +++ b/internal/querynodev2/pkoracle/bloom_filter_set_test.go @@ -24,7 +24,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestInt64Pk(t *testing.T) { diff --git a/internal/querynodev2/pkoracle/candidate.go b/internal/querynodev2/pkoracle/candidate.go index 9f8a8b7daf..74c78ed4c9 100644 --- a/internal/querynodev2/pkoracle/candidate.go +++ b/internal/querynodev2/pkoracle/candidate.go @@ -19,8 +19,8 @@ package pkoracle import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Candidate is the interface for pk oracle candidate. diff --git a/internal/querynodev2/pkoracle/pk_oracle.go b/internal/querynodev2/pkoracle/pk_oracle.go index 472f441790..69e5040c5b 100644 --- a/internal/querynodev2/pkoracle/pk_oracle.go +++ b/internal/querynodev2/pkoracle/pk_oracle.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // PkOracle interface for pk oracle. diff --git a/internal/querynodev2/pkoracle/pk_oracle_test.go b/internal/querynodev2/pkoracle/pk_oracle_test.go index ec19fd4c35..429cd7d6c8 100644 --- a/internal/querynodev2/pkoracle/pk_oracle_test.go +++ b/internal/querynodev2/pkoracle/pk_oracle_test.go @@ -23,7 +23,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestGet(t *testing.T) { diff --git a/internal/querynodev2/segments/cgo_util.go b/internal/querynodev2/segments/cgo_util.go index 222e8ca95a..1b3484aa05 100644 --- a/internal/querynodev2/segments/cgo_util.go +++ b/internal/querynodev2/segments/cgo_util.go @@ -32,8 +32,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // HandleCStatus deals with the error returned from CGO diff --git a/internal/querynodev2/segments/collection.go b/internal/querynodev2/segments/collection.go index c10cbde9e5..3a509e6866 100644 --- a/internal/querynodev2/segments/collection.go +++ b/internal/querynodev2/segments/collection.go @@ -28,13 +28,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/segcore" "github.com/milvus-io/milvus/internal/util/vecindexmgr" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type CollectionManager interface { diff --git a/internal/querynodev2/segments/count_reducer.go b/internal/querynodev2/segments/count_reducer.go index 2da67ca79b..61fdd72fec 100644 --- a/internal/querynodev2/segments/count_reducer.go +++ b/internal/querynodev2/segments/count_reducer.go @@ -5,8 +5,8 @@ import ( "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/segcore" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" ) type cntReducer struct{} diff --git a/internal/querynodev2/segments/count_reducer_test.go b/internal/querynodev2/segments/count_reducer_test.go index 2e1578b29a..4a99012573 100644 --- a/internal/querynodev2/segments/count_reducer_test.go +++ b/internal/querynodev2/segments/count_reducer_test.go @@ -8,8 +8,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" ) type InternalCntReducerSuite struct { diff --git a/internal/querynodev2/segments/default_limit_reducer.go b/internal/querynodev2/segments/default_limit_reducer.go index 38a135c6f7..4b35c186b7 100644 --- a/internal/querynodev2/segments/default_limit_reducer.go +++ b/internal/querynodev2/segments/default_limit_reducer.go @@ -5,9 +5,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/reduce" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" ) type defaultLimitReducer struct { diff --git a/internal/querynodev2/segments/disk_usage_fetcher.go b/internal/querynodev2/segments/disk_usage_fetcher.go index ca4aeecaee..58c7fd0125 100644 --- a/internal/querynodev2/segments/disk_usage_fetcher.go +++ b/internal/querynodev2/segments/disk_usage_fetcher.go @@ -25,9 +25,9 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/util/segcore" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type diskUsageFetcher struct { diff --git a/internal/querynodev2/segments/index_attr_cache.go b/internal/querynodev2/segments/index_attr_cache.go index c58552fc17..830b26b698 100644 --- a/internal/querynodev2/segments/index_attr_cache.go +++ b/internal/querynodev2/segments/index_attr_cache.go @@ -29,12 +29,12 @@ import ( "github.com/milvus-io/milvus/internal/util/indexparamcheck" "github.com/milvus-io/milvus/internal/util/vecindexmgr" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var indexAttrCache = NewIndexAttrCache() diff --git a/internal/querynodev2/segments/index_attr_cache_test.go b/internal/querynodev2/segments/index_attr_cache_test.go index 14b05cc999..e8966da3c2 100644 --- a/internal/querynodev2/segments/index_attr_cache_test.go +++ b/internal/querynodev2/segments/index_attr_cache_test.go @@ -23,11 +23,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/util/indexparamcheck" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type IndexAttrCacheSuite struct { diff --git a/internal/querynodev2/segments/load_field_data_info.go b/internal/querynodev2/segments/load_field_data_info.go index dd59312037..29eef77a40 100644 --- a/internal/querynodev2/segments/load_field_data_info.go +++ b/internal/querynodev2/segments/load_field_data_info.go @@ -26,7 +26,7 @@ import ( "context" "unsafe" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) type LoadFieldDataInfo struct { diff --git a/internal/querynodev2/segments/load_index_info.go b/internal/querynodev2/segments/load_index_info.go index da60f2d316..9068ce5a47 100644 --- a/internal/querynodev2/segments/load_index_info.go +++ b/internal/querynodev2/segments/load_index_info.go @@ -34,9 +34,9 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/cgopb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/cgopb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // LoadIndexInfo is a wrapper of the underlying C-structure C.CLoadIndexInfo diff --git a/internal/querynodev2/segments/manager.go b/internal/querynodev2/segments/manager.go index 8dfccd2573..a96b06cb70 100644 --- a/internal/querynodev2/segments/manager.go +++ b/internal/querynodev2/segments/manager.go @@ -33,17 +33,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/querynodev2/segments/metricsutil" - "github.com/milvus-io/milvus/pkg/eventlog" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/cache" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/eventlog" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/cache" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // TODO maybe move to manager and change segment constructor diff --git a/internal/querynodev2/segments/manager_test.go b/internal/querynodev2/segments/manager_test.go index 474a520ab2..0a376737b5 100644 --- a/internal/querynodev2/segments/manager_test.go +++ b/internal/querynodev2/segments/manager_test.go @@ -12,10 +12,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/mocks/util/mock_segcore" "github.com/milvus-io/milvus/internal/util/initcore" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ManagerSuite struct { diff --git a/internal/querynodev2/segments/metricsutil/observer.go b/internal/querynodev2/segments/metricsutil/observer.go index edeb92afbd..b9db62ea31 100644 --- a/internal/querynodev2/segments/metricsutil/observer.go +++ b/internal/querynodev2/segments/metricsutil/observer.go @@ -8,9 +8,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.uber.org/atomic" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // labeledRecord is a labeled sample point. diff --git a/internal/querynodev2/segments/metricsutil/record.go b/internal/querynodev2/segments/metricsutil/record.go index 1c4309aa77..66cf725acb 100644 --- a/internal/querynodev2/segments/metricsutil/record.go +++ b/internal/querynodev2/segments/metricsutil/record.go @@ -3,7 +3,7 @@ package metricsutil import ( "time" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) var ( diff --git a/internal/querynodev2/segments/metricsutil/record_test.go b/internal/querynodev2/segments/metricsutil/record_test.go index 4789ecfb87..73222f28f4 100644 --- a/internal/querynodev2/segments/metricsutil/record_test.go +++ b/internal/querynodev2/segments/metricsutil/record_test.go @@ -7,7 +7,7 @@ import ( "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var testLabel = SegmentLabel{ diff --git a/internal/querynodev2/segments/mock_collection_manager.go b/internal/querynodev2/segments/mock_collection_manager.go index 22e1aeb9df..fe8368a514 100644 --- a/internal/querynodev2/segments/mock_collection_manager.go +++ b/internal/querynodev2/segments/mock_collection_manager.go @@ -4,10 +4,10 @@ package segments import ( schemapb "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - querypb "github.com/milvus-io/milvus/pkg/proto/querypb" + querypb "github.com/milvus-io/milvus/pkg/v2/proto/querypb" mock "github.com/stretchr/testify/mock" - segcorepb "github.com/milvus-io/milvus/pkg/proto/segcorepb" + segcorepb "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" ) // MockCollectionManager is an autogenerated mock type for the CollectionManager type diff --git a/internal/querynodev2/segments/mock_loader.go b/internal/querynodev2/segments/mock_loader.go index bdefdc91a0..331ae867d4 100644 --- a/internal/querynodev2/segments/mock_loader.go +++ b/internal/querynodev2/segments/mock_loader.go @@ -7,17 +7,17 @@ import ( commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" mock "github.com/stretchr/testify/mock" pkoracle "github.com/milvus-io/milvus/internal/querynodev2/pkoracle" - querypb "github.com/milvus-io/milvus/pkg/proto/querypb" + querypb "github.com/milvus-io/milvus/pkg/v2/proto/querypb" storage "github.com/milvus-io/milvus/internal/storage" - typeutil "github.com/milvus-io/milvus/pkg/util/typeutil" + typeutil "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // MockLoader is an autogenerated mock type for the Loader type diff --git a/internal/querynodev2/segments/mock_segment.go b/internal/querynodev2/segments/mock_segment.go index 44ea005b9b..2d706cade6 100644 --- a/internal/querynodev2/segments/mock_segment.go +++ b/internal/querynodev2/segments/mock_segment.go @@ -7,19 +7,19 @@ import ( commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" - metautil "github.com/milvus-io/milvus/pkg/util/metautil" + metautil "github.com/milvus-io/milvus/pkg/v2/util/metautil" mock "github.com/stretchr/testify/mock" msgpb "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - querypb "github.com/milvus-io/milvus/pkg/proto/querypb" + querypb "github.com/milvus-io/milvus/pkg/v2/proto/querypb" segcore "github.com/milvus-io/milvus/internal/util/segcore" - segcorepb "github.com/milvus-io/milvus/pkg/proto/segcorepb" + segcorepb "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" storage "github.com/milvus-io/milvus/internal/storage" ) diff --git a/internal/querynodev2/segments/mock_segment_manager.go b/internal/querynodev2/segments/mock_segment_manager.go index c5b665e56b..4d6cbe2579 100644 --- a/internal/querynodev2/segments/mock_segment_manager.go +++ b/internal/querynodev2/segments/mock_segment_manager.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - querypb "github.com/milvus-io/milvus/pkg/proto/querypb" + querypb "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) // MockSegmentManager is an autogenerated mock type for the SegmentManager type diff --git a/internal/querynodev2/segments/pool.go b/internal/querynodev2/segments/pool.go index ca9971caa9..b0ee53185f 100644 --- a/internal/querynodev2/segments/pool.go +++ b/internal/querynodev2/segments/pool.go @@ -35,11 +35,11 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var ( diff --git a/internal/querynodev2/segments/pool_test.go b/internal/querynodev2/segments/pool_test.go index b8774ecb0d..30aa896f9c 100644 --- a/internal/querynodev2/segments/pool_test.go +++ b/internal/querynodev2/segments/pool_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestResizePools(t *testing.T) { diff --git a/internal/querynodev2/segments/reducer.go b/internal/querynodev2/segments/reducer.go index 5dc157c330..e16ff20f97 100644 --- a/internal/querynodev2/segments/reducer.go +++ b/internal/querynodev2/segments/reducer.go @@ -7,12 +7,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/segcore" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type internalReducer interface { diff --git a/internal/querynodev2/segments/reducer_test.go b/internal/querynodev2/segments/reducer_test.go index ed9a98f307..be1f3c167e 100644 --- a/internal/querynodev2/segments/reducer_test.go +++ b/internal/querynodev2/segments/reducer_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) type ReducerFactorySuite struct { diff --git a/internal/querynodev2/segments/result.go b/internal/querynodev2/segments/result.go index 340b28a50f..daa731a8cc 100644 --- a/internal/querynodev2/segments/result.go +++ b/internal/querynodev2/segments/result.go @@ -30,14 +30,14 @@ import ( "github.com/milvus-io/milvus/internal/util/reduce" "github.com/milvus-io/milvus/internal/util/segcore" typeutil2 "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ typeutil.ResultWithID = &internalpb.RetrieveResults{} diff --git a/internal/querynodev2/segments/result_sorter.go b/internal/querynodev2/segments/result_sorter.go index 32f4ad9dd8..e9c94b82b0 100644 --- a/internal/querynodev2/segments/result_sorter.go +++ b/internal/querynodev2/segments/result_sorter.go @@ -2,8 +2,8 @@ package segments import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type byPK struct { diff --git a/internal/querynodev2/segments/result_test.go b/internal/querynodev2/segments/result_test.go index 44f141b2e3..efb8a49132 100644 --- a/internal/querynodev2/segments/result_test.go +++ b/internal/querynodev2/segments/result_test.go @@ -30,12 +30,12 @@ import ( "github.com/milvus-io/milvus/internal/mocks/util/mock_segcore" "github.com/milvus-io/milvus/internal/util/reduce" "github.com/milvus-io/milvus/internal/util/segcore" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func getFieldData[T interface { diff --git a/internal/querynodev2/segments/retrieve.go b/internal/querynodev2/segments/retrieve.go index 40696e2998..f621486961 100644 --- a/internal/querynodev2/segments/retrieve.go +++ b/internal/querynodev2/segments/retrieve.go @@ -25,15 +25,15 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/util/streamrpc" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type RetrieveSegmentResult struct { diff --git a/internal/querynodev2/segments/retrieve_test.go b/internal/querynodev2/segments/retrieve_test.go index b377df3ee6..22548e7712 100644 --- a/internal/querynodev2/segments/retrieve_test.go +++ b/internal/querynodev2/segments/retrieve_test.go @@ -30,11 +30,11 @@ import ( "github.com/milvus-io/milvus/internal/util/initcore" "github.com/milvus-io/milvus/internal/util/segcore" "github.com/milvus-io/milvus/internal/util/streamrpc" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type RetrieveSuite struct { diff --git a/internal/querynodev2/segments/search.go b/internal/querynodev2/segments/search.go index ca5aa76a1e..b2d0a6cc24 100644 --- a/internal/querynodev2/segments/search.go +++ b/internal/querynodev2/segments/search.go @@ -27,10 +27,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/querynodev2/segments/metricsutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) // searchOnSegments performs search on listed segments diff --git a/internal/querynodev2/segments/search_reduce.go b/internal/querynodev2/segments/search_reduce.go index a8997115ab..7c33432557 100644 --- a/internal/querynodev2/segments/search_reduce.go +++ b/internal/querynodev2/segments/search_reduce.go @@ -9,10 +9,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/reduce" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type SearchReduce interface { diff --git a/internal/querynodev2/segments/search_reduce_test.go b/internal/querynodev2/segments/search_reduce_test.go index 2409158dd2..f3629df738 100644 --- a/internal/querynodev2/segments/search_reduce_test.go +++ b/internal/querynodev2/segments/search_reduce_test.go @@ -9,7 +9,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/mocks/util/mock_segcore" "github.com/milvus-io/milvus/internal/util/reduce" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type SearchReduceSuite struct { diff --git a/internal/querynodev2/segments/search_test.go b/internal/querynodev2/segments/search_test.go index eac94af7ec..d1cf996860 100644 --- a/internal/querynodev2/segments/search_test.go +++ b/internal/querynodev2/segments/search_test.go @@ -27,9 +27,9 @@ import ( "github.com/milvus-io/milvus/internal/mocks/util/mock_segcore" storage "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/initcore" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type SearchSuite struct { diff --git a/internal/querynodev2/segments/segment.go b/internal/querynodev2/segments/segment.go index e63a377b7d..615ed206d1 100644 --- a/internal/querynodev2/segments/segment.go +++ b/internal/querynodev2/segments/segment.go @@ -50,22 +50,22 @@ import ( "github.com/milvus-io/milvus/internal/util/indexparamcheck" "github.com/milvus-io/milvus/internal/util/segcore" "github.com/milvus-io/milvus/internal/util/vecindexmgr" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/cgopb" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexcgopb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/indexparams" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/cgopb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexcgopb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/indexparams" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type SegmentType = commonpb.SegmentState diff --git a/internal/querynodev2/segments/segment_do.go b/internal/querynodev2/segments/segment_do.go index 61b03103c3..9fdea2b945 100644 --- a/internal/querynodev2/segments/segment_do.go +++ b/internal/querynodev2/segments/segment_do.go @@ -7,8 +7,8 @@ import ( "golang.org/x/sync/errgroup" "github.com/milvus-io/milvus/internal/querynodev2/segments/metricsutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/conc" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/conc" ) type doOnSegmentFunc func(ctx context.Context, segment Segment) error diff --git a/internal/querynodev2/segments/segment_filter.go b/internal/querynodev2/segments/segment_filter.go index 080fae5841..a9fec49219 100644 --- a/internal/querynodev2/segments/segment_filter.go +++ b/internal/querynodev2/segments/segment_filter.go @@ -17,9 +17,9 @@ package segments import ( - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // segmentCriterion is the segment filter criterion obj. diff --git a/internal/querynodev2/segments/segment_interface.go b/internal/querynodev2/segments/segment_interface.go index 51b1143e44..2ae2bc4aed 100644 --- a/internal/querynodev2/segments/segment_interface.go +++ b/internal/querynodev2/segments/segment_interface.go @@ -22,11 +22,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/segcore" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // ResourceUsage is used to estimate the resource usage of a sealed segment. diff --git a/internal/querynodev2/segments/segment_l0.go b/internal/querynodev2/segments/segment_l0.go index cf42c2ef9c..bdc53a0f4c 100644 --- a/internal/querynodev2/segments/segment_l0.go +++ b/internal/querynodev2/segments/segment_l0.go @@ -25,12 +25,12 @@ import ( storage "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/segcore" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ Segment = (*L0Segment)(nil) diff --git a/internal/querynodev2/segments/segment_loader.go b/internal/querynodev2/segments/segment_loader.go index fed43d53ce..9501ab4b47 100644 --- a/internal/querynodev2/segments/segment_loader.go +++ b/internal/querynodev2/segments/segment_loader.go @@ -46,22 +46,22 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/pkoracle" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/vecindexmgr" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/contextutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/contextutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/querynodev2/segments/segment_loader_test.go b/internal/querynodev2/segments/segment_loader_test.go index f12087b073..4dbb1bee9b 100644 --- a/internal/querynodev2/segments/segment_loader_test.go +++ b/internal/querynodev2/segments/segment_loader_test.go @@ -34,14 +34,14 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/indexparamcheck" "github.com/milvus-io/milvus/internal/util/initcore" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/contextutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/contextutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type SegmentLoaderSuite struct { diff --git a/internal/querynodev2/segments/segment_test.go b/internal/querynodev2/segments/segment_test.go index 41442abf16..aa609a4e88 100644 --- a/internal/querynodev2/segments/segment_test.go +++ b/internal/querynodev2/segments/segment_test.go @@ -15,10 +15,10 @@ import ( "github.com/milvus-io/milvus/internal/mocks/util/mock_segcore" storage "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/initcore" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type SegmentSuite struct { diff --git a/internal/querynodev2/segments/state/load_state_lock.go b/internal/querynodev2/segments/state/load_state_lock.go index e774a373ce..6d3d2c6677 100644 --- a/internal/querynodev2/segments/state/load_state_lock.go +++ b/internal/querynodev2/segments/state/load_state_lock.go @@ -9,8 +9,8 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type loadStateEnum int diff --git a/internal/querynodev2/segments/state/load_state_lock_test.go b/internal/querynodev2/segments/state/load_state_lock_test.go index b2053488b2..9b8a6915c1 100644 --- a/internal/querynodev2/segments/state/load_state_lock_test.go +++ b/internal/querynodev2/segments/state/load_state_lock_test.go @@ -7,7 +7,7 @@ import ( "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestLoadStateLoadData(t *testing.T) { diff --git a/internal/querynodev2/segments/utils.go b/internal/querynodev2/segments/utils.go index 64f7dd518a..65b806a14f 100644 --- a/internal/querynodev2/segments/utils.go +++ b/internal/querynodev2/segments/utils.go @@ -28,16 +28,16 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/indexparamcheck" "github.com/milvus-io/milvus/internal/util/vecindexmgr" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/contextutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/contextutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var errLazyLoadTimeout = merr.WrapErrServiceInternal("lazy load time out") diff --git a/internal/querynodev2/segments/utils_test.go b/internal/querynodev2/segments/utils_test.go index 28f4b609e5..727a94c400 100644 --- a/internal/querynodev2/segments/utils_test.go +++ b/internal/querynodev2/segments/utils_test.go @@ -7,10 +7,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestFilterZeroValuesFromSlice(t *testing.T) { diff --git a/internal/querynodev2/segments/validate.go b/internal/querynodev2/segments/validate.go index 68fa8adf75..53a20c27fd 100644 --- a/internal/querynodev2/segments/validate.go +++ b/internal/querynodev2/segments/validate.go @@ -21,8 +21,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func validate(ctx context.Context, manager *Manager, collectionID int64, partitionIDs []int64, segmentIDs []int64, segmentFilter SegmentFilter) ([]Segment, error) { diff --git a/internal/querynodev2/server.go b/internal/querynodev2/server.go index 55ff9abc3a..8ac5e0aba6 100644 --- a/internal/querynodev2/server.go +++ b/internal/querynodev2/server.go @@ -61,18 +61,18 @@ import ( "github.com/milvus-io/milvus/internal/util/searchutil/scheduler" "github.com/milvus-io/milvus/internal/util/segcore" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" - "github.com/milvus-io/milvus/pkg/util/expr" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/lifetime" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/v2/util/expr" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/lifetime" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // make sure QueryNode implements types.QueryNode diff --git a/internal/querynodev2/server_test.go b/internal/querynodev2/server_test.go index 3a48501cf8..3b3a54fb9b 100644 --- a/internal/querynodev2/server_test.go +++ b/internal/querynodev2/server_test.go @@ -37,10 +37,10 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type QueryNodeSuite struct { diff --git a/internal/querynodev2/services.go b/internal/querynodev2/services.go index 6007638ce6..b85c4b0814 100644 --- a/internal/querynodev2/services.go +++ b/internal/querynodev2/services.go @@ -39,23 +39,23 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/searchutil/scheduler" "github.com/milvus-io/milvus/internal/util/streamrpc" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // GetComponentStates returns information about whether the node is healthy diff --git a/internal/querynodev2/services_test.go b/internal/querynodev2/services_test.go index e513576c97..3e3e7f7022 100644 --- a/internal/querynodev2/services_test.go +++ b/internal/querynodev2/services_test.go @@ -44,21 +44,21 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/streamrpc" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ServiceSuite struct { diff --git a/internal/querynodev2/tasks/query_stream_task.go b/internal/querynodev2/tasks/query_stream_task.go index 348b414df2..29a0edcc27 100644 --- a/internal/querynodev2/tasks/query_stream_task.go +++ b/internal/querynodev2/tasks/query_stream_task.go @@ -7,8 +7,8 @@ import ( "github.com/milvus-io/milvus/internal/util/searchutil/scheduler" "github.com/milvus-io/milvus/internal/util/segcore" "github.com/milvus-io/milvus/internal/util/streamrpc" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) var _ scheduler.Task = &QueryStreamTask{} diff --git a/internal/querynodev2/tasks/query_task.go b/internal/querynodev2/tasks/query_task.go index d84e192182..8b772ac7bb 100644 --- a/internal/querynodev2/tasks/query_task.go +++ b/internal/querynodev2/tasks/query_task.go @@ -14,14 +14,14 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/util/searchutil/scheduler" "github.com/milvus-io/milvus/internal/util/segcore" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ scheduler.Task = &QueryTask{} diff --git a/internal/querynodev2/tasks/search_task.go b/internal/querynodev2/tasks/search_task.go index 5056ac8889..7d59beb5d7 100644 --- a/internal/querynodev2/tasks/search_task.go +++ b/internal/querynodev2/tasks/search_task.go @@ -20,15 +20,15 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/util/searchutil/scheduler" "github.com/milvus-io/milvus/internal/util/segcore" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/internal/querynodev2/tasks/search_task_test.go b/internal/querynodev2/tasks/search_task_test.go index eab7ff49c4..166decbdc9 100644 --- a/internal/querynodev2/tasks/search_task_test.go +++ b/internal/querynodev2/tasks/search_task_test.go @@ -27,7 +27,7 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) type SearchTaskSuite struct { diff --git a/internal/registry/in_mem_resolver.go b/internal/registry/in_mem_resolver.go index 5f690d6da0..6a4744b640 100644 --- a/internal/registry/in_mem_resolver.go +++ b/internal/registry/in_mem_resolver.go @@ -9,7 +9,7 @@ import ( qnClient "github.com/milvus-io/milvus/internal/distributed/querynode/client" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/wrappers" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/internal/rootcoord/alter_collection_task.go b/internal/rootcoord/alter_collection_task.go index 66b9452319..91b17dccfa 100644 --- a/internal/rootcoord/alter_collection_task.go +++ b/internal/rootcoord/alter_collection_task.go @@ -30,11 +30,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/util/proxyutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type alterCollectionTask struct { diff --git a/internal/rootcoord/alter_collection_task_test.go b/internal/rootcoord/alter_collection_task_test.go index 83c7c99860..6eca877519 100644 --- a/internal/rootcoord/alter_collection_task_test.go +++ b/internal/rootcoord/alter_collection_task_test.go @@ -30,8 +30,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" ) func Test_alterCollectionTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/alter_database_task.go b/internal/rootcoord/alter_database_task.go index 61b481c6ac..45da82c24a 100644 --- a/internal/rootcoord/alter_database_task.go +++ b/internal/rootcoord/alter_database_task.go @@ -28,13 +28,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/util/proxyutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type alterDatabaseTask struct { diff --git a/internal/rootcoord/alter_database_task_test.go b/internal/rootcoord/alter_database_task_test.go index ff2391bf39..e9428476c9 100644 --- a/internal/rootcoord/alter_database_task_test.go +++ b/internal/rootcoord/alter_database_task_test.go @@ -29,10 +29,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/metastore/model" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) func Test_alterDatabaseTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/broadcast_task.go b/internal/rootcoord/broadcast_task.go index 9dfa066748..d4f739182f 100644 --- a/internal/rootcoord/broadcast_task.go +++ b/internal/rootcoord/broadcast_task.go @@ -4,12 +4,12 @@ import ( "context" "github.com/milvus-io/milvus/internal/util/streamingutil/util" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/message/adaptor" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message/adaptor" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) var _ task = (*broadcastTask)(nil) diff --git a/internal/rootcoord/broker.go b/internal/rootcoord/broker.go index 8a74af1f65..113e04ba3d 100644 --- a/internal/rootcoord/broker.go +++ b/internal/rootcoord/broker.go @@ -27,13 +27,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type watchInfo struct { diff --git a/internal/rootcoord/broker_test.go b/internal/rootcoord/broker_test.go index e099e3025b..6e1e456135 100644 --- a/internal/rootcoord/broker_test.go +++ b/internal/rootcoord/broker_test.go @@ -29,10 +29,10 @@ import ( "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/mocks" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/proto/datapb" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func TestServerBroker_ReleaseCollection(t *testing.T) { diff --git a/internal/rootcoord/constrant.go b/internal/rootcoord/constrant.go index 199b31fb8f..ea3a4061c4 100644 --- a/internal/rootcoord/constrant.go +++ b/internal/rootcoord/constrant.go @@ -19,7 +19,7 @@ package rootcoord import ( "context" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) const ( diff --git a/internal/rootcoord/constrant_test.go b/internal/rootcoord/constrant_test.go index f4c60d3d3e..0731b0e10c 100644 --- a/internal/rootcoord/constrant_test.go +++ b/internal/rootcoord/constrant_test.go @@ -26,8 +26,8 @@ import ( "github.com/milvus-io/milvus/internal/metastore/mocks" "github.com/milvus-io/milvus/internal/metastore/model" mocktso "github.com/milvus-io/milvus/internal/tso/mocks" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestCheckGeneralCapacity(t *testing.T) { diff --git a/internal/rootcoord/create_collection_task.go b/internal/rootcoord/create_collection_task.go index ffb076ea5f..d2a344b012 100644 --- a/internal/rootcoord/create_collection_task.go +++ b/internal/rootcoord/create_collection_task.go @@ -34,17 +34,17 @@ import ( "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/util/proxyutil" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - ms "github.com/milvus-io/milvus/pkg/mq/msgstream" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/message/adaptor" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/parameterutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + ms "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message/adaptor" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/parameterutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type collectionChannels struct { diff --git a/internal/rootcoord/create_collection_task_test.go b/internal/rootcoord/create_collection_task_test.go index 3cb89b1020..b47a1070b4 100644 --- a/internal/rootcoord/create_collection_task_test.go +++ b/internal/rootcoord/create_collection_task_test.go @@ -33,12 +33,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/metastore/model" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func Test_createCollectionTask_validate(t *testing.T) { diff --git a/internal/rootcoord/create_db_task.go b/internal/rootcoord/create_db_task.go index ea926100a5..cdc0a2f9dc 100644 --- a/internal/rootcoord/create_db_task.go +++ b/internal/rootcoord/create_db_task.go @@ -21,8 +21,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type createDatabaseTask struct { diff --git a/internal/rootcoord/create_db_task_test.go b/internal/rootcoord/create_db_task_test.go index 5f83139150..1507d53bf8 100644 --- a/internal/rootcoord/create_db_task_test.go +++ b/internal/rootcoord/create_db_task_test.go @@ -28,8 +28,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func Test_CreateDBTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/create_partition_task.go b/internal/rootcoord/create_partition_task.go index e26cf068d4..a6ace87ace 100644 --- a/internal/rootcoord/create_partition_task.go +++ b/internal/rootcoord/create_partition_task.go @@ -27,8 +27,8 @@ import ( "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/util/proxyutil" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/log" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" ) type createPartitionTask struct { diff --git a/internal/rootcoord/create_partition_task_test.go b/internal/rootcoord/create_partition_task_test.go index 14b6c97783..f945dc1c1c 100644 --- a/internal/rootcoord/create_partition_task_test.go +++ b/internal/rootcoord/create_partition_task_test.go @@ -27,8 +27,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) func Test_createPartitionTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/describe_collection_task_test.go b/internal/rootcoord/describe_collection_task_test.go index f8da9bb4e7..9787762f74 100644 --- a/internal/rootcoord/describe_collection_task_test.go +++ b/internal/rootcoord/describe_collection_task_test.go @@ -27,7 +27,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) func Test_describeCollectionTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/describe_db_task.go b/internal/rootcoord/describe_db_task.go index 7f064e3164..8dff48104c 100644 --- a/internal/rootcoord/describe_db_task.go +++ b/internal/rootcoord/describe_db_task.go @@ -19,9 +19,9 @@ package rootcoord import ( "context" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // describeDBTask describe database request task diff --git a/internal/rootcoord/describe_db_task_test.go b/internal/rootcoord/describe_db_task_test.go index 71fb8b4615..69ecb6890a 100644 --- a/internal/rootcoord/describe_db_task_test.go +++ b/internal/rootcoord/describe_db_task_test.go @@ -26,8 +26,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/metastore/model" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util" ) func Test_describeDatabaseTask_Execute(t *testing.T) { diff --git a/internal/rootcoord/dml_channels.go b/internal/rootcoord/dml_channels.go index b626b6e0aa..cbf430f4e6 100644 --- a/internal/rootcoord/dml_channels.go +++ b/internal/rootcoord/dml_channels.go @@ -27,12 +27,12 @@ import ( "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type dmlMsgStream struct { diff --git a/internal/rootcoord/dml_channels_test.go b/internal/rootcoord/dml_channels_test.go index d5eb6bf441..523018e933 100644 --- a/internal/rootcoord/dml_channels_test.go +++ b/internal/rootcoord/dml_channels_test.go @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/require" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestDmlMsgStream(t *testing.T) { diff --git a/internal/rootcoord/drop_alias_task_test.go b/internal/rootcoord/drop_alias_task_test.go index d97823c952..03a6e6bca4 100644 --- a/internal/rootcoord/drop_alias_task_test.go +++ b/internal/rootcoord/drop_alias_task_test.go @@ -27,7 +27,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) func Test_dropAliasTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/drop_collection_task.go b/internal/rootcoord/drop_collection_task.go index 3f231eef37..b435ad3d87 100644 --- a/internal/rootcoord/drop_collection_task.go +++ b/internal/rootcoord/drop_collection_task.go @@ -27,10 +27,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/util/proxyutil" - "github.com/milvus-io/milvus/pkg/log" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type dropCollectionTask struct { diff --git a/internal/rootcoord/drop_collection_task_test.go b/internal/rootcoord/drop_collection_task_test.go index 5d75079c8c..f259aed26a 100644 --- a/internal/rootcoord/drop_collection_task_test.go +++ b/internal/rootcoord/drop_collection_task_test.go @@ -29,8 +29,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func Test_dropCollectionTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/drop_db_task.go b/internal/rootcoord/drop_db_task.go index e071f3b3df..918a57b65d 100644 --- a/internal/rootcoord/drop_db_task.go +++ b/internal/rootcoord/drop_db_task.go @@ -23,7 +23,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/util/proxyutil" - "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/v2/util" ) type dropDatabaseTask struct { diff --git a/internal/rootcoord/drop_db_task_test.go b/internal/rootcoord/drop_db_task_test.go index e51c5c7342..42f96f9a40 100644 --- a/internal/rootcoord/drop_db_task_test.go +++ b/internal/rootcoord/drop_db_task_test.go @@ -27,7 +27,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/v2/util" ) func Test_DropDBTask(t *testing.T) { diff --git a/internal/rootcoord/drop_partition_task.go b/internal/rootcoord/drop_partition_task.go index 0fa7037bbf..b66ce77def 100644 --- a/internal/rootcoord/drop_partition_task.go +++ b/internal/rootcoord/drop_partition_task.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/util/proxyutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" ) type dropPartitionTask struct { diff --git a/internal/rootcoord/drop_partition_task_test.go b/internal/rootcoord/drop_partition_task_test.go index 4b3e16703f..b2a5639bd7 100644 --- a/internal/rootcoord/drop_partition_task_test.go +++ b/internal/rootcoord/drop_partition_task_test.go @@ -28,7 +28,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) func Test_dropPartitionTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/expire_cache.go b/internal/rootcoord/expire_cache.go index 31bdaa4b52..ba756b1757 100644 --- a/internal/rootcoord/expire_cache.go +++ b/internal/rootcoord/expire_cache.go @@ -20,9 +20,9 @@ import ( "context" "github.com/milvus-io/milvus/internal/util/proxyutil" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // ExpireMetaCache will call invalidate collection meta cache diff --git a/internal/rootcoord/expire_cache_test.go b/internal/rootcoord/expire_cache_test.go index 8ab0513fbe..004f2579da 100644 --- a/internal/rootcoord/expire_cache_test.go +++ b/internal/rootcoord/expire_cache_test.go @@ -23,7 +23,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/util/proxyutil" - "github.com/milvus-io/milvus/pkg/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" ) func Test_expireCacheConfig_apply(t *testing.T) { diff --git a/internal/rootcoord/field_id.go b/internal/rootcoord/field_id.go index af17552970..c511ce0629 100644 --- a/internal/rootcoord/field_id.go +++ b/internal/rootcoord/field_id.go @@ -16,7 +16,7 @@ package rootcoord -import "github.com/milvus-io/milvus/pkg/common" +import "github.com/milvus-io/milvus/pkg/v2/common" // system field id: // 0: unique row id diff --git a/internal/rootcoord/garbage_collector.go b/internal/rootcoord/garbage_collector.go index 0fc9ea58b3..d5d9bd8b44 100644 --- a/internal/rootcoord/garbage_collector.go +++ b/internal/rootcoord/garbage_collector.go @@ -24,9 +24,9 @@ import ( "github.com/milvus-io/milvus/internal/distributed/streaming" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/util/streamingutil" - ms "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" + ms "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" ) //go:generate mockery --name=GarbageCollector --outpkg=mockrootcoord --filename=garbage_collector.go --with-expecter --testonly diff --git a/internal/rootcoord/garbage_collector_test.go b/internal/rootcoord/garbage_collector_test.go index 563d95c4b1..3dec0f88ff 100644 --- a/internal/rootcoord/garbage_collector_test.go +++ b/internal/rootcoord/garbage_collector_test.go @@ -33,9 +33,9 @@ import ( mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" mocktso "github.com/milvus-io/milvus/internal/tso/mocks" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func TestGarbageCollectorCtx_ReDropCollection(t *testing.T) { diff --git a/internal/rootcoord/has_collection_task.go b/internal/rootcoord/has_collection_task.go index 52a4625ef1..91eeab9e1a 100644 --- a/internal/rootcoord/has_collection_task.go +++ b/internal/rootcoord/has_collection_task.go @@ -21,7 +21,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // hasCollectionTask has collection request task diff --git a/internal/rootcoord/has_partition_task.go b/internal/rootcoord/has_partition_task.go index c4e1b47b60..646c2f3ee8 100644 --- a/internal/rootcoord/has_partition_task.go +++ b/internal/rootcoord/has_partition_task.go @@ -21,8 +21,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // hasPartitionTask has partition request task diff --git a/internal/rootcoord/has_partition_task_test.go b/internal/rootcoord/has_partition_task_test.go index 3ccc0935a3..20130c995d 100644 --- a/internal/rootcoord/has_partition_task_test.go +++ b/internal/rootcoord/has_partition_task_test.go @@ -27,7 +27,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func Test_hasPartitionTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/list_db_task.go b/internal/rootcoord/list_db_task.go index 49438db873..d74c80227a 100644 --- a/internal/rootcoord/list_db_task.go +++ b/internal/rootcoord/list_db_task.go @@ -22,11 +22,11 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/contextutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/contextutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type listDatabaseTask struct { diff --git a/internal/rootcoord/list_db_task_test.go b/internal/rootcoord/list_db_task_test.go index e7c1774a3b..73797988ef 100644 --- a/internal/rootcoord/list_db_task_test.go +++ b/internal/rootcoord/list_db_task_test.go @@ -30,9 +30,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func Test_ListDBTask(t *testing.T) { diff --git a/internal/rootcoord/meta_table.go b/internal/rootcoord/meta_table.go index b4b71947a9..c67ceea93b 100644 --- a/internal/rootcoord/meta_table.go +++ b/internal/rootcoord/meta_table.go @@ -31,18 +31,18 @@ import ( "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/tso" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/contextutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/contextutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) //go:generate mockery --name=IMetaTable --structname=MockIMetaTable --output=./ --filename=mock_meta_table.go --with-expecter --inpackage diff --git a/internal/rootcoord/meta_table_test.go b/internal/rootcoord/meta_table_test.go index f5d4db657d..c4b49e0d10 100644 --- a/internal/rootcoord/meta_table_test.go +++ b/internal/rootcoord/meta_table_test.go @@ -33,13 +33,13 @@ import ( "github.com/milvus-io/milvus/internal/metastore/mocks" "github.com/milvus-io/milvus/internal/metastore/model" mocktso "github.com/milvus-io/milvus/internal/tso/mocks" - "github.com/milvus-io/milvus/pkg/common" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func generateMetaTable(t *testing.T) *MetaTable { diff --git a/internal/rootcoord/metrics_info.go b/internal/rootcoord/metrics_info.go index 0a9e8deebf..f125f1509f 100644 --- a/internal/rootcoord/metrics_info.go +++ b/internal/rootcoord/metrics_info.go @@ -22,11 +22,11 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func (c *Core) getSystemInfoMetrics(ctx context.Context, req *milvuspb.GetMetricsRequest) (string, error) { diff --git a/internal/rootcoord/mock_test.go b/internal/rootcoord/mock_test.go index b22ddcd958..1ece91b48a 100644 --- a/internal/rootcoord/mock_test.go +++ b/internal/rootcoord/mock_test.go @@ -36,19 +36,19 @@ import ( "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/proxyutil" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/rootcoord/mocks/meta_table.go b/internal/rootcoord/mocks/meta_table.go index f6b60d53a0..95970ae88b 100644 --- a/internal/rootcoord/mocks/meta_table.go +++ b/internal/rootcoord/mocks/meta_table.go @@ -5,8 +5,8 @@ package mockrootcoord import ( context "context" - etcdpb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + etcdpb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" @@ -14,7 +14,7 @@ import ( model "github.com/milvus-io/milvus/internal/metastore/model" - rootcoordpb "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" + rootcoordpb "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" ) // IMetaTable is an autogenerated mock type for the IMetaTable type diff --git a/internal/rootcoord/name_db.go b/internal/rootcoord/name_db.go index 4d839ebf47..a40de205a5 100644 --- a/internal/rootcoord/name_db.go +++ b/internal/rootcoord/name_db.go @@ -21,8 +21,8 @@ import ( "golang.org/x/exp/maps" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type nameDb struct { diff --git a/internal/rootcoord/quota_center.go b/internal/rootcoord/quota_center.go index 6c57216f0c..b48afab78c 100644 --- a/internal/rootcoord/quota_center.go +++ b/internal/rootcoord/quota_center.go @@ -38,18 +38,18 @@ import ( "github.com/milvus-io/milvus/internal/util/proxyutil" "github.com/milvus-io/milvus/internal/util/quota" rlinternal "github.com/milvus-io/milvus/internal/util/ratelimitutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/ratelimitutil" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/rootcoord/quota_center_test.go b/internal/rootcoord/quota_center_test.go index 7ec4ea9482..8eddba2ac5 100644 --- a/internal/rootcoord/quota_center_test.go +++ b/internal/rootcoord/quota_center_test.go @@ -39,16 +39,16 @@ import ( mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" "github.com/milvus-io/milvus/internal/util/proxyutil" interalratelimitutil "github.com/milvus-io/milvus/internal/util/ratelimitutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/ratelimitutil" - "github.com/milvus-io/milvus/pkg/util/testutils" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestQuotaCenter(t *testing.T) { diff --git a/internal/rootcoord/rbac_task.go b/internal/rootcoord/rbac_task.go index 6b8ea05a4e..70073cde0c 100644 --- a/internal/rootcoord/rbac_task.go +++ b/internal/rootcoord/rbac_task.go @@ -27,12 +27,12 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func executeDeleteCredentialTaskSteps(ctx context.Context, core *Core, username string) error { diff --git a/internal/rootcoord/redo.go b/internal/rootcoord/redo.go index 72406ee296..af6d7266a8 100644 --- a/internal/rootcoord/redo.go +++ b/internal/rootcoord/redo.go @@ -21,7 +21,7 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) type baseRedoTask struct { diff --git a/internal/rootcoord/root_coord.go b/internal/rootcoord/root_coord.go index 0181c2bc55..c9897b6a25 100644 --- a/internal/rootcoord/root_coord.go +++ b/internal/rootcoord/root_coord.go @@ -54,26 +54,26 @@ import ( "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/streamingutil" tsoutil2 "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/expr" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/expr" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // UniqueID is an alias of typeutil.UniqueID. diff --git a/internal/rootcoord/root_coord_test.go b/internal/rootcoord/root_coord_test.go index 7e9970aefe..58459902dd 100644 --- a/internal/rootcoord/root_coord_test.go +++ b/internal/rootcoord/root_coord_test.go @@ -40,19 +40,19 @@ import ( kvfactory "github.com/milvus-io/milvus/internal/util/dependency/kv" "github.com/milvus-io/milvus/internal/util/proxyutil" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tikv" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tikv" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestMain(m *testing.M) { diff --git a/internal/rootcoord/scheduler.go b/internal/rootcoord/scheduler.go index 9ce202a6eb..2a6dc1ff48 100644 --- a/internal/rootcoord/scheduler.go +++ b/internal/rootcoord/scheduler.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/tso" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type IScheduler interface { diff --git a/internal/rootcoord/scheduler_test.go b/internal/rootcoord/scheduler_test.go index a5f782d0dc..7420e738e5 100644 --- a/internal/rootcoord/scheduler_test.go +++ b/internal/rootcoord/scheduler_test.go @@ -32,8 +32,8 @@ import ( "github.com/milvus-io/milvus/internal/allocator" mocktso "github.com/milvus-io/milvus/internal/tso/mocks" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type mockFailTask struct { diff --git a/internal/rootcoord/show_collection_task.go b/internal/rootcoord/show_collection_task.go index 92eeaad4a6..959703aa20 100644 --- a/internal/rootcoord/show_collection_task.go +++ b/internal/rootcoord/show_collection_task.go @@ -24,12 +24,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/contextutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/contextutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // showCollectionTask show collection request task diff --git a/internal/rootcoord/show_collection_task_test.go b/internal/rootcoord/show_collection_task_test.go index b18792b0ad..0695860915 100644 --- a/internal/rootcoord/show_collection_task_test.go +++ b/internal/rootcoord/show_collection_task_test.go @@ -28,9 +28,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) func Test_showCollectionTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/show_partition_task.go b/internal/rootcoord/show_partition_task.go index 51ca382cd6..285277d068 100644 --- a/internal/rootcoord/show_partition_task.go +++ b/internal/rootcoord/show_partition_task.go @@ -22,9 +22,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // showPartitionTask show partition request task diff --git a/internal/rootcoord/show_partition_task_test.go b/internal/rootcoord/show_partition_task_test.go index 94b03bf3e9..4722df3954 100644 --- a/internal/rootcoord/show_partition_task_test.go +++ b/internal/rootcoord/show_partition_task_test.go @@ -27,8 +27,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func Test_showPartitionTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/step.go b/internal/rootcoord/step.go index 4cfce37bec..3af8d52078 100644 --- a/internal/rootcoord/step.go +++ b/internal/rootcoord/step.go @@ -29,10 +29,10 @@ import ( "github.com/milvus-io/milvus/internal/distributed/streaming" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/util/proxyutil" - "github.com/milvus-io/milvus/pkg/log" - pb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/log" + pb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" ) type stepPriority int diff --git a/internal/rootcoord/step_executor.go b/internal/rootcoord/step_executor.go index bbadf6252e..bce2246097 100644 --- a/internal/rootcoord/step_executor.go +++ b/internal/rootcoord/step_executor.go @@ -24,8 +24,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) const ( diff --git a/internal/rootcoord/step_executor_test.go b/internal/rootcoord/step_executor_test.go index 29d3d47848..ca3c76a1a6 100644 --- a/internal/rootcoord/step_executor_test.go +++ b/internal/rootcoord/step_executor_test.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) type mockChildStep struct{} diff --git a/internal/rootcoord/task.go b/internal/rootcoord/task.go index 5f9765b6b6..dc075afe17 100644 --- a/internal/rootcoord/task.go +++ b/internal/rootcoord/task.go @@ -24,8 +24,8 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) type LockLevel int diff --git a/internal/rootcoord/task_test.go b/internal/rootcoord/task_test.go index 1ecb5bea53..fde3f91047 100644 --- a/internal/rootcoord/task_test.go +++ b/internal/rootcoord/task_test.go @@ -29,7 +29,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" ) func TestLockerKey(t *testing.T) { diff --git a/internal/rootcoord/timestamp_bench_test.go b/internal/rootcoord/timestamp_bench_test.go index bf47c68634..c0b6b70b08 100644 --- a/internal/rootcoord/timestamp_bench_test.go +++ b/internal/rootcoord/timestamp_bench_test.go @@ -26,11 +26,11 @@ import ( "github.com/milvus-io/milvus/internal/tso" "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func getTestEtcdCli() *clientv3.Client { diff --git a/internal/rootcoord/timeticksync.go b/internal/rootcoord/timeticksync.go index dafbf25cce..f47fd7dd14 100644 --- a/internal/rootcoord/timeticksync.go +++ b/internal/rootcoord/timeticksync.go @@ -28,14 +28,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/internal/rootcoord/timeticksync_test.go b/internal/rootcoord/timeticksync_test.go index 2b92b328e8..277b9b6e44 100644 --- a/internal/rootcoord/timeticksync_test.go +++ b/internal/rootcoord/timeticksync_test.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestTimetickSync(t *testing.T) { diff --git a/internal/rootcoord/undo.go b/internal/rootcoord/undo.go index f41e00394b..0928cbe140 100644 --- a/internal/rootcoord/undo.go +++ b/internal/rootcoord/undo.go @@ -22,7 +22,7 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) type baseUndoTask struct { diff --git a/internal/rootcoord/util.go b/internal/rootcoord/util.go index 8ee2b25463..6323c74f4a 100644 --- a/internal/rootcoord/util.go +++ b/internal/rootcoord/util.go @@ -29,13 +29,13 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/proxyutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // EqualKeyPairArray check whether 2 KeyValuePairs are equal diff --git a/internal/rootcoord/util_test.go b/internal/rootcoord/util_test.go index b3a42e3178..3fc453c129 100644 --- a/internal/rootcoord/util_test.go +++ b/internal/rootcoord/util_test.go @@ -23,9 +23,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func Test_EqualKeyPairArray(t *testing.T) { diff --git a/internal/storage/aliyun/aliyun.go b/internal/storage/aliyun/aliyun.go index 09e3a083b8..14a7b9da38 100644 --- a/internal/storage/aliyun/aliyun.go +++ b/internal/storage/aliyun/aliyun.go @@ -6,7 +6,7 @@ import ( "github.com/minio/minio-go/v7" minioCred "github.com/minio/minio-go/v7/pkg/credentials" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) const ( diff --git a/internal/storage/azure_object_storage.go b/internal/storage/azure_object_storage.go index 66890b3e20..7afef07ddf 100644 --- a/internal/storage/azure_object_storage.go +++ b/internal/storage/azure_object_storage.go @@ -31,8 +31,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) type AzureObjectStorage struct { diff --git a/internal/storage/binlog_iterator.go b/internal/storage/binlog_iterator.go index feecd6c215..40ba73d4c7 100644 --- a/internal/storage/binlog_iterator.go +++ b/internal/storage/binlog_iterator.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) var ( diff --git a/internal/storage/binlog_iterator_test.go b/internal/storage/binlog_iterator_test.go index 5a536e851f..a9f464d94d 100644 --- a/internal/storage/binlog_iterator_test.go +++ b/internal/storage/binlog_iterator_test.go @@ -25,9 +25,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func generateTestSchema() *schemapb.CollectionSchema { diff --git a/internal/storage/binlog_reader.go b/internal/storage/binlog_reader.go index 56adf2990e..55d1cb9ba6 100644 --- a/internal/storage/binlog_reader.go +++ b/internal/storage/binlog_reader.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) // BinlogReader is an object to read binlog file. Binlog file's format can be diff --git a/internal/storage/binlog_test.go b/internal/storage/binlog_test.go index f7a2fbc957..74c3a7eff3 100644 --- a/internal/storage/binlog_test.go +++ b/internal/storage/binlog_test.go @@ -28,11 +28,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" - "github.com/milvus-io/milvus/pkg/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/uniquegenerator" ) /* #nosec G103 */ diff --git a/internal/storage/binlog_util.go b/internal/storage/binlog_util.go index b4f3aa5311..5813ff86aa 100644 --- a/internal/storage/binlog_util.go +++ b/internal/storage/binlog_util.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) // ParseSegmentIDByBinlog parse segment id from binlog paths diff --git a/internal/storage/binlog_writer.go b/internal/storage/binlog_writer.go index 4b3d1d31b9..38e4934f42 100644 --- a/internal/storage/binlog_writer.go +++ b/internal/storage/binlog_writer.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) // BinlogType is to distinguish different files saving different data. diff --git a/internal/storage/data_codec.go b/internal/storage/data_codec.go index a5ac4d79d1..099941e5b3 100644 --- a/internal/storage/data_codec.go +++ b/internal/storage/data_codec.go @@ -26,11 +26,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/storage/data_codec_test.go b/internal/storage/data_codec_test.go index 72a6b8fb82..7d594b1147 100644 --- a/internal/storage/data_codec_test.go +++ b/internal/storage/data_codec_test.go @@ -27,10 +27,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/storage/data_sorter.go b/internal/storage/data_sorter.go index c7e1d3dd88..79bb1bdb67 100644 --- a/internal/storage/data_sorter.go +++ b/internal/storage/data_sorter.go @@ -18,7 +18,7 @@ package storage import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) // DataSorter sorts insert data diff --git a/internal/storage/data_sorter_test.go b/internal/storage/data_sorter_test.go index 12f0e72d4e..4e74041e8e 100644 --- a/internal/storage/data_sorter_test.go +++ b/internal/storage/data_sorter_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestDataSorter(t *testing.T) { diff --git a/internal/storage/delta_data.go b/internal/storage/delta_data.go index 5dc0b4f812..4feafde54c 100644 --- a/internal/storage/delta_data.go +++ b/internal/storage/delta_data.go @@ -27,7 +27,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // parserPool use object pooling to reduce fastjson.Parser allocation. diff --git a/internal/storage/event_data.go b/internal/storage/event_data.go index 9ee6622438..0c10c84e41 100644 --- a/internal/storage/event_data.go +++ b/internal/storage/event_data.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/storage/event_header.go b/internal/storage/event_header.go index 20f2b99eeb..3e36bbd279 100644 --- a/internal/storage/event_header.go +++ b/internal/storage/event_header.go @@ -21,9 +21,9 @@ import ( "io" "time" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type baseEventHeader struct { diff --git a/internal/storage/event_test.go b/internal/storage/event_test.go index 02eecc6162..fe4950904f 100644 --- a/internal/storage/event_test.go +++ b/internal/storage/event_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) /* #nosec G103 */ diff --git a/internal/storage/event_writer.go b/internal/storage/event_writer.go index 495bab0c76..b4d6f10aa0 100644 --- a/internal/storage/event_writer.go +++ b/internal/storage/event_writer.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) // EventTypeCode represents event type by code diff --git a/internal/storage/event_writer_test.go b/internal/storage/event_writer_test.go index 160bd78666..77ed1329e7 100644 --- a/internal/storage/event_writer_test.go +++ b/internal/storage/event_writer_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) func TestEventTypeCode_String(t *testing.T) { diff --git a/internal/storage/factory.go b/internal/storage/factory.go index f0fe8df10b..1d9f433c19 100644 --- a/internal/storage/factory.go +++ b/internal/storage/factory.go @@ -5,7 +5,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type ChunkManagerFactory struct { diff --git a/internal/storage/field_stats.go b/internal/storage/field_stats.go index df8dee82a2..b08769aca5 100644 --- a/internal/storage/field_stats.go +++ b/internal/storage/field_stats.go @@ -24,10 +24,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/bloomfilter" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // FieldStats contains statistics data for any column diff --git a/internal/storage/field_stats_test.go b/internal/storage/field_stats_test.go index 0a5f9cfdfd..c1e788771a 100644 --- a/internal/storage/field_stats_test.go +++ b/internal/storage/field_stats_test.go @@ -24,9 +24,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/bloomfilter" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestFieldStatsUpdate(t *testing.T) { diff --git a/internal/storage/field_value.go b/internal/storage/field_value.go index b5b746f6bc..d95011f907 100644 --- a/internal/storage/field_value.go +++ b/internal/storage/field_value.go @@ -23,9 +23,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type ScalarFieldValue interface { diff --git a/internal/storage/gcp_native_object_storage.go b/internal/storage/gcp_native_object_storage.go index 68e4c1a42d..cf94101332 100644 --- a/internal/storage/gcp_native_object_storage.go +++ b/internal/storage/gcp_native_object_storage.go @@ -30,9 +30,9 @@ import ( "google.golang.org/api/option" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) type GcpNativeObjectStorage struct { diff --git a/internal/storage/index_data_codec.go b/internal/storage/index_data_codec.go index be53f156e2..adfa5fbb28 100644 --- a/internal/storage/index_data_codec.go +++ b/internal/storage/index_data_codec.go @@ -26,8 +26,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type IndexFileBinlogCodec struct{} diff --git a/internal/storage/index_data_codec_test.go b/internal/storage/index_data_codec_test.go index c1759ee970..143f3a0da0 100644 --- a/internal/storage/index_data_codec_test.go +++ b/internal/storage/index_data_codec_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/uniquegenerator" ) func TestIndexFileBinlogCodec(t *testing.T) { diff --git a/internal/storage/insert_data.go b/internal/storage/insert_data.go index f7125fe19c..a6c6481595 100644 --- a/internal/storage/insert_data.go +++ b/internal/storage/insert_data.go @@ -23,9 +23,9 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // TODO: fill it diff --git a/internal/storage/insert_data_test.go b/internal/storage/insert_data_test.go index b8069be880..76cbd22aac 100644 --- a/internal/storage/insert_data_test.go +++ b/internal/storage/insert_data_test.go @@ -7,9 +7,9 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestInsertDataSuite(t *testing.T) { diff --git a/internal/storage/local_chunk_manager.go b/internal/storage/local_chunk_manager.go index 39399fb1c9..829249f661 100644 --- a/internal/storage/local_chunk_manager.go +++ b/internal/storage/local_chunk_manager.go @@ -28,8 +28,8 @@ import ( "go.uber.org/zap" "golang.org/x/exp/mmap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // LocalChunkManager is responsible for read and write local file. diff --git a/internal/storage/minio_object_storage.go b/internal/storage/minio_object_storage.go index 379222e4b2..ea15cc2d9f 100644 --- a/internal/storage/minio_object_storage.go +++ b/internal/storage/minio_object_storage.go @@ -30,9 +30,9 @@ import ( "github.com/milvus-io/milvus/internal/storage/aliyun" "github.com/milvus-io/milvus/internal/storage/gcp" "github.com/milvus-io/milvus/internal/storage/tencent" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) var CheckBucketRetryAttempts uint = 20 diff --git a/internal/storage/payload_reader.go b/internal/storage/payload_reader.go index 0b748d1cc5..2d6051404a 100644 --- a/internal/storage/payload_reader.go +++ b/internal/storage/payload_reader.go @@ -17,9 +17,9 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // PayloadReader reads data from payload diff --git a/internal/storage/payload_test.go b/internal/storage/payload_test.go index b99b7b8313..53ab2ca541 100644 --- a/internal/storage/payload_test.go +++ b/internal/storage/payload_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestPayload_ReaderAndWriter(t *testing.T) { diff --git a/internal/storage/payload_writer.go b/internal/storage/payload_writer.go index f02948a545..a4bc3a9200 100644 --- a/internal/storage/payload_writer.go +++ b/internal/storage/payload_writer.go @@ -32,9 +32,9 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ PayloadWriterInterface = (*NativePayloadWriter)(nil) diff --git a/internal/storage/pk_statistics.go b/internal/storage/pk_statistics.go index e99e132a06..7732eccd5b 100644 --- a/internal/storage/pk_statistics.go +++ b/internal/storage/pk_statistics.go @@ -25,7 +25,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/bloomfilter" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) // pkStatistics contains pk field statistic information diff --git a/internal/storage/primary_key.go b/internal/storage/primary_key.go index 6a6e502769..7aaa548ac6 100644 --- a/internal/storage/primary_key.go +++ b/internal/storage/primary_key.go @@ -22,8 +22,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type PrimaryKey interface { diff --git a/internal/storage/primary_keys.go b/internal/storage/primary_keys.go index 58666356ed..3e97b6da58 100644 --- a/internal/storage/primary_keys.go +++ b/internal/storage/primary_keys.go @@ -20,7 +20,7 @@ import ( "github.com/samber/lo" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // PrimaryKeys is the interface holding a slice of PrimaryKey diff --git a/internal/storage/print_binlog.go b/internal/storage/print_binlog.go index 9df9d31d60..28f335a7cd 100644 --- a/internal/storage/print_binlog.go +++ b/internal/storage/print_binlog.go @@ -27,7 +27,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) // PrintBinlogFiles call printBinlogFile in turn for the file list specified by parameter fileList. diff --git a/internal/storage/print_binlog_test.go b/internal/storage/print_binlog_test.go index 5ac813f8a1..a60dcaae71 100644 --- a/internal/storage/print_binlog_test.go +++ b/internal/storage/print_binlog_test.go @@ -28,11 +28,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/uniquegenerator" ) func TestPrintBinlogFilesInt64(t *testing.T) { diff --git a/internal/storage/remote_chunk_manager.go b/internal/storage/remote_chunk_manager.go index 451b043f89..d77736c9ab 100644 --- a/internal/storage/remote_chunk_manager.go +++ b/internal/storage/remote_chunk_manager.go @@ -32,11 +32,11 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/api/googleapi" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) const ( diff --git a/internal/storage/remote_chunk_manager_test.go b/internal/storage/remote_chunk_manager_test.go index 9ab811934a..66d0dd50a7 100644 --- a/internal/storage/remote_chunk_manager_test.go +++ b/internal/storage/remote_chunk_manager_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // TODO: NewRemoteChunkManager is deprecated. Rewrite this unittest. diff --git a/internal/storage/rw.go b/internal/storage/rw.go index 3ccfec1058..642abe0baf 100644 --- a/internal/storage/rw.go +++ b/internal/storage/rw.go @@ -25,8 +25,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) const ( diff --git a/internal/storage/schema.go b/internal/storage/schema.go index e18fc53539..829d6bd95c 100644 --- a/internal/storage/schema.go +++ b/internal/storage/schema.go @@ -4,7 +4,7 @@ import ( "github.com/apache/arrow/go/v12/arrow" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func ConvertToArrowSchema(fields []*schemapb.FieldSchema) (*arrow.Schema, error) { diff --git a/internal/storage/serde.go b/internal/storage/serde.go index d0fcb54e60..2e5f3a6bcd 100644 --- a/internal/storage/serde.go +++ b/internal/storage/serde.go @@ -31,7 +31,7 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) type Record interface { diff --git a/internal/storage/serde_events.go b/internal/storage/serde_events.go index fe90c84d5e..01445fc926 100644 --- a/internal/storage/serde_events.go +++ b/internal/storage/serde_events.go @@ -33,14 +33,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/etcdpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metautil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ RecordReader = (*CompositeBinlogRecordReader)(nil) diff --git a/internal/storage/serde_events_test.go b/internal/storage/serde_events_test.go index 57fe482cf9..a51ac16bdb 100644 --- a/internal/storage/serde_events_test.go +++ b/internal/storage/serde_events_test.go @@ -37,8 +37,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" ) func TestBinlogDeserializeReader(t *testing.T) { diff --git a/internal/storage/serde_events_v2.go b/internal/storage/serde_events_v2.go index d3b80dc51b..f8e0a2257f 100644 --- a/internal/storage/serde_events_v2.go +++ b/internal/storage/serde_events_v2.go @@ -24,8 +24,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storagev2/packed" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type packedRecordReader struct { diff --git a/internal/storage/serde_events_v2_test.go b/internal/storage/serde_events_v2_test.go index 491b860e6f..8c368d3c8d 100644 --- a/internal/storage/serde_events_v2_test.go +++ b/internal/storage/serde_events_v2_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus/internal/util/initcore" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) func TestPackedSerde(t *testing.T) { diff --git a/internal/storage/serde_test.go b/internal/storage/serde_test.go index 90dbf5b5c2..28bdd4cec9 100644 --- a/internal/storage/serde_test.go +++ b/internal/storage/serde_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) type MockRecordWriter struct { diff --git a/internal/storage/sort.go b/internal/storage/sort.go index da587ae7b9..555e436bbe 100644 --- a/internal/storage/sort.go +++ b/internal/storage/sort.go @@ -27,7 +27,7 @@ import ( "github.com/apache/arrow/go/v12/arrow/memory" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func Sort(schema *schemapb.CollectionSchema, rr []RecordReader, diff --git a/internal/storage/sort_test.go b/internal/storage/sort_test.go index 39dccca4a3..5bbe5123e7 100644 --- a/internal/storage/sort_test.go +++ b/internal/storage/sort_test.go @@ -22,7 +22,7 @@ import ( "github.com/apache/arrow/go/v12/arrow/array" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) func TestSort(t *testing.T) { diff --git a/internal/storage/stats.go b/internal/storage/stats.go index 61b808667f..0488bf54d8 100644 --- a/internal/storage/stats.go +++ b/internal/storage/stats.go @@ -28,11 +28,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/bloomfilter" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // PrimaryKeyStats contains rowsWithToken data for pk column diff --git a/internal/storage/stats_test.go b/internal/storage/stats_test.go index 578ffd99ea..060344e8b5 100644 --- a/internal/storage/stats_test.go +++ b/internal/storage/stats_test.go @@ -24,9 +24,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/bloomfilter" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestStatsWriter_Int64PrimaryKey(t *testing.T) { diff --git a/internal/storage/storage_test.go b/internal/storage/storage_test.go index 9606551411..497fca4e72 100644 --- a/internal/storage/storage_test.go +++ b/internal/storage/storage_test.go @@ -20,7 +20,7 @@ import ( "os" "testing" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var Params = paramtable.Get() diff --git a/internal/storage/utils.go b/internal/storage/utils.go index 2516f08b53..b812469787 100644 --- a/internal/storage/utils.go +++ b/internal/storage/utils.go @@ -35,13 +35,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) ////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/internal/storage/utils_test.go b/internal/storage/utils_test.go index 61cd6a82e1..95243b88f2 100644 --- a/internal/storage/utils_test.go +++ b/internal/storage/utils_test.go @@ -32,10 +32,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/testutils" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestCheckTsField(t *testing.T) { diff --git a/internal/storagev2/packed/packed_test.go b/internal/storagev2/packed/packed_test.go index 04dda6dbdb..599523eef6 100644 --- a/internal/storagev2/packed/packed_test.go +++ b/internal/storagev2/packed/packed_test.go @@ -24,7 +24,7 @@ import ( "golang.org/x/exp/rand" "github.com/milvus-io/milvus/internal/util/initcore" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestPackedReadAndWrite(t *testing.T) { diff --git a/internal/storagev2/packed/util.go b/internal/storagev2/packed/util.go index c96e5d8e22..3812089759 100644 --- a/internal/storagev2/packed/util.go +++ b/internal/storagev2/packed/util.go @@ -29,7 +29,7 @@ import "C" import ( "unsafe" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func ConsumeCStatusIntoError(status *C.CStatus) error { diff --git a/internal/streamingcoord/client/assignment/assignment_impl.go b/internal/streamingcoord/client/assignment/assignment_impl.go index 4d18614310..bfb0823915 100644 --- a/internal/streamingcoord/client/assignment/assignment_impl.go +++ b/internal/streamingcoord/client/assignment/assignment_impl.go @@ -10,11 +10,11 @@ import ( "github.com/milvus-io/milvus/internal/util/streamingutil/service/lazygrpc" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // NewAssignmentService creates a new assignment service. diff --git a/internal/streamingcoord/client/assignment/assignment_test.go b/internal/streamingcoord/client/assignment/assignment_test.go index debde50b92..708b97ad03 100644 --- a/internal/streamingcoord/client/assignment/assignment_test.go +++ b/internal/streamingcoord/client/assignment/assignment_test.go @@ -12,10 +12,10 @@ import ( "github.com/milvus-io/milvus/internal/mocks/util/streamingutil/service/mock_lazygrpc" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/mocks/proto/mock_streamingpb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/mocks/proto/mock_streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestAssignmentService(t *testing.T) { diff --git a/internal/streamingcoord/client/assignment/discoverer.go b/internal/streamingcoord/client/assignment/discoverer.go index 94fbd406ba..18313bcc05 100644 --- a/internal/streamingcoord/client/assignment/discoverer.go +++ b/internal/streamingcoord/client/assignment/discoverer.go @@ -5,10 +5,10 @@ import ( "sync" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // newAssignmentDiscoverClient creates a new assignment discover client. diff --git a/internal/streamingcoord/client/assignment/watcher.go b/internal/streamingcoord/client/assignment/watcher.go index 6fefe97a82..a3c3f035c1 100644 --- a/internal/streamingcoord/client/assignment/watcher.go +++ b/internal/streamingcoord/client/assignment/watcher.go @@ -6,9 +6,9 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ErrWatcherClosed = errors.New("watcher is closed") diff --git a/internal/streamingcoord/client/broadcast/broadcast_impl.go b/internal/streamingcoord/client/broadcast/broadcast_impl.go index 7538fcd4cd..640a6945c0 100644 --- a/internal/streamingcoord/client/broadcast/broadcast_impl.go +++ b/internal/streamingcoord/client/broadcast/broadcast_impl.go @@ -5,12 +5,12 @@ import ( "time" "github.com/milvus-io/milvus/internal/util/streamingutil/service/lazygrpc" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var logger = log.With(log.FieldComponent("broadcast-client")) diff --git a/internal/streamingcoord/client/broadcast/broadcast_test.go b/internal/streamingcoord/client/broadcast/broadcast_test.go index e335523bec..518a76dccb 100644 --- a/internal/streamingcoord/client/broadcast/broadcast_test.go +++ b/internal/streamingcoord/client/broadcast/broadcast_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" ) func TestBroadcast(t *testing.T) { diff --git a/internal/streamingcoord/client/broadcast/grpc_watcher.go b/internal/streamingcoord/client/broadcast/grpc_watcher.go index 4f98f162fb..273c43637c 100644 --- a/internal/streamingcoord/client/broadcast/grpc_watcher.go +++ b/internal/streamingcoord/client/broadcast/grpc_watcher.go @@ -9,11 +9,11 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/util/streamingutil/service/lazygrpc" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type grpcWatcherBuilder struct { diff --git a/internal/streamingcoord/client/broadcast/grpc_watcher_test.go b/internal/streamingcoord/client/broadcast/grpc_watcher_test.go index 0d5237d982..8e540c1a80 100644 --- a/internal/streamingcoord/client/broadcast/grpc_watcher_test.go +++ b/internal/streamingcoord/client/broadcast/grpc_watcher_test.go @@ -12,11 +12,11 @@ import ( "github.com/milvus-io/milvus/internal/mocks/util/streamingutil/service/mock_lazygrpc" "github.com/milvus-io/milvus/internal/util/streamingutil/service/lazygrpc" - "github.com/milvus-io/milvus/pkg/mocks/proto/mock_streamingpb" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/mocks/proto/mock_streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" ) func TestWatcher(t *testing.T) { diff --git a/internal/streamingcoord/client/broadcast/watcher.go b/internal/streamingcoord/client/broadcast/watcher.go index bc98f92750..5a69eaabf6 100644 --- a/internal/streamingcoord/client/broadcast/watcher.go +++ b/internal/streamingcoord/client/broadcast/watcher.go @@ -3,7 +3,7 @@ package broadcast import ( "context" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) type WatcherBuilder interface { diff --git a/internal/streamingcoord/client/broadcast/watcher_resuming.go b/internal/streamingcoord/client/broadcast/watcher_resuming.go index 077f3786c5..0e6d699f7e 100644 --- a/internal/streamingcoord/client/broadcast/watcher_resuming.go +++ b/internal/streamingcoord/client/broadcast/watcher_resuming.go @@ -7,10 +7,10 @@ import ( "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var errWatcherClosed = errors.New("watcher is closed") diff --git a/internal/streamingcoord/client/broadcast/watcher_resuming_test.go b/internal/streamingcoord/client/broadcast/watcher_resuming_test.go index 60cbfb1e5a..3c6dbdc177 100644 --- a/internal/streamingcoord/client/broadcast/watcher_resuming_test.go +++ b/internal/streamingcoord/client/broadcast/watcher_resuming_test.go @@ -14,9 +14,9 @@ import ( "go.uber.org/atomic" "github.com/milvus-io/milvus/internal/mocks/streamingcoord/client/mock_broadcast" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type mockBuilder struct { diff --git a/internal/streamingcoord/client/client.go b/internal/streamingcoord/client/client.go index 2537bea20b..e2d8f2dff8 100644 --- a/internal/streamingcoord/client/client.go +++ b/internal/streamingcoord/client/client.go @@ -19,13 +19,13 @@ import ( "github.com/milvus-io/milvus/internal/util/streamingutil/service/lazygrpc" "github.com/milvus-io/milvus/internal/util/streamingutil/service/resolver" "github.com/milvus-io/milvus/internal/util/streamingutil/util" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util/interceptor" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util/interceptor" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ Client = (*clientImpl)(nil) diff --git a/internal/streamingcoord/client/client_test.go b/internal/streamingcoord/client/client_test.go index a3210b63c9..494034eb60 100644 --- a/internal/streamingcoord/client/client_test.go +++ b/internal/streamingcoord/client/client_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestDial(t *testing.T) { diff --git a/internal/streamingcoord/server/balancer/balancer.go b/internal/streamingcoord/server/balancer/balancer.go index 98d2bd85bc..ca66752fcc 100644 --- a/internal/streamingcoord/server/balancer/balancer.go +++ b/internal/streamingcoord/server/balancer/balancer.go @@ -5,8 +5,8 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/internal/streamingcoord/server/balancer/balancer_impl.go b/internal/streamingcoord/server/balancer/balancer_impl.go index 7d827121cc..ecc699d003 100644 --- a/internal/streamingcoord/server/balancer/balancer_impl.go +++ b/internal/streamingcoord/server/balancer/balancer_impl.go @@ -11,12 +11,12 @@ import ( "github.com/milvus-io/milvus/internal/streamingcoord/server/balancer/channel" "github.com/milvus-io/milvus/internal/streamingcoord/server/resource" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/contextutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/contextutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // RecoverBalancer recover the balancer working. diff --git a/internal/streamingcoord/server/balancer/balancer_test.go b/internal/streamingcoord/server/balancer/balancer_test.go index 427d993f50..445e2c4e3c 100644 --- a/internal/streamingcoord/server/balancer/balancer_test.go +++ b/internal/streamingcoord/server/balancer/balancer_test.go @@ -14,11 +14,11 @@ import ( "github.com/milvus-io/milvus/internal/streamingcoord/server/balancer" _ "github.com/milvus-io/milvus/internal/streamingcoord/server/balancer/policy" "github.com/milvus-io/milvus/internal/streamingcoord/server/resource" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestBalancer(t *testing.T) { diff --git a/internal/streamingcoord/server/balancer/channel/manager.go b/internal/streamingcoord/server/balancer/channel/manager.go index dd8bd8163d..779303aee6 100644 --- a/internal/streamingcoord/server/balancer/channel/manager.go +++ b/internal/streamingcoord/server/balancer/channel/manager.go @@ -7,11 +7,11 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus/internal/streamingcoord/server/resource" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ErrChannelNotExist = errors.New("channel not exist") diff --git a/internal/streamingcoord/server/balancer/channel/manager_test.go b/internal/streamingcoord/server/balancer/channel/manager_test.go index 0d948d8792..e3cf441178 100644 --- a/internal/streamingcoord/server/balancer/channel/manager_test.go +++ b/internal/streamingcoord/server/balancer/channel/manager_test.go @@ -10,9 +10,9 @@ import ( "github.com/milvus-io/milvus/internal/mocks/mock_metastore" "github.com/milvus-io/milvus/internal/streamingcoord/server/resource" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestChannelManager(t *testing.T) { diff --git a/internal/streamingcoord/server/balancer/channel/metrics.go b/internal/streamingcoord/server/balancer/channel/metrics.go index 9d9c01d9ff..f2b757c5d6 100644 --- a/internal/streamingcoord/server/balancer/channel/metrics.go +++ b/internal/streamingcoord/server/balancer/channel/metrics.go @@ -5,10 +5,10 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func newPChannelMetrics() *channelMetrics { diff --git a/internal/streamingcoord/server/balancer/channel/pchannel.go b/internal/streamingcoord/server/balancer/channel/pchannel.go index 90fcafc56a..b64647ed7d 100644 --- a/internal/streamingcoord/server/balancer/channel/pchannel.go +++ b/internal/streamingcoord/server/balancer/channel/pchannel.go @@ -3,8 +3,8 @@ package channel import ( "google.golang.org/protobuf/proto" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) // newPChannelMeta creates a new PChannelMeta. diff --git a/internal/streamingcoord/server/balancer/channel/pchannel_test.go b/internal/streamingcoord/server/balancer/channel/pchannel_test.go index b5feda9261..ef70ae5ab1 100644 --- a/internal/streamingcoord/server/balancer/channel/pchannel_test.go +++ b/internal/streamingcoord/server/balancer/channel/pchannel_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) func TestPChannel(t *testing.T) { diff --git a/internal/streamingcoord/server/balancer/policy/pchannel_count_fair.go b/internal/streamingcoord/server/balancer/policy/pchannel_count_fair.go index aa7e6daa6b..30bfd4b68f 100644 --- a/internal/streamingcoord/server/balancer/policy/pchannel_count_fair.go +++ b/internal/streamingcoord/server/balancer/policy/pchannel_count_fair.go @@ -4,7 +4,7 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus/internal/streamingcoord/server/balancer" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) var _ balancer.Policy = &pchannelCountFairPolicy{} diff --git a/internal/streamingcoord/server/balancer/policy/pchannel_count_fair_test.go b/internal/streamingcoord/server/balancer/policy/pchannel_count_fair_test.go index 48c1c2881f..fd0b2aa483 100644 --- a/internal/streamingcoord/server/balancer/policy/pchannel_count_fair_test.go +++ b/internal/streamingcoord/server/balancer/policy/pchannel_count_fair_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus/internal/streamingcoord/server/balancer" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) func TestPChannelCountFair(t *testing.T) { diff --git a/internal/streamingcoord/server/balancer/policy_registry.go b/internal/streamingcoord/server/balancer/policy_registry.go index a198627cc2..df01b19d08 100644 --- a/internal/streamingcoord/server/balancer/policy_registry.go +++ b/internal/streamingcoord/server/balancer/policy_registry.go @@ -1,8 +1,8 @@ package balancer import ( - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // policies is a map of registered balancer policies. diff --git a/internal/streamingcoord/server/balancer/request.go b/internal/streamingcoord/server/balancer/request.go index 2693cc40d9..d42a6ebb7b 100644 --- a/internal/streamingcoord/server/balancer/request.go +++ b/internal/streamingcoord/server/balancer/request.go @@ -3,8 +3,8 @@ package balancer import ( "context" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) // request is a operation request. diff --git a/internal/streamingcoord/server/broadcaster/broadcast_manager.go b/internal/streamingcoord/server/broadcaster/broadcast_manager.go index edbc4b72f4..8db4754e6f 100644 --- a/internal/streamingcoord/server/broadcaster/broadcast_manager.go +++ b/internal/streamingcoord/server/broadcaster/broadcast_manager.go @@ -10,10 +10,10 @@ import ( "github.com/milvus-io/milvus/internal/streamingcoord/server/resource" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) // newBroadcastTaskManager creates a new broadcast task manager with recovery info. diff --git a/internal/streamingcoord/server/broadcaster/broadcast_task.go b/internal/streamingcoord/server/broadcaster/broadcast_task.go index a73e00f265..fef0e91852 100644 --- a/internal/streamingcoord/server/broadcaster/broadcast_task.go +++ b/internal/streamingcoord/server/broadcaster/broadcast_task.go @@ -9,10 +9,10 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus/internal/streamingcoord/server/resource" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) // newBroadcastTaskFromProto creates a new broadcast task from the proto. diff --git a/internal/streamingcoord/server/broadcaster/broadcaster.go b/internal/streamingcoord/server/broadcaster/broadcaster.go index 8a5a333375..c1328f7c20 100644 --- a/internal/streamingcoord/server/broadcaster/broadcaster.go +++ b/internal/streamingcoord/server/broadcaster/broadcaster.go @@ -4,8 +4,8 @@ import ( "context" "github.com/milvus-io/milvus/internal/streamingcoord/server/broadcaster/registry" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) type Broadcaster interface { diff --git a/internal/streamingcoord/server/broadcaster/broadcaster_impl.go b/internal/streamingcoord/server/broadcaster/broadcaster_impl.go index 7bedcd3ece..63ea16268c 100644 --- a/internal/streamingcoord/server/broadcaster/broadcaster_impl.go +++ b/internal/streamingcoord/server/broadcaster/broadcaster_impl.go @@ -9,14 +9,14 @@ import ( "github.com/milvus-io/milvus/internal/streamingcoord/server/resource" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/contextutil" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/contextutil" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func RecoverBroadcaster( diff --git a/internal/streamingcoord/server/broadcaster/broadcaster_test.go b/internal/streamingcoord/server/broadcaster/broadcaster_test.go index e66c8ffd24..e253401a68 100644 --- a/internal/streamingcoord/server/broadcaster/broadcaster_test.go +++ b/internal/streamingcoord/server/broadcaster/broadcaster_test.go @@ -20,14 +20,14 @@ import ( internaltypes "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/idalloc" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestBroadcaster(t *testing.T) { diff --git a/internal/streamingcoord/server/broadcaster/registry/append_operator.go b/internal/streamingcoord/server/broadcaster/registry/append_operator.go index e5e59d8bce..7c9b40cb3b 100644 --- a/internal/streamingcoord/server/broadcaster/registry/append_operator.go +++ b/internal/streamingcoord/server/broadcaster/registry/append_operator.go @@ -4,9 +4,9 @@ import ( "context" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) type AppendOperatorType int diff --git a/internal/streamingcoord/server/broadcaster/registry/test_utility.go b/internal/streamingcoord/server/broadcaster/registry/test_utility.go index 1e555ff261..708eaaf2c7 100644 --- a/internal/streamingcoord/server/broadcaster/registry/test_utility.go +++ b/internal/streamingcoord/server/broadcaster/registry/test_utility.go @@ -3,7 +3,7 @@ package registry -import "github.com/milvus-io/milvus/pkg/util/syncutil" +import "github.com/milvus-io/milvus/pkg/v2/util/syncutil" func ResetRegistration() { localRegistry = make(map[AppendOperatorType]*syncutil.Future[AppendOperator]) diff --git a/internal/streamingcoord/server/broadcaster/task.go b/internal/streamingcoord/server/broadcaster/task.go index f74eb94ff0..9f11709f43 100644 --- a/internal/streamingcoord/server/broadcaster/task.go +++ b/internal/streamingcoord/server/broadcaster/task.go @@ -7,10 +7,10 @@ import ( "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var errBroadcastTaskIsNotDone = errors.New("broadcast task is not done") diff --git a/internal/streamingcoord/server/broadcaster/watcher.go b/internal/streamingcoord/server/broadcaster/watcher.go index e5c9e1e62f..02b5ccf1b0 100644 --- a/internal/streamingcoord/server/broadcaster/watcher.go +++ b/internal/streamingcoord/server/broadcaster/watcher.go @@ -5,9 +5,9 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) // newWatcher creates a new watcher. diff --git a/internal/streamingcoord/server/builder.go b/internal/streamingcoord/server/builder.go index dcbb5eeb4c..199c0575ea 100644 --- a/internal/streamingcoord/server/builder.go +++ b/internal/streamingcoord/server/builder.go @@ -10,9 +10,9 @@ import ( "github.com/milvus-io/milvus/internal/streamingcoord/server/service" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) type ServerBuilder struct { diff --git a/internal/streamingcoord/server/resource/resource.go b/internal/streamingcoord/server/resource/resource.go index 96a92e3727..939bd5fedd 100644 --- a/internal/streamingcoord/server/resource/resource.go +++ b/internal/streamingcoord/server/resource/resource.go @@ -9,9 +9,9 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/client/manager" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/idalloc" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var r *resourceImpl // singleton resource instance diff --git a/internal/streamingcoord/server/resource/test_utility.go b/internal/streamingcoord/server/resource/test_utility.go index fad9918eb1..a3270ebb37 100644 --- a/internal/streamingcoord/server/resource/test_utility.go +++ b/internal/streamingcoord/server/resource/test_utility.go @@ -5,7 +5,7 @@ package resource import ( "github.com/milvus-io/milvus/internal/streamingnode/client/manager" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) // OptStreamingManagerClient provides streaming manager client to the resource. diff --git a/internal/streamingcoord/server/server.go b/internal/streamingcoord/server/server.go index aacf680252..1428af7e1b 100644 --- a/internal/streamingcoord/server/server.go +++ b/internal/streamingcoord/server/server.go @@ -15,10 +15,10 @@ import ( "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/streamingutil" "github.com/milvus-io/milvus/internal/util/streamingutil/util" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) // Server is the streamingcoord server. diff --git a/internal/streamingcoord/server/service/assignment.go b/internal/streamingcoord/server/service/assignment.go index e5b22e7978..fdfd126e07 100644 --- a/internal/streamingcoord/server/service/assignment.go +++ b/internal/streamingcoord/server/service/assignment.go @@ -5,10 +5,10 @@ import ( "github.com/milvus-io/milvus/internal/streamingcoord/server/balancer" "github.com/milvus-io/milvus/internal/streamingcoord/server/service/discover" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) var _ streamingpb.StreamingCoordAssignmentServiceServer = (*assignmentServiceImpl)(nil) diff --git a/internal/streamingcoord/server/service/broadcast.go b/internal/streamingcoord/server/service/broadcast.go index e903d92dba..1e5d9a2175 100644 --- a/internal/streamingcoord/server/service/broadcast.go +++ b/internal/streamingcoord/server/service/broadcast.go @@ -5,10 +5,10 @@ import ( "github.com/milvus-io/milvus/internal/streamingcoord/server/broadcaster" "github.com/milvus-io/milvus/internal/streamingcoord/server/service/broadcast" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) // BroadcastService is the interface of the broadcast service. diff --git a/internal/streamingcoord/server/service/broadcast/broadcast_watch_grpc_server_helper.go b/internal/streamingcoord/server/service/broadcast/broadcast_watch_grpc_server_helper.go index 7240f4d2c9..dd3584e452 100644 --- a/internal/streamingcoord/server/service/broadcast/broadcast_watch_grpc_server_helper.go +++ b/internal/streamingcoord/server/service/broadcast/broadcast_watch_grpc_server_helper.go @@ -1,8 +1,8 @@ package broadcast import ( - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) type broadcastWatchGrpcServerHelper struct { diff --git a/internal/streamingcoord/server/service/broadcast/broadcast_watch_server.go b/internal/streamingcoord/server/service/broadcast/broadcast_watch_server.go index 0c6d7a28ab..5886853f8d 100644 --- a/internal/streamingcoord/server/service/broadcast/broadcast_watch_server.go +++ b/internal/streamingcoord/server/service/broadcast/broadcast_watch_server.go @@ -9,8 +9,8 @@ import ( "github.com/milvus-io/milvus/internal/streamingcoord/server/broadcaster" "github.com/milvus-io/milvus/internal/streamingcoord/server/resource" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) var errClosedByUser = errors.New("closed by user") diff --git a/internal/streamingcoord/server/service/broadcast/broadcast_watch_test.go b/internal/streamingcoord/server/service/broadcast/broadcast_watch_test.go index f68762bef3..53c93aa498 100644 --- a/internal/streamingcoord/server/service/broadcast/broadcast_watch_test.go +++ b/internal/streamingcoord/server/service/broadcast/broadcast_watch_test.go @@ -9,10 +9,10 @@ import ( "github.com/milvus-io/milvus/internal/mocks/streamingcoord/server/mock_broadcaster" "github.com/milvus-io/milvus/internal/streamingcoord/server/resource" - "github.com/milvus-io/milvus/pkg/mocks/proto/mock_streamingpb" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/mocks/proto/mock_streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) func TestBroadcastWatch(t *testing.T) { diff --git a/internal/streamingcoord/server/service/discover/discover_grpc_server_helper.go b/internal/streamingcoord/server/service/discover/discover_grpc_server_helper.go index 1f323ce941..e2132212f6 100644 --- a/internal/streamingcoord/server/service/discover/discover_grpc_server_helper.go +++ b/internal/streamingcoord/server/service/discover/discover_grpc_server_helper.go @@ -1,9 +1,9 @@ package discover import ( - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // discoverGrpcServerHelper is a wrapped discover server of log messages. diff --git a/internal/streamingcoord/server/service/discover/discover_server.go b/internal/streamingcoord/server/service/discover/discover_server.go index 5c82f297e2..7230a65e09 100644 --- a/internal/streamingcoord/server/service/discover/discover_server.go +++ b/internal/streamingcoord/server/service/discover/discover_server.go @@ -9,9 +9,9 @@ import ( "github.com/milvus-io/milvus/internal/streamingcoord/server/balancer" "github.com/milvus-io/milvus/internal/streamingcoord/server/resource" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) var errClosedByUser = errors.New("closed by user") diff --git a/internal/streamingcoord/server/service/discover/discover_server_test.go b/internal/streamingcoord/server/service/discover/discover_server_test.go index 992ef29545..bc287c8ff6 100644 --- a/internal/streamingcoord/server/service/discover/discover_server_test.go +++ b/internal/streamingcoord/server/service/discover/discover_server_test.go @@ -9,10 +9,10 @@ import ( "github.com/milvus-io/milvus/internal/mocks/streamingcoord/server/mock_balancer" "github.com/milvus-io/milvus/internal/streamingcoord/server/resource" - "github.com/milvus-io/milvus/pkg/mocks/proto/mock_streamingpb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/mocks/proto/mock_streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestAssignmentDiscover(t *testing.T) { diff --git a/internal/streamingcoord/server/service_test.go b/internal/streamingcoord/server/service_test.go index f303851c82..1fdca20eb6 100644 --- a/internal/streamingcoord/server/service_test.go +++ b/internal/streamingcoord/server/service_test.go @@ -10,9 +10,9 @@ import ( etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) func TestServer(t *testing.T) { diff --git a/internal/streamingnode/client/handler/assignment/watcher.go b/internal/streamingnode/client/handler/assignment/watcher.go index ca80e8ac20..1ffe67d3e5 100644 --- a/internal/streamingnode/client/handler/assignment/watcher.go +++ b/internal/streamingnode/client/handler/assignment/watcher.go @@ -3,7 +3,7 @@ package assignment import ( "context" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) var _ Watcher = (*watcherImpl)(nil) diff --git a/internal/streamingnode/client/handler/assignment/watcher_impl.go b/internal/streamingnode/client/handler/assignment/watcher_impl.go index aa276a5b46..b375c30d00 100644 --- a/internal/streamingnode/client/handler/assignment/watcher_impl.go +++ b/internal/streamingnode/client/handler/assignment/watcher_impl.go @@ -8,9 +8,9 @@ import ( "github.com/milvus-io/milvus/internal/util/streamingutil/service/discoverer" "github.com/milvus-io/milvus/internal/util/streamingutil/service/resolver" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) func NewWatcher(r resolver.Resolver) Watcher { diff --git a/internal/streamingnode/client/handler/assignment/watcher_test.go b/internal/streamingnode/client/handler/assignment/watcher_test.go index 01d3e06983..81258129c6 100644 --- a/internal/streamingnode/client/handler/assignment/watcher_test.go +++ b/internal/streamingnode/client/handler/assignment/watcher_test.go @@ -12,8 +12,8 @@ import ( "github.com/milvus-io/milvus/internal/mocks/util/streamingutil/service/mock_resolver" "github.com/milvus-io/milvus/internal/util/streamingutil/service/attributes" "github.com/milvus-io/milvus/internal/util/streamingutil/service/discoverer" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestWatcher(t *testing.T) { diff --git a/internal/streamingnode/client/handler/consumer/consumer_impl.go b/internal/streamingnode/client/handler/consumer/consumer_impl.go index c63b53ae36..55d3befe32 100644 --- a/internal/streamingnode/client/handler/consumer/consumer_impl.go +++ b/internal/streamingnode/client/handler/consumer/consumer_impl.go @@ -11,12 +11,12 @@ import ( "github.com/milvus-io/milvus/internal/util/streamingutil/service/contextutil" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) // ConsumerOptions is the options for creating a consumer. diff --git a/internal/streamingnode/client/handler/consumer/consumer_test.go b/internal/streamingnode/client/handler/consumer/consumer_test.go index 97dfca0e33..a1fb7afd79 100644 --- a/internal/streamingnode/client/handler/consumer/consumer_test.go +++ b/internal/streamingnode/client/handler/consumer/consumer_test.go @@ -10,15 +10,15 @@ import ( "github.com/stretchr/testify/mock" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/mocks/proto/mock_streamingpb" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/message/adaptor" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/mocks/proto/mock_streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message/adaptor" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) func TestConsumer(t *testing.T) { diff --git a/internal/streamingnode/client/handler/handler_client.go b/internal/streamingnode/client/handler/handler_client.go index 9c1496dfbc..a412d2fe32 100644 --- a/internal/streamingnode/client/handler/handler_client.go +++ b/internal/streamingnode/client/handler/handler_client.go @@ -17,14 +17,14 @@ import ( streamingserviceinterceptor "github.com/milvus-io/milvus/internal/util/streamingutil/service/interceptor" "github.com/milvus-io/milvus/internal/util/streamingutil/service/lazygrpc" "github.com/milvus-io/milvus/internal/util/streamingutil/service/resolver" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util/interceptor" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util/interceptor" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/internal/streamingnode/client/handler/handler_client_impl.go b/internal/streamingnode/client/handler/handler_client_impl.go index 09ef14203b..023c76fae7 100644 --- a/internal/streamingnode/client/handler/handler_client_impl.go +++ b/internal/streamingnode/client/handler/handler_client_impl.go @@ -17,11 +17,11 @@ import ( "github.com/milvus-io/milvus/internal/util/streamingutil/service/lazygrpc" "github.com/milvus-io/milvus/internal/util/streamingutil/service/resolver" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/internal/streamingnode/client/handler/handler_client_test.go b/internal/streamingnode/client/handler/handler_client_test.go index 5773b4fc94..397046ff27 100644 --- a/internal/streamingnode/client/handler/handler_client_test.go +++ b/internal/streamingnode/client/handler/handler_client_test.go @@ -16,14 +16,14 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/client/handler/consumer" "github.com/milvus-io/milvus/internal/streamingnode/client/handler/producer" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/mocks/proto/mock_streamingpb" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_types" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message/adaptor" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/mocks/proto/mock_streamingpb" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_types" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message/adaptor" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestHandlerClient(t *testing.T) { diff --git a/internal/streamingnode/client/handler/producer/produce_grpc_client.go b/internal/streamingnode/client/handler/producer/produce_grpc_client.go index 1606bb5a80..124501f52a 100644 --- a/internal/streamingnode/client/handler/producer/produce_grpc_client.go +++ b/internal/streamingnode/client/handler/producer/produce_grpc_client.go @@ -1,9 +1,9 @@ package producer import ( - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) // produceGrpcClient is a wrapped producer server of log messages. diff --git a/internal/streamingnode/client/handler/producer/producer.go b/internal/streamingnode/client/handler/producer/producer.go index 6e31d2b479..3e59b42cc6 100644 --- a/internal/streamingnode/client/handler/producer/producer.go +++ b/internal/streamingnode/client/handler/producer/producer.go @@ -3,8 +3,8 @@ package producer import ( "context" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) var _ Producer = (*producerImpl)(nil) diff --git a/internal/streamingnode/client/handler/producer/producer_impl.go b/internal/streamingnode/client/handler/producer/producer_impl.go index dc38432128..5f678f89cc 100644 --- a/internal/streamingnode/client/handler/producer/producer_impl.go +++ b/internal/streamingnode/client/handler/producer/producer_impl.go @@ -11,11 +11,11 @@ import ( "github.com/milvus-io/milvus/internal/util/streamingutil/service/contextutil" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // ProducerOptions is the options for creating a producer. diff --git a/internal/streamingnode/client/handler/producer/producer_test.go b/internal/streamingnode/client/handler/producer/producer_test.go index ab49418100..5f0c10d9b5 100644 --- a/internal/streamingnode/client/handler/producer/producer_test.go +++ b/internal/streamingnode/client/handler/producer/producer_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/milvus-io/milvus/pkg/mocks/proto/mock_streamingpb" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/mocks/proto/mock_streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" ) func TestProducer(t *testing.T) { diff --git a/internal/streamingnode/client/handler/registry/wal_manager.go b/internal/streamingnode/client/handler/registry/wal_manager.go index 446a413989..907b63c192 100644 --- a/internal/streamingnode/client/handler/registry/wal_manager.go +++ b/internal/streamingnode/client/handler/registry/wal_manager.go @@ -6,12 +6,12 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus/internal/streamingnode/server/wal" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/internal/streamingnode/client/handler/registry/wal_manager_test.go b/internal/streamingnode/client/handler/registry/wal_manager_test.go index 4e95920d24..87384f9f82 100644 --- a/internal/streamingnode/client/handler/registry/wal_manager_test.go +++ b/internal/streamingnode/client/handler/registry/wal_manager_test.go @@ -10,10 +10,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/mocks/streamingnode/server/mock_wal" "github.com/milvus-io/milvus/internal/streamingnode/server/wal" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type mockWALManager struct { diff --git a/internal/streamingnode/client/manager/manager_client.go b/internal/streamingnode/client/manager/manager_client.go index 31459ef906..cb1aa3d40d 100644 --- a/internal/streamingnode/client/manager/manager_client.go +++ b/internal/streamingnode/client/manager/manager_client.go @@ -15,12 +15,12 @@ import ( streamingserviceinterceptor "github.com/milvus-io/milvus/internal/util/streamingutil/service/interceptor" "github.com/milvus-io/milvus/internal/util/streamingutil/service/lazygrpc" "github.com/milvus-io/milvus/internal/util/streamingutil/service/resolver" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util/interceptor" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util/interceptor" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // ManagerClient is the client to manage wal instances in all streamingnode. diff --git a/internal/streamingnode/client/manager/manager_client_impl.go b/internal/streamingnode/client/manager/manager_client_impl.go index 625d943661..47aa1c0426 100644 --- a/internal/streamingnode/client/manager/manager_client_impl.go +++ b/internal/streamingnode/client/manager/manager_client_impl.go @@ -13,10 +13,10 @@ import ( "github.com/milvus-io/milvus/internal/util/streamingutil/service/lazygrpc" "github.com/milvus-io/milvus/internal/util/streamingutil/service/resolver" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ ManagerClient = (*managerClientImpl)(nil) diff --git a/internal/streamingnode/client/manager/manager_test.go b/internal/streamingnode/client/manager/manager_test.go index d31f849ac1..c268672606 100644 --- a/internal/streamingnode/client/manager/manager_test.go +++ b/internal/streamingnode/client/manager/manager_test.go @@ -17,12 +17,12 @@ import ( "github.com/milvus-io/milvus/internal/util/streamingutil/service/attributes" "github.com/milvus-io/milvus/internal/util/streamingutil/service/contextutil" "github.com/milvus-io/milvus/internal/util/streamingutil/service/discoverer" - "github.com/milvus-io/milvus/pkg/mocks/proto/mock_streamingpb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/mocks/proto/mock_streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestManager(t *testing.T) { diff --git a/internal/streamingnode/server/builder.go b/internal/streamingnode/server/builder.go index a645c08315..c4a9ca622a 100644 --- a/internal/streamingnode/server/builder.go +++ b/internal/streamingnode/server/builder.go @@ -9,8 +9,8 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/resource" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) // ServerBuilder is used to build a server. diff --git a/internal/streamingnode/server/flusher/flusherimpl/data_service_wrapper.go b/internal/streamingnode/server/flusher/flusherimpl/data_service_wrapper.go index 9919cb0c9e..62a9a35907 100644 --- a/internal/streamingnode/server/flusher/flusherimpl/data_service_wrapper.go +++ b/internal/streamingnode/server/flusher/flusherimpl/data_service_wrapper.go @@ -4,9 +4,9 @@ import ( "context" "github.com/milvus-io/milvus/internal/flushcommon/pipeline" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/message/adaptor" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message/adaptor" ) // newDataSyncServiceWrapper creates a new data sync service wrapper. diff --git a/internal/streamingnode/server/flusher/flusherimpl/flusher_components.go b/internal/streamingnode/server/flusher/flusherimpl/flusher_components.go index 3b1d58d6c7..89267b93ca 100644 --- a/internal/streamingnode/server/flusher/flusherimpl/flusher_components.go +++ b/internal/streamingnode/server/flusher/flusherimpl/flusher_components.go @@ -18,13 +18,13 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/segment/stats" "github.com/milvus-io/milvus/internal/util/idalloc" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/message/adaptor" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message/adaptor" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) // flusherComponents is the components of the flusher. diff --git a/internal/streamingnode/server/flusher/flusherimpl/msg_handler_impl.go b/internal/streamingnode/server/flusher/flusherimpl/msg_handler_impl.go index 9d1b270897..162eeb9f7d 100644 --- a/internal/streamingnode/server/flusher/flusherimpl/msg_handler_impl.go +++ b/internal/streamingnode/server/flusher/flusherimpl/msg_handler_impl.go @@ -28,13 +28,13 @@ import ( "github.com/milvus-io/milvus/internal/flushcommon/util" "github.com/milvus-io/milvus/internal/flushcommon/writebuffer" "github.com/milvus-io/milvus/internal/streamingnode/server/resource" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) func newMsgHandler(wbMgr writebuffer.BufferManager) *msgHandlerImpl { diff --git a/internal/streamingnode/server/flusher/flusherimpl/msg_handler_impl_test.go b/internal/streamingnode/server/flusher/flusherimpl/msg_handler_impl_test.go index 58b3cda68b..0397eeecb6 100644 --- a/internal/streamingnode/server/flusher/flusherimpl/msg_handler_impl_test.go +++ b/internal/streamingnode/server/flusher/flusherimpl/msg_handler_impl_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/milvus-io/milvus/internal/flushcommon/writebuffer" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) func TestFlushMsgHandler_HandleFlush(t *testing.T) { diff --git a/internal/streamingnode/server/flusher/flusherimpl/pchannel_checkpoint.go b/internal/streamingnode/server/flusher/flusherimpl/pchannel_checkpoint.go index b708806643..65c8056a10 100644 --- a/internal/streamingnode/server/flusher/flusherimpl/pchannel_checkpoint.go +++ b/internal/streamingnode/server/flusher/flusherimpl/pchannel_checkpoint.go @@ -9,11 +9,11 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/streamingnode/server/resource" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) // recoverPChannelCheckpointManager recovers the pchannel checkpoint manager from the catalog diff --git a/internal/streamingnode/server/flusher/flusherimpl/pchannel_checkpoint_test.go b/internal/streamingnode/server/flusher/flusherimpl/pchannel_checkpoint_test.go index d18c742bda..01f3de0b1b 100644 --- a/internal/streamingnode/server/flusher/flusherimpl/pchannel_checkpoint_test.go +++ b/internal/streamingnode/server/flusher/flusherimpl/pchannel_checkpoint_test.go @@ -11,10 +11,10 @@ import ( "github.com/milvus-io/milvus/internal/mocks/mock_metastore" "github.com/milvus-io/milvus/internal/streamingnode/server/resource" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/rmq" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/rmq" ) func TestPChannelCheckpointManager(t *testing.T) { diff --git a/internal/streamingnode/server/flusher/flusherimpl/pool.go b/internal/streamingnode/server/flusher/flusherimpl/pool.go index fcf527da2d..3445ee564e 100644 --- a/internal/streamingnode/server/flusher/flusherimpl/pool.go +++ b/internal/streamingnode/server/flusher/flusherimpl/pool.go @@ -19,7 +19,7 @@ package flusherimpl import ( "sync" - "github.com/milvus-io/milvus/pkg/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/conc" ) var ( diff --git a/internal/streamingnode/server/flusher/flusherimpl/util.go b/internal/streamingnode/server/flusher/flusherimpl/util.go index c01eda7148..c5ab48d0e3 100644 --- a/internal/streamingnode/server/flusher/flusherimpl/util.go +++ b/internal/streamingnode/server/flusher/flusherimpl/util.go @@ -8,14 +8,14 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/streamingnode/server/resource" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/message/adaptor" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message/adaptor" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) // getVchannels gets the vchannels of current pchannel. diff --git a/internal/streamingnode/server/flusher/flusherimpl/vchannel_checkpoint.go b/internal/streamingnode/server/flusher/flusherimpl/vchannel_checkpoint.go index 8a8b69cd38..db21e91cb1 100644 --- a/internal/streamingnode/server/flusher/flusherimpl/vchannel_checkpoint.go +++ b/internal/streamingnode/server/flusher/flusherimpl/vchannel_checkpoint.go @@ -5,7 +5,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) var ( diff --git a/internal/streamingnode/server/flusher/flusherimpl/vchannel_checkpoint_test.go b/internal/streamingnode/server/flusher/flusherimpl/vchannel_checkpoint_test.go index f48c10b2d5..fa8b0997ce 100644 --- a/internal/streamingnode/server/flusher/flusherimpl/vchannel_checkpoint_test.go +++ b/internal/streamingnode/server/flusher/flusherimpl/vchannel_checkpoint_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/rmq" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/rmq" ) func TestVChannelCheckpointManager(t *testing.T) { diff --git a/internal/streamingnode/server/flusher/flusherimpl/wal_flusher.go b/internal/streamingnode/server/flusher/flusherimpl/wal_flusher.go index d21167db9d..a6d90ac17e 100644 --- a/internal/streamingnode/server/flusher/flusherimpl/wal_flusher.go +++ b/internal/streamingnode/server/flusher/flusherimpl/wal_flusher.go @@ -14,12 +14,12 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/resource" "github.com/milvus-io/milvus/internal/streamingnode/server/wal" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/message/adaptor" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message/adaptor" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) var errChannelLifetimeUnrecoverable = errors.New("channel lifetime unrecoverable") diff --git a/internal/streamingnode/server/flusher/flusherimpl/wal_flusher_test.go b/internal/streamingnode/server/flusher/flusherimpl/wal_flusher_test.go index bf2fe9d7ad..fb8fb874da 100644 --- a/internal/streamingnode/server/flusher/flusherimpl/wal_flusher_test.go +++ b/internal/streamingnode/server/flusher/flusherimpl/wal_flusher_test.go @@ -21,16 +21,16 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors" internaltypes "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/mocks/streaming/mock_walimpls" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/rmq" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/mock_walimpls" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/rmq" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) func TestMain(m *testing.M) { diff --git a/internal/streamingnode/server/resource/resource.go b/internal/streamingnode/server/resource/resource.go index 41f7703573..80d0f1c9d1 100644 --- a/internal/streamingnode/server/resource/resource.go +++ b/internal/streamingnode/server/resource/resource.go @@ -12,9 +12,9 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal/vchantempstore" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/idalloc" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var r = &resourceImpl{ diff --git a/internal/streamingnode/server/resource/resource_test.go b/internal/streamingnode/server/resource/resource_test.go index 9d0af63890..d2581ff15f 100644 --- a/internal/streamingnode/server/resource/resource_test.go +++ b/internal/streamingnode/server/resource/resource_test.go @@ -10,8 +10,8 @@ import ( "github.com/milvus-io/milvus/internal/mocks/mock_metastore" "github.com/milvus-io/milvus/internal/mocks/mock_storage" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) func TestMain(m *testing.M) { diff --git a/internal/streamingnode/server/resource/test_utility.go b/internal/streamingnode/server/resource/test_utility.go index a05ec41c69..74a12c703a 100644 --- a/internal/streamingnode/server/resource/test_utility.go +++ b/internal/streamingnode/server/resource/test_utility.go @@ -10,8 +10,8 @@ import ( tinspector "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/timetick/inspector" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/idalloc" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) // InitForTest initializes the singleton of resources for test. diff --git a/internal/streamingnode/server/server.go b/internal/streamingnode/server/server.go index 0a59213d67..65c90e8601 100644 --- a/internal/streamingnode/server/server.go +++ b/internal/streamingnode/server/server.go @@ -9,11 +9,11 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/service" "github.com/milvus-io/milvus/internal/streamingnode/server/walmanager" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - _ "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/kafka" - _ "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/pulsar" - _ "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/rmq" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + _ "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/kafka" + _ "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/pulsar" + _ "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/rmq" ) // Server is the streamingnode server. diff --git a/internal/streamingnode/server/service/handler.go b/internal/streamingnode/server/service/handler.go index c67e3c6023..82051d4fc3 100644 --- a/internal/streamingnode/server/service/handler.go +++ b/internal/streamingnode/server/service/handler.go @@ -4,7 +4,7 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/service/handler/consumer" "github.com/milvus-io/milvus/internal/streamingnode/server/service/handler/producer" "github.com/milvus-io/milvus/internal/streamingnode/server/walmanager" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) var _ HandlerService = (*handlerServiceImpl)(nil) diff --git a/internal/streamingnode/server/service/handler/consumer/consume_grpc_server_helper.go b/internal/streamingnode/server/service/handler/consumer/consume_grpc_server_helper.go index c55a449d6a..706465cf90 100644 --- a/internal/streamingnode/server/service/handler/consumer/consume_grpc_server_helper.go +++ b/internal/streamingnode/server/service/handler/consumer/consume_grpc_server_helper.go @@ -1,6 +1,6 @@ package consumer -import "github.com/milvus-io/milvus/pkg/proto/streamingpb" +import "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" // consumeGrpcServerHelper is a wrapped consumer server of log messages. type consumeGrpcServerHelper struct { diff --git a/internal/streamingnode/server/service/handler/consumer/consume_server.go b/internal/streamingnode/server/service/handler/consumer/consume_server.go index 1d6d9cab3d..8515b6f91f 100644 --- a/internal/streamingnode/server/service/handler/consumer/consume_server.go +++ b/internal/streamingnode/server/service/handler/consumer/consume_server.go @@ -11,11 +11,11 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/walmanager" "github.com/milvus-io/milvus/internal/util/streamingutil/service/contextutil" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) // CreateConsumeServer create a new consumer. diff --git a/internal/streamingnode/server/service/handler/consumer/consume_server_test.go b/internal/streamingnode/server/service/handler/consumer/consume_server_test.go index 2c6ab7affe..d50ccda837 100644 --- a/internal/streamingnode/server/service/handler/consumer/consume_server_test.go +++ b/internal/streamingnode/server/service/handler/consumer/consume_server_test.go @@ -16,14 +16,14 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/walmanager" "github.com/milvus-io/milvus/internal/util/streamingutil/service/contextutil" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mocks/proto/mock_streamingpb" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mocks/proto/mock_streamingpb" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMain(m *testing.M) { diff --git a/internal/streamingnode/server/service/handler/consumer/metrics.go b/internal/streamingnode/server/service/handler/consumer/metrics.go index 03a186ca57..6eb24806cf 100644 --- a/internal/streamingnode/server/service/handler/consumer/metrics.go +++ b/internal/streamingnode/server/service/handler/consumer/metrics.go @@ -3,8 +3,8 @@ package consumer import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // newConsumerMetrics creates a new consumer metrics. diff --git a/internal/streamingnode/server/service/handler/producer/metrics.go b/internal/streamingnode/server/service/handler/producer/metrics.go index 37b4e5ccf5..5db9314726 100644 --- a/internal/streamingnode/server/service/handler/producer/metrics.go +++ b/internal/streamingnode/server/service/handler/producer/metrics.go @@ -3,9 +3,9 @@ package producer import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // newProducerMetrics creates a new producer metrics. diff --git a/internal/streamingnode/server/service/handler/producer/produce_grpc_server_helper.go b/internal/streamingnode/server/service/handler/producer/produce_grpc_server_helper.go index 4f78e9ebef..9a71e65416 100644 --- a/internal/streamingnode/server/service/handler/producer/produce_grpc_server_helper.go +++ b/internal/streamingnode/server/service/handler/producer/produce_grpc_server_helper.go @@ -1,7 +1,7 @@ package producer import ( - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // produceGrpcServerHelper is a wrapped producer server of log messages. diff --git a/internal/streamingnode/server/service/handler/producer/produce_server.go b/internal/streamingnode/server/service/handler/producer/produce_server.go index 0889e00b79..249e4c1fd4 100644 --- a/internal/streamingnode/server/service/handler/producer/produce_server.go +++ b/internal/streamingnode/server/service/handler/producer/produce_server.go @@ -12,10 +12,10 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/walmanager" "github.com/milvus-io/milvus/internal/util/streamingutil/service/contextutil" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) // CreateProduceServer create a new producer. diff --git a/internal/streamingnode/server/service/handler/producer/produce_server_test.go b/internal/streamingnode/server/service/handler/producer/produce_server_test.go index 0da35538c5..a15e956510 100644 --- a/internal/streamingnode/server/service/handler/producer/produce_server_test.go +++ b/internal/streamingnode/server/service/handler/producer/produce_server_test.go @@ -19,14 +19,14 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal" "github.com/milvus-io/milvus/internal/streamingnode/server/walmanager" "github.com/milvus-io/milvus/internal/util/streamingutil/service/contextutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mocks/proto/mock_streamingpb" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mocks/proto/mock_streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMain(m *testing.M) { diff --git a/internal/streamingnode/server/service/manager.go b/internal/streamingnode/server/service/manager.go index 4942a0cb84..e720112bfd 100644 --- a/internal/streamingnode/server/service/manager.go +++ b/internal/streamingnode/server/service/manager.go @@ -4,8 +4,8 @@ import ( "context" "github.com/milvus-io/milvus/internal/streamingnode/server/walmanager" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) var _ ManagerService = (*managerServiceImpl)(nil) diff --git a/internal/streamingnode/server/wal/adaptor/builder.go b/internal/streamingnode/server/wal/adaptor/builder.go index 86cc8d4d76..afcf392f0f 100644 --- a/internal/streamingnode/server/wal/adaptor/builder.go +++ b/internal/streamingnode/server/wal/adaptor/builder.go @@ -3,7 +3,7 @@ package adaptor import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" ) var _ wal.OpenerBuilder = (*builderAdaptorImpl)(nil) diff --git a/internal/streamingnode/server/wal/adaptor/old_version_message.go b/internal/streamingnode/server/wal/adaptor/old_version_message.go index c30ce5179a..ebb353bc5b 100644 --- a/internal/streamingnode/server/wal/adaptor/old_version_message.go +++ b/internal/streamingnode/server/wal/adaptor/old_version_message.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/milvus-io/milvus/internal/streamingnode/server/resource" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/message/adaptor" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message/adaptor" ) // newOldVersionImmutableMessage creates a new immutable message from the old version message. diff --git a/internal/streamingnode/server/wal/adaptor/old_version_message_test.go b/internal/streamingnode/server/wal/adaptor/old_version_message_test.go index 66c247e94c..57bfc63583 100644 --- a/internal/streamingnode/server/wal/adaptor/old_version_message_test.go +++ b/internal/streamingnode/server/wal/adaptor/old_version_message_test.go @@ -14,10 +14,10 @@ import ( "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/streamingnode/server/resource" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) func TestNewOldVersionImmutableMessage(t *testing.T) { diff --git a/internal/streamingnode/server/wal/adaptor/opener.go b/internal/streamingnode/server/wal/adaptor/opener.go index 8fc2d8ba45..32fc1fa238 100644 --- a/internal/streamingnode/server/wal/adaptor/opener.go +++ b/internal/streamingnode/server/wal/adaptor/opener.go @@ -8,9 +8,9 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ wal.Opener = (*openerAdaptorImpl)(nil) diff --git a/internal/streamingnode/server/wal/adaptor/opener_test.go b/internal/streamingnode/server/wal/adaptor/opener_test.go index a0acc396f3..056dcc7a2d 100644 --- a/internal/streamingnode/server/wal/adaptor/opener_test.go +++ b/internal/streamingnode/server/wal/adaptor/opener_test.go @@ -12,12 +12,12 @@ import ( "github.com/stretchr/testify/mock" "github.com/milvus-io/milvus/internal/streamingnode/server/wal" - "github.com/milvus-io/milvus/pkg/mocks/streaming/mock_walimpls" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/mock_walimpls" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMain(m *testing.M) { diff --git a/internal/streamingnode/server/wal/adaptor/scanner_adaptor.go b/internal/streamingnode/server/wal/adaptor/scanner_adaptor.go index 354c3ee676..30a7cef1fa 100644 --- a/internal/streamingnode/server/wal/adaptor/scanner_adaptor.go +++ b/internal/streamingnode/server/wal/adaptor/scanner_adaptor.go @@ -10,13 +10,13 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/metricsutil" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/utility" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/message/adaptor" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/helper" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message/adaptor" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/helper" ) var _ wal.Scanner = (*scannerAdaptorImpl)(nil) diff --git a/internal/streamingnode/server/wal/adaptor/scanner_adaptor_test.go b/internal/streamingnode/server/wal/adaptor/scanner_adaptor_test.go index aba0f4155b..948c1929df 100644 --- a/internal/streamingnode/server/wal/adaptor/scanner_adaptor_test.go +++ b/internal/streamingnode/server/wal/adaptor/scanner_adaptor_test.go @@ -13,9 +13,9 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/resource" "github.com/milvus-io/milvus/internal/streamingnode/server/wal" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/metricsutil" - "github.com/milvus-io/milvus/pkg/mocks/streaming/mock_walimpls" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/mock_walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) func TestScannerAdaptorReadError(t *testing.T) { diff --git a/internal/streamingnode/server/wal/adaptor/scanner_registry.go b/internal/streamingnode/server/wal/adaptor/scanner_registry.go index 34ad95cb6d..545375dd73 100644 --- a/internal/streamingnode/server/wal/adaptor/scanner_registry.go +++ b/internal/streamingnode/server/wal/adaptor/scanner_registry.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/milvus-io/milvus/internal/streamingnode/server/wal" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type scannerRegistry struct { diff --git a/internal/streamingnode/server/wal/adaptor/scanner_switchable.go b/internal/streamingnode/server/wal/adaptor/scanner_switchable.go index 2a1ddd1789..c3d52f8453 100644 --- a/internal/streamingnode/server/wal/adaptor/scanner_switchable.go +++ b/internal/streamingnode/server/wal/adaptor/scanner_switchable.go @@ -9,11 +9,11 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/wab" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/vchantempstore" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/internal/streamingnode/server/wal/adaptor/wal_adaptor.go b/internal/streamingnode/server/wal/adaptor/wal_adaptor.go index 9239179907..ac07806625 100644 --- a/internal/streamingnode/server/wal/adaptor/wal_adaptor.go +++ b/internal/streamingnode/server/wal/adaptor/wal_adaptor.go @@ -12,13 +12,13 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal/metricsutil" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/utility" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ wal.WAL = (*walAdaptorImpl)(nil) diff --git a/internal/streamingnode/server/wal/adaptor/wal_adaptor_test.go b/internal/streamingnode/server/wal/adaptor/wal_adaptor_test.go index 53ad12aa7b..4b6b0b9271 100644 --- a/internal/streamingnode/server/wal/adaptor/wal_adaptor_test.go +++ b/internal/streamingnode/server/wal/adaptor/wal_adaptor_test.go @@ -19,12 +19,12 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/mocks/streaming/mock_walimpls" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/mock_walimpls" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" ) func TestWalAdaptorReadFail(t *testing.T) { diff --git a/internal/streamingnode/server/wal/adaptor/wal_test.go b/internal/streamingnode/server/wal/adaptor/wal_test.go index 2615babfcf..9b2a8d7922 100644 --- a/internal/streamingnode/server/wal/adaptor/wal_test.go +++ b/internal/streamingnode/server/wal/adaptor/wal_test.go @@ -25,14 +25,14 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal/registry" internaltypes "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/idalloc" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) const testVChannel = "v1" diff --git a/internal/streamingnode/server/wal/builder.go b/internal/streamingnode/server/wal/builder.go index c030c95c60..19fcdfb60d 100644 --- a/internal/streamingnode/server/wal/builder.go +++ b/internal/streamingnode/server/wal/builder.go @@ -3,7 +3,7 @@ package wal import ( "context" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) // OpenerBuilder is the interface for build wal opener. diff --git a/internal/streamingnode/server/wal/interceptors/chain_interceptor.go b/internal/streamingnode/server/wal/interceptors/chain_interceptor.go index 96216aca89..3563e3eafe 100644 --- a/internal/streamingnode/server/wal/interceptors/chain_interceptor.go +++ b/internal/streamingnode/server/wal/interceptors/chain_interceptor.go @@ -3,7 +3,7 @@ package interceptors import ( "context" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) var _ InterceptorWithReady = (*chainedInterceptor)(nil) diff --git a/internal/streamingnode/server/wal/interceptors/chain_interceptor_test.go b/internal/streamingnode/server/wal/interceptors/chain_interceptor_test.go index 8f756281e1..d25ad5f59f 100644 --- a/internal/streamingnode/server/wal/interceptors/chain_interceptor_test.go +++ b/internal/streamingnode/server/wal/interceptors/chain_interceptor_test.go @@ -10,7 +10,7 @@ import ( "github.com/milvus-io/milvus/internal/mocks/streamingnode/server/wal/mock_interceptors" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) func TestChainInterceptor(t *testing.T) { diff --git a/internal/streamingnode/server/wal/interceptors/flusher/flusher_interceptor.go b/internal/streamingnode/server/wal/interceptors/flusher/flusher_interceptor.go index 0749c04af4..5f5f8b02e6 100644 --- a/internal/streamingnode/server/wal/interceptors/flusher/flusher_interceptor.go +++ b/internal/streamingnode/server/wal/interceptors/flusher/flusher_interceptor.go @@ -5,7 +5,7 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/flusher/flusherimpl" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) var ( diff --git a/internal/streamingnode/server/wal/interceptors/interceptor.go b/internal/streamingnode/server/wal/interceptors/interceptor.go index 9ff57c64a7..61ffc0f857 100644 --- a/internal/streamingnode/server/wal/interceptors/interceptor.go +++ b/internal/streamingnode/server/wal/interceptors/interceptor.go @@ -4,9 +4,9 @@ import ( "context" "github.com/milvus-io/milvus/internal/streamingnode/server/wal" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) type ( diff --git a/internal/streamingnode/server/wal/interceptors/redo/redo_interceptor.go b/internal/streamingnode/server/wal/interceptors/redo/redo_interceptor.go index 1aa0b67561..5bcaaad441 100644 --- a/internal/streamingnode/server/wal/interceptors/redo/redo_interceptor.go +++ b/internal/streamingnode/server/wal/interceptors/redo/redo_interceptor.go @@ -6,7 +6,7 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) var ( diff --git a/internal/streamingnode/server/wal/interceptors/segment/builder.go b/internal/streamingnode/server/wal/interceptors/segment/builder.go index 14578bf357..debc818a15 100644 --- a/internal/streamingnode/server/wal/interceptors/segment/builder.go +++ b/internal/streamingnode/server/wal/interceptors/segment/builder.go @@ -8,8 +8,8 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/resource" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/segment/manager" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) func NewInterceptorBuilder() interceptors.InterceptorBuilder { diff --git a/internal/streamingnode/server/wal/interceptors/segment/inspector/impls.go b/internal/streamingnode/server/wal/interceptors/segment/inspector/impls.go index 22de69e39a..3e0d8f0e44 100644 --- a/internal/streamingnode/server/wal/interceptors/segment/inspector/impls.go +++ b/internal/streamingnode/server/wal/interceptors/segment/inspector/impls.go @@ -8,10 +8,10 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/resource" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/segment/stats" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/streamingnode/server/wal/interceptors/segment/inspector/inspector.go b/internal/streamingnode/server/wal/interceptors/segment/inspector/inspector.go index 7fb77b665a..787ae99dc1 100644 --- a/internal/streamingnode/server/wal/interceptors/segment/inspector/inspector.go +++ b/internal/streamingnode/server/wal/interceptors/segment/inspector/inspector.go @@ -6,7 +6,7 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/resource" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/segment/stats" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) var ( diff --git a/internal/streamingnode/server/wal/interceptors/segment/inspector/inspector_test.go b/internal/streamingnode/server/wal/interceptors/segment/inspector/inspector_test.go index 3876341988..8458955821 100644 --- a/internal/streamingnode/server/wal/interceptors/segment/inspector/inspector_test.go +++ b/internal/streamingnode/server/wal/interceptors/segment/inspector/inspector_test.go @@ -12,8 +12,8 @@ import ( "github.com/milvus-io/milvus/internal/mocks/streamingnode/server/wal/interceptors/segment/mock_inspector" "github.com/milvus-io/milvus/internal/streamingnode/server/resource" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/segment/stats" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestSealedInspector(t *testing.T) { diff --git a/internal/streamingnode/server/wal/interceptors/segment/manager/partition_manager.go b/internal/streamingnode/server/wal/interceptors/segment/manager/partition_manager.go index cb19ccec86..7bf4b776b1 100644 --- a/internal/streamingnode/server/wal/interceptors/segment/manager/partition_manager.go +++ b/internal/streamingnode/server/wal/interceptors/segment/manager/partition_manager.go @@ -12,14 +12,14 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/segment/policy" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/metricsutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) var ErrFencedAssign = errors.New("fenced assign") diff --git a/internal/streamingnode/server/wal/interceptors/segment/manager/partition_managers.go b/internal/streamingnode/server/wal/interceptors/segment/manager/partition_managers.go index 2673853bf8..dc1f13c2b9 100644 --- a/internal/streamingnode/server/wal/interceptors/segment/manager/partition_managers.go +++ b/internal/streamingnode/server/wal/interceptors/segment/manager/partition_managers.go @@ -11,12 +11,12 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/segment/policy" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/metricsutil" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // buildNewPartitionManagers builds new partition managers. diff --git a/internal/streamingnode/server/wal/interceptors/segment/manager/pchannel_manager.go b/internal/streamingnode/server/wal/interceptors/segment/manager/pchannel_manager.go index 771290a2e1..d886282870 100644 --- a/internal/streamingnode/server/wal/interceptors/segment/manager/pchannel_manager.go +++ b/internal/streamingnode/server/wal/interceptors/segment/manager/pchannel_manager.go @@ -11,13 +11,13 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/segment/inspector" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/segment/stats" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/metricsutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // RecoverPChannelSegmentAllocManager recovers the segment assignment manager at the specified pchannel. diff --git a/internal/streamingnode/server/wal/interceptors/segment/manager/pchannel_manager_test.go b/internal/streamingnode/server/wal/interceptors/segment/manager/pchannel_manager_test.go index 6a4f7a11ec..22d6cbeb26 100644 --- a/internal/streamingnode/server/wal/interceptors/segment/manager/pchannel_manager_test.go +++ b/internal/streamingnode/server/wal/interceptors/segment/manager/pchannel_manager_test.go @@ -19,15 +19,15 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/txn" internaltypes "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/idalloc" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/rmq" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/rmq" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) func TestSegmentAllocManager(t *testing.T) { diff --git a/internal/streamingnode/server/wal/interceptors/segment/manager/seal_queue.go b/internal/streamingnode/server/wal/interceptors/segment/manager/seal_queue.go index e3cb540d4f..3289550e0c 100644 --- a/internal/streamingnode/server/wal/interceptors/segment/manager/seal_queue.go +++ b/internal/streamingnode/server/wal/interceptors/segment/manager/seal_queue.go @@ -9,10 +9,10 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/metricsutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) // newSealQueue creates a new seal helper queue. diff --git a/internal/streamingnode/server/wal/interceptors/segment/manager/segment_manager.go b/internal/streamingnode/server/wal/interceptors/segment/manager/segment_manager.go index 986cb44b94..3913f3b101 100644 --- a/internal/streamingnode/server/wal/interceptors/segment/manager/segment_manager.go +++ b/internal/streamingnode/server/wal/interceptors/segment/manager/segment_manager.go @@ -13,9 +13,9 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/segment/policy" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/segment/stats" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/metricsutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) const dirtyThreshold = 30 * 1024 * 1024 // 30MB diff --git a/internal/streamingnode/server/wal/interceptors/segment/policy/segment_limitation_policy.go b/internal/streamingnode/server/wal/interceptors/segment/policy/segment_limitation_policy.go index f66a3c0edd..c64b66adf7 100644 --- a/internal/streamingnode/server/wal/interceptors/segment/policy/segment_limitation_policy.go +++ b/internal/streamingnode/server/wal/interceptors/segment/policy/segment_limitation_policy.go @@ -3,7 +3,7 @@ package policy import ( "math/rand" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // GetSegmentLimitationPolicy returns the segment limitation policy. diff --git a/internal/streamingnode/server/wal/interceptors/segment/policy/segment_seal_policy.go b/internal/streamingnode/server/wal/interceptors/segment/policy/segment_seal_policy.go index f62b408b9f..a73fdca73b 100644 --- a/internal/streamingnode/server/wal/interceptors/segment/policy/segment_seal_policy.go +++ b/internal/streamingnode/server/wal/interceptors/segment/policy/segment_seal_policy.go @@ -4,7 +4,7 @@ import ( "time" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/segment/stats" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type PolicyName string diff --git a/internal/streamingnode/server/wal/interceptors/segment/segment_assign_interceptor.go b/internal/streamingnode/server/wal/interceptors/segment/segment_assign_interceptor.go index 72849cf592..b50085c22f 100644 --- a/internal/streamingnode/server/wal/interceptors/segment/segment_assign_interceptor.go +++ b/internal/streamingnode/server/wal/interceptors/segment/segment_assign_interceptor.go @@ -15,11 +15,11 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/txn" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/utility" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ interceptors.InterceptorWithReady = (*segmentInterceptor)(nil) diff --git a/internal/streamingnode/server/wal/interceptors/segment/stats/signal_notifier.go b/internal/streamingnode/server/wal/interceptors/segment/stats/signal_notifier.go index 6b6ae07815..d94fa13430 100644 --- a/internal/streamingnode/server/wal/interceptors/segment/stats/signal_notifier.go +++ b/internal/streamingnode/server/wal/interceptors/segment/stats/signal_notifier.go @@ -3,8 +3,8 @@ package stats import ( "sync" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // NewSealSignalNotifier creates a new seal signal notifier. diff --git a/internal/streamingnode/server/wal/interceptors/segment/stats/stats.go b/internal/streamingnode/server/wal/interceptors/segment/stats/stats.go index 1a210e6f10..5a4bd35526 100644 --- a/internal/streamingnode/server/wal/interceptors/segment/stats/stats.go +++ b/internal/streamingnode/server/wal/interceptors/segment/stats/stats.go @@ -3,7 +3,7 @@ package stats import ( "time" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // SegmentStats is the usage stats of a segment. diff --git a/internal/streamingnode/server/wal/interceptors/timetick/ack/ack.go b/internal/streamingnode/server/wal/interceptors/timetick/ack/ack.go index debf70d091..9ff5e044ab 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/ack/ack.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/ack/ack.go @@ -1,8 +1,8 @@ package ack import ( - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/internal/streamingnode/server/wal/interceptors/timetick/ack/ack_details.go b/internal/streamingnode/server/wal/interceptors/timetick/ack/ack_details.go index fc2e5274e8..063c8690f8 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/ack/ack_details.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/ack/ack_details.go @@ -1,7 +1,7 @@ package ack import ( - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) // details that sorted by timestamp. diff --git a/internal/streamingnode/server/wal/interceptors/timetick/ack/ack_details_test.go b/internal/streamingnode/server/wal/interceptors/timetick/ack/ack_details_test.go index c4da34a0b1..51525b5c56 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/ack/ack_details_test.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/ack/ack_details_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" ) func TestAckDetails(t *testing.T) { diff --git a/internal/streamingnode/server/wal/interceptors/timetick/ack/ack_test.go b/internal/streamingnode/server/wal/interceptors/timetick/ack/ack_test.go index d6d641f442..31377741d8 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/ack/ack_test.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/ack/ack_test.go @@ -17,12 +17,12 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/resource" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/metricsutil" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) func TestAck(t *testing.T) { diff --git a/internal/streamingnode/server/wal/interceptors/timetick/ack/detail.go b/internal/streamingnode/server/wal/interceptors/timetick/ack/detail.go index 7008ddb804..03e10bd963 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/ack/detail.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/ack/detail.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/txn" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) // newAckDetail creates a new default acker detail. diff --git a/internal/streamingnode/server/wal/interceptors/timetick/ack/detail_test.go b/internal/streamingnode/server/wal/interceptors/timetick/ack/detail_test.go index 88a54ec54f..07d5454d0f 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/ack/detail_test.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/ack/detail_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/txn" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" ) func TestDetail(t *testing.T) { diff --git a/internal/streamingnode/server/wal/interceptors/timetick/ack/last_confirmed.go b/internal/streamingnode/server/wal/interceptors/timetick/ack/last_confirmed.go index 2f30571ab4..83b25118c3 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/ack/last_confirmed.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/ack/last_confirmed.go @@ -2,8 +2,8 @@ package ack import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/txn" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type uncommittedTxnInfo struct { diff --git a/internal/streamingnode/server/wal/interceptors/timetick/ack/manager.go b/internal/streamingnode/server/wal/interceptors/timetick/ack/manager.go index 7b93365cbf..e708e1f160 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/ack/manager.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/ack/manager.go @@ -7,8 +7,8 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/resource" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/metricsutil" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // AckManager manages the timestampAck. diff --git a/internal/streamingnode/server/wal/interceptors/timetick/inspector/impls.go b/internal/streamingnode/server/wal/interceptors/timetick/inspector/impls.go index 4182f6804c..717d9fcb13 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/inspector/impls.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/inspector/impls.go @@ -5,11 +5,11 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // NewTimeTickSyncInspector creates a new time tick sync inspector. diff --git a/internal/streamingnode/server/wal/interceptors/timetick/inspector/inspector.go b/internal/streamingnode/server/wal/interceptors/timetick/inspector/inspector.go index 43cc2a6e6d..6bf0f33f1b 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/inspector/inspector.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/inspector/inspector.go @@ -5,7 +5,7 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/timetick/mvcc" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/wab" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) type TimeTickSyncOperator interface { diff --git a/internal/streamingnode/server/wal/interceptors/timetick/inspector/inspector_test.go b/internal/streamingnode/server/wal/interceptors/timetick/inspector/inspector_test.go index 75176ab3c4..b9ef7bc2e4 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/inspector/inspector_test.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/inspector/inspector_test.go @@ -10,8 +10,8 @@ import ( "github.com/milvus-io/milvus/internal/mocks/streamingnode/server/wal/interceptors/timetick/mock_inspector" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/timetick/inspector" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestInsepctor(t *testing.T) { diff --git a/internal/streamingnode/server/wal/interceptors/timetick/inspector/notifier.go b/internal/streamingnode/server/wal/interceptors/timetick/inspector/notifier.go index eb3c58430d..ca44463b81 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/inspector/notifier.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/inspector/notifier.go @@ -3,9 +3,9 @@ package inspector import ( "sync" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // newSyncNotifier creates a new sync notifier. diff --git a/internal/streamingnode/server/wal/interceptors/timetick/inspector/notifier_test.go b/internal/streamingnode/server/wal/interceptors/timetick/inspector/notifier_test.go index 51998913e7..0ac7dd133a 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/inspector/notifier_test.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/inspector/notifier_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) func TestSyncNotifier(t *testing.T) { diff --git a/internal/streamingnode/server/wal/interceptors/timetick/mvcc/mvcc_manager.go b/internal/streamingnode/server/wal/interceptors/timetick/mvcc/mvcc_manager.go index 1a6a2acec0..2faaeb2180 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/mvcc/mvcc_manager.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/mvcc/mvcc_manager.go @@ -3,7 +3,7 @@ package mvcc import ( "sync" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) // NewMVCCManager creates a new mvcc timestamp manager. diff --git a/internal/streamingnode/server/wal/interceptors/timetick/mvcc/mvcc_manager_test.go b/internal/streamingnode/server/wal/interceptors/timetick/mvcc/mvcc_manager_test.go index 8e37d65adc..b4364fcd55 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/mvcc/mvcc_manager_test.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/mvcc/mvcc_manager_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) func TestNewMVCCManager(t *testing.T) { diff --git a/internal/streamingnode/server/wal/interceptors/timetick/timetick_interceptor.go b/internal/streamingnode/server/wal/interceptors/timetick/timetick_interceptor.go index 26de7c2bbc..2fa7110aa8 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/timetick_interceptor.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/timetick_interceptor.go @@ -12,8 +12,8 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/timetick/ack" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/txn" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/utility" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) var ( diff --git a/internal/streamingnode/server/wal/interceptors/timetick/timetick_message.go b/internal/streamingnode/server/wal/interceptors/timetick/timetick_message.go index a705663ad8..43a3f388e3 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/timetick_message.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/timetick_message.go @@ -3,8 +3,8 @@ package timetick import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" ) func NewTimeTickMsg(ts uint64, lastConfirmedMessageID message.MessageID, sourceID int64) (message.MutableMessage, error) { diff --git a/internal/streamingnode/server/wal/interceptors/timetick/timetick_sync_operator.go b/internal/streamingnode/server/wal/interceptors/timetick/timetick_sync_operator.go index bbc0684979..5f27515aed 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/timetick_sync_operator.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/timetick_sync_operator.go @@ -15,11 +15,11 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors/wab" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/metricsutil" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/utility" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // timeTickSyncOperator is a time tick sync operator. diff --git a/internal/streamingnode/server/wal/interceptors/timetick/timetick_sync_operator_test.go b/internal/streamingnode/server/wal/interceptors/timetick/timetick_sync_operator_test.go index 83e1e3e9d4..4e1f1c0d52 100644 --- a/internal/streamingnode/server/wal/interceptors/timetick/timetick_sync_operator_test.go +++ b/internal/streamingnode/server/wal/interceptors/timetick/timetick_sync_operator_test.go @@ -13,12 +13,12 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/utility" - "github.com/milvus-io/milvus/pkg/mocks/streaming/mock_walimpls" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/mock_walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) func TestTimeTickSyncOperator(t *testing.T) { diff --git a/internal/streamingnode/server/wal/interceptors/txn/session.go b/internal/streamingnode/server/wal/interceptors/txn/session.go index 3f9422c660..8318f37997 100644 --- a/internal/streamingnode/server/wal/interceptors/txn/session.go +++ b/internal/streamingnode/server/wal/interceptors/txn/session.go @@ -5,8 +5,8 @@ import ( "sync" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type txnSessionKeyType int diff --git a/internal/streamingnode/server/wal/interceptors/txn/session_test.go b/internal/streamingnode/server/wal/interceptors/txn/session_test.go index 5a973a5c40..e81ecfe6a1 100644 --- a/internal/streamingnode/server/wal/interceptors/txn/session_test.go +++ b/internal/streamingnode/server/wal/interceptors/txn/session_test.go @@ -11,11 +11,11 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/resource" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) func TestMain(m *testing.M) { diff --git a/internal/streamingnode/server/wal/interceptors/txn/txn_manager.go b/internal/streamingnode/server/wal/interceptors/txn/txn_manager.go index 0aba8bdd6a..355e5a0be6 100644 --- a/internal/streamingnode/server/wal/interceptors/txn/txn_manager.go +++ b/internal/streamingnode/server/wal/interceptors/txn/txn_manager.go @@ -10,11 +10,11 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/resource" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/metricsutil" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/lifetime" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/lifetime" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // NewTxnManager creates a new transaction manager. diff --git a/internal/streamingnode/server/wal/interceptors/wab/pending_queue.go b/internal/streamingnode/server/wal/interceptors/wab/pending_queue.go index 6d4f5d656a..db2dd55d44 100644 --- a/internal/streamingnode/server/wal/interceptors/wab/pending_queue.go +++ b/internal/streamingnode/server/wal/interceptors/wab/pending_queue.go @@ -6,7 +6,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) // ErrEvicted is returned when the expected message has been evicted. diff --git a/internal/streamingnode/server/wal/interceptors/wab/pending_queue_test.go b/internal/streamingnode/server/wal/interceptors/wab/pending_queue_test.go index f86ea8ad16..cdfa98926e 100644 --- a/internal/streamingnode/server/wal/interceptors/wab/pending_queue_test.go +++ b/internal/streamingnode/server/wal/interceptors/wab/pending_queue_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) func TestPendingQueue(t *testing.T) { diff --git a/internal/streamingnode/server/wal/interceptors/wab/reader.go b/internal/streamingnode/server/wal/interceptors/wab/reader.go index 6722f98fd8..a1480febe8 100644 --- a/internal/streamingnode/server/wal/interceptors/wab/reader.go +++ b/internal/streamingnode/server/wal/interceptors/wab/reader.go @@ -3,7 +3,7 @@ package wab import ( "context" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) // WriteAheadBufferReader is used to read messages from WriteAheadBuffer. diff --git a/internal/streamingnode/server/wal/interceptors/wab/write_ahead_buffer.go b/internal/streamingnode/server/wal/interceptors/wab/write_ahead_buffer.go index 3505ff4632..38d7bece59 100644 --- a/internal/streamingnode/server/wal/interceptors/wab/write_ahead_buffer.go +++ b/internal/streamingnode/server/wal/interceptors/wab/write_ahead_buffer.go @@ -8,9 +8,9 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) var _ ROWriteAheadBuffer = (*WriteAheadBuffer)(nil) diff --git a/internal/streamingnode/server/wal/interceptors/wab/write_ahead_buffer_test.go b/internal/streamingnode/server/wal/interceptors/wab/write_ahead_buffer_test.go index 8f618c7895..ed252b91dc 100644 --- a/internal/streamingnode/server/wal/interceptors/wab/write_ahead_buffer_test.go +++ b/internal/streamingnode/server/wal/interceptors/wab/write_ahead_buffer_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) func TestWriteAheadBufferWithOnlyTrivialTimeTick(t *testing.T) { diff --git a/internal/streamingnode/server/wal/metricsutil/segment.go b/internal/streamingnode/server/wal/metricsutil/segment.go index de00973867..6e97470edf 100644 --- a/internal/streamingnode/server/wal/metricsutil/segment.go +++ b/internal/streamingnode/server/wal/metricsutil/segment.go @@ -3,9 +3,9 @@ package metricsutil import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func NewSegmentAssignMetrics(pchannel string) *SegmentAssignMetrics { diff --git a/internal/streamingnode/server/wal/metricsutil/timetick.go b/internal/streamingnode/server/wal/metricsutil/timetick.go index 4dc085b7c7..0ca8b96aa8 100644 --- a/internal/streamingnode/server/wal/metricsutil/timetick.go +++ b/internal/streamingnode/server/wal/metricsutil/timetick.go @@ -3,10 +3,10 @@ package metricsutil import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) // TimeTickMetrics is the metrics for time tick. diff --git a/internal/streamingnode/server/wal/metricsutil/txn.go b/internal/streamingnode/server/wal/metricsutil/txn.go index 6db97ee53f..d2326e7016 100644 --- a/internal/streamingnode/server/wal/metricsutil/txn.go +++ b/internal/streamingnode/server/wal/metricsutil/txn.go @@ -3,10 +3,10 @@ package metricsutil import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) func NewTxnMetrics(pchannel string) *TxnMetrics { diff --git a/internal/streamingnode/server/wal/metricsutil/wal_scan.go b/internal/streamingnode/server/wal/metricsutil/wal_scan.go index 2df9eeb4c8..fd233a2899 100644 --- a/internal/streamingnode/server/wal/metricsutil/wal_scan.go +++ b/internal/streamingnode/server/wal/metricsutil/wal_scan.go @@ -3,10 +3,10 @@ package metricsutil import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func NewScanMetrics(pchannel types.PChannelInfo) *ScanMetrics { diff --git a/internal/streamingnode/server/wal/metricsutil/wal_write.go b/internal/streamingnode/server/wal/metricsutil/wal_write.go index 6cdc7b9c4a..329d0674cb 100644 --- a/internal/streamingnode/server/wal/metricsutil/wal_write.go +++ b/internal/streamingnode/server/wal/metricsutil/wal_write.go @@ -7,10 +7,10 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // NewWriteMetrics creates a new WriteMetrics. diff --git a/internal/streamingnode/server/wal/registry/registry.go b/internal/streamingnode/server/wal/registry/registry.go index 2f71207064..9648aa7ddb 100644 --- a/internal/streamingnode/server/wal/registry/registry.go +++ b/internal/streamingnode/server/wal/registry/registry.go @@ -4,7 +4,7 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/adaptor" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/interceptors" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/registry" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/registry" ) // MustGetBuilder returns the wal builder by name. diff --git a/internal/streamingnode/server/wal/scanner.go b/internal/streamingnode/server/wal/scanner.go index 334fe6e973..5987800af5 100644 --- a/internal/streamingnode/server/wal/scanner.go +++ b/internal/streamingnode/server/wal/scanner.go @@ -3,9 +3,9 @@ package wal import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) type MessageFilter = func(message.ImmutableMessage) bool diff --git a/internal/streamingnode/server/wal/utility/context.go b/internal/streamingnode/server/wal/utility/context.go index ee6b3fd3fd..98542ab98c 100644 --- a/internal/streamingnode/server/wal/utility/context.go +++ b/internal/streamingnode/server/wal/utility/context.go @@ -6,7 +6,7 @@ import ( "google.golang.org/protobuf/reflect/protoreflect" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) // walCtxKey is the key type of extra append result. diff --git a/internal/streamingnode/server/wal/utility/context_test.go b/internal/streamingnode/server/wal/utility/context_test.go index 878e9fd033..9ebc943a6c 100644 --- a/internal/streamingnode/server/wal/utility/context_test.go +++ b/internal/streamingnode/server/wal/utility/context_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/protobuf/types/known/anypb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" ) func TestWithNotPersisted(t *testing.T) { diff --git a/internal/streamingnode/server/wal/utility/message_heap.go b/internal/streamingnode/server/wal/utility/message_heap.go index 27c57f20ea..adc81a1f57 100644 --- a/internal/streamingnode/server/wal/utility/message_heap.go +++ b/internal/streamingnode/server/wal/utility/message_heap.go @@ -1,8 +1,8 @@ package utility import ( - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ typeutil.HeapInterface = (*immutableMessageHeap)(nil) diff --git a/internal/streamingnode/server/wal/utility/message_heap_test.go b/internal/streamingnode/server/wal/utility/message_heap_test.go index 22c63d852e..449d244ece 100644 --- a/internal/streamingnode/server/wal/utility/message_heap_test.go +++ b/internal/streamingnode/server/wal/utility/message_heap_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestImmutableMessageHeap(t *testing.T) { diff --git a/internal/streamingnode/server/wal/utility/pending_queue.go b/internal/streamingnode/server/wal/utility/pending_queue.go index 750660e6fa..f872624cc6 100644 --- a/internal/streamingnode/server/wal/utility/pending_queue.go +++ b/internal/streamingnode/server/wal/utility/pending_queue.go @@ -1,8 +1,8 @@ package utility import ( - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type PendingQueue struct { diff --git a/internal/streamingnode/server/wal/utility/pending_queue_test.go b/internal/streamingnode/server/wal/utility/pending_queue_test.go index e0d5df24f4..cb2cba017b 100644 --- a/internal/streamingnode/server/wal/utility/pending_queue_test.go +++ b/internal/streamingnode/server/wal/utility/pending_queue_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) func TestPendingQueue(t *testing.T) { diff --git a/internal/streamingnode/server/wal/utility/reorder_buffer.go b/internal/streamingnode/server/wal/utility/reorder_buffer.go index dca49efecd..54cf6b3aa9 100644 --- a/internal/streamingnode/server/wal/utility/reorder_buffer.go +++ b/internal/streamingnode/server/wal/utility/reorder_buffer.go @@ -3,8 +3,8 @@ package utility import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ErrTimeTickVoilation = errors.New("time tick violation") diff --git a/internal/streamingnode/server/wal/utility/reorder_buffer_test.go b/internal/streamingnode/server/wal/utility/reorder_buffer_test.go index b821f670e1..38c35b8656 100644 --- a/internal/streamingnode/server/wal/utility/reorder_buffer_test.go +++ b/internal/streamingnode/server/wal/utility/reorder_buffer_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" ) func TestReOrderByTimeTickBuffer(t *testing.T) { diff --git a/internal/streamingnode/server/wal/utility/txn_buffer.go b/internal/streamingnode/server/wal/utility/txn_buffer.go index e5d29e3360..20f9351bf9 100644 --- a/internal/streamingnode/server/wal/utility/txn_buffer.go +++ b/internal/streamingnode/server/wal/utility/txn_buffer.go @@ -4,8 +4,8 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/metricsutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) // NewTxnBuffer creates a new txn buffer. diff --git a/internal/streamingnode/server/wal/utility/txn_buffer_test.go b/internal/streamingnode/server/wal/utility/txn_buffer_test.go index ac42d5b3d9..364c0aceca 100644 --- a/internal/streamingnode/server/wal/utility/txn_buffer_test.go +++ b/internal/streamingnode/server/wal/utility/txn_buffer_test.go @@ -8,12 +8,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/streamingnode/server/wal/metricsutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var idAllocator = typeutil.NewIDAllocator() diff --git a/internal/streamingnode/server/wal/vchantempstore/vchannel_temp_storage.go b/internal/streamingnode/server/wal/vchantempstore/vchannel_temp_storage.go index 9b0c5a68ff..e89d19a56b 100644 --- a/internal/streamingnode/server/wal/vchantempstore/vchannel_temp_storage.go +++ b/internal/streamingnode/server/wal/vchantempstore/vchannel_temp_storage.go @@ -10,11 +10,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) // ErrNotFound is returned when the vchannel is not found. diff --git a/internal/streamingnode/server/wal/vchantempstore/vchannel_temp_storage_test.go b/internal/streamingnode/server/wal/vchantempstore/vchannel_temp_storage_test.go index 20c406420d..4c9910c714 100644 --- a/internal/streamingnode/server/wal/vchantempstore/vchannel_temp_storage_test.go +++ b/internal/streamingnode/server/wal/vchantempstore/vchannel_temp_storage_test.go @@ -11,8 +11,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) func TestVChannelTempStorage(t *testing.T) { diff --git a/internal/streamingnode/server/wal/wal.go b/internal/streamingnode/server/wal/wal.go index cbab8610f5..ca9a1130a2 100644 --- a/internal/streamingnode/server/wal/wal.go +++ b/internal/streamingnode/server/wal/wal.go @@ -3,8 +3,8 @@ package wal import ( "context" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) type AppendResult = types.AppendResult diff --git a/internal/streamingnode/server/walmanager/manager.go b/internal/streamingnode/server/walmanager/manager.go index 142461ef61..f30d00dbea 100644 --- a/internal/streamingnode/server/walmanager/manager.go +++ b/internal/streamingnode/server/walmanager/manager.go @@ -4,7 +4,7 @@ import ( "context" "github.com/milvus-io/milvus/internal/streamingnode/server/wal" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) var _ Manager = (*managerImpl)(nil) diff --git a/internal/streamingnode/server/walmanager/manager_impl.go b/internal/streamingnode/server/walmanager/manager_impl.go index 4c3b177c3e..25383de96c 100644 --- a/internal/streamingnode/server/walmanager/manager_impl.go +++ b/internal/streamingnode/server/walmanager/manager_impl.go @@ -14,9 +14,9 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal/registry" "github.com/milvus-io/milvus/internal/util/streamingutil/status" "github.com/milvus-io/milvus/internal/util/streamingutil/util" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var errWALManagerClosed = status.NewOnShutdownError("wal manager is closed") diff --git a/internal/streamingnode/server/walmanager/manager_impl_test.go b/internal/streamingnode/server/walmanager/manager_impl_test.go index 9f38bb1f67..3f32a63976 100644 --- a/internal/streamingnode/server/walmanager/manager_impl_test.go +++ b/internal/streamingnode/server/walmanager/manager_impl_test.go @@ -13,10 +13,10 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal" internaltypes "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) func TestMain(m *testing.M) { diff --git a/internal/streamingnode/server/walmanager/wal_lifetime.go b/internal/streamingnode/server/walmanager/wal_lifetime.go index 969d5989d1..8e45962392 100644 --- a/internal/streamingnode/server/walmanager/wal_lifetime.go +++ b/internal/streamingnode/server/walmanager/wal_lifetime.go @@ -8,8 +8,8 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/wal" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) // newWALLifetime create a WALLifetime with opener. diff --git a/internal/streamingnode/server/walmanager/wal_lifetime_test.go b/internal/streamingnode/server/walmanager/wal_lifetime_test.go index 897e5ada3a..42042a4290 100644 --- a/internal/streamingnode/server/walmanager/wal_lifetime_test.go +++ b/internal/streamingnode/server/walmanager/wal_lifetime_test.go @@ -12,9 +12,9 @@ import ( "github.com/milvus-io/milvus/internal/streamingnode/server/resource" "github.com/milvus-io/milvus/internal/streamingnode/server/wal" internaltypes "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) func TestWALLifetime(t *testing.T) { diff --git a/internal/streamingnode/server/walmanager/wal_state.go b/internal/streamingnode/server/walmanager/wal_state.go index 5ff2ede0aa..bad17f3a41 100644 --- a/internal/streamingnode/server/walmanager/wal_state.go +++ b/internal/streamingnode/server/walmanager/wal_state.go @@ -6,8 +6,8 @@ import ( "sync" "github.com/milvus-io/milvus/internal/streamingnode/server/wal" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) var ( diff --git a/internal/streamingnode/server/walmanager/wal_state_pair_test.go b/internal/streamingnode/server/walmanager/wal_state_pair_test.go index e2a0d3cdd0..33ee44ad0c 100644 --- a/internal/streamingnode/server/walmanager/wal_state_pair_test.go +++ b/internal/streamingnode/server/walmanager/wal_state_pair_test.go @@ -9,8 +9,8 @@ import ( "github.com/milvus-io/milvus/internal/mocks/streamingnode/server/mock_wal" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) func TestStatePair(t *testing.T) { diff --git a/internal/streamingnode/server/walmanager/wal_state_test.go b/internal/streamingnode/server/walmanager/wal_state_test.go index e02b9adb4b..349049d956 100644 --- a/internal/streamingnode/server/walmanager/wal_state_test.go +++ b/internal/streamingnode/server/walmanager/wal_state_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus/internal/mocks/streamingnode/server/mock_wal" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) func TestInitialWALState(t *testing.T) { diff --git a/internal/tso/global_allocator.go b/internal/tso/global_allocator.go index cf63b97e74..eb82837b33 100644 --- a/internal/tso/global_allocator.go +++ b/internal/tso/global_allocator.go @@ -36,10 +36,10 @@ import ( "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Allocator is a Timestamp Oracle allocator. diff --git a/internal/tso/global_allocator_test.go b/internal/tso/global_allocator_test.go index 924e14429c..46ce15c4d2 100644 --- a/internal/tso/global_allocator_test.go +++ b/internal/tso/global_allocator_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" tsoutil2 "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) var gTestTsoAllocator *GlobalTSOAllocator diff --git a/internal/tso/tso.go b/internal/tso/tso.go index 75faf20d54..272f9c93fd 100644 --- a/internal/tso/tso.go +++ b/internal/tso/tso.go @@ -38,10 +38,10 @@ import ( "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/types/types.go b/internal/types/types.go index d694bae3c9..79fa9d631c 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -26,13 +26,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" ) // Limiter defines the interface to perform request rate limiting. diff --git a/internal/util/analyzecgowrapper/analyze.go b/internal/util/analyzecgowrapper/analyze.go index 0d106a0830..c5dae07208 100644 --- a/internal/util/analyzecgowrapper/analyze.go +++ b/internal/util/analyzecgowrapper/analyze.go @@ -32,8 +32,8 @@ import ( "go.uber.org/zap" "google.golang.org/protobuf/proto" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/clusteringpb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/clusteringpb" ) type CodecAnalyze interface { diff --git a/internal/util/analyzecgowrapper/helper.go b/internal/util/analyzecgowrapper/helper.go index 7b8bbd564b..9df17287e6 100644 --- a/internal/util/analyzecgowrapper/helper.go +++ b/internal/util/analyzecgowrapper/helper.go @@ -29,8 +29,8 @@ import ( "fmt" "unsafe" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // HandleCStatus deal with the error returned from CGO diff --git a/internal/util/bloomfilter/bloom_filter_test.go b/internal/util/bloomfilter/bloom_filter_test.go index 44d78fa075..000a2989df 100644 --- a/internal/util/bloomfilter/bloom_filter_test.go +++ b/internal/util/bloomfilter/bloom_filter_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) func TestPerformance(t *testing.T) { diff --git a/internal/util/cgo/errors.go b/internal/util/cgo/errors.go index 11e703499c..f0ddcf4b36 100644 --- a/internal/util/cgo/errors.go +++ b/internal/util/cgo/errors.go @@ -11,7 +11,7 @@ import "C" import ( "unsafe" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func ConsumeCStatusIntoError(status *C.CStatus) error { diff --git a/internal/util/cgo/executor.go b/internal/util/cgo/executor.go index 0c68b4d660..33505f3b28 100644 --- a/internal/util/cgo/executor.go +++ b/internal/util/cgo/executor.go @@ -12,9 +12,9 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // initExecutor initialize underlying cgo thread pool. diff --git a/internal/util/cgo/futures.go b/internal/util/cgo/futures.go index 8f115737dd..bdc770e5d1 100644 --- a/internal/util/cgo/futures.go +++ b/internal/util/cgo/futures.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) var ErrConsumed = errors.New("future is already consumed") diff --git a/internal/util/cgo/futures_test.go b/internal/util/cgo/futures_test.go index ce6c6551b4..ad3f5c2ae8 100644 --- a/internal/util/cgo/futures_test.go +++ b/internal/util/cgo/futures_test.go @@ -12,8 +12,8 @@ import ( "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMain(m *testing.M) { diff --git a/internal/util/cgo/manager_active.go b/internal/util/cgo/manager_active.go index 37c6011f18..7d225fa5df 100644 --- a/internal/util/cgo/manager_active.go +++ b/internal/util/cgo/manager_active.go @@ -6,8 +6,8 @@ import ( "go.uber.org/atomic" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) const ( diff --git a/internal/util/cgo/pool.go b/internal/util/cgo/pool.go index 789db284e9..ff7080062f 100644 --- a/internal/util/cgo/pool.go +++ b/internal/util/cgo/pool.go @@ -5,9 +5,9 @@ import ( "runtime" "time" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var caller *cgoCaller diff --git a/internal/util/cgoconverter/bytes_converter.go b/internal/util/cgoconverter/bytes_converter.go index 0cd7469563..a3d1cbedff 100644 --- a/internal/util/cgoconverter/bytes_converter.go +++ b/internal/util/cgoconverter/bytes_converter.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "unsafe" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const maxByteArrayLen = math.MaxInt32 diff --git a/internal/util/cgoconverter/bytes_converter_test.go b/internal/util/cgoconverter/bytes_converter_test.go index 4279a780e9..b80e314ea4 100644 --- a/internal/util/cgoconverter/bytes_converter_test.go +++ b/internal/util/cgoconverter/bytes_converter_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" ) func TestBytesConverter(t *testing.T) { diff --git a/internal/util/clustering/clustering.go b/internal/util/clustering/clustering.go index 2c64a5825e..2b8fdb1905 100644 --- a/internal/util/clustering/clustering.go +++ b/internal/util/clustering/clustering.go @@ -5,10 +5,10 @@ import ( "math" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/distance" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/distance" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func CalcVectorDistance(dim int64, dataType schemapb.DataType, left []byte, right []float32, metric string) ([]float32, error) { diff --git a/internal/util/componentutil/component_service.go b/internal/util/componentutil/component_service.go index ed0015d79e..4748fd43ab 100644 --- a/internal/util/componentutil/component_service.go +++ b/internal/util/componentutil/component_service.go @@ -6,8 +6,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // NewComponentStateService create a ComponentStateService diff --git a/internal/util/componentutil/componentutil.go b/internal/util/componentutil/componentutil.go index d89c9db72b..abc9f82f8c 100644 --- a/internal/util/componentutil/componentutil.go +++ b/internal/util/componentutil/componentutil.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) // WaitForComponentStates wait for component's state to be one of the specific states diff --git a/internal/util/componentutil/componentutil_test.go b/internal/util/componentutil/componentutil_test.go index 7f6a5b2734..6547a5abd6 100644 --- a/internal/util/componentutil/componentutil_test.go +++ b/internal/util/componentutil/componentutil_test.go @@ -27,8 +27,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) type MockComponent struct { diff --git a/internal/util/ctokenizer/helper.go b/internal/util/ctokenizer/helper.go index 38e681e201..7b137e2598 100644 --- a/internal/util/ctokenizer/helper.go +++ b/internal/util/ctokenizer/helper.go @@ -11,8 +11,8 @@ import ( "fmt" "unsafe" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // HandleCStatus deal with the error returned from CGO diff --git a/internal/util/ctokenizer/text_schema_validator.go b/internal/util/ctokenizer/text_schema_validator.go index 7127fe3dbd..6a865b5c4c 100644 --- a/internal/util/ctokenizer/text_schema_validator.go +++ b/internal/util/ctokenizer/text_schema_validator.go @@ -14,7 +14,7 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func ValidateTextSchema(fieldSchema *schemapb.FieldSchema, EnableBM25 bool) error { diff --git a/internal/util/dependency/factory.go b/internal/util/dependency/factory.go index 0422faf3c7..c6260e31e3 100644 --- a/internal/util/dependency/factory.go +++ b/internal/util/dependency/factory.go @@ -7,11 +7,11 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) const ( diff --git a/internal/util/dependency/factory_test.go b/internal/util/dependency/factory_test.go index 724aca522e..eb20509abb 100644 --- a/internal/util/dependency/factory_test.go +++ b/internal/util/dependency/factory_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestValidateMQType(t *testing.T) { diff --git a/internal/util/dependency/kv/kv_client_handler.go b/internal/util/dependency/kv/kv_client_handler.go index 4bb8851996..267a8e3092 100644 --- a/internal/util/dependency/kv/kv_client_handler.go +++ b/internal/util/dependency/kv/kv_client_handler.go @@ -6,8 +6,8 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var clientCreator = &etcdClientCreator{} diff --git a/internal/util/dependency/mock_factory.go b/internal/util/dependency/mock_factory.go index 6ff49ebf82..444020a203 100644 --- a/internal/util/dependency/mock_factory.go +++ b/internal/util/dependency/mock_factory.go @@ -5,10 +5,10 @@ package dependency import ( context "context" - msgstream "github.com/milvus-io/milvus/pkg/mq/msgstream" + msgstream "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" mock "github.com/stretchr/testify/mock" - paramtable "github.com/milvus-io/milvus/pkg/util/paramtable" + paramtable "github.com/milvus-io/milvus/pkg/v2/util/paramtable" storage "github.com/milvus-io/milvus/internal/storage" ) diff --git a/internal/util/exprutil/expr_checker.go b/internal/util/exprutil/expr_checker.go index 0f97de44cc..894f869d7d 100644 --- a/internal/util/exprutil/expr_checker.go +++ b/internal/util/exprutil/expr_checker.go @@ -7,7 +7,7 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" ) type KeyType int64 diff --git a/internal/util/exprutil/expr_checker_test.go b/internal/util/exprutil/expr_checker_test.go index ff5a3a0f5b..2a9a3e5f82 100644 --- a/internal/util/exprutil/expr_checker_test.go +++ b/internal/util/exprutil/expr_checker_test.go @@ -10,10 +10,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/parser/planparserv2" "github.com/milvus-io/milvus/internal/util/testutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestParsePartitionKeys(t *testing.T) { diff --git a/internal/util/flowgraph/flow_graph_test.go b/internal/util/flowgraph/flow_graph_test.go index cb867fbf0f..7140d4f1ea 100644 --- a/internal/util/flowgraph/flow_graph_test.go +++ b/internal/util/flowgraph/flow_graph_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // Flow graph basic example: count `c = pow(a) + 2` diff --git a/internal/util/flowgraph/input_node.go b/internal/util/flowgraph/input_node.go index eed9850025..0ad4003127 100644 --- a/internal/util/flowgraph/input_node.go +++ b/internal/util/flowgraph/input_node.go @@ -27,12 +27,12 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/util/flowgraph/input_node_test.go b/internal/util/flowgraph/input_node_test.go index eabc90db0f..d53dacbe13 100644 --- a/internal/util/flowgraph/input_node_test.go +++ b/internal/util/flowgraph/input_node_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestInputNode(t *testing.T) { diff --git a/internal/util/flowgraph/message.go b/internal/util/flowgraph/message.go index 8a9d265ec7..9bbce5fb2b 100644 --- a/internal/util/flowgraph/message.go +++ b/internal/util/flowgraph/message.go @@ -17,7 +17,7 @@ package flowgraph import ( - "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" ) // Msg is an abstract class that contains a method to get the time tick of this message diff --git a/internal/util/flowgraph/message_test.go b/internal/util/flowgraph/message_test.go index 0b4bde0f5f..ae7ce2d412 100644 --- a/internal/util/flowgraph/message_test.go +++ b/internal/util/flowgraph/message_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" ) type MockMsg struct { diff --git a/internal/util/flowgraph/node.go b/internal/util/flowgraph/node.go index 9cb65609ae..b1d4b4a7b5 100644 --- a/internal/util/flowgraph/node.go +++ b/internal/util/flowgraph/node.go @@ -25,8 +25,8 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) const ( diff --git a/internal/util/flowgraph/node_test.go b/internal/util/flowgraph/node_test.go index 352c482045..39060aec3c 100644 --- a/internal/util/flowgraph/node_test.go +++ b/internal/util/flowgraph/node_test.go @@ -28,8 +28,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" ) func generateMsgPack() msgstream.MsgPack { diff --git a/internal/util/flowgraph/type_def.go b/internal/util/flowgraph/type_def.go index 2d08ed7e90..4c2d3c3c82 100644 --- a/internal/util/flowgraph/type_def.go +++ b/internal/util/flowgraph/type_def.go @@ -18,7 +18,7 @@ package flowgraph import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Timestamp shortcut for typeutil.Timestamp diff --git a/internal/util/function/ali_embedding_provider.go b/internal/util/function/ali_embedding_provider.go index cbd74a6cca..9597dd232a 100644 --- a/internal/util/function/ali_embedding_provider.go +++ b/internal/util/function/ali_embedding_provider.go @@ -25,7 +25,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/function/models/ali" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type AliEmbeddingProvider struct { diff --git a/internal/util/function/bedrock_embedding_provider.go b/internal/util/function/bedrock_embedding_provider.go index 32237b2c5a..e08e400cfc 100644 --- a/internal/util/function/bedrock_embedding_provider.go +++ b/internal/util/function/bedrock_embedding_provider.go @@ -31,7 +31,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/bedrockruntime" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type BedrockClient interface { diff --git a/internal/util/function/bm25_function.go b/internal/util/function/bm25_function.go index 22994d756c..bafdb53b22 100644 --- a/internal/util/function/bm25_function.go +++ b/internal/util/function/bm25_function.go @@ -27,7 +27,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/ctokenizer" "github.com/milvus-io/milvus/internal/util/tokenizerapi" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const analyzerParams = "analyzer_params" diff --git a/internal/util/function/cohere_embedding_provider.go b/internal/util/function/cohere_embedding_provider.go index 6ea5017ce4..e0a48c3718 100644 --- a/internal/util/function/cohere_embedding_provider.go +++ b/internal/util/function/cohere_embedding_provider.go @@ -25,7 +25,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/function/models/cohere" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type CohereEmbeddingProvider struct { diff --git a/internal/util/function/function_executor.go b/internal/util/function/function_executor.go index c327da3880..19906efd9a 100644 --- a/internal/util/function/function_executor.go +++ b/internal/util/function/function_executor.go @@ -27,9 +27,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type Runner interface { diff --git a/internal/util/function/function_executor_test.go b/internal/util/function/function_executor_test.go index 14b6136c18..af52fcbed7 100644 --- a/internal/util/function/function_executor_test.go +++ b/internal/util/function/function_executor_test.go @@ -33,9 +33,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/function/models/openai" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) func TestFunctionExecutor(t *testing.T) { diff --git a/internal/util/function/openai_embedding_provider.go b/internal/util/function/openai_embedding_provider.go index 24b248406b..f094370b31 100644 --- a/internal/util/function/openai_embedding_provider.go +++ b/internal/util/function/openai_embedding_provider.go @@ -25,7 +25,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/function/models/openai" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type OpenAIEmbeddingProvider struct { diff --git a/internal/util/function/text_embedding_function.go b/internal/util/function/text_embedding_function.go index 1f8db28bac..fe7f82c539 100644 --- a/internal/util/function/text_embedding_function.go +++ b/internal/util/function/text_embedding_function.go @@ -25,7 +25,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) const ( diff --git a/internal/util/function/text_embedding_function_test.go b/internal/util/function/text_embedding_function_test.go index bcc5437c9d..c3f3a15068 100644 --- a/internal/util/function/text_embedding_function_test.go +++ b/internal/util/function/text_embedding_function_test.go @@ -29,7 +29,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/testutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) func TestTextEmbeddingFunction(t *testing.T) { diff --git a/internal/util/function/vertexai_embedding_provider.go b/internal/util/function/vertexai_embedding_provider.go index e4db4b8061..8da19980b9 100644 --- a/internal/util/function/vertexai_embedding_provider.go +++ b/internal/util/function/vertexai_embedding_provider.go @@ -26,7 +26,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/function/models/vertexai" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type vertexAIJsonKey struct { diff --git a/internal/util/function/voyageai_embedding_provider.go b/internal/util/function/voyageai_embedding_provider.go index 98de41f44e..989a8e6310 100644 --- a/internal/util/function/voyageai_embedding_provider.go +++ b/internal/util/function/voyageai_embedding_provider.go @@ -25,7 +25,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/function/models/voyageai" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type VoyageAIEmbeddingProvider struct { diff --git a/internal/util/funcutil/count_util.go b/internal/util/funcutil/count_util.go index ae2b370aa1..170fc50b35 100644 --- a/internal/util/funcutil/count_util.go +++ b/internal/util/funcutil/count_util.go @@ -6,8 +6,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" ) func CntOfInternalResult(res *internalpb.RetrieveResults) (int64, error) { diff --git a/internal/util/funcutil/count_util_test.go b/internal/util/funcutil/count_util_test.go index 062d3f21aa..1957ca9df3 100644 --- a/internal/util/funcutil/count_util_test.go +++ b/internal/util/funcutil/count_util_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" ) func TestCntOfInternalResult(t *testing.T) { diff --git a/internal/util/grpcclient/auth.go b/internal/util/grpcclient/auth.go index 38043880fd..1d0d91bb55 100644 --- a/internal/util/grpcclient/auth.go +++ b/internal/util/grpcclient/auth.go @@ -3,7 +3,7 @@ package grpcclient import ( "context" - "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/v2/util" ) type Token struct { diff --git a/internal/util/grpcclient/client.go b/internal/util/grpcclient/client.go index 921265e70d..3974d1b0b3 100644 --- a/internal/util/grpcclient/client.go +++ b/internal/util/grpcclient/client.go @@ -38,17 +38,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/generic" - "github.com/milvus-io/milvus/pkg/util/interceptor" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/generic" + "github.com/milvus-io/milvus/pkg/v2/util/interceptor" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type GrpcComponent interface { diff --git a/internal/util/grpcclient/client_test.go b/internal/util/grpcclient/client_test.go index b89b7459d5..168a25104c 100644 --- a/internal/util/grpcclient/client_test.go +++ b/internal/util/grpcclient/client_test.go @@ -40,10 +40,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/streamrpc" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestMain(m *testing.M) { diff --git a/internal/util/grpcclient/local_grpc_client_test.go b/internal/util/grpcclient/local_grpc_client_test.go index 8500b2508e..68475a0461 100644 --- a/internal/util/grpcclient/local_grpc_client_test.go +++ b/internal/util/grpcclient/local_grpc_client_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" ) type mockRootCoordServer struct { diff --git a/internal/util/hookutil/hook.go b/internal/util/hookutil/hook.go index 4d1acb1b11..920cca04aa 100644 --- a/internal/util/hookutil/hook.go +++ b/internal/util/hookutil/hook.go @@ -27,9 +27,9 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/hook" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var ( diff --git a/internal/util/hookutil/hook_test.go b/internal/util/hookutil/hook_test.go index 1cde9f9bf6..bf8d80fc56 100644 --- a/internal/util/hookutil/hook_test.go +++ b/internal/util/hookutil/hook_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestInitHook(t *testing.T) { diff --git a/internal/util/idalloc/allocator.go b/internal/util/idalloc/allocator.go index 1a296891f6..dbc51b4e31 100644 --- a/internal/util/idalloc/allocator.go +++ b/internal/util/idalloc/allocator.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) // batchAllocateSize is the size of batch allocate from remote allocator. diff --git a/internal/util/idalloc/allocator_test.go b/internal/util/idalloc/allocator_test.go index 46dd366ed7..eef24e1b67 100644 --- a/internal/util/idalloc/allocator_test.go +++ b/internal/util/idalloc/allocator_test.go @@ -11,9 +11,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) func TestTimestampAllocator(t *testing.T) { diff --git a/internal/util/idalloc/basic_allocator.go b/internal/util/idalloc/basic_allocator.go index 4b768f323c..3a114e36b9 100644 --- a/internal/util/idalloc/basic_allocator.go +++ b/internal/util/idalloc/basic_allocator.go @@ -9,10 +9,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) var ( diff --git a/internal/util/idalloc/basic_allocator_test.go b/internal/util/idalloc/basic_allocator_test.go index 9f11a8b64e..57805e4f36 100644 --- a/internal/util/idalloc/basic_allocator_test.go +++ b/internal/util/idalloc/basic_allocator_test.go @@ -13,9 +13,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) func TestLocalAllocator(t *testing.T) { diff --git a/internal/util/idalloc/test_mock_root_coord_client.go b/internal/util/idalloc/test_mock_root_coord_client.go index 19a8c42402..21131314a1 100644 --- a/internal/util/idalloc/test_mock_root_coord_client.go +++ b/internal/util/idalloc/test_mock_root_coord_client.go @@ -14,9 +14,9 @@ import ( "google.golang.org/grpc" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) func NewMockRootCoordClient(t *testing.T) *mocks.MockRootCoordClient { diff --git a/internal/util/importutilv2/binlog/filter.go b/internal/util/importutilv2/binlog/filter.go index c63b6e25b5..fd7982905c 100644 --- a/internal/util/importutilv2/binlog/filter.go +++ b/internal/util/importutilv2/binlog/filter.go @@ -17,8 +17,8 @@ package binlog import ( - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type Filter func(row map[int64]interface{}) bool diff --git a/internal/util/importutilv2/binlog/l0_reader.go b/internal/util/importutilv2/binlog/l0_reader.go index eb794548f3..a873a034f0 100644 --- a/internal/util/importutilv2/binlog/l0_reader.go +++ b/internal/util/importutilv2/binlog/l0_reader.go @@ -25,9 +25,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type L0Reader interface { diff --git a/internal/util/importutilv2/binlog/l0_reader_test.go b/internal/util/importutilv2/binlog/l0_reader_test.go index eeae66b05b..8017b4e147 100644 --- a/internal/util/importutilv2/binlog/l0_reader_test.go +++ b/internal/util/importutilv2/binlog/l0_reader_test.go @@ -28,7 +28,7 @@ import ( "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" ) func TestL0Reader_NewL0Reader(t *testing.T) { diff --git a/internal/util/importutilv2/binlog/reader.go b/internal/util/importutilv2/binlog/reader.go index bedfb36933..967fae99aa 100644 --- a/internal/util/importutilv2/binlog/reader.go +++ b/internal/util/importutilv2/binlog/reader.go @@ -27,8 +27,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type reader struct { diff --git a/internal/util/importutilv2/binlog/reader_test.go b/internal/util/importutilv2/binlog/reader_test.go index 80b8f60a9f..16734c73ae 100644 --- a/internal/util/importutilv2/binlog/reader_test.go +++ b/internal/util/importutilv2/binlog/reader_test.go @@ -34,9 +34,9 @@ import ( "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/testutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ReaderSuite struct { diff --git a/internal/util/importutilv2/binlog/util.go b/internal/util/importutilv2/binlog/util.go index 8f316e9609..16e95a9a3a 100644 --- a/internal/util/importutilv2/binlog/util.go +++ b/internal/util/importutilv2/binlog/util.go @@ -25,8 +25,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func readData(reader *storage.BinlogReader, et storage.EventTypeCode) ([]any, [][]bool, error) { diff --git a/internal/util/importutilv2/common/util.go b/internal/util/importutilv2/common/util.go index bb6e86d730..c5daeeac8a 100644 --- a/internal/util/importutilv2/common/util.go +++ b/internal/util/importutilv2/common/util.go @@ -23,7 +23,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func FillDynamicData(data *storage.InsertData, schema *schemapb.CollectionSchema) error { diff --git a/internal/util/importutilv2/common/util_test.go b/internal/util/importutilv2/common/util_test.go index cc7f14b531..34222fce95 100644 --- a/internal/util/importutilv2/common/util_test.go +++ b/internal/util/importutilv2/common/util_test.go @@ -23,7 +23,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) func TestUtil_EstimateReadCountPerBatch(t *testing.T) { diff --git a/internal/util/importutilv2/csv/reader.go b/internal/util/importutilv2/csv/reader.go index 375b79bfd4..076e32ccbd 100644 --- a/internal/util/importutilv2/csv/reader.go +++ b/internal/util/importutilv2/csv/reader.go @@ -28,8 +28,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/importutilv2/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type Row = map[storage.FieldID]any diff --git a/internal/util/importutilv2/csv/reader_test.go b/internal/util/importutilv2/csv/reader_test.go index c00c1a2511..642b4d4825 100644 --- a/internal/util/importutilv2/csv/reader_test.go +++ b/internal/util/importutilv2/csv/reader_test.go @@ -30,8 +30,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/testutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type ReaderSuite struct { diff --git a/internal/util/importutilv2/csv/row_parser.go b/internal/util/importutilv2/csv/row_parser.go index bee68e3eb3..2e19d033e8 100644 --- a/internal/util/importutilv2/csv/row_parser.go +++ b/internal/util/importutilv2/csv/row_parser.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/importutilv2/common" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/parameterutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/parameterutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type RowParser interface { diff --git a/internal/util/importutilv2/csv/row_parser_test.go b/internal/util/importutilv2/csv/row_parser_test.go index ef6f0af552..6f0a4948f1 100644 --- a/internal/util/importutilv2/csv/row_parser_test.go +++ b/internal/util/importutilv2/csv/row_parser_test.go @@ -26,7 +26,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) func TestNewRowParser_Invalid(t *testing.T) { diff --git a/internal/util/importutilv2/json/reader.go b/internal/util/importutilv2/json/reader.go index 7606600914..ec6c2e38c5 100644 --- a/internal/util/importutilv2/json/reader.go +++ b/internal/util/importutilv2/json/reader.go @@ -28,7 +28,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/importutilv2/common" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) const ( diff --git a/internal/util/importutilv2/json/reader_test.go b/internal/util/importutilv2/json/reader_test.go index 5569d77fdb..aa5ac2432f 100644 --- a/internal/util/importutilv2/json/reader_test.go +++ b/internal/util/importutilv2/json/reader_test.go @@ -33,8 +33,8 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/nullutil" "github.com/milvus-io/milvus/internal/util/testutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type ReaderSuite struct { diff --git a/internal/util/importutilv2/json/row_parser.go b/internal/util/importutilv2/json/row_parser.go index c61f685e1e..ecbe252867 100644 --- a/internal/util/importutilv2/json/row_parser.go +++ b/internal/util/importutilv2/json/row_parser.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/importutilv2/common" "github.com/milvus-io/milvus/internal/util/nullutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/parameterutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/parameterutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type RowParser interface { diff --git a/internal/util/importutilv2/json/row_parser_test.go b/internal/util/importutilv2/json/row_parser_test.go index 89b934224c..72a7fa2e27 100644 --- a/internal/util/importutilv2/json/row_parser_test.go +++ b/internal/util/importutilv2/json/row_parser_test.go @@ -25,7 +25,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) func TestRowParser_Parse_Valid(t *testing.T) { diff --git a/internal/util/importutilv2/numpy/field_reader.go b/internal/util/importutilv2/numpy/field_reader.go index 369654d100..2a5223a4aa 100644 --- a/internal/util/importutilv2/numpy/field_reader.go +++ b/internal/util/importutilv2/numpy/field_reader.go @@ -30,9 +30,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/importutilv2/common" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/parameterutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/parameterutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type FieldReader struct { diff --git a/internal/util/importutilv2/numpy/reader.go b/internal/util/importutilv2/numpy/reader.go index dd754f03dd..710c8950c0 100644 --- a/internal/util/importutilv2/numpy/reader.go +++ b/internal/util/importutilv2/numpy/reader.go @@ -29,7 +29,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/importutilv2/common" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type reader struct { diff --git a/internal/util/importutilv2/numpy/reader_test.go b/internal/util/importutilv2/numpy/reader_test.go index 759b99892f..d83b1219d9 100644 --- a/internal/util/importutilv2/numpy/reader_test.go +++ b/internal/util/importutilv2/numpy/reader_test.go @@ -37,9 +37,9 @@ import ( "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/testutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ReaderSuite struct { diff --git a/internal/util/importutilv2/numpy/util.go b/internal/util/importutilv2/numpy/util.go index e9d9d8d7c0..3ca4eb69d8 100644 --- a/internal/util/importutilv2/numpy/util.go +++ b/internal/util/importutilv2/numpy/util.go @@ -29,7 +29,7 @@ import ( "golang.org/x/text/encoding/unicode" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) var ( diff --git a/internal/util/importutilv2/option.go b/internal/util/importutilv2/option.go index f4e72ca6f2..a9848ab2d2 100644 --- a/internal/util/importutilv2/option.go +++ b/internal/util/importutilv2/option.go @@ -26,9 +26,9 @@ import ( "github.com/samber/lo" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) const ( diff --git a/internal/util/importutilv2/option_test.go b/internal/util/importutilv2/option_test.go index 0a5deedad9..27f3438d50 100644 --- a/internal/util/importutilv2/option_test.go +++ b/internal/util/importutilv2/option_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) func TestOption_GetTimeout(t *testing.T) { diff --git a/internal/util/importutilv2/parquet/field_reader.go b/internal/util/importutilv2/parquet/field_reader.go index 99c0c2f754..f04dfdebd9 100644 --- a/internal/util/importutilv2/parquet/field_reader.go +++ b/internal/util/importutilv2/parquet/field_reader.go @@ -31,9 +31,9 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/importutilv2/common" "github.com/milvus-io/milvus/internal/util/nullutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/parameterutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/parameterutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type FieldReader struct { diff --git a/internal/util/importutilv2/parquet/reader.go b/internal/util/importutilv2/parquet/reader.go index 19f3631a9e..07b08a3a1f 100644 --- a/internal/util/importutilv2/parquet/reader.go +++ b/internal/util/importutilv2/parquet/reader.go @@ -31,8 +31,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/importutilv2/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type reader struct { diff --git a/internal/util/importutilv2/parquet/reader_test.go b/internal/util/importutilv2/parquet/reader_test.go index 46b98923c9..82f55e045e 100644 --- a/internal/util/importutilv2/parquet/reader_test.go +++ b/internal/util/importutilv2/parquet/reader_test.go @@ -36,9 +36,9 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/nullutil" "github.com/milvus-io/milvus/internal/util/testutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ReaderSuite struct { diff --git a/internal/util/importutilv2/parquet/util.go b/internal/util/importutilv2/parquet/util.go index 18dd81a24a..6489404a65 100644 --- a/internal/util/importutilv2/parquet/util.go +++ b/internal/util/importutilv2/parquet/util.go @@ -25,8 +25,8 @@ import ( "github.com/samber/lo" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func WrapTypeErr(expect string, actual string, field *schemapb.FieldSchema) error { diff --git a/internal/util/importutilv2/reader.go b/internal/util/importutilv2/reader.go index 8324250ba2..ae1ac66946 100644 --- a/internal/util/importutilv2/reader.go +++ b/internal/util/importutilv2/reader.go @@ -26,8 +26,8 @@ import ( "github.com/milvus-io/milvus/internal/util/importutilv2/json" "github.com/milvus-io/milvus/internal/util/importutilv2/numpy" "github.com/milvus-io/milvus/internal/util/importutilv2/parquet" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) //go:generate mockery --name=Reader --structname=MockReader --output=./ --filename=mock_reader.go --with-expecter --inpackage diff --git a/internal/util/importutilv2/util.go b/internal/util/importutilv2/util.go index ae7bdf6693..27ac7bdb52 100644 --- a/internal/util/importutilv2/util.go +++ b/internal/util/importutilv2/util.go @@ -22,8 +22,8 @@ import ( "github.com/samber/lo" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type FileType int diff --git a/internal/util/indexcgowrapper/build_index_info.go b/internal/util/indexcgowrapper/build_index_info.go index 41838647d0..025458673b 100644 --- a/internal/util/indexcgowrapper/build_index_info.go +++ b/internal/util/indexcgowrapper/build_index_info.go @@ -31,8 +31,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/indexcgopb" - "github.com/milvus-io/milvus/pkg/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexcgopb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" ) type BuildIndexInfo struct { diff --git a/internal/util/indexcgowrapper/codec_index_test.go b/internal/util/indexcgowrapper/codec_index_test.go index 3790fbc923..aaecc98f58 100644 --- a/internal/util/indexcgowrapper/codec_index_test.go +++ b/internal/util/indexcgowrapper/codec_index_test.go @@ -11,11 +11,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/indexpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMain(m *testing.M) { diff --git a/internal/util/indexcgowrapper/helper.go b/internal/util/indexcgowrapper/helper.go index 6ebbd9009e..a599b35864 100644 --- a/internal/util/indexcgowrapper/helper.go +++ b/internal/util/indexcgowrapper/helper.go @@ -13,8 +13,8 @@ import ( "fmt" "unsafe" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func GetBinarySetKeys(cBinarySet C.CBinarySet) ([]string, error) { diff --git a/internal/util/indexcgowrapper/index.go b/internal/util/indexcgowrapper/index.go index cc0b3a55cb..9b3dfc14b3 100644 --- a/internal/util/indexcgowrapper/index.go +++ b/internal/util/indexcgowrapper/index.go @@ -24,9 +24,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/segcore" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/cgopb" - "github.com/milvus-io/milvus/pkg/proto/indexcgopb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/cgopb" + "github.com/milvus-io/milvus/pkg/v2/proto/indexcgopb" ) type Blob = storage.Blob diff --git a/internal/util/indexcgowrapper/index_test.go b/internal/util/indexcgowrapper/index_test.go index c9c170617c..8cebaa18fb 100644 --- a/internal/util/indexcgowrapper/index_test.go +++ b/internal/util/indexcgowrapper/index_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) const ( diff --git a/internal/util/indexparamcheck/base_checker_test.go b/internal/util/indexparamcheck/base_checker_test.go index 99333f5d1f..9cdc206436 100644 --- a/internal/util/indexparamcheck/base_checker_test.go +++ b/internal/util/indexparamcheck/base_checker_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) func Test_baseChecker_CheckTrain(t *testing.T) { diff --git a/internal/util/indexparamcheck/bin_flat_checker_test.go b/internal/util/indexparamcheck/bin_flat_checker_test.go index 9f747afb65..93896e285f 100644 --- a/internal/util/indexparamcheck/bin_flat_checker_test.go +++ b/internal/util/indexparamcheck/bin_flat_checker_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) func Test_binFlatChecker_CheckTrain(t *testing.T) { diff --git a/internal/util/indexparamcheck/bin_ivf_flat_checker_test.go b/internal/util/indexparamcheck/bin_ivf_flat_checker_test.go index cf82b97d84..d3cff273e6 100644 --- a/internal/util/indexparamcheck/bin_ivf_flat_checker_test.go +++ b/internal/util/indexparamcheck/bin_ivf_flat_checker_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) func Test_binIVFFlatChecker_CheckTrain(t *testing.T) { diff --git a/internal/util/indexparamcheck/bitmap_index_checker.go b/internal/util/indexparamcheck/bitmap_index_checker.go index 37eba2f51d..bbda35816f 100644 --- a/internal/util/indexparamcheck/bitmap_index_checker.go +++ b/internal/util/indexparamcheck/bitmap_index_checker.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type BITMAPChecker struct { diff --git a/internal/util/indexparamcheck/cagra_checker_test.go b/internal/util/indexparamcheck/cagra_checker_test.go index 4fc1127038..a258cf1935 100644 --- a/internal/util/indexparamcheck/cagra_checker_test.go +++ b/internal/util/indexparamcheck/cagra_checker_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) func Test_cagraChecker_CheckTrain(t *testing.T) { diff --git a/internal/util/indexparamcheck/constraints.go b/internal/util/indexparamcheck/constraints.go index 6f54ad8554..17e6acbc02 100644 --- a/internal/util/indexparamcheck/constraints.go +++ b/internal/util/indexparamcheck/constraints.go @@ -1,8 +1,8 @@ package indexparamcheck import ( - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) const ( diff --git a/internal/util/indexparamcheck/diskann_checker_test.go b/internal/util/indexparamcheck/diskann_checker_test.go index 50d692ea34..752e82580c 100644 --- a/internal/util/indexparamcheck/diskann_checker_test.go +++ b/internal/util/indexparamcheck/diskann_checker_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) func Test_diskannChecker_CheckTrain(t *testing.T) { diff --git a/internal/util/indexparamcheck/flat_checker_test.go b/internal/util/indexparamcheck/flat_checker_test.go index e6991c571e..aee817dd43 100644 --- a/internal/util/indexparamcheck/flat_checker_test.go +++ b/internal/util/indexparamcheck/flat_checker_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) func Test_flatChecker_CheckTrain(t *testing.T) { diff --git a/internal/util/indexparamcheck/hnsw_checker_test.go b/internal/util/indexparamcheck/hnsw_checker_test.go index fbb33dc3b0..8dfad02025 100644 --- a/internal/util/indexparamcheck/hnsw_checker_test.go +++ b/internal/util/indexparamcheck/hnsw_checker_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) func Test_hnswChecker_CheckTrain(t *testing.T) { diff --git a/internal/util/indexparamcheck/hybrid_index_checker.go b/internal/util/indexparamcheck/hybrid_index_checker.go index 08dfe03943..63c10d384e 100644 --- a/internal/util/indexparamcheck/hybrid_index_checker.go +++ b/internal/util/indexparamcheck/hybrid_index_checker.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type HYBRIDChecker struct { diff --git a/internal/util/indexparamcheck/index_checker_test.go b/internal/util/indexparamcheck/index_checker_test.go index b9bdaff2c5..510bb6df5b 100644 --- a/internal/util/indexparamcheck/index_checker_test.go +++ b/internal/util/indexparamcheck/index_checker_test.go @@ -14,7 +14,7 @@ package indexparamcheck import ( "strconv" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) // TODO: add more test cases which `IndexChecker.CheckTrain` return false, diff --git a/internal/util/indexparamcheck/index_type.go b/internal/util/indexparamcheck/index_type.go index 2d9cfe15aa..45bdbdc747 100644 --- a/internal/util/indexparamcheck/index_type.go +++ b/internal/util/indexparamcheck/index_type.go @@ -16,7 +16,7 @@ import ( "strconv" "github.com/milvus-io/milvus/internal/util/vecindexmgr" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) // IndexType string. diff --git a/internal/util/indexparamcheck/index_type_test.go b/internal/util/indexparamcheck/index_type_test.go index d350ee9121..5b744ed6b8 100644 --- a/internal/util/indexparamcheck/index_type_test.go +++ b/internal/util/indexparamcheck/index_type_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) func TestIsScalarMmapIndex(t *testing.T) { diff --git a/internal/util/indexparamcheck/inverted_checker.go b/internal/util/indexparamcheck/inverted_checker.go index 5690562db9..9e95b1582d 100644 --- a/internal/util/indexparamcheck/inverted_checker.go +++ b/internal/util/indexparamcheck/inverted_checker.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // INVERTEDChecker checks if a INVERTED index can be built. diff --git a/internal/util/indexparamcheck/ivf_base_checker_test.go b/internal/util/indexparamcheck/ivf_base_checker_test.go index dfe115f2eb..fa76f1b6bf 100644 --- a/internal/util/indexparamcheck/ivf_base_checker_test.go +++ b/internal/util/indexparamcheck/ivf_base_checker_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) func Test_ivfBaseChecker_CheckTrain(t *testing.T) { diff --git a/internal/util/indexparamcheck/ivf_pq_checker_test.go b/internal/util/indexparamcheck/ivf_pq_checker_test.go index 6af97de612..ccf88bec82 100644 --- a/internal/util/indexparamcheck/ivf_pq_checker_test.go +++ b/internal/util/indexparamcheck/ivf_pq_checker_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) func Test_ivfPQChecker_CheckTrain(t *testing.T) { diff --git a/internal/util/indexparamcheck/ivf_sq_checker_test.go b/internal/util/indexparamcheck/ivf_sq_checker_test.go index ee37eea78d..b57781e3d3 100644 --- a/internal/util/indexparamcheck/ivf_sq_checker_test.go +++ b/internal/util/indexparamcheck/ivf_sq_checker_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) func Test_ivfSQChecker_CheckTrain(t *testing.T) { diff --git a/internal/util/indexparamcheck/raft_brute_force_checker_test.go b/internal/util/indexparamcheck/raft_brute_force_checker_test.go index 6f5fd9a0ec..1a0b7fb4eb 100644 --- a/internal/util/indexparamcheck/raft_brute_force_checker_test.go +++ b/internal/util/indexparamcheck/raft_brute_force_checker_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) func Test_raftbfChecker_CheckTrain(t *testing.T) { diff --git a/internal/util/indexparamcheck/raft_ivf_flat_checker_test.go b/internal/util/indexparamcheck/raft_ivf_flat_checker_test.go index d2debb90b7..863d31cc3b 100644 --- a/internal/util/indexparamcheck/raft_ivf_flat_checker_test.go +++ b/internal/util/indexparamcheck/raft_ivf_flat_checker_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) func Test_raftIvfFlatChecker_CheckTrain(t *testing.T) { diff --git a/internal/util/indexparamcheck/raft_ivf_pq_checker_test.go b/internal/util/indexparamcheck/raft_ivf_pq_checker_test.go index fcbda59063..04d87dd2ad 100644 --- a/internal/util/indexparamcheck/raft_ivf_pq_checker_test.go +++ b/internal/util/indexparamcheck/raft_ivf_pq_checker_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) func Test_raftIVFPQChecker_CheckTrain(t *testing.T) { diff --git a/internal/util/indexparamcheck/scann_checker_test.go b/internal/util/indexparamcheck/scann_checker_test.go index dd4fc4eb24..00f4d0a26f 100644 --- a/internal/util/indexparamcheck/scann_checker_test.go +++ b/internal/util/indexparamcheck/scann_checker_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) func Test_scaNNChecker_CheckTrain(t *testing.T) { diff --git a/internal/util/indexparamcheck/sparse_float_vector_base_checker_test.go b/internal/util/indexparamcheck/sparse_float_vector_base_checker_test.go index c05dbdb69c..079a0b5d55 100644 --- a/internal/util/indexparamcheck/sparse_float_vector_base_checker_test.go +++ b/internal/util/indexparamcheck/sparse_float_vector_base_checker_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) func Test_sparseFloatVectorBaseChecker_StaticCheck(t *testing.T) { diff --git a/internal/util/indexparamcheck/stl_sort_checker.go b/internal/util/indexparamcheck/stl_sort_checker.go index 7681bea7a6..35c0c0defe 100644 --- a/internal/util/indexparamcheck/stl_sort_checker.go +++ b/internal/util/indexparamcheck/stl_sort_checker.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // STLSORTChecker checks if a STL_SORT index can be built. diff --git a/internal/util/indexparamcheck/trie_checker.go b/internal/util/indexparamcheck/trie_checker.go index 5666e4d6a7..2f510dfb61 100644 --- a/internal/util/indexparamcheck/trie_checker.go +++ b/internal/util/indexparamcheck/trie_checker.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // TRIEChecker checks if a TRIE index can be built. diff --git a/internal/util/indexparamcheck/utils.go b/internal/util/indexparamcheck/utils.go index c392b7d4e1..2717436e51 100644 --- a/internal/util/indexparamcheck/utils.go +++ b/internal/util/indexparamcheck/utils.go @@ -21,9 +21,9 @@ import ( "strconv" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // CheckIntByRange check if the data corresponding to the key is in the range of [min, max]. diff --git a/internal/util/indexparamcheck/utils_test.go b/internal/util/indexparamcheck/utils_test.go index f833005b86..da4f7e94c6 100644 --- a/internal/util/indexparamcheck/utils_test.go +++ b/internal/util/indexparamcheck/utils_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func Test_CheckIntByRange(t *testing.T) { diff --git a/internal/util/indexparamcheck/vector_index_checker.go b/internal/util/indexparamcheck/vector_index_checker.go index bd6e57eb1f..dfb5902cc3 100644 --- a/internal/util/indexparamcheck/vector_index_checker.go +++ b/internal/util/indexparamcheck/vector_index_checker.go @@ -18,10 +18,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/vecindexmgr" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/indexcgopb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/indexcgopb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type vecIndexChecker struct { diff --git a/internal/util/initcore/init_core.go b/internal/util/initcore/init_core.go index 520673f3ab..0c871c624f 100644 --- a/internal/util/initcore/init_core.go +++ b/internal/util/initcore/init_core.go @@ -37,8 +37,8 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func InitLocalChunkManager(path string) { diff --git a/internal/util/initcore/init_core_test.go b/internal/util/initcore/init_core_test.go index 25eefa8355..1cbefef44c 100644 --- a/internal/util/initcore/init_core_test.go +++ b/internal/util/initcore/init_core_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestTracer(t *testing.T) { diff --git a/internal/util/metrics/c_registry.go b/internal/util/metrics/c_registry.go index 9d4963f623..bf8a7bf82c 100644 --- a/internal/util/metrics/c_registry.go +++ b/internal/util/metrics/c_registry.go @@ -40,7 +40,7 @@ import ( "go.uber.org/zap" "golang.org/x/exp/maps" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) // metricSorter is a sortable slice of *dto.Metric. diff --git a/internal/util/metrics/thread.go b/internal/util/metrics/thread.go index ae4af36050..23d75116e6 100644 --- a/internal/util/metrics/thread.go +++ b/internal/util/metrics/thread.go @@ -25,8 +25,8 @@ import ( "github.com/shirou/gopsutil/v4/process" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" ) // theadWatcher is the utility to update milvus process thread number metrics. diff --git a/internal/util/metrics/utils.go b/internal/util/metrics/utils.go index d4a1fb1e8e..9a97e5be54 100644 --- a/internal/util/metrics/utils.go +++ b/internal/util/metrics/utils.go @@ -5,8 +5,8 @@ import ( "github.com/samber/lo" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" ) func NewSegmentFrom(segment *datapb.SegmentInfo) *metricsinfo.Segment { diff --git a/internal/util/mock/grpc_datanode_client.go b/internal/util/mock/grpc_datanode_client.go index 9aa4573ba4..59d1997973 100644 --- a/internal/util/mock/grpc_datanode_client.go +++ b/internal/util/mock/grpc_datanode_client.go @@ -23,8 +23,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" ) var _ datapb.DataNodeClient = &GrpcDataNodeClient{} diff --git a/internal/util/mock/grpc_querycoord_client.go b/internal/util/mock/grpc_querycoord_client.go index 9fc85dfa40..b3727dee02 100644 --- a/internal/util/mock/grpc_querycoord_client.go +++ b/internal/util/mock/grpc_querycoord_client.go @@ -23,8 +23,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) // Check if GrpcQueryCoordClient implements proto.GrpcQueryCoordClient diff --git a/internal/util/mock/grpc_querynode_client.go b/internal/util/mock/grpc_querynode_client.go index 1a2e2e0a7e..60a1069e0b 100644 --- a/internal/util/mock/grpc_querynode_client.go +++ b/internal/util/mock/grpc_querynode_client.go @@ -24,8 +24,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/util/streamrpc" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) var _ querypb.QueryNodeClient = &GrpcQueryNodeClient{} diff --git a/internal/util/mock/grpc_rootcoord_client.go b/internal/util/mock/grpc_rootcoord_client.go index 2a415f8576..41d2274cad 100644 --- a/internal/util/mock/grpc_rootcoord_client.go +++ b/internal/util/mock/grpc_rootcoord_client.go @@ -23,12 +23,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/proto/rootcoordpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/uniquegenerator" ) var _ rootcoordpb.RootCoordClient = &GrpcRootCoordClient{} diff --git a/internal/util/mock/grpcclient.go b/internal/util/mock/grpcclient.go index 448f014f15..2238c4d442 100644 --- a/internal/util/mock/grpcclient.go +++ b/internal/util/mock/grpcclient.go @@ -26,11 +26,11 @@ import ( "google.golang.org/grpc" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/tracer" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/generic" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/tracer" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/generic" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) type GRPCClientBase[T any] struct { diff --git a/internal/util/nullutil/nullutil.go b/internal/util/nullutil/nullutil.go index ed29d6af76..a14b969517 100644 --- a/internal/util/nullutil/nullutil.go +++ b/internal/util/nullutil/nullutil.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func CheckValidData(validData []bool, schema *schemapb.FieldSchema, numRows int) error { diff --git a/internal/util/pipeline/node.go b/internal/util/pipeline/node.go index def0331794..77a294b9aa 100644 --- a/internal/util/pipeline/node.go +++ b/internal/util/pipeline/node.go @@ -17,7 +17,7 @@ package pipeline import ( - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) type Node interface { diff --git a/internal/util/pipeline/pipeline.go b/internal/util/pipeline/pipeline.go index 6e85f2d998..3ec1cff148 100644 --- a/internal/util/pipeline/pipeline.go +++ b/internal/util/pipeline/pipeline.go @@ -22,8 +22,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) type Pipeline interface { diff --git a/internal/util/pipeline/pipeline_test.go b/internal/util/pipeline/pipeline_test.go index 909893d458..236ba5bdd8 100644 --- a/internal/util/pipeline/pipeline_test.go +++ b/internal/util/pipeline/pipeline_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" ) type testNode struct { diff --git a/internal/util/pipeline/stream_pipeline.go b/internal/util/pipeline/stream_pipeline.go index ce60350b91..3c44507b22 100644 --- a/internal/util/pipeline/stream_pipeline.go +++ b/internal/util/pipeline/stream_pipeline.go @@ -29,17 +29,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus/internal/distributed/streaming" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/message/adaptor" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message/adaptor" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) type StreamPipeline interface { diff --git a/internal/util/pipeline/stream_pipeline_test.go b/internal/util/pipeline/stream_pipeline_test.go index 41154f3728..f18194b08a 100644 --- a/internal/util/pipeline/stream_pipeline_test.go +++ b/internal/util/pipeline/stream_pipeline_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type StreamPipelineSuite struct { diff --git a/internal/util/proxyutil/mock_proxy_client_manager.go b/internal/util/proxyutil/mock_proxy_client_manager.go index e2cf971e27..e2244e6b76 100644 --- a/internal/util/proxyutil/mock_proxy_client_manager.go +++ b/internal/util/proxyutil/mock_proxy_client_manager.go @@ -8,13 +8,13 @@ import ( milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" mock "github.com/stretchr/testify/mock" - proxypb "github.com/milvus-io/milvus/pkg/proto/proxypb" + proxypb "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" sessionutil "github.com/milvus-io/milvus/internal/util/sessionutil" types "github.com/milvus-io/milvus/internal/types" - typeutil "github.com/milvus-io/milvus/pkg/util/typeutil" + typeutil "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // MockProxyClientManager is an autogenerated mock type for the ProxyClientManagerInterface type diff --git a/internal/util/proxyutil/proxy_client_manager.go b/internal/util/proxyutil/proxy_client_manager.go index f5a98b9cd8..7693683055 100644 --- a/internal/util/proxyutil/proxy_client_manager.go +++ b/internal/util/proxyutil/proxy_client_manager.go @@ -30,13 +30,13 @@ import ( grpcproxyclient "github.com/milvus-io/milvus/internal/distributed/proxy/client" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ExpireCacheConfig struct { diff --git a/internal/util/proxyutil/proxy_client_manager_test.go b/internal/util/proxyutil/proxy_client_manager_test.go index 03ba4e8a5e..f0d2e03fc5 100644 --- a/internal/util/proxyutil/proxy_client_manager_test.go +++ b/internal/util/proxyutil/proxy_client_manager_test.go @@ -31,9 +31,9 @@ import ( "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type UniqueID = int64 diff --git a/internal/util/proxyutil/proxy_watcher.go b/internal/util/proxyutil/proxy_watcher.go index 529024736e..a0c845f84b 100644 --- a/internal/util/proxyutil/proxy_watcher.go +++ b/internal/util/proxyutil/proxy_watcher.go @@ -31,10 +31,10 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/lifetime" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/lifetime" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ProxyWatcherInterface interface { diff --git a/internal/util/proxyutil/proxy_watcher_test.go b/internal/util/proxyutil/proxy_watcher_test.go index f015a5433d..7016d85e1a 100644 --- a/internal/util/proxyutil/proxy_watcher_test.go +++ b/internal/util/proxyutil/proxy_watcher_test.go @@ -28,9 +28,9 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestProxyManager(t *testing.T) { diff --git a/internal/util/quota/quota_constant.go b/internal/util/quota/quota_constant.go index 94b1a31610..4b6c43c88e 100644 --- a/internal/util/quota/quota_constant.go +++ b/internal/util/quota/quota_constant.go @@ -24,11 +24,11 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var ( diff --git a/internal/util/quota/quota_constant_test.go b/internal/util/quota/quota_constant_test.go index 4179c51941..561d6e0c35 100644 --- a/internal/util/quota/quota_constant_test.go +++ b/internal/util/quota/quota_constant_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestGetQuotaConfigMap(t *testing.T) { diff --git a/internal/util/ratelimitutil/rate_limiter_tree.go b/internal/util/ratelimitutil/rate_limiter_tree.go index 5ae9c0b9db..686bf268ce 100644 --- a/internal/util/ratelimitutil/rate_limiter_tree.go +++ b/internal/util/ratelimitutil/rate_limiter_tree.go @@ -23,11 +23,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/ratelimitutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type RateLimiterNode struct { diff --git a/internal/util/ratelimitutil/rate_limiter_tree_test.go b/internal/util/ratelimitutil/rate_limiter_tree_test.go index ab56ce8a6e..6a22d405ac 100644 --- a/internal/util/ratelimitutil/rate_limiter_tree_test.go +++ b/internal/util/ratelimitutil/rate_limiter_tree_test.go @@ -26,11 +26,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/ratelimitutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestRateLimiterNode_AddAndGetChild(t *testing.T) { diff --git a/internal/util/searchutil/optimizers/query_hook.go b/internal/util/searchutil/optimizers/query_hook.go index 0bed21940a..9d33ca6ebb 100644 --- a/internal/util/searchutil/optimizers/query_hook.go +++ b/internal/util/searchutil/optimizers/query_hook.go @@ -7,13 +7,13 @@ import ( "go.uber.org/zap" "google.golang.org/protobuf/proto" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // QueryHook is the interface for search/query parameter optimizer. diff --git a/internal/util/searchutil/optimizers/query_hook_test.go b/internal/util/searchutil/optimizers/query_hook_test.go index 1f405b9bb2..cf6053e66c 100644 --- a/internal/util/searchutil/optimizers/query_hook_test.go +++ b/internal/util/searchutil/optimizers/query_hook_test.go @@ -9,12 +9,12 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus/internal/mocks/util/searchutil/mock_optimizers" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type QueryHookSuite struct { diff --git a/internal/util/searchutil/scheduler/concurrent_safe_scheduler.go b/internal/util/searchutil/scheduler/concurrent_safe_scheduler.go index 7d04fe7c18..a157c1f814 100644 --- a/internal/util/searchutil/scheduler/concurrent_safe_scheduler.go +++ b/internal/util/searchutil/scheduler/concurrent_safe_scheduler.go @@ -8,12 +8,12 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/querynodev2/collector" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/lifetime" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/lifetime" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) const ( diff --git a/internal/util/searchutil/scheduler/concurrent_safe_scheduler_test.go b/internal/util/searchutil/scheduler/concurrent_safe_scheduler_test.go index 4017ff88f8..11a32bfa30 100644 --- a/internal/util/searchutil/scheduler/concurrent_safe_scheduler_test.go +++ b/internal/util/searchutil/scheduler/concurrent_safe_scheduler_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/suite" "go.uber.org/atomic" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/lifetime" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/lifetime" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestScheduler(t *testing.T) { diff --git a/internal/util/searchutil/scheduler/fifo_policy.go b/internal/util/searchutil/scheduler/fifo_policy.go index e23b04eaf1..d4190905f0 100644 --- a/internal/util/searchutil/scheduler/fifo_policy.go +++ b/internal/util/searchutil/scheduler/fifo_policy.go @@ -1,7 +1,7 @@ package scheduler import ( - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var _ schedulePolicy = &fifoPolicy{} diff --git a/internal/util/searchutil/scheduler/mock_task_test.go b/internal/util/searchutil/scheduler/mock_task_test.go index eae4d2f7ed..2294473f6b 100644 --- a/internal/util/searchutil/scheduler/mock_task_test.go +++ b/internal/util/searchutil/scheduler/mock_task_test.go @@ -5,8 +5,8 @@ import ( "math/rand" "time" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) var ( diff --git a/internal/util/searchutil/scheduler/policy_test.go b/internal/util/searchutil/scheduler/policy_test.go index c88b9972b8..1a2328cf34 100644 --- a/internal/util/searchutil/scheduler/policy_test.go +++ b/internal/util/searchutil/scheduler/policy_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestUserTaskPollingPolicy(t *testing.T) { diff --git a/internal/util/searchutil/scheduler/tasks.go b/internal/util/searchutil/scheduler/tasks.go index f221eb518b..adad009d63 100644 --- a/internal/util/searchutil/scheduler/tasks.go +++ b/internal/util/searchutil/scheduler/tasks.go @@ -1,6 +1,6 @@ package scheduler -import "github.com/milvus-io/milvus/pkg/proto/internalpb" +import "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" const ( schedulePolicyNameFIFO = "fifo" diff --git a/internal/util/searchutil/scheduler/user_task_polling_policy.go b/internal/util/searchutil/scheduler/user_task_polling_policy.go index 3a9f86f5e5..c206c4682d 100644 --- a/internal/util/searchutil/scheduler/user_task_polling_policy.go +++ b/internal/util/searchutil/scheduler/user_task_polling_policy.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var _ schedulePolicy = &userTaskPollingPolicy{} diff --git a/internal/util/segcore/cgo_util.go b/internal/util/segcore/cgo_util.go index 9a4298b38e..6d0b5ba47f 100644 --- a/internal/util/segcore/cgo_util.go +++ b/internal/util/segcore/cgo_util.go @@ -35,7 +35,7 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus/internal/util/cgoconverter" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type CStatus = C.CStatus diff --git a/internal/util/segcore/cgo_util_test.go b/internal/util/segcore/cgo_util_test.go index e5486aa4ca..5738d0de57 100644 --- a/internal/util/segcore/cgo_util_test.go +++ b/internal/util/segcore/cgo_util_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/protobuf/proto" - "github.com/milvus-io/milvus/pkg/proto/cgopb" + "github.com/milvus-io/milvus/pkg/v2/proto/cgopb" ) func TestConsumeCStatusIntoError(t *testing.T) { diff --git a/internal/util/segcore/collection.go b/internal/util/segcore/collection.go index 04a5a94f1c..94bea2c4fd 100644 --- a/internal/util/segcore/collection.go +++ b/internal/util/segcore/collection.go @@ -15,7 +15,7 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" ) // CreateCCollectionRequest is a request to create a CCollection. diff --git a/internal/util/segcore/collection_test.go b/internal/util/segcore/collection_test.go index ff649351d0..00a03ab523 100644 --- a/internal/util/segcore/collection_test.go +++ b/internal/util/segcore/collection_test.go @@ -8,7 +8,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/mocks/util/mock_segcore" "github.com/milvus-io/milvus/internal/util/segcore" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestCollection(t *testing.T) { diff --git a/internal/util/segcore/plan.go b/internal/util/segcore/plan.go index 516807aad7..1c2f50dffd 100644 --- a/internal/util/segcore/plan.go +++ b/internal/util/segcore/plan.go @@ -31,10 +31,10 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // SearchPlan is a wrapper of the underlying C-structure C.CSearchPlan diff --git a/internal/util/segcore/plan_test.go b/internal/util/segcore/plan_test.go index 01893348e8..47a57a3cbf 100644 --- a/internal/util/segcore/plan_test.go +++ b/internal/util/segcore/plan_test.go @@ -25,10 +25,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/mocks/util/mock_segcore" "github.com/milvus-io/milvus/internal/util/segcore" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type PlanSuite struct { diff --git a/internal/util/segcore/reduce_test.go b/internal/util/segcore/reduce_test.go index 64eb33b63c..822576e45b 100644 --- a/internal/util/segcore/reduce_test.go +++ b/internal/util/segcore/reduce_test.go @@ -34,14 +34,14 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/initcore" "github.com/milvus-io/milvus/internal/util/segcore" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/testutils" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ReduceSuite struct { diff --git a/internal/util/segcore/requests.go b/internal/util/segcore/requests.go index 5a1a49d490..42eca2c6e1 100644 --- a/internal/util/segcore/requests.go +++ b/internal/util/segcore/requests.go @@ -12,9 +12,9 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type RetrievePlanWithOffsets struct { diff --git a/internal/util/segcore/requests_test.go b/internal/util/segcore/requests_test.go index 9410423446..95f8ce9432 100644 --- a/internal/util/segcore/requests_test.go +++ b/internal/util/segcore/requests_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) func TestLoadFieldDataRequest(t *testing.T) { diff --git a/internal/util/segcore/responses.go b/internal/util/segcore/responses.go index ffafac08e7..c70443f10d 100644 --- a/internal/util/segcore/responses.go +++ b/internal/util/segcore/responses.go @@ -9,7 +9,7 @@ package segcore import "C" import ( - "github.com/milvus-io/milvus/pkg/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" ) type SearchResult struct { diff --git a/internal/util/segcore/segment.go b/internal/util/segcore/segment.go index 7147aba470..06a4f0a0de 100644 --- a/internal/util/segcore/segment.go +++ b/internal/util/segcore/segment.go @@ -23,7 +23,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/cgo" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) const ( diff --git a/internal/util/segcore/segment_test.go b/internal/util/segcore/segment_test.go index fd82fd728f..d677d75310 100644 --- a/internal/util/segcore/segment_test.go +++ b/internal/util/segcore/segment_test.go @@ -13,10 +13,10 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/initcore" "github.com/milvus-io/milvus/internal/util/segcore" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestGrowingSegment(t *testing.T) { diff --git a/internal/util/segmentutil/utils.go b/internal/util/segmentutil/utils.go index 3e883cce8c..9d67243f15 100644 --- a/internal/util/segmentutil/utils.go +++ b/internal/util/segmentutil/utils.go @@ -3,8 +3,8 @@ package segmentutil import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" ) // ReCalcRowCount re-calculates number of rows of `oldSeg` based on its bin log count, and correct its value in its diff --git a/internal/util/sessionutil/session_util.go b/internal/util/sessionutil/session_util.go index d7b1830d4d..f7e834b428 100644 --- a/internal/util/sessionutil/session_util.go +++ b/internal/util/sessionutil/session_util.go @@ -38,10 +38,10 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/storage" kvfactory "github.com/milvus-io/milvus/internal/util/dependency/kv" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) const ( diff --git a/internal/util/sessionutil/session_util_test.go b/internal/util/sessionutil/session_util_test.go index 4cd8572472..e392b9489a 100644 --- a/internal/util/sessionutil/session_util_test.go +++ b/internal/util/sessionutil/session_util_test.go @@ -27,12 +27,12 @@ import ( "github.com/milvus-io/milvus/internal/json" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestGetServerIDConcurrently(t *testing.T) { diff --git a/internal/util/streamingutil/service/attributes/attributes.go b/internal/util/streamingutil/service/attributes/attributes.go index 3cc00fa99c..447ae0e13e 100644 --- a/internal/util/streamingutil/service/attributes/attributes.go +++ b/internal/util/streamingutil/service/attributes/attributes.go @@ -4,7 +4,7 @@ import ( "google.golang.org/grpc/attributes" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) type attributesKeyType int diff --git a/internal/util/streamingutil/service/attributes/attributes_test.go b/internal/util/streamingutil/service/attributes/attributes_test.go index 0f629b1433..46ed758962 100644 --- a/internal/util/streamingutil/service/attributes/attributes_test.go +++ b/internal/util/streamingutil/service/attributes/attributes_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) func TestAttributes(t *testing.T) { diff --git a/internal/util/streamingutil/service/balancer/picker/server_id_builder.go b/internal/util/streamingutil/service/balancer/picker/server_id_builder.go index 736bc25660..5524f67a1f 100644 --- a/internal/util/streamingutil/service/balancer/picker/server_id_builder.go +++ b/internal/util/streamingutil/service/balancer/picker/server_id_builder.go @@ -8,7 +8,7 @@ import ( "github.com/milvus-io/milvus/internal/util/streamingutil/service/attributes" bbalancer "github.com/milvus-io/milvus/internal/util/streamingutil/service/balancer" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) const ( diff --git a/internal/util/streamingutil/service/balancer/picker/server_id_picker.go b/internal/util/streamingutil/service/balancer/picker/server_id_picker.go index 9e4c9648cb..a5efc696f2 100644 --- a/internal/util/streamingutil/service/balancer/picker/server_id_picker.go +++ b/internal/util/streamingutil/service/balancer/picker/server_id_picker.go @@ -12,7 +12,7 @@ import ( "google.golang.org/grpc/status" "github.com/milvus-io/milvus/internal/util/streamingutil/service/contextutil" - "github.com/milvus-io/milvus/pkg/util/interceptor" + "github.com/milvus-io/milvus/pkg/v2/util/interceptor" ) var _ balancer.Picker = &serverIDPicker{} diff --git a/internal/util/streamingutil/service/balancer/picker/server_id_picker_test.go b/internal/util/streamingutil/service/balancer/picker/server_id_picker_test.go index 707eba3464..cbb0956cb6 100644 --- a/internal/util/streamingutil/service/balancer/picker/server_id_picker_test.go +++ b/internal/util/streamingutil/service/balancer/picker/server_id_picker_test.go @@ -15,8 +15,8 @@ import ( bbalancer "github.com/milvus-io/milvus/internal/util/streamingutil/service/balancer" "github.com/milvus-io/milvus/internal/util/streamingutil/service/contextutil" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/util/interceptor" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/interceptor" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestServerIDPickerBuilder(t *testing.T) { diff --git a/internal/util/streamingutil/service/contextutil/create_consumer.go b/internal/util/streamingutil/service/contextutil/create_consumer.go index ffe61b3a6a..b677b7fe23 100644 --- a/internal/util/streamingutil/service/contextutil/create_consumer.go +++ b/internal/util/streamingutil/service/contextutil/create_consumer.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/protobuf/proto" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) const ( diff --git a/internal/util/streamingutil/service/contextutil/create_consumer_test.go b/internal/util/streamingutil/service/contextutil/create_consumer_test.go index c9ae1218c7..266ca502f3 100644 --- a/internal/util/streamingutil/service/contextutil/create_consumer_test.go +++ b/internal/util/streamingutil/service/contextutil/create_consumer_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/grpc/metadata" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) func TestWithCreateConsumer(t *testing.T) { diff --git a/internal/util/streamingutil/service/contextutil/create_producer.go b/internal/util/streamingutil/service/contextutil/create_producer.go index 599553e61a..788a332c69 100644 --- a/internal/util/streamingutil/service/contextutil/create_producer.go +++ b/internal/util/streamingutil/service/contextutil/create_producer.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/protobuf/proto" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) const ( diff --git a/internal/util/streamingutil/service/contextutil/create_producer_test.go b/internal/util/streamingutil/service/contextutil/create_producer_test.go index 514143ea2b..c07df334c6 100644 --- a/internal/util/streamingutil/service/contextutil/create_producer_test.go +++ b/internal/util/streamingutil/service/contextutil/create_producer_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/grpc/metadata" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) func TestWithCreateProducer(t *testing.T) { diff --git a/internal/util/streamingutil/service/discoverer/channel_assignment_discoverer.go b/internal/util/streamingutil/service/discoverer/channel_assignment_discoverer.go index 2dc40858c4..5c005a75ae 100644 --- a/internal/util/streamingutil/service/discoverer/channel_assignment_discoverer.go +++ b/internal/util/streamingutil/service/discoverer/channel_assignment_discoverer.go @@ -7,9 +7,9 @@ import ( "google.golang.org/grpc/resolver" "github.com/milvus-io/milvus/internal/util/streamingutil/service/attributes" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // NewChannelAssignmentDiscoverer returns a new Discoverer for the channel assignment registration. diff --git a/internal/util/streamingutil/service/discoverer/channel_assignment_discoverer_test.go b/internal/util/streamingutil/service/discoverer/channel_assignment_discoverer_test.go index 6acb570bc7..7953cb0f7a 100644 --- a/internal/util/streamingutil/service/discoverer/channel_assignment_discoverer_test.go +++ b/internal/util/streamingutil/service/discoverer/channel_assignment_discoverer_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/milvus-io/milvus/internal/util/streamingutil/service/attributes" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_types" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestChannelAssignmentDiscoverer(t *testing.T) { diff --git a/internal/util/streamingutil/service/discoverer/discoverer.go b/internal/util/streamingutil/service/discoverer/discoverer.go index e2a13caaea..2be0eaaf84 100644 --- a/internal/util/streamingutil/service/discoverer/discoverer.go +++ b/internal/util/streamingutil/service/discoverer/discoverer.go @@ -5,7 +5,7 @@ import ( "google.golang.org/grpc/resolver" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Discoverer is the interface for the discoverer. diff --git a/internal/util/streamingutil/service/discoverer/session_discoverer.go b/internal/util/streamingutil/service/discoverer/session_discoverer.go index d770f84393..a0170daf24 100644 --- a/internal/util/streamingutil/service/discoverer/session_discoverer.go +++ b/internal/util/streamingutil/service/discoverer/session_discoverer.go @@ -12,8 +12,8 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/streamingutil/service/attributes" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // NewSessionDiscoverer returns a new Discoverer for the milvus session registration. diff --git a/internal/util/streamingutil/service/discoverer/session_discoverer_test.go b/internal/util/streamingutil/service/discoverer/session_discoverer_test.go index aaeb726e6a..3203d97226 100644 --- a/internal/util/streamingutil/service/discoverer/session_discoverer_test.go +++ b/internal/util/streamingutil/service/discoverer/session_discoverer_test.go @@ -13,8 +13,8 @@ import ( "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/streamingutil/service/attributes" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestSessionDiscoverer(t *testing.T) { diff --git a/internal/util/streamingutil/service/interceptor/client.go b/internal/util/streamingutil/service/interceptor/client.go index 1c95aa46fc..3879fcf215 100644 --- a/internal/util/streamingutil/service/interceptor/client.go +++ b/internal/util/streamingutil/service/interceptor/client.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // NewStreamingServiceUnaryClientInterceptor returns a new unary client interceptor for error handling. diff --git a/internal/util/streamingutil/service/interceptor/server.go b/internal/util/streamingutil/service/interceptor/server.go index cd3943e3d5..bc70a00d9b 100644 --- a/internal/util/streamingutil/service/interceptor/server.go +++ b/internal/util/streamingutil/service/interceptor/server.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc" "github.com/milvus-io/milvus/internal/util/streamingutil/status" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // NewStreamingServiceUnaryServerInterceptor returns a new unary server interceptor for error handling, metric... diff --git a/internal/util/streamingutil/service/lazygrpc/conn.go b/internal/util/streamingutil/service/lazygrpc/conn.go index fcc2846dab..e375979695 100644 --- a/internal/util/streamingutil/service/lazygrpc/conn.go +++ b/internal/util/streamingutil/service/lazygrpc/conn.go @@ -8,8 +8,8 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) var ErrClosed = errors.New("lazy grpc conn closed") diff --git a/internal/util/streamingutil/service/resolver/builder.go b/internal/util/streamingutil/service/resolver/builder.go index ca6af04552..887a5a6935 100644 --- a/internal/util/streamingutil/service/resolver/builder.go +++ b/internal/util/streamingutil/service/resolver/builder.go @@ -9,8 +9,8 @@ import ( "google.golang.org/grpc/resolver" "github.com/milvus-io/milvus/internal/util/streamingutil/service/discoverer" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/util/streamingutil/service/resolver/builder_test.go b/internal/util/streamingutil/service/resolver/builder_test.go index 423232d6f1..ea50543822 100644 --- a/internal/util/streamingutil/service/resolver/builder_test.go +++ b/internal/util/streamingutil/service/resolver/builder_test.go @@ -11,7 +11,7 @@ import ( "github.com/milvus-io/milvus/internal/mocks/google.golang.org/grpc/mock_resolver" "github.com/milvus-io/milvus/internal/mocks/util/streamingutil/service/mock_discoverer" "github.com/milvus-io/milvus/internal/util/streamingutil/service/discoverer" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestNewBuilder(t *testing.T) { diff --git a/internal/util/streamingutil/service/resolver/resolver_with_discoverer.go b/internal/util/streamingutil/service/resolver/resolver_with_discoverer.go index a10677c57b..e635ca23e2 100644 --- a/internal/util/streamingutil/service/resolver/resolver_with_discoverer.go +++ b/internal/util/streamingutil/service/resolver/resolver_with_discoverer.go @@ -9,9 +9,9 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/util/streamingutil/service/discoverer" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ Resolver = (*resolverWithDiscoverer)(nil) diff --git a/internal/util/streamingutil/service/resolver/resolver_with_discoverer_test.go b/internal/util/streamingutil/service/resolver/resolver_with_discoverer_test.go index 8b6b173884..b3a35c6601 100644 --- a/internal/util/streamingutil/service/resolver/resolver_with_discoverer_test.go +++ b/internal/util/streamingutil/service/resolver/resolver_with_discoverer_test.go @@ -14,8 +14,8 @@ import ( "github.com/milvus-io/milvus/internal/mocks/google.golang.org/grpc/mock_resolver" "github.com/milvus-io/milvus/internal/mocks/util/streamingutil/service/mock_discoverer" "github.com/milvus-io/milvus/internal/util/streamingutil/service/discoverer" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestResolverWithDiscoverer(t *testing.T) { diff --git a/internal/util/streamingutil/service/resolver/watch_based_grpc_resolver.go b/internal/util/streamingutil/service/resolver/watch_based_grpc_resolver.go index 10eb98f16d..7df2c3e5bf 100644 --- a/internal/util/streamingutil/service/resolver/watch_based_grpc_resolver.go +++ b/internal/util/streamingutil/service/resolver/watch_based_grpc_resolver.go @@ -5,8 +5,8 @@ import ( "go.uber.org/zap" "google.golang.org/grpc/resolver" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ resolver.Resolver = (*watchBasedGRPCResolver)(nil) diff --git a/internal/util/streamingutil/service/resolver/watch_based_grpc_resolver_test.go b/internal/util/streamingutil/service/resolver/watch_based_grpc_resolver_test.go index 4508c9b86a..fb2336afcf 100644 --- a/internal/util/streamingutil/service/resolver/watch_based_grpc_resolver_test.go +++ b/internal/util/streamingutil/service/resolver/watch_based_grpc_resolver_test.go @@ -9,8 +9,8 @@ import ( "google.golang.org/grpc/resolver" "github.com/milvus-io/milvus/internal/mocks/google.golang.org/grpc/mock_resolver" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMain(m *testing.M) { diff --git a/internal/util/streamingutil/status/client_stream_wrapper_test.go b/internal/util/streamingutil/status/client_stream_wrapper_test.go index 3efd8bab36..9b25ffab81 100644 --- a/internal/util/streamingutil/status/client_stream_wrapper_test.go +++ b/internal/util/streamingutil/status/client_stream_wrapper_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/milvus-io/milvus/internal/mocks/google.golang.org/mock_grpc" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) func TestClientStreamWrapper(t *testing.T) { diff --git a/internal/util/streamingutil/status/rpc_error.go b/internal/util/streamingutil/status/rpc_error.go index 9fb13275da..572fb4457b 100644 --- a/internal/util/streamingutil/status/rpc_error.go +++ b/internal/util/streamingutil/status/rpc_error.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) var streamingErrorToGRPCStatus = map[streamingpb.StreamingCode]codes.Code{ diff --git a/internal/util/streamingutil/status/rpc_error_test.go b/internal/util/streamingutil/status/rpc_error_test.go index 05f6b2a44e..3d0865a886 100644 --- a/internal/util/streamingutil/status/rpc_error_test.go +++ b/internal/util/streamingutil/status/rpc_error_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) func TestStreamingStatus(t *testing.T) { diff --git a/internal/util/streamingutil/status/streaming_error.go b/internal/util/streamingutil/status/streaming_error.go index 5adb08db5c..b9feb1bbea 100644 --- a/internal/util/streamingutil/status/streaming_error.go +++ b/internal/util/streamingutil/status/streaming_error.go @@ -6,8 +6,8 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/redact" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) var _ error = (*StreamingError)(nil) diff --git a/internal/util/streamingutil/status/streaming_error_test.go b/internal/util/streamingutil/status/streaming_error_test.go index 3b6972a572..23ce481250 100644 --- a/internal/util/streamingutil/status/streaming_error_test.go +++ b/internal/util/streamingutil/status/streaming_error_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) func TestStreamingError(t *testing.T) { diff --git a/internal/util/streamingutil/util/topic.go b/internal/util/streamingutil/util/topic.go index 8020e2a1be..726b7e79df 100644 --- a/internal/util/streamingutil/util/topic.go +++ b/internal/util/streamingutil/util/topic.go @@ -3,8 +3,8 @@ package util import ( "fmt" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // GetAllTopicsFromConfiguration gets all topics from configuration. diff --git a/internal/util/streamingutil/util/topic_test.go b/internal/util/streamingutil/util/topic_test.go index bdce25066b..f6584f2354 100644 --- a/internal/util/streamingutil/util/topic_test.go +++ b/internal/util/streamingutil/util/topic_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestGetAllTopicsFromConfiguration(t *testing.T) { diff --git a/internal/util/streamingutil/util/wal_selector.go b/internal/util/streamingutil/util/wal_selector.go index 3c2f0c71f5..8d9c1bde03 100644 --- a/internal/util/streamingutil/util/wal_selector.go +++ b/internal/util/streamingutil/util/wal_selector.go @@ -3,8 +3,8 @@ package util import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/util/streamrpc/in_memory_streamer.go b/internal/util/streamrpc/in_memory_streamer.go index a1f98aa1a8..98502f45b7 100644 --- a/internal/util/streamrpc/in_memory_streamer.go +++ b/internal/util/streamrpc/in_memory_streamer.go @@ -25,8 +25,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/metadata" - "github.com/milvus-io/milvus/pkg/util/generic" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/generic" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // InMemoryStreamer is a utility to wrap in-memory stream methods. diff --git a/internal/util/streamrpc/streamer.go b/internal/util/streamrpc/streamer.go index 768eb7a82d..5a326c1b44 100644 --- a/internal/util/streamrpc/streamer.go +++ b/internal/util/streamrpc/streamer.go @@ -9,8 +9,8 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type QueryStreamServer interface { diff --git a/internal/util/streamrpc/streamer_test.go b/internal/util/streamrpc/streamer_test.go index 4deff15f73..08ea39beff 100644 --- a/internal/util/streamrpc/streamer_test.go +++ b/internal/util/streamrpc/streamer_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" ) type ResultCacheServerSuite struct { diff --git a/internal/util/testutil/test_util.go b/internal/util/testutil/test_util.go index a73e816661..519e76cc34 100644 --- a/internal/util/testutil/test_util.go +++ b/internal/util/testutil/test_util.go @@ -14,10 +14,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/json" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/testutils" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/internal/util/tsoutil/tso.go b/internal/util/tsoutil/tso.go index 20254cc708..7342f1b52f 100644 --- a/internal/util/tsoutil/tso.go +++ b/internal/util/tsoutil/tso.go @@ -24,7 +24,7 @@ import ( etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/kv/tikv" - "github.com/milvus-io/milvus/pkg/kv" + "github.com/milvus-io/milvus/pkg/v2/kv" ) // NewTSOKVBase returns a kv.TxnKV object diff --git a/internal/util/typeutil/hash.go b/internal/util/typeutil/hash.go index b977592ea3..b56ce1ecf4 100644 --- a/internal/util/typeutil/hash.go +++ b/internal/util/typeutil/hash.go @@ -4,8 +4,8 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/planpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/planpb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // HashKey2Partitions hash partition keys to partitions diff --git a/internal/util/typeutil/result_helper.go b/internal/util/typeutil/result_helper.go index 671dabb491..1a92e3fc9f 100644 --- a/internal/util/typeutil/result_helper.go +++ b/internal/util/typeutil/result_helper.go @@ -2,7 +2,7 @@ package typeutil import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func preHandleEmptyResult(result RetrieveResults) { diff --git a/internal/util/typeutil/result_helper_test.go b/internal/util/typeutil/result_helper_test.go index 467018f984..e13aa44dbe 100644 --- a/internal/util/typeutil/result_helper_test.go +++ b/internal/util/typeutil/result_helper_test.go @@ -8,10 +8,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func fieldDataEmpty(data *schemapb.FieldData) bool { diff --git a/internal/util/typeutil/retrieve_result.go b/internal/util/typeutil/retrieve_result.go index 8f809284d4..6594edd4d1 100644 --- a/internal/util/typeutil/retrieve_result.go +++ b/internal/util/typeutil/retrieve_result.go @@ -3,9 +3,9 @@ package typeutil import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/segcorepb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type RetrieveResults interface { diff --git a/internal/util/typeutil/storage.go b/internal/util/typeutil/storage.go index 5942a9673b..8bc05cc3e4 100644 --- a/internal/util/typeutil/storage.go +++ b/internal/util/typeutil/storage.go @@ -11,10 +11,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func GetStorageURI(protocol, pathPrefix string, segmentID int64) (string, error) { diff --git a/internal/util/vecindexmgr/vector_index_mgr.go b/internal/util/vecindexmgr/vector_index_mgr.go index 86ee0bd836..504b5c441b 100644 --- a/internal/util/vecindexmgr/vector_index_mgr.go +++ b/internal/util/vecindexmgr/vector_index_mgr.go @@ -31,7 +31,7 @@ import ( "unsafe" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) const ( diff --git a/internal/util/wrappers/qn_wrapper.go b/internal/util/wrappers/qn_wrapper.go index 09ac9166e9..9434afe39e 100644 --- a/internal/util/wrappers/qn_wrapper.go +++ b/internal/util/wrappers/qn_wrapper.go @@ -25,8 +25,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/streamrpc" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) type qnServerWrapper struct { diff --git a/internal/util/wrappers/qn_wrapper_test.go b/internal/util/wrappers/qn_wrapper_test.go index 505908c954..6dea877132 100644 --- a/internal/util/wrappers/qn_wrapper_test.go +++ b/internal/util/wrappers/qn_wrapper_test.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type QnWrapperSuite struct { diff --git a/pkg/.mockery_pkg.yaml b/pkg/.mockery_pkg.yaml index 1a2b54eeb3..d5dfa7532f 100644 --- a/pkg/.mockery_pkg.yaml +++ b/pkg/.mockery_pkg.yaml @@ -1,21 +1,21 @@ quiet: False with-expecter: True filename: "mock_{{.InterfaceName}}.go" -dir: 'mocks/{{trimPrefix .PackagePath "github.com/milvus-io/milvus/pkg" | dir }}/mock_{{.PackageName}}' +dir: 'mocks/{{trimPrefix .PackagePath "github.com/milvus-io/milvus/pkg/v2" | dir }}/mock_{{.PackageName}}' mockname: "Mock{{.InterfaceName}}" outpkg: "mock_{{.PackageName}}" packages: - github.com/milvus-io/milvus/pkg/kv: + github.com/milvus-io/milvus/pkg/v2/kv: interfaces: MetaKv: - github.com/milvus-io/milvus/pkg/streaming/util/message: + github.com/milvus-io/milvus/pkg/v2/streaming/util/message: interfaces: MessageID: ImmutableMessage: ImmutableTxnMessage: MutableMessage: RProperties: - github.com/milvus-io/milvus/pkg/streaming/walimpls: + github.com/milvus-io/milvus/pkg/v2/streaming/walimpls: interfaces: OpenerBuilderImpls: OpenerImpls: @@ -24,11 +24,11 @@ packages: Interceptor: InterceptorWithReady: InterceptorBuilder: - github.com/milvus-io/milvus/pkg/streaming/util/types: + github.com/milvus-io/milvus/pkg/v2/streaming/util/types: interfaces: AssignmentDiscoverWatcher: AssignmentRebalanceTrigger: - github.com/milvus-io/milvus/pkg/proto/streamingpb: + github.com/milvus-io/milvus/pkg/v2/proto/streamingpb: interfaces: StreamingNodeHandlerService_ConsumeServer: StreamingNodeHandlerService_ProduceServer: diff --git a/pkg/common/common.go b/pkg/common/common.go index fa66431e6c..e782345f6a 100644 --- a/pkg/common/common.go +++ b/pkg/common/common.go @@ -28,7 +28,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) // system field id: diff --git a/pkg/common/mock_testonly.go b/pkg/common/mock_testonly.go index f039578b0d..b139174970 100644 --- a/pkg/common/mock_testonly.go +++ b/pkg/common/mock_testonly.go @@ -24,7 +24,7 @@ import ( "context" "fmt" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) type MockTestingT struct { diff --git a/pkg/config/config.go b/pkg/config/config.go index 3ef5e5254f..b7d771b76b 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/cast" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/pkg/config/env_source.go b/pkg/config/env_source.go index b4ea1e6ba8..48bc6e54ba 100644 --- a/pkg/config/env_source.go +++ b/pkg/config/env_source.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type EnvSource struct { diff --git a/pkg/config/etcd_source.go b/pkg/config/etcd_source.go index c7b84e6542..2e06c62ead 100644 --- a/pkg/config/etcd_source.go +++ b/pkg/config/etcd_source.go @@ -28,8 +28,8 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" ) const ( diff --git a/pkg/config/etcd_source_test.go b/pkg/config/etcd_source_test.go index f7dad37c70..7ec5c860cc 100644 --- a/pkg/config/etcd_source_test.go +++ b/pkg/config/etcd_source_test.go @@ -26,7 +26,7 @@ import ( "go.etcd.io/etcd/server/v3/embed" "go.uber.org/atomic" - "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" ) type EtcdSourceSuite struct { diff --git a/pkg/config/file_source.go b/pkg/config/file_source.go index b4055997f7..dfeb68e89a 100644 --- a/pkg/config/file_source.go +++ b/pkg/config/file_source.go @@ -27,7 +27,7 @@ import ( "go.uber.org/zap" "gopkg.in/yaml.v2" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) type FileSource struct { diff --git a/pkg/config/manager.go b/pkg/config/manager.go index dc2ae3d674..306f3a8144 100644 --- a/pkg/config/manager.go +++ b/pkg/config/manager.go @@ -23,8 +23,8 @@ import ( "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/pkg/config/refresher.go b/pkg/config/refresher.go index 472c3537bc..9e0407d7f0 100644 --- a/pkg/config/refresher.go +++ b/pkg/config/refresher.go @@ -23,7 +23,7 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) type refresher struct { diff --git a/pkg/eventlog/global.go b/pkg/eventlog/global.go index 13549ac234..8e87e97c51 100644 --- a/pkg/eventlog/global.go +++ b/pkg/eventlog/global.go @@ -19,8 +19,8 @@ package eventlog import ( "go.uber.org/atomic" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/pkg/eventlog/grpc.go b/pkg/eventlog/grpc.go index e3cd991180..de6ed83e76 100644 --- a/pkg/eventlog/grpc.go +++ b/pkg/eventlog/grpc.go @@ -24,9 +24,9 @@ import ( "go.uber.org/atomic" "google.golang.org/grpc" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/pkg/eventlog/handler.go b/pkg/eventlog/handler.go index 7461d2c627..368ca45bcd 100644 --- a/pkg/eventlog/handler.go +++ b/pkg/eventlog/handler.go @@ -22,7 +22,7 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) const ( diff --git a/pkg/go.mod b/pkg/go.mod index 56053d466a..ee3d2bfb31 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -1,4 +1,4 @@ -module github.com/milvus-io/milvus/pkg +module github.com/milvus-io/milvus/pkg/v2 go 1.21 diff --git a/pkg/kv/kv.go b/pkg/kv/kv.go index 2386506b00..2b15196807 100644 --- a/pkg/kv/kv.go +++ b/pkg/kv/kv.go @@ -21,8 +21,8 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" - "github.com/milvus-io/milvus/pkg/kv/predicates" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv/predicates" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // CompareFailedError is a helper type for checking MetaKv CompareAndSwap series func error type diff --git a/pkg/kv/rocksdb/rocks_iterator.go b/pkg/kv/rocksdb/rocks_iterator.go index aea3cc74cc..9156296515 100644 --- a/pkg/kv/rocksdb/rocks_iterator.go +++ b/pkg/kv/rocksdb/rocks_iterator.go @@ -5,7 +5,7 @@ import ( "github.com/tecbot/gorocksdb" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) /** diff --git a/pkg/kv/rocksdb/rocksdb_kv.go b/pkg/kv/rocksdb/rocksdb_kv.go index 3b156c414f..c407582f01 100644 --- a/pkg/kv/rocksdb/rocksdb_kv.go +++ b/pkg/kv/rocksdb/rocksdb_kv.go @@ -23,10 +23,10 @@ import ( "github.com/cockroachdb/errors" "github.com/tecbot/gorocksdb" - "github.com/milvus-io/milvus/pkg/kv" - "github.com/milvus-io/milvus/pkg/kv/predicates" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + "github.com/milvus-io/milvus/pkg/v2/kv/predicates" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var _ kv.BaseKV = (*RocksdbKV)(nil) diff --git a/pkg/kv/rocksdb/rocksdb_kv_test.go b/pkg/kv/rocksdb/rocksdb_kv_test.go index aeecb0a681..f0797eceb9 100644 --- a/pkg/kv/rocksdb/rocksdb_kv_test.go +++ b/pkg/kv/rocksdb/rocksdb_kv_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/milvus-io/milvus/pkg/kv/predicates" - rocksdbkv "github.com/milvus-io/milvus/pkg/kv/rocksdb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/kv/predicates" + rocksdbkv "github.com/milvus-io/milvus/pkg/v2/kv/rocksdb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func TestRocksdbKV(t *testing.T) { diff --git a/pkg/metrics/datacoord_metrics.go b/pkg/metrics/datacoord_metrics.go index a772e5c074..74205a2895 100644 --- a/pkg/metrics/datacoord_metrics.go +++ b/pkg/metrics/datacoord_metrics.go @@ -21,7 +21,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/pkg/metrics/datanode_metrics.go b/pkg/metrics/datanode_metrics.go index 56b293584c..8776941312 100644 --- a/pkg/metrics/datanode_metrics.go +++ b/pkg/metrics/datanode_metrics.go @@ -21,7 +21,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/pkg/metrics/grpc_stats_handler.go b/pkg/metrics/grpc_stats_handler.go index 50b887db10..216666528e 100644 --- a/pkg/metrics/grpc_stats_handler.go +++ b/pkg/metrics/grpc_stats_handler.go @@ -22,7 +22,7 @@ import ( "google.golang.org/grpc/stats" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // milvusStatsKey is context key type. diff --git a/pkg/metrics/indexnode_metrics.go b/pkg/metrics/indexnode_metrics.go index 3a02286307..44c5b3b13f 100644 --- a/pkg/metrics/indexnode_metrics.go +++ b/pkg/metrics/indexnode_metrics.go @@ -19,7 +19,7 @@ package metrics import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/pkg/metrics/proxy_metrics.go b/pkg/metrics/proxy_metrics.go index 53aac27a0b..f44e566677 100644 --- a/pkg/metrics/proxy_metrics.go +++ b/pkg/metrics/proxy_metrics.go @@ -21,7 +21,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/pkg/metrics/querycoord_metrics.go b/pkg/metrics/querycoord_metrics.go index d66abea2cd..b1c0a9853f 100644 --- a/pkg/metrics/querycoord_metrics.go +++ b/pkg/metrics/querycoord_metrics.go @@ -21,7 +21,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/pkg/metrics/querynode_metrics.go b/pkg/metrics/querynode_metrics.go index 67d70009fd..b09bd138ce 100644 --- a/pkg/metrics/querynode_metrics.go +++ b/pkg/metrics/querynode_metrics.go @@ -21,7 +21,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/pkg/metrics/rootcoord_metrics.go b/pkg/metrics/rootcoord_metrics.go index 9ec5118da1..f41a90d725 100644 --- a/pkg/metrics/rootcoord_metrics.go +++ b/pkg/metrics/rootcoord_metrics.go @@ -3,7 +3,7 @@ package metrics import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/pkg/metrics/streaming_service_metrics.go b/pkg/metrics/streaming_service_metrics.go index e412225622..40cd9933e5 100644 --- a/pkg/metrics/streaming_service_metrics.go +++ b/pkg/metrics/streaming_service_metrics.go @@ -5,7 +5,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/pkg/mocks/mock_kv/mock_MetaKv.go b/pkg/mocks/mock_kv/mock_MetaKv.go index 683ef85f18..4cda102275 100644 --- a/pkg/mocks/mock_kv/mock_MetaKv.go +++ b/pkg/mocks/mock_kv/mock_MetaKv.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - predicates "github.com/milvus-io/milvus/pkg/kv/predicates" + predicates "github.com/milvus-io/milvus/pkg/v2/kv/predicates" ) // MockMetaKv is an autogenerated mock type for the MetaKv type diff --git a/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordAssignmentServiceClient.go b/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordAssignmentServiceClient.go index 0ade6137b7..56f9628554 100644 --- a/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordAssignmentServiceClient.go +++ b/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordAssignmentServiceClient.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - streamingpb "github.com/milvus-io/milvus/pkg/proto/streamingpb" + streamingpb "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // MockStreamingCoordAssignmentServiceClient is an autogenerated mock type for the StreamingCoordAssignmentServiceClient type diff --git a/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordAssignmentService_AssignmentDiscoverClient.go b/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordAssignmentService_AssignmentDiscoverClient.go index 0506483c53..854635ecb6 100644 --- a/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordAssignmentService_AssignmentDiscoverClient.go +++ b/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordAssignmentService_AssignmentDiscoverClient.go @@ -8,7 +8,7 @@ import ( mock "github.com/stretchr/testify/mock" metadata "google.golang.org/grpc/metadata" - streamingpb "github.com/milvus-io/milvus/pkg/proto/streamingpb" + streamingpb "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // MockStreamingCoordAssignmentService_AssignmentDiscoverClient is an autogenerated mock type for the StreamingCoordAssignmentService_AssignmentDiscoverClient type diff --git a/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordAssignmentService_AssignmentDiscoverServer.go b/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordAssignmentService_AssignmentDiscoverServer.go index 89f8cd2356..2e276686e1 100644 --- a/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordAssignmentService_AssignmentDiscoverServer.go +++ b/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordAssignmentService_AssignmentDiscoverServer.go @@ -8,7 +8,7 @@ import ( mock "github.com/stretchr/testify/mock" metadata "google.golang.org/grpc/metadata" - streamingpb "github.com/milvus-io/milvus/pkg/proto/streamingpb" + streamingpb "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // MockStreamingCoordAssignmentService_AssignmentDiscoverServer is an autogenerated mock type for the StreamingCoordAssignmentService_AssignmentDiscoverServer type diff --git a/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordBroadcastServiceClient.go b/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordBroadcastServiceClient.go index d53b5bcca9..03582651d8 100644 --- a/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordBroadcastServiceClient.go +++ b/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordBroadcastServiceClient.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - streamingpb "github.com/milvus-io/milvus/pkg/proto/streamingpb" + streamingpb "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // MockStreamingCoordBroadcastServiceClient is an autogenerated mock type for the StreamingCoordBroadcastServiceClient type diff --git a/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordBroadcastService_WatchClient.go b/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordBroadcastService_WatchClient.go index fbebad3fc6..eed5a93cbb 100644 --- a/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordBroadcastService_WatchClient.go +++ b/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordBroadcastService_WatchClient.go @@ -8,7 +8,7 @@ import ( mock "github.com/stretchr/testify/mock" metadata "google.golang.org/grpc/metadata" - streamingpb "github.com/milvus-io/milvus/pkg/proto/streamingpb" + streamingpb "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // MockStreamingCoordBroadcastService_WatchClient is an autogenerated mock type for the StreamingCoordBroadcastService_WatchClient type diff --git a/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordBroadcastService_WatchServer.go b/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordBroadcastService_WatchServer.go index d5e1a24f8a..a9d64d3982 100644 --- a/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordBroadcastService_WatchServer.go +++ b/pkg/mocks/proto/mock_streamingpb/mock_StreamingCoordBroadcastService_WatchServer.go @@ -8,7 +8,7 @@ import ( mock "github.com/stretchr/testify/mock" metadata "google.golang.org/grpc/metadata" - streamingpb "github.com/milvus-io/milvus/pkg/proto/streamingpb" + streamingpb "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // MockStreamingCoordBroadcastService_WatchServer is an autogenerated mock type for the StreamingCoordBroadcastService_WatchServer type diff --git a/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerServiceClient.go b/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerServiceClient.go index 94fa20d06e..04d5f2e857 100644 --- a/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerServiceClient.go +++ b/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerServiceClient.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - streamingpb "github.com/milvus-io/milvus/pkg/proto/streamingpb" + streamingpb "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // MockStreamingNodeHandlerServiceClient is an autogenerated mock type for the StreamingNodeHandlerServiceClient type diff --git a/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerService_ConsumeClient.go b/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerService_ConsumeClient.go index 85e2eb8bac..ec6de7974f 100644 --- a/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerService_ConsumeClient.go +++ b/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerService_ConsumeClient.go @@ -8,7 +8,7 @@ import ( mock "github.com/stretchr/testify/mock" metadata "google.golang.org/grpc/metadata" - streamingpb "github.com/milvus-io/milvus/pkg/proto/streamingpb" + streamingpb "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // MockStreamingNodeHandlerService_ConsumeClient is an autogenerated mock type for the StreamingNodeHandlerService_ConsumeClient type diff --git a/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerService_ConsumeServer.go b/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerService_ConsumeServer.go index fddf76ff73..bc490bf31b 100644 --- a/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerService_ConsumeServer.go +++ b/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerService_ConsumeServer.go @@ -8,7 +8,7 @@ import ( mock "github.com/stretchr/testify/mock" metadata "google.golang.org/grpc/metadata" - streamingpb "github.com/milvus-io/milvus/pkg/proto/streamingpb" + streamingpb "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // MockStreamingNodeHandlerService_ConsumeServer is an autogenerated mock type for the StreamingNodeHandlerService_ConsumeServer type diff --git a/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerService_ProduceClient.go b/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerService_ProduceClient.go index 164b616ce5..53e21e0e80 100644 --- a/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerService_ProduceClient.go +++ b/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerService_ProduceClient.go @@ -8,7 +8,7 @@ import ( mock "github.com/stretchr/testify/mock" metadata "google.golang.org/grpc/metadata" - streamingpb "github.com/milvus-io/milvus/pkg/proto/streamingpb" + streamingpb "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // MockStreamingNodeHandlerService_ProduceClient is an autogenerated mock type for the StreamingNodeHandlerService_ProduceClient type diff --git a/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerService_ProduceServer.go b/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerService_ProduceServer.go index 6ce0e317dd..e9e0953bcc 100644 --- a/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerService_ProduceServer.go +++ b/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeHandlerService_ProduceServer.go @@ -8,7 +8,7 @@ import ( mock "github.com/stretchr/testify/mock" metadata "google.golang.org/grpc/metadata" - streamingpb "github.com/milvus-io/milvus/pkg/proto/streamingpb" + streamingpb "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // MockStreamingNodeHandlerService_ProduceServer is an autogenerated mock type for the StreamingNodeHandlerService_ProduceServer type diff --git a/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeManagerServiceClient.go b/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeManagerServiceClient.go index e5409c1928..12ba55533f 100644 --- a/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeManagerServiceClient.go +++ b/pkg/mocks/proto/mock_streamingpb/mock_StreamingNodeManagerServiceClient.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - streamingpb "github.com/milvus-io/milvus/pkg/proto/streamingpb" + streamingpb "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) // MockStreamingNodeManagerServiceClient is an autogenerated mock type for the StreamingNodeManagerServiceClient type diff --git a/pkg/mocks/streaming/mock_walimpls/mock_OpenerBuilderImpls.go b/pkg/mocks/streaming/mock_walimpls/mock_OpenerBuilderImpls.go index 04682f4d50..70e5708eb1 100644 --- a/pkg/mocks/streaming/mock_walimpls/mock_OpenerBuilderImpls.go +++ b/pkg/mocks/streaming/mock_walimpls/mock_OpenerBuilderImpls.go @@ -3,7 +3,7 @@ package mock_walimpls import ( - walimpls "github.com/milvus-io/milvus/pkg/streaming/walimpls" + walimpls "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/mocks/streaming/mock_walimpls/mock_OpenerImpls.go b/pkg/mocks/streaming/mock_walimpls/mock_OpenerImpls.go index 0f5c5f8550..1e7d91347d 100644 --- a/pkg/mocks/streaming/mock_walimpls/mock_OpenerImpls.go +++ b/pkg/mocks/streaming/mock_walimpls/mock_OpenerImpls.go @@ -5,7 +5,7 @@ package mock_walimpls import ( context "context" - walimpls "github.com/milvus-io/milvus/pkg/streaming/walimpls" + walimpls "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/mocks/streaming/mock_walimpls/mock_ScannerImpls.go b/pkg/mocks/streaming/mock_walimpls/mock_ScannerImpls.go index 783a63b5eb..45c3a4ae79 100644 --- a/pkg/mocks/streaming/mock_walimpls/mock_ScannerImpls.go +++ b/pkg/mocks/streaming/mock_walimpls/mock_ScannerImpls.go @@ -3,7 +3,7 @@ package mock_walimpls import ( - message "github.com/milvus-io/milvus/pkg/streaming/util/message" + message "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/mocks/streaming/mock_walimpls/mock_WALImpls.go b/pkg/mocks/streaming/mock_walimpls/mock_WALImpls.go index 2b2b77d261..d898714d84 100644 --- a/pkg/mocks/streaming/mock_walimpls/mock_WALImpls.go +++ b/pkg/mocks/streaming/mock_walimpls/mock_WALImpls.go @@ -5,12 +5,12 @@ package mock_walimpls import ( context "context" - message "github.com/milvus-io/milvus/pkg/streaming/util/message" + message "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" mock "github.com/stretchr/testify/mock" - types "github.com/milvus-io/milvus/pkg/streaming/util/types" + types "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" - walimpls "github.com/milvus-io/milvus/pkg/streaming/walimpls" + walimpls "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" ) // MockWALImpls is an autogenerated mock type for the WALImpls type diff --git a/pkg/mocks/streaming/util/mock_message/mock_ImmutableMessage.go b/pkg/mocks/streaming/util/mock_message/mock_ImmutableMessage.go index 83d04062e3..54081ac876 100644 --- a/pkg/mocks/streaming/util/mock_message/mock_ImmutableMessage.go +++ b/pkg/mocks/streaming/util/mock_message/mock_ImmutableMessage.go @@ -3,7 +3,7 @@ package mock_message import ( - message "github.com/milvus-io/milvus/pkg/streaming/util/message" + message "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/mocks/streaming/util/mock_message/mock_ImmutableTxnMessage.go b/pkg/mocks/streaming/util/mock_message/mock_ImmutableTxnMessage.go index f3031dfc5d..59366fadb9 100644 --- a/pkg/mocks/streaming/util/mock_message/mock_ImmutableTxnMessage.go +++ b/pkg/mocks/streaming/util/mock_message/mock_ImmutableTxnMessage.go @@ -3,7 +3,7 @@ package mock_message import ( - message "github.com/milvus-io/milvus/pkg/streaming/util/message" + message "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/mocks/streaming/util/mock_message/mock_MessageID.go b/pkg/mocks/streaming/util/mock_message/mock_MessageID.go index ba042676f8..080ab742e8 100644 --- a/pkg/mocks/streaming/util/mock_message/mock_MessageID.go +++ b/pkg/mocks/streaming/util/mock_message/mock_MessageID.go @@ -3,7 +3,7 @@ package mock_message import ( - message "github.com/milvus-io/milvus/pkg/streaming/util/message" + message "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/mocks/streaming/util/mock_message/mock_MutableMessage.go b/pkg/mocks/streaming/util/mock_message/mock_MutableMessage.go index d0f127fe6e..f38ef13d09 100644 --- a/pkg/mocks/streaming/util/mock_message/mock_MutableMessage.go +++ b/pkg/mocks/streaming/util/mock_message/mock_MutableMessage.go @@ -3,7 +3,7 @@ package mock_message import ( - message "github.com/milvus-io/milvus/pkg/streaming/util/message" + message "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/mocks/streaming/util/mock_types/mock_AssignmentDiscoverWatcher.go b/pkg/mocks/streaming/util/mock_types/mock_AssignmentDiscoverWatcher.go index 69f69706ac..824618e0fc 100644 --- a/pkg/mocks/streaming/util/mock_types/mock_AssignmentDiscoverWatcher.go +++ b/pkg/mocks/streaming/util/mock_types/mock_AssignmentDiscoverWatcher.go @@ -5,7 +5,7 @@ package mock_types import ( context "context" - types "github.com/milvus-io/milvus/pkg/streaming/util/types" + types "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/mocks/streaming/util/mock_types/mock_AssignmentRebalanceTrigger.go b/pkg/mocks/streaming/util/mock_types/mock_AssignmentRebalanceTrigger.go index dfb71a4995..9e1ca2c1f7 100644 --- a/pkg/mocks/streaming/util/mock_types/mock_AssignmentRebalanceTrigger.go +++ b/pkg/mocks/streaming/util/mock_types/mock_AssignmentRebalanceTrigger.go @@ -5,7 +5,7 @@ package mock_types import ( context "context" - types "github.com/milvus-io/milvus/pkg/streaming/util/types" + types "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/mq/mqimpl/rocksmq/client/client.go b/pkg/mq/mqimpl/rocksmq/client/client.go index fbd705dc52..aec41f7e0e 100644 --- a/pkg/mq/mqimpl/rocksmq/client/client.go +++ b/pkg/mq/mqimpl/rocksmq/client/client.go @@ -11,7 +11,7 @@ package client -import "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" +import "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" // RocksMQ is the type server.RocksMQ type RocksMQ = server.RocksMQ diff --git a/pkg/mq/mqimpl/rocksmq/client/client_impl.go b/pkg/mq/mqimpl/rocksmq/client/client_impl.go index a278d51f9f..63f07620bf 100644 --- a/pkg/mq/mqimpl/rocksmq/client/client_impl.go +++ b/pkg/mq/mqimpl/rocksmq/client/client_impl.go @@ -20,9 +20,9 @@ import ( "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" ) const ( diff --git a/pkg/mq/mqimpl/rocksmq/client/client_impl_test.go b/pkg/mq/mqimpl/rocksmq/client/client_impl_test.go index 057359a9e2..246e9d28a5 100644 --- a/pkg/mq/mqimpl/rocksmq/client/client_impl_test.go +++ b/pkg/mq/mqimpl/rocksmq/client/client_impl_test.go @@ -23,10 +23,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/common" - mqcommon "github.com/milvus-io/milvus/pkg/mq/common" - server2 "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + mqcommon "github.com/milvus-io/milvus/pkg/v2/mq/common" + server2 "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var rmqPath = "/tmp/rocksmq_client" diff --git a/pkg/mq/mqimpl/rocksmq/client/consumer.go b/pkg/mq/mqimpl/rocksmq/client/consumer.go index 48efa18ef1..e609994319 100644 --- a/pkg/mq/mqimpl/rocksmq/client/consumer.go +++ b/pkg/mq/mqimpl/rocksmq/client/consumer.go @@ -12,8 +12,8 @@ package client import ( - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" ) // UniqueID is the type of message ID diff --git a/pkg/mq/mqimpl/rocksmq/client/consumer_impl.go b/pkg/mq/mqimpl/rocksmq/client/consumer_impl.go index 8c3d1644af..8e17cac2ec 100644 --- a/pkg/mq/mqimpl/rocksmq/client/consumer_impl.go +++ b/pkg/mq/mqimpl/rocksmq/client/consumer_impl.go @@ -16,8 +16,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/common" ) type consumer struct { diff --git a/pkg/mq/mqimpl/rocksmq/client/consumer_impl_test.go b/pkg/mq/mqimpl/rocksmq/client/consumer_impl_test.go index e0d8f355d0..1c158861bc 100644 --- a/pkg/mq/mqimpl/rocksmq/client/consumer_impl_test.go +++ b/pkg/mq/mqimpl/rocksmq/client/consumer_impl_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/common" ) func TestConsumer_newConsumer(t *testing.T) { diff --git a/pkg/mq/mqimpl/rocksmq/client/producer.go b/pkg/mq/mqimpl/rocksmq/client/producer.go index 50388478a4..0d9698c60b 100644 --- a/pkg/mq/mqimpl/rocksmq/client/producer.go +++ b/pkg/mq/mqimpl/rocksmq/client/producer.go @@ -12,7 +12,7 @@ package client import ( - "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/common" ) // ProducerOptions is the options of a producer diff --git a/pkg/mq/mqimpl/rocksmq/client/producer_impl.go b/pkg/mq/mqimpl/rocksmq/client/producer_impl.go index 4f2aad064c..082052edf2 100644 --- a/pkg/mq/mqimpl/rocksmq/client/producer_impl.go +++ b/pkg/mq/mqimpl/rocksmq/client/producer_impl.go @@ -14,9 +14,9 @@ package client import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" ) // assertion make sure implementation diff --git a/pkg/mq/mqimpl/rocksmq/client/rmq_message.go b/pkg/mq/mqimpl/rocksmq/client/rmq_message.go index e2fb4376aa..c9a0124f17 100644 --- a/pkg/mq/mqimpl/rocksmq/client/rmq_message.go +++ b/pkg/mq/mqimpl/rocksmq/client/rmq_message.go @@ -12,9 +12,9 @@ package client import ( - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Check rmqMessage implements ConsumerMessage diff --git a/pkg/mq/mqimpl/rocksmq/client/streaming.go b/pkg/mq/mqimpl/rocksmq/client/streaming.go index 60c372d17b..858697f432 100644 --- a/pkg/mq/mqimpl/rocksmq/client/streaming.go +++ b/pkg/mq/mqimpl/rocksmq/client/streaming.go @@ -6,9 +6,9 @@ import ( "github.com/cockroachdb/errors" "google.golang.org/protobuf/proto" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/pkg/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" ) var ( diff --git a/pkg/mq/mqimpl/rocksmq/client/streaming_test.go b/pkg/mq/mqimpl/rocksmq/client/streaming_test.go index 3028c98fb8..c679c48a5f 100644 --- a/pkg/mq/mqimpl/rocksmq/client/streaming_test.go +++ b/pkg/mq/mqimpl/rocksmq/client/streaming_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" ) func TestStreaming(t *testing.T) { diff --git a/pkg/mq/mqimpl/rocksmq/client/test_helper.go b/pkg/mq/mqimpl/rocksmq/client/test_helper.go index c75c68a919..8b04639571 100644 --- a/pkg/mq/mqimpl/rocksmq/client/test_helper.go +++ b/pkg/mq/mqimpl/rocksmq/client/test_helper.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func newTopicName() string { diff --git a/pkg/mq/mqimpl/rocksmq/server/global_rmq.go b/pkg/mq/mqimpl/rocksmq/server/global_rmq.go index 20291ea281..d54ec30169 100644 --- a/pkg/mq/mqimpl/rocksmq/server/global_rmq.go +++ b/pkg/mq/mqimpl/rocksmq/server/global_rmq.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) // Rmq is global rocksmq instance that will be initialized only once diff --git a/pkg/mq/mqimpl/rocksmq/server/rmq_id.go b/pkg/mq/mqimpl/rocksmq/server/rmq_id.go index 91817c6e2e..9dd5534e07 100644 --- a/pkg/mq/mqimpl/rocksmq/server/rmq_id.go +++ b/pkg/mq/mqimpl/rocksmq/server/rmq_id.go @@ -17,8 +17,8 @@ package server import ( - "github.com/milvus-io/milvus/pkg/common" - mqcommon "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/common" + mqcommon "github.com/milvus-io/milvus/pkg/v2/mq/common" ) // rmqID wraps message ID for rocksmq diff --git a/pkg/mq/mqimpl/rocksmq/server/rocksmq_impl.go b/pkg/mq/mqimpl/rocksmq/server/rocksmq_impl.go index ee15161571..9d7639c573 100644 --- a/pkg/mq/mqimpl/rocksmq/server/rocksmq_impl.go +++ b/pkg/mq/mqimpl/rocksmq/server/rocksmq_impl.go @@ -26,15 +26,15 @@ import ( "github.com/tecbot/gorocksdb" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/kv" - rocksdb "github.com/milvus-io/milvus/pkg/kv/rocksdb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/kv" + rocksdb "github.com/milvus-io/milvus/pkg/v2/kv/rocksdb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // UniqueID is the type of message ID diff --git a/pkg/mq/mqimpl/rocksmq/server/rocksmq_impl_test.go b/pkg/mq/mqimpl/rocksmq/server/rocksmq_impl_test.go index 77a375e026..cb6d0b2fd3 100644 --- a/pkg/mq/mqimpl/rocksmq/server/rocksmq_impl_test.go +++ b/pkg/mq/mqimpl/rocksmq/server/rocksmq_impl_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - rocksdbkv "github.com/milvus-io/milvus/pkg/kv/rocksdb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + rocksdbkv "github.com/milvus-io/milvus/pkg/v2/kv/rocksdb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var rmqPath = "/tmp/rocksmq" diff --git a/pkg/mq/mqimpl/rocksmq/server/rocksmq_retention.go b/pkg/mq/mqimpl/rocksmq/server/rocksmq_retention.go index c221e9834d..24d5bf2075 100644 --- a/pkg/mq/mqimpl/rocksmq/server/rocksmq_retention.go +++ b/pkg/mq/mqimpl/rocksmq/server/rocksmq_retention.go @@ -22,10 +22,10 @@ import ( "github.com/tecbot/gorocksdb" "go.uber.org/zap" - rocksdbkv "github.com/milvus-io/milvus/pkg/kv/rocksdb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + rocksdbkv "github.com/milvus-io/milvus/pkg/v2/kv/rocksdb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Const value that used to convert unit diff --git a/pkg/mq/mqimpl/rocksmq/server/rocksmq_retention_test.go b/pkg/mq/mqimpl/rocksmq/server/rocksmq_retention_test.go index 1266d4068c..20335fc7a1 100644 --- a/pkg/mq/mqimpl/rocksmq/server/rocksmq_retention_test.go +++ b/pkg/mq/mqimpl/rocksmq/server/rocksmq_retention_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var retentionPath = "/tmp/rmq_retention/" diff --git a/pkg/mq/msgdispatcher/client.go b/pkg/mq/msgdispatcher/client.go index daa279928b..931e358b5e 100644 --- a/pkg/mq/msgdispatcher/client.go +++ b/pkg/mq/msgdispatcher/client.go @@ -24,14 +24,14 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ( diff --git a/pkg/mq/msgdispatcher/client_test.go b/pkg/mq/msgdispatcher/client_test.go index 11ddab3d8f..0cfb69fb89 100644 --- a/pkg/mq/msgdispatcher/client_test.go +++ b/pkg/mq/msgdispatcher/client_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/atomic" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestClient(t *testing.T) { diff --git a/pkg/mq/msgdispatcher/dispatcher.go b/pkg/mq/msgdispatcher/dispatcher.go index dff93b0791..4f919bdd91 100644 --- a/pkg/mq/msgdispatcher/dispatcher.go +++ b/pkg/mq/msgdispatcher/dispatcher.go @@ -27,14 +27,14 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type signal int32 diff --git a/pkg/mq/msgdispatcher/dispatcher_test.go b/pkg/mq/msgdispatcher/dispatcher_test.go index 7da33191fb..8e179b993f 100644 --- a/pkg/mq/msgdispatcher/dispatcher_test.go +++ b/pkg/mq/msgdispatcher/dispatcher_test.go @@ -30,8 +30,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" ) func TestDispatcher(t *testing.T) { diff --git a/pkg/mq/msgdispatcher/manager.go b/pkg/mq/msgdispatcher/manager.go index 2a3c60824c..33589b14e8 100644 --- a/pkg/mq/msgdispatcher/manager.go +++ b/pkg/mq/msgdispatcher/manager.go @@ -25,14 +25,14 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type DispatcherManager interface { diff --git a/pkg/mq/msgdispatcher/manager_test.go b/pkg/mq/msgdispatcher/manager_test.go index d6711777d7..63f56fa851 100644 --- a/pkg/mq/msgdispatcher/manager_test.go +++ b/pkg/mq/msgdispatcher/manager_test.go @@ -30,10 +30,10 @@ import ( "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestManager(t *testing.T) { diff --git a/pkg/mq/msgdispatcher/mock_client.go b/pkg/mq/msgdispatcher/mock_client.go index 9a056a730b..dbaafb0c8c 100644 --- a/pkg/mq/msgdispatcher/mock_client.go +++ b/pkg/mq/msgdispatcher/mock_client.go @@ -5,7 +5,7 @@ package msgdispatcher import ( context "context" - msgstream "github.com/milvus-io/milvus/pkg/mq/msgstream" + msgstream "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/mq/msgdispatcher/mock_test.go b/pkg/mq/msgdispatcher/mock_test.go index a2d93bfaf8..3b6892a2ce 100644 --- a/pkg/mq/msgdispatcher/mock_test.go +++ b/pkg/mq/msgdispatcher/mock_test.go @@ -27,10 +27,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/pkg/mq/msgdispatcher/target.go b/pkg/mq/msgdispatcher/target.go index 251131e3f8..d5f84f5a7a 100644 --- a/pkg/mq/msgdispatcher/target.go +++ b/pkg/mq/msgdispatcher/target.go @@ -23,10 +23,10 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/lifetime" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/lifetime" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type target struct { diff --git a/pkg/mq/msgdispatcher/target_test.go b/pkg/mq/msgdispatcher/target_test.go index b0f4a37405..444f1e5dfa 100644 --- a/pkg/mq/msgdispatcher/target_test.go +++ b/pkg/mq/msgdispatcher/target_test.go @@ -8,9 +8,9 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestSendTimeout(t *testing.T) { diff --git a/pkg/mq/msgstream/common_mq_factory.go b/pkg/mq/msgstream/common_mq_factory.go index 92046ccec8..155d809f4d 100644 --- a/pkg/mq/msgstream/common_mq_factory.go +++ b/pkg/mq/msgstream/common_mq_factory.go @@ -5,8 +5,8 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" ) var _ Factory = &CommonFactory{} diff --git a/pkg/mq/msgstream/factory_stream_test.go b/pkg/mq/msgstream/factory_stream_test.go index 1d33b29b2e..e7150b9c85 100644 --- a/pkg/mq/msgstream/factory_stream_test.go +++ b/pkg/mq/msgstream/factory_stream_test.go @@ -13,8 +13,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) type streamNewer func(ctx context.Context) (MsgStream, error) diff --git a/pkg/mq/msgstream/factory_test.go b/pkg/mq/msgstream/factory_test.go index 0f6661cc97..72bcee3eb0 100644 --- a/pkg/mq/msgstream/factory_test.go +++ b/pkg/mq/msgstream/factory_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/nmq" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper/nmq" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type positionGenerator func(channelName string, timestamp uint64, msgGroup string, targetMsgIDs []uint64) []*msgpb.MsgPosition diff --git a/pkg/mq/msgstream/mock_msgstream.go b/pkg/mq/msgstream/mock_msgstream.go index 758666f2b4..111cd4bf1a 100644 --- a/pkg/mq/msgstream/mock_msgstream.go +++ b/pkg/mq/msgstream/mock_msgstream.go @@ -5,7 +5,7 @@ package msgstream import ( context "context" - common "github.com/milvus-io/milvus/pkg/mq/common" + common "github.com/milvus-io/milvus/pkg/v2/mq/common" mock "github.com/stretchr/testify/mock" diff --git a/pkg/mq/msgstream/mq_factory.go b/pkg/mq/msgstream/mq_factory.go index 1bd9f8ca34..1519396225 100644 --- a/pkg/mq/msgstream/mq_factory.go +++ b/pkg/mq/msgstream/mq_factory.go @@ -28,16 +28,16 @@ import ( "github.com/streamnative/pulsarctl/pkg/pulsar/utils" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" - kafkawrapper "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/kafka" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/nmq" - pulsarmqwrapper "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/pulsar" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/rmq" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" + kafkawrapper "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper/kafka" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper/nmq" + pulsarmqwrapper "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper/pulsar" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper/rmq" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) // PmsFactory is a pulsar msgstream factory that implemented Factory interface(msgstream.go) diff --git a/pkg/mq/msgstream/mq_factory_test.go b/pkg/mq/msgstream/mq_factory_test.go index 578637e9ce..46f5afb549 100644 --- a/pkg/mq/msgstream/mq_factory_test.go +++ b/pkg/mq/msgstream/mq_factory_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestPmsFactory(t *testing.T) { diff --git a/pkg/mq/msgstream/mq_kafka_msgstream_test.go b/pkg/mq/msgstream/mq_kafka_msgstream_test.go index 054f1aed73..6fe4ddcdf3 100644 --- a/pkg/mq/msgstream/mq_kafka_msgstream_test.go +++ b/pkg/mq/msgstream/mq_kafka_msgstream_test.go @@ -28,9 +28,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/mq/common" - kafkawrapper "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/kafka" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + kafkawrapper "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper/kafka" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) // Note: kafka does not support get all data when consuming from the earliest position again. diff --git a/pkg/mq/msgstream/mq_msgstream.go b/pkg/mq/msgstream/mq_msgstream.go index 0a2c0d78d0..b4381e3a2d 100644 --- a/pkg/mq/msgstream/mq_msgstream.go +++ b/pkg/mq/msgstream/mq_msgstream.go @@ -35,15 +35,15 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/pkg/mq/msgstream/mq_msgstream_test.go b/pkg/mq/msgstream/mq_msgstream_test.go index c07cd64463..cb2318be1e 100644 --- a/pkg/mq/msgstream/mq_msgstream_test.go +++ b/pkg/mq/msgstream/mq_msgstream_test.go @@ -35,14 +35,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - kafkawrapper "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/kafka" - pulsarwrapper "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/pulsar" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + kafkawrapper "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper/kafka" + pulsarwrapper "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper/pulsar" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" ) const ( diff --git a/pkg/mq/msgstream/mq_rocksmq_msgstream_test.go b/pkg/mq/msgstream/mq_rocksmq_msgstream_test.go index 9a5cf91a92..20538c026f 100644 --- a/pkg/mq/msgstream/mq_rocksmq_msgstream_test.go +++ b/pkg/mq/msgstream/mq_rocksmq_msgstream_test.go @@ -27,10 +27,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/common" - mqcommon "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/rmq" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/common" + mqcommon "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper/rmq" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) func Test_NewMqMsgStream(t *testing.T) { diff --git a/pkg/mq/msgstream/mqwrapper/client.go b/pkg/mq/msgstream/mqwrapper/client.go index e0ac2128b5..b18490f3be 100644 --- a/pkg/mq/msgstream/mqwrapper/client.go +++ b/pkg/mq/msgstream/mqwrapper/client.go @@ -19,7 +19,7 @@ package mqwrapper import ( "context" - "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/common" ) // Client is the interface that provides operations of message queues diff --git a/pkg/mq/msgstream/mqwrapper/consumer.go b/pkg/mq/msgstream/mqwrapper/consumer.go index 41086aa85f..110903ff7a 100644 --- a/pkg/mq/msgstream/mqwrapper/consumer.go +++ b/pkg/mq/msgstream/mqwrapper/consumer.go @@ -16,7 +16,7 @@ package mqwrapper -import "github.com/milvus-io/milvus/pkg/mq/common" +import "github.com/milvus-io/milvus/pkg/v2/mq/common" const DefaultPartitionIdx = 0 diff --git a/pkg/mq/msgstream/mqwrapper/kafka/kafka_client.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_client.go index 3755060b7e..12a994f908 100644 --- a/pkg/mq/msgstream/mqwrapper/kafka/kafka_client.go +++ b/pkg/mq/msgstream/mqwrapper/kafka/kafka_client.go @@ -12,13 +12,13 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/util/conc" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/util/conc" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) var ( diff --git a/pkg/mq/msgstream/mqwrapper/kafka/kafka_client_test.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_client_test.go index 27417ae56a..b25c32236f 100644 --- a/pkg/mq/msgstream/mqwrapper/kafka/kafka_client_test.go +++ b/pkg/mq/msgstream/mqwrapper/kafka/kafka_client_test.go @@ -14,12 +14,12 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/log" - mqcommon "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/log" + mqcommon "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var Params = paramtable.Get() diff --git a/pkg/mq/msgstream/mqwrapper/kafka/kafka_consumer.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_consumer.go index 8809d6b28f..ddcb65f93f 100644 --- a/pkg/mq/msgstream/mqwrapper/kafka/kafka_consumer.go +++ b/pkg/mq/msgstream/mqwrapper/kafka/kafka_consumer.go @@ -8,11 +8,11 @@ import ( "github.com/confluentinc/confluent-kafka-go/kafka" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type Consumer struct { diff --git a/pkg/mq/msgstream/mqwrapper/kafka/kafka_consumer_test.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_consumer_test.go index c058706f91..e3e1070e5d 100644 --- a/pkg/mq/msgstream/mqwrapper/kafka/kafka_consumer_test.go +++ b/pkg/mq/msgstream/mqwrapper/kafka/kafka_consumer_test.go @@ -10,8 +10,8 @@ import ( "github.com/confluentinc/confluent-kafka-go/kafka" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/common" - mqcommon "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/common" + mqcommon "github.com/milvus-io/milvus/pkg/v2/mq/common" ) func TestKafkaConsumer_Subscription(t *testing.T) { diff --git a/pkg/mq/msgstream/mqwrapper/kafka/kafka_id.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_id.go index 8f2d192673..772139c1a3 100644 --- a/pkg/mq/msgstream/mqwrapper/kafka/kafka_id.go +++ b/pkg/mq/msgstream/mqwrapper/kafka/kafka_id.go @@ -1,8 +1,8 @@ package kafka import ( - "github.com/milvus-io/milvus/pkg/common" - mqcommon "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/common" + mqcommon "github.com/milvus-io/milvus/pkg/v2/mq/common" ) func NewKafkaID(messageID int64) mqcommon.MessageID { diff --git a/pkg/mq/msgstream/mqwrapper/kafka/kafka_message.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_message.go index 93f611c9b6..a399009ff5 100644 --- a/pkg/mq/msgstream/mqwrapper/kafka/kafka_message.go +++ b/pkg/mq/msgstream/mqwrapper/kafka/kafka_message.go @@ -3,7 +3,7 @@ package kafka import ( "github.com/confluentinc/confluent-kafka-go/kafka" - "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/common" ) type kafkaMessage struct { diff --git a/pkg/mq/msgstream/mqwrapper/kafka/kafka_producer.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_producer.go index edd3016049..158f6ce5d0 100644 --- a/pkg/mq/msgstream/mqwrapper/kafka/kafka_producer.go +++ b/pkg/mq/msgstream/mqwrapper/kafka/kafka_producer.go @@ -9,12 +9,12 @@ import ( "github.com/confluentinc/confluent-kafka-go/kafka" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - mqcommon "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + mqcommon "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) type kafkaProducer struct { diff --git a/pkg/mq/msgstream/mqwrapper/kafka/kafka_producer_test.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_producer_test.go index ee7db58739..2bf9383d5a 100644 --- a/pkg/mq/msgstream/mqwrapper/kafka/kafka_producer_test.go +++ b/pkg/mq/msgstream/mqwrapper/kafka/kafka_producer_test.go @@ -10,7 +10,7 @@ import ( "github.com/confluentinc/confluent-kafka-go/kafka" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/common" ) func TestKafkaProducer_SendSuccess(t *testing.T) { diff --git a/pkg/mq/msgstream/mqwrapper/nmq/nmq_client.go b/pkg/mq/msgstream/mqwrapper/nmq/nmq_client.go index 6306025940..384be0ea92 100644 --- a/pkg/mq/msgstream/mqwrapper/nmq/nmq_client.go +++ b/pkg/mq/msgstream/mqwrapper/nmq/nmq_client.go @@ -26,11 +26,11 @@ import ( "github.com/cockroachdb/errors" "github.com/nats-io/nats.go" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) // nmqClient implements mqwrapper.Client. diff --git a/pkg/mq/msgstream/mqwrapper/nmq/nmq_client_test.go b/pkg/mq/msgstream/mqwrapper/nmq/nmq_client_test.go index 38fcd781e1..ad3e4f23c7 100644 --- a/pkg/mq/msgstream/mqwrapper/nmq/nmq_client_test.go +++ b/pkg/mq/msgstream/mqwrapper/nmq/nmq_client_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" ) func createNmqClient() (*nmqClient, error) { diff --git a/pkg/mq/msgstream/mqwrapper/nmq/nmq_consumer.go b/pkg/mq/msgstream/mqwrapper/nmq/nmq_consumer.go index 6830f96e98..015106af08 100644 --- a/pkg/mq/msgstream/mqwrapper/nmq/nmq_consumer.go +++ b/pkg/mq/msgstream/mqwrapper/nmq/nmq_consumer.go @@ -24,10 +24,10 @@ import ( "github.com/nats-io/nats.go" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // Consumer is a client that used to consume messages from natsmq diff --git a/pkg/mq/msgstream/mqwrapper/nmq/nmq_consumer_test.go b/pkg/mq/msgstream/mqwrapper/nmq/nmq_consumer_test.go index 70c2607da7..08cd68545a 100644 --- a/pkg/mq/msgstream/mqwrapper/nmq/nmq_consumer_test.go +++ b/pkg/mq/msgstream/mqwrapper/nmq/nmq_consumer_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" ) func TestNatsConsumer_Subscription(t *testing.T) { diff --git a/pkg/mq/msgstream/mqwrapper/nmq/nmq_id.go b/pkg/mq/msgstream/mqwrapper/nmq/nmq_id.go index 37571d4045..62e5f4956f 100644 --- a/pkg/mq/msgstream/mqwrapper/nmq/nmq_id.go +++ b/pkg/mq/msgstream/mqwrapper/nmq/nmq_id.go @@ -17,8 +17,8 @@ package nmq import ( - "github.com/milvus-io/milvus/pkg/common" - mqcommon "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/common" + mqcommon "github.com/milvus-io/milvus/pkg/v2/mq/common" ) // MessageIDType is a type alias for server.UniqueID that represents the ID of a Nmq message. diff --git a/pkg/mq/msgstream/mqwrapper/nmq/nmq_message.go b/pkg/mq/msgstream/mqwrapper/nmq/nmq_message.go index 7f6d42981b..9bcafe01ae 100644 --- a/pkg/mq/msgstream/mqwrapper/nmq/nmq_message.go +++ b/pkg/mq/msgstream/mqwrapper/nmq/nmq_message.go @@ -22,7 +22,7 @@ import ( "github.com/nats-io/nats.go" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/common" ) // Check nmqMessage implements ConsumerMessage diff --git a/pkg/mq/msgstream/mqwrapper/nmq/nmq_producer.go b/pkg/mq/msgstream/mqwrapper/nmq/nmq_producer.go index 3bc3907166..a0345ec20c 100644 --- a/pkg/mq/msgstream/mqwrapper/nmq/nmq_producer.go +++ b/pkg/mq/msgstream/mqwrapper/nmq/nmq_producer.go @@ -22,11 +22,11 @@ import ( "github.com/nats-io/nats.go" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) var _ mqwrapper.Producer = (*nmqProducer)(nil) diff --git a/pkg/mq/msgstream/mqwrapper/nmq/nmq_producer_test.go b/pkg/mq/msgstream/mqwrapper/nmq/nmq_producer_test.go index dc974808f0..d178e73168 100644 --- a/pkg/mq/msgstream/mqwrapper/nmq/nmq_producer_test.go +++ b/pkg/mq/msgstream/mqwrapper/nmq/nmq_producer_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/common" ) func TestNatsMQProducer(t *testing.T) { diff --git a/pkg/mq/msgstream/mqwrapper/nmq/nmq_server.go b/pkg/mq/msgstream/mqwrapper/nmq/nmq_server.go index 7fab92658a..1377379896 100644 --- a/pkg/mq/msgstream/mqwrapper/nmq/nmq_server.go +++ b/pkg/mq/msgstream/mqwrapper/nmq/nmq_server.go @@ -27,8 +27,8 @@ import ( "github.com/nats-io/nats-server/v2/server" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // Nmq is global natsmq instance that will be initialized only once diff --git a/pkg/mq/msgstream/mqwrapper/nmq/nmq_server_test.go b/pkg/mq/msgstream/mqwrapper/nmq/nmq_server_test.go index c65e169919..e22d40a536 100644 --- a/pkg/mq/msgstream/mqwrapper/nmq/nmq_server_test.go +++ b/pkg/mq/msgstream/mqwrapper/nmq/nmq_server_test.go @@ -25,7 +25,7 @@ import ( "github.com/nats-io/nats-server/v2/server" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var natsServerAddress string diff --git a/pkg/mq/msgstream/mqwrapper/producer.go b/pkg/mq/msgstream/mqwrapper/producer.go index 12579de297..84721796da 100644 --- a/pkg/mq/msgstream/mqwrapper/producer.go +++ b/pkg/mq/msgstream/mqwrapper/producer.go @@ -19,7 +19,7 @@ package mqwrapper import ( "context" - "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/common" ) // Producer is the interface that provides operations of producer diff --git a/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_client.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_client.go index c33f0df938..ca48ec39c0 100644 --- a/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_client.go +++ b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_client.go @@ -28,11 +28,11 @@ import ( "github.com/streamnative/pulsarctl/pkg/pulsar/common" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - mqcommon "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + mqcommon "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) type pulsarClient struct { diff --git a/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_client_test.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_client_test.go index bded0c3227..c9797c65b8 100644 --- a/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_client_test.go +++ b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_client_test.go @@ -33,12 +33,12 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - mqcommon "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + mqcommon "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) const ( diff --git a/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_consumer.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_consumer.go index 7d4dac2ebe..2f8e3da0df 100644 --- a/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_consumer.go +++ b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_consumer.go @@ -26,10 +26,10 @@ import ( "github.com/apache/pulsar-client-go/pulsar" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/util/retry" ) // Consumer consumes from pulsar diff --git a/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_consumer_test.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_consumer_test.go index b829c2428a..bc052eff26 100644 --- a/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_consumer_test.go +++ b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_consumer_test.go @@ -27,8 +27,8 @@ import ( "github.com/streamnative/pulsarctl/pkg/pulsar/utils" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/common" - mqcommon "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/common" + mqcommon "github.com/milvus-io/milvus/pkg/v2/mq/common" ) func TestPulsarConsumer_Subscription(t *testing.T) { diff --git a/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_id.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_id.go index e029175a63..5ec18f2b42 100644 --- a/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_id.go +++ b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_id.go @@ -21,7 +21,7 @@ import ( "github.com/apache/pulsar-client-go/pulsar" - "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/common" ) // NewPulsarID creates a new pulsarID diff --git a/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_message.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_message.go index 27cbfeb08a..d8f846c2b7 100644 --- a/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_message.go +++ b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_message.go @@ -19,7 +19,7 @@ package pulsar import ( "github.com/apache/pulsar-client-go/pulsar" - "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/common" ) // Check pulsarMessage implements ConsumerMessage diff --git a/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_producer.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_producer.go index fcd95ca163..e686c98768 100644 --- a/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_producer.go +++ b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_producer.go @@ -21,10 +21,10 @@ import ( "github.com/apache/pulsar-client-go/pulsar" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) // implementation assertion diff --git a/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_producer_test.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_producer_test.go index 5c4fdf5f2f..37f88edfde 100644 --- a/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_producer_test.go +++ b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_producer_test.go @@ -23,7 +23,7 @@ import ( "github.com/apache/pulsar-client-go/pulsar" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/common" ) func TestPulsarProducer(t *testing.T) { diff --git a/pkg/mq/msgstream/mqwrapper/rmq/rmq_client.go b/pkg/mq/msgstream/mqwrapper/rmq/rmq_client.go index b40192fe85..29d08939c8 100644 --- a/pkg/mq/msgstream/mqwrapper/rmq/rmq_client.go +++ b/pkg/mq/msgstream/mqwrapper/rmq/rmq_client.go @@ -23,13 +23,13 @@ import ( "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/client" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/client" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) // nmqClient implements mqwrapper.Client. diff --git a/pkg/mq/msgstream/mqwrapper/rmq/rmq_client_test.go b/pkg/mq/msgstream/mqwrapper/rmq/rmq_client_test.go index 4c42275b6d..3c684306c1 100644 --- a/pkg/mq/msgstream/mqwrapper/rmq/rmq_client_test.go +++ b/pkg/mq/msgstream/mqwrapper/rmq/rmq_client_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/milvus-io/milvus/pkg/mq/common" - client3 "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/client" - server2 "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + client3 "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/client" + server2 "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMain(m *testing.M) { diff --git a/pkg/mq/msgstream/mqwrapper/rmq/rmq_consumer.go b/pkg/mq/msgstream/mqwrapper/rmq/rmq_consumer.go index 724206e518..0426163812 100644 --- a/pkg/mq/msgstream/mqwrapper/rmq/rmq_consumer.go +++ b/pkg/mq/msgstream/mqwrapper/rmq/rmq_consumer.go @@ -20,9 +20,9 @@ import ( "sync" "sync/atomic" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/client" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/client" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" ) // Consumer is a client that used to consume messages from rocksmq diff --git a/pkg/mq/msgstream/mqwrapper/rmq/rmq_producer.go b/pkg/mq/msgstream/mqwrapper/rmq/rmq_producer.go index f6bf0f3707..5a60094534 100644 --- a/pkg/mq/msgstream/mqwrapper/rmq/rmq_producer.go +++ b/pkg/mq/msgstream/mqwrapper/rmq/rmq_producer.go @@ -14,12 +14,12 @@ package rmq import ( "context" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/client" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/client" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/util/timerecord" ) var _ mqwrapper.Producer = (*rmqProducer)(nil) diff --git a/pkg/mq/msgstream/msg.go b/pkg/mq/msgstream/msg.go index 8b409e8c8d..c53228d7b7 100644 --- a/pkg/mq/msgstream/msg.go +++ b/pkg/mq/msgstream/msg.go @@ -27,9 +27,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // MsgType is an alias of commonpb.MsgType diff --git a/pkg/mq/msgstream/msgstream.go b/pkg/mq/msgstream/msgstream.go index f6778fcfcc..aaa2ee69de 100644 --- a/pkg/mq/msgstream/msgstream.go +++ b/pkg/mq/msgstream/msgstream.go @@ -27,10 +27,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // UniqueID is an alias for short diff --git a/pkg/mq/msgstream/msgstream_util.go b/pkg/mq/msgstream/msgstream_util.go index e7adbee073..215444554c 100644 --- a/pkg/mq/msgstream/msgstream_util.go +++ b/pkg/mq/msgstream/msgstream_util.go @@ -27,12 +27,12 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - pcommon "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/common" - kafkamqwrapper "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/kafka" - pulsarmqwrapper "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/pulsar" - "github.com/milvus-io/milvus/pkg/util/paramtable" + pcommon "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + kafkamqwrapper "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper/kafka" + pulsarmqwrapper "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper/pulsar" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // unsubscribeChannels create consumer first, and unsubscribe channel through msgStream.close() diff --git a/pkg/mq/msgstream/msgstream_util_test.go b/pkg/mq/msgstream/msgstream_util_test.go index 9811ea5e78..4079272a29 100644 --- a/pkg/mq/msgstream/msgstream_util_test.go +++ b/pkg/mq/msgstream/msgstream_util_test.go @@ -26,7 +26,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/common" ) func TestPulsarMsgUtil(t *testing.T) { diff --git a/pkg/mq/msgstream/stream_bench_test.go b/pkg/mq/msgstream/stream_bench_test.go index ca7676ae5f..f31cab18d6 100644 --- a/pkg/mq/msgstream/stream_bench_test.go +++ b/pkg/mq/msgstream/stream_bench_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/nmq" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper/nmq" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func BenchmarkProduceAndConsumeNatsMQ(b *testing.B) { diff --git a/pkg/mq/msgstream/stream_test.go b/pkg/mq/msgstream/stream_test.go index d752d34529..85be32228b 100644 --- a/pkg/mq/msgstream/stream_test.go +++ b/pkg/mq/msgstream/stream_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) func testStreamOperation(t *testing.T, mqClient mqwrapper.Client) { diff --git a/pkg/proto/cgo_msg.proto b/pkg/proto/cgo_msg.proto index 6c286bba0f..1ebc91dcbe 100644 --- a/pkg/proto/cgo_msg.proto +++ b/pkg/proto/cgo_msg.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package milvus.proto.cgo; -option go_package="github.com/milvus-io/milvus/pkg/proto/cgopb"; +option go_package="github.com/milvus-io/milvus/pkg/v2/proto/cgopb"; import "schema.proto"; diff --git a/pkg/proto/cgopb/cgo_msg.pb.go b/pkg/proto/cgopb/cgo_msg.pb.go index 0018995d86..90c297cc6b 100644 --- a/pkg/proto/cgopb/cgo_msg.pb.go +++ b/pkg/proto/cgopb/cgo_msg.pb.go @@ -352,10 +352,11 @@ var file_cgo_msg_proto_rawDesc = []byte{ 0x0a, 0x09, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, - 0x66, 0x69, 0x6c, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x42, 0x2d, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, + 0x66, 0x69, 0x6c, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x42, 0x30, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, 0x6f, - 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2f, 0x63, 0x67, 0x6f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x67, 0x6f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/pkg/proto/clustering.proto b/pkg/proto/clustering.proto index eef47b534f..a1042c3242 100644 --- a/pkg/proto/clustering.proto +++ b/pkg/proto/clustering.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package milvus.proto.clustering; -option go_package = "github.com/milvus-io/milvus/pkg/proto/clusteringpb"; +option go_package = "github.com/milvus-io/milvus/pkg/v2/proto/clusteringpb"; import "schema.proto"; // Synchronously modify StorageConfig in index_coord.proto/index_cgo_msg.proto file diff --git a/pkg/proto/clusteringpb/clustering.pb.go b/pkg/proto/clusteringpb/clustering.pb.go index cf0d771aad..ccd702e5bc 100644 --- a/pkg/proto/clusteringpb/clustering.pb.go +++ b/pkg/proto/clusteringpb/clustering.pb.go @@ -608,11 +608,11 @@ var file_clustering_proto_rawDesc = []byte{ 0x03, 0x28, 0x0d, 0x52, 0x11, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x6f, 0x69, 0x64, 0x49, 0x64, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x75, 0x6d, 0x5f, 0x69, 0x6e, 0x5f, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x03, 0x52, - 0x0d, 0x6e, 0x75, 0x6d, 0x49, 0x6e, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x6f, 0x69, 0x64, 0x42, 0x34, - 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, + 0x0d, 0x6e, 0x75, 0x6d, 0x49, 0x6e, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x6f, 0x69, 0x64, 0x42, 0x37, + 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, 0x6f, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, - 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x69, - 0x6e, 0x67, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, + 0x65, 0x72, 0x69, 0x6e, 0x67, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/proto/data_coord.proto b/pkg/proto/data_coord.proto index 19e371bb1d..5d8a5fbf51 100644 --- a/pkg/proto/data_coord.proto +++ b/pkg/proto/data_coord.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package milvus.proto.data; -option go_package = "github.com/milvus-io/milvus/pkg/proto/datapb"; +option go_package = "github.com/milvus-io/milvus/pkg/v2/proto/datapb"; import "common.proto"; import "internal.proto"; diff --git a/pkg/proto/datapb/data_coord.pb.go b/pkg/proto/datapb/data_coord.pb.go index 2161deaa96..c90c6b275b 100644 --- a/pkg/proto/datapb/data_coord.pb.go +++ b/pkg/proto/datapb/data_coord.pb.go @@ -11,8 +11,8 @@ import ( milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" msgpb "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" schemapb "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - indexpb "github.com/milvus-io/milvus/pkg/proto/indexpb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + indexpb "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -10269,11 +10269,11 @@ var file_data_coord_proto_rawDesc = []byte{ 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x44, 0x72, 0x6f, 0x70, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6c, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x63, - 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x00, 0x42, 0x2e, - 0x5a, 0x2c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x00, 0x42, 0x31, + 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, 0x6f, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, - 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/proto/datapb/data_coord_grpc.pb.go b/pkg/proto/datapb/data_coord_grpc.pb.go index fc64e5fa91..320efe5637 100644 --- a/pkg/proto/datapb/data_coord_grpc.pb.go +++ b/pkg/proto/datapb/data_coord_grpc.pb.go @@ -10,8 +10,8 @@ import ( context "context" commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - indexpb "github.com/milvus-io/milvus/pkg/proto/indexpb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + indexpb "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/pkg/proto/etcd_meta.proto b/pkg/proto/etcd_meta.proto index 0ec4770819..055bc13e7d 100644 --- a/pkg/proto/etcd_meta.proto +++ b/pkg/proto/etcd_meta.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package milvus.proto.etcd; -option go_package="github.com/milvus-io/milvus/pkg/proto/etcdpb"; +option go_package="github.com/milvus-io/milvus/pkg/v2/proto/etcdpb"; import "common.proto"; import "schema.proto"; diff --git a/pkg/proto/etcdpb/etcd_meta.pb.go b/pkg/proto/etcdpb/etcd_meta.pb.go index 3d97c55b8c..230231cb84 100644 --- a/pkg/proto/etcdpb/etcd_meta.pb.go +++ b/pkg/proto/etcdpb/etcd_meta.pb.go @@ -1243,10 +1243,11 @@ var file_etcd_meta_proto_rawDesc = []byte{ 0x0a, 0x0d, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x44, 0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x10, 0x02, 0x12, 0x10, 0x0a, 0x0c, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x44, 0x72, 0x6f, - 0x70, 0x70, 0x65, 0x64, 0x10, 0x03, 0x42, 0x2e, 0x5a, 0x2c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x70, 0x70, 0x65, 0x64, 0x10, 0x03, 0x42, 0x31, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, 0x6f, 0x2f, 0x6d, - 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, - 0x65, 0x74, 0x63, 0x64, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x63, 0x64, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/pkg/proto/index_cgo_msg.proto b/pkg/proto/index_cgo_msg.proto index d8146a6cbe..65aeecd9d7 100644 --- a/pkg/proto/index_cgo_msg.proto +++ b/pkg/proto/index_cgo_msg.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package milvus.proto.indexcgo; -option go_package="github.com/milvus-io/milvus/pkg/proto/indexcgopb"; +option go_package="github.com/milvus-io/milvus/pkg/v2/proto/indexcgopb"; import "common.proto"; import "schema.proto"; diff --git a/pkg/proto/index_coord.proto b/pkg/proto/index_coord.proto index 02b8128d28..044c3a1d14 100644 --- a/pkg/proto/index_coord.proto +++ b/pkg/proto/index_coord.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package milvus.proto.index; -option go_package = "github.com/milvus-io/milvus/pkg/proto/indexpb"; +option go_package = "github.com/milvus-io/milvus/pkg/v2/proto/indexpb"; import "common.proto"; import "internal.proto"; diff --git a/pkg/proto/indexcgopb/index_cgo_msg.pb.go b/pkg/proto/indexcgopb/index_cgo_msg.pb.go index 2d72a0acf9..b282fb9048 100644 --- a/pkg/proto/indexcgopb/index_cgo_msg.pb.go +++ b/pkg/proto/indexcgopb/index_cgo_msg.pb.go @@ -1004,10 +1004,11 @@ var file_index_cgo_msg_proto_rawDesc = []byte{ 0x28, 0x03, 0x52, 0x0c, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x49, 0x44, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x49, 0x44, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, 0x6f, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, - 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x69, 0x6e, 0x64, 0x65, - 0x78, 0x63, 0x67, 0x6f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x69, + 0x6e, 0x64, 0x65, 0x78, 0x63, 0x67, 0x6f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/pkg/proto/indexpb/index_coord.pb.go b/pkg/proto/indexpb/index_coord.pb.go index 24e0420afd..9d1c98e721 100644 --- a/pkg/proto/indexpb/index_coord.pb.go +++ b/pkg/proto/indexpb/index_coord.pb.go @@ -10,7 +10,7 @@ import ( commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" schemapb "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -3353,10 +3353,11 @@ var file_index_coord_proto_rawDesc = []byte{ 0x6c, 0x74, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x2f, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, 0x6f, 0x2f, 0x6d, - 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, - 0x69, 0x6e, 0x64, 0x65, 0x78, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/pkg/proto/indexpb/index_coord_grpc.pb.go b/pkg/proto/indexpb/index_coord_grpc.pb.go index 8c162ad329..ab75520080 100644 --- a/pkg/proto/indexpb/index_coord_grpc.pb.go +++ b/pkg/proto/indexpb/index_coord_grpc.pb.go @@ -10,7 +10,7 @@ import ( context "context" commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/pkg/proto/internal.proto b/pkg/proto/internal.proto index d7ba3459a2..e96c9b6875 100644 --- a/pkg/proto/internal.proto +++ b/pkg/proto/internal.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package milvus.proto.internal; -option go_package = "github.com/milvus-io/milvus/pkg/proto/internalpb"; +option go_package = "github.com/milvus-io/milvus/pkg/v2/proto/internalpb"; import "common.proto"; import "schema.proto"; diff --git a/pkg/proto/internalpb/internal.pb.go b/pkg/proto/internalpb/internal.pb.go index 43d69902c2..cb6d5b91f1 100644 --- a/pkg/proto/internalpb/internal.pb.go +++ b/pkg/proto/internalpb/internal.pb.go @@ -4188,11 +4188,11 @@ var file_internal_proto_rawDesc = []byte{ 0x0a, 0x06, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x04, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0x05, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x6e, 0x67, 0x10, 0x06, 0x12, 0x09, 0x0a, 0x05, - 0x53, 0x74, 0x61, 0x74, 0x73, 0x10, 0x07, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x53, 0x74, 0x61, 0x74, 0x73, 0x10, 0x07, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, 0x6f, 0x2f, - 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/proto/messages.proto b/pkg/proto/messages.proto index 604641c0e3..0ae7b7e8a9 100644 --- a/pkg/proto/messages.proto +++ b/pkg/proto/messages.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package milvus.proto.messages; -option go_package = "github.com/milvus-io/milvus/pkg/proto/messagespb"; +option go_package = "github.com/milvus-io/milvus/pkg/v2/proto/messagespb"; // MessageID is the unique identifier of a message. message MessageID { diff --git a/pkg/proto/messagespb/messages.pb.go b/pkg/proto/messagespb/messages.pb.go index 1a278a808a..c4e8f492de 100644 --- a/pkg/proto/messagespb/messages.pb.go +++ b/pkg/proto/messagespb/messages.pb.go @@ -2316,10 +2316,10 @@ var file_messages_proto_rawDesc = []byte{ 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4a, 0x6f, 0x62, 0x49, 0x44, 0x10, 0x01, 0x12, 0x20, 0x0a, 0x1c, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x10, 0x02, 0x42, - 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, + 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, 0x6f, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, - 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x73, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6b, 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6d, 0x65, 0x73, 0x73, + 0x61, 0x67, 0x65, 0x73, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/proto/plan.proto b/pkg/proto/plan.proto index dbf4e7621a..33e05ec510 100644 --- a/pkg/proto/plan.proto +++ b/pkg/proto/plan.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package milvus.proto.plan; -option go_package = "github.com/milvus-io/milvus/pkg/proto/planpb"; +option go_package = "github.com/milvus-io/milvus/pkg/v2/proto/planpb"; import "schema.proto"; enum OpType { diff --git a/pkg/proto/planpb/plan.pb.go b/pkg/proto/planpb/plan.pb.go index bc8b37ce83..2c4dd9f308 100644 --- a/pkg/proto/planpb/plan.pb.go +++ b/pkg/proto/planpb/plan.pb.go @@ -2990,10 +2990,10 @@ var file_plan_proto_rawDesc = []byte{ 0x74, 0x31, 0x36, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x10, 0x03, 0x12, 0x15, 0x0a, 0x11, 0x53, 0x70, 0x61, 0x72, 0x73, 0x65, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x10, 0x04, 0x12, 0x0e, 0x0a, 0x0a, 0x49, 0x6e, 0x74, 0x38, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, - 0x10, 0x05, 0x42, 0x2e, 0x5a, 0x2c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x10, 0x05, 0x42, 0x31, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, 0x6f, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, - 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x6c, 0x61, 0x6e, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, + 0x6c, 0x61, 0x6e, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/proto/proxy.proto b/pkg/proto/proxy.proto index d493ae62c5..15cfc038fa 100644 --- a/pkg/proto/proxy.proto +++ b/pkg/proto/proxy.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package milvus.proto.proxy; -option go_package = "github.com/milvus-io/milvus/pkg/proto/proxypb"; +option go_package = "github.com/milvus-io/milvus/pkg/v2/proto/proxypb"; import "common.proto"; import "internal.proto"; diff --git a/pkg/proto/proxypb/proxy.pb.go b/pkg/proto/proxypb/proxy.pb.go index 36a0e3dcae..643e71a237 100644 --- a/pkg/proto/proxypb/proxy.pb.go +++ b/pkg/proto/proxypb/proxy.pb.go @@ -9,7 +9,7 @@ package proxypb import ( commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -915,11 +915,11 @@ var file_proxy_proto_rawDesc = []byte{ 0x74, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x43, 0x61, 0x63, 0x68, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, - 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x00, 0x42, 0x2f, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, + 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x00, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, 0x6f, - 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/proto/proxypb/proxy_grpc.pb.go b/pkg/proto/proxypb/proxy_grpc.pb.go index 8f155d508b..0b748c0c08 100644 --- a/pkg/proto/proxypb/proxy_grpc.pb.go +++ b/pkg/proto/proxypb/proxy_grpc.pb.go @@ -10,7 +10,7 @@ import ( context "context" commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/pkg/proto/query_coord.proto b/pkg/proto/query_coord.proto index a8c7c244bd..dff5a3047b 100644 --- a/pkg/proto/query_coord.proto +++ b/pkg/proto/query_coord.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package milvus.proto.query; -option go_package = "github.com/milvus-io/milvus/pkg/proto/querypb"; +option go_package = "github.com/milvus-io/milvus/pkg/v2/proto/querypb"; import "common.proto"; import "milvus.proto"; diff --git a/pkg/proto/querypb/query_coord.pb.go b/pkg/proto/querypb/query_coord.pb.go index 5ff05564af..2cbe4a7cca 100644 --- a/pkg/proto/querypb/query_coord.pb.go +++ b/pkg/proto/querypb/query_coord.pb.go @@ -12,9 +12,9 @@ import ( msgpb "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" rgpb "github.com/milvus-io/milvus-proto/go-api/v2/rgpb" schemapb "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" - indexpb "github.com/milvus-io/milvus/pkg/proto/indexpb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + indexpb "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -9034,10 +9034,11 @@ var file_query_coord_proto_rawDesc = []byte{ 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x42, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x2f, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, 0x6f, 0x2f, 0x6d, - 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, - 0x71, 0x75, 0x65, 0x72, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x2f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/pkg/proto/querypb/query_coord_grpc.pb.go b/pkg/proto/querypb/query_coord_grpc.pb.go index 7a207c41c6..388b4050e4 100644 --- a/pkg/proto/querypb/query_coord_grpc.pb.go +++ b/pkg/proto/querypb/query_coord_grpc.pb.go @@ -10,7 +10,7 @@ import ( context "context" commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/pkg/proto/root_coord.proto b/pkg/proto/root_coord.proto index d391f457e3..25a5c51046 100644 --- a/pkg/proto/root_coord.proto +++ b/pkg/proto/root_coord.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package milvus.proto.rootcoord; -option go_package="github.com/milvus-io/milvus/pkg/proto/rootcoordpb"; +option go_package="github.com/milvus-io/milvus/pkg/v2/proto/rootcoordpb"; import "common.proto"; import "milvus.proto"; diff --git a/pkg/proto/rootcoordpb/root_coord.pb.go b/pkg/proto/rootcoordpb/root_coord.pb.go index fc93a2263c..a74bbddf45 100644 --- a/pkg/proto/rootcoordpb/root_coord.pb.go +++ b/pkg/proto/rootcoordpb/root_coord.pb.go @@ -9,9 +9,9 @@ package rootcoordpb import ( commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - etcdpb "github.com/milvus-io/milvus/pkg/proto/etcdpb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" - proxypb "github.com/milvus-io/milvus/pkg/proto/proxypb" + etcdpb "github.com/milvus-io/milvus/pkg/v2/proto/etcdpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + proxypb "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -1813,11 +1813,11 @@ var file_root_coord_proto_rawDesc = []byte{ 0x74, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x2e, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, - 0x6e, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x00, 0x42, 0x33, 0x5a, 0x31, 0x67, 0x69, + 0x6e, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x00, 0x42, 0x36, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, - 0x69, 0x6f, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x2f, 0x72, 0x6f, 0x6f, 0x74, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x70, 0x62, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x6f, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x32, + 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x72, 0x6f, 0x6f, 0x74, 0x63, 0x6f, 0x6f, 0x72, 0x64, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/proto/rootcoordpb/root_coord_grpc.pb.go b/pkg/proto/rootcoordpb/root_coord_grpc.pb.go index 252a20af9e..8bff12df83 100644 --- a/pkg/proto/rootcoordpb/root_coord_grpc.pb.go +++ b/pkg/proto/rootcoordpb/root_coord_grpc.pb.go @@ -10,8 +10,8 @@ import ( context "context" commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" - proxypb "github.com/milvus-io/milvus/pkg/proto/proxypb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + proxypb "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/pkg/proto/segcore.proto b/pkg/proto/segcore.proto index f11ac17bc8..da56244977 100644 --- a/pkg/proto/segcore.proto +++ b/pkg/proto/segcore.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package milvus.proto.segcore; -option go_package = "github.com/milvus-io/milvus/pkg/proto/segcorepb"; +option go_package = "github.com/milvus-io/milvus/pkg/v2/proto/segcorepb"; import "schema.proto"; import "common.proto"; diff --git a/pkg/proto/segcorepb/segcore.pb.go b/pkg/proto/segcorepb/segcore.pb.go index ef4c536797..c8e9c3c3ae 100644 --- a/pkg/proto/segcorepb/segcore.pb.go +++ b/pkg/proto/segcorepb/segcore.pb.go @@ -499,11 +499,11 @@ var file_segcore_proto_rawDesc = []byte{ 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x73, 0x65, 0x67, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0a, 0x69, - 0x6e, 0x64, 0x65, 0x78, 0x4d, 0x65, 0x74, 0x61, 0x73, 0x42, 0x31, 0x5a, 0x2f, 0x67, 0x69, 0x74, + 0x6e, 0x64, 0x65, 0x78, 0x4d, 0x65, 0x74, 0x61, 0x73, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, - 0x6f, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x2f, 0x73, 0x65, 0x67, 0x63, 0x6f, 0x72, 0x65, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x32, 0x2f, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x65, 0x67, 0x63, 0x6f, 0x72, 0x65, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/proto/storagev2pb/storagev2.pb.go b/pkg/proto/storagev2pb/storagev2.pb.go index 7852e3d073..40fef3ddef 100644 --- a/pkg/proto/storagev2pb/storagev2.pb.go +++ b/pkg/proto/storagev2pb/storagev2.pb.go @@ -1249,10 +1249,11 @@ var file_storagev2_proto_rawDesc = []byte{ 0x10, 0x20, 0x12, 0x0a, 0x0a, 0x06, 0x4d, 0x41, 0x58, 0x5f, 0x49, 0x44, 0x10, 0x27, 0x2a, 0x21, 0x0a, 0x0a, 0x45, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x6e, 0x65, 0x73, 0x73, 0x12, 0x0a, 0x0a, 0x06, 0x4c, 0x69, 0x74, 0x74, 0x6c, 0x65, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x42, 0x69, 0x67, 0x10, - 0x01, 0x42, 0x33, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x01, 0x42, 0x36, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, 0x6f, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, - 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x61, - 0x67, 0x65, 0x76, 0x32, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x74, + 0x6f, 0x72, 0x61, 0x67, 0x65, 0x76, 0x32, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/pkg/proto/streaming.proto b/pkg/proto/streaming.proto index d0e992f253..0b889363e4 100644 --- a/pkg/proto/streaming.proto +++ b/pkg/proto/streaming.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package milvus.proto.streaming; -option go_package = "github.com/milvus-io/milvus/pkg/proto/streamingpb"; +option go_package = "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb"; import "messages.proto"; import "milvus.proto"; diff --git a/pkg/proto/streamingpb/streaming.pb.go b/pkg/proto/streamingpb/streaming.pb.go index a0dce7460a..65045e7b77 100644 --- a/pkg/proto/streamingpb/streaming.pb.go +++ b/pkg/proto/streamingpb/streaming.pb.go @@ -8,7 +8,7 @@ package streamingpb import ( milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - messagespb "github.com/milvus-io/milvus/pkg/proto/messagespb" + messagespb "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -4616,10 +4616,11 @@ var file_streaming_proto_rawDesc = []byte{ 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x64, 0x65, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x00, 0x42, 0x33, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x65, 0x22, 0x00, 0x42, 0x36, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, 0x6f, 0x2f, 0x6d, 0x69, 0x6c, 0x76, - 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x74, 0x72, - 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x75, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, + 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/proto/worker.proto b/pkg/proto/worker.proto index 37f77d6239..c1ec92552d 100644 --- a/pkg/proto/worker.proto +++ b/pkg/proto/worker.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package milvus.proto.index; -option go_package = "github.com/milvus-io/milvus/pkg/proto/workerpb"; +option go_package = "github.com/milvus-io/milvus/pkg/v2/proto/workerpb"; import "common.proto"; import "internal.proto"; diff --git a/pkg/proto/workerpb/worker.pb.go b/pkg/proto/workerpb/worker.pb.go index 92e16a7c85..75f5f9605d 100644 --- a/pkg/proto/workerpb/worker.pb.go +++ b/pkg/proto/workerpb/worker.pb.go @@ -10,9 +10,9 @@ import ( commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" schemapb "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - datapb "github.com/milvus-io/milvus/pkg/proto/datapb" - indexpb "github.com/milvus-io/milvus/pkg/proto/indexpb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + datapb "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + indexpb "github.com/milvus-io/milvus/pkg/v2/proto/indexpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -2221,10 +2221,10 @@ var file_worker_proto_rawDesc = []byte{ 0x2e, 0x44, 0x72, 0x6f, 0x70, 0x4a, 0x6f, 0x62, 0x73, 0x56, 0x32, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, - 0x00, 0x42, 0x30, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x00, 0x42, 0x33, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, 0x2d, 0x69, 0x6f, 0x2f, 0x6d, 0x69, 0x6c, 0x76, 0x75, 0x73, - 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x77, 0x6f, 0x72, 0x6b, 0x65, - 0x72, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x77, 0x6f, + 0x72, 0x6b, 0x65, 0x72, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/proto/workerpb/worker_grpc.pb.go b/pkg/proto/workerpb/worker_grpc.pb.go index a13c2bb553..a8af47a7b3 100644 --- a/pkg/proto/workerpb/worker_grpc.pb.go +++ b/pkg/proto/workerpb/worker_grpc.pb.go @@ -10,7 +10,7 @@ import ( context "context" commonpb "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" milvuspb "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - internalpb "github.com/milvus-io/milvus/pkg/proto/internalpb" + internalpb "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/pkg/streaming/util/message/adaptor/broadcast_message.go b/pkg/streaming/util/message/adaptor/broadcast_message.go index 338da8ac00..3a50db160f 100644 --- a/pkg/streaming/util/message/adaptor/broadcast_message.go +++ b/pkg/streaming/util/message/adaptor/broadcast_message.go @@ -3,8 +3,8 @@ package adaptor import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) func NewMsgPackFromMutableMessageV1(msg message.MutableMessage) (msgstream.TsMsg, error) { diff --git a/pkg/streaming/util/message/adaptor/handler.go b/pkg/streaming/util/message/adaptor/handler.go index 57bcb56edb..c3a2b6d4e7 100644 --- a/pkg/streaming/util/message/adaptor/handler.go +++ b/pkg/streaming/util/message/adaptor/handler.go @@ -3,10 +3,10 @@ package adaptor import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type ChanMessageHandler chan message.ImmutableMessage diff --git a/pkg/streaming/util/message/adaptor/handler_test.go b/pkg/streaming/util/message/adaptor/handler_test.go index d34ece8b1d..71fe275b05 100644 --- a/pkg/streaming/util/message/adaptor/handler_test.go +++ b/pkg/streaming/util/message/adaptor/handler_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/rmq" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/rmq" ) func TestMsgPackAdaptorHandler(t *testing.T) { diff --git a/pkg/streaming/util/message/adaptor/message.go b/pkg/streaming/util/message/adaptor/message.go index 70064f7640..ba03df1aa8 100644 --- a/pkg/streaming/util/message/adaptor/message.go +++ b/pkg/streaming/util/message/adaptor/message.go @@ -5,8 +5,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) var UnmashalerDispatcher = (&msgstream.ProtoUDFactory{}).NewUnmarshalDispatcher() diff --git a/pkg/streaming/util/message/adaptor/message_id.go b/pkg/streaming/util/message/adaptor/message_id.go index 1cd76ba1a8..f61eb569f9 100644 --- a/pkg/streaming/util/message/adaptor/message_id.go +++ b/pkg/streaming/util/message/adaptor/message_id.go @@ -6,14 +6,14 @@ import ( "github.com/apache/pulsar-client-go/pulsar" rawKafka "github.com/confluentinc/confluent-kafka-go/kafka" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" - mqkafka "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/kafka" - mqpulsar "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/pulsar" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - msgkafka "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/kafka" - msgpulsar "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/pulsar" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/rmq" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" + mqkafka "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper/kafka" + mqpulsar "github.com/milvus-io/milvus/pkg/v2/mq/msgstream/mqwrapper/pulsar" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + msgkafka "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/kafka" + msgpulsar "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/pulsar" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/rmq" ) // MustGetMQWrapperIDFromMessage converts message.MessageID to common.MessageID diff --git a/pkg/streaming/util/message/adaptor/message_id_test.go b/pkg/streaming/util/message/adaptor/message_id_test.go index 81da9f5e87..27fed2032b 100644 --- a/pkg/streaming/util/message/adaptor/message_id_test.go +++ b/pkg/streaming/util/message/adaptor/message_id_test.go @@ -6,9 +6,9 @@ import ( "github.com/apache/pulsar-client-go/pulsar" "github.com/stretchr/testify/assert" - msgkafka "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/kafka" - msgpulsar "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/pulsar" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/rmq" + msgkafka "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/kafka" + msgpulsar "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/pulsar" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/rmq" ) func TestIDConvension(t *testing.T) { diff --git a/pkg/streaming/util/message/adaptor/message_test.go b/pkg/streaming/util/message/adaptor/message_test.go index 5196405d51..0caef7c559 100644 --- a/pkg/streaming/util/message/adaptor/message_test.go +++ b/pkg/streaming/util/message/adaptor/message_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/rmq" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/rmq" ) func TestNewMsgPackFromInsertMessage(t *testing.T) { diff --git a/pkg/streaming/util/message/adaptor/message_type.go b/pkg/streaming/util/message/adaptor/message_type.go index 2f83d4833e..f567365e1e 100644 --- a/pkg/streaming/util/message/adaptor/message_type.go +++ b/pkg/streaming/util/message/adaptor/message_type.go @@ -2,7 +2,7 @@ package adaptor import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) var messageTypeToCommonpbMsgType = map[message.MessageType]commonpb.MsgType{ diff --git a/pkg/streaming/util/message/adaptor/ts_msg_newer.go b/pkg/streaming/util/message/adaptor/ts_msg_newer.go index fe7aa12c79..04ed27d4de 100644 --- a/pkg/streaming/util/message/adaptor/ts_msg_newer.go +++ b/pkg/streaming/util/message/adaptor/ts_msg_newer.go @@ -2,8 +2,8 @@ package adaptor import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/mq/msgstream" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/mq/msgstream" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) var ( diff --git a/pkg/streaming/util/message/broadcast.go b/pkg/streaming/util/message/broadcast.go index b29c94407a..fb95d05c76 100644 --- a/pkg/streaming/util/message/broadcast.go +++ b/pkg/streaming/util/message/broadcast.go @@ -5,8 +5,8 @@ import ( "google.golang.org/protobuf/proto" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // newBroadcastHeaderFromProto creates a BroadcastHeader from proto. diff --git a/pkg/streaming/util/message/builder.go b/pkg/streaming/util/message/builder.go index 8df84094a8..c27e41df6c 100644 --- a/pkg/streaming/util/message/builder.go +++ b/pkg/streaming/util/message/builder.go @@ -7,9 +7,9 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/util/tsoutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/util/tsoutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // NewMutableMessageBeforeAppend creates a new mutable message. diff --git a/pkg/streaming/util/message/message_builder_test.go b/pkg/streaming/util/message/message_builder_test.go index cb798fe891..1464c65a89 100644 --- a/pkg/streaming/util/message/message_builder_test.go +++ b/pkg/streaming/util/message/message_builder_test.go @@ -8,8 +8,8 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" ) func TestMessage(t *testing.T) { diff --git a/pkg/streaming/util/message/message_id.go b/pkg/streaming/util/message/message_id.go index 69bf61e94e..fc0f232f74 100644 --- a/pkg/streaming/util/message/message_id.go +++ b/pkg/streaming/util/message/message_id.go @@ -5,7 +5,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/pkg/streaming/util/message/message_id_test.go b/pkg/streaming/util/message/message_id_test.go index 437b35b385..2e964f96b9 100644 --- a/pkg/streaming/util/message/message_id_test.go +++ b/pkg/streaming/util/message/message_id_test.go @@ -6,8 +6,8 @@ import ( "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) func TestRegisterMessageIDUnmarshaler(t *testing.T) { diff --git a/pkg/streaming/util/message/message_impl.go b/pkg/streaming/util/message/message_impl.go index fea1862e98..c6243ecc36 100644 --- a/pkg/streaming/util/message/message_impl.go +++ b/pkg/streaming/util/message/message_impl.go @@ -3,7 +3,7 @@ package message import ( "fmt" - "github.com/milvus-io/milvus/pkg/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" ) type messageImpl struct { diff --git a/pkg/streaming/util/message/message_type.go b/pkg/streaming/util/message/message_type.go index ca3f21bb1e..2e2c09997d 100644 --- a/pkg/streaming/util/message/message_type.go +++ b/pkg/streaming/util/message/message_type.go @@ -3,7 +3,7 @@ package message import ( "strconv" - "github.com/milvus-io/milvus/pkg/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" ) type MessageType messagespb.MessageType diff --git a/pkg/streaming/util/message/specialized_message.go b/pkg/streaming/util/message/specialized_message.go index 102edd1569..4b3d44e5f7 100644 --- a/pkg/streaming/util/message/specialized_message.go +++ b/pkg/streaming/util/message/specialized_message.go @@ -8,7 +8,7 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" ) type ( diff --git a/pkg/streaming/util/message/specialized_message_test.go b/pkg/streaming/util/message/specialized_message_test.go index 733e35bdf7..25a30c7499 100644 --- a/pkg/streaming/util/message/specialized_message_test.go +++ b/pkg/streaming/util/message/specialized_message_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) func TestAsSpecializedMessage(t *testing.T) { diff --git a/pkg/streaming/util/message/test_case.go b/pkg/streaming/util/message/test_case.go index 84999463c6..ec15bc874d 100644 --- a/pkg/streaming/util/message/test_case.go +++ b/pkg/streaming/util/message/test_case.go @@ -12,7 +12,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" ) func CreateTestInsertMessage(t *testing.T, segmentID int64, totalRows int, timetick uint64, messageID MessageID) MutableMessage { diff --git a/pkg/streaming/util/message/txn.go b/pkg/streaming/util/message/txn.go index fe1615adcb..65322c1836 100644 --- a/pkg/streaming/util/message/txn.go +++ b/pkg/streaming/util/message/txn.go @@ -3,7 +3,7 @@ package message import ( "time" - "github.com/milvus-io/milvus/pkg/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" ) type ( diff --git a/pkg/streaming/util/message/txn_test.go b/pkg/streaming/util/message/txn_test.go index cc6f4dc844..a28a4eaec9 100644 --- a/pkg/streaming/util/message/txn_test.go +++ b/pkg/streaming/util/message/txn_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/impls/walimplstest" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/impls/walimplstest" ) func TestTxn(t *testing.T) { diff --git a/pkg/streaming/util/options/deliver.go b/pkg/streaming/util/options/deliver.go index dfb61d61cc..d5f1aea092 100644 --- a/pkg/streaming/util/options/deliver.go +++ b/pkg/streaming/util/options/deliver.go @@ -3,9 +3,9 @@ package options import ( "fmt" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) const ( diff --git a/pkg/streaming/util/options/deliver_test.go b/pkg/streaming/util/options/deliver_test.go index 1ac3b43b98..11ab627210 100644 --- a/pkg/streaming/util/options/deliver_test.go +++ b/pkg/streaming/util/options/deliver_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mocks/streaming/util/mock_message" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/util/mock_message" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) func TestDeliverPolicy(t *testing.T) { diff --git a/pkg/streaming/util/types/pchannel_info.go b/pkg/streaming/util/types/pchannel_info.go index 7db3860cdd..67257af882 100644 --- a/pkg/streaming/util/types/pchannel_info.go +++ b/pkg/streaming/util/types/pchannel_info.go @@ -3,7 +3,7 @@ package types import ( "fmt" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) const ( diff --git a/pkg/streaming/util/types/pchannel_info_test.go b/pkg/streaming/util/types/pchannel_info_test.go index 4afcdd9e9d..37b7e837de 100644 --- a/pkg/streaming/util/types/pchannel_info_test.go +++ b/pkg/streaming/util/types/pchannel_info_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" ) func TestPChannelInfo(t *testing.T) { diff --git a/pkg/streaming/util/types/responses.go b/pkg/streaming/util/types/responses.go index 9ee07f90a4..f716625d98 100644 --- a/pkg/streaming/util/types/responses.go +++ b/pkg/streaming/util/types/responses.go @@ -4,9 +4,9 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" - "github.com/milvus-io/milvus/pkg/proto/messagespb" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/proto/messagespb" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) type BroadcastAckRequest struct { diff --git a/pkg/streaming/util/types/streaming_node.go b/pkg/streaming/util/types/streaming_node.go index f2a68b99e2..3e09af53d6 100644 --- a/pkg/streaming/util/types/streaming_node.go +++ b/pkg/streaming/util/types/streaming_node.go @@ -5,8 +5,8 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/pkg/streaming/walimpls/helper/scanner_helper.go b/pkg/streaming/walimpls/helper/scanner_helper.go index 082d28cc84..5b55f869a0 100644 --- a/pkg/streaming/walimpls/helper/scanner_helper.go +++ b/pkg/streaming/walimpls/helper/scanner_helper.go @@ -3,7 +3,7 @@ package helper import ( "context" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) // NewScannerHelper creates a new ScannerHelper. diff --git a/pkg/streaming/walimpls/helper/wal_helper.go b/pkg/streaming/walimpls/helper/wal_helper.go index f590ba3f61..3733b7d2d5 100644 --- a/pkg/streaming/walimpls/helper/wal_helper.go +++ b/pkg/streaming/walimpls/helper/wal_helper.go @@ -3,9 +3,9 @@ package helper import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" ) // NewWALHelper creates a new WALHelper. diff --git a/pkg/streaming/walimpls/helper/wal_helper_test.go b/pkg/streaming/walimpls/helper/wal_helper_test.go index e3b9c1b79b..8ab09e2697 100644 --- a/pkg/streaming/walimpls/helper/wal_helper_test.go +++ b/pkg/streaming/walimpls/helper/wal_helper_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/streaming/util/types" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" ) func TestWALHelper(t *testing.T) { diff --git a/pkg/streaming/walimpls/impls/kafka/builder.go b/pkg/streaming/walimpls/impls/kafka/builder.go index 5c2cba15cd..81119fa4fe 100644 --- a/pkg/streaming/walimpls/impls/kafka/builder.go +++ b/pkg/streaming/walimpls/impls/kafka/builder.go @@ -3,10 +3,10 @@ package kafka import ( "github.com/confluentinc/confluent-kafka-go/kafka" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/registry" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/registry" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) const ( diff --git a/pkg/streaming/walimpls/impls/kafka/kafka_test.go b/pkg/streaming/walimpls/impls/kafka/kafka_test.go index fd8434d7ef..2c771fd1e0 100644 --- a/pkg/streaming/walimpls/impls/kafka/kafka_test.go +++ b/pkg/streaming/walimpls/impls/kafka/kafka_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/registry" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/registry" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMain(m *testing.M) { diff --git a/pkg/streaming/walimpls/impls/kafka/message_id.go b/pkg/streaming/walimpls/impls/kafka/message_id.go index f99ea4ba13..c565377d10 100644 --- a/pkg/streaming/walimpls/impls/kafka/message_id.go +++ b/pkg/streaming/walimpls/impls/kafka/message_id.go @@ -6,7 +6,7 @@ import ( "github.com/cockroachdb/errors" "github.com/confluentinc/confluent-kafka-go/kafka" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) func UnmarshalMessageID(data string) (message.MessageID, error) { diff --git a/pkg/streaming/walimpls/impls/kafka/message_id_test.go b/pkg/streaming/walimpls/impls/kafka/message_id_test.go index 507a05e1b7..803bd5695f 100644 --- a/pkg/streaming/walimpls/impls/kafka/message_id_test.go +++ b/pkg/streaming/walimpls/impls/kafka/message_id_test.go @@ -6,7 +6,7 @@ import ( "github.com/confluentinc/confluent-kafka-go/kafka" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) func TestMessageID(t *testing.T) { diff --git a/pkg/streaming/walimpls/impls/kafka/opener.go b/pkg/streaming/walimpls/impls/kafka/opener.go index 4f2464c370..4791867d01 100644 --- a/pkg/streaming/walimpls/impls/kafka/opener.go +++ b/pkg/streaming/walimpls/impls/kafka/opener.go @@ -7,10 +7,10 @@ import ( "github.com/confluentinc/confluent-kafka-go/kafka" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/helper" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/helper" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) var _ walimpls.OpenerImpls = (*openerImpl)(nil) diff --git a/pkg/streaming/walimpls/impls/kafka/scanner.go b/pkg/streaming/walimpls/impls/kafka/scanner.go index 934b00da84..94aed69d66 100644 --- a/pkg/streaming/walimpls/impls/kafka/scanner.go +++ b/pkg/streaming/walimpls/impls/kafka/scanner.go @@ -5,9 +5,9 @@ import ( "github.com/confluentinc/confluent-kafka-go/kafka" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/helper" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/helper" ) var _ walimpls.ScannerImpls = (*scannerImpl)(nil) diff --git a/pkg/streaming/walimpls/impls/kafka/wal.go b/pkg/streaming/walimpls/impls/kafka/wal.go index 3540beba21..8a01291590 100644 --- a/pkg/streaming/walimpls/impls/kafka/wal.go +++ b/pkg/streaming/walimpls/impls/kafka/wal.go @@ -6,10 +6,10 @@ import ( "github.com/cockroachdb/errors" "github.com/confluentinc/confluent-kafka-go/kafka" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/helper" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/helper" ) var _ walimpls.WALImpls = (*walImpl)(nil) diff --git a/pkg/streaming/walimpls/impls/pulsar/builder.go b/pkg/streaming/walimpls/impls/pulsar/builder.go index 0a0be9074d..9176a85018 100644 --- a/pkg/streaming/walimpls/impls/pulsar/builder.go +++ b/pkg/streaming/walimpls/impls/pulsar/builder.go @@ -6,11 +6,11 @@ import ( "github.com/apache/pulsar-client-go/pulsar" "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/registry" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/registry" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) const ( diff --git a/pkg/streaming/walimpls/impls/pulsar/message_id.go b/pkg/streaming/walimpls/impls/pulsar/message_id.go index a6e6313359..34cb985297 100644 --- a/pkg/streaming/walimpls/impls/pulsar/message_id.go +++ b/pkg/streaming/walimpls/impls/pulsar/message_id.go @@ -7,7 +7,7 @@ import ( "github.com/apache/pulsar-client-go/pulsar" "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) var _ message.MessageID = pulsarID{} diff --git a/pkg/streaming/walimpls/impls/pulsar/message_id_test.go b/pkg/streaming/walimpls/impls/pulsar/message_id_test.go index e6d31f7716..32f60af8d0 100644 --- a/pkg/streaming/walimpls/impls/pulsar/message_id_test.go +++ b/pkg/streaming/walimpls/impls/pulsar/message_id_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/protobuf/proto" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) func TestMessageID(t *testing.T) { diff --git a/pkg/streaming/walimpls/impls/pulsar/opener.go b/pkg/streaming/walimpls/impls/pulsar/opener.go index 5025cf7f37..7f4ec85ee0 100644 --- a/pkg/streaming/walimpls/impls/pulsar/opener.go +++ b/pkg/streaming/walimpls/impls/pulsar/opener.go @@ -5,8 +5,8 @@ import ( "github.com/apache/pulsar-client-go/pulsar" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/helper" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/helper" ) var _ walimpls.OpenerImpls = (*openerImpl)(nil) diff --git a/pkg/streaming/walimpls/impls/pulsar/pulsar_test.go b/pkg/streaming/walimpls/impls/pulsar/pulsar_test.go index 7f9b812de5..e565d7341c 100644 --- a/pkg/streaming/walimpls/impls/pulsar/pulsar_test.go +++ b/pkg/streaming/walimpls/impls/pulsar/pulsar_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/registry" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/registry" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMain(m *testing.M) { diff --git a/pkg/streaming/walimpls/impls/pulsar/scanner.go b/pkg/streaming/walimpls/impls/pulsar/scanner.go index 1a5cb215b5..d28a2d9dd5 100644 --- a/pkg/streaming/walimpls/impls/pulsar/scanner.go +++ b/pkg/streaming/walimpls/impls/pulsar/scanner.go @@ -6,9 +6,9 @@ import ( "github.com/apache/pulsar-client-go/pulsar" "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/helper" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/helper" ) var _ walimpls.ScannerImpls = (*scannerImpl)(nil) diff --git a/pkg/streaming/walimpls/impls/pulsar/wal.go b/pkg/streaming/walimpls/impls/pulsar/wal.go index 6b2d14e90f..29d96aaa0e 100644 --- a/pkg/streaming/walimpls/impls/pulsar/wal.go +++ b/pkg/streaming/walimpls/impls/pulsar/wal.go @@ -6,10 +6,10 @@ import ( "github.com/apache/pulsar-client-go/pulsar" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/helper" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/helper" ) var _ walimpls.WALImpls = (*walImpl)(nil) diff --git a/pkg/streaming/walimpls/impls/rmq/builder.go b/pkg/streaming/walimpls/impls/rmq/builder.go index 33d1bbe224..073d5f7817 100644 --- a/pkg/streaming/walimpls/impls/rmq/builder.go +++ b/pkg/streaming/walimpls/impls/rmq/builder.go @@ -1,11 +1,11 @@ package rmq import ( - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/client" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/registry" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/client" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/registry" ) const ( diff --git a/pkg/streaming/walimpls/impls/rmq/message_id.go b/pkg/streaming/walimpls/impls/rmq/message_id.go index af548ad07d..bf5c67562f 100644 --- a/pkg/streaming/walimpls/impls/rmq/message_id.go +++ b/pkg/streaming/walimpls/impls/rmq/message_id.go @@ -5,7 +5,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) var _ message.MessageID = rmqID(0) diff --git a/pkg/streaming/walimpls/impls/rmq/message_id_test.go b/pkg/streaming/walimpls/impls/rmq/message_id_test.go index e37bfdf056..ccf64ebca7 100644 --- a/pkg/streaming/walimpls/impls/rmq/message_id_test.go +++ b/pkg/streaming/walimpls/impls/rmq/message_id_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) func TestMessageID(t *testing.T) { diff --git a/pkg/streaming/walimpls/impls/rmq/opener.go b/pkg/streaming/walimpls/impls/rmq/opener.go index a1fa63777a..40b22e63c8 100644 --- a/pkg/streaming/walimpls/impls/rmq/opener.go +++ b/pkg/streaming/walimpls/impls/rmq/opener.go @@ -3,9 +3,9 @@ package rmq import ( "context" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/client" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/helper" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/client" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/helper" ) var _ walimpls.OpenerImpls = (*openerImpl)(nil) diff --git a/pkg/streaming/walimpls/impls/rmq/rmq_test.go b/pkg/streaming/walimpls/impls/rmq/rmq_test.go index 47e9f57043..9c2bf61862 100644 --- a/pkg/streaming/walimpls/impls/rmq/rmq_test.go +++ b/pkg/streaming/walimpls/impls/rmq/rmq_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/registry" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/registry" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMain(m *testing.M) { diff --git a/pkg/streaming/walimpls/impls/rmq/scanner.go b/pkg/streaming/walimpls/impls/rmq/scanner.go index f1288f3e14..f930555718 100644 --- a/pkg/streaming/walimpls/impls/rmq/scanner.go +++ b/pkg/streaming/walimpls/impls/rmq/scanner.go @@ -3,11 +3,11 @@ package rmq import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/client" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/helper" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/client" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/helper" ) var _ walimpls.ScannerImpls = (*scannerImpl)(nil) diff --git a/pkg/streaming/walimpls/impls/rmq/wal.go b/pkg/streaming/walimpls/impls/rmq/wal.go index d2f157fd36..4462923cce 100644 --- a/pkg/streaming/walimpls/impls/rmq/wal.go +++ b/pkg/streaming/walimpls/impls/rmq/wal.go @@ -5,12 +5,12 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/mq/common" - "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/client" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/helper" + "github.com/milvus-io/milvus/pkg/v2/mq/common" + "github.com/milvus-io/milvus/pkg/v2/mq/mqimpl/rocksmq/client" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/helper" ) const defaultReadAheadBufferSize = 1024 diff --git a/pkg/streaming/walimpls/impls/walimplstest/builder.go b/pkg/streaming/walimpls/impls/walimplstest/builder.go index e00ac91354..a7191ebfa4 100644 --- a/pkg/streaming/walimpls/impls/walimplstest/builder.go +++ b/pkg/streaming/walimpls/impls/walimplstest/builder.go @@ -4,9 +4,9 @@ package walimplstest import ( - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/registry" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/registry" ) const ( diff --git a/pkg/streaming/walimpls/impls/walimplstest/message_id.go b/pkg/streaming/walimpls/impls/walimplstest/message_id.go index 16fd80768a..8d8a58b8f4 100644 --- a/pkg/streaming/walimpls/impls/walimplstest/message_id.go +++ b/pkg/streaming/walimpls/impls/walimplstest/message_id.go @@ -6,7 +6,7 @@ package walimplstest import ( "strconv" - "github.com/milvus-io/milvus/pkg/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" ) var _ message.MessageID = testMessageID(0) diff --git a/pkg/streaming/walimpls/impls/walimplstest/message_log.go b/pkg/streaming/walimpls/impls/walimplstest/message_log.go index 818c35c535..ac7c25ba37 100644 --- a/pkg/streaming/walimpls/impls/walimplstest/message_log.go +++ b/pkg/streaming/walimpls/impls/walimplstest/message_log.go @@ -8,9 +8,9 @@ import ( "encoding/json" "sync" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/util/syncutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var logs = typeutil.NewConcurrentMap[string, *messageLog]() diff --git a/pkg/streaming/walimpls/impls/walimplstest/opener.go b/pkg/streaming/walimpls/impls/walimplstest/opener.go index 78a9be1ab3..02fa766024 100644 --- a/pkg/streaming/walimpls/impls/walimplstest/opener.go +++ b/pkg/streaming/walimpls/impls/walimplstest/opener.go @@ -6,8 +6,8 @@ package walimplstest import ( "context" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/helper" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/helper" ) var _ walimpls.OpenerImpls = &opener{} diff --git a/pkg/streaming/walimpls/impls/walimplstest/scanner.go b/pkg/streaming/walimpls/impls/walimplstest/scanner.go index 87249bb4ab..6181bb35b5 100644 --- a/pkg/streaming/walimpls/impls/walimplstest/scanner.go +++ b/pkg/streaming/walimpls/impls/walimplstest/scanner.go @@ -4,9 +4,9 @@ package walimplstest import ( - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/helper" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/helper" ) var _ walimpls.ScannerImpls = &scannerImpls{} diff --git a/pkg/streaming/walimpls/impls/walimplstest/wal.go b/pkg/streaming/walimpls/impls/walimplstest/wal.go index 68d18ab081..710c218161 100644 --- a/pkg/streaming/walimpls/impls/walimplstest/wal.go +++ b/pkg/streaming/walimpls/impls/walimplstest/wal.go @@ -6,10 +6,10 @@ package walimplstest import ( "context" - "github.com/milvus-io/milvus/pkg/proto/streamingpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/streaming/walimpls/helper" + "github.com/milvus-io/milvus/pkg/v2/proto/streamingpb" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls/helper" ) var _ walimpls.WALImpls = &walImpls{} diff --git a/pkg/streaming/walimpls/impls/walimplstest/wal_test.go b/pkg/streaming/walimpls/impls/walimplstest/wal_test.go index 88d2841562..a24c69ffe4 100644 --- a/pkg/streaming/walimpls/impls/walimplstest/wal_test.go +++ b/pkg/streaming/walimpls/impls/walimplstest/wal_test.go @@ -3,7 +3,7 @@ package walimplstest import ( "testing" - "github.com/milvus-io/milvus/pkg/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" ) func TestWALImplsTest(t *testing.T) { diff --git a/pkg/streaming/walimpls/opener.go b/pkg/streaming/walimpls/opener.go index 0684ecf660..3cfd54d06a 100644 --- a/pkg/streaming/walimpls/opener.go +++ b/pkg/streaming/walimpls/opener.go @@ -3,7 +3,7 @@ package walimpls import ( "context" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) // OpenOption is the option for allocating wal impls instance. diff --git a/pkg/streaming/walimpls/registry/registry.go b/pkg/streaming/walimpls/registry/registry.go index af5166b431..4f20563aa5 100644 --- a/pkg/streaming/walimpls/registry/registry.go +++ b/pkg/streaming/walimpls/registry/registry.go @@ -1,8 +1,8 @@ package registry import ( - "github.com/milvus-io/milvus/pkg/streaming/walimpls" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/streaming/walimpls" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // builders is a map of registered wal builders. diff --git a/pkg/streaming/walimpls/registry/wal_test.go b/pkg/streaming/walimpls/registry/wal_test.go index 778a92455d..6c330d483d 100644 --- a/pkg/streaming/walimpls/registry/wal_test.go +++ b/pkg/streaming/walimpls/registry/wal_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/mocks/streaming/mock_walimpls" + "github.com/milvus-io/milvus/pkg/v2/mocks/streaming/mock_walimpls" ) func TestRegister(t *testing.T) { diff --git a/pkg/streaming/walimpls/scanner.go b/pkg/streaming/walimpls/scanner.go index 8bcad0f4d7..a605a8d05e 100644 --- a/pkg/streaming/walimpls/scanner.go +++ b/pkg/streaming/walimpls/scanner.go @@ -1,8 +1,8 @@ package walimpls import ( - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" ) type ReadOption struct { diff --git a/pkg/streaming/walimpls/test_framework.go b/pkg/streaming/walimpls/test_framework.go index 7fac0b3ba2..d014bc64f2 100644 --- a/pkg/streaming/walimpls/test_framework.go +++ b/pkg/streaming/walimpls/test_framework.go @@ -19,9 +19,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/msgpb" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/options" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/options" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") diff --git a/pkg/streaming/walimpls/wal.go b/pkg/streaming/walimpls/wal.go index 64c87f7d2c..aa62199490 100644 --- a/pkg/streaming/walimpls/wal.go +++ b/pkg/streaming/walimpls/wal.go @@ -3,8 +3,8 @@ package walimpls import ( "context" - "github.com/milvus-io/milvus/pkg/streaming/util/message" - "github.com/milvus-io/milvus/pkg/streaming/util/types" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/streaming/util/types" ) type WALImpls interface { diff --git a/pkg/tracer/tracer.go b/pkg/tracer/tracer.go index 8314536e8a..53d89337b5 100644 --- a/pkg/tracer/tracer.go +++ b/pkg/tracer/tracer.go @@ -32,8 +32,8 @@ import ( semconv "go.opentelemetry.io/otel/semconv/v1.4.0" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func Init() error { diff --git a/pkg/tracer/tracer_test.go b/pkg/tracer/tracer_test.go index c3ce066906..c741ecd495 100644 --- a/pkg/tracer/tracer_test.go +++ b/pkg/tracer/tracer_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestTracer_Init(t *testing.T) { diff --git a/pkg/tracer/util.go b/pkg/tracer/util.go index 54427d94bb..884f5e4a17 100644 --- a/pkg/tracer/util.go +++ b/pkg/tracer/util.go @@ -6,7 +6,7 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) // SetupSpan add span into ctx values. diff --git a/pkg/util/cache/cache.go b/pkg/util/cache/cache.go index a3309d3c22..b49f903149 100644 --- a/pkg/util/cache/cache.go +++ b/pkg/util/cache/cache.go @@ -25,11 +25,11 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/lock" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/syncutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/lock" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/syncutil" ) var ( diff --git a/pkg/util/cache/cache_test.go b/pkg/util/cache/cache_test.go index 6ad21fb033..6e7b7db693 100644 --- a/pkg/util/cache/cache_test.go +++ b/pkg/util/cache/cache_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/atomic" - "github.com/milvus-io/milvus/pkg/util/contextutil" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/contextutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) var errTimeout = errors.New("timeout") diff --git a/pkg/util/compressor/compressor_test.go b/pkg/util/compressor/compressor_test.go index bc5cf53f18..ffa2cc89b0 100644 --- a/pkg/util/compressor/compressor_test.go +++ b/pkg/util/compressor/compressor_test.go @@ -11,7 +11,7 @@ import ( "github.com/klauspost/compress/zstd" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" ) func TestZstdCompress(t *testing.T) { diff --git a/pkg/util/conc/options.go b/pkg/util/conc/options.go index 281ab675b3..6f985afc19 100644 --- a/pkg/util/conc/options.go +++ b/pkg/util/conc/options.go @@ -22,7 +22,7 @@ import ( "github.com/panjf2000/ants/v2" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) type poolOption struct { diff --git a/pkg/util/conc/pool.go b/pkg/util/conc/pool.go index 9376c9113c..2b19e5fb68 100644 --- a/pkg/util/conc/pool.go +++ b/pkg/util/conc/pool.go @@ -24,9 +24,9 @@ import ( "github.com/panjf2000/ants/v2" - "github.com/milvus-io/milvus/pkg/util/generic" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/generic" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // A goroutine pool diff --git a/pkg/util/conc/pool_test.go b/pkg/util/conc/pool_test.go index 3c09fc6b8a..926343a354 100644 --- a/pkg/util/conc/pool_test.go +++ b/pkg/util/conc/pool_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" ) func TestPool(t *testing.T) { diff --git a/pkg/util/constant.go b/pkg/util/constant.go index d930cc5c75..5dcb9d0660 100644 --- a/pkg/util/constant.go +++ b/pkg/util/constant.go @@ -23,8 +23,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // Meta Prefix consts diff --git a/pkg/util/contextutil/context_util.go b/pkg/util/contextutil/context_util.go index 2bded437d1..210ac87cec 100644 --- a/pkg/util/contextutil/context_util.go +++ b/pkg/util/contextutil/context_util.go @@ -24,8 +24,8 @@ import ( "google.golang.org/grpc/metadata" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" ) type ctxTenantKey struct{} diff --git a/pkg/util/contextutil/context_util_test.go b/pkg/util/contextutil/context_util_test.go index 38442e6e39..ea4eb8cc47 100644 --- a/pkg/util/contextutil/context_util_test.go +++ b/pkg/util/contextutil/context_util_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/grpc/metadata" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" ) func TestAppendToIncomingContext(t *testing.T) { diff --git a/pkg/util/distance/calc_distance_amd64.go b/pkg/util/distance/calc_distance_amd64.go index 13d227257c..6cc25991bf 100644 --- a/pkg/util/distance/calc_distance_amd64.go +++ b/pkg/util/distance/calc_distance_amd64.go @@ -5,8 +5,8 @@ import ( "golang.org/x/sys/cpu" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/distance/asm" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/distance/asm" ) func init() { diff --git a/pkg/util/etcd/etcd_server.go b/pkg/util/etcd/etcd_server.go index 7130d10f34..2dae2cf758 100644 --- a/pkg/util/etcd/etcd_server.go +++ b/pkg/util/etcd/etcd_server.go @@ -8,7 +8,7 @@ import ( "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) // EtcdServer is the singleton of embedded etcd server diff --git a/pkg/util/etcd/etcd_util.go b/pkg/util/etcd/etcd_util.go index 6873b890c9..dac7695ca7 100644 --- a/pkg/util/etcd/etcd_util.go +++ b/pkg/util/etcd/etcd_util.go @@ -33,9 +33,9 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util" ) // GetEtcdClient returns etcd client diff --git a/pkg/util/expr/expr.go b/pkg/util/expr/expr.go index 611a762dab..ff7231427c 100644 --- a/pkg/util/expr/expr.go +++ b/pkg/util/expr/expr.go @@ -28,8 +28,8 @@ import ( "go.uber.org/zap" "google.golang.org/protobuf/proto" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) var ( diff --git a/pkg/util/expr/expr_test.go b/pkg/util/expr/expr_test.go index dd449b7990..c72de319b5 100644 --- a/pkg/util/expr/expr_test.go +++ b/pkg/util/expr/expr_test.go @@ -28,7 +28,7 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type FooID = int64 diff --git a/pkg/util/funcutil/func.go b/pkg/util/funcutil/func.go index c2ff5d1b78..e524880345 100644 --- a/pkg/util/funcutil/func.go +++ b/pkg/util/funcutil/func.go @@ -37,9 +37,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // CheckGrpcReady wait for context timeout, or wait 100ms then send nil to targetCh diff --git a/pkg/util/funcutil/func_test.go b/pkg/util/funcutil/func_test.go index c3ff4cb4a7..8b4545315c 100644 --- a/pkg/util/funcutil/func_test.go +++ b/pkg/util/funcutil/func_test.go @@ -36,8 +36,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func Test_CheckGrpcReady(t *testing.T) { diff --git a/pkg/util/funcutil/parallel.go b/pkg/util/funcutil/parallel.go index d8214ddcf9..e86e8c3519 100644 --- a/pkg/util/funcutil/parallel.go +++ b/pkg/util/funcutil/parallel.go @@ -25,7 +25,7 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) // GetFunctionName returns the name of input diff --git a/pkg/util/funcutil/parallel_test.go b/pkg/util/funcutil/parallel_test.go index 2e6d52d043..6947fe42f0 100644 --- a/pkg/util/funcutil/parallel_test.go +++ b/pkg/util/funcutil/parallel_test.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" ) func dummyFunc() { diff --git a/pkg/util/funcutil/policy.go b/pkg/util/funcutil/policy.go index 25d5174c2e..413c0a9247 100644 --- a/pkg/util/funcutil/policy.go +++ b/pkg/util/funcutil/policy.go @@ -13,8 +13,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util" ) func GetVersion(m interface{}) (string, error) { diff --git a/pkg/util/funcutil/slice.go b/pkg/util/funcutil/slice.go index 8699b65fe6..a44b553830 100644 --- a/pkg/util/funcutil/slice.go +++ b/pkg/util/funcutil/slice.go @@ -19,7 +19,7 @@ package funcutil import ( "reflect" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // SliceContain returns true if slice s contains item. diff --git a/pkg/util/gc/gc_tuner.go b/pkg/util/gc/gc_tuner.go index ff50aeab31..dafd9a81af 100644 --- a/pkg/util/gc/gc_tuner.go +++ b/pkg/util/gc/gc_tuner.go @@ -27,8 +27,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" ) var ( diff --git a/pkg/util/hardware/hardware_info.go b/pkg/util/hardware/hardware_info.go index 877edd505c..8bc26698b4 100644 --- a/pkg/util/hardware/hardware_info.go +++ b/pkg/util/hardware/hardware_info.go @@ -25,8 +25,8 @@ import ( "go.uber.org/automaxprocs/maxprocs" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/pkg/util/hardware/hardware_info_test.go b/pkg/util/hardware/hardware_info_test.go index 7bb79de04d..90173e053e 100644 --- a/pkg/util/hardware/hardware_info_test.go +++ b/pkg/util/hardware/hardware_info_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) func Test_GetCPUCoreCount(t *testing.T) { diff --git a/pkg/util/hardware/mem_info.go b/pkg/util/hardware/mem_info.go index 52658efebd..5548574222 100644 --- a/pkg/util/hardware/mem_info.go +++ b/pkg/util/hardware/mem_info.go @@ -24,7 +24,7 @@ import ( "github.com/sirupsen/logrus" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) var proc *process.Process diff --git a/pkg/util/hardware/mem_info_darwin.go b/pkg/util/hardware/mem_info_darwin.go index ae3af73fff..c7f4c695a8 100644 --- a/pkg/util/hardware/mem_info_darwin.go +++ b/pkg/util/hardware/mem_info_darwin.go @@ -21,7 +21,7 @@ import ( "github.com/shirou/gopsutil/v3/mem" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) // GetUsedMemoryCount returns the memory usage in bytes. diff --git a/pkg/util/indexparams/index_params.go b/pkg/util/indexparams/index_params.go index 62a87984bc..42dba38137 100644 --- a/pkg/util/indexparams/index_params.go +++ b/pkg/util/indexparams/index_params.go @@ -23,11 +23,11 @@ import ( "unsafe" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/pkg/util/indexparams/index_params_test.go b/pkg/util/indexparams/index_params_test.go index 2051833b30..f71c5d0bd7 100644 --- a/pkg/util/indexparams/index_params_test.go +++ b/pkg/util/indexparams/index_params_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestDiskIndexParams(t *testing.T) { diff --git a/pkg/util/interceptor/cluster_interceptor.go b/pkg/util/interceptor/cluster_interceptor.go index 9ce21f1b5c..76edaeb26b 100644 --- a/pkg/util/interceptor/cluster_interceptor.go +++ b/pkg/util/interceptor/cluster_interceptor.go @@ -22,8 +22,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/metadata" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) const ClusterKey = "Cluster" diff --git a/pkg/util/interceptor/cluster_interceptor_test.go b/pkg/util/interceptor/cluster_interceptor_test.go index a5bd041f50..2bf60b2d65 100644 --- a/pkg/util/interceptor/cluster_interceptor_test.go +++ b/pkg/util/interceptor/cluster_interceptor_test.go @@ -25,8 +25,8 @@ import ( "google.golang.org/grpc/metadata" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestClusterInterceptor(t *testing.T) { diff --git a/pkg/util/interceptor/interceptor_test.go b/pkg/util/interceptor/interceptor_test.go index f9d5d3c87c..766cdafdd2 100644 --- a/pkg/util/interceptor/interceptor_test.go +++ b/pkg/util/interceptor/interceptor_test.go @@ -21,7 +21,7 @@ import ( "google.golang.org/grpc" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type mockSS struct { diff --git a/pkg/util/interceptor/server_id_interceptor.go b/pkg/util/interceptor/server_id_interceptor.go index 5e01225788..bbeced7d3a 100644 --- a/pkg/util/interceptor/server_id_interceptor.go +++ b/pkg/util/interceptor/server_id_interceptor.go @@ -24,7 +24,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/metadata" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) const ServerIDKey = "ServerID" diff --git a/pkg/util/interceptor/server_id_interceptor_test.go b/pkg/util/interceptor/server_id_interceptor_test.go index 8e813b54c3..c7667c5799 100644 --- a/pkg/util/interceptor/server_id_interceptor_test.go +++ b/pkg/util/interceptor/server_id_interceptor_test.go @@ -26,8 +26,8 @@ import ( "google.golang.org/grpc/metadata" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestServerIDInterceptor(t *testing.T) { diff --git a/pkg/util/lifetime/lifetime_test.go b/pkg/util/lifetime/lifetime_test.go index 20b348e1de..6a97dbfd86 100644 --- a/pkg/util/lifetime/lifetime_test.go +++ b/pkg/util/lifetime/lifetime_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) type LifetimeSuite struct { diff --git a/pkg/util/lifetime/safe_chan.go b/pkg/util/lifetime/safe_chan.go index ac877c215f..893a8506f0 100644 --- a/pkg/util/lifetime/safe_chan.go +++ b/pkg/util/lifetime/safe_chan.go @@ -3,7 +3,7 @@ package lifetime import ( "sync" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // SafeChan is the utility type combining chan struct{} & sync.Once. diff --git a/pkg/util/lifetime/safe_chan_test.go b/pkg/util/lifetime/safe_chan_test.go index 05dd445134..7535c34eab 100644 --- a/pkg/util/lifetime/safe_chan_test.go +++ b/pkg/util/lifetime/safe_chan_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) type SafeChanSuite struct { diff --git a/pkg/util/lifetime/state.go b/pkg/util/lifetime/state.go index c94be9e944..1eff199988 100644 --- a/pkg/util/lifetime/state.go +++ b/pkg/util/lifetime/state.go @@ -17,8 +17,8 @@ package lifetime import ( - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) // Singal alias for chan struct{}. diff --git a/pkg/util/lock/key_lock.go b/pkg/util/lock/key_lock.go index a85ee02424..699c327730 100644 --- a/pkg/util/lock/key_lock.go +++ b/pkg/util/lock/key_lock.go @@ -23,7 +23,7 @@ import ( pool "github.com/jolestar/go-commons-pool/v2" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) var ( diff --git a/pkg/util/lock/metric_mutex.go b/pkg/util/lock/metric_mutex.go index 4c8d4fb8ef..b87324a441 100644 --- a/pkg/util/lock/metric_mutex.go +++ b/pkg/util/lock/metric_mutex.go @@ -7,9 +7,9 @@ import ( "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type MetricsLockManager struct { diff --git a/pkg/util/lock/metrics_mutex_test.go b/pkg/util/lock/metrics_mutex_test.go index 293f109b8c..1e8f3dce07 100644 --- a/pkg/util/lock/metrics_mutex_test.go +++ b/pkg/util/lock/metrics_mutex_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func TestMetricsLockLock(t *testing.T) { diff --git a/pkg/util/logutil/grpc_interceptor.go b/pkg/util/logutil/grpc_interceptor.go index 35a4bbf303..a25e9dd97f 100644 --- a/pkg/util/logutil/grpc_interceptor.go +++ b/pkg/util/logutil/grpc_interceptor.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/metadata" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) const ( diff --git a/pkg/util/logutil/grpc_interceptor_test.go b/pkg/util/logutil/grpc_interceptor_test.go index 32fb4542a3..14a88e3516 100644 --- a/pkg/util/logutil/grpc_interceptor_test.go +++ b/pkg/util/logutil/grpc_interceptor_test.go @@ -8,7 +8,7 @@ import ( "go.uber.org/zap/zapcore" "google.golang.org/grpc/metadata" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) func TestCtxWithLevelAndTrace(t *testing.T) { diff --git a/pkg/util/logutil/logutil.go b/pkg/util/logutil/logutil.go index 306b2e8a8e..50e0d07cf8 100644 --- a/pkg/util/logutil/logutil.go +++ b/pkg/util/logutil/logutil.go @@ -24,7 +24,7 @@ import ( "go.uber.org/zap/zapcore" "google.golang.org/grpc/grpclog" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) const ( diff --git a/pkg/util/logutil/logutil_test.go b/pkg/util/logutil/logutil_test.go index 3506852327..512151c5cb 100644 --- a/pkg/util/logutil/logutil_test.go +++ b/pkg/util/logutil/logutil_test.go @@ -7,7 +7,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) func TestName(t *testing.T) { diff --git a/pkg/util/merr/errors_test.go b/pkg/util/merr/errors_test.go index fea03f7ffc..8eb2fc2174 100644 --- a/pkg/util/merr/errors_test.go +++ b/pkg/util/merr/errors_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) type ErrSuite struct { diff --git a/pkg/util/merr/utils.go b/pkg/util/merr/utils.go index 5c4811672c..a95945b152 100644 --- a/pkg/util/merr/utils.go +++ b/pkg/util/merr/utils.go @@ -26,8 +26,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) const InputErrorFlagKey string = "is_input_error" diff --git a/pkg/util/metautil/binlog.go b/pkg/util/metautil/binlog.go index 2888782948..ab9052e632 100644 --- a/pkg/util/metautil/binlog.go +++ b/pkg/util/metautil/binlog.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const pathSep = "/" diff --git a/pkg/util/metautil/binlog_test.go b/pkg/util/metautil/binlog_test.go index 59d4d2d47a..404677875d 100644 --- a/pkg/util/metautil/binlog_test.go +++ b/pkg/util/metautil/binlog_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestParseInsertLogPath(t *testing.T) { diff --git a/pkg/util/metautil/channel.go b/pkg/util/metautil/channel.go index 361b9ad638..6faf2cab6b 100644 --- a/pkg/util/metautil/channel.go +++ b/pkg/util/metautil/channel.go @@ -22,8 +22,8 @@ import ( "strconv" "sync" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) const ( diff --git a/pkg/util/metautil/segment_index.go b/pkg/util/metautil/segment_index.go index 0410e81e2a..d1a9a83518 100644 --- a/pkg/util/metautil/segment_index.go +++ b/pkg/util/metautil/segment_index.go @@ -3,7 +3,7 @@ package metautil import ( "path" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) func BuildSegmentIndexFilePath(rootPath string, buildID, indexVersion, partID, segID int64, fileKey string) string { diff --git a/pkg/util/metricsinfo/metric_request.go b/pkg/util/metricsinfo/metric_request.go index 98a63fa9c9..d880771f0d 100644 --- a/pkg/util/metricsinfo/metric_request.go +++ b/pkg/util/metricsinfo/metric_request.go @@ -23,9 +23,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" ) const ( diff --git a/pkg/util/metricsinfo/metric_request_test.go b/pkg/util/metricsinfo/metric_request_test.go index 847c677e0c..aff0add7c7 100644 --- a/pkg/util/metricsinfo/metric_request_test.go +++ b/pkg/util/metricsinfo/metric_request_test.go @@ -19,7 +19,7 @@ import ( "github.com/tidwall/gjson" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) func Test_ParseMetricType(t *testing.T) { diff --git a/pkg/util/metricsinfo/metrics_info_test.go b/pkg/util/metricsinfo/metrics_info_test.go index b9b6386fe2..bfdae912ad 100644 --- a/pkg/util/metricsinfo/metrics_info_test.go +++ b/pkg/util/metricsinfo/metrics_info_test.go @@ -18,8 +18,8 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestBaseComponentInfos_Codec(t *testing.T) { diff --git a/pkg/util/metricsinfo/quota_metric.go b/pkg/util/metricsinfo/quota_metric.go index 1c29f6eb36..325c0e1cfb 100644 --- a/pkg/util/metricsinfo/quota_metric.go +++ b/pkg/util/metricsinfo/quota_metric.go @@ -17,7 +17,7 @@ package metricsinfo import ( - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // RateMetricLabel defines the metric label collected from nodes. diff --git a/pkg/util/metricsinfo/topology.go b/pkg/util/metricsinfo/topology.go index 774cfbcb27..2e68328608 100644 --- a/pkg/util/metricsinfo/topology.go +++ b/pkg/util/metricsinfo/topology.go @@ -15,7 +15,7 @@ import ( "encoding/json" "strconv" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // in topology graph, the name of all nodes are consisted of role name and its' id diff --git a/pkg/util/metricsinfo/topology_test.go b/pkg/util/metricsinfo/topology_test.go index 93ab7185dc..fa49672e77 100644 --- a/pkg/util/metricsinfo/topology_test.go +++ b/pkg/util/metricsinfo/topology_test.go @@ -17,8 +17,8 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func Test_ConstructComponentName(t *testing.T) { diff --git a/pkg/util/metricsinfo/utils.go b/pkg/util/metricsinfo/utils.go index 1d11c05c0f..1c56469bff 100644 --- a/pkg/util/metricsinfo/utils.go +++ b/pkg/util/metricsinfo/utils.go @@ -24,9 +24,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // FillDeployMetricsWithEnv fill deploy metrics with env. diff --git a/pkg/util/netutil/listener.go b/pkg/util/netutil/listener.go index 19b19202ef..b00965a59c 100644 --- a/pkg/util/netutil/listener.go +++ b/pkg/util/netutil/listener.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) // NewListener creates a new listener that listens on the specified network and IP address. diff --git a/pkg/util/parameterutil/get_max_len.go b/pkg/util/parameterutil/get_max_len.go index fc1aa6d7a3..253e5d4fca 100644 --- a/pkg/util/parameterutil/get_max_len.go +++ b/pkg/util/parameterutil/get_max_len.go @@ -5,9 +5,9 @@ import ( "strconv" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // GetMaxLength get max length of field. Maybe also helpful outside. diff --git a/pkg/util/parameterutil/get_max_len_test.go b/pkg/util/parameterutil/get_max_len_test.go index cf27715fe0..08afaf5537 100644 --- a/pkg/util/parameterutil/get_max_len_test.go +++ b/pkg/util/parameterutil/get_max_len_test.go @@ -7,7 +7,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) func TestGetMaxLength(t *testing.T) { diff --git a/pkg/util/paramtable/autoindex_param.go b/pkg/util/paramtable/autoindex_param.go index 83c0334d2c..49c5ee7f15 100644 --- a/pkg/util/paramtable/autoindex_param.go +++ b/pkg/util/paramtable/autoindex_param.go @@ -22,10 +22,10 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // ///////////////////////////////////////////////////////////////////////////// diff --git a/pkg/util/paramtable/autoindex_param_test.go b/pkg/util/paramtable/autoindex_param_test.go index c4b2174645..425336b563 100644 --- a/pkg/util/paramtable/autoindex_param_test.go +++ b/pkg/util/paramtable/autoindex_param_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/config" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/config" ) const ( diff --git a/pkg/util/paramtable/base_table.go b/pkg/util/paramtable/base_table.go index 5fe618fd25..3484f2d827 100644 --- a/pkg/util/paramtable/base_table.go +++ b/pkg/util/paramtable/base_table.go @@ -26,10 +26,10 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // UniqueID is type alias of typeutil.UniqueID diff --git a/pkg/util/paramtable/base_table_test.go b/pkg/util/paramtable/base_table_test.go index f1123b655c..7d42e33dc1 100644 --- a/pkg/util/paramtable/base_table_test.go +++ b/pkg/util/paramtable/base_table_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/config" + "github.com/milvus-io/milvus/pkg/v2/config" ) var baseParams = NewBaseTable(SkipRemote(true)) diff --git a/pkg/util/paramtable/component_param.go b/pkg/util/paramtable/component_param.go index 07b22449bd..d866a1dc80 100644 --- a/pkg/util/paramtable/component_param.go +++ b/pkg/util/paramtable/component_param.go @@ -29,11 +29,11 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/hardware" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/pkg/util/paramtable/component_param_test.go b/pkg/util/paramtable/component_param_test.go index 723925cbdc..23723bf0ad 100644 --- a/pkg/util/paramtable/component_param_test.go +++ b/pkg/util/paramtable/component_param_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" ) func shouldPanic(t *testing.T, name string, f func()) { diff --git a/pkg/util/paramtable/grpc_param.go b/pkg/util/paramtable/grpc_param.go index f74e78632b..0f26def585 100644 --- a/pkg/util/paramtable/grpc_param.go +++ b/pkg/util/paramtable/grpc_param.go @@ -26,8 +26,8 @@ import ( "google.golang.org/grpc/backoff" "google.golang.org/grpc/keepalive" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) const ( diff --git a/pkg/util/paramtable/grpc_param_test.go b/pkg/util/paramtable/grpc_param_test.go index 402279c694..4c1238e631 100644 --- a/pkg/util/paramtable/grpc_param_test.go +++ b/pkg/util/paramtable/grpc_param_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestGrpcServerParams(t *testing.T) { diff --git a/pkg/util/paramtable/hook_config.go b/pkg/util/paramtable/hook_config.go index e23b74d73d..bdc4bfc553 100644 --- a/pkg/util/paramtable/hook_config.go +++ b/pkg/util/paramtable/hook_config.go @@ -3,8 +3,8 @@ package paramtable import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/log" ) const hookYamlFile = "hook.yaml" diff --git a/pkg/util/paramtable/knowhere_param.go b/pkg/util/paramtable/knowhere_param.go index 5eb15ce339..e96459f712 100644 --- a/pkg/util/paramtable/knowhere_param.go +++ b/pkg/util/paramtable/knowhere_param.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" ) type knowhereConfig struct { diff --git a/pkg/util/paramtable/param_item.go b/pkg/util/paramtable/param_item.go index 8dff3ef9d9..c98a92b3fd 100644 --- a/pkg/util/paramtable/param_item.go +++ b/pkg/util/paramtable/param_item.go @@ -25,8 +25,8 @@ import ( "github.com/samber/lo" "go.uber.org/atomic" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) type ParamItem struct { diff --git a/pkg/util/paramtable/quota_param.go b/pkg/util/paramtable/quota_param.go index a871b0da81..c2fee18bdf 100644 --- a/pkg/util/paramtable/quota_param.go +++ b/pkg/util/paramtable/quota_param.go @@ -22,7 +22,7 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) const ( diff --git a/pkg/util/paramtable/rbac_param.go b/pkg/util/paramtable/rbac_param.go index 35816a5d8a..8314a1c6bb 100644 --- a/pkg/util/paramtable/rbac_param.go +++ b/pkg/util/paramtable/rbac_param.go @@ -7,7 +7,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/v2/util" ) type rbacConfig struct { diff --git a/pkg/util/paramtable/role_param.go b/pkg/util/paramtable/role_param.go index 925a15de05..e842c81795 100644 --- a/pkg/util/paramtable/role_param.go +++ b/pkg/util/paramtable/role_param.go @@ -17,8 +17,8 @@ package paramtable import ( - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" ) type roleConfig struct { diff --git a/pkg/util/paramtable/role_param_test.go b/pkg/util/paramtable/role_param_test.go index 15f3e99862..64024ee9c1 100644 --- a/pkg/util/paramtable/role_param_test.go +++ b/pkg/util/paramtable/role_param_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/config" + "github.com/milvus-io/milvus/pkg/v2/config" ) func TestRoleConfig_Init(t *testing.T) { diff --git a/pkg/util/paramtable/runtime.go b/pkg/util/paramtable/runtime.go index 63079dfb70..1392517830 100644 --- a/pkg/util/paramtable/runtime.go +++ b/pkg/util/paramtable/runtime.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var ( diff --git a/pkg/util/paramtable/service_param.go b/pkg/util/paramtable/service_param.go index 9a860e6f6a..6de262e33d 100644 --- a/pkg/util/paramtable/service_param.go +++ b/pkg/util/paramtable/service_param.go @@ -26,10 +26,10 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/metrics" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/metrics" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" ) const ( diff --git a/pkg/util/paramtable/service_param_test.go b/pkg/util/paramtable/service_param_test.go index 8cba74b544..a9d6c0b00e 100644 --- a/pkg/util/paramtable/service_param_test.go +++ b/pkg/util/paramtable/service_param_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/config" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/config" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) func TestServiceParam(t *testing.T) { diff --git a/pkg/util/retry/retry.go b/pkg/util/retry/retry.go index a2a722ec13..929d70f385 100644 --- a/pkg/util/retry/retry.go +++ b/pkg/util/retry/retry.go @@ -18,9 +18,9 @@ import ( "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) // Do will run function with retry mechanism. diff --git a/pkg/util/retry/retry_test.go b/pkg/util/retry/retry_test.go index e4c86d0b75..f703d70df8 100644 --- a/pkg/util/retry/retry_test.go +++ b/pkg/util/retry/retry_test.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) func TestDo(t *testing.T) { diff --git a/pkg/util/testutils/embed_etcd.go b/pkg/util/testutils/embed_etcd.go index 42498c062e..e379125878 100644 --- a/pkg/util/testutils/embed_etcd.go +++ b/pkg/util/testutils/embed_etcd.go @@ -21,7 +21,7 @@ import ( "go.etcd.io/etcd/server/v3/embed" - "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" ) type EmbedEtcdUtil struct { diff --git a/pkg/util/testutils/gen_data.go b/pkg/util/testutils/gen_data.go index 294bae38df..cb40ced4b3 100644 --- a/pkg/util/testutils/gen_data.go +++ b/pkg/util/testutils/gen_data.go @@ -29,8 +29,8 @@ import ( "github.com/x448/float16" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const elemCountOfArray = 10 diff --git a/pkg/util/tikv/tikv_util.go b/pkg/util/tikv/tikv_util.go index 53a1303bcf..c339d25845 100644 --- a/pkg/util/tikv/tikv_util.go +++ b/pkg/util/tikv/tikv_util.go @@ -20,7 +20,7 @@ import ( "github.com/tikv/client-go/v2/config" "github.com/tikv/client-go/v2/txnkv" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" ) func GetTiKVClient(cfg *paramtable.TiKVConfig) (*txnkv.Client, error) { diff --git a/pkg/util/timerecord/group_checker.go b/pkg/util/timerecord/group_checker.go index c06dcd5dde..aacfa2a9df 100644 --- a/pkg/util/timerecord/group_checker.go +++ b/pkg/util/timerecord/group_checker.go @@ -21,7 +21,7 @@ import ( "sync/atomic" "time" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) // groups maintains string to GroupChecker diff --git a/pkg/util/timerecord/time_recorder.go b/pkg/util/timerecord/time_recorder.go index 2d8097286e..d60aea942a 100644 --- a/pkg/util/timerecord/time_recorder.go +++ b/pkg/util/timerecord/time_recorder.go @@ -19,7 +19,7 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) // TimeRecorder provides methods to record time duration diff --git a/pkg/util/tsoutil/tso.go b/pkg/util/tsoutil/tso.go index 4e9867f1dd..9785c1f695 100644 --- a/pkg/util/tsoutil/tso.go +++ b/pkg/util/tsoutil/tso.go @@ -19,7 +19,7 @@ package tsoutil import ( "time" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/pkg/util/tsoutil/tso_test.go b/pkg/util/tsoutil/tso_test.go index a4c44a73f6..5e0c1f57ba 100644 --- a/pkg/util/tsoutil/tso_test.go +++ b/pkg/util/tsoutil/tso_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) func TestParseHybridTs(t *testing.T) { diff --git a/pkg/util/typeutil/convension.go b/pkg/util/typeutil/convension.go index c12b1c7ed4..0488090f40 100644 --- a/pkg/util/typeutil/convension.go +++ b/pkg/util/typeutil/convension.go @@ -26,8 +26,8 @@ import ( "go.uber.org/zap" "google.golang.org/protobuf/proto" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" ) // Generic Clone for proto message diff --git a/pkg/util/typeutil/conversion_test.go b/pkg/util/typeutil/conversion_test.go index e4fafe0596..ca47b525cb 100644 --- a/pkg/util/typeutil/conversion_test.go +++ b/pkg/util/typeutil/conversion_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/log" ) func TestConversion(t *testing.T) { diff --git a/pkg/util/typeutil/field_schema.go b/pkg/util/typeutil/field_schema.go index d07bf0696d..f7add8f4ad 100644 --- a/pkg/util/typeutil/field_schema.go +++ b/pkg/util/typeutil/field_schema.go @@ -5,7 +5,7 @@ import ( "strconv" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) type FieldSchemaHelper struct { diff --git a/pkg/util/typeutil/hash.go b/pkg/util/typeutil/hash.go index 6995bf6e6a..464a096e3d 100644 --- a/pkg/util/typeutil/hash.go +++ b/pkg/util/typeutil/hash.go @@ -28,7 +28,7 @@ import ( "github.com/spaolacci/murmur3" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) const substringLengthForCRC = 100 diff --git a/pkg/util/typeutil/kv_pair_helper_test.go b/pkg/util/typeutil/kv_pair_helper_test.go index 576aea68e7..1f820e0312 100644 --- a/pkg/util/typeutil/kv_pair_helper_test.go +++ b/pkg/util/typeutil/kv_pair_helper_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) func TestNewKvPairs(t *testing.T) { diff --git a/pkg/util/typeutil/schema.go b/pkg/util/typeutil/schema.go index 3585035bd4..99bc8e80c8 100644 --- a/pkg/util/typeutil/schema.go +++ b/pkg/util/typeutil/schema.go @@ -33,8 +33,8 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" ) const DynamicFieldMaxLength = 512 diff --git a/pkg/util/typeutil/schema_test.go b/pkg/util/typeutil/schema_test.go index 714ae31ae9..39ea545d7b 100644 --- a/pkg/util/typeutil/schema_test.go +++ b/pkg/util/typeutil/schema_test.go @@ -32,8 +32,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" ) func TestSchema(t *testing.T) { diff --git a/pkg/util/vralloc/alloc.go b/pkg/util/vralloc/alloc.go index ceee169af4..6fd584a24c 100644 --- a/pkg/util/vralloc/alloc.go +++ b/pkg/util/vralloc/alloc.go @@ -22,7 +22,7 @@ import ( "github.com/shirou/gopsutil/v3/disk" - "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" ) var zero = &Resource{0, 0, 0} diff --git a/pkg/util/vralloc/alloc_test.go b/pkg/util/vralloc/alloc_test.go index d50df58584..6e2e039211 100644 --- a/pkg/util/vralloc/alloc_test.go +++ b/pkg/util/vralloc/alloc_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/hardware" ) func inspect[T comparable](a Allocator[T]) { diff --git a/tests/integration/alias/alias_test.go b/tests/integration/alias/alias_test.go index a557007f5c..8e1af71270 100644 --- a/tests/integration/alias/alias_test.go +++ b/tests/integration/alias/alias_test.go @@ -27,8 +27,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/balance/balance_test.go b/tests/integration/balance/balance_test.go index cf2f148ae3..9911f5d5b5 100644 --- a/tests/integration/balance/balance_test.go +++ b/tests/integration/balance/balance_test.go @@ -32,13 +32,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/balance/channel_exclusive_balance_test.go b/tests/integration/balance/channel_exclusive_balance_test.go index fd5714aec0..e8fec558ea 100644 --- a/tests/integration/balance/channel_exclusive_balance_test.go +++ b/tests/integration/balance/channel_exclusive_balance_test.go @@ -34,12 +34,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" grpcquerynode "github.com/milvus-io/milvus/internal/distributed/querynode" "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/bloomfilter/bloom_filter_test.go b/tests/integration/bloomfilter/bloom_filter_test.go index 5635c2ce75..ca7970f984 100644 --- a/tests/integration/bloomfilter/bloom_filter_test.go +++ b/tests/integration/bloomfilter/bloom_filter_test.go @@ -31,11 +31,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/channel_balance/channel_balance_test.go b/tests/integration/channel_balance/channel_balance_test.go index f136571d80..4b38cae31c 100644 --- a/tests/integration/channel_balance/channel_balance_test.go +++ b/tests/integration/channel_balance/channel_balance_test.go @@ -14,9 +14,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/compaction/clustering_compaction_null_data_test.go b/tests/integration/compaction/clustering_compaction_null_data_test.go index 43e9f82b30..ea5082ffa4 100644 --- a/tests/integration/compaction/clustering_compaction_null_data_test.go +++ b/tests/integration/compaction/clustering_compaction_null_data_test.go @@ -15,13 +15,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/compaction/clustering_compaction_test.go b/tests/integration/compaction/clustering_compaction_test.go index f1801575bc..b33f85ce25 100644 --- a/tests/integration/compaction/clustering_compaction_test.go +++ b/tests/integration/compaction/clustering_compaction_test.go @@ -31,13 +31,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/compaction/compaction_test.go b/tests/integration/compaction/compaction_test.go index f38d926bbe..91705f74b8 100644 --- a/tests/integration/compaction/compaction_test.go +++ b/tests/integration/compaction/compaction_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/compaction/l0_compaction_test.go b/tests/integration/compaction/l0_compaction_test.go index 26f864b193..eb930a46f6 100644 --- a/tests/integration/compaction/l0_compaction_test.go +++ b/tests/integration/compaction/l0_compaction_test.go @@ -28,13 +28,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/compaction/l2_single_compaction_test.go b/tests/integration/compaction/l2_single_compaction_test.go index c608092591..4a05889794 100644 --- a/tests/integration/compaction/l2_single_compaction_test.go +++ b/tests/integration/compaction/l2_single_compaction_test.go @@ -31,13 +31,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/compaction/mix_compaction_test.go b/tests/integration/compaction/mix_compaction_test.go index ce49192d1d..db4cdd295f 100644 --- a/tests/integration/compaction/mix_compaction_test.go +++ b/tests/integration/compaction/mix_compaction_test.go @@ -28,13 +28,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/coorddownsearch/search_after_coord_down_test.go b/tests/integration/coorddownsearch/search_after_coord_down_test.go index 5b597760d7..ac14f471b1 100644 --- a/tests/integration/coorddownsearch/search_after_coord_down_test.go +++ b/tests/integration/coorddownsearch/search_after_coord_down_test.go @@ -32,12 +32,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/coordinator/coordclient" "github.com/milvus-io/milvus/internal/streamingcoord/server/broadcaster/registry" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/coordrecovery/coord_recovery_test.go b/tests/integration/coordrecovery/coord_recovery_test.go index 65d922ea86..38318b7330 100644 --- a/tests/integration/coordrecovery/coord_recovery_test.go +++ b/tests/integration/coordrecovery/coord_recovery_test.go @@ -32,11 +32,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/coordinator/coordclient" "github.com/milvus-io/milvus/internal/streamingcoord/server/broadcaster/registry" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/crossclusterrouting/cross_cluster_routing_test.go b/tests/integration/crossclusterrouting/cross_cluster_routing_test.go index fff9c65bfe..41690f8030 100644 --- a/tests/integration/crossclusterrouting/cross_cluster_routing_test.go +++ b/tests/integration/crossclusterrouting/cross_cluster_routing_test.go @@ -28,13 +28,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/proxypb" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/proto/workerpb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/proxypb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/proto/workerpb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/datanode/compaction_test.go b/tests/integration/datanode/compaction_test.go index 9944434d33..8b571b04d6 100644 --- a/tests/integration/datanode/compaction_test.go +++ b/tests/integration/datanode/compaction_test.go @@ -14,10 +14,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/datanode/datanode_test.go b/tests/integration/datanode/datanode_test.go index dc04750624..b3873b9ed4 100644 --- a/tests/integration/datanode/datanode_test.go +++ b/tests/integration/datanode/datanode_test.go @@ -30,11 +30,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/expression/expression_test.go b/tests/integration/expression/expression_test.go index 4278f7ddb0..3f9845e2a7 100644 --- a/tests/integration/expression/expression_test.go +++ b/tests/integration/expression/expression_test.go @@ -28,11 +28,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/getvector/get_vector_test.go b/tests/integration/getvector/get_vector_test.go index e729213a59..5c8bb78aa6 100644 --- a/tests/integration/getvector/get_vector_test.go +++ b/tests/integration/getvector/get_vector_test.go @@ -28,10 +28,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/hellomilvus/hello_milvus_test.go b/tests/integration/hellomilvus/hello_milvus_test.go index 4361d23955..76e9251c4f 100644 --- a/tests/integration/hellomilvus/hello_milvus_test.go +++ b/tests/integration/hellomilvus/hello_milvus_test.go @@ -30,11 +30,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/hookutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/httpserver/httpserver_test.go b/tests/integration/httpserver/httpserver_test.go index 6646e35127..9ed5aa2ff5 100644 --- a/tests/integration/httpserver/httpserver_test.go +++ b/tests/integration/httpserver/httpserver_test.go @@ -16,9 +16,9 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/internal/distributed/proxy/httpserver" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/hybridsearch/hybridsearch_test.go b/tests/integration/hybridsearch/hybridsearch_test.go index cc6fd667d0..f7d7410db5 100644 --- a/tests/integration/hybridsearch/hybridsearch_test.go +++ b/tests/integration/hybridsearch/hybridsearch_test.go @@ -15,11 +15,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/proxy" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/import/binlog_test.go b/tests/integration/import/binlog_test.go index 61d2c6d746..e55d4fa221 100644 --- a/tests/integration/import/binlog_test.go +++ b/tests/integration/import/binlog_test.go @@ -28,14 +28,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/import/dynamic_field_test.go b/tests/integration/import/dynamic_field_test.go index f0d89dca48..7a53a781f2 100644 --- a/tests/integration/import/dynamic_field_test.go +++ b/tests/integration/import/dynamic_field_test.go @@ -32,12 +32,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/importutilv2" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/import/import_test.go b/tests/integration/import/import_test.go index 8891428949..12e032406f 100644 --- a/tests/integration/import/import_test.go +++ b/tests/integration/import/import_test.go @@ -33,12 +33,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/importutilv2" "github.com/milvus-io/milvus/internal/util/indexparamcheck" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/import/multi_vector_test.go b/tests/integration/import/multi_vector_test.go index d11baa0217..168b54657d 100644 --- a/tests/integration/import/multi_vector_test.go +++ b/tests/integration/import/multi_vector_test.go @@ -32,12 +32,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/importutilv2" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/import/partition_key_test.go b/tests/integration/import/partition_key_test.go index 73fc98e5ab..03ca116878 100644 --- a/tests/integration/import/partition_key_test.go +++ b/tests/integration/import/partition_key_test.go @@ -31,12 +31,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/import/util_test.go b/tests/integration/import/util_test.go index 80bc31778c..c40ae47717 100644 --- a/tests/integration/import/util_test.go +++ b/tests/integration/import/util_test.go @@ -37,10 +37,10 @@ import ( "github.com/milvus-io/milvus/internal/storage" pq "github.com/milvus-io/milvus/internal/util/importutilv2/parquet" "github.com/milvus-io/milvus/internal/util/testutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/internalpb" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/internalpb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/indexstat/get_index_statistics_test.go b/tests/integration/indexstat/get_index_statistics_test.go index eb740a7055..8d131dc5cb 100644 --- a/tests/integration/indexstat/get_index_statistics_test.go +++ b/tests/integration/indexstat/get_index_statistics_test.go @@ -11,9 +11,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/insert/insert_test.go b/tests/integration/insert/insert_test.go index bf08bb9520..82432ec50a 100644 --- a/tests/integration/insert/insert_test.go +++ b/tests/integration/insert/insert_test.go @@ -26,11 +26,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/internaltls/internaltls_test.go b/tests/integration/internaltls/internaltls_test.go index 39d6dd5940..db565e987b 100644 --- a/tests/integration/internaltls/internaltls_test.go +++ b/tests/integration/internaltls/internaltls_test.go @@ -31,12 +31,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/hookutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/jsonexpr/json_expr_test.go b/tests/integration/jsonexpr/json_expr_test.go index f194c877af..d6c1cc88f1 100644 --- a/tests/integration/jsonexpr/json_expr_test.go +++ b/tests/integration/jsonexpr/json_expr_test.go @@ -31,11 +31,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/levelzero/delete_on_growing_test.go b/tests/integration/levelzero/delete_on_growing_test.go index a7bafdb895..22d1c8eff7 100644 --- a/tests/integration/levelzero/delete_on_growing_test.go +++ b/tests/integration/levelzero/delete_on_growing_test.go @@ -23,11 +23,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/levelzero/delete_partition_key_test.go b/tests/integration/levelzero/delete_partition_key_test.go index e2a536e66a..7fca681f73 100644 --- a/tests/integration/levelzero/delete_partition_key_test.go +++ b/tests/integration/levelzero/delete_partition_key_test.go @@ -10,11 +10,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/levelzero/levelzero_test.go b/tests/integration/levelzero/levelzero_test.go index 3b69938f80..baeae70b24 100644 --- a/tests/integration/levelzero/levelzero_test.go +++ b/tests/integration/levelzero/levelzero_test.go @@ -27,9 +27,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/materialized_view/materialized_view_test.go b/tests/integration/materialized_view/materialized_view_test.go index cf2c484a2a..2a3e2e585c 100644 --- a/tests/integration/materialized_view/materialized_view_test.go +++ b/tests/integration/materialized_view/materialized_view_test.go @@ -27,12 +27,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/meta_watcher.go b/tests/integration/meta_watcher.go index 2f7fdbbbe0..d43a84b079 100644 --- a/tests/integration/meta_watcher.go +++ b/tests/integration/meta_watcher.go @@ -29,9 +29,9 @@ import ( "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" ) // MetaWatcher to observe meta data of milvus cluster diff --git a/tests/integration/meta_watcher_test.go b/tests/integration/meta_watcher_test.go index 5a44b81706..aa903aca73 100644 --- a/tests/integration/meta_watcher_test.go +++ b/tests/integration/meta_watcher_test.go @@ -29,10 +29,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) type MetaWatcherSuite struct { diff --git a/tests/integration/minicluster_v2.go b/tests/integration/minicluster_v2.go index 222ace49f4..b817572271 100644 --- a/tests/integration/minicluster_v2.go +++ b/tests/integration/minicluster_v2.go @@ -60,10 +60,10 @@ import ( "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/hookutil" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/paramtable" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) var params *paramtable.ComponentParam = paramtable.Get() diff --git a/tests/integration/null_data/null_data_test.go b/tests/integration/null_data/null_data_test.go index a6707ba4ff..901cd3441f 100644 --- a/tests/integration/null_data/null_data_test.go +++ b/tests/integration/null_data/null_data_test.go @@ -29,11 +29,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/ops/suspend_node_test.go b/tests/integration/ops/suspend_node_test.go index a89c2fc7e4..64826f1120 100644 --- a/tests/integration/ops/suspend_node_test.go +++ b/tests/integration/ops/suspend_node_test.go @@ -26,9 +26,9 @@ import ( grpcquerynode "github.com/milvus-io/milvus/internal/distributed/querynode" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/partialsearch/partial_search_test.go b/tests/integration/partialsearch/partial_search_test.go index c5fdd1d8d2..e353d7c879 100644 --- a/tests/integration/partialsearch/partial_search_test.go +++ b/tests/integration/partialsearch/partial_search_test.go @@ -30,14 +30,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/partitionkey/partition_key_test.go b/tests/integration/partitionkey/partition_key_test.go index f76f1af6db..94b8d140b7 100644 --- a/tests/integration/partitionkey/partition_key_test.go +++ b/tests/integration/partitionkey/partition_key_test.go @@ -32,10 +32,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/hookutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/querynode/querynode_test.go b/tests/integration/querynode/querynode_test.go index 9e04d94bf8..a14a163064 100644 --- a/tests/integration/querynode/querynode_test.go +++ b/tests/integration/querynode/querynode_test.go @@ -30,11 +30,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/rangesearch/range_search_test.go b/tests/integration/rangesearch/range_search_test.go index 91d4006d24..c533ca787d 100644 --- a/tests/integration/rangesearch/range_search_test.go +++ b/tests/integration/rangesearch/range_search_test.go @@ -27,11 +27,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/ratelimit/db_properties_test.go b/tests/integration/ratelimit/db_properties_test.go index 97b0ed67d2..9dc8a0dd05 100644 --- a/tests/integration/ratelimit/db_properties_test.go +++ b/tests/integration/ratelimit/db_properties_test.go @@ -31,12 +31,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/ratelimit/flush_test.go b/tests/integration/ratelimit/flush_test.go index 04233ee329..1ba45187f6 100644 --- a/tests/integration/ratelimit/flush_test.go +++ b/tests/integration/ratelimit/flush_test.go @@ -26,11 +26,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/rbac/privilege_group_test.go b/tests/integration/rbac/privilege_group_test.go index 43b1fae34f..58945c8288 100644 --- a/tests/integration/rbac/privilege_group_test.go +++ b/tests/integration/rbac/privilege_group_test.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/rbac/rbac_backup_test.go b/tests/integration/rbac/rbac_backup_test.go index 9ef45878a7..e7044e6e14 100644 --- a/tests/integration/rbac/rbac_backup_test.go +++ b/tests/integration/rbac/rbac_backup_test.go @@ -26,10 +26,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/crypto" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/crypto" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/rbac/rbac_basic_test.go b/tests/integration/rbac/rbac_basic_test.go index 1b83995d4f..31db371ea8 100644 --- a/tests/integration/rbac/rbac_basic_test.go +++ b/tests/integration/rbac/rbac_basic_test.go @@ -23,9 +23,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/util" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/refreshconfig/refresh_config_test.go b/tests/integration/refreshconfig/refresh_config_test.go index df22cf7b75..953203272e 100644 --- a/tests/integration/refreshconfig/refresh_config_test.go +++ b/tests/integration/refreshconfig/refresh_config_test.go @@ -29,9 +29,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/replicas/balance/replica_test.go b/tests/integration/replicas/balance/replica_test.go index a6bf3f7d4b..5ce490821f 100644 --- a/tests/integration/replicas/balance/replica_test.go +++ b/tests/integration/replicas/balance/replica_test.go @@ -28,11 +28,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/replicas/load/load_test.go b/tests/integration/replicas/load/load_test.go index 8346b30be5..92b693ce9c 100644 --- a/tests/integration/replicas/load/load_test.go +++ b/tests/integration/replicas/load/load_test.go @@ -32,12 +32,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/rgpb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/rg/resource_group_test.go b/tests/integration/rg/resource_group_test.go index e21dc48937..a901faaac5 100644 --- a/tests/integration/rg/resource_group_test.go +++ b/tests/integration/rg/resource_group_test.go @@ -12,8 +12,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/rgpb" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/rollingupgrade/manual_rolling_upgrade_test.go b/tests/integration/rollingupgrade/manual_rolling_upgrade_test.go index faaab97db1..cf69259817 100644 --- a/tests/integration/rollingupgrade/manual_rolling_upgrade_test.go +++ b/tests/integration/rollingupgrade/manual_rolling_upgrade_test.go @@ -29,12 +29,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/sealpolicies/seal_by_total_growing_test.go b/tests/integration/sealpolicies/seal_by_total_growing_test.go index 33253bab3b..416d2e35f7 100644 --- a/tests/integration/sealpolicies/seal_by_total_growing_test.go +++ b/tests/integration/sealpolicies/seal_by_total_growing_test.go @@ -27,12 +27,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/sealpolicies/seal_policies_test.go b/tests/integration/sealpolicies/seal_policies_test.go index c8d5493b94..07c5389dfb 100644 --- a/tests/integration/sealpolicies/seal_policies_test.go +++ b/tests/integration/sealpolicies/seal_policies_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/sparse/sparse_test.go b/tests/integration/sparse/sparse_test.go index 140d867f2a..7693995cd2 100644 --- a/tests/integration/sparse/sparse_test.go +++ b/tests/integration/sparse/sparse_test.go @@ -29,11 +29,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/stats_task/stats_task_test.go b/tests/integration/stats_task/stats_task_test.go index dbcb10af0f..3cf4c81daa 100644 --- a/tests/integration/stats_task/stats_task_test.go +++ b/tests/integration/stats_task/stats_task_test.go @@ -34,13 +34,13 @@ import ( "github.com/milvus-io/milvus/internal/metastore/kv/binlog" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/hookutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/streaming/hello_streaming_test.go b/tests/integration/streaming/hello_streaming_test.go index 77549f0274..26f6f8d60a 100644 --- a/tests/integration/streaming/hello_streaming_test.go +++ b/tests/integration/streaming/hello_streaming_test.go @@ -31,12 +31,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" "github.com/milvus-io/milvus/internal/util/streamingutil" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/datapb" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/datapb" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/suite.go b/tests/integration/suite.go index d1bd7fc3e8..279d23dd44 100644 --- a/tests/integration/suite.go +++ b/tests/integration/suite.go @@ -31,9 +31,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus/internal/util/hookutil" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/etcd" - "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/etcd" + "github.com/milvus-io/milvus/pkg/v2/util/merr" ) var caseTimeout time.Duration diff --git a/tests/integration/target/target_test.go b/tests/integration/target/target_test.go index 774cefe04e..192734e149 100644 --- a/tests/integration/target/target_test.go +++ b/tests/integration/target/target_test.go @@ -30,13 +30,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/proto/querypb" - "github.com/milvus-io/milvus/pkg/util/commonpbutil" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" - "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/proto/querypb" + "github.com/milvus-io/milvus/pkg/v2/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" + "github.com/milvus-io/milvus/pkg/v2/util/paramtable" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/upsert/upsert_test.go b/tests/integration/upsert/upsert_test.go index 048c4ac3d2..ea3c01a133 100644 --- a/tests/integration/upsert/upsert_test.go +++ b/tests/integration/upsert/upsert_test.go @@ -27,11 +27,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/funcutil" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" "github.com/milvus-io/milvus/tests/integration" ) diff --git a/tests/integration/util_collection.go b/tests/integration/util_collection.go index 1caf7258cf..04a47aa256 100644 --- a/tests/integration/util_collection.go +++ b/tests/integration/util_collection.go @@ -11,10 +11,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/log" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metric" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/log" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metric" ) type CreateCollectionConfig struct { diff --git a/tests/integration/util_index.go b/tests/integration/util_index.go index 15da7d7885..f586cf93e6 100644 --- a/tests/integration/util_index.go +++ b/tests/integration/util_index.go @@ -25,7 +25,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) const ( diff --git a/tests/integration/util_insert.go b/tests/integration/util_insert.go index 1a37538211..41f3dc04cc 100644 --- a/tests/integration/util_insert.go +++ b/tests/integration/util_insert.go @@ -22,7 +22,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" ) func (s *MiniClusterSuite) WaitForFlush(ctx context.Context, segIDs []int64, flushTs uint64, dbName, collectionName string) { diff --git a/tests/integration/util_query.go b/tests/integration/util_query.go index fd14f0099e..b45b8154c5 100644 --- a/tests/integration/util_query.go +++ b/tests/integration/util_query.go @@ -30,11 +30,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/pkg/util/merr" - "github.com/milvus-io/milvus/pkg/util/metricsinfo" - "github.com/milvus-io/milvus/pkg/util/testutils" - "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/v2/common" + "github.com/milvus-io/milvus/pkg/v2/util/merr" + "github.com/milvus-io/milvus/pkg/v2/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/v2/util/testutils" + "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) const ( diff --git a/tests/integration/util_schema.go b/tests/integration/util_schema.go index 9caf046ce7..e4a35f5a75 100644 --- a/tests/integration/util_schema.go +++ b/tests/integration/util_schema.go @@ -21,7 +21,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" - "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/v2/common" ) const (