From d7f38a803d5d23d3e061702e73770cb68aee1dc2 Mon Sep 17 00:00:00 2001 From: SimFG Date: Fri, 16 Sep 2022 16:56:49 +0800 Subject: [PATCH] Separate some proto files (#19218) Signed-off-by: SimFG Signed-off-by: SimFG --- {internal/proto => api}/commonpb/common.pb.go | 318 +++++++++--------- api/go.mod | 16 + api/go.sum | 127 +++++++ {internal/proto => api}/milvuspb/milvus.pb.go | 18 +- {internal/proto => api}/schemapb/schema.pb.go | 136 ++++---- cmd/milvus/mck.go | 2 +- cmd/roles/healthz_handler.go | 2 +- go.mod | 10 +- go.sum | 2 + internal/allocator/id.go | 2 +- internal/allocator/id_test.go | 2 +- internal/common/key_data_pairs.go | 2 +- internal/common/key_data_pairs_test.go | 2 +- internal/common/key_value_pairs.go | 2 +- internal/common/key_value_pairs_test.go | 2 +- internal/core/src/pb/common.pb.cc | 8 +- internal/core/src/pb/schema.pb.cc | 8 +- internal/datacoord/allocator.go | 2 +- internal/datacoord/channel_manager.go | 2 +- internal/datacoord/cluster.go | 2 +- internal/datacoord/cluster_test.go | 2 +- internal/datacoord/compaction.go | 2 +- internal/datacoord/compaction_test.go | 2 +- internal/datacoord/compaction_trigger.go | 2 +- internal/datacoord/compaction_trigger_test.go | 4 +- internal/datacoord/garbage_collector.go | 2 +- internal/datacoord/garbage_collector_test.go | 2 +- internal/datacoord/handler.go | 2 +- internal/datacoord/meta.go | 2 +- internal/datacoord/meta_test.go | 2 +- internal/datacoord/metrics_info.go | 4 +- internal/datacoord/metrics_info_test.go | 4 +- internal/datacoord/mock_test.go | 6 +- .../datacoord/segment_allocation_policy.go | 4 +- .../segment_allocation_policy_test.go | 4 +- internal/datacoord/segment_info.go | 2 +- internal/datacoord/segment_manager.go | 2 +- internal/datacoord/segment_manager_test.go | 4 +- internal/datacoord/server.go | 4 +- internal/datacoord/server_test.go | 6 +- internal/datacoord/services.go | 4 +- internal/datacoord/session_manager.go | 2 +- internal/datacoord/util.go | 4 +- internal/datacoord/util_test.go | 2 +- internal/datanode/allocator.go | 2 +- internal/datanode/binlog_io_test.go | 2 +- internal/datanode/compactor.go | 2 +- internal/datanode/compactor_test.go | 6 +- internal/datanode/data_node.go | 6 +- internal/datanode/data_node_test.go | 6 +- internal/datanode/data_sync_service.go | 2 +- internal/datanode/data_sync_service_test.go | 4 +- internal/datanode/flow_graph_dd_node.go | 2 +- internal/datanode/flow_graph_dd_node_test.go | 2 +- internal/datanode/flow_graph_delete_node.go | 2 +- .../datanode/flow_graph_delete_node_test.go | 2 +- .../datanode/flow_graph_insert_buffer_node.go | 4 +- .../flow_graph_insert_buffer_node_test.go | 6 +- internal/datanode/flow_graph_manager_test.go | 2 +- internal/datanode/flush_manager.go | 2 +- internal/datanode/flush_manager_test.go | 4 +- internal/datanode/meta_service.go | 6 +- internal/datanode/meta_service_test.go | 6 +- internal/datanode/metrics_info.go | 4 +- internal/datanode/mock_test.go | 6 +- internal/datanode/segment_replica.go | 2 +- internal/datanode/segment_replica_test.go | 2 +- .../distributed/datacoord/client/client.go | 4 +- internal/distributed/datacoord/service.go | 4 +- .../distributed/datacoord/service_test.go | 4 +- .../distributed/datanode/client/client.go | 4 +- internal/distributed/datanode/service.go | 4 +- internal/distributed/datanode/service_test.go | 4 +- .../distributed/indexcoord/client/client.go | 4 +- .../indexcoord/client/client_test.go | 4 +- internal/distributed/indexcoord/service.go | 4 +- .../distributed/indexcoord/service_test.go | 4 +- .../distributed/indexnode/client/client.go | 4 +- .../indexnode/client/client_test.go | 2 +- internal/distributed/indexnode/service.go | 4 +- .../distributed/indexnode/service_test.go | 2 +- internal/distributed/proxy/client/client.go | 4 +- .../distributed/proxy/httpserver/handler.go | 2 +- .../proxy/httpserver/handler_test.go | 6 +- .../proxy/httpserver/wrap_request.go | 6 +- .../proxy/httpserver/wrap_request_test.go | 4 +- .../distributed/proxy/httpserver/wrapper.go | 2 +- internal/distributed/proxy/service.go | 4 +- internal/distributed/proxy/service_test.go | 4 +- .../distributed/querycoord/client/client.go | 4 +- internal/distributed/querycoord/service.go | 4 +- .../distributed/querycoord/service_test.go | 4 +- .../distributed/querynode/client/client.go | 4 +- internal/distributed/querynode/service.go | 4 +- .../distributed/querynode/service_test.go | 4 +- .../distributed/rootcoord/client/client.go | 4 +- internal/distributed/rootcoord/service.go | 4 +- .../distributed/rootcoord/service_test.go | 2 +- internal/indexcoord/flush_segment_watcher.go | 2 +- .../flushed_segment_watcher_test.go | 2 +- internal/indexcoord/garbage_collector.go | 2 +- internal/indexcoord/index_builder.go | 2 +- internal/indexcoord/index_builder_test.go | 2 +- internal/indexcoord/index_coord.go | 4 +- internal/indexcoord/index_coord_mock.go | 4 +- internal/indexcoord/index_coord_test.go | 2 +- internal/indexcoord/meta_table.go | 2 +- internal/indexcoord/meta_table_test.go | 2 +- internal/indexcoord/metrics_info.go | 4 +- internal/indexcoord/node_manager.go | 4 +- internal/indexcoord/node_manager_test.go | 2 +- internal/indexcoord/peek_client_policy.go | 2 +- .../indexcoord/peek_client_policy_test.go | 2 +- internal/indexcoord/priority_queue.go | 2 +- internal/indexcoord/priority_queue_test.go | 2 +- internal/indexcoord/task.go | 2 +- internal/indexcoord/util.go | 2 +- internal/indexcoord/util_test.go | 4 +- internal/indexnode/chunkmgr_mock.go | 2 +- internal/indexnode/indexnode.go | 4 +- internal/indexnode/indexnode_mock.go | 4 +- internal/indexnode/indexnode_service.go | 4 +- internal/indexnode/indexnode_service_test.go | 4 +- internal/indexnode/indexnode_test.go | 2 +- internal/indexnode/metrics_info.go | 4 +- internal/indexnode/task.go | 4 +- internal/indexnode/task_scheduler.go | 2 +- internal/indexnode/task_scheduler_test.go | 2 +- internal/indexnode/task_test.go | 2 +- internal/indexnode/taskinfo_ops.go | 2 +- internal/metastore/catalog.go | 2 +- internal/metastore/db/dao/collection_test.go | 2 +- internal/metastore/db/dao/field_test.go | 2 +- internal/metastore/db/dbmodel/collection.go | 2 +- internal/metastore/db/dbmodel/field.go | 4 +- internal/metastore/db/dbmodel/index.go | 2 +- internal/metastore/db/dbmodel/role.go | 2 +- .../metastore/db/dbmodel/segment_index.go | 2 +- .../db/indexcoord/table_catalog_test.go | 2 +- .../metastore/db/rootcoord/table_catalog.go | 2 +- .../db/rootcoord/table_catalog_test.go | 6 +- internal/metastore/kv/datacoord/kv_catalog.go | 2 +- .../kv/indexcoord/kv_catalog_test.go | 2 +- .../metastore/kv/querycoord/kv_catalog.go | 2 +- internal/metastore/kv/rootcoord/kv_catalog.go | 4 +- .../metastore/kv/rootcoord/kv_catalog_test.go | 4 +- internal/metastore/model/collection.go | 4 +- internal/metastore/model/collection_test.go | 4 +- internal/metastore/model/field.go | 4 +- internal/metastore/model/field_test.go | 4 +- internal/metastore/model/index.go | 2 +- internal/metastore/model/index_test.go | 2 +- internal/metastore/model/segment.go | 2 +- internal/metastore/model/segment_index.go | 2 +- .../metastore/model/segment_index_test.go | 2 +- internal/mocks/mock_datacoord.go | 4 +- internal/mocks/mock_datanode.go | 4 +- internal/mocks/mock_indexcoord.go | 4 +- internal/mocks/mock_rootcoord.go | 4 +- .../mq/msgstream/mq_kafka_msgstream_test.go | 2 +- internal/mq/msgstream/mq_msgstream.go | 2 +- internal/mq/msgstream/mq_msgstream_test.go | 2 +- internal/mq/msgstream/msg.go | 4 +- internal/mq/msgstream/msg_test.go | 4 +- internal/mq/msgstream/repack_func.go | 2 +- internal/mq/msgstream/trace.go | 2 +- internal/mq/msgstream/unmarshal.go | 2 +- internal/mq/msgstream/unmarshal_test.go | 2 +- internal/parser/planparserv2/node_ret.go | 2 +- internal/parser/planparserv2/operators.go | 2 +- .../parser/planparserv2/parser_visitor.go | 2 +- .../parser/planparserv2/plan_parser_v2.go | 2 +- .../planparserv2/plan_parser_v2_test.go | 2 +- internal/parser/planparserv2/utils.go | 2 +- internal/parser/planparserv2/utils_test.go | 2 +- internal/proto/common.proto | 2 +- internal/proto/datapb/data_coord.pb.go | 6 +- internal/proto/etcdpb/etcd_meta.pb.go | 4 +- internal/proto/indexcgopb/index_cgo_msg.pb.go | 2 +- internal/proto/indexpb/index_coord.pb.go | 4 +- internal/proto/internalpb/internal.pb.go | 4 +- internal/proto/milvus.proto | 2 +- internal/proto/planpb/plan.pb.go | 2 +- internal/proto/proxypb/proxy.pb.go | 4 +- internal/proto/querypb/query_coord.pb.go | 6 +- internal/proto/rootcoordpb/root_coord.pb.go | 4 +- internal/proto/schema.proto | 2 +- internal/proto/segcorepb/segcore.pb.go | 2 +- internal/proxy/channels_mgr.go | 4 +- internal/proxy/channels_mgr_test.go | 4 +- internal/proxy/data_coord_mock_test.go | 4 +- internal/proxy/error.go | 2 +- internal/proxy/error_test.go | 2 +- internal/proxy/impl.go | 4 +- internal/proxy/index_coord_mock_test.go | 4 +- internal/proxy/meta_cache.go | 6 +- internal/proxy/meta_cache_test.go | 6 +- internal/proxy/metrics_info.go | 4 +- internal/proxy/metrics_info_test.go | 4 +- internal/proxy/mock_cache_test.go | 2 +- internal/proxy/mock_test.go | 4 +- internal/proxy/plan_parser.go | 2 +- internal/proxy/plan_parser_test.go | 2 +- internal/proxy/privilege_interceptor.go | 2 +- internal/proxy/privilege_interceptor_test.go | 4 +- internal/proxy/proxy.go | 2 +- internal/proxy/proxy_test.go | 6 +- internal/proxy/query_coord_mock_test.go | 4 +- internal/proxy/query_node_mock_test.go | 4 +- internal/proxy/rate_limit_interceptor.go | 4 +- internal/proxy/rate_limit_interceptor_test.go | 4 +- internal/proxy/rootcoord_mock_test.go | 6 +- internal/proxy/segment.go | 2 +- internal/proxy/segment_test.go | 2 +- internal/proxy/task.go | 6 +- internal/proxy/task_calc_distance.go | 6 +- internal/proxy/task_calc_distance_test.go | 6 +- internal/proxy/task_index_test.go | 4 +- internal/proxy/task_insert.go | 6 +- internal/proxy/task_insert_test.go | 4 +- internal/proxy/task_query.go | 6 +- internal/proxy/task_query_test.go | 6 +- internal/proxy/task_search.go | 6 +- internal/proxy/task_search_test.go | 6 +- internal/proxy/task_statistic.go | 4 +- internal/proxy/task_test.go | 6 +- internal/proxy/timestamp.go | 2 +- internal/proxy/util.go | 4 +- internal/proxy/util_test.go | 4 +- internal/querycoord/cluster.go | 4 +- internal/querycoord/cluster_test.go | 4 +- internal/querycoord/global_meta_broker.go | 6 +- .../querycoord/global_meta_broker_test.go | 2 +- internal/querycoord/group_balance_test.go | 2 +- internal/querycoord/handoff_handler.go | 2 +- internal/querycoord/handoff_handler_test.go | 4 +- internal/querycoord/impl.go | 4 +- internal/querycoord/impl_test.go | 4 +- internal/querycoord/meta.go | 6 +- internal/querycoord/meta_test.go | 2 +- internal/querycoord/metrics_info.go | 4 +- .../querycoord/mock_3rd_component_test.go | 6 +- .../querycoord/mock_querynode_client_test.go | 4 +- .../querycoord/mock_querynode_server_test.go | 4 +- internal/querycoord/query_coord.go | 4 +- internal/querycoord/query_coord_test.go | 4 +- internal/querycoord/querynode.go | 4 +- internal/querycoord/querynode_test.go | 4 +- internal/querycoord/replica.go | 2 +- internal/querycoord/replica_test.go | 2 +- internal/querycoord/task.go | 4 +- internal/querycoord/task_scheduler.go | 2 +- internal/querycoord/task_scheduler_test.go | 2 +- internal/querycoord/task_test.go | 2 +- internal/querycoord/task_util_test.go | 2 +- internal/querycoord/util.go | 2 +- internal/querycoordv2/dist/dist_handler.go | 2 +- internal/querycoordv2/handlers.go | 4 +- .../querycoordv2/meta/coordinator_broker.go | 6 +- internal/querycoordv2/meta/mock_broker.go | 2 +- .../querycoordv2/meta/replica_manager_test.go | 2 +- internal/querycoordv2/meta/store.go | 2 +- internal/querycoordv2/mocks/mock_querynode.go | 4 +- internal/querycoordv2/mocks/querynode.go | 2 +- .../observers/handoff_observer_test.go | 2 +- .../querycoordv2/observers/leader_observer.go | 2 +- .../observers/leader_observer_test.go | 2 +- internal/querycoordv2/server.go | 4 +- internal/querycoordv2/server_test.go | 4 +- internal/querycoordv2/services.go | 4 +- internal/querycoordv2/services_test.go | 4 +- internal/querycoordv2/session/cluster.go | 4 +- internal/querycoordv2/session/cluster_test.go | 4 +- internal/querycoordv2/session/mock_cluster.go | 4 +- internal/querycoordv2/session/task.go | 2 +- internal/querycoordv2/task/executor.go | 2 +- internal/querycoordv2/task/task_test.go | 4 +- internal/querycoordv2/task/utils.go | 4 +- internal/querycoordv2/utils/types.go | 4 +- internal/querynode/benchmark_test.go | 2 +- internal/querynode/cgo_helper.go | 2 +- internal/querynode/collection.go | 2 +- internal/querynode/collection_test.go | 2 +- .../querynode/flow_graph_delete_node_test.go | 2 +- .../flow_graph_filter_delete_node.go | 2 +- .../flow_graph_filter_delete_node_test.go | 2 +- .../querynode/flow_graph_filter_dm_node.go | 2 +- .../flow_graph_filter_dm_node_test.go | 4 +- internal/querynode/flow_graph_insert_node.go | 2 +- .../querynode/flow_graph_insert_node_test.go | 2 +- internal/querynode/impl.go | 4 +- internal/querynode/impl_test.go | 4 +- internal/querynode/impl_utils.go | 2 +- internal/querynode/load_index_info.go | 2 +- internal/querynode/load_index_info_test.go | 4 +- internal/querynode/meta_replica.go | 2 +- internal/querynode/meta_replica_test.go | 2 +- internal/querynode/metrics_info.go | 4 +- internal/querynode/metrics_info_test.go | 4 +- internal/querynode/mock_test.go | 4 +- internal/querynode/plan.go | 2 +- internal/querynode/plan_test.go | 2 +- internal/querynode/query_shard_test.go | 2 +- internal/querynode/reduce_test.go | 2 +- internal/querynode/result.go | 4 +- internal/querynode/result_sorter.go | 2 +- internal/querynode/result_sorter_test.go | 2 +- internal/querynode/result_test.go | 2 +- internal/querynode/search.go | 2 +- internal/querynode/segment.go | 4 +- internal/querynode/segment_loader.go | 4 +- internal/querynode/segment_loader_test.go | 4 +- internal/querynode/segment_test.go | 4 +- internal/querynode/shard_cluster.go | 2 +- internal/querynode/shard_cluster_test.go | 2 +- internal/querynode/task.go | 2 +- internal/querynode/task_query.go | 2 +- internal/querynode/task_search.go | 2 +- internal/querynode/task_statistics.go | 2 +- internal/querynode/task_test.go | 4 +- internal/rootcoord/alter_alias_task.go | 4 +- internal/rootcoord/alter_alias_task_test.go | 4 +- internal/rootcoord/broker.go | 2 +- internal/rootcoord/broker_test.go | 2 +- internal/rootcoord/create_alias_task.go | 4 +- internal/rootcoord/create_alias_task_test.go | 4 +- internal/rootcoord/create_collection_task.go | 6 +- .../rootcoord/create_collection_task_test.go | 6 +- internal/rootcoord/create_partition_task.go | 4 +- .../rootcoord/create_partition_task_test.go | 4 +- .../rootcoord/describe_collection_task.go | 6 +- .../describe_collection_task_test.go | 4 +- internal/rootcoord/drop_alias_task.go | 4 +- internal/rootcoord/drop_alias_task_test.go | 4 +- internal/rootcoord/drop_collection_task.go | 4 +- .../rootcoord/drop_collection_task_test.go | 4 +- internal/rootcoord/drop_partition_task.go | 4 +- .../rootcoord/drop_partition_task_test.go | 4 +- internal/rootcoord/garbage_collector.go | 2 +- internal/rootcoord/has_collection_task.go | 4 +- .../rootcoord/has_collection_task_test.go | 4 +- internal/rootcoord/has_partition_task.go | 4 +- internal/rootcoord/has_partition_task_test.go | 4 +- internal/rootcoord/import_manager.go | 4 +- internal/rootcoord/import_manager_test.go | 4 +- internal/rootcoord/meta_table.go | 2 +- internal/rootcoord/meta_table_test.go | 4 +- internal/rootcoord/metrics_info.go | 4 +- internal/rootcoord/mock_test.go | 2 +- internal/rootcoord/proxy_client_manager.go | 4 +- .../rootcoord/proxy_client_manager_test.go | 2 +- internal/rootcoord/quota_center.go | 2 +- internal/rootcoord/quota_center_test.go | 4 +- internal/rootcoord/root_coord.go | 4 +- internal/rootcoord/root_coord_test.go | 4 +- internal/rootcoord/show_collection_task.go | 4 +- .../rootcoord/show_collection_task_test.go | 4 +- internal/rootcoord/show_partition_task.go | 4 +- .../rootcoord/show_partition_task_test.go | 4 +- internal/rootcoord/timeticksync.go | 2 +- internal/rootcoord/timeticksync_test.go | 2 +- internal/rootcoord/util.go | 2 +- internal/rootcoord/util_test.go | 2 +- internal/storage/binlog_iterator.go | 2 +- internal/storage/binlog_iterator_test.go | 2 +- internal/storage/binlog_test.go | 2 +- internal/storage/binlog_writer.go | 2 +- internal/storage/binlog_writer_test.go | 2 +- internal/storage/data_codec.go | 2 +- internal/storage/data_codec_test.go | 2 +- internal/storage/data_sorter.go | 2 +- internal/storage/data_sorter_test.go | 2 +- internal/storage/event_data.go | 2 +- internal/storage/event_reader.go | 2 +- internal/storage/event_test.go | 2 +- internal/storage/event_writer.go | 2 +- internal/storage/event_writer_test.go | 2 +- internal/storage/payload.go | 2 +- internal/storage/payload_benchmark_test.go | 2 +- internal/storage/payload_cgo_test.go | 2 +- internal/storage/payload_reader.go | 2 +- internal/storage/payload_reader_cgo.go | 4 +- internal/storage/payload_test.go | 2 +- internal/storage/primary_key.go | 2 +- internal/storage/primary_key_test.go | 2 +- internal/storage/print_binlog.go | 2 +- internal/storage/print_binlog_test.go | 4 +- internal/storage/stats.go | 2 +- internal/storage/stats_test.go | 2 +- internal/storage/utils.go | 4 +- internal/storage/utils_test.go | 4 +- internal/storage/vector_chunk_manager_test.go | 2 +- internal/types/types.go | 4 +- internal/util/constant.go | 2 +- internal/util/errorutil/util.go | 2 +- internal/util/flowgraph/node_test.go | 2 +- internal/util/funcutil/func.go | 6 +- internal/util/funcutil/func_test.go | 4 +- internal/util/funcutil/policy.go | 4 +- internal/util/funcutil/policy_test.go | 4 +- internal/util/funcutil/verify_response.go | 2 +- internal/util/importutil/import_wrapper.go | 4 +- .../util/importutil/import_wrapper_test.go | 4 +- internal/util/importutil/json_handler.go | 2 +- internal/util/importutil/json_handler_test.go | 4 +- internal/util/importutil/json_parser.go | 2 +- internal/util/importutil/json_parser_test.go | 4 +- internal/util/importutil/numpy_parser.go | 2 +- internal/util/importutil/numpy_parser_test.go | 2 +- .../util/indexcgowrapper/codec_index_test.go | 2 +- internal/util/indexcgowrapper/dataset.go | 2 +- internal/util/indexcgowrapper/helper.go | 2 +- internal/util/indexcgowrapper/index.go | 4 +- internal/util/indexcgowrapper/index_test.go | 2 +- .../indexparamcheck/scalar_index_checker.go | 2 +- .../scalar_index_checker_test.go | 2 +- internal/util/metricsinfo/cache.go | 2 +- internal/util/metricsinfo/cache_test.go | 2 +- internal/util/metricsinfo/metric_type.go | 4 +- internal/util/mock/datacoord_client.go | 4 +- internal/util/mock/grpc_datacoord_client.go | 4 +- internal/util/mock/grpc_datanode_client.go | 4 +- internal/util/mock/grpc_indexnode_client.go | 4 +- internal/util/mock/grpc_proxy_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 | 4 +- internal/util/mock/querynode_client.go | 4 +- internal/util/typeutil/data_format.go | 4 +- internal/util/typeutil/data_format_test.go | 4 +- internal/util/typeutil/hash.go | 2 +- internal/util/typeutil/hash_test.go | 2 +- internal/util/typeutil/index.go | 2 +- internal/util/typeutil/index_test.go | 2 +- internal/util/typeutil/schema.go | 2 +- internal/util/typeutil/schema_test.go | 4 +- scripts/check_proto_product.sh | 8 + scripts/proto_gen_go.sh | 54 ++- 438 files changed, 1114 insertions(+), 939 deletions(-) rename {internal/proto => api}/commonpb/common.pb.go (74%) create mode 100644 api/go.mod create mode 100644 api/go.sum rename {internal/proto => api}/milvuspb/milvus.pb.go (99%) rename {internal/proto => api}/schemapb/schema.pb.go (83%) diff --git a/internal/proto/commonpb/common.pb.go b/api/commonpb/common.pb.go similarity index 74% rename from internal/proto/commonpb/common.pb.go rename to api/commonpb/common.pb.go index c3950912baa79..0ae79850bb9d5 100644 --- a/internal/proto/commonpb/common.pb.go +++ b/api/commonpb/common.pb.go @@ -1394,164 +1394,164 @@ func init() { func init() { proto.RegisterFile("common.proto", fileDescriptor_555bd8c177793206) } var fileDescriptor_555bd8c177793206 = []byte{ - // 2539 bytes of a gzipped FileDescriptorProto + // 2532 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x59, 0x73, 0x24, 0x47, - 0xf1, 0x57, 0xcf, 0x8c, 0x8e, 0xa9, 0x19, 0x49, 0xa5, 0x92, 0x56, 0x3b, 0xde, 0xc3, 0x2b, 0xeb, - 0x6f, 0xff, 0x59, 0x06, 0x5b, 0x6b, 0xaf, 0x23, 0x80, 0x20, 0xc2, 0x04, 0xd2, 0x8c, 0xa4, 0x55, - 0x58, 0x17, 0x2d, 0xad, 0x4d, 0x10, 0x01, 0x1b, 0x35, 0xdd, 0xa9, 0x51, 0xed, 0x76, 0x77, 0x35, - 0x5d, 0x35, 0x5a, 0x0d, 0x4f, 0xc6, 0x80, 0x9f, 0xc1, 0x7c, 0x01, 0x3e, 0x00, 0xf7, 0xfd, 0xc8, - 0x8d, 0xcd, 0xf5, 0xcc, 0x0d, 0x8f, 0xf0, 0x48, 0x04, 0x87, 0xf1, 0x49, 0x64, 0x55, 0x5f, 0xa3, - 0x5d, 0xc3, 0x03, 0x6f, 0x5d, 0xbf, 0xcc, 0xca, 0xab, 0xb2, 0x32, 0xb3, 0x9a, 0x34, 0x3d, 0x19, - 0x86, 0x32, 0x5a, 0x89, 0x13, 0xa9, 0x25, 0x9b, 0x0f, 0x45, 0x70, 0x32, 0x50, 0x76, 0xb5, 0x62, - 0x49, 0x17, 0x96, 0xfa, 0x52, 0xf6, 0x03, 0xb8, 0x66, 0xc0, 0xde, 0xe0, 0xe8, 0x9a, 0x0f, 0xca, - 0x4b, 0x44, 0xac, 0x65, 0x62, 0x19, 0x97, 0x6f, 0x91, 0x89, 0x03, 0xcd, 0xf5, 0x40, 0xb1, 0xa7, - 0x08, 0x81, 0x24, 0x91, 0xc9, 0x2d, 0x4f, 0xfa, 0xd0, 0x72, 0x96, 0x9c, 0xab, 0x33, 0xd7, 0x1f, - 0x5c, 0xb9, 0x8f, 0xd4, 0x95, 0x75, 0x64, 0xeb, 0x48, 0x1f, 0xdc, 0x3a, 0x64, 0x9f, 0x6c, 0x91, - 0x4c, 0x24, 0xc0, 0x95, 0x8c, 0x5a, 0x95, 0x25, 0xe7, 0x6a, 0xdd, 0x4d, 0x57, 0xcb, 0xef, 0x26, - 0xcd, 0xa7, 0x61, 0xf8, 0x0c, 0x0f, 0x06, 0xb0, 0xcf, 0x45, 0xc2, 0x28, 0xa9, 0xde, 0x81, 0xa1, - 0x91, 0x5f, 0x77, 0xf1, 0x93, 0x2d, 0x90, 0xf1, 0x13, 0x24, 0xa7, 0x1b, 0xed, 0x62, 0xf9, 0x49, - 0xd2, 0x78, 0x1a, 0x86, 0x5d, 0xae, 0xf9, 0xdb, 0x6c, 0x63, 0xa4, 0xe6, 0x73, 0xcd, 0xcd, 0xae, - 0xa6, 0x6b, 0xbe, 0x97, 0x2f, 0x91, 0xda, 0x5a, 0x20, 0x7b, 0x85, 0x48, 0xc7, 0x10, 0x53, 0x91, - 0x27, 0x84, 0xee, 0x07, 0xdc, 0x83, 0x63, 0x19, 0xf8, 0x90, 0x18, 0x93, 0x50, 0xae, 0xe6, 0xfd, - 0x4c, 0xae, 0xe6, 0x7d, 0xf6, 0x5e, 0x52, 0xd3, 0xc3, 0xd8, 0x5a, 0x33, 0x73, 0xfd, 0xe1, 0xfb, - 0x46, 0xa0, 0x24, 0xe6, 0x70, 0x18, 0x83, 0x6b, 0x76, 0x60, 0x08, 0x8c, 0x22, 0xd5, 0xaa, 0x2e, - 0x55, 0xaf, 0x36, 0xdd, 0x74, 0xb5, 0xfc, 0x91, 0x11, 0xbd, 0x9b, 0x89, 0x1c, 0xc4, 0x6c, 0x8b, - 0x34, 0xe3, 0x02, 0x53, 0x2d, 0x67, 0xa9, 0x7a, 0xb5, 0x71, 0xfd, 0x91, 0xff, 0xa6, 0xcd, 0x18, - 0xed, 0x8e, 0x6c, 0x5d, 0x7e, 0x8c, 0x4c, 0xae, 0xfa, 0x7e, 0x02, 0x4a, 0xb1, 0x19, 0x52, 0x11, - 0x71, 0xea, 0x4c, 0x45, 0xc4, 0x18, 0xa3, 0x58, 0x26, 0xda, 0xf8, 0x52, 0x75, 0xcd, 0xf7, 0xf2, - 0x8b, 0x0e, 0x99, 0xdc, 0x51, 0xfd, 0x35, 0xae, 0x80, 0xbd, 0x87, 0x4c, 0x85, 0xaa, 0x7f, 0xcb, - 0xf8, 0x6b, 0x4f, 0xfc, 0xd2, 0x7d, 0x2d, 0xd8, 0x51, 0x7d, 0xe3, 0xe7, 0x64, 0x68, 0x3f, 0x30, - 0xc0, 0xa1, 0xea, 0x6f, 0x75, 0x53, 0xc9, 0x76, 0xc1, 0x2e, 0x91, 0xba, 0x16, 0x21, 0x28, 0xcd, - 0xc3, 0xb8, 0x55, 0x5d, 0x72, 0xae, 0xd6, 0xdc, 0x02, 0x60, 0x17, 0xc8, 0x94, 0x92, 0x83, 0xc4, - 0x83, 0xad, 0x6e, 0xab, 0x66, 0xb6, 0xe5, 0xeb, 0xe5, 0xa7, 0x48, 0x7d, 0x47, 0xf5, 0x6f, 0x00, - 0xf7, 0x21, 0x61, 0x8f, 0x93, 0x5a, 0x8f, 0x2b, 0x6b, 0x51, 0xe3, 0xed, 0x2d, 0x42, 0x0f, 0x5c, - 0xc3, 0xb9, 0xfc, 0x51, 0xd2, 0xec, 0xee, 0x6c, 0xff, 0x0f, 0x12, 0xd0, 0x74, 0x75, 0xcc, 0x13, - 0x7f, 0x97, 0x87, 0x59, 0x22, 0x16, 0xc0, 0xf2, 0x6b, 0x0e, 0x69, 0xee, 0x27, 0xe2, 0x44, 0x04, - 0xd0, 0x87, 0xf5, 0x53, 0xcd, 0x3e, 0x40, 0x1a, 0xb2, 0x77, 0x1b, 0x3c, 0x5d, 0x8e, 0xdd, 0x95, - 0xfb, 0xea, 0xd9, 0x33, 0x7c, 0x26, 0x7c, 0x44, 0xe6, 0xdf, 0x6c, 0x8f, 0xd0, 0x54, 0x42, 0x9c, - 0x09, 0xfe, 0x8f, 0x29, 0x67, 0xc5, 0xe4, 0x46, 0xb8, 0xb3, 0x72, 0x14, 0x60, 0x6d, 0x32, 0x97, - 0x0a, 0x8c, 0x78, 0x08, 0xb7, 0x44, 0xe4, 0xc3, 0xa9, 0x39, 0x84, 0xf1, 0x8c, 0x17, 0x5d, 0xd9, - 0x42, 0x98, 0x3d, 0x4a, 0xd8, 0x3d, 0xbc, 0xca, 0x1c, 0xca, 0xb8, 0x4b, 0xcf, 0x30, 0xab, 0xf6, - 0x5f, 0xa7, 0x48, 0x3d, 0xbf, 0xf3, 0xac, 0x41, 0x26, 0x0f, 0x06, 0x9e, 0x07, 0x4a, 0xd1, 0x31, - 0x36, 0x4f, 0x66, 0x6f, 0x46, 0x70, 0x1a, 0x83, 0xa7, 0xc1, 0x37, 0x3c, 0xd4, 0x61, 0x73, 0x64, - 0xba, 0x23, 0xa3, 0x08, 0x3c, 0xbd, 0xc1, 0x45, 0x00, 0x3e, 0xad, 0xb0, 0x05, 0x42, 0xf7, 0x21, - 0x09, 0x85, 0x52, 0x42, 0x46, 0x5d, 0x88, 0x04, 0xf8, 0xb4, 0xca, 0xce, 0x93, 0xf9, 0x8e, 0x0c, - 0x02, 0xf0, 0xb4, 0x90, 0xd1, 0xae, 0xd4, 0xeb, 0xa7, 0x42, 0x69, 0x45, 0x6b, 0x28, 0x76, 0x2b, - 0x08, 0xa0, 0xcf, 0x83, 0xd5, 0xa4, 0x3f, 0x08, 0x21, 0xd2, 0x74, 0x1c, 0x65, 0xa4, 0x60, 0x57, - 0x84, 0x10, 0xa1, 0x24, 0x3a, 0x59, 0x42, 0x8d, 0xb5, 0x18, 0x5b, 0x3a, 0xc5, 0x1e, 0x20, 0xe7, - 0x52, 0xb4, 0xa4, 0x80, 0x87, 0x40, 0xeb, 0x6c, 0x96, 0x34, 0x52, 0xd2, 0xe1, 0xde, 0xfe, 0xd3, - 0x94, 0x94, 0x24, 0xb8, 0xf2, 0xae, 0x0b, 0x9e, 0x4c, 0x7c, 0xda, 0x28, 0x99, 0xf0, 0x0c, 0x78, - 0x5a, 0x26, 0x5b, 0x5d, 0xda, 0x44, 0x83, 0x53, 0xf0, 0x00, 0x78, 0xe2, 0x1d, 0xbb, 0xa0, 0x06, - 0x81, 0xa6, 0xd3, 0x8c, 0x92, 0xe6, 0x86, 0x08, 0x60, 0x57, 0xea, 0x0d, 0x39, 0x88, 0x7c, 0x3a, - 0xc3, 0x66, 0x08, 0xd9, 0x01, 0xcd, 0xd3, 0x08, 0xcc, 0xa2, 0xda, 0x0e, 0xf7, 0x8e, 0x21, 0x05, - 0x28, 0x5b, 0x24, 0xac, 0xc3, 0xa3, 0x48, 0xea, 0x4e, 0x02, 0x5c, 0xc3, 0x86, 0xb9, 0xcd, 0x74, - 0x0e, 0xcd, 0x19, 0xc1, 0x45, 0x00, 0x94, 0x15, 0xdc, 0x5d, 0x08, 0x20, 0xe7, 0x9e, 0x2f, 0xb8, - 0x53, 0x1c, 0xb9, 0x17, 0xd0, 0xf8, 0xb5, 0x81, 0x08, 0x7c, 0x13, 0x12, 0x7b, 0x2c, 0xe7, 0xd0, - 0xc6, 0xd4, 0xf8, 0xdd, 0xed, 0xad, 0x83, 0x43, 0xba, 0xc8, 0xce, 0x91, 0xb9, 0x14, 0xd9, 0x01, - 0x9d, 0x08, 0xcf, 0x04, 0xef, 0x3c, 0x9a, 0xba, 0x37, 0xd0, 0x7b, 0x47, 0x3b, 0x10, 0xca, 0x64, - 0x48, 0x5b, 0x78, 0xa0, 0x46, 0x52, 0x76, 0x44, 0xf4, 0x01, 0xd4, 0xb0, 0x1e, 0xc6, 0x7a, 0x58, - 0x84, 0x97, 0x5e, 0x60, 0x17, 0xc9, 0xf9, 0x9b, 0xb1, 0xcf, 0x35, 0x6c, 0x85, 0x58, 0x6a, 0x0e, - 0xb9, 0xba, 0x83, 0xee, 0x0e, 0x12, 0xa0, 0x17, 0xd9, 0x05, 0xb2, 0x38, 0x7a, 0x16, 0x79, 0xb0, - 0x2e, 0xe1, 0x46, 0xeb, 0x6d, 0x27, 0x01, 0x1f, 0x22, 0x2d, 0x78, 0x90, 0x6d, 0xbc, 0x5c, 0x48, - 0xbd, 0x97, 0xf8, 0x20, 0x12, 0xad, 0xe7, 0xf7, 0x12, 0xaf, 0xb0, 0x16, 0x59, 0xd8, 0x04, 0x7d, - 0x2f, 0x65, 0x09, 0x29, 0xdb, 0x42, 0x19, 0xd2, 0x4d, 0x05, 0x89, 0xca, 0x28, 0x0f, 0x31, 0x46, - 0x66, 0x36, 0x41, 0x23, 0x98, 0x61, 0xcb, 0x18, 0x27, 0x6b, 0x9e, 0x2b, 0x03, 0xc8, 0xe0, 0xff, - 0xc3, 0x18, 0x74, 0x13, 0x19, 0x97, 0xc1, 0x87, 0xd1, 0xcd, 0xbd, 0x18, 0x12, 0xae, 0x01, 0x65, - 0x94, 0x69, 0x8f, 0xa0, 0x9c, 0x03, 0xc0, 0x08, 0x94, 0xe1, 0xff, 0x2f, 0xe0, 0xb2, 0xd6, 0x77, - 0x60, 0x0e, 0xa7, 0xdc, 0x60, 0xeb, 0x64, 0x46, 0xba, 0x8a, 0x5e, 0xa7, 0x4a, 0xf2, 0xfb, 0x9f, - 0x11, 0xdf, 0x89, 0xa9, 0x62, 0xf7, 0x6d, 0x26, 0x3c, 0xd2, 0x19, 0xde, 0x66, 0x0f, 0x91, 0xcb, - 0x2e, 0x1c, 0x25, 0xa0, 0x8e, 0xf7, 0x65, 0x20, 0xbc, 0xe1, 0x56, 0x74, 0x24, 0xf3, 0x94, 0x44, - 0x96, 0x77, 0xa1, 0x25, 0x18, 0x16, 0x4b, 0xcf, 0xe0, 0x47, 0x31, 0x26, 0xbb, 0x52, 0x1f, 0x60, - 0x39, 0xdc, 0x36, 0x05, 0x96, 0x3e, 0x86, 0x5a, 0x76, 0xa5, 0x0b, 0x71, 0x20, 0x3c, 0xbe, 0x7a, - 0xc2, 0x45, 0xc0, 0x7b, 0x01, 0xd0, 0x15, 0x0c, 0xca, 0x01, 0xf4, 0xf1, 0xca, 0xe6, 0xe7, 0x7b, - 0x8d, 0x4d, 0x93, 0xfa, 0x86, 0x4c, 0x3c, 0xe8, 0x42, 0x34, 0xa4, 0x8f, 0xe3, 0xd2, 0xe5, 0x1a, - 0xb6, 0x45, 0x28, 0x34, 0x7d, 0x82, 0x31, 0x32, 0xdd, 0xed, 0xba, 0xf0, 0xb1, 0x01, 0x28, 0xed, - 0x72, 0x0f, 0xe8, 0x9f, 0x27, 0xdb, 0x1e, 0x21, 0x26, 0xe5, 0x70, 0x38, 0x01, 0x34, 0xa0, 0x58, - 0xed, 0xca, 0x08, 0xe8, 0x18, 0x6b, 0x92, 0xa9, 0x9b, 0x91, 0x50, 0x6a, 0x00, 0x3e, 0x75, 0xf0, - 0xba, 0x6d, 0x45, 0xfb, 0x89, 0xec, 0x63, 0x1f, 0xa4, 0x15, 0xa4, 0x6e, 0x88, 0x48, 0xa8, 0x63, - 0x53, 0x68, 0x08, 0x99, 0x48, 0xef, 0x5d, 0x8d, 0xd5, 0xc9, 0xb8, 0x0b, 0x3a, 0x19, 0xd2, 0xf1, - 0xf6, 0xf3, 0x0e, 0x69, 0xa6, 0xc6, 0x5a, 0x3d, 0x0b, 0x84, 0x96, 0xd7, 0x85, 0xa6, 0x3c, 0xf3, - 0x1d, 0xac, 0x7f, 0x9b, 0x89, 0xbc, 0x2b, 0xa2, 0x3e, 0xad, 0xa0, 0xe0, 0x03, 0xe0, 0x81, 0x51, - 0xd2, 0x20, 0x93, 0x1b, 0xc1, 0xc0, 0x68, 0xac, 0x19, 0xfd, 0xb8, 0x40, 0xb6, 0x71, 0x24, 0x61, - 0xa6, 0xc4, 0xe0, 0xd3, 0x09, 0xf4, 0xde, 0xde, 0x0f, 0xa4, 0x4d, 0xb6, 0xdf, 0x4f, 0x66, 0xcf, - 0x8c, 0x13, 0x6c, 0x8a, 0xd4, 0x52, 0xd5, 0x94, 0x34, 0xd7, 0x44, 0xc4, 0x93, 0xa1, 0x2d, 0x42, - 0xd4, 0xc7, 0xcb, 0xb9, 0x11, 0x48, 0xae, 0x53, 0x00, 0xda, 0xaf, 0x34, 0x4d, 0x3f, 0x37, 0x1b, - 0xa7, 0x49, 0xfd, 0x66, 0xe4, 0xc3, 0x91, 0x88, 0xc0, 0xa7, 0x63, 0xa6, 0x38, 0xd8, 0x6b, 0x55, - 0xdc, 0x52, 0x1f, 0x83, 0x89, 0xc6, 0x94, 0x30, 0xc0, 0x1b, 0x7e, 0x83, 0xab, 0x12, 0x74, 0x84, - 0x07, 0xdc, 0x35, 0xd3, 0x62, 0xaf, 0xbc, 0xbd, 0x6f, 0x0e, 0xf8, 0x58, 0xde, 0x2d, 0x30, 0x45, - 0x8f, 0x51, 0xd3, 0x26, 0xe8, 0x83, 0xa1, 0xd2, 0x10, 0x76, 0x64, 0x74, 0x24, 0xfa, 0x8a, 0x0a, - 0xd4, 0xb4, 0x2d, 0xb9, 0x5f, 0xda, 0x7e, 0x1b, 0x53, 0xcc, 0x85, 0x00, 0xb8, 0x2a, 0x4b, 0xbd, - 0x63, 0xca, 0xa3, 0x31, 0x75, 0x35, 0x10, 0x5c, 0xd1, 0x00, 0x5d, 0x41, 0x2b, 0xed, 0x32, 0xc4, - 0xf3, 0x5d, 0x0d, 0x34, 0x24, 0x76, 0x1d, 0xb1, 0x05, 0x32, 0x6b, 0xf9, 0xf7, 0x79, 0xa2, 0x85, - 0x11, 0xf2, 0x92, 0x63, 0x32, 0x29, 0x91, 0x71, 0x81, 0xbd, 0x8c, 0xdd, 0xa8, 0x79, 0x83, 0xab, - 0x02, 0xfa, 0xa9, 0xc3, 0x16, 0xc9, 0x5c, 0xe6, 0x5a, 0x81, 0xff, 0xcc, 0x61, 0xf3, 0x64, 0x06, - 0x5d, 0xcb, 0x31, 0x45, 0x7f, 0x6e, 0x40, 0x74, 0xa2, 0x04, 0xfe, 0xc2, 0x48, 0x48, 0xbd, 0x28, - 0xe1, 0xbf, 0x34, 0xca, 0x50, 0x42, 0x9a, 0x44, 0x8a, 0xbe, 0xea, 0xa0, 0xa5, 0x99, 0xb2, 0x14, - 0xa6, 0xaf, 0x19, 0x46, 0x94, 0x9a, 0x33, 0xbe, 0x6e, 0x18, 0x53, 0x99, 0x39, 0xfa, 0x86, 0x41, - 0x6f, 0xf0, 0xc8, 0x97, 0x47, 0x47, 0x39, 0xfa, 0xa6, 0xc3, 0x5a, 0x64, 0x1e, 0xb7, 0xaf, 0xf1, - 0x80, 0x47, 0x5e, 0xc1, 0xff, 0x96, 0xc3, 0xce, 0x11, 0x7a, 0x46, 0x9d, 0xa2, 0xcf, 0x55, 0x18, - 0xcd, 0xe2, 0x6b, 0xee, 0x11, 0xfd, 0x42, 0xc5, 0xc4, 0x2a, 0x65, 0xb4, 0xd8, 0x17, 0x2b, 0x6c, - 0xc6, 0x06, 0xdd, 0xae, 0xbf, 0x54, 0x61, 0x0d, 0x32, 0xb1, 0x15, 0x29, 0x48, 0x34, 0xfd, 0x0c, - 0xe6, 0xf7, 0x84, 0x2d, 0xb5, 0xf4, 0xb3, 0x78, 0xa3, 0xc6, 0x4d, 0x7e, 0xd3, 0x17, 0xb1, 0x8d, - 0x33, 0x17, 0x14, 0x44, 0x7e, 0xe9, 0xee, 0x28, 0xfa, 0x39, 0xb3, 0xc3, 0xf6, 0x49, 0xfa, 0xb7, - 0xaa, 0x09, 0x4d, 0xb9, 0x69, 0xfe, 0xbd, 0x8a, 0x26, 0x6c, 0x82, 0x2e, 0x6e, 0x36, 0xfd, 0x47, - 0x95, 0x5d, 0x20, 0xe7, 0x32, 0xcc, 0xb4, 0xb0, 0xfc, 0x4e, 0xff, 0xb3, 0xca, 0x2e, 0x91, 0xf3, - 0x58, 0xcf, 0xf3, 0xbc, 0xc1, 0x4d, 0x42, 0x69, 0xe1, 0x29, 0xfa, 0x4a, 0x95, 0x5d, 0x24, 0x8b, - 0x9b, 0xa0, 0xf3, 0xf3, 0x28, 0x11, 0xff, 0x55, 0x65, 0xd3, 0x64, 0x0a, 0x6f, 0xbd, 0x80, 0x13, - 0xa0, 0xaf, 0x56, 0xf1, 0x50, 0xb3, 0x65, 0x6a, 0xce, 0x6b, 0x55, 0x0c, 0xf5, 0xb3, 0x5c, 0x7b, - 0xc7, 0xdd, 0xb0, 0x73, 0xcc, 0xa3, 0x08, 0x02, 0x45, 0x5f, 0xaf, 0x62, 0x40, 0x5d, 0x08, 0xe5, - 0x09, 0x94, 0xe0, 0x37, 0x8c, 0xd3, 0x86, 0xf9, 0x83, 0x03, 0x48, 0x86, 0x39, 0xe1, 0xcd, 0x2a, - 0x1e, 0x8d, 0xe5, 0x1f, 0xa5, 0xbc, 0x55, 0x65, 0x97, 0x49, 0xcb, 0x16, 0x8b, 0xec, 0x60, 0x90, - 0xd8, 0x07, 0xac, 0xc3, 0xf4, 0xb9, 0x5a, 0x2e, 0xb1, 0x0b, 0x81, 0xe6, 0xf9, 0xbe, 0x4f, 0xd4, - 0xd0, 0x2e, 0xbc, 0x5c, 0x45, 0xf9, 0x55, 0xf4, 0xf9, 0x1a, 0x9e, 0xe8, 0x26, 0xe8, 0xb4, 0x02, - 0x2b, 0xfa, 0x49, 0x9c, 0x9a, 0x66, 0x6e, 0x46, 0x6a, 0xd0, 0xcb, 0x0d, 0xa5, 0x9f, 0xca, 0x36, - 0x77, 0x85, 0xd2, 0x89, 0xe8, 0x0d, 0x4c, 0xa6, 0x7f, 0xba, 0x86, 0x4e, 0x1d, 0x0c, 0x23, 0x6f, - 0x04, 0x7e, 0xc1, 0xc8, 0x4c, 0x6d, 0x33, 0x46, 0xfd, 0xaa, 0xc6, 0x66, 0x09, 0xb1, 0xb7, 0xda, - 0x00, 0xbf, 0xce, 0xe4, 0xe1, 0x98, 0x74, 0x02, 0x89, 0xe9, 0x21, 0xf4, 0x37, 0xb9, 0x89, 0xa5, - 0xda, 0x49, 0x7f, 0x5b, 0xc3, 0xa0, 0x1f, 0x8a, 0x10, 0x0e, 0x85, 0x77, 0x87, 0x7e, 0xa5, 0x8e, - 0xf6, 0x99, 0x98, 0xec, 0x4a, 0x1f, 0x6c, 0x8e, 0x7c, 0xb5, 0x8e, 0x29, 0x87, 0x99, 0x6c, 0x53, - 0xee, 0x6b, 0x66, 0x9d, 0xb6, 0x82, 0xad, 0x2e, 0xfd, 0x3a, 0x8e, 0x6b, 0x24, 0x5d, 0x1f, 0x1e, - 0xec, 0xd1, 0x6f, 0xd4, 0x51, 0xd5, 0x6a, 0x10, 0x48, 0x8f, 0xeb, 0xfc, 0x3e, 0x7d, 0xb3, 0x8e, - 0x17, 0xb2, 0xa4, 0x3d, 0x3d, 0xf7, 0x6f, 0xd5, 0x8d, 0xa3, 0x16, 0x37, 0xe9, 0xda, 0xc5, 0xb2, - 0xfa, 0x6d, 0x23, 0x15, 0x9f, 0x96, 0x68, 0xc9, 0xa1, 0xa6, 0xdf, 0x31, 0x7c, 0x67, 0x27, 0x10, - 0xfa, 0xbb, 0x46, 0x9a, 0xa1, 0x25, 0xec, 0xf7, 0x0d, 0x7b, 0xc3, 0x46, 0x47, 0x0e, 0xfa, 0x07, - 0x03, 0x9f, 0x1d, 0x53, 0xe8, 0x1f, 0x1b, 0x68, 0x58, 0x79, 0xd2, 0xc0, 0x79, 0x5b, 0xd1, 0x3f, - 0x35, 0xd0, 0x82, 0x62, 0xa6, 0xa0, 0xdf, 0x6d, 0x62, 0xb0, 0xb2, 0x69, 0x82, 0x7e, 0xaf, 0x89, - 0x6e, 0x9e, 0x99, 0x23, 0xe8, 0xf7, 0x9b, 0xe6, 0x38, 0xf2, 0x09, 0x82, 0xfe, 0xa0, 0x04, 0x20, - 0x17, 0xfd, 0x61, 0xd3, 0xd4, 0xb0, 0x91, 0xa9, 0x81, 0xfe, 0xa8, 0x89, 0xb6, 0x9d, 0x9d, 0x17, - 0xe8, 0x8f, 0x9b, 0xf6, 0xb8, 0xf3, 0x49, 0x81, 0xfe, 0xa4, 0x89, 0x77, 0xe8, 0xfe, 0x33, 0x02, - 0x7d, 0xc9, 0xe8, 0x2a, 0xa6, 0x03, 0xfa, 0x72, 0xb3, 0xbd, 0x4c, 0x26, 0xbb, 0x2a, 0x30, 0x9d, - 0x67, 0x92, 0x54, 0xbb, 0x2a, 0xa0, 0x63, 0x58, 0xa8, 0xd7, 0xa4, 0x0c, 0xd6, 0x4f, 0xe3, 0xe4, - 0x99, 0x27, 0xa8, 0xd3, 0x5e, 0x23, 0xb3, 0x1d, 0x19, 0xc6, 0x3c, 0xbf, 0xb0, 0xa6, 0xd9, 0xd8, - 0x2e, 0x05, 0xbe, 0x4d, 0x95, 0x31, 0xac, 0xf6, 0xeb, 0xa7, 0xe0, 0x0d, 0x4c, 0x4f, 0x74, 0x70, - 0x89, 0x9b, 0x30, 0xc8, 0x3e, 0xad, 0xb4, 0x3f, 0x44, 0x68, 0x47, 0x46, 0x4a, 0x28, 0x0d, 0x91, - 0x37, 0xdc, 0x86, 0x13, 0x08, 0x4c, 0xe7, 0xd5, 0x89, 0x8c, 0xfa, 0x74, 0xcc, 0x3c, 0x49, 0xc0, - 0x3c, 0x2d, 0x6c, 0x7f, 0x5e, 0xc3, 0xb1, 0xc3, 0xbc, 0x3b, 0x66, 0x08, 0x59, 0x3f, 0x81, 0x48, - 0x0f, 0x78, 0x10, 0x0c, 0x69, 0x15, 0xd7, 0x9d, 0x81, 0xd2, 0x32, 0x14, 0x1f, 0xc7, 0x36, 0xdd, - 0xfe, 0xb2, 0x43, 0x1a, 0xb6, 0x19, 0xe7, 0xa6, 0xd9, 0xe5, 0x3e, 0x44, 0xbe, 0x30, 0xc2, 0x71, - 0x6c, 0x36, 0x50, 0x3a, 0x41, 0x38, 0x05, 0xd3, 0x81, 0xe6, 0x89, 0xce, 0xde, 0x37, 0x16, 0xea, - 0xca, 0xbb, 0x51, 0x20, 0xb9, 0x6f, 0x26, 0x82, 0x7c, 0xeb, 0x3e, 0x4f, 0x94, 0x19, 0x0b, 0xf0, - 0x55, 0x91, 0xca, 0x4f, 0x8c, 0x3f, 0x3e, 0x1d, 0x2f, 0xc0, 0xc2, 0xe7, 0x09, 0x6c, 0xbf, 0x16, - 0x34, 0xc9, 0x9e, 0x65, 0x3a, 0x69, 0x5f, 0x27, 0xa4, 0x78, 0x51, 0x1a, 0x7f, 0x8a, 0x36, 0x3a, - 0x86, 0x51, 0xd9, 0x0c, 0x64, 0x8f, 0x07, 0xd4, 0xc1, 0x29, 0xc2, 0x24, 0x45, 0xa5, 0xfd, 0xc2, - 0x38, 0x99, 0x3d, 0xf3, 0x7e, 0x44, 0xdb, 0xf2, 0xc5, 0x6a, 0x80, 0x27, 0x77, 0x99, 0x3c, 0x90, - 0x23, 0xf7, 0x8c, 0x0d, 0x0e, 0xce, 0x9c, 0x39, 0xf9, 0xcc, 0xfc, 0x50, 0x61, 0x57, 0xc8, 0xc5, - 0x82, 0x78, 0xef, 0xd4, 0x80, 0xa5, 0xbb, 0x95, 0x33, 0x9c, 0x1d, 0x1f, 0x6a, 0x18, 0xd1, 0x9c, - 0x8a, 0xd5, 0xc0, 0xbe, 0xf6, 0x8a, 0xc7, 0xae, 0x6d, 0x8b, 0x74, 0x02, 0x1f, 0x60, 0x85, 0x8d, - 0x79, 0x5a, 0xd1, 0x49, 0x8c, 0x61, 0x4e, 0x48, 0x5b, 0xd6, 0xd4, 0x08, 0x98, 0xb6, 0xae, 0x3a, - 0x0e, 0xe8, 0x39, 0x88, 0x35, 0xab, 0x28, 0x17, 0x04, 0x9f, 0x05, 0x67, 0x42, 0x60, 0xeb, 0x52, - 0x63, 0x84, 0x62, 0xb0, 0x2e, 0x68, 0x2e, 0x02, 0xda, 0xc4, 0x83, 0x1a, 0x89, 0x8b, 0xdd, 0x31, - 0x3d, 0xa2, 0x3c, 0xed, 0x82, 0x33, 0x38, 0x11, 0x15, 0x13, 0xbb, 0xe9, 0x9f, 0xb3, 0x23, 0x98, - 0xa9, 0x8f, 0x94, 0x8e, 0xa8, 0x2b, 0x35, 0x7a, 0x3a, 0x37, 0xea, 0xa8, 0x49, 0x10, 0xca, 0x46, - 0xa2, 0x6b, 0xed, 0xde, 0xbb, 0x1b, 0x41, 0xa2, 0x8e, 0x45, 0x4c, 0xe7, 0x47, 0x82, 0x66, 0x4b, - 0x94, 0xc9, 0x8b, 0x85, 0x91, 0x50, 0xa0, 0xe9, 0xc5, 0xa6, 0x73, 0xa3, 0x07, 0x66, 0x8a, 0x44, - 0x41, 0x5d, 0x1c, 0xa1, 0xee, 0xf0, 0x88, 0xf7, 0x4b, 0x0a, 0xcf, 0x8f, 0x28, 0x2c, 0x55, 0xa7, - 0xd6, 0xfb, 0x24, 0x99, 0xcb, 0xff, 0x76, 0xdc, 0x82, 0x53, 0x7d, 0x4b, 0xf6, 0x6e, 0xb3, 0x2b, - 0x2b, 0xf6, 0x2f, 0xe5, 0x4a, 0xf6, 0x97, 0x72, 0x65, 0x07, 0x94, 0x42, 0x91, 0xb1, 0xc9, 0x8f, - 0xd6, 0x5f, 0x26, 0xcd, 0x6f, 0x9c, 0x87, 0xee, 0xff, 0x73, 0xac, 0xf4, 0x5b, 0xc6, 0x9d, 0x8d, - 0x4b, 0xab, 0xbd, 0xde, 0xed, 0xb5, 0x67, 0xc9, 0x8c, 0x90, 0xd9, 0xbe, 0x7e, 0x12, 0x7b, 0x6b, - 0x8d, 0x8e, 0xd9, 0xb7, 0x8f, 0x32, 0xf6, 0x9d, 0x0f, 0x3f, 0xd9, 0x17, 0xfa, 0x78, 0xd0, 0x43, - 0x69, 0xd7, 0x2c, 0xdb, 0x63, 0x42, 0xa6, 0x5f, 0xd7, 0x44, 0xa4, 0xb1, 0x62, 0x07, 0xf6, 0xff, - 0xe9, 0x35, 0xab, 0x31, 0xee, 0x7d, 0xde, 0x71, 0x7a, 0x13, 0x06, 0x7a, 0xf2, 0xdf, 0x01, 0x00, - 0x00, 0xff, 0xff, 0x8e, 0xbe, 0x21, 0x8f, 0x85, 0x15, 0x00, 0x00, + 0x11, 0xde, 0x9e, 0x19, 0x1d, 0x53, 0x33, 0x92, 0x4a, 0x25, 0xad, 0x76, 0xbc, 0x87, 0x57, 0x16, + 0x36, 0x88, 0xc1, 0xd6, 0xda, 0xeb, 0x08, 0x20, 0x88, 0x30, 0x81, 0x34, 0x23, 0x69, 0x15, 0xd6, + 0x45, 0x4b, 0x6b, 0x08, 0x22, 0x60, 0xa3, 0xa6, 0x3b, 0x35, 0xaa, 0xdd, 0xee, 0xae, 0xa6, 0xab, + 0x46, 0xab, 0xe1, 0xc9, 0x18, 0xf0, 0x33, 0x98, 0x3f, 0xc0, 0x0f, 0xe0, 0xbe, 0x1f, 0xb9, 0xb1, + 0xb9, 0x9e, 0xb9, 0xe1, 0x11, 0x1e, 0x89, 0xe0, 0x30, 0x3e, 0x89, 0xac, 0xea, 0x6b, 0xb4, 0x6b, + 0x78, 0xe0, 0xad, 0xeb, 0xcb, 0xac, 0xbc, 0x2a, 0x2b, 0x33, 0xab, 0x49, 0xd3, 0x93, 0x61, 0x28, + 0xa3, 0x95, 0x38, 0x91, 0x5a, 0xb2, 0xb9, 0x50, 0x04, 0x27, 0x03, 0x65, 0x57, 0x2b, 0x96, 0x74, + 0x71, 0xb1, 0x2f, 0x65, 0x3f, 0x80, 0x6b, 0x06, 0xec, 0x0d, 0x8e, 0xae, 0xf9, 0xa0, 0xbc, 0x44, + 0xc4, 0x5a, 0x26, 0x96, 0x71, 0xe9, 0x16, 0x19, 0x3f, 0xd0, 0x5c, 0x0f, 0x14, 0x7b, 0x8a, 0x10, + 0x48, 0x12, 0x99, 0xdc, 0xf2, 0xa4, 0x0f, 0x2d, 0x67, 0xd1, 0x59, 0x9e, 0xbe, 0xfe, 0xe0, 0xca, + 0x7d, 0xa4, 0xae, 0xac, 0x23, 0x5b, 0x47, 0xfa, 0xe0, 0xd6, 0x21, 0xfb, 0x64, 0x0b, 0x64, 0x3c, + 0x01, 0xae, 0x64, 0xd4, 0xaa, 0x2c, 0x3a, 0xcb, 0x75, 0x37, 0x5d, 0x2d, 0xbd, 0x9b, 0x34, 0x9f, + 0x86, 0xe1, 0x33, 0x3c, 0x18, 0xc0, 0x3e, 0x17, 0x09, 0xa3, 0xa4, 0x7a, 0x07, 0x86, 0x46, 0x7e, + 0xdd, 0xc5, 0x4f, 0x36, 0x4f, 0xc6, 0x4e, 0x90, 0x9c, 0x6e, 0xb4, 0x8b, 0xa5, 0x27, 0x49, 0xe3, + 0x69, 0x18, 0x76, 0xb9, 0xe6, 0x6f, 0xb1, 0x8d, 0x91, 0x9a, 0xcf, 0x35, 0x37, 0xbb, 0x9a, 0xae, + 0xf9, 0x5e, 0xba, 0x4c, 0x6a, 0x6b, 0x81, 0xec, 0x15, 0x22, 0x1d, 0x43, 0x4c, 0x45, 0x9e, 0x10, + 0xba, 0x1f, 0x70, 0x0f, 0x8e, 0x65, 0xe0, 0x43, 0x62, 0x4c, 0x42, 0xb9, 0x9a, 0xf7, 0x33, 0xb9, + 0x9a, 0xf7, 0xd9, 0x7b, 0x49, 0x4d, 0x0f, 0x63, 0x6b, 0xcd, 0xf4, 0xf5, 0x87, 0xef, 0x1b, 0x81, + 0x92, 0x98, 0xc3, 0x61, 0x0c, 0xae, 0xd9, 0x81, 0x21, 0x30, 0x8a, 0x54, 0xab, 0xba, 0x58, 0x5d, + 0x6e, 0xba, 0xe9, 0x6a, 0xe9, 0xa3, 0x23, 0x7a, 0x37, 0x13, 0x39, 0x88, 0xd9, 0x16, 0x69, 0xc6, + 0x05, 0xa6, 0x5a, 0xce, 0x62, 0x75, 0xb9, 0x71, 0xfd, 0x91, 0xff, 0xa5, 0xcd, 0x18, 0xed, 0x8e, + 0x6c, 0x5d, 0x7a, 0x8c, 0x4c, 0xac, 0xfa, 0x7e, 0x02, 0x4a, 0xb1, 0x69, 0x52, 0x11, 0x71, 0xea, + 0x4c, 0x45, 0xc4, 0x18, 0xa3, 0x58, 0x26, 0xda, 0xf8, 0x52, 0x75, 0xcd, 0xf7, 0xd2, 0x0b, 0x0e, + 0x99, 0xd8, 0x51, 0xfd, 0x35, 0xae, 0x80, 0xbd, 0x87, 0x4c, 0x86, 0xaa, 0x7f, 0xcb, 0xf8, 0x6b, + 0x4f, 0xfc, 0xf2, 0x7d, 0x2d, 0xd8, 0x51, 0x7d, 0xe3, 0xe7, 0x44, 0x68, 0x3f, 0x30, 0xc0, 0xa1, + 0xea, 0x6f, 0x75, 0x53, 0xc9, 0x76, 0xc1, 0x2e, 0x93, 0xba, 0x16, 0x21, 0x28, 0xcd, 0xc3, 0xb8, + 0x55, 0x5d, 0x74, 0x96, 0x6b, 0x6e, 0x01, 0xb0, 0x8b, 0x64, 0x52, 0xc9, 0x41, 0xe2, 0xc1, 0x56, + 0xb7, 0x55, 0x33, 0xdb, 0xf2, 0xf5, 0xd2, 0x53, 0xa4, 0xbe, 0xa3, 0xfa, 0x37, 0x80, 0xfb, 0x90, + 0xb0, 0xc7, 0x49, 0xad, 0xc7, 0x95, 0xb5, 0xa8, 0xf1, 0xd6, 0x16, 0xa1, 0x07, 0xae, 0xe1, 0x5c, + 0xfa, 0x18, 0x69, 0x76, 0x77, 0xb6, 0xff, 0x0f, 0x09, 0x68, 0xba, 0x3a, 0xe6, 0x89, 0xbf, 0xcb, + 0xc3, 0x2c, 0x11, 0x0b, 0x60, 0xe9, 0x55, 0x87, 0x34, 0xf7, 0x13, 0x71, 0x22, 0x02, 0xe8, 0xc3, + 0xfa, 0xa9, 0x66, 0x1f, 0x20, 0x0d, 0xd9, 0xbb, 0x0d, 0x9e, 0x2e, 0xc7, 0xee, 0xea, 0x7d, 0xf5, + 0xec, 0x19, 0x3e, 0x13, 0x3e, 0x22, 0xf3, 0x6f, 0xb6, 0x47, 0x68, 0x2a, 0x21, 0xce, 0x04, 0xff, + 0xd7, 0x94, 0xb3, 0x62, 0x72, 0x23, 0xdc, 0x19, 0x39, 0x0a, 0xb0, 0x36, 0x99, 0x4d, 0x05, 0x46, + 0x3c, 0x84, 0x5b, 0x22, 0xf2, 0xe1, 0xd4, 0x1c, 0xc2, 0x58, 0xc6, 0x8b, 0xae, 0x6c, 0x21, 0xcc, + 0x1e, 0x25, 0xec, 0x1e, 0x5e, 0x65, 0x0e, 0x65, 0xcc, 0xa5, 0x67, 0x98, 0x55, 0xfb, 0x6f, 0x93, + 0xa4, 0x9e, 0xdf, 0x79, 0xd6, 0x20, 0x13, 0x07, 0x03, 0xcf, 0x03, 0xa5, 0xe8, 0x39, 0x36, 0x47, + 0x66, 0x6e, 0x46, 0x70, 0x1a, 0x83, 0xa7, 0xc1, 0x37, 0x3c, 0xd4, 0x61, 0xb3, 0x64, 0xaa, 0x23, + 0xa3, 0x08, 0x3c, 0xbd, 0xc1, 0x45, 0x00, 0x3e, 0xad, 0xb0, 0x79, 0x42, 0xf7, 0x21, 0x09, 0x85, + 0x52, 0x42, 0x46, 0x5d, 0x88, 0x04, 0xf8, 0xb4, 0xca, 0x2e, 0x90, 0xb9, 0x8e, 0x0c, 0x02, 0xf0, + 0xb4, 0x90, 0xd1, 0xae, 0xd4, 0xeb, 0xa7, 0x42, 0x69, 0x45, 0x6b, 0x28, 0x76, 0x2b, 0x08, 0xa0, + 0xcf, 0x83, 0xd5, 0xa4, 0x3f, 0x08, 0x21, 0xd2, 0x74, 0x0c, 0x65, 0xa4, 0x60, 0x57, 0x84, 0x10, + 0xa1, 0x24, 0x3a, 0x51, 0x42, 0x8d, 0xb5, 0x18, 0x5b, 0x3a, 0xc9, 0x1e, 0x20, 0xe7, 0x53, 0xb4, + 0xa4, 0x80, 0x87, 0x40, 0xeb, 0x6c, 0x86, 0x34, 0x52, 0xd2, 0xe1, 0xde, 0xfe, 0xd3, 0x94, 0x94, + 0x24, 0xb8, 0xf2, 0xae, 0x0b, 0x9e, 0x4c, 0x7c, 0xda, 0x28, 0x99, 0xf0, 0x0c, 0x78, 0x5a, 0x26, + 0x5b, 0x5d, 0xda, 0x44, 0x83, 0x53, 0xf0, 0x00, 0x78, 0xe2, 0x1d, 0xbb, 0xa0, 0x06, 0x81, 0xa6, + 0x53, 0x8c, 0x92, 0xe6, 0x86, 0x08, 0x60, 0x57, 0xea, 0x0d, 0x39, 0x88, 0x7c, 0x3a, 0xcd, 0xa6, + 0x09, 0xd9, 0x01, 0xcd, 0xd3, 0x08, 0xcc, 0xa0, 0xda, 0x0e, 0xf7, 0x8e, 0x21, 0x05, 0x28, 0x5b, + 0x20, 0xac, 0xc3, 0xa3, 0x48, 0xea, 0x4e, 0x02, 0x5c, 0xc3, 0x86, 0xb9, 0xcd, 0x74, 0x16, 0xcd, + 0x19, 0xc1, 0x45, 0x00, 0x94, 0x15, 0xdc, 0x5d, 0x08, 0x20, 0xe7, 0x9e, 0x2b, 0xb8, 0x53, 0x1c, + 0xb9, 0xe7, 0xd1, 0xf8, 0xb5, 0x81, 0x08, 0x7c, 0x13, 0x12, 0x7b, 0x2c, 0xe7, 0xd1, 0xc6, 0xd4, + 0xf8, 0xdd, 0xed, 0xad, 0x83, 0x43, 0xba, 0xc0, 0xce, 0x93, 0xd9, 0x14, 0xd9, 0x01, 0x9d, 0x08, + 0xcf, 0x04, 0xef, 0x02, 0x9a, 0xba, 0x37, 0xd0, 0x7b, 0x47, 0x3b, 0x10, 0xca, 0x64, 0x48, 0x5b, + 0x78, 0xa0, 0x46, 0x52, 0x76, 0x44, 0xf4, 0x01, 0xd4, 0xb0, 0x1e, 0xc6, 0x7a, 0x58, 0x84, 0x97, + 0x5e, 0x64, 0x97, 0xc8, 0x85, 0x9b, 0xb1, 0xcf, 0x35, 0x6c, 0x85, 0x58, 0x6a, 0x0e, 0xb9, 0xba, + 0x83, 0xee, 0x0e, 0x12, 0xa0, 0x97, 0xd8, 0x45, 0xb2, 0x30, 0x7a, 0x16, 0x79, 0xb0, 0x2e, 0xe3, + 0x46, 0xeb, 0x6d, 0x27, 0x01, 0x1f, 0x22, 0x2d, 0x78, 0x90, 0x6d, 0xbc, 0x52, 0x48, 0xbd, 0x97, + 0xf8, 0x20, 0x12, 0xad, 0xe7, 0xf7, 0x12, 0xaf, 0xb2, 0x16, 0x99, 0xdf, 0x04, 0x7d, 0x2f, 0x65, + 0x11, 0x29, 0xdb, 0x42, 0x19, 0xd2, 0x4d, 0x05, 0x89, 0xca, 0x28, 0x0f, 0x31, 0x46, 0xa6, 0x37, + 0x41, 0x23, 0x98, 0x61, 0x4b, 0x18, 0x27, 0x6b, 0x9e, 0x2b, 0x03, 0xc8, 0xe0, 0xb7, 0x61, 0x0c, + 0xba, 0x89, 0x8c, 0xcb, 0xe0, 0xc3, 0xe8, 0xe6, 0x5e, 0x0c, 0x09, 0xd7, 0x80, 0x32, 0xca, 0xb4, + 0x47, 0x50, 0xce, 0x01, 0x60, 0x04, 0xca, 0xf0, 0xdb, 0x0b, 0xb8, 0xac, 0xf5, 0x1d, 0x98, 0xc3, + 0x29, 0x37, 0xd8, 0x3a, 0x99, 0x91, 0x96, 0xd1, 0xeb, 0x54, 0x49, 0x7e, 0xff, 0x33, 0xe2, 0x3b, + 0x31, 0x55, 0xec, 0xbe, 0xcd, 0x84, 0x47, 0x3a, 0xc3, 0xdb, 0xec, 0x21, 0x72, 0xc5, 0x85, 0xa3, + 0x04, 0xd4, 0xf1, 0xbe, 0x0c, 0x84, 0x37, 0xdc, 0x8a, 0x8e, 0x64, 0x9e, 0x92, 0xc8, 0xf2, 0x2e, + 0xb4, 0x04, 0xc3, 0x62, 0xe9, 0x19, 0xfc, 0x28, 0xc6, 0x64, 0x57, 0xea, 0x03, 0x2c, 0x87, 0xdb, + 0xa6, 0xc0, 0xd2, 0xc7, 0x50, 0xcb, 0xae, 0x74, 0x21, 0x0e, 0x84, 0xc7, 0x57, 0x4f, 0xb8, 0x08, + 0x78, 0x2f, 0x00, 0xba, 0x82, 0x41, 0x39, 0x80, 0x3e, 0x5e, 0xd9, 0xfc, 0x7c, 0xaf, 0xb1, 0x29, + 0x52, 0xdf, 0x90, 0x89, 0x07, 0x5d, 0x88, 0x86, 0xf4, 0x71, 0x5c, 0xba, 0x5c, 0xc3, 0xb6, 0x08, + 0x85, 0xa6, 0x4f, 0x30, 0x46, 0xa6, 0xba, 0x5d, 0x17, 0x3e, 0x3e, 0x00, 0xa5, 0x5d, 0xee, 0x01, + 0xfd, 0xcb, 0x44, 0xdb, 0x23, 0xc4, 0xa4, 0x1c, 0x0e, 0x27, 0x80, 0x06, 0x14, 0xab, 0x5d, 0x19, + 0x01, 0x3d, 0xc7, 0x9a, 0x64, 0xf2, 0x66, 0x24, 0x94, 0x1a, 0x80, 0x4f, 0x1d, 0xbc, 0x6e, 0x5b, + 0xd1, 0x7e, 0x22, 0xfb, 0xd8, 0x07, 0x69, 0x05, 0xa9, 0x1b, 0x22, 0x12, 0xea, 0xd8, 0x14, 0x1a, + 0x42, 0xc6, 0xd3, 0x7b, 0x57, 0x63, 0x75, 0x32, 0xe6, 0x82, 0x4e, 0x86, 0x74, 0xac, 0xfd, 0x9c, + 0x43, 0x9a, 0xa9, 0xb1, 0x56, 0xcf, 0x3c, 0xa1, 0xe5, 0x75, 0xa1, 0x29, 0xcf, 0x7c, 0x07, 0xeb, + 0xdf, 0x66, 0x22, 0xef, 0x8a, 0xa8, 0x4f, 0x2b, 0x28, 0xf8, 0x00, 0x78, 0x60, 0x94, 0x34, 0xc8, + 0xc4, 0x46, 0x30, 0x30, 0x1a, 0x6b, 0x46, 0x3f, 0x2e, 0x90, 0x6d, 0x0c, 0x49, 0x98, 0x29, 0x31, + 0xf8, 0x74, 0x1c, 0xbd, 0xb7, 0xf7, 0x03, 0x69, 0x13, 0xed, 0xf7, 0x93, 0x99, 0x33, 0xe3, 0x04, + 0x9b, 0x24, 0xb5, 0x54, 0x35, 0x25, 0xcd, 0x35, 0x11, 0xf1, 0x64, 0x68, 0x8b, 0x10, 0xf5, 0xf1, + 0x72, 0x6e, 0x04, 0x92, 0xeb, 0x14, 0x80, 0xf6, 0xcb, 0x4d, 0xd3, 0xcf, 0xcd, 0xc6, 0x29, 0x52, + 0xbf, 0x19, 0xf9, 0x70, 0x24, 0x22, 0xf0, 0xe9, 0x39, 0x53, 0x1c, 0xec, 0xb5, 0x2a, 0x6e, 0xa9, + 0x8f, 0xc1, 0x44, 0x63, 0x4a, 0x18, 0xe0, 0x0d, 0xbf, 0xc1, 0x55, 0x09, 0x3a, 0xc2, 0x03, 0xee, + 0x9a, 0x69, 0xb1, 0x57, 0xde, 0xde, 0x37, 0x07, 0x7c, 0x2c, 0xef, 0x16, 0x98, 0xa2, 0xc7, 0xa8, + 0x69, 0x13, 0xf4, 0xc1, 0x50, 0x69, 0x08, 0x3b, 0x32, 0x3a, 0x12, 0x7d, 0x45, 0x05, 0x6a, 0xda, + 0x96, 0xdc, 0x2f, 0x6d, 0xbf, 0x8d, 0x29, 0xe6, 0x42, 0x00, 0x5c, 0x95, 0xa5, 0xde, 0x31, 0xe5, + 0xd1, 0x98, 0xba, 0x1a, 0x08, 0xae, 0x68, 0x80, 0xae, 0xa0, 0x95, 0x76, 0x19, 0xe2, 0xf9, 0xae, + 0x06, 0x1a, 0x12, 0xbb, 0x8e, 0xd8, 0x3c, 0x99, 0xb1, 0xfc, 0xfb, 0x3c, 0xd1, 0xc2, 0x08, 0x79, + 0xd1, 0x31, 0x99, 0x94, 0xc8, 0xb8, 0xc0, 0x5e, 0xc2, 0x6e, 0xd4, 0xbc, 0xc1, 0x55, 0x01, 0xfd, + 0xcc, 0x61, 0x0b, 0x64, 0x36, 0x73, 0xad, 0xc0, 0x7f, 0xee, 0xb0, 0x39, 0x32, 0x8d, 0xae, 0xe5, + 0x98, 0xa2, 0xbf, 0x30, 0x20, 0x3a, 0x51, 0x02, 0x7f, 0x69, 0x24, 0xa4, 0x5e, 0x94, 0xf0, 0x5f, + 0x19, 0x65, 0x28, 0x21, 0x4d, 0x22, 0x45, 0x5f, 0x71, 0xd0, 0xd2, 0x4c, 0x59, 0x0a, 0xd3, 0x57, + 0x0d, 0x23, 0x4a, 0xcd, 0x19, 0x5f, 0x33, 0x8c, 0xa9, 0xcc, 0x1c, 0x7d, 0xdd, 0xa0, 0x37, 0x78, + 0xe4, 0xcb, 0xa3, 0xa3, 0x1c, 0x7d, 0xc3, 0x61, 0x2d, 0x32, 0x87, 0xdb, 0xd7, 0x78, 0xc0, 0x23, + 0xaf, 0xe0, 0x7f, 0xd3, 0x61, 0xe7, 0x09, 0x3d, 0xa3, 0x4e, 0xd1, 0x67, 0x2b, 0x8c, 0x66, 0xf1, + 0x35, 0xf7, 0x88, 0x7e, 0xb1, 0x62, 0x62, 0x95, 0x32, 0x5a, 0xec, 0x4b, 0x15, 0x36, 0x6d, 0x83, + 0x6e, 0xd7, 0x5f, 0xae, 0xb0, 0x06, 0x19, 0xdf, 0x8a, 0x14, 0x24, 0x9a, 0x7e, 0x16, 0xf3, 0x7b, + 0xdc, 0x96, 0x5a, 0xfa, 0x39, 0xbc, 0x51, 0x63, 0x26, 0xbf, 0xe9, 0x0b, 0xd8, 0xc6, 0x99, 0x0b, + 0x0a, 0x22, 0xbf, 0x74, 0x77, 0x14, 0xfd, 0xbc, 0xd9, 0x61, 0xfb, 0x24, 0xfd, 0x7b, 0xd5, 0x84, + 0xa6, 0xdc, 0x34, 0xff, 0x51, 0x45, 0x13, 0x36, 0x41, 0x17, 0x37, 0x9b, 0xfe, 0xb3, 0xca, 0x2e, + 0x92, 0xf3, 0x19, 0x66, 0x5a, 0x58, 0x7e, 0xa7, 0xff, 0x55, 0x65, 0x97, 0xc9, 0x05, 0xac, 0xe7, + 0x79, 0xde, 0xe0, 0x26, 0xa1, 0xb4, 0xf0, 0x14, 0x7d, 0xb9, 0xca, 0x2e, 0x91, 0x85, 0x4d, 0xd0, + 0xf9, 0x79, 0x94, 0x88, 0xff, 0xae, 0xb2, 0x29, 0x32, 0x89, 0xb7, 0x5e, 0xc0, 0x09, 0xd0, 0x57, + 0xaa, 0x78, 0xa8, 0xd9, 0x32, 0x35, 0xe7, 0xd5, 0x2a, 0x86, 0xfa, 0x43, 0x5c, 0x7b, 0xc7, 0xdd, + 0xb0, 0x73, 0xcc, 0xa3, 0x08, 0x02, 0x45, 0x5f, 0xab, 0x62, 0x40, 0x5d, 0x08, 0xe5, 0x09, 0x94, + 0xe0, 0xd7, 0x8d, 0xd3, 0x86, 0xf9, 0x83, 0x03, 0x48, 0x86, 0x39, 0xe1, 0x8d, 0x2a, 0x1e, 0x8d, + 0xe5, 0x1f, 0xa5, 0xbc, 0x59, 0x65, 0x57, 0x48, 0xcb, 0x16, 0x8b, 0xec, 0x60, 0x90, 0xd8, 0x07, + 0xac, 0xc3, 0xf4, 0xd9, 0x5a, 0x2e, 0xb1, 0x0b, 0x81, 0xe6, 0xf9, 0xbe, 0x4f, 0xd6, 0xd0, 0x2e, + 0xbc, 0x5c, 0x45, 0xf9, 0x55, 0xf4, 0xb9, 0x1a, 0x9e, 0xe8, 0x26, 0xe8, 0xb4, 0x02, 0x2b, 0xfa, + 0x29, 0x9c, 0x9a, 0xa6, 0x6f, 0x46, 0x6a, 0xd0, 0xcb, 0x0d, 0xa5, 0x9f, 0xce, 0x36, 0x77, 0x85, + 0xd2, 0x89, 0xe8, 0x0d, 0x4c, 0xa6, 0x7f, 0xa6, 0x86, 0x4e, 0x1d, 0x0c, 0x23, 0x6f, 0x04, 0x7e, + 0xde, 0xc8, 0x4c, 0x6d, 0x33, 0x46, 0xfd, 0xba, 0xc6, 0x66, 0x08, 0xb1, 0xb7, 0xda, 0x00, 0xbf, + 0xc9, 0xe4, 0xe1, 0x98, 0x74, 0x02, 0x89, 0xe9, 0x21, 0xf4, 0xb7, 0xb9, 0x89, 0xa5, 0xda, 0x49, + 0x7f, 0x57, 0xc3, 0xa0, 0x1f, 0x8a, 0x10, 0x0e, 0x85, 0x77, 0x87, 0x7e, 0xb5, 0x8e, 0xf6, 0x99, + 0x98, 0xec, 0x4a, 0x1f, 0x6c, 0x8e, 0x7c, 0xad, 0x8e, 0x29, 0x87, 0x99, 0x6c, 0x53, 0xee, 0xeb, + 0x66, 0x9d, 0xb6, 0x82, 0xad, 0x2e, 0xfd, 0x06, 0x8e, 0x6b, 0x24, 0x5d, 0x1f, 0x1e, 0xec, 0xd1, + 0x6f, 0xd6, 0x51, 0xd5, 0x6a, 0x10, 0x48, 0x8f, 0xeb, 0xfc, 0x3e, 0x7d, 0xab, 0x8e, 0x17, 0xb2, + 0xa4, 0x3d, 0x3d, 0xf7, 0x6f, 0xd7, 0x8d, 0xa3, 0x16, 0x37, 0xe9, 0xda, 0xc5, 0xb2, 0xfa, 0x1d, + 0x23, 0x15, 0x9f, 0x96, 0x68, 0xc9, 0xa1, 0xa6, 0xdf, 0x35, 0x7c, 0x67, 0x27, 0x10, 0xfa, 0xfb, + 0x46, 0x9a, 0xa1, 0x25, 0xec, 0x0f, 0x0d, 0x7b, 0xc3, 0x46, 0x47, 0x0e, 0xfa, 0x47, 0x03, 0x9f, + 0x1d, 0x53, 0xe8, 0x9f, 0x1a, 0x68, 0x58, 0x79, 0xd2, 0xc0, 0x79, 0x5b, 0xd1, 0x3f, 0x37, 0xd0, + 0x82, 0x62, 0xa6, 0xa0, 0xdf, 0x6b, 0x62, 0xb0, 0xb2, 0x69, 0x82, 0x7e, 0xbf, 0x89, 0x6e, 0x9e, + 0x99, 0x23, 0xe8, 0x0f, 0x9a, 0xe6, 0x38, 0xf2, 0x09, 0x82, 0xfe, 0xb0, 0x04, 0x20, 0x17, 0xfd, + 0x51, 0xd3, 0xd4, 0xb0, 0x91, 0xa9, 0x81, 0xfe, 0xb8, 0x89, 0xb6, 0x9d, 0x9d, 0x17, 0xe8, 0x4f, + 0x9a, 0xf6, 0xb8, 0xf3, 0x49, 0x81, 0xfe, 0xb4, 0x89, 0x77, 0xe8, 0xfe, 0x33, 0x02, 0x7d, 0xd1, + 0xe8, 0x2a, 0xa6, 0x03, 0xfa, 0x52, 0xb3, 0xbd, 0x44, 0x26, 0xba, 0x2a, 0x30, 0x9d, 0x67, 0x82, + 0x54, 0xbb, 0x2a, 0xa0, 0xe7, 0xb0, 0x50, 0xaf, 0x49, 0x19, 0xac, 0x9f, 0xc6, 0xc9, 0x33, 0x4f, + 0x50, 0xa7, 0xbd, 0x46, 0x66, 0x3a, 0x32, 0x8c, 0x79, 0x7e, 0x61, 0x4d, 0xb3, 0xb1, 0x5d, 0x0a, + 0x7c, 0x9b, 0x2a, 0xe7, 0xb0, 0xda, 0xaf, 0x9f, 0x82, 0x37, 0x30, 0x3d, 0xd1, 0xc1, 0x25, 0x6e, + 0xc2, 0x20, 0xfb, 0xb4, 0xd2, 0xfe, 0x30, 0xa1, 0x1d, 0x19, 0x29, 0xa1, 0x34, 0x44, 0xde, 0x70, + 0x1b, 0x4e, 0x20, 0x30, 0x9d, 0x57, 0x27, 0x32, 0xea, 0xd3, 0x73, 0xe6, 0x49, 0x02, 0xe6, 0x69, + 0x61, 0xfb, 0xf3, 0x1a, 0x8e, 0x1d, 0xe6, 0xdd, 0x31, 0x4d, 0xc8, 0xfa, 0x09, 0x44, 0x7a, 0xc0, + 0x83, 0x60, 0x48, 0xab, 0xb8, 0xee, 0x0c, 0x94, 0x96, 0xa1, 0xf8, 0x04, 0xb6, 0xe9, 0xf6, 0x57, + 0x1c, 0xd2, 0xb0, 0xcd, 0x38, 0x37, 0xcd, 0x2e, 0xf7, 0x21, 0xf2, 0x85, 0x11, 0x8e, 0x63, 0xb3, + 0x81, 0xd2, 0x09, 0xc2, 0x29, 0x98, 0x0e, 0x34, 0x4f, 0x74, 0xf6, 0xbe, 0xb1, 0x50, 0x57, 0xde, + 0x8d, 0x02, 0xc9, 0x7d, 0x33, 0x11, 0xe4, 0x5b, 0xf7, 0x79, 0xa2, 0xcc, 0x58, 0x80, 0xaf, 0x8a, + 0x54, 0x7e, 0x62, 0xfc, 0xf1, 0xe9, 0x58, 0x01, 0x16, 0x3e, 0x8f, 0x63, 0xfb, 0xb5, 0xa0, 0x49, + 0xf6, 0x2c, 0xd3, 0x49, 0xfb, 0x3a, 0x21, 0xc5, 0x8b, 0xd2, 0xf8, 0x53, 0xb4, 0xd1, 0x73, 0x18, + 0x95, 0xcd, 0x40, 0xf6, 0x78, 0x40, 0x1d, 0x9c, 0x22, 0x4c, 0x52, 0x54, 0xda, 0xcf, 0x8f, 0x91, + 0x99, 0x33, 0xef, 0x47, 0xb4, 0x2d, 0x5f, 0xac, 0x06, 0x78, 0x72, 0x57, 0xc8, 0x03, 0x39, 0x72, + 0xcf, 0xd8, 0xe0, 0xe0, 0xcc, 0x99, 0x93, 0xcf, 0xcc, 0x0f, 0x15, 0x76, 0x95, 0x5c, 0x2a, 0x88, + 0xf7, 0x4e, 0x0d, 0x58, 0xba, 0x5b, 0x39, 0xc3, 0xd9, 0xf1, 0xa1, 0x86, 0x11, 0xcd, 0xa9, 0x58, + 0x0d, 0xec, 0x6b, 0xaf, 0x78, 0xec, 0xda, 0xb6, 0x48, 0xc7, 0xf1, 0x01, 0x56, 0xd8, 0x98, 0xa7, + 0x15, 0x9d, 0xc0, 0x18, 0xe6, 0x84, 0xb4, 0x65, 0x4d, 0x8e, 0x80, 0x69, 0xeb, 0xaa, 0xe3, 0x80, + 0x9e, 0x83, 0x58, 0xb3, 0x8a, 0x72, 0x41, 0xf0, 0x59, 0x70, 0x26, 0x04, 0xb6, 0x2e, 0x35, 0x46, + 0x28, 0x06, 0xeb, 0x82, 0xe6, 0x22, 0xa0, 0x4d, 0x3c, 0xa8, 0x91, 0xb8, 0xd8, 0x1d, 0x53, 0x23, + 0xca, 0xd3, 0x2e, 0x38, 0x8d, 0x13, 0x51, 0x31, 0xb1, 0x9b, 0xfe, 0x39, 0x33, 0x82, 0x99, 0xfa, + 0x48, 0xe9, 0x88, 0xba, 0x52, 0xa3, 0xa7, 0xb3, 0xa3, 0x8e, 0x9a, 0x04, 0xa1, 0x6c, 0x24, 0xba, + 0xd6, 0xee, 0xbd, 0xbb, 0x11, 0x24, 0xea, 0x58, 0xc4, 0x74, 0x6e, 0x24, 0x68, 0xb6, 0x44, 0x99, + 0xbc, 0x98, 0x1f, 0x09, 0x05, 0x9a, 0x5e, 0x6c, 0x3a, 0x3f, 0x7a, 0x60, 0xa6, 0x48, 0x14, 0xd4, + 0x85, 0x11, 0xea, 0x0e, 0x8f, 0x78, 0xbf, 0xa4, 0xf0, 0xc2, 0x88, 0xc2, 0x52, 0x75, 0x6a, 0xbd, + 0x4f, 0x92, 0xd9, 0xfc, 0x6f, 0xc7, 0x2d, 0x38, 0xd5, 0xb7, 0x64, 0xef, 0x36, 0xbb, 0xba, 0x62, + 0xff, 0x52, 0xae, 0x64, 0x7f, 0x29, 0x57, 0x76, 0x40, 0x29, 0x14, 0x19, 0x9b, 0xfc, 0x68, 0xfd, + 0x75, 0xc2, 0xfc, 0xc6, 0x79, 0xe8, 0xfe, 0x3f, 0xc7, 0x4a, 0xbf, 0x65, 0xdc, 0x99, 0xb8, 0xb4, + 0xda, 0xeb, 0xdd, 0x5e, 0xdb, 0x26, 0xd3, 0x42, 0x66, 0xfb, 0xfa, 0x49, 0xec, 0xad, 0x35, 0x3a, + 0x66, 0xdf, 0x3e, 0xca, 0xd8, 0x77, 0x3e, 0xb2, 0xdc, 0x17, 0xfa, 0x78, 0xd0, 0x43, 0x69, 0xd7, + 0x2c, 0xdb, 0x63, 0x42, 0xa6, 0x5f, 0xd7, 0x78, 0x2c, 0xae, 0x59, 0x35, 0x71, 0xef, 0x0b, 0x8e, + 0xd3, 0x1b, 0x37, 0x9a, 0x9f, 0xfc, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x20, 0x60, 0xb7, 0x1c, + 0x7a, 0x15, 0x00, 0x00, } diff --git a/api/go.mod b/api/go.mod new file mode 100644 index 0000000000000..d72677b39f4f5 --- /dev/null +++ b/api/go.mod @@ -0,0 +1,16 @@ +module github.com/milvus-io/milvus/api + +go 1.18 + +require ( + github.com/golang/protobuf v1.5.2 + google.golang.org/grpc v1.46.0 + google.golang.org/protobuf v1.28.0 +) + +require ( + golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect + golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect + golang.org/x/text v0.3.7 // indirect + google.golang.org/genproto v0.0.0-20220503193339-ba3ae3f07e29 // indirect +) diff --git a/api/go.sum b/api/go.sum new file mode 100644 index 0000000000000..1da10b859187d --- /dev/null +++ b/api/go.sum @@ -0,0 +1,127 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8= +google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/internal/proto/milvuspb/milvus.pb.go b/api/milvuspb/milvus.pb.go similarity index 99% rename from internal/proto/milvuspb/milvus.pb.go rename to api/milvuspb/milvus.pb.go index 12efda783ba75..e8631aab96e8e 100644 --- a/internal/proto/milvuspb/milvus.pb.go +++ b/api/milvuspb/milvus.pb.go @@ -8,8 +8,8 @@ import ( fmt "fmt" proto "github.com/golang/protobuf/proto" descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" - commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" - schemapb "github.com/milvus-io/milvus/internal/proto/schemapb" + commonpb "github.com/milvus-io/milvus/api/commonpb" + schemapb "github.com/milvus-io/milvus/api/schemapb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -7083,7 +7083,7 @@ func init() { func init() { proto.RegisterFile("milvus.proto", fileDescriptor_02345ba45cc0e303) } var fileDescriptor_02345ba45cc0e303 = []byte{ - // 5279 bytes of a gzipped FileDescriptorProto + // 5274 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x3d, 0x4b, 0x6c, 0x1c, 0x47, 0x76, 0xec, 0xf9, 0xcf, 0x9b, 0x0f, 0x87, 0xc5, 0xdf, 0x78, 0x24, 0x59, 0x54, 0xdb, 0xb2, 0x69, 0x69, 0x4d, 0xd9, 0x94, 0x3f, 0x6b, 0xd9, 0x6b, 0x5b, 0x12, 0x6d, 0x89, 0xb0, 0x3e, 0x74, 0xd3, @@ -7408,12 +7408,12 @@ var fileDescriptor_02345ba45cc0e303 = []byte{ 0xab, 0x7d, 0xa8, 0x6e, 0x78, 0xee, 0xfd, 0xf0, 0x11, 0xd1, 0x2f, 0xc8, 0xd0, 0x5f, 0x69, 0x43, 0x9d, 0x55, 0xd0, 0xf1, 0xfd, 0x40, 0x77, 0xb7, 0x3e, 0x44, 0xa7, 0x57, 0xd8, 0xbf, 0xe6, 0x58, 0x09, 0xff, 0x35, 0xc7, 0xca, 0x9b, 0x96, 0x8d, 0xef, 0xf2, 0x2c, 0xc8, 0x7f, 0x2f, 0x8e, 0xb8, - 0xb9, 0x17, 0x1d, 0x59, 0x6b, 0xfc, 0xbf, 0x83, 0xbc, 0x71, 0x3f, 0xb8, 0xbb, 0xf5, 0xe1, 0x35, - 0xe3, 0xb3, 0x57, 0x8b, 0x90, 0x5f, 0x5d, 0x79, 0x76, 0xe5, 0x19, 0xa8, 0x5b, 0x51, 0xf5, 0x8e, - 0xd7, 0x6b, 0x5f, 0xab, 0xb0, 0x46, 0x1b, 0xa4, 0x9f, 0x0d, 0xe5, 0x67, 0x2f, 0x77, 0xac, 0x60, - 0xa7, 0xbf, 0x45, 0x96, 0xe0, 0x12, 0xab, 0xf6, 0xb4, 0xe5, 0xf2, 0x5f, 0x97, 0x2c, 0x27, 0xc0, - 0x9e, 0x63, 0xd8, 0xec, 0xbf, 0x86, 0x70, 0x68, 0x6f, 0xeb, 0xf7, 0x14, 0x65, 0xab, 0x40, 0x41, - 0x97, 0xff, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xd0, 0x23, 0x78, 0x7c, 0x97, 0x64, 0x00, 0x00, + 0xb9, 0x17, 0x1d, 0x59, 0x6b, 0xfc, 0xbf, 0x83, 0xbc, 0x71, 0x3f, 0xb8, 0xbb, 0xf5, 0xe1, 0xb5, + 0xf7, 0x3e, 0x7b, 0xb5, 0x08, 0xf9, 0xd5, 0x95, 0x67, 0x57, 0x9e, 0x81, 0xba, 0x15, 0x55, 0xef, + 0x78, 0xbd, 0xf6, 0xb5, 0x0a, 0x6b, 0xb4, 0x41, 0xfa, 0xd9, 0x50, 0x7e, 0x76, 0xb9, 0x63, 0x05, + 0x3b, 0xfd, 0x2d, 0xb2, 0x04, 0x97, 0x58, 0xb5, 0xa7, 0x2d, 0x97, 0xff, 0xba, 0x64, 0xf4, 0x2c, + 0xfe, 0xb3, 0xb7, 0xf5, 0x7b, 0x8a, 0xb2, 0x55, 0xa0, 0xa3, 0x5f, 0xfe, 0xff, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xdf, 0x0f, 0x9c, 0x21, 0x8c, 0x64, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/internal/proto/schemapb/schema.pb.go b/api/schemapb/schema.pb.go similarity index 83% rename from internal/proto/schemapb/schema.pb.go rename to api/schemapb/schema.pb.go index 26e50b52aef00..2e1ff25f2daab 100644 --- a/internal/proto/schemapb/schema.pb.go +++ b/api/schemapb/schema.pb.go @@ -6,7 +6,7 @@ package schemapb import ( fmt "fmt" proto "github.com/golang/protobuf/proto" - commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" + commonpb "github.com/milvus-io/milvus/api/commonpb" math "math" ) @@ -1081,71 +1081,71 @@ func init() { func init() { proto.RegisterFile("schema.proto", fileDescriptor_1c5fb4d8cc22d66a) } var fileDescriptor_1c5fb4d8cc22d66a = []byte{ - // 1051 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x6f, 0x6f, 0x1b, 0xc5, - 0x13, 0xf6, 0xfa, 0xfc, 0xe7, 0x6e, 0xce, 0xed, 0xef, 0x7e, 0xdb, 0x82, 0x0e, 0xa4, 0x36, 0xae, - 0x05, 0x92, 0x55, 0x89, 0x44, 0x4d, 0xa0, 0x94, 0x8a, 0x0a, 0x70, 0xac, 0x28, 0x56, 0x50, 0x15, - 0x2e, 0x28, 0x48, 0xbc, 0xb1, 0xd6, 0xbe, 0x6d, 0xb2, 0xca, 0xf9, 0xf6, 0xd8, 0x5d, 0x57, 0xf8, - 0x03, 0xf0, 0x0d, 0x78, 0x81, 0x10, 0x2f, 0xf8, 0x62, 0xbc, 0xe2, 0x73, 0x20, 0xa1, 0x9d, 0x5d, - 0xff, 0x29, 0x71, 0xa2, 0xbc, 0x9b, 0x9d, 0x9b, 0xe7, 0xb9, 0x99, 0x67, 0x66, 0x67, 0xa1, 0xa3, - 0xa7, 0x97, 0x7c, 0xc6, 0x76, 0x2b, 0x25, 0x8d, 0xa4, 0x0f, 0x66, 0xa2, 0x78, 0x3b, 0xd7, 0xee, - 0xb4, 0xeb, 0x3e, 0x7d, 0xd8, 0x99, 0xca, 0xd9, 0x4c, 0x96, 0xce, 0xd9, 0xfb, 0x2d, 0x80, 0xf8, - 0x48, 0xf0, 0x22, 0x3f, 0xc3, 0xaf, 0x34, 0x85, 0xf6, 0x1b, 0x7b, 0x1c, 0x0d, 0x53, 0xd2, 0x25, - 0xfd, 0x20, 0x5b, 0x1e, 0x29, 0x85, 0x46, 0xc9, 0x66, 0x3c, 0xad, 0x77, 0x49, 0x3f, 0xca, 0xd0, - 0xa6, 0x1f, 0xc1, 0x7d, 0xa1, 0xc7, 0x95, 0x12, 0x33, 0xa6, 0x16, 0xe3, 0x2b, 0xbe, 0x48, 0x83, - 0x2e, 0xe9, 0x87, 0x59, 0x47, 0xe8, 0x53, 0xe7, 0x3c, 0xe1, 0x0b, 0xda, 0x85, 0x38, 0xe7, 0x7a, - 0xaa, 0x44, 0x65, 0x84, 0x2c, 0xd3, 0x06, 0x12, 0x6c, 0xba, 0xe8, 0x4b, 0x88, 0x72, 0x66, 0xd8, - 0xd8, 0x2c, 0x2a, 0x9e, 0x36, 0xbb, 0xa4, 0x7f, 0x7f, 0xff, 0xd1, 0xee, 0x96, 0xe4, 0x77, 0x87, - 0xcc, 0xb0, 0xef, 0x17, 0x15, 0xcf, 0xc2, 0xdc, 0x5b, 0x74, 0x00, 0xb1, 0x85, 0x8d, 0x2b, 0xa6, - 0xd8, 0x4c, 0xa7, 0xad, 0x6e, 0xd0, 0x8f, 0xf7, 0x9f, 0xbc, 0x8b, 0xf6, 0x25, 0x9f, 0xf0, 0xc5, - 0x39, 0x2b, 0xe6, 0xfc, 0x94, 0x09, 0x95, 0x81, 0x45, 0x9d, 0x22, 0x88, 0x0e, 0xa1, 0x23, 0xca, - 0x9c, 0xff, 0xbc, 0x24, 0x69, 0xdf, 0x95, 0x24, 0x46, 0x98, 0x67, 0x79, 0x1f, 0x5a, 0x6c, 0x6e, - 0xe4, 0x68, 0x98, 0x86, 0xa8, 0x82, 0x3f, 0xd1, 0xcf, 0xa0, 0xa9, 0x0d, 0x33, 0x3c, 0x8d, 0xb0, - 0xb2, 0x9d, 0xad, 0x95, 0xb9, 0x26, 0xd8, 0xb0, 0xcc, 0x45, 0xf7, 0x7e, 0x27, 0x90, 0x1c, 0xca, - 0xa2, 0xe0, 0x53, 0xab, 0x91, 0xef, 0xcf, 0xb2, 0x0b, 0x64, 0xa3, 0x0b, 0xff, 0xd1, 0xb7, 0x7e, - 0x5d, 0xdf, 0x75, 0x66, 0xc1, 0x3b, 0x99, 0xbd, 0x80, 0x16, 0xb6, 0x57, 0xa7, 0x0d, 0xac, 0xb8, - 0x7b, 0x4b, 0x6a, 0x68, 0x67, 0x3e, 0xbe, 0xb7, 0x03, 0xd1, 0x40, 0xca, 0xe2, 0x1b, 0xa5, 0xd8, - 0xc2, 0x26, 0x65, 0xdb, 0x91, 0x92, 0x6e, 0xd0, 0x0f, 0x33, 0xb4, 0x7b, 0x8f, 0x21, 0x1c, 0x95, - 0xe6, 0xfa, 0xf7, 0xa6, 0xff, 0xbe, 0x03, 0xd1, 0xb7, 0xb2, 0xbc, 0xb8, 0x1e, 0x10, 0xf8, 0x80, - 0x2e, 0xc0, 0x51, 0x21, 0xd9, 0x16, 0x8a, 0xba, 0x8f, 0x78, 0x02, 0xf1, 0x50, 0xce, 0x27, 0x05, - 0xbf, 0x1e, 0x42, 0xd6, 0x24, 0x83, 0x85, 0xe1, 0xfa, 0x7a, 0x44, 0x67, 0x4d, 0x72, 0x66, 0x94, - 0xd8, 0x96, 0x49, 0xe4, 0x43, 0xfe, 0x0a, 0x20, 0x3e, 0x9b, 0xb2, 0x82, 0x29, 0x54, 0x82, 0xbe, - 0x82, 0x68, 0x22, 0x65, 0x31, 0xf6, 0x81, 0xa4, 0x1f, 0xef, 0x3f, 0xde, 0x2a, 0xdc, 0x4a, 0xa1, - 0xe3, 0x5a, 0x16, 0x5a, 0x88, 0x1d, 0x5f, 0xfa, 0x12, 0x42, 0x51, 0x1a, 0x87, 0xae, 0x23, 0x7a, - 0xfb, 0xac, 0x2f, 0xe5, 0x3b, 0xae, 0x65, 0x6d, 0x51, 0x1a, 0xc4, 0xbe, 0x82, 0xa8, 0x90, 0xe5, - 0x85, 0x03, 0x07, 0xb7, 0xfc, 0x7a, 0xa5, 0xad, 0xfd, 0xb5, 0x85, 0x20, 0xfc, 0x6b, 0x80, 0x37, - 0x56, 0x53, 0x87, 0x6f, 0x20, 0xfe, 0x86, 0x71, 0x5c, 0x49, 0x7f, 0x5c, 0xcb, 0x22, 0x04, 0x21, - 0xc3, 0x21, 0xc4, 0x39, 0x6a, 0xee, 0x28, 0x9a, 0x48, 0xb1, 0x7d, 0x6c, 0x36, 0x7a, 0x73, 0x5c, - 0xcb, 0xc0, 0xc1, 0x96, 0x24, 0x1a, 0x35, 0x77, 0x24, 0xad, 0x5b, 0x48, 0x36, 0x7a, 0x63, 0x49, - 0x1c, 0x6c, 0x59, 0xcb, 0xc4, 0xb6, 0xd6, 0x71, 0xb4, 0x6f, 0xa9, 0x65, 0x3d, 0x01, 0xb6, 0x16, - 0x04, 0x59, 0x86, 0x41, 0xcb, 0xf5, 0xba, 0xf7, 0x2b, 0x81, 0xf8, 0x9c, 0x4f, 0x8d, 0xf4, 0xfd, - 0x4d, 0x20, 0xc8, 0xc5, 0xcc, 0xef, 0x3f, 0x6b, 0xda, 0xfd, 0xe0, 0x74, 0x7b, 0x8b, 0x61, 0xbe, - 0x6d, 0x77, 0x50, 0x2e, 0x46, 0x98, 0x23, 0xa7, 0x1f, 0xc3, 0xbd, 0x89, 0x28, 0xed, 0xa6, 0xf4, - 0x34, 0xb6, 0x81, 0x9d, 0xe3, 0x5a, 0xd6, 0x71, 0x6e, 0x17, 0xb6, 0x4a, 0xeb, 0x1f, 0x02, 0x11, - 0x26, 0x84, 0xe5, 0x3e, 0x83, 0x06, 0x6e, 0x47, 0x72, 0x97, 0xed, 0x88, 0xa1, 0xf4, 0x11, 0x00, - 0xde, 0xd6, 0xf1, 0xc6, 0xde, 0x8e, 0xd0, 0xf3, 0xda, 0xae, 0x8d, 0x2f, 0xa1, 0xad, 0x71, 0xaa, - 0xb5, 0x9f, 0xa4, 0x1b, 0x3a, 0xb0, 0x9e, 0x7c, 0x3b, 0x89, 0x1e, 0x62, 0xd1, 0xae, 0x0a, 0xed, - 0xe7, 0x68, 0x3b, 0x7a, 0x43, 0x57, 0x8b, 0xf6, 0x10, 0xfa, 0x01, 0x84, 0x2e, 0x35, 0x91, 0xe3, - 0x0c, 0xad, 0xde, 0x99, 0x7c, 0xd0, 0x86, 0x26, 0x9a, 0xbd, 0x5f, 0x08, 0x04, 0xa3, 0xa1, 0xa6, - 0x9f, 0x43, 0xcb, 0xde, 0x17, 0x91, 0xdf, 0x7a, 0xd7, 0x36, 0x07, 0xbe, 0x29, 0x4a, 0x33, 0xca, - 0xe9, 0x17, 0xd0, 0xd2, 0x46, 0x59, 0x60, 0xfd, 0xce, 0x13, 0xd6, 0xd4, 0x46, 0x8d, 0xf2, 0x01, - 0x40, 0x28, 0xf2, 0xb1, 0xcb, 0xe3, 0x6f, 0x02, 0xc9, 0x19, 0x67, 0x6a, 0x7a, 0x99, 0x71, 0x3d, - 0x2f, 0xdc, 0x3d, 0xd8, 0x81, 0xb8, 0x9c, 0xcf, 0xc6, 0x3f, 0xcd, 0xb9, 0x12, 0x5c, 0xfb, 0x59, - 0x81, 0x72, 0x3e, 0xfb, 0xce, 0x79, 0xe8, 0x03, 0x68, 0x1a, 0x59, 0x8d, 0xaf, 0xf0, 0xdf, 0x41, - 0xd6, 0x30, 0xb2, 0x3a, 0xa1, 0x5f, 0x41, 0xec, 0xf6, 0xe7, 0xf2, 0x02, 0x07, 0x37, 0xd6, 0xb3, - 0xea, 0x7c, 0xe6, 0x9a, 0x88, 0x23, 0x6b, 0x17, 0xb9, 0x9e, 0x4a, 0xc5, 0xdd, 0xc2, 0xae, 0x67, - 0xfe, 0x44, 0x9f, 0x42, 0x20, 0x72, 0xed, 0xaf, 0x63, 0xba, 0x7d, 0x9d, 0x0c, 0x75, 0x66, 0x83, - 0xe8, 0x43, 0xcc, 0xec, 0xca, 0x3d, 0x95, 0x41, 0xe6, 0x0e, 0x4f, 0xff, 0x20, 0x10, 0x2e, 0xe7, - 0x87, 0x86, 0xd0, 0x78, 0x2d, 0x4b, 0x9e, 0xd4, 0xac, 0x65, 0xb7, 0x58, 0x42, 0xac, 0x35, 0x2a, - 0xcd, 0x8b, 0xa4, 0x4e, 0x23, 0x68, 0x8e, 0x4a, 0xf3, 0xec, 0x79, 0x12, 0x78, 0xf3, 0x60, 0x3f, - 0x69, 0x78, 0xf3, 0xf9, 0xa7, 0x49, 0xd3, 0x9a, 0x78, 0x0b, 0x12, 0xa0, 0x00, 0x2d, 0xb7, 0x07, - 0x92, 0xd8, 0xda, 0x4e, 0xec, 0xe4, 0x21, 0x8d, 0xa1, 0x7d, 0xce, 0xd4, 0xe1, 0x25, 0x53, 0xc9, - 0x7b, 0x34, 0x81, 0xce, 0x60, 0xe3, 0x06, 0x24, 0x39, 0xfd, 0x1f, 0xc4, 0x47, 0xeb, 0x9b, 0x93, - 0xf0, 0xa7, 0xe7, 0x00, 0xeb, 0x17, 0xd2, 0x02, 0xf0, 0x74, 0xa8, 0x38, 0x33, 0x3c, 0x4f, 0x6a, - 0xf4, 0xff, 0x70, 0x6f, 0xed, 0xb1, 0xbf, 0x20, 0x2b, 0xd7, 0x50, 0xc9, 0xaa, 0xb2, 0xae, 0xfa, - 0x0a, 0x87, 0x2e, 0x9e, 0x27, 0xc1, 0xe0, 0x07, 0xb8, 0x2f, 0xe4, 0x52, 0xaf, 0x0b, 0x55, 0x4d, - 0x07, 0xb1, 0x7b, 0xe9, 0x4e, 0xad, 0x76, 0xa7, 0xe4, 0xc7, 0x83, 0x0b, 0x61, 0x2e, 0xe7, 0x13, - 0xfb, 0xfa, 0xef, 0xb9, 0xb0, 0x4f, 0x84, 0xf4, 0xd6, 0x9e, 0x28, 0x0d, 0x57, 0x25, 0x2b, 0xf6, - 0x50, 0xe9, 0x3d, 0xa7, 0x74, 0x35, 0xf9, 0x93, 0x90, 0x49, 0x0b, 0x5d, 0x07, 0xff, 0x06, 0x00, - 0x00, 0xff, 0xff, 0x31, 0x59, 0x18, 0x2e, 0x92, 0x09, 0x00, 0x00, + // 1044 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x5f, 0x6f, 0x1b, 0x45, + 0x10, 0xf7, 0xfa, 0xfc, 0xe7, 0x6e, 0xce, 0x0d, 0xc7, 0xb6, 0xa0, 0x03, 0xa9, 0x8d, 0x6b, 0x81, + 0x64, 0x45, 0x22, 0x51, 0x53, 0x28, 0xa5, 0xa2, 0x02, 0x1c, 0x2b, 0x8a, 0x95, 0xaa, 0x0a, 0x17, + 0x94, 0x07, 0x5e, 0xac, 0xb5, 0x6f, 0x9b, 0xac, 0x72, 0x77, 0x7b, 0xdc, 0xae, 0x2b, 0xfc, 0x01, + 0xf8, 0x06, 0x3c, 0x20, 0xc4, 0x03, 0x5f, 0x8c, 0x27, 0x3e, 0x07, 0x12, 0xda, 0xd9, 0xf5, 0x9f, + 0x36, 0x8e, 0x95, 0xb7, 0xd9, 0xb9, 0xf9, 0xfd, 0x6e, 0xe6, 0x37, 0xb3, 0xb3, 0xd0, 0x51, 0xd3, + 0x2b, 0x9e, 0xb3, 0xfd, 0xb2, 0x92, 0x5a, 0xd2, 0xfb, 0xb9, 0xc8, 0xde, 0xce, 0x94, 0x3d, 0xed, + 0xdb, 0x4f, 0x9f, 0x76, 0xa6, 0x32, 0xcf, 0x65, 0x61, 0x9d, 0xbd, 0x3f, 0x3c, 0x08, 0x8f, 0x05, + 0xcf, 0xd2, 0x73, 0xfc, 0x4a, 0x63, 0x68, 0xbf, 0x31, 0xc7, 0xd1, 0x30, 0x26, 0x5d, 0xd2, 0xf7, + 0x92, 0xc5, 0x91, 0x52, 0x68, 0x14, 0x2c, 0xe7, 0x71, 0xbd, 0x4b, 0xfa, 0x41, 0x82, 0x36, 0xfd, + 0x0c, 0x76, 0x84, 0x1a, 0x97, 0x95, 0xc8, 0x59, 0x35, 0x1f, 0x5f, 0xf3, 0x79, 0xec, 0x75, 0x49, + 0xdf, 0x4f, 0x3a, 0x42, 0x9d, 0x59, 0xe7, 0x29, 0x9f, 0xd3, 0x2e, 0x84, 0x29, 0x57, 0xd3, 0x4a, + 0x94, 0x5a, 0xc8, 0x22, 0x6e, 0x20, 0xc1, 0xba, 0x8b, 0xbe, 0x80, 0x20, 0x65, 0x9a, 0x8d, 0xf5, + 0xbc, 0xe4, 0x71, 0xb3, 0x4b, 0xfa, 0x3b, 0x87, 0x0f, 0xf7, 0x37, 0x24, 0xbf, 0x3f, 0x64, 0x9a, + 0xfd, 0x34, 0x2f, 0x79, 0xe2, 0xa7, 0xce, 0xa2, 0x03, 0x08, 0x0d, 0x6c, 0x5c, 0xb2, 0x8a, 0xe5, + 0x2a, 0x6e, 0x75, 0xbd, 0x7e, 0x78, 0xf8, 0xf8, 0x5d, 0xb4, 0x2b, 0xf9, 0x94, 0xcf, 0x2f, 0x58, + 0x36, 0xe3, 0x67, 0x4c, 0x54, 0x09, 0x18, 0xd4, 0x19, 0x82, 0xe8, 0x10, 0x3a, 0xa2, 0x48, 0xf9, + 0xaf, 0x0b, 0x92, 0xf6, 0x5d, 0x49, 0x42, 0x84, 0x39, 0x96, 0x8f, 0xa1, 0xc5, 0x66, 0x5a, 0x8e, + 0x86, 0xb1, 0x8f, 0x2a, 0xb8, 0x13, 0xfd, 0x0a, 0x9a, 0x4a, 0x33, 0xcd, 0xe3, 0x00, 0x2b, 0xdb, + 0xdd, 0x58, 0x99, 0x6d, 0x82, 0x09, 0x4b, 0x6c, 0x74, 0xef, 0x4f, 0x02, 0xd1, 0x91, 0xcc, 0x32, + 0x3e, 0x35, 0x1a, 0xb9, 0xfe, 0x2c, 0xba, 0x40, 0xd6, 0xba, 0xf0, 0x9e, 0xbe, 0xf5, 0x9b, 0xfa, + 0xae, 0x32, 0xf3, 0xde, 0xc9, 0xec, 0x39, 0xb4, 0xb0, 0xbd, 0x2a, 0x6e, 0x60, 0xc5, 0xdd, 0x2d, + 0xa9, 0xa1, 0x9d, 0xb8, 0xf8, 0xde, 0x2e, 0x04, 0x03, 0x29, 0xb3, 0x1f, 0xaa, 0x8a, 0xcd, 0x4d, + 0x52, 0xa6, 0x1d, 0x31, 0xe9, 0x7a, 0x7d, 0x3f, 0x41, 0xbb, 0xf7, 0x08, 0xfc, 0x51, 0xa1, 0x6f, + 0x7e, 0x6f, 0xba, 0xef, 0xbb, 0x10, 0xbc, 0x92, 0xc5, 0xe5, 0xcd, 0x00, 0xcf, 0x05, 0x74, 0x01, + 0x8e, 0x33, 0xc9, 0x36, 0x50, 0xd4, 0x5d, 0xc4, 0x63, 0x08, 0x87, 0x72, 0x36, 0xc9, 0xf8, 0xcd, + 0x10, 0xb2, 0x22, 0x19, 0xcc, 0x35, 0x57, 0x37, 0x23, 0x3a, 0x2b, 0x92, 0x73, 0x5d, 0x89, 0x4d, + 0x99, 0x04, 0x2e, 0xe4, 0x1f, 0x0f, 0xc2, 0xf3, 0x29, 0xcb, 0x58, 0x85, 0x4a, 0xd0, 0x97, 0x10, + 0x4c, 0xa4, 0xcc, 0xc6, 0x2e, 0x90, 0xf4, 0xc3, 0xc3, 0x47, 0x1b, 0x85, 0x5b, 0x2a, 0x74, 0x52, + 0x4b, 0x7c, 0x03, 0x31, 0xe3, 0x4b, 0x5f, 0x80, 0x2f, 0x0a, 0x6d, 0xd1, 0x75, 0x44, 0x6f, 0x9e, + 0xf5, 0x85, 0x7c, 0x27, 0xb5, 0xa4, 0x2d, 0x0a, 0x8d, 0xd8, 0x97, 0x10, 0x64, 0xb2, 0xb8, 0xb4, + 0x60, 0x6f, 0xcb, 0xaf, 0x97, 0xda, 0x9a, 0x5f, 0x1b, 0x08, 0xc2, 0xbf, 0x07, 0x78, 0x63, 0x34, + 0xb5, 0xf8, 0x06, 0xe2, 0x6f, 0x19, 0xc7, 0xa5, 0xf4, 0x27, 0xb5, 0x24, 0x40, 0x10, 0x32, 0x1c, + 0x41, 0x98, 0xa2, 0xe6, 0x96, 0xa2, 0x89, 0x14, 0x9b, 0xc7, 0x66, 0xad, 0x37, 0x27, 0xb5, 0x04, + 0x2c, 0x6c, 0x41, 0xa2, 0x50, 0x73, 0x4b, 0xd2, 0xda, 0x42, 0xb2, 0xd6, 0x1b, 0x43, 0x62, 0x61, + 0x8b, 0x5a, 0x26, 0xa6, 0xb5, 0x96, 0xa3, 0xbd, 0xa5, 0x96, 0xd5, 0x04, 0x98, 0x5a, 0x10, 0x64, + 0x18, 0x06, 0x2d, 0xdb, 0xeb, 0xde, 0xef, 0x04, 0xc2, 0x0b, 0x3e, 0xd5, 0xd2, 0xf5, 0x37, 0x02, + 0x2f, 0x15, 0xb9, 0xdb, 0x7f, 0xc6, 0x34, 0xfb, 0xc1, 0xea, 0xf6, 0x16, 0xc3, 0x5c, 0xdb, 0xee, + 0xa0, 0x5c, 0x88, 0x30, 0x4b, 0x4e, 0x3f, 0x87, 0x7b, 0x13, 0x51, 0x98, 0x4d, 0xe9, 0x68, 0x4c, + 0x03, 0x3b, 0x27, 0xb5, 0xa4, 0x63, 0xdd, 0x36, 0x6c, 0x99, 0xd6, 0x7f, 0x04, 0x02, 0x4c, 0x08, + 0xcb, 0x7d, 0x02, 0x0d, 0xdc, 0x8e, 0xe4, 0x2e, 0xdb, 0x11, 0x43, 0xe9, 0x43, 0x00, 0xbc, 0xad, + 0xe3, 0xb5, 0xbd, 0x1d, 0xa0, 0xe7, 0xb5, 0x59, 0x1b, 0xdf, 0x42, 0x5b, 0xe1, 0x54, 0x2b, 0x37, + 0x49, 0xb7, 0x74, 0x60, 0x35, 0xf9, 0x66, 0x12, 0x1d, 0xc4, 0xa0, 0x6d, 0x15, 0xca, 0xcd, 0xd1, + 0x66, 0xf4, 0x9a, 0xae, 0x06, 0xed, 0x20, 0xf4, 0x13, 0xf0, 0x6d, 0x6a, 0x22, 0xc5, 0x19, 0x5a, + 0xbe, 0x33, 0xe9, 0xa0, 0x0d, 0x4d, 0x34, 0x7b, 0xbf, 0x11, 0xf0, 0x46, 0x43, 0x45, 0xbf, 0x86, + 0x96, 0xb9, 0x2f, 0x22, 0xdd, 0x7a, 0xd7, 0xd6, 0x07, 0xbe, 0x29, 0x0a, 0x3d, 0x4a, 0xe9, 0x37, + 0xd0, 0x52, 0xba, 0x32, 0xc0, 0xfa, 0x9d, 0x27, 0xac, 0xa9, 0x74, 0x35, 0x4a, 0x07, 0x00, 0xbe, + 0x48, 0xc7, 0x36, 0x8f, 0x7f, 0x09, 0x44, 0xe7, 0x9c, 0x55, 0xd3, 0xab, 0x84, 0xab, 0x59, 0x66, + 0xef, 0xc1, 0x2e, 0x84, 0xc5, 0x2c, 0x1f, 0xff, 0x32, 0xe3, 0x95, 0xe0, 0xca, 0xcd, 0x0a, 0x14, + 0xb3, 0xfc, 0x47, 0xeb, 0xa1, 0xf7, 0xa1, 0xa9, 0x65, 0x39, 0xbe, 0xc6, 0x7f, 0x7b, 0x49, 0x43, + 0xcb, 0xf2, 0x94, 0x7e, 0x07, 0xa1, 0xdd, 0x9f, 0x8b, 0x0b, 0xec, 0xdd, 0x5a, 0xcf, 0xb2, 0xf3, + 0x89, 0x6d, 0x22, 0x8e, 0xac, 0x59, 0xe4, 0x6a, 0x2a, 0x2b, 0x6e, 0x17, 0x76, 0x3d, 0x71, 0x27, + 0xba, 0x07, 0x9e, 0x48, 0x95, 0xbb, 0x8e, 0xf1, 0xe6, 0x75, 0x32, 0x54, 0x89, 0x09, 0xa2, 0x0f, + 0x30, 0xb3, 0x6b, 0xfb, 0x54, 0x7a, 0x89, 0x3d, 0xec, 0xfd, 0x45, 0xc0, 0x5f, 0xcc, 0x0f, 0xf5, + 0xa1, 0xf1, 0x5a, 0x16, 0x3c, 0xaa, 0x19, 0xcb, 0x6c, 0xb1, 0x88, 0x18, 0x6b, 0x54, 0xe8, 0xe7, + 0x51, 0x9d, 0x06, 0xd0, 0x1c, 0x15, 0xfa, 0xc9, 0xb3, 0xc8, 0x73, 0xe6, 0xd3, 0xc3, 0xa8, 0xe1, + 0xcc, 0x67, 0x5f, 0x46, 0x4d, 0x63, 0xe2, 0x2d, 0x88, 0x80, 0x02, 0xb4, 0xec, 0x1e, 0x88, 0x42, + 0x63, 0x5b, 0xb1, 0xa3, 0x07, 0x34, 0x84, 0xf6, 0x05, 0xab, 0x8e, 0xae, 0x58, 0x15, 0x7d, 0x44, + 0x23, 0xe8, 0x0c, 0xd6, 0x6e, 0x40, 0x94, 0xd2, 0x0f, 0x20, 0x3c, 0x5e, 0xdd, 0x9c, 0x88, 0xef, + 0x5d, 0x00, 0xac, 0x5e, 0x48, 0x03, 0xc0, 0xd3, 0x51, 0xc5, 0x99, 0xe6, 0x69, 0x54, 0xa3, 0x1f, + 0xc2, 0xbd, 0x95, 0xc7, 0xfc, 0x82, 0x2c, 0x5d, 0xc3, 0x4a, 0x96, 0xa5, 0x71, 0xd5, 0x97, 0x38, + 0x74, 0xf1, 0x34, 0xf2, 0x06, 0xaf, 0x60, 0x47, 0xc8, 0x85, 0x5e, 0x97, 0x55, 0x39, 0x1d, 0x84, + 0xf6, 0xa5, 0x3b, 0x33, 0xda, 0x9d, 0x91, 0x9f, 0xfb, 0x97, 0x42, 0x5f, 0xcd, 0x26, 0xe6, 0xf5, + 0x3f, 0xb0, 0x61, 0x5f, 0x08, 0xe9, 0xac, 0x03, 0x56, 0x8a, 0x03, 0x2b, 0x6f, 0x39, 0xf9, 0x9b, + 0x90, 0x49, 0x0b, 0x15, 0x7f, 0xfa, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x20, 0xa3, 0xa5, 0x38, + 0x87, 0x09, 0x00, 0x00, } diff --git a/cmd/milvus/mck.go b/cmd/milvus/mck.go index 2660fc6e15e08..4270f614cee96 100644 --- a/cmd/milvus/mck.go +++ b/cmd/milvus/mck.go @@ -22,7 +22,7 @@ import ( pb "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/golang/protobuf/proto" diff --git a/cmd/roles/healthz_handler.go b/cmd/roles/healthz_handler.go index 8082799f7c3c7..468040f9dd1ed 100644 --- a/cmd/roles/healthz_handler.go +++ b/cmd/roles/healthz_handler.go @@ -21,8 +21,8 @@ import ( "fmt" "net/http" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/util/healthz" "go.uber.org/zap" diff --git a/go.mod b/go.mod index 5d9f2ffffe65d..ce8243e3c6cbf 100644 --- a/go.mod +++ b/go.mod @@ -28,6 +28,7 @@ require ( github.com/jinzhu/now v1.1.5 // indirect github.com/klauspost/compress v1.14.2 github.com/lingdor/stackerror v0.0.0-20191119040541-976d8885ed76 + github.com/milvus-io/milvus/api v0.0.0-20220915082433-b1f4c60117bb github.com/minio/minio-go/v7 v7.0.10 github.com/opentracing/opentracing-go v1.2.0 github.com/panjf2000/ants/v2 v2.4.8 @@ -55,8 +56,8 @@ require ( google.golang.org/grpc/examples v0.0.0-20220617181431-3e7b97febc7f google.golang.org/protobuf v1.28.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 - gorm.io/driver/mysql v1.3.5 // indirect - gorm.io/gorm v1.23.8 // indirect + gorm.io/driver/mysql v1.3.5 + gorm.io/gorm v1.23.8 stathat.com/c/consistent v1.0.0 ) @@ -140,7 +141,7 @@ require ( github.com/prometheus/procfs v0.6.0 // indirect github.com/quasilyte/go-ruleguard/dsl v0.3.21 // indirect github.com/rs/xid v1.2.1 // indirect - github.com/samber/lo v1.27.0 // indirect + github.com/samber/lo v1.27.0 github.com/sirupsen/logrus v1.8.1 // indirect github.com/soheilhy/cmux v0.1.5 // indirect github.com/spf13/afero v1.6.0 // indirect @@ -197,4 +198,7 @@ replace ( github.com/go-kit/kit => github.com/go-kit/kit v0.1.0 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 + // If you want to use the hook interceptor, the following code should be commented out + // and you should modify the api version to be the same as the `so` project. + github.com/milvus-io/milvus/api => ./api ) diff --git a/go.sum b/go.sum index 71e753d408426..9ee707d14a64c 100644 --- a/go.sum +++ b/go.sum @@ -491,6 +491,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/milvus-io/gorocksdb v0.0.0-20220624081344-8c5f4212846b h1:TfeY0NxYxZzUfIfYe5qYDBzt4ZYRqzUjTR6CvUzjat8= github.com/milvus-io/gorocksdb v0.0.0-20220624081344-8c5f4212846b/go.mod h1:iwW+9cWfIzzDseEBCCeDSN5SD16Tidvy8cwQ7ZY8Qj4= +github.com/milvus-io/milvus/api v0.0.0-20220915082433-b1f4c60117bb h1:vKuSxdR+egH8P7QOgO/WP0c2JpLnGPpt1DF6bSE6tmQ= +github.com/milvus-io/milvus/api v0.0.0-20220915082433-b1f4c60117bb/go.mod h1:ZhlXJ8rZ90MBqJZNniyzcT8dibpZ8wRW2c1Tcb8/6oo= github.com/milvus-io/pulsar-client-go v0.6.8 h1:fZdZH73aPRszu2fazyeeahQEz34tyn1Pt9EkqJmV100= github.com/milvus-io/pulsar-client-go v0.6.8/go.mod h1:oFIlYIk23tamkSLttw849qphmMIpHY8ztEBWDWJW+sc= github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs= diff --git a/internal/allocator/id.go b/internal/allocator/id.go index 57b11e3abcffa..35464814f9cee 100644 --- a/internal/allocator/id.go +++ b/internal/allocator/id.go @@ -21,8 +21,8 @@ import ( "fmt" "time" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" diff --git a/internal/allocator/id_test.go b/internal/allocator/id_test.go index 71ec079ed4c5f..16874ae73eb47 100644 --- a/internal/allocator/id_test.go +++ b/internal/allocator/id_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/stretchr/testify/assert" ) diff --git a/internal/common/key_data_pairs.go b/internal/common/key_data_pairs.go index 329b8d192812a..dd917e2a7c691 100644 --- a/internal/common/key_data_pairs.go +++ b/internal/common/key_data_pairs.go @@ -3,7 +3,7 @@ package common import ( "reflect" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" ) type KeyDataPairs []*commonpb.KeyDataPair diff --git a/internal/common/key_data_pairs_test.go b/internal/common/key_data_pairs_test.go index 922ff92a98e50..153fa6d3d4b77 100644 --- a/internal/common/key_data_pairs_test.go +++ b/internal/common/key_data_pairs_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/stretchr/testify/assert" ) diff --git a/internal/common/key_value_pairs.go b/internal/common/key_value_pairs.go index 3b0e81ff72a3c..89279d546537e 100644 --- a/internal/common/key_value_pairs.go +++ b/internal/common/key_value_pairs.go @@ -3,7 +3,7 @@ package common import ( "reflect" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" ) type KeyValuePairs []*commonpb.KeyValuePair diff --git a/internal/common/key_value_pairs_test.go b/internal/common/key_value_pairs_test.go index 7ba19581dfdf8..89f84fafb12d7 100644 --- a/internal/common/key_value_pairs_test.go +++ b/internal/common/key_value_pairs_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/stretchr/testify/assert" ) diff --git a/internal/core/src/pb/common.pb.cc b/internal/core/src/pb/common.pb.cc index cf061ad78537d..8f2b4accb37c7 100644 --- a/internal/core/src/pb/common.pb.cc +++ b/internal/core/src/pb/common.pb.cc @@ -468,9 +468,9 @@ const char descriptor_table_protodef_common_2eproto[] PROTOBUF_SECTION_VARIABLE( "ManageOwnership\020\027\022\027\n\023PrivilegeSelectUser" "\020\030:^\n\021privilege_ext_obj\022\037.google.protobu" "f.MessageOptions\030\351\007 \001(\0132!.milvus.proto.c" - "ommon.PrivilegeExtBW\n\016io.milvus.grpcB\013Co" - "mmonProtoP\001Z3github.com/milvus-io/milvus" - "/internal/proto/commonpb\240\001\001b\006proto3" + "ommon.PrivilegeExtBL\n\016io.milvus.grpcB\013Co" + "mmonProtoP\001Z(github.com/milvus-io/milvus" + "/api/commonpb\240\001\001b\006proto3" ; static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_common_2eproto_deps[1] = { &::descriptor_table_google_2fprotobuf_2fdescriptor_2eproto, @@ -491,7 +491,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_com static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_common_2eproto_once; static bool descriptor_table_common_2eproto_initialized = false; const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_common_2eproto = { - &descriptor_table_common_2eproto_initialized, descriptor_table_protodef_common_2eproto, "common.proto", 5275, + &descriptor_table_common_2eproto_initialized, descriptor_table_protodef_common_2eproto, "common.proto", 5264, &descriptor_table_common_2eproto_once, descriptor_table_common_2eproto_sccs, descriptor_table_common_2eproto_deps, 11, 1, schemas, file_default_instances, TableStruct_common_2eproto::offsets, file_level_metadata_common_2eproto, 11, file_level_enum_descriptors_common_2eproto, file_level_service_descriptors_common_2eproto, diff --git a/internal/core/src/pb/schema.pb.cc b/internal/core/src/pb/schema.pb.cc index a9bae0f82af22..3659af1a29de2 100644 --- a/internal/core/src/pb/schema.pb.cc +++ b/internal/core/src/pb/schema.pb.cc @@ -522,9 +522,9 @@ const char descriptor_table_protodef_schema_2eproto[] PROTOBUF_SECTION_VARIABLE( "r\020\025\022\020\n\014BinaryVector\020d\022\017\n\013FloatVector\020e*V" "\n\nFieldState\022\020\n\014FieldCreated\020\000\022\021\n\rFieldC" "reating\020\001\022\021\n\rFieldDropping\020\002\022\020\n\014FieldDro" - "pped\020\003BW\n\016io.milvus.grpcB\013SchemaProtoP\001Z" - "3github.com/milvus-io/milvus/internal/pr" - "oto/schemapb\240\001\001b\006proto3" + "pped\020\003BL\n\016io.milvus.grpcB\013SchemaProtoP\001Z" + "(github.com/milvus-io/milvus/api/schemap" + "b\240\001\001b\006proto3" ; static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_schema_2eproto_deps[1] = { &::descriptor_table_common_2eproto, @@ -548,7 +548,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_sch static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_schema_2eproto_once; static bool descriptor_table_schema_2eproto_initialized = false; const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_schema_2eproto = { - &descriptor_table_schema_2eproto_initialized, descriptor_table_protodef_schema_2eproto, "schema.proto", 2063, + &descriptor_table_schema_2eproto_initialized, descriptor_table_protodef_schema_2eproto, "schema.proto", 2052, &descriptor_table_schema_2eproto_once, descriptor_table_schema_2eproto_sccs, descriptor_table_schema_2eproto_deps, 14, 1, schemas, file_default_instances, TableStruct_schema_2eproto::offsets, file_level_metadata_schema_2eproto, 14, file_level_enum_descriptors_schema_2eproto, file_level_service_descriptors_schema_2eproto, diff --git a/internal/datacoord/allocator.go b/internal/datacoord/allocator.go index e113db22655d4..caa9e9d17bf2b 100644 --- a/internal/datacoord/allocator.go +++ b/internal/datacoord/allocator.go @@ -19,7 +19,7 @@ package datacoord import ( "context" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/types" ) diff --git a/internal/datacoord/channel_manager.go b/internal/datacoord/channel_manager.go index 8ac37b2d3a139..f9695966bd37d 100644 --- a/internal/datacoord/channel_manager.go +++ b/internal/datacoord/channel_manager.go @@ -22,10 +22,10 @@ import ( "sync" "time" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/logutil" diff --git a/internal/datacoord/cluster.go b/internal/datacoord/cluster.go index 973f792187af6..1cc7296749464 100644 --- a/internal/datacoord/cluster.go +++ b/internal/datacoord/cluster.go @@ -19,9 +19,9 @@ package datacoord import ( "context" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "go.uber.org/zap" ) diff --git a/internal/datacoord/cluster_test.go b/internal/datacoord/cluster_test.go index b541d2c56f778..14cfaa4b6d364 100644 --- a/internal/datacoord/cluster_test.go +++ b/internal/datacoord/cluster_test.go @@ -23,9 +23,9 @@ import ( "time" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/types" "github.com/stretchr/testify/assert" diff --git a/internal/datacoord/compaction.go b/internal/datacoord/compaction.go index 481e59e3b7586..6c26e4e21a965 100644 --- a/internal/datacoord/compaction.go +++ b/internal/datacoord/compaction.go @@ -23,8 +23,8 @@ import ( "sync" "time" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/util/tsoutil" "go.uber.org/zap" diff --git a/internal/datacoord/compaction_test.go b/internal/datacoord/compaction_test.go index 57f4cffc5b3b8..c6faaaef8635d 100644 --- a/internal/datacoord/compaction_test.go +++ b/internal/datacoord/compaction_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" + "github.com/milvus-io/milvus/api/commonpb" memkv "github.com/milvus-io/milvus/internal/kv/mem" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/kv/datacoord" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/stretchr/testify/assert" diff --git a/internal/datacoord/compaction_trigger.go b/internal/datacoord/compaction_trigger.go index 04089bcfc1c79..36b63ef8d9cb6 100644 --- a/internal/datacoord/compaction_trigger.go +++ b/internal/datacoord/compaction_trigger.go @@ -22,8 +22,8 @@ import ( "sync" "time" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/logutil" diff --git a/internal/datacoord/compaction_trigger_test.go b/internal/datacoord/compaction_trigger_test.go index 16dbe29494faa..d5b159dd63cbc 100644 --- a/internal/datacoord/compaction_trigger_test.go +++ b/internal/datacoord/compaction_trigger_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/datacoord/garbage_collector.go b/internal/datacoord/garbage_collector.go index ac308fd1e02a1..eafdf905cefb0 100644 --- a/internal/datacoord/garbage_collector.go +++ b/internal/datacoord/garbage_collector.go @@ -26,8 +26,8 @@ import ( "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/samber/lo" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" "github.com/minio/minio-go/v7" diff --git a/internal/datacoord/garbage_collector_test.go b/internal/datacoord/garbage_collector_test.go index 3bfcea408d3e2..9936ec1029e30 100644 --- a/internal/datacoord/garbage_collector_test.go +++ b/internal/datacoord/garbage_collector_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" + "github.com/milvus-io/milvus/api/commonpb" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/etcd" diff --git a/internal/datacoord/handler.go b/internal/datacoord/handler.go index 5e19c7b5f3407..3968a756f4791 100644 --- a/internal/datacoord/handler.go +++ b/internal/datacoord/handler.go @@ -19,8 +19,8 @@ package datacoord import ( "context" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/util/funcutil" diff --git a/internal/datacoord/meta.go b/internal/datacoord/meta.go index 49a6e51fcc37c..cf768241fe3ba 100644 --- a/internal/datacoord/meta.go +++ b/internal/datacoord/meta.go @@ -25,12 +25,12 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/kv/datacoord" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" ) diff --git a/internal/datacoord/meta_test.go b/internal/datacoord/meta_test.go index 0b5adad617e61..4e3003c3269a6 100644 --- a/internal/datacoord/meta_test.go +++ b/internal/datacoord/meta_test.go @@ -25,10 +25,10 @@ import ( "testing" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/kv" memkv "github.com/milvus-io/milvus/internal/kv/mem" "github.com/milvus-io/milvus/internal/metastore/kv/datacoord" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/util" diff --git a/internal/datacoord/metrics_info.go b/internal/datacoord/metrics_info.go index e8272140ca510..27063ccfa2472 100644 --- a/internal/datacoord/metrics_info.go +++ b/internal/datacoord/metrics_info.go @@ -20,10 +20,10 @@ import ( "context" "errors" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/milvus-io/milvus/internal/util/uniquegenerator" diff --git a/internal/datacoord/metrics_info_test.go b/internal/datacoord/metrics_info_test.go index 8d585754b178c..deb5171236a38 100644 --- a/internal/datacoord/metrics_info_test.go +++ b/internal/datacoord/metrics_info_test.go @@ -21,8 +21,8 @@ import ( "errors" "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/datacoord/mock_test.go b/internal/datacoord/mock_test.go index 129ccd96919d4..82b3df5f201a2 100644 --- a/internal/datacoord/mock_test.go +++ b/internal/datacoord/mock_test.go @@ -22,15 +22,15 @@ import ( "sync/atomic" "time" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/kv" memkv "github.com/milvus-io/milvus/internal/kv/mem" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/datacoord/segment_allocation_policy.go b/internal/datacoord/segment_allocation_policy.go index efc8943e56e20..99a26598681c4 100644 --- a/internal/datacoord/segment_allocation_policy.go +++ b/internal/datacoord/segment_allocation_policy.go @@ -21,8 +21,8 @@ import ( "sort" "time" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/datacoord/segment_allocation_policy_test.go b/internal/datacoord/segment_allocation_policy_test.go index 6cce91af546ba..76aad3235aa2f 100644 --- a/internal/datacoord/segment_allocation_policy_test.go +++ b/internal/datacoord/segment_allocation_policy_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/datacoord/segment_info.go b/internal/datacoord/segment_info.go index d3d7189534b77..1bff499c1bb18 100644 --- a/internal/datacoord/segment_info.go +++ b/internal/datacoord/segment_info.go @@ -20,7 +20,7 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" ) diff --git a/internal/datacoord/segment_manager.go b/internal/datacoord/segment_manager.go index 334bf10d395a8..c8c3abbb96ae8 100644 --- a/internal/datacoord/segment_manager.go +++ b/internal/datacoord/segment_manager.go @@ -23,8 +23,8 @@ import ( "sync" "time" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/types" diff --git a/internal/datacoord/segment_manager_test.go b/internal/datacoord/segment_manager_test.go index 65c24a2fcdffc..72138c46ea32b 100644 --- a/internal/datacoord/segment_manager_test.go +++ b/internal/datacoord/segment_manager_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" memkv "github.com/milvus-io/milvus/internal/kv/mem" "github.com/milvus-io/milvus/internal/metastore/kv/datacoord" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/datacoord/server.go b/internal/datacoord/server.go index 4291c10850236..c444abd60281d 100644 --- a/internal/datacoord/server.go +++ b/internal/datacoord/server.go @@ -32,6 +32,8 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" datanodeclient "github.com/milvus-io/milvus/internal/distributed/datanode/client" rootcoordclient "github.com/milvus-io/milvus/internal/distributed/rootcoord/client" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" @@ -39,9 +41,7 @@ import ( "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" diff --git a/internal/datacoord/server_test.go b/internal/datacoord/server_test.go index e6f13a5c874f0..0d512318f618f 100644 --- a/internal/datacoord/server_test.go +++ b/internal/datacoord/server_test.go @@ -41,17 +41,17 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/etcd" diff --git a/internal/datacoord/services.go b/internal/datacoord/services.go index b363a2bf63529..ca9db5a22c0e2 100644 --- a/internal/datacoord/services.go +++ b/internal/datacoord/services.go @@ -24,12 +24,12 @@ import ( "sync/atomic" "time" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/logutil" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/retry" diff --git a/internal/datacoord/session_manager.go b/internal/datacoord/session_manager.go index 74d2031279a93..9cadc30f2d2bc 100644 --- a/internal/datacoord/session_manager.go +++ b/internal/datacoord/session_manager.go @@ -22,9 +22,9 @@ import ( "sync" "time" + "github.com/milvus-io/milvus/api/commonpb" grpcdatanodeclient "github.com/milvus-io/milvus/internal/distributed/datanode/client" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/types" "go.uber.org/zap" diff --git a/internal/datacoord/util.go b/internal/datacoord/util.go index 63d75f92149e0..eae1ea0e05ec4 100644 --- a/internal/datacoord/util.go +++ b/internal/datacoord/util.go @@ -22,10 +22,10 @@ import ( "sync" "time" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/datacoord/util_test.go b/internal/datacoord/util_test.go index 7d609bbc46637..94f20f34aff33 100644 --- a/internal/datacoord/util_test.go +++ b/internal/datacoord/util_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/util/tsoutil" diff --git a/internal/datanode/allocator.go b/internal/datanode/allocator.go index dc73fc212246d..b72c3c80e9b33 100644 --- a/internal/datanode/allocator.go +++ b/internal/datanode/allocator.go @@ -22,7 +22,7 @@ import ( "path" "strconv" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/types" ) diff --git a/internal/datanode/binlog_io_test.go b/internal/datanode/binlog_io_test.go index 6c63e78474921..074b160e69ae4 100644 --- a/internal/datanode/binlog_io_test.go +++ b/internal/datanode/binlog_io_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/datanode/compactor.go b/internal/datanode/compactor.go index 180c68ab2e221..d576209b6f187 100644 --- a/internal/datanode/compactor.go +++ b/internal/datanode/compactor.go @@ -25,11 +25,11 @@ import ( "sync" "time" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/timerecord" diff --git a/internal/datanode/compactor_test.go b/internal/datanode/compactor_test.go index f361514cb8927..06c9a2c5114fb 100644 --- a/internal/datanode/compactor_test.go +++ b/internal/datanode/compactor_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" memkv "github.com/milvus-io/milvus/internal/kv/mem" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/datanode/data_node.go b/internal/datanode/data_node.go index 18ef8fa6ad990..a40f09d6fe61c 100644 --- a/internal/datanode/data_node.go +++ b/internal/datanode/data_node.go @@ -39,19 +39,19 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" allocator2 "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" diff --git a/internal/datanode/data_node_test.go b/internal/datanode/data_node_test.go index a842605a98461..75d0ba1539428 100644 --- a/internal/datanode/data_node_test.go +++ b/internal/datanode/data_node_test.go @@ -36,12 +36,12 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/etcd" "github.com/milvus-io/milvus/internal/util/metricsinfo" diff --git a/internal/datanode/data_sync_service.go b/internal/datanode/data_sync_service.go index b1eba4e935bd4..2d5a742b88a17 100644 --- a/internal/datanode/data_sync_service.go +++ b/internal/datanode/data_sync_service.go @@ -23,10 +23,10 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" diff --git a/internal/datanode/data_sync_service_test.go b/internal/datanode/data_sync_service_test.go index b05dbd7b4456c..ec78dd940f65e 100644 --- a/internal/datanode/data_sync_service_test.go +++ b/internal/datanode/data_sync_service_test.go @@ -28,13 +28,13 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/dependency" ) diff --git a/internal/datanode/flow_graph_dd_node.go b/internal/datanode/flow_graph_dd_node.go index 8c366876468d2..231abea3976d1 100644 --- a/internal/datanode/flow_graph_dd_node.go +++ b/internal/datanode/flow_graph_dd_node.go @@ -27,11 +27,11 @@ import ( "github.com/opentracing/opentracing-go" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/util/flowgraph" diff --git a/internal/datanode/flow_graph_dd_node_test.go b/internal/datanode/flow_graph_dd_node_test.go index afd27acb15fe7..1e10d69af3fcb 100644 --- a/internal/datanode/flow_graph_dd_node_test.go +++ b/internal/datanode/flow_graph_dd_node_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" diff --git a/internal/datanode/flow_graph_delete_node.go b/internal/datanode/flow_graph_delete_node.go index ab4667e51a561..b2ec7a93bbc1a 100644 --- a/internal/datanode/flow_graph_delete_node.go +++ b/internal/datanode/flow_graph_delete_node.go @@ -26,12 +26,12 @@ import ( "github.com/opentracing/opentracing-go" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/retry" "github.com/milvus-io/milvus/internal/util/trace" diff --git a/internal/datanode/flow_graph_delete_node_test.go b/internal/datanode/flow_graph_delete_node_test.go index 220035aea33b3..d06ba2cd4ef31 100644 --- a/internal/datanode/flow_graph_delete_node_test.go +++ b/internal/datanode/flow_graph_delete_node_test.go @@ -25,9 +25,9 @@ import ( "github.com/milvus-io/milvus/internal/util/retry" "github.com/bits-and-blooms/bloom/v3" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/flowgraph" "github.com/stretchr/testify/assert" diff --git a/internal/datanode/flow_graph_insert_buffer_node.go b/internal/datanode/flow_graph_insert_buffer_node.go index 6a59d980840c3..5fc652d599fb8 100644 --- a/internal/datanode/flow_graph_insert_buffer_node.go +++ b/internal/datanode/flow_graph_insert_buffer_node.go @@ -29,13 +29,13 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/retry" diff --git a/internal/datanode/flow_graph_insert_buffer_node_test.go b/internal/datanode/flow_graph_insert_buffer_node_test.go index dda842428e323..5c491e4fdf4c5 100644 --- a/internal/datanode/flow_graph_insert_buffer_node_test.go +++ b/internal/datanode/flow_graph_insert_buffer_node_test.go @@ -38,11 +38,11 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) var insertNodeTestDir = "/tmp/milvus_test/insert_node" diff --git a/internal/datanode/flow_graph_manager_test.go b/internal/datanode/flow_graph_manager_test.go index 75de8d3a81e90..99c773a20a006 100644 --- a/internal/datanode/flow_graph_manager_test.go +++ b/internal/datanode/flow_graph_manager_test.go @@ -20,9 +20,9 @@ import ( "context" "testing" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/etcd" "github.com/stretchr/testify/assert" diff --git a/internal/datanode/flush_manager.go b/internal/datanode/flush_manager.go index 9379cede75a5f..a5ded2b164add 100644 --- a/internal/datanode/flush_manager.go +++ b/internal/datanode/flush_manager.go @@ -27,10 +27,10 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/internalpb" diff --git a/internal/datanode/flush_manager_test.go b/internal/datanode/flush_manager_test.go index b88bba7dae81a..ded516629a317 100644 --- a/internal/datanode/flush_manager_test.go +++ b/internal/datanode/flush_manager_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/retry" "github.com/stretchr/testify/assert" diff --git a/internal/datanode/meta_service.go b/internal/datanode/meta_service.go index d3e7c41cc1279..481aed9cdf5cb 100644 --- a/internal/datanode/meta_service.go +++ b/internal/datanode/meta_service.go @@ -23,10 +23,10 @@ import ( "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) // metaService initialize replica collections in data node from root coord. diff --git a/internal/datanode/meta_service_test.go b/internal/datanode/meta_service_test.go index ee66afefb644f..ab7c46caaf047 100644 --- a/internal/datanode/meta_service_test.go +++ b/internal/datanode/meta_service_test.go @@ -21,9 +21,9 @@ import ( "errors" "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/datanode/metrics_info.go b/internal/datanode/metrics_info.go index 7fcf42319de7d..10a68ccc3448e 100644 --- a/internal/datanode/metrics_info.go +++ b/internal/datanode/metrics_info.go @@ -19,9 +19,9 @@ package datanode import ( "context" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/ratelimitutil" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/datanode/mock_test.go b/internal/datanode/mock_test.go index 87de4ca17d072..8e75772d37346 100644 --- a/internal/datanode/mock_test.go +++ b/internal/datanode/mock_test.go @@ -38,14 +38,14 @@ import ( "github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/etcd" ) diff --git a/internal/datanode/segment_replica.go b/internal/datanode/segment_replica.go index bb96f68b4f149..97343800cd716 100644 --- a/internal/datanode/segment_replica.go +++ b/internal/datanode/segment_replica.go @@ -26,12 +26,12 @@ import ( "github.com/bits-and-blooms/bloom/v3" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/datanode/segment_replica_test.go b/internal/datanode/segment_replica_test.go index 51adef3390d50..4447dc4f2c8c4 100644 --- a/internal/datanode/segment_replica_test.go +++ b/internal/datanode/segment_replica_test.go @@ -30,10 +30,10 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" ) diff --git a/internal/distributed/datacoord/client/client.go b/internal/distributed/datacoord/client/client.go index 76666ceb4d25e..c5de5b2916335 100644 --- a/internal/distributed/datacoord/client/client.go +++ b/internal/distributed/datacoord/client/client.go @@ -20,11 +20,11 @@ import ( "context" "fmt" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/grpcclient" diff --git a/internal/distributed/datacoord/service.go b/internal/distributed/datacoord/service.go index 48a8a9517e98d..8759e50ba359f 100644 --- a/internal/distributed/datacoord/service.go +++ b/internal/distributed/datacoord/service.go @@ -33,12 +33,12 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/keepalive" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/datacoord" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/etcd" diff --git a/internal/distributed/datacoord/service_test.go b/internal/distributed/datacoord/service_test.go index 2253ada829489..c3ddd13188503 100644 --- a/internal/distributed/datacoord/service_test.go +++ b/internal/distributed/datacoord/service_test.go @@ -21,11 +21,11 @@ import ( "errors" "testing" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/types" "github.com/stretchr/testify/assert" clientv3 "go.etcd.io/etcd/client/v3" diff --git a/internal/distributed/datanode/client/client.go b/internal/distributed/datanode/client/client.go index c7928bb183b50..2ea6fcb2804c6 100644 --- a/internal/distributed/datanode/client/client.go +++ b/internal/distributed/datanode/client/client.go @@ -20,10 +20,10 @@ import ( "context" "fmt" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/grpcclient" "github.com/milvus-io/milvus/internal/util/paramtable" diff --git a/internal/distributed/datanode/service.go b/internal/distributed/datanode/service.go index b6cc3befa7cf1..54700a7d72395 100644 --- a/internal/distributed/datanode/service.go +++ b/internal/distributed/datanode/service.go @@ -33,14 +33,14 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/keepalive" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" dn "github.com/milvus-io/milvus/internal/datanode" dcc "github.com/milvus-io/milvus/internal/distributed/datacoord/client" rcc "github.com/milvus-io/milvus/internal/distributed/rootcoord/client" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/etcd" diff --git a/internal/distributed/datanode/service_test.go b/internal/distributed/datanode/service_test.go index 4a7471bfca87a..ca8a7e224f18e 100644 --- a/internal/distributed/datanode/service_test.go +++ b/internal/distributed/datanode/service_test.go @@ -22,10 +22,10 @@ import ( "fmt" "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/stretchr/testify/assert" diff --git a/internal/distributed/indexcoord/client/client.go b/internal/distributed/indexcoord/client/client.go index f319b9509d39b..bbfa89797a509 100644 --- a/internal/distributed/indexcoord/client/client.go +++ b/internal/distributed/indexcoord/client/client.go @@ -24,11 +24,11 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/grpcclient" "github.com/milvus-io/milvus/internal/util/paramtable" diff --git a/internal/distributed/indexcoord/client/client_test.go b/internal/distributed/indexcoord/client/client_test.go index 25e5827dd701a..f8a1755fb8151 100644 --- a/internal/distributed/indexcoord/client/client_test.go +++ b/internal/distributed/indexcoord/client/client_test.go @@ -22,13 +22,13 @@ import ( "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" grpcindexcoord "github.com/milvus-io/milvus/internal/distributed/indexcoord" "github.com/milvus-io/milvus/internal/indexcoord" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/etcd" "github.com/milvus-io/milvus/internal/util/sessionutil" diff --git a/internal/distributed/indexcoord/service.go b/internal/distributed/indexcoord/service.go index 115dfd67e48cb..efd61f4cd2e66 100644 --- a/internal/distributed/indexcoord/service.go +++ b/internal/distributed/indexcoord/service.go @@ -31,15 +31,15 @@ import ( grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" ot "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" dcc "github.com/milvus-io/milvus/internal/distributed/datacoord/client" rcc "github.com/milvus-io/milvus/internal/distributed/rootcoord/client" "github.com/milvus-io/milvus/internal/indexcoord" ic "github.com/milvus-io/milvus/internal/indexcoord" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/etcd" diff --git a/internal/distributed/indexcoord/service_test.go b/internal/distributed/indexcoord/service_test.go index fb2a4f32864c6..2250ca47d8370 100644 --- a/internal/distributed/indexcoord/service_test.go +++ b/internal/distributed/indexcoord/service_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/indexcoord" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/distributed/indexnode/client/client.go b/internal/distributed/indexnode/client/client.go index e395f0a9a021f..c6093d64ec635 100644 --- a/internal/distributed/indexnode/client/client.go +++ b/internal/distributed/indexnode/client/client.go @@ -22,10 +22,10 @@ import ( "google.golang.org/grpc" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/grpcclient" "github.com/milvus-io/milvus/internal/util/paramtable" diff --git a/internal/distributed/indexnode/client/client_test.go b/internal/distributed/indexnode/client/client_test.go index b9c2cf7a44806..a1d66a430ef40 100644 --- a/internal/distributed/indexnode/client/client_test.go +++ b/internal/distributed/indexnode/client/client_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/grpc" + "github.com/milvus-io/milvus/api/commonpb" grpcindexnode "github.com/milvus-io/milvus/internal/distributed/indexnode" "github.com/milvus-io/milvus/internal/indexnode" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/util/dependency" diff --git a/internal/distributed/indexnode/service.go b/internal/distributed/indexnode/service.go index d87ff81d04961..1a36c66b774d3 100644 --- a/internal/distributed/indexnode/service.go +++ b/internal/distributed/indexnode/service.go @@ -32,12 +32,12 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/keepalive" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/indexnode" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/etcd" diff --git a/internal/distributed/indexnode/service_test.go b/internal/distributed/indexnode/service_test.go index b7a6b59544d1d..7bf43bdb76aaf 100644 --- a/internal/distributed/indexnode/service_test.go +++ b/internal/distributed/indexnode/service_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/indexnode" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/util/dependency" diff --git a/internal/distributed/proxy/client/client.go b/internal/distributed/proxy/client/client.go index fefdbf79b5c62..b00c9fc368e08 100644 --- a/internal/distributed/proxy/client/client.go +++ b/internal/distributed/proxy/client/client.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/grpcclient" diff --git a/internal/distributed/proxy/httpserver/handler.go b/internal/distributed/proxy/httpserver/handler.go index 2f27d79858e97..ec13cfdb896f0 100644 --- a/internal/distributed/proxy/httpserver/handler.go +++ b/internal/distributed/proxy/httpserver/handler.go @@ -5,7 +5,7 @@ import ( "github.com/gin-gonic/gin" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/types" ) diff --git a/internal/distributed/proxy/httpserver/handler_test.go b/internal/distributed/proxy/httpserver/handler_test.go index 55d77bdad592e..3cfe8d0617699 100644 --- a/internal/distributed/proxy/httpserver/handler_test.go +++ b/internal/distributed/proxy/httpserver/handler_test.go @@ -12,9 +12,9 @@ import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/types" "github.com/stretchr/testify/assert" ) diff --git a/internal/distributed/proxy/httpserver/wrap_request.go b/internal/distributed/proxy/httpserver/wrap_request.go index 360cc073da5b2..489373eb1b520 100644 --- a/internal/distributed/proxy/httpserver/wrap_request.go +++ b/internal/distributed/proxy/httpserver/wrap_request.go @@ -8,9 +8,9 @@ import ( "reflect" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" ) // We wrap original protobuf structure for 2 reasons: diff --git a/internal/distributed/proxy/httpserver/wrap_request_test.go b/internal/distributed/proxy/httpserver/wrap_request_test.go index e5d224e996a85..b984b88907848 100644 --- a/internal/distributed/proxy/httpserver/wrap_request_test.go +++ b/internal/distributed/proxy/httpserver/wrap_request_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/distributed/proxy/httpserver/wrapper.go b/internal/distributed/proxy/httpserver/wrapper.go index def013184c5fe..e8ddc63c81220 100644 --- a/internal/distributed/proxy/httpserver/wrapper.go +++ b/internal/distributed/proxy/httpserver/wrapper.go @@ -7,7 +7,7 @@ import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" ) var ( diff --git a/internal/distributed/proxy/service.go b/internal/distributed/proxy/service.go index 3b542ac3b9c03..2c3dccd199e5e 100644 --- a/internal/distributed/proxy/service.go +++ b/internal/distributed/proxy/service.go @@ -47,15 +47,15 @@ import ( "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/grpc/keepalive" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" dcc "github.com/milvus-io/milvus/internal/distributed/datacoord/client" icc "github.com/milvus-io/milvus/internal/distributed/indexcoord/client" "github.com/milvus-io/milvus/internal/distributed/proxy/httpserver" qcc "github.com/milvus-io/milvus/internal/distributed/querycoord/client" rcc "github.com/milvus-io/milvus/internal/distributed/rootcoord/client" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proxy" "github.com/milvus-io/milvus/internal/types" diff --git a/internal/distributed/proxy/service_test.go b/internal/distributed/proxy/service_test.go index dde4ab93a069a..e8cd41f75d6b5 100644 --- a/internal/distributed/proxy/service_test.go +++ b/internal/distributed/proxy/service_test.go @@ -32,12 +32,12 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" diff --git a/internal/distributed/querycoord/client/client.go b/internal/distributed/querycoord/client/client.go index 27c074844c01e..c9a996d2eb94c 100644 --- a/internal/distributed/querycoord/client/client.go +++ b/internal/distributed/querycoord/client/client.go @@ -20,10 +20,10 @@ import ( "context" "fmt" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/grpcclient" diff --git a/internal/distributed/querycoord/service.go b/internal/distributed/querycoord/service.go index 507625ef15e03..35068278c40f6 100644 --- a/internal/distributed/querycoord/service.go +++ b/internal/distributed/querycoord/service.go @@ -31,13 +31,13 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/keepalive" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" dcc "github.com/milvus-io/milvus/internal/distributed/datacoord/client" icc "github.com/milvus-io/milvus/internal/distributed/indexcoord/client" rcc "github.com/milvus-io/milvus/internal/distributed/rootcoord/client" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" qc "github.com/milvus-io/milvus/internal/querycoordv2" "github.com/milvus-io/milvus/internal/types" diff --git a/internal/distributed/querycoord/service_test.go b/internal/distributed/querycoord/service_test.go index 167426ffcfab1..bb0386b281d97 100644 --- a/internal/distributed/querycoord/service_test.go +++ b/internal/distributed/querycoord/service_test.go @@ -24,9 +24,9 @@ import ( "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/stretchr/testify/assert" clientv3 "go.etcd.io/etcd/client/v3" diff --git a/internal/distributed/querynode/client/client.go b/internal/distributed/querynode/client/client.go index f4d8132f42451..f78a11f1c218a 100644 --- a/internal/distributed/querynode/client/client.go +++ b/internal/distributed/querynode/client/client.go @@ -22,9 +22,9 @@ import ( "google.golang.org/grpc" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/grpcclient" diff --git a/internal/distributed/querynode/service.go b/internal/distributed/querynode/service.go index d1797ed31acf2..f1a7936e8d24b 100644 --- a/internal/distributed/querynode/service.go +++ b/internal/distributed/querynode/service.go @@ -32,10 +32,10 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/keepalive" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" qn "github.com/milvus-io/milvus/internal/querynode" "github.com/milvus-io/milvus/internal/types" diff --git a/internal/distributed/querynode/service_test.go b/internal/distributed/querynode/service_test.go index 57bfa71e29bfc..b98f807c71161 100644 --- a/internal/distributed/querynode/service_test.go +++ b/internal/distributed/querynode/service_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" clientv3 "go.etcd.io/etcd/client/v3" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" ) diff --git a/internal/distributed/rootcoord/client/client.go b/internal/distributed/rootcoord/client/client.go index 45c2f46bc208d..6d89979467b66 100644 --- a/internal/distributed/rootcoord/client/client.go +++ b/internal/distributed/rootcoord/client/client.go @@ -20,10 +20,10 @@ import ( "context" "fmt" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/util/funcutil" diff --git a/internal/distributed/rootcoord/service.go b/internal/distributed/rootcoord/service.go index 331352375db8a..5cd472217ac0a 100644 --- a/internal/distributed/rootcoord/service.go +++ b/internal/distributed/rootcoord/service.go @@ -31,11 +31,11 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/keepalive" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" pnc "github.com/milvus-io/milvus/internal/distributed/proxy/client" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/rootcoord" diff --git a/internal/distributed/rootcoord/service_test.go b/internal/distributed/rootcoord/service_test.go index 2d7c582ed04c4..7dccd3ddfd3ff 100644 --- a/internal/distributed/rootcoord/service_test.go +++ b/internal/distributed/rootcoord/service_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/rootcoord" diff --git a/internal/indexcoord/flush_segment_watcher.go b/internal/indexcoord/flush_segment_watcher.go index bcc94c4d68e6e..bdf0036eb3b07 100644 --- a/internal/indexcoord/flush_segment_watcher.go +++ b/internal/indexcoord/flush_segment_watcher.go @@ -29,10 +29,10 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util" diff --git a/internal/indexcoord/flushed_segment_watcher_test.go b/internal/indexcoord/flushed_segment_watcher_test.go index d22ae40da8444..2a019c0abde9e 100644 --- a/internal/indexcoord/flushed_segment_watcher_test.go +++ b/internal/indexcoord/flushed_segment_watcher_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/metastore/kv/indexcoord" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" ) diff --git a/internal/indexcoord/garbage_collector.go b/internal/indexcoord/garbage_collector.go index 495551bd2b46a..8299ff8eebd09 100644 --- a/internal/indexcoord/garbage_collector.go +++ b/internal/indexcoord/garbage_collector.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "go.uber.org/zap" diff --git a/internal/indexcoord/index_builder.go b/internal/indexcoord/index_builder.go index 4f94d0c9b4049..9e3b4e1dd9b21 100644 --- a/internal/indexcoord/index_builder.go +++ b/internal/indexcoord/index_builder.go @@ -25,9 +25,9 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" ) diff --git a/internal/indexcoord/index_builder_test.go b/internal/indexcoord/index_builder_test.go index f8a5e4322743f..64c7813e42251 100644 --- a/internal/indexcoord/index_builder_test.go +++ b/internal/indexcoord/index_builder_test.go @@ -30,8 +30,8 @@ import ( "github.com/milvus-io/milvus/internal/metastore/kv/indexcoord" "github.com/milvus-io/milvus/internal/metastore/model" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/indexnode" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/types" "github.com/stretchr/testify/assert" ) diff --git a/internal/indexcoord/index_coord.go b/internal/indexcoord/index_coord.go index 10eaf2a3c1e13..afb883009fe0a 100644 --- a/internal/indexcoord/index_coord.go +++ b/internal/indexcoord/index_coord.go @@ -33,17 +33,17 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util" diff --git a/internal/indexcoord/index_coord_mock.go b/internal/indexcoord/index_coord_mock.go index 3513cadd8610b..5b11297f631cf 100644 --- a/internal/indexcoord/index_coord_mock.go +++ b/internal/indexcoord/index_coord_mock.go @@ -23,12 +23,12 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" diff --git a/internal/indexcoord/index_coord_test.go b/internal/indexcoord/index_coord_test.go index 412b94bbe29b4..30c4667ce9862 100644 --- a/internal/indexcoord/index_coord_test.go +++ b/internal/indexcoord/index_coord_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/indexnode" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" diff --git a/internal/indexcoord/meta_table.go b/internal/indexcoord/meta_table.go index 2351129578919..a53f254c52d1b 100644 --- a/internal/indexcoord/meta_table.go +++ b/internal/indexcoord/meta_table.go @@ -26,13 +26,13 @@ import ( "github.com/golang/protobuf/proto" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/kv/indexcoord" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/util/tsoutil" ) diff --git a/internal/indexcoord/meta_table_test.go b/internal/indexcoord/meta_table_test.go index dfed9f8a329c1..ce39ad3dfcec3 100644 --- a/internal/indexcoord/meta_table_test.go +++ b/internal/indexcoord/meta_table_test.go @@ -23,10 +23,10 @@ import ( "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/kv/indexcoord" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/util" "github.com/stretchr/testify/assert" diff --git a/internal/indexcoord/metrics_info.go b/internal/indexcoord/metrics_info.go index c7d158ffd0636..05e3bf43e055a 100644 --- a/internal/indexcoord/metrics_info.go +++ b/internal/indexcoord/metrics_info.go @@ -21,10 +21,10 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/milvus-io/milvus/internal/util/uniquegenerator" diff --git a/internal/indexcoord/node_manager.go b/internal/indexcoord/node_manager.go index 26c1c673bbb4e..d5cfe7806fddc 100644 --- a/internal/indexcoord/node_manager.go +++ b/internal/indexcoord/node_manager.go @@ -22,13 +22,13 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" grpcindexnodeclient "github.com/milvus-io/milvus/internal/distributed/indexnode/client" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/types" ) diff --git a/internal/indexcoord/node_manager_test.go b/internal/indexcoord/node_manager_test.go index 18f7feee5417a..bf21c1e1d93ef 100644 --- a/internal/indexcoord/node_manager_test.go +++ b/internal/indexcoord/node_manager_test.go @@ -21,9 +21,9 @@ import ( "errors" "testing" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/indexnode" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/types" "github.com/stretchr/testify/assert" diff --git a/internal/indexcoord/peek_client_policy.go b/internal/indexcoord/peek_client_policy.go index 0f258d8d9f29d..2e28d0d7f5aab 100644 --- a/internal/indexcoord/peek_client_policy.go +++ b/internal/indexcoord/peek_client_policy.go @@ -16,7 +16,7 @@ package indexcoord -import "github.com/milvus-io/milvus/internal/proto/commonpb" +import "github.com/milvus-io/milvus/api/commonpb" // PeekClientPolicy defines how to choose IndexNode. type PeekClientPolicy func(memorySize uint64, indexParams []*commonpb.KeyValuePair, diff --git a/internal/indexcoord/peek_client_policy_test.go b/internal/indexcoord/peek_client_policy_test.go index b2040b5f96d81..31e7891753c83 100644 --- a/internal/indexcoord/peek_client_policy_test.go +++ b/internal/indexcoord/peek_client_policy_test.go @@ -19,7 +19,7 @@ package indexcoord import ( "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/stretchr/testify/assert" ) diff --git a/internal/indexcoord/priority_queue.go b/internal/indexcoord/priority_queue.go index 6203b6e8044db..86e3cfb0e5997 100644 --- a/internal/indexcoord/priority_queue.go +++ b/internal/indexcoord/priority_queue.go @@ -20,7 +20,7 @@ import ( "container/heap" "sync" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" ) // PQItem is something we manage in a priority queue. diff --git a/internal/indexcoord/priority_queue_test.go b/internal/indexcoord/priority_queue_test.go index 9e1f6a7d5334f..aed21d534a3bd 100644 --- a/internal/indexcoord/priority_queue_test.go +++ b/internal/indexcoord/priority_queue_test.go @@ -20,7 +20,7 @@ import ( "container/heap" "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/stretchr/testify/assert" ) diff --git a/internal/indexcoord/task.go b/internal/indexcoord/task.go index 30ba67eff5075..201231512cba3 100644 --- a/internal/indexcoord/task.go +++ b/internal/indexcoord/task.go @@ -22,9 +22,9 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" diff --git a/internal/indexcoord/util.go b/internal/indexcoord/util.go index 0f3bfb6edfcac..37c6a86482bb1 100644 --- a/internal/indexcoord/util.go +++ b/internal/indexcoord/util.go @@ -21,9 +21,9 @@ import ( "strconv" "strings" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/indexpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) // getDimension gets the dimension of data from building index request. diff --git a/internal/indexcoord/util_test.go b/internal/indexcoord/util_test.go index b27e12ad6596c..e11860ecb11cd 100644 --- a/internal/indexcoord/util_test.go +++ b/internal/indexcoord/util_test.go @@ -19,9 +19,9 @@ package indexcoord import ( "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/indexpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/indexnode/chunkmgr_mock.go b/internal/indexnode/chunkmgr_mock.go index ae486a4a6ec8d..23ba6cd4b7f31 100644 --- a/internal/indexnode/chunkmgr_mock.go +++ b/internal/indexnode/chunkmgr_mock.go @@ -9,11 +9,11 @@ import ( "golang.org/x/exp/mmap" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/indexpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/paramtable" ) diff --git a/internal/indexnode/indexnode.go b/internal/indexnode/indexnode.go index 8a896f4b83db7..578b8cbc036e6 100644 --- a/internal/indexnode/indexnode.go +++ b/internal/indexnode/indexnode.go @@ -41,11 +41,11 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/paramtable" diff --git a/internal/indexnode/indexnode_mock.go b/internal/indexnode/indexnode_mock.go index 268ee6c4c4e9b..8a8e0c562ca62 100644 --- a/internal/indexnode/indexnode_mock.go +++ b/internal/indexnode/indexnode_mock.go @@ -21,10 +21,10 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/indexnode/indexnode_service.go b/internal/indexnode/indexnode_service.go index 38882d2231c95..2205b05a5aa8c 100644 --- a/internal/indexnode/indexnode_service.go +++ b/internal/indexnode/indexnode_service.go @@ -10,12 +10,12 @@ import ( "github.com/golang/protobuf/proto" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/logutil" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/timerecord" diff --git a/internal/indexnode/indexnode_service_test.go b/internal/indexnode/indexnode_service_test.go index a4ebe1df72295..29d7300bb7819 100644 --- a/internal/indexnode/indexnode_service_test.go +++ b/internal/indexnode/indexnode_service_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/metricsinfo" ) diff --git a/internal/indexnode/indexnode_test.go b/internal/indexnode/indexnode_test.go index 5cdc865ceeeda..59fa48fd4fa56 100644 --- a/internal/indexnode/indexnode_test.go +++ b/internal/indexnode/indexnode_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/stretchr/testify/assert" ) diff --git a/internal/indexnode/metrics_info.go b/internal/indexnode/metrics_info.go index 5e92089e276d0..2974ad2aedf79 100644 --- a/internal/indexnode/metrics_info.go +++ b/internal/indexnode/metrics_info.go @@ -19,9 +19,9 @@ package indexnode import ( "context" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/indexnode/task.go b/internal/indexnode/task.go index 3db617fcde8cf..9d44fb7a4d9d0 100644 --- a/internal/indexnode/task.go +++ b/internal/indexnode/task.go @@ -27,10 +27,10 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/indexcgowrapper" diff --git a/internal/indexnode/task_scheduler.go b/internal/indexnode/task_scheduler.go index 5673f48ce1a61..c5c3219e9f590 100644 --- a/internal/indexnode/task_scheduler.go +++ b/internal/indexnode/task_scheduler.go @@ -25,8 +25,8 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/util/logutil" ) diff --git a/internal/indexnode/task_scheduler_test.go b/internal/indexnode/task_scheduler_test.go index f8c0a9307f9b6..b2622b5cd2c7f 100644 --- a/internal/indexnode/task_scheduler_test.go +++ b/internal/indexnode/task_scheduler_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/stretchr/testify/assert" ) diff --git a/internal/indexnode/task_test.go b/internal/indexnode/task_test.go index 0b1a0ec69a126..80c1c0512bf2e 100644 --- a/internal/indexnode/task_test.go +++ b/internal/indexnode/task_test.go @@ -28,7 +28,7 @@ package indexnode // "github.com/golang/protobuf/proto" // etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" -// "github.com/milvus-io/milvus/internal/proto/commonpb" +// "github.com/milvus-io/milvus/api/commonpb" // "github.com/milvus-io/milvus/internal/proto/indexpb" // "github.com/milvus-io/milvus/internal/storage" // "github.com/milvus-io/milvus/internal/util/etcd" diff --git a/internal/indexnode/taskinfo_ops.go b/internal/indexnode/taskinfo_ops.go index c00e2bf4596bf..8aeb6bb3776e6 100644 --- a/internal/indexnode/taskinfo_ops.go +++ b/internal/indexnode/taskinfo_ops.go @@ -5,7 +5,7 @@ import ( "github.com/milvus-io/milvus/internal/log" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" ) diff --git a/internal/metastore/catalog.go b/internal/metastore/catalog.go index ec3c384d3baaf..97d5bb31d8a07 100644 --- a/internal/metastore/catalog.go +++ b/internal/metastore/catalog.go @@ -3,9 +3,9 @@ package metastore import ( "context" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/metastore/db/dao/collection_test.go b/internal/metastore/db/dao/collection_test.go index d5bd55c204fbd..d17c3cebdb435 100644 --- a/internal/metastore/db/dao/collection_test.go +++ b/internal/metastore/db/dao/collection_test.go @@ -10,9 +10,9 @@ import ( "time" "github.com/DATA-DOG/go-sqlmock" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/metastore/db/dbcore" "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/stretchr/testify/assert" "gorm.io/driver/mysql" diff --git a/internal/metastore/db/dao/field_test.go b/internal/metastore/db/dao/field_test.go index afe6f4504aa68..fcc48cdf18f0f 100644 --- a/internal/metastore/db/dao/field_test.go +++ b/internal/metastore/db/dao/field_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/DATA-DOG/go-sqlmock" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/metastore/db/dbmodel/collection.go b/internal/metastore/db/dbmodel/collection.go index 113e1f7c2de7f..344a58e00b05f 100644 --- a/internal/metastore/db/dbmodel/collection.go +++ b/internal/metastore/db/dbmodel/collection.go @@ -4,9 +4,9 @@ import ( "encoding/json" "time" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" ) diff --git a/internal/metastore/db/dbmodel/field.go b/internal/metastore/db/dbmodel/field.go index 3cfbd5c40084f..6c86eb9284b9f 100644 --- a/internal/metastore/db/dbmodel/field.go +++ b/internal/metastore/db/dbmodel/field.go @@ -4,10 +4,10 @@ import ( "encoding/json" "time" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" diff --git a/internal/metastore/db/dbmodel/index.go b/internal/metastore/db/dbmodel/index.go index 3e21e41654219..ee0be148f5d93 100644 --- a/internal/metastore/db/dbmodel/index.go +++ b/internal/metastore/db/dbmodel/index.go @@ -4,10 +4,10 @@ import ( "encoding/json" "time" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" diff --git a/internal/metastore/db/dbmodel/role.go b/internal/metastore/db/dbmodel/role.go index 38546c9ba0d6e..51fc3147bf5bb 100644 --- a/internal/metastore/db/dbmodel/role.go +++ b/internal/metastore/db/dbmodel/role.go @@ -1,6 +1,6 @@ package dbmodel -import "github.com/milvus-io/milvus/internal/proto/milvuspb" +import "github.com/milvus-io/milvus/api/milvuspb" type Role struct { Base diff --git a/internal/metastore/db/dbmodel/segment_index.go b/internal/metastore/db/dbmodel/segment_index.go index ae376c0b6c51e..55c7c5c6afcb5 100644 --- a/internal/metastore/db/dbmodel/segment_index.go +++ b/internal/metastore/db/dbmodel/segment_index.go @@ -4,7 +4,7 @@ import ( "encoding/json" "time" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" diff --git a/internal/metastore/db/indexcoord/table_catalog_test.go b/internal/metastore/db/indexcoord/table_catalog_test.go index 5451d1cafab99..35639ce3a47e1 100644 --- a/internal/metastore/db/indexcoord/table_catalog_test.go +++ b/internal/metastore/db/indexcoord/table_catalog_test.go @@ -10,7 +10,7 @@ package indexcoord // "github.com/milvus-io/milvus/internal/metastore" // "github.com/milvus-io/milvus/internal/metastore/db/dbmodel/mocks" // "github.com/milvus-io/milvus/internal/metastore/model" -// "github.com/milvus-io/milvus/internal/proto/commonpb" +// "github.com/milvus-io/milvus/api/commonpb" // "github.com/milvus-io/milvus/internal/util/contextutil" // "github.com/milvus-io/milvus/internal/util/typeutil" // "github.com/stretchr/testify/mock" diff --git a/internal/metastore/db/rootcoord/table_catalog.go b/internal/metastore/db/rootcoord/table_catalog.go index d05a6f818ed79..e111ea6ac86e8 100644 --- a/internal/metastore/db/rootcoord/table_catalog.go +++ b/internal/metastore/db/rootcoord/table_catalog.go @@ -15,10 +15,10 @@ import ( "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/contextutil" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/metastore/db/rootcoord/table_catalog_test.go b/internal/metastore/db/rootcoord/table_catalog_test.go index 4674d3e291e27..047b53acb1c85 100644 --- a/internal/metastore/db/rootcoord/table_catalog_test.go +++ b/internal/metastore/db/rootcoord/table_catalog_test.go @@ -12,13 +12,13 @@ import ( pb "github.com/milvus-io/milvus/internal/proto/etcdpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" "github.com/milvus-io/milvus/internal/metastore/db/dbmodel/mocks" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/contextutil" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/metastore/kv/datacoord/kv_catalog.go b/internal/metastore/kv/datacoord/kv_catalog.go index 65e1f901dad45..a07e3783b549a 100644 --- a/internal/metastore/kv/datacoord/kv_catalog.go +++ b/internal/metastore/kv/datacoord/kv_catalog.go @@ -22,9 +22,9 @@ import ( "strconv" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util" diff --git a/internal/metastore/kv/indexcoord/kv_catalog_test.go b/internal/metastore/kv/indexcoord/kv_catalog_test.go index a2151bd8e7bc8..f95f4d29896d9 100644 --- a/internal/metastore/kv/indexcoord/kv_catalog_test.go +++ b/internal/metastore/kv/indexcoord/kv_catalog_test.go @@ -8,9 +8,9 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" ) diff --git a/internal/metastore/kv/querycoord/kv_catalog.go b/internal/metastore/kv/querycoord/kv_catalog.go index d2c3977baa792..459abbc5c2a3e 100644 --- a/internal/metastore/kv/querycoord/kv_catalog.go +++ b/internal/metastore/kv/querycoord/kv_catalog.go @@ -8,8 +8,8 @@ import ( "github.com/samber/lo" clientv3 "go.etcd.io/etcd/client/v3" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util" ) diff --git a/internal/metastore/kv/rootcoord/kv_catalog.go b/internal/metastore/kv/rootcoord/kv_catalog.go index bbf42d664f22b..dc88227b6d8a7 100644 --- a/internal/metastore/kv/rootcoord/kv_catalog.go +++ b/internal/metastore/kv/rootcoord/kv_catalog.go @@ -13,14 +13,14 @@ import ( "github.com/golang/protobuf/proto" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/metastore/kv/rootcoord/kv_catalog_test.go b/internal/metastore/kv/rootcoord/kv_catalog_test.go index 2d851200a045d..e0e0303fb8a46 100644 --- a/internal/metastore/kv/rootcoord/kv_catalog_test.go +++ b/internal/metastore/kv/rootcoord/kv_catalog_test.go @@ -9,12 +9,12 @@ import ( "github.com/milvus-io/milvus/internal/metastore" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/stretchr/testify/assert" diff --git a/internal/metastore/model/collection.go b/internal/metastore/model/collection.go index 0b3f900d0aa1f..19226bb01e09a 100644 --- a/internal/metastore/model/collection.go +++ b/internal/metastore/model/collection.go @@ -1,10 +1,10 @@ package model import ( + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/commonpb" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) type Collection struct { diff --git a/internal/metastore/model/collection_test.go b/internal/metastore/model/collection_test.go index 768e1e5ea993d..06190261267bd 100644 --- a/internal/metastore/model/collection_test.go +++ b/internal/metastore/model/collection_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) var ( diff --git a/internal/metastore/model/field.go b/internal/metastore/model/field.go index e5a0bb484019f..017adaa82a3b9 100644 --- a/internal/metastore/model/field.go +++ b/internal/metastore/model/field.go @@ -3,8 +3,8 @@ package model import ( "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" ) type Field struct { diff --git a/internal/metastore/model/field_test.go b/internal/metastore/model/field_test.go index 426ffe29f78c3..fe57e290cecae 100644 --- a/internal/metastore/model/field_test.go +++ b/internal/metastore/model/field_test.go @@ -3,9 +3,9 @@ package model import ( "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/metastore/model/index.go b/internal/metastore/model/index.go index 8b4674e4663fc..378c2755930c1 100644 --- a/internal/metastore/model/index.go +++ b/internal/metastore/model/index.go @@ -2,7 +2,7 @@ package model import ( "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" ) diff --git a/internal/metastore/model/index_test.go b/internal/metastore/model/index_test.go index c054d7e9f787f..59c6ea175de48 100644 --- a/internal/metastore/model/index_test.go +++ b/internal/metastore/model/index_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" ) diff --git a/internal/metastore/model/segment.go b/internal/metastore/model/segment.go index 8d40e998ab970..4c8244571046b 100644 --- a/internal/metastore/model/segment.go +++ b/internal/metastore/model/segment.go @@ -1,7 +1,7 @@ package model import ( - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" ) type Segment struct { diff --git a/internal/metastore/model/segment_index.go b/internal/metastore/model/segment_index.go index a8a405e51a191..d4abb8d8ca985 100644 --- a/internal/metastore/model/segment_index.go +++ b/internal/metastore/model/segment_index.go @@ -1,7 +1,7 @@ package model import ( - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" ) diff --git a/internal/metastore/model/segment_index_test.go b/internal/metastore/model/segment_index_test.go index e75d29398ca84..974a49b24b4c5 100644 --- a/internal/metastore/model/segment_index_test.go +++ b/internal/metastore/model/segment_index_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" ) diff --git a/internal/mocks/mock_datacoord.go b/internal/mocks/mock_datacoord.go index 0c807b3c82860..5c4ef93fc4ffe 100644 --- a/internal/mocks/mock_datacoord.go +++ b/internal/mocks/mock_datacoord.go @@ -5,13 +5,13 @@ package mocks import ( context "context" - commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" + commonpb "github.com/milvus-io/milvus/api/commonpb" datapb "github.com/milvus-io/milvus/internal/proto/datapb" internalpb "github.com/milvus-io/milvus/internal/proto/internalpb" - milvuspb "github.com/milvus-io/milvus/internal/proto/milvuspb" + milvuspb "github.com/milvus-io/milvus/api/milvuspb" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/mocks/mock_datanode.go b/internal/mocks/mock_datanode.go index a829ed81f11aa..8bac89eadeb7a 100644 --- a/internal/mocks/mock_datanode.go +++ b/internal/mocks/mock_datanode.go @@ -5,13 +5,13 @@ package mocks import ( context "context" - commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" + commonpb "github.com/milvus-io/milvus/api/commonpb" datapb "github.com/milvus-io/milvus/internal/proto/datapb" internalpb "github.com/milvus-io/milvus/internal/proto/internalpb" - milvuspb "github.com/milvus-io/milvus/internal/proto/milvuspb" + milvuspb "github.com/milvus-io/milvus/api/milvuspb" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/mocks/mock_indexcoord.go b/internal/mocks/mock_indexcoord.go index f72578cd254a8..f2f03e05ff2ae 100644 --- a/internal/mocks/mock_indexcoord.go +++ b/internal/mocks/mock_indexcoord.go @@ -5,13 +5,13 @@ package mocks import ( context "context" - commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" + commonpb "github.com/milvus-io/milvus/api/commonpb" indexpb "github.com/milvus-io/milvus/internal/proto/indexpb" internalpb "github.com/milvus-io/milvus/internal/proto/internalpb" - milvuspb "github.com/milvus-io/milvus/internal/proto/milvuspb" + milvuspb "github.com/milvus-io/milvus/api/milvuspb" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/mocks/mock_rootcoord.go b/internal/mocks/mock_rootcoord.go index 6ec18fb042a96..3cdb50679f000 100644 --- a/internal/mocks/mock_rootcoord.go +++ b/internal/mocks/mock_rootcoord.go @@ -5,11 +5,11 @@ package mocks import ( context "context" - commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" + commonpb "github.com/milvus-io/milvus/api/commonpb" internalpb "github.com/milvus-io/milvus/internal/proto/internalpb" - milvuspb "github.com/milvus-io/milvus/internal/proto/milvuspb" + milvuspb "github.com/milvus-io/milvus/api/milvuspb" mock "github.com/stretchr/testify/mock" diff --git a/internal/mq/msgstream/mq_kafka_msgstream_test.go b/internal/mq/msgstream/mq_kafka_msgstream_test.go index 295de387d2cf2..c32935b742d66 100644 --- a/internal/mq/msgstream/mq_kafka_msgstream_test.go +++ b/internal/mq/msgstream/mq_kafka_msgstream_test.go @@ -29,7 +29,7 @@ import ( kafkawrapper "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper/kafka" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/stretchr/testify/assert" diff --git a/internal/mq/msgstream/mq_msgstream.go b/internal/mq/msgstream/mq_msgstream.go index a1ef8856e8971..1f9f4f82741a2 100644 --- a/internal/mq/msgstream/mq_msgstream.go +++ b/internal/mq/msgstream/mq_msgstream.go @@ -28,9 +28,9 @@ import ( "github.com/golang/protobuf/proto" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/util/retry" "github.com/milvus-io/milvus/internal/util/trace" diff --git a/internal/mq/msgstream/mq_msgstream_test.go b/internal/mq/msgstream/mq_msgstream_test.go index e0c758e555a1a..76dee1481618b 100644 --- a/internal/mq/msgstream/mq_msgstream_test.go +++ b/internal/mq/msgstream/mq_msgstream_test.go @@ -40,11 +40,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/common" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/util/etcd" "github.com/milvus-io/milvus/internal/util/funcutil" diff --git a/internal/mq/msgstream/msg.go b/internal/mq/msgstream/msg.go index 61e037077cb49..0fce1f43ce4a6 100644 --- a/internal/mq/msgstream/msg.go +++ b/internal/mq/msgstream/msg.go @@ -22,13 +22,13 @@ import ( "fmt" "time" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" diff --git a/internal/mq/msgstream/msg_test.go b/internal/mq/msgstream/msg_test.go index da1b52a97302c..c3bc22582c49d 100644 --- a/internal/mq/msgstream/msg_test.go +++ b/internal/mq/msgstream/msg_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) func TestBaseMsg(t *testing.T) { diff --git a/internal/mq/msgstream/repack_func.go b/internal/mq/msgstream/repack_func.go index c900645853e87..29a497ce0019f 100644 --- a/internal/mq/msgstream/repack_func.go +++ b/internal/mq/msgstream/repack_func.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" ) // InsertRepackFunc is used to repack messages after hash by primary key diff --git a/internal/mq/msgstream/trace.go b/internal/mq/msgstream/trace.go index 8cd9753895e46..3a26293f4f8a1 100644 --- a/internal/mq/msgstream/trace.go +++ b/internal/mq/msgstream/trace.go @@ -25,7 +25,7 @@ import ( "github.com/opentracing/opentracing-go/ext" "github.com/opentracing/opentracing-go/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/util/trace" ) diff --git a/internal/mq/msgstream/unmarshal.go b/internal/mq/msgstream/unmarshal.go index 5ff08926ded88..c64163be2bfa9 100644 --- a/internal/mq/msgstream/unmarshal.go +++ b/internal/mq/msgstream/unmarshal.go @@ -19,7 +19,7 @@ package msgstream import ( "errors" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" ) // UnmarshalFunc is an interface that has been implemented by each Msg diff --git a/internal/mq/msgstream/unmarshal_test.go b/internal/mq/msgstream/unmarshal_test.go index 694b3436a7824..ac1329b543d91 100644 --- a/internal/mq/msgstream/unmarshal_test.go +++ b/internal/mq/msgstream/unmarshal_test.go @@ -23,7 +23,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" ) diff --git a/internal/parser/planparserv2/node_ret.go b/internal/parser/planparserv2/node_ret.go index dd91f5f34638d..15f8e96baf3c1 100644 --- a/internal/parser/planparserv2/node_ret.go +++ b/internal/parser/planparserv2/node_ret.go @@ -1,8 +1,8 @@ package planparserv2 import ( + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/planpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) type ExprWithType struct { diff --git a/internal/parser/planparserv2/operators.go b/internal/parser/planparserv2/operators.go index b62adced0c3ae..47370b8b89b5e 100644 --- a/internal/parser/planparserv2/operators.go +++ b/internal/parser/planparserv2/operators.go @@ -4,9 +4,9 @@ import ( "fmt" "math" + "github.com/milvus-io/milvus/api/schemapb" parser "github.com/milvus-io/milvus/internal/parser/planparserv2/generated" "github.com/milvus-io/milvus/internal/proto/planpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) var arithExprMap = map[int]planpb.ArithOpType{ diff --git a/internal/parser/planparserv2/parser_visitor.go b/internal/parser/planparserv2/parser_visitor.go index ce613f84fcc05..e57a13823365c 100644 --- a/internal/parser/planparserv2/parser_visitor.go +++ b/internal/parser/planparserv2/parser_visitor.go @@ -4,9 +4,9 @@ import ( "fmt" "strconv" + "github.com/milvus-io/milvus/api/schemapb" parser "github.com/milvus-io/milvus/internal/parser/planparserv2/generated" "github.com/milvus-io/milvus/internal/proto/planpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/parser/planparserv2/plan_parser_v2.go b/internal/parser/planparserv2/plan_parser_v2.go index 17cf00b55500f..7b10b401c5f59 100644 --- a/internal/parser/planparserv2/plan_parser_v2.go +++ b/internal/parser/planparserv2/plan_parser_v2.go @@ -3,8 +3,8 @@ package planparserv2 import ( "fmt" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/planpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/antlr/antlr4/runtime/Go/antlr" diff --git a/internal/parser/planparserv2/plan_parser_v2_test.go b/internal/parser/planparserv2/plan_parser_v2_test.go index a1a12ccdb1c92..58e7e2f510173 100644 --- a/internal/parser/planparserv2/plan_parser_v2_test.go +++ b/internal/parser/planparserv2/plan_parser_v2_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/parser/planparserv2/utils.go b/internal/parser/planparserv2/utils.go index 78ca7548991d9..c185f00a4e423 100644 --- a/internal/parser/planparserv2/utils.go +++ b/internal/parser/planparserv2/utils.go @@ -5,8 +5,8 @@ import ( "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/planpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) func IsBool(n *planpb.GenericValue) bool { diff --git a/internal/parser/planparserv2/utils_test.go b/internal/parser/planparserv2/utils_test.go index 63ae911337f09..a33ecf65f6100 100644 --- a/internal/parser/planparserv2/utils_test.go +++ b/internal/parser/planparserv2/utils_test.go @@ -3,7 +3,7 @@ package planparserv2 import ( "testing" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" ) func Test_relationalCompatible(t *testing.T) { diff --git a/internal/proto/common.proto b/internal/proto/common.proto index 617f2e0757f32..a678013ce7ac5 100644 --- a/internal/proto/common.proto +++ b/internal/proto/common.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package milvus.proto.common; -option go_package="github.com/milvus-io/milvus/internal/proto/commonpb"; +option go_package="github.com/milvus-io/milvus/api/commonpb"; option java_multiple_files = true; option java_package = "io.milvus.grpc"; diff --git a/internal/proto/datapb/data_coord.pb.go b/internal/proto/datapb/data_coord.pb.go index c4b2b0dea47ce..c2dcfa7d502ad 100644 --- a/internal/proto/datapb/data_coord.pb.go +++ b/internal/proto/datapb/data_coord.pb.go @@ -7,10 +7,10 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" + commonpb "github.com/milvus-io/milvus/api/commonpb" + milvuspb "github.com/milvus-io/milvus/api/milvuspb" + schemapb "github.com/milvus-io/milvus/api/schemapb" internalpb "github.com/milvus-io/milvus/internal/proto/internalpb" - milvuspb "github.com/milvus-io/milvus/internal/proto/milvuspb" - schemapb "github.com/milvus-io/milvus/internal/proto/schemapb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/internal/proto/etcdpb/etcd_meta.pb.go b/internal/proto/etcdpb/etcd_meta.pb.go index 140ab014155b5..3d9dd57a2440a 100644 --- a/internal/proto/etcdpb/etcd_meta.pb.go +++ b/internal/proto/etcdpb/etcd_meta.pb.go @@ -6,8 +6,8 @@ package etcdpb import ( fmt "fmt" proto "github.com/golang/protobuf/proto" - commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" - schemapb "github.com/milvus-io/milvus/internal/proto/schemapb" + commonpb "github.com/milvus-io/milvus/api/commonpb" + schemapb "github.com/milvus-io/milvus/api/schemapb" math "math" ) diff --git a/internal/proto/indexcgopb/index_cgo_msg.pb.go b/internal/proto/indexcgopb/index_cgo_msg.pb.go index 217d9cd1b019c..60d7c26e232a1 100644 --- a/internal/proto/indexcgopb/index_cgo_msg.pb.go +++ b/internal/proto/indexcgopb/index_cgo_msg.pb.go @@ -6,7 +6,7 @@ package indexcgopb import ( fmt "fmt" proto "github.com/golang/protobuf/proto" - commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" + commonpb "github.com/milvus-io/milvus/api/commonpb" math "math" ) diff --git a/internal/proto/indexpb/index_coord.pb.go b/internal/proto/indexpb/index_coord.pb.go index 0025e5167a6f8..241dc9c90617b 100644 --- a/internal/proto/indexpb/index_coord.pb.go +++ b/internal/proto/indexpb/index_coord.pb.go @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" + commonpb "github.com/milvus-io/milvus/api/commonpb" + milvuspb "github.com/milvus-io/milvus/api/milvuspb" internalpb "github.com/milvus-io/milvus/internal/proto/internalpb" - milvuspb "github.com/milvus-io/milvus/internal/proto/milvuspb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/internal/proto/internalpb/internal.pb.go b/internal/proto/internalpb/internal.pb.go index 7403839eac560..648c1f5176fe6 100644 --- a/internal/proto/internalpb/internal.pb.go +++ b/internal/proto/internalpb/internal.pb.go @@ -6,8 +6,8 @@ package internalpb import ( fmt "fmt" proto "github.com/golang/protobuf/proto" - commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" - schemapb "github.com/milvus-io/milvus/internal/proto/schemapb" + commonpb "github.com/milvus-io/milvus/api/commonpb" + schemapb "github.com/milvus-io/milvus/api/schemapb" math "math" ) diff --git a/internal/proto/milvus.proto b/internal/proto/milvus.proto index fe32b662eb414..ccf4d616f49f6 100644 --- a/internal/proto/milvus.proto +++ b/internal/proto/milvus.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package milvus.proto.milvus; -option go_package = "github.com/milvus-io/milvus/internal/proto/milvuspb"; +option go_package = "github.com/milvus-io/milvus/api/milvuspb"; option java_multiple_files = true; option java_package = "io.milvus.grpc"; diff --git a/internal/proto/planpb/plan.pb.go b/internal/proto/planpb/plan.pb.go index 08e5c9909c7aa..030e97ebcda95 100644 --- a/internal/proto/planpb/plan.pb.go +++ b/internal/proto/planpb/plan.pb.go @@ -6,7 +6,7 @@ package planpb import ( fmt "fmt" proto "github.com/golang/protobuf/proto" - schemapb "github.com/milvus-io/milvus/internal/proto/schemapb" + schemapb "github.com/milvus-io/milvus/api/schemapb" math "math" ) diff --git a/internal/proto/proxypb/proxy.pb.go b/internal/proto/proxypb/proxy.pb.go index d8c8f0113236b..1f68a02513b53 100644 --- a/internal/proto/proxypb/proxy.pb.go +++ b/internal/proto/proxypb/proxy.pb.go @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" + commonpb "github.com/milvus-io/milvus/api/commonpb" + milvuspb "github.com/milvus-io/milvus/api/milvuspb" internalpb "github.com/milvus-io/milvus/internal/proto/internalpb" - milvuspb "github.com/milvus-io/milvus/internal/proto/milvuspb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/internal/proto/querypb/query_coord.pb.go b/internal/proto/querypb/query_coord.pb.go index 260cc5fb41ca2..9c1a78f2a53f4 100644 --- a/internal/proto/querypb/query_coord.pb.go +++ b/internal/proto/querypb/query_coord.pb.go @@ -7,11 +7,11 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" + commonpb "github.com/milvus-io/milvus/api/commonpb" + milvuspb "github.com/milvus-io/milvus/api/milvuspb" + schemapb "github.com/milvus-io/milvus/api/schemapb" datapb "github.com/milvus-io/milvus/internal/proto/datapb" internalpb "github.com/milvus-io/milvus/internal/proto/internalpb" - milvuspb "github.com/milvus-io/milvus/internal/proto/milvuspb" - schemapb "github.com/milvus-io/milvus/internal/proto/schemapb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/internal/proto/rootcoordpb/root_coord.pb.go b/internal/proto/rootcoordpb/root_coord.pb.go index 6b6a3e30816cf..b6c60be630c30 100644 --- a/internal/proto/rootcoordpb/root_coord.pb.go +++ b/internal/proto/rootcoordpb/root_coord.pb.go @@ -7,10 +7,10 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" + commonpb "github.com/milvus-io/milvus/api/commonpb" + milvuspb "github.com/milvus-io/milvus/api/milvuspb" etcdpb "github.com/milvus-io/milvus/internal/proto/etcdpb" internalpb "github.com/milvus-io/milvus/internal/proto/internalpb" - milvuspb "github.com/milvus-io/milvus/internal/proto/milvuspb" proxypb "github.com/milvus-io/milvus/internal/proto/proxypb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/internal/proto/schema.proto b/internal/proto/schema.proto index 7dd1f45594f8c..6ae896fe27bf4 100644 --- a/internal/proto/schema.proto +++ b/internal/proto/schema.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package milvus.proto.schema; -option go_package = "github.com/milvus-io/milvus/internal/proto/schemapb"; +option go_package = "github.com/milvus-io/milvus/api/schemapb"; option java_multiple_files = true; option java_package = "io.milvus.grpc"; diff --git a/internal/proto/segcorepb/segcore.pb.go b/internal/proto/segcorepb/segcore.pb.go index 99e43ef45d29f..43c746a86b501 100644 --- a/internal/proto/segcorepb/segcore.pb.go +++ b/internal/proto/segcorepb/segcore.pb.go @@ -6,7 +6,7 @@ package segcorepb import ( fmt "fmt" proto "github.com/golang/protobuf/proto" - schemapb "github.com/milvus-io/milvus/internal/proto/schemapb" + schemapb "github.com/milvus-io/milvus/api/schemapb" math "math" ) diff --git a/internal/proxy/channels_mgr.go b/internal/proxy/channels_mgr.go index 1434981dd65ec..121820a21c791 100644 --- a/internal/proxy/channels_mgr.go +++ b/internal/proxy/channels_mgr.go @@ -24,11 +24,11 @@ import ( "strconv" "sync" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/types" "go.uber.org/zap" diff --git a/internal/proxy/channels_mgr_test.go b/internal/proxy/channels_mgr_test.go index 180eb509d8c69..c18bb0851fa73 100644 --- a/internal/proxy/channels_mgr_test.go +++ b/internal/proxy/channels_mgr_test.go @@ -23,8 +23,8 @@ import ( "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/stretchr/testify/assert" ) diff --git a/internal/proxy/data_coord_mock_test.go b/internal/proxy/data_coord_mock_test.go index f72507703de68..3bf84db49afdd 100644 --- a/internal/proxy/data_coord_mock_test.go +++ b/internal/proxy/data_coord_mock_test.go @@ -20,10 +20,10 @@ import ( "context" "sync/atomic" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/milvus-io/milvus/internal/util/uniquegenerator" diff --git a/internal/proxy/error.go b/internal/proxy/error.go index 311698022625c..fbca188337f7e 100644 --- a/internal/proxy/error.go +++ b/internal/proxy/error.go @@ -23,7 +23,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" ) // TODO(dragondriver): add more common error type diff --git a/internal/proxy/error_test.go b/internal/proxy/error_test.go index 2dd209e8714ee..fdd291f778067 100644 --- a/internal/proxy/error_test.go +++ b/internal/proxy/error_test.go @@ -19,7 +19,7 @@ package proxy import ( "testing" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" "go.uber.org/zap" diff --git a/internal/proxy/impl.go b/internal/proxy/impl.go index ac10a69196bcb..13fd7d2af1333 100644 --- a/internal/proxy/impl.go +++ b/internal/proxy/impl.go @@ -36,10 +36,10 @@ import ( "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/crypto" diff --git a/internal/proxy/index_coord_mock_test.go b/internal/proxy/index_coord_mock_test.go index ca6ef8c35fb58..e6c8329bb3820 100644 --- a/internal/proxy/index_coord_mock_test.go +++ b/internal/proxy/index_coord_mock_test.go @@ -28,10 +28,10 @@ import ( "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/uniquegenerator" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/proxy/meta_cache.go b/internal/proxy/meta_cache.go index e3a13dca1e370..702bd20360767 100644 --- a/internal/proxy/meta_cache.go +++ b/internal/proxy/meta_cache.go @@ -28,15 +28,15 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util" "github.com/milvus-io/milvus/internal/util/retry" diff --git a/internal/proxy/meta_cache_test.go b/internal/proxy/meta_cache_test.go index 0466a12ed823e..615aa461af974 100644 --- a/internal/proxy/meta_cache_test.go +++ b/internal/proxy/meta_cache_test.go @@ -27,13 +27,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/crypto" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/proxy/metrics_info.go b/internal/proxy/metrics_info.go index cb4afe892f0d2..8fb39340bda9a 100644 --- a/internal/proxy/metrics_info.go +++ b/internal/proxy/metrics_info.go @@ -20,9 +20,9 @@ import ( "context" "sync" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/ratelimitutil" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/proxy/metrics_info_test.go b/internal/proxy/metrics_info_test.go index fb9054f984e0e..f90d34e36f577 100644 --- a/internal/proxy/metrics_info_test.go +++ b/internal/proxy/metrics_info_test.go @@ -25,8 +25,8 @@ import ( "github.com/milvus-io/milvus/internal/util/uniquegenerator" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/stretchr/testify/assert" diff --git a/internal/proxy/mock_cache_test.go b/internal/proxy/mock_cache_test.go index 76b4e8cb4ddec..4bba76cec671d 100644 --- a/internal/proxy/mock_cache_test.go +++ b/internal/proxy/mock_cache_test.go @@ -3,7 +3,7 @@ package proxy import ( "context" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/proxy/mock_test.go b/internal/proxy/mock_test.go index b5124118704e7..e21df463e0a03 100644 --- a/internal/proxy/mock_test.go +++ b/internal/proxy/mock_test.go @@ -24,11 +24,11 @@ import ( "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/uniquegenerator" ) diff --git a/internal/proxy/plan_parser.go b/internal/proxy/plan_parser.go index e8fb555dcdd95..d1f420e20444d 100644 --- a/internal/proxy/plan_parser.go +++ b/internal/proxy/plan_parser.go @@ -23,8 +23,8 @@ import ( ant_ast "github.com/antonmedv/expr/ast" ant_parser "github.com/antonmedv/expr/parser" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/planpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/proxy/plan_parser_test.go b/internal/proxy/plan_parser_test.go index 41bb844d417d2..3c3bbb14e85a1 100644 --- a/internal/proxy/plan_parser_test.go +++ b/internal/proxy/plan_parser_test.go @@ -28,8 +28,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/planpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/proxy/privilege_interceptor.go b/internal/proxy/privilege_interceptor.go index 2071defaa6a00..1a1fc9245a04f 100644 --- a/internal/proxy/privilege_interceptor.go +++ b/internal/proxy/privilege_interceptor.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/util" diff --git a/internal/proxy/privilege_interceptor_test.go b/internal/proxy/privilege_interceptor_test.go index 7ca3547e95198..9212eb688aa0d 100644 --- a/internal/proxy/privilege_interceptor_test.go +++ b/internal/proxy/privilege_interceptor_test.go @@ -6,9 +6,9 @@ import ( "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/stretchr/testify/assert" ) diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go index dad596ca1b37d..b40c81b483e5f 100644 --- a/internal/proxy/proxy.go +++ b/internal/proxy/proxy.go @@ -31,10 +31,10 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" diff --git a/internal/proxy/proxy_test.go b/internal/proxy/proxy_test.go index 7fdfcc2628bb5..5f49057f1cfc9 100644 --- a/internal/proxy/proxy_test.go +++ b/internal/proxy/proxy_test.go @@ -54,12 +54,12 @@ import ( "github.com/milvus-io/milvus/internal/util/trace" "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" grpcdatacoordclient "github.com/milvus-io/milvus/internal/distributed/datacoord" grpcdatacoordclient2 "github.com/milvus-io/milvus/internal/distributed/datacoord/client" diff --git a/internal/proxy/query_coord_mock_test.go b/internal/proxy/query_coord_mock_test.go index 25154d15424f7..4981569590597 100644 --- a/internal/proxy/query_coord_mock_test.go +++ b/internal/proxy/query_coord_mock_test.go @@ -25,9 +25,9 @@ import ( "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/uniquegenerator" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/proxy/query_node_mock_test.go b/internal/proxy/query_node_mock_test.go index 1c65a08d19a50..f3ea4b7d16270 100644 --- a/internal/proxy/query_node_mock_test.go +++ b/internal/proxy/query_node_mock_test.go @@ -22,9 +22,9 @@ import ( "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/proxy/rate_limit_interceptor.go b/internal/proxy/rate_limit_interceptor.go index 84353fbc6be42..42d72f7cc5638 100644 --- a/internal/proxy/rate_limit_interceptor.go +++ b/internal/proxy/rate_limit_interceptor.go @@ -24,9 +24,9 @@ import ( "github.com/golang/protobuf/proto" "google.golang.org/grpc" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/types" ) diff --git a/internal/proxy/rate_limit_interceptor_test.go b/internal/proxy/rate_limit_interceptor_test.go index 66b61545cbf98..f2d44afccf81c 100644 --- a/internal/proxy/rate_limit_interceptor_test.go +++ b/internal/proxy/rate_limit_interceptor_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/grpc" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" ) type limiterMock struct { diff --git a/internal/proxy/rootcoord_mock_test.go b/internal/proxy/rootcoord_mock_test.go index fc7f602be47e7..20f40af14fc8a 100644 --- a/internal/proxy/rootcoord_mock_test.go +++ b/internal/proxy/rootcoord_mock_test.go @@ -35,14 +35,14 @@ import ( "github.com/milvus-io/milvus/internal/util/milvuserrors" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" ) diff --git a/internal/proxy/segment.go b/internal/proxy/segment.go index 9bb8233c0432a..9cf870f8385d4 100644 --- a/internal/proxy/segment.go +++ b/internal/proxy/segment.go @@ -25,9 +25,9 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/proxy/segment_test.go b/internal/proxy/segment_test.go index 1f08e1060d625..379c1952003da 100644 --- a/internal/proxy/segment_test.go +++ b/internal/proxy/segment_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/proxy/task.go b/internal/proxy/task.go index f3a5dd2cdcafe..83f15aef68a4d 100644 --- a/internal/proxy/task.go +++ b/internal/proxy/task.go @@ -35,13 +35,13 @@ import ( "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/indexparamcheck" diff --git a/internal/proxy/task_calc_distance.go b/internal/proxy/task_calc_distance.go index 19dae8729ff08..6d06b0c7a685a 100644 --- a/internal/proxy/task_calc_distance.go +++ b/internal/proxy/task_calc_distance.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/distance" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/proxy/task_calc_distance_test.go b/internal/proxy/task_calc_distance_test.go index 52a8a6ec7743f..eb97ea52cece8 100644 --- a/internal/proxy/task_calc_distance_test.go +++ b/internal/proxy/task_calc_distance_test.go @@ -5,9 +5,9 @@ import ( "errors" "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/proxy/task_index_test.go b/internal/proxy/task_index_test.go index f03ce7234e4d8..96fa175019f2e 100644 --- a/internal/proxy/task_index_test.go +++ b/internal/proxy/task_index_test.go @@ -22,8 +22,8 @@ import ( "github.com/milvus-io/milvus/internal/proto/indexpb" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/proxy/task_insert.go b/internal/proxy/task_insert.go index acddc5684be07..cd65e0be0b79b 100644 --- a/internal/proxy/task_insert.go +++ b/internal/proxy/task_insert.go @@ -5,14 +5,14 @@ import ( "fmt" "strconv" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/retry" "github.com/milvus-io/milvus/internal/util/timerecord" "github.com/milvus-io/milvus/internal/util/trace" diff --git a/internal/proxy/task_insert_test.go b/internal/proxy/task_insert_test.go index 473c31322640b..6d5c4ad58286f 100644 --- a/internal/proxy/task_insert_test.go +++ b/internal/proxy/task_insert_test.go @@ -3,9 +3,9 @@ package proxy import ( "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/proxy/task_query.go b/internal/proxy/task_query.go index 377e3754366b2..796b527d95b85 100644 --- a/internal/proxy/task_query.go +++ b/internal/proxy/task_query.go @@ -22,11 +22,11 @@ import ( "github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) const ( diff --git a/internal/proxy/task_query_test.go b/internal/proxy/task_query_test.go index 01bb2150c4a03..6b75e90ddefa1 100644 --- a/internal/proxy/task_query_test.go +++ b/internal/proxy/task_query_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/funcutil" diff --git a/internal/proxy/task_search.go b/internal/proxy/task_search.go index f1fd1076e463d..e7564741ea568 100644 --- a/internal/proxy/task_search.go +++ b/internal/proxy/task_search.go @@ -24,12 +24,12 @@ import ( "github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) type searchTask struct { diff --git a/internal/proxy/task_search_test.go b/internal/proxy/task_search_test.go index f0b269724a3a8..cb09d002efcbb 100644 --- a/internal/proxy/task_search_test.go +++ b/internal/proxy/task_search_test.go @@ -15,11 +15,11 @@ import ( "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/distance" "github.com/milvus-io/milvus/internal/util/funcutil" diff --git a/internal/proxy/task_statistic.go b/internal/proxy/task_statistic.go index 8a4be54819668..6d8bb9cbc97c6 100644 --- a/internal/proxy/task_statistic.go +++ b/internal/proxy/task_statistic.go @@ -6,11 +6,11 @@ import ( "fmt" "strconv" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/types" diff --git a/internal/proxy/task_test.go b/internal/proxy/task_test.go index 7476567a4adbb..eb1fe7a89ae5d 100644 --- a/internal/proxy/task_test.go +++ b/internal/proxy/task_test.go @@ -35,11 +35,11 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/distance" "github.com/milvus-io/milvus/internal/util/funcutil" diff --git a/internal/proxy/timestamp.go b/internal/proxy/timestamp.go index 51f01531f1329..e75ce8c206b32 100644 --- a/internal/proxy/timestamp.go +++ b/internal/proxy/timestamp.go @@ -22,8 +22,8 @@ import ( "strconv" "time" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/util/timerecord" ) diff --git a/internal/proxy/util.go b/internal/proxy/util.go index 66f473594cd87..1f3c014bbd289 100644 --- a/internal/proxy/util.go +++ b/internal/proxy/util.go @@ -28,9 +28,9 @@ import ( "golang.org/x/crypto/bcrypt" "google.golang.org/grpc/metadata" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util" "github.com/milvus-io/milvus/internal/util/crypto" "github.com/milvus-io/milvus/internal/util/tsoutil" diff --git a/internal/proxy/util_test.go b/internal/proxy/util_test.go index c6ad491668426..0fc07b84d33e4 100644 --- a/internal/proxy/util_test.go +++ b/internal/proxy/util_test.go @@ -27,8 +27,8 @@ import ( "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/util" "github.com/milvus-io/milvus/internal/util/crypto" "github.com/stretchr/testify/assert" diff --git a/internal/querycoord/cluster.go b/internal/querycoord/cluster.go index 735bb917ae391..c3091b2184b7a 100644 --- a/internal/querycoord/cluster.go +++ b/internal/querycoord/cluster.go @@ -29,13 +29,13 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/sessionutil" diff --git a/internal/querycoord/cluster_test.go b/internal/querycoord/cluster_test.go index 036528d4d9d66..ce5b4cf5b86d2 100644 --- a/internal/querycoord/cluster_test.go +++ b/internal/querycoord/cluster_test.go @@ -29,15 +29,15 @@ import ( "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/etcd" diff --git a/internal/querycoord/global_meta_broker.go b/internal/querycoord/global_meta_broker.go index 4286a2e98787c..9f33fbbdd2333 100644 --- a/internal/querycoord/global_meta_broker.go +++ b/internal/querycoord/global_meta_broker.go @@ -10,14 +10,14 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/funcutil" diff --git a/internal/querycoord/global_meta_broker_test.go b/internal/querycoord/global_meta_broker_test.go index 0f72dbc6b4371..d501b79fbbdce 100644 --- a/internal/querycoord/global_meta_broker_test.go +++ b/internal/querycoord/global_meta_broker_test.go @@ -21,8 +21,8 @@ import ( "errors" "testing" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/querycoord/group_balance_test.go b/internal/querycoord/group_balance_test.go index 35cf2e0b0f56a..961f316448f6a 100644 --- a/internal/querycoord/group_balance_test.go +++ b/internal/querycoord/group_balance_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/stretchr/testify/assert" ) diff --git a/internal/querycoord/handoff_handler.go b/internal/querycoord/handoff_handler.go index d1e6bb877174a..5635edc17a07e 100644 --- a/internal/querycoord/handoff_handler.go +++ b/internal/querycoord/handoff_handler.go @@ -26,9 +26,9 @@ import ( "github.com/golang/protobuf/proto" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util" ) diff --git a/internal/querycoord/handoff_handler_test.go b/internal/querycoord/handoff_handler_test.go index 5c2bdab6f970e..705814e7cb0a7 100644 --- a/internal/querycoord/handoff_handler_test.go +++ b/internal/querycoord/handoff_handler_test.go @@ -25,10 +25,10 @@ import ( "testing" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util" diff --git a/internal/querycoord/impl.go b/internal/querycoord/impl.go index f980da1ce11c6..828d9f0c924f0 100644 --- a/internal/querycoord/impl.go +++ b/internal/querycoord/impl.go @@ -23,12 +23,12 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/querycoord/impl_test.go b/internal/querycoord/impl_test.go index fd300b7c87fef..41a196a931555 100644 --- a/internal/querycoord/impl_test.go +++ b/internal/querycoord/impl_test.go @@ -32,9 +32,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/metricsinfo" ) diff --git a/internal/querycoord/meta.go b/internal/querycoord/meta.go index 5168f91eaf177..634b2db9b6682 100644 --- a/internal/querycoord/meta.go +++ b/internal/querycoord/meta.go @@ -30,14 +30,14 @@ import ( "github.com/golang/protobuf/proto" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util" "github.com/milvus-io/milvus/internal/util/dependency" diff --git a/internal/querycoord/meta_test.go b/internal/querycoord/meta_test.go index 2114db9e7854d..bee1243bb29f7 100644 --- a/internal/querycoord/meta_test.go +++ b/internal/querycoord/meta_test.go @@ -30,10 +30,10 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/types" diff --git a/internal/querycoord/metrics_info.go b/internal/querycoord/metrics_info.go index 63b5cd8b7a7a2..babb09eee699e 100644 --- a/internal/querycoord/metrics_info.go +++ b/internal/querycoord/metrics_info.go @@ -27,9 +27,9 @@ import ( "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/metricsinfo" ) diff --git a/internal/querycoord/mock_3rd_component_test.go b/internal/querycoord/mock_3rd_component_test.go index 9b187f1e30bdd..b8eb0bf143689 100644 --- a/internal/querycoord/mock_3rd_component_test.go +++ b/internal/querycoord/mock_3rd_component_test.go @@ -25,17 +25,17 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/querycoord/mock_querynode_client_test.go b/internal/querycoord/mock_querynode_client_test.go index b0592b43405cb..35adc6d3d03dc 100644 --- a/internal/querycoord/mock_querynode_client_test.go +++ b/internal/querycoord/mock_querynode_client_test.go @@ -23,11 +23,11 @@ import ( "google.golang.org/grpc" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" ) diff --git a/internal/querycoord/mock_querynode_server_test.go b/internal/querycoord/mock_querynode_server_test.go index 8aef9ebb8bb36..1c47b63d2b54e 100644 --- a/internal/querycoord/mock_querynode_server_test.go +++ b/internal/querycoord/mock_querynode_server_test.go @@ -27,10 +27,10 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/etcd" "github.com/milvus-io/milvus/internal/util/funcutil" diff --git a/internal/querycoord/query_coord.go b/internal/querycoord/query_coord.go index 604f24173e477..53eda24a8eaba 100644 --- a/internal/querycoord/query_coord.go +++ b/internal/querycoord/query_coord.go @@ -36,12 +36,12 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/allocator" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" diff --git a/internal/querycoord/query_coord_test.go b/internal/querycoord/query_coord_test.go index 33d822046c4ce..7e4dbe4eb3196 100644 --- a/internal/querycoord/query_coord_test.go +++ b/internal/querycoord/query_coord_test.go @@ -36,10 +36,10 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util" "github.com/milvus-io/milvus/internal/util/dependency" diff --git a/internal/querycoord/querynode.go b/internal/querycoord/querynode.go index 6ce38f765d339..dc3ed9e5953ba 100644 --- a/internal/querycoord/querynode.go +++ b/internal/querycoord/querynode.go @@ -25,12 +25,12 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" nodeclient "github.com/milvus-io/milvus/internal/distributed/querynode/client" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/metricsinfo" diff --git a/internal/querycoord/querynode_test.go b/internal/querycoord/querynode_test.go index 269e40c1c780f..e8ea30d65a86f 100644 --- a/internal/querycoord/querynode_test.go +++ b/internal/querycoord/querynode_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/etcd" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/querycoord/replica.go b/internal/querycoord/replica.go index 867c87ae7f0bb..d6682ca1db9fe 100644 --- a/internal/querycoord/replica.go +++ b/internal/querycoord/replica.go @@ -22,8 +22,8 @@ import ( "sync" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/proto/milvuspb" ) const ( diff --git a/internal/querycoord/replica_test.go b/internal/querycoord/replica_test.go index 412d15de9e566..32942fed68c0d 100644 --- a/internal/querycoord/replica_test.go +++ b/internal/querycoord/replica_test.go @@ -20,7 +20,7 @@ import ( "errors" "testing" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/internal/querycoord/task.go b/internal/querycoord/task.go index 3ca5bbb01d7b2..93ff0b47e0ad9 100644 --- a/internal/querycoord/task.go +++ b/internal/querycoord/task.go @@ -29,11 +29,11 @@ import ( "go.uber.org/zap" "golang.org/x/sync/errgroup" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/timerecord" diff --git a/internal/querycoord/task_scheduler.go b/internal/querycoord/task_scheduler.go index e109ae85ed0e5..957865885213e 100644 --- a/internal/querycoord/task_scheduler.go +++ b/internal/querycoord/task_scheduler.go @@ -30,10 +30,10 @@ import ( "github.com/opentracing/opentracing-go" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/trace" oplog "github.com/opentracing/opentracing-go/log" diff --git a/internal/querycoord/task_scheduler_test.go b/internal/querycoord/task_scheduler_test.go index 8f38f5faaa04c..029ae0c77e411 100644 --- a/internal/querycoord/task_scheduler_test.go +++ b/internal/querycoord/task_scheduler_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" + "github.com/milvus-io/milvus/api/commonpb" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/etcd" diff --git a/internal/querycoord/task_test.go b/internal/querycoord/task_test.go index dee3b603c71f7..cc28c5ed722e2 100644 --- a/internal/querycoord/task_test.go +++ b/internal/querycoord/task_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" diff --git a/internal/querycoord/task_util_test.go b/internal/querycoord/task_util_test.go index ac92f024d74ca..7c7c900e3799e 100644 --- a/internal/querycoord/task_util_test.go +++ b/internal/querycoord/task_util_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/stretchr/testify/assert" diff --git a/internal/querycoord/util.go b/internal/querycoord/util.go index 9a8857676cdb6..fababf69a40b9 100644 --- a/internal/querycoord/util.go +++ b/internal/querycoord/util.go @@ -20,9 +20,9 @@ import ( "context" "sort" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" diff --git a/internal/querycoordv2/dist/dist_handler.go b/internal/querycoordv2/dist/dist_handler.go index e3925c6664c94..167cda23f1ddf 100644 --- a/internal/querycoordv2/dist/dist_handler.go +++ b/internal/querycoordv2/dist/dist_handler.go @@ -7,8 +7,8 @@ import ( "time" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" diff --git a/internal/querycoordv2/handlers.go b/internal/querycoordv2/handlers.go index 56d45f2b63e4b..127a83344d549 100644 --- a/internal/querycoordv2/handlers.go +++ b/internal/querycoordv2/handlers.go @@ -6,9 +6,9 @@ import ( "sync" "time" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" diff --git a/internal/querycoordv2/meta/coordinator_broker.go b/internal/querycoordv2/meta/coordinator_broker.go index 52956a1ffdb85..835d388a16f0e 100644 --- a/internal/querycoordv2/meta/coordinator_broker.go +++ b/internal/querycoordv2/meta/coordinator_broker.go @@ -6,13 +6,13 @@ import ( "fmt" "time" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" diff --git a/internal/querycoordv2/meta/mock_broker.go b/internal/querycoordv2/meta/mock_broker.go index 560ea9e03912f..c5f5beccc2ad5 100644 --- a/internal/querycoordv2/meta/mock_broker.go +++ b/internal/querycoordv2/meta/mock_broker.go @@ -10,7 +10,7 @@ import ( querypb "github.com/milvus-io/milvus/internal/proto/querypb" - schemapb "github.com/milvus-io/milvus/internal/proto/schemapb" + schemapb "github.com/milvus-io/milvus/api/schemapb" ) // MockBroker is an autogenerated mock type for the Broker type diff --git a/internal/querycoordv2/meta/replica_manager_test.go b/internal/querycoordv2/meta/replica_manager_test.go index b7adc1f370b05..6fae1bbe2283c 100644 --- a/internal/querycoordv2/meta/replica_manager_test.go +++ b/internal/querycoordv2/meta/replica_manager_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/proto/milvuspb" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/util/etcd" "github.com/stretchr/testify/suite" diff --git a/internal/querycoordv2/meta/store.go b/internal/querycoordv2/meta/store.go index 786e41a77a64c..c38227f32f39f 100644 --- a/internal/querycoordv2/meta/store.go +++ b/internal/querycoordv2/meta/store.go @@ -8,9 +8,9 @@ import ( "github.com/samber/lo" clientv3 "go.etcd.io/etcd/client/v3" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/metastore" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util" ) diff --git a/internal/querycoordv2/mocks/mock_querynode.go b/internal/querycoordv2/mocks/mock_querynode.go index cc39d7afd5565..07c455496d679 100644 --- a/internal/querycoordv2/mocks/mock_querynode.go +++ b/internal/querycoordv2/mocks/mock_querynode.go @@ -5,11 +5,11 @@ package mocks import ( context "context" - commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" + commonpb "github.com/milvus-io/milvus/api/commonpb" internalpb "github.com/milvus-io/milvus/internal/proto/internalpb" - milvuspb "github.com/milvus-io/milvus/internal/proto/milvuspb" + milvuspb "github.com/milvus-io/milvus/api/milvuspb" mock "github.com/stretchr/testify/mock" diff --git a/internal/querycoordv2/mocks/querynode.go b/internal/querycoordv2/mocks/querynode.go index f8f198a887fc3..24c825a5bb4ff 100644 --- a/internal/querycoordv2/mocks/querynode.go +++ b/internal/querycoordv2/mocks/querynode.go @@ -7,8 +7,8 @@ import ( "testing" "time" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" querypb "github.com/milvus-io/milvus/internal/proto/querypb" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/util/sessionutil" diff --git a/internal/querycoordv2/observers/handoff_observer_test.go b/internal/querycoordv2/observers/handoff_observer_test.go index e372570cfa83e..7cf75ffa0fb39 100644 --- a/internal/querycoordv2/observers/handoff_observer_test.go +++ b/internal/querycoordv2/observers/handoff_observer_test.go @@ -12,9 +12,9 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" diff --git a/internal/querycoordv2/observers/leader_observer.go b/internal/querycoordv2/observers/leader_observer.go index 1b0a31fa35acd..cabd032165c68 100644 --- a/internal/querycoordv2/observers/leader_observer.go +++ b/internal/querycoordv2/observers/leader_observer.go @@ -5,8 +5,8 @@ import ( "sync" "time" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" diff --git a/internal/querycoordv2/observers/leader_observer_test.go b/internal/querycoordv2/observers/leader_observer_test.go index 6fa7914fad7ea..ce98aa65d7379 100644 --- a/internal/querycoordv2/observers/leader_observer_test.go +++ b/internal/querycoordv2/observers/leader_observer_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/suite" "go.uber.org/atomic" + "github.com/milvus-io/milvus/api/commonpb" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" . "github.com/milvus-io/milvus/internal/querycoordv2/params" diff --git a/internal/querycoordv2/server.go b/internal/querycoordv2/server.go index e9a4b6b492870..3adbf82ba3330 100644 --- a/internal/querycoordv2/server.go +++ b/internal/querycoordv2/server.go @@ -16,14 +16,14 @@ import ( "go.uber.org/zap" "golang.org/x/sync/errgroup" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/balance" "github.com/milvus-io/milvus/internal/querycoordv2/checkers" diff --git a/internal/querycoordv2/server_test.go b/internal/querycoordv2/server_test.go index 76be31ea077ce..80a82c762c975 100644 --- a/internal/querycoordv2/server_test.go +++ b/internal/querycoordv2/server_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/querycoordv2/checkers" "github.com/milvus-io/milvus/internal/querycoordv2/dist" "github.com/milvus-io/milvus/internal/querycoordv2/meta" diff --git a/internal/querycoordv2/services.go b/internal/querycoordv2/services.go index 5d7d539b359a5..2ffe5fc797ca0 100644 --- a/internal/querycoordv2/services.go +++ b/internal/querycoordv2/services.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/job" "github.com/milvus-io/milvus/internal/querycoordv2/meta" diff --git a/internal/querycoordv2/services_test.go b/internal/querycoordv2/services_test.go index a07c038d6fd37..761f8fac1ff19 100644 --- a/internal/querycoordv2/services_test.go +++ b/internal/querycoordv2/services_test.go @@ -5,12 +5,12 @@ import ( "encoding/json" "testing" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/balance" "github.com/milvus-io/milvus/internal/querycoordv2/job" diff --git a/internal/querycoordv2/session/cluster.go b/internal/querycoordv2/session/cluster.go index de3ea2b479735..cedb0ca099ea1 100644 --- a/internal/querycoordv2/session/cluster.go +++ b/internal/querycoordv2/session/cluster.go @@ -7,10 +7,10 @@ import ( "sync" "time" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" grpcquerynodeclient "github.com/milvus-io/milvus/internal/distributed/querynode/client" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" diff --git a/internal/querycoordv2/session/cluster_test.go b/internal/querycoordv2/session/cluster_test.go index 89e0b6f3adb6c..43da070f2c853 100644 --- a/internal/querycoordv2/session/cluster_test.go +++ b/internal/querycoordv2/session/cluster_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/mocks" "github.com/stretchr/testify/mock" diff --git a/internal/querycoordv2/session/mock_cluster.go b/internal/querycoordv2/session/mock_cluster.go index c3f76da3b1a9e..00091c0489dd2 100644 --- a/internal/querycoordv2/session/mock_cluster.go +++ b/internal/querycoordv2/session/mock_cluster.go @@ -5,9 +5,9 @@ package session import ( context "context" - commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" + commonpb "github.com/milvus-io/milvus/api/commonpb" - milvuspb "github.com/milvus-io/milvus/internal/proto/milvuspb" + milvuspb "github.com/milvus-io/milvus/api/milvuspb" mock "github.com/stretchr/testify/mock" diff --git a/internal/querycoordv2/session/task.go b/internal/querycoordv2/session/task.go index 06023c3914b58..6e6f8cc9223a8 100644 --- a/internal/querycoordv2/session/task.go +++ b/internal/querycoordv2/session/task.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/querycoordv2/task/executor.go b/internal/querycoordv2/task/executor.go index 2538a956b80aa..b05ac20309721 100644 --- a/internal/querycoordv2/task/executor.go +++ b/internal/querycoordv2/task/executor.go @@ -5,8 +5,8 @@ import ( "sync" "time" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" diff --git a/internal/querycoordv2/task/task_test.go b/internal/querycoordv2/task/task_test.go index dde7d6d0d9190..cf3ec27a4cc01 100644 --- a/internal/querycoordv2/task/task_test.go +++ b/internal/querycoordv2/task/task_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" diff --git a/internal/querycoordv2/task/utils.go b/internal/querycoordv2/task/utils.go index 2e46d1c2fd32a..70360a8f84d4f 100644 --- a/internal/querycoordv2/task/utils.go +++ b/internal/querycoordv2/task/utils.go @@ -5,11 +5,11 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/util/funcutil" diff --git a/internal/querycoordv2/utils/types.go b/internal/querycoordv2/utils/types.go index a4c60a6c7a4c4..bbe32b49820e6 100644 --- a/internal/querycoordv2/utils/types.go +++ b/internal/querycoordv2/utils/types.go @@ -3,9 +3,9 @@ package utils import ( "fmt" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" ) diff --git a/internal/querynode/benchmark_test.go b/internal/querynode/benchmark_test.go index 29b5611271eb9..6b2196ee75916 100644 --- a/internal/querynode/benchmark_test.go +++ b/internal/querynode/benchmark_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap/zapcore" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) const ( diff --git a/internal/querynode/cgo_helper.go b/internal/querynode/cgo_helper.go index 17a062d543538..29123eed807a8 100644 --- a/internal/querynode/cgo_helper.go +++ b/internal/querynode/cgo_helper.go @@ -32,8 +32,8 @@ import ( "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/util/cgoconverter" ) diff --git a/internal/querynode/collection.go b/internal/querynode/collection.go index 15b03ba88fbd9..fe2da3194845c 100644 --- a/internal/querynode/collection.go +++ b/internal/querynode/collection.go @@ -38,8 +38,8 @@ import ( "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) // Collection is a wrapper of the underlying C-structure C.CCollection diff --git a/internal/querynode/collection_test.go b/internal/querynode/collection_test.go index 6781729a36193..98f990e16e851 100644 --- a/internal/querynode/collection_test.go +++ b/internal/querynode/collection_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" ) func TestCollection_newCollection(t *testing.T) { diff --git a/internal/querynode/flow_graph_delete_node_test.go b/internal/querynode/flow_graph_delete_node_test.go index 376331374a9ff..170de6256d857 100644 --- a/internal/querynode/flow_graph_delete_node_test.go +++ b/internal/querynode/flow_graph_delete_node_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/flowgraph" ) diff --git a/internal/querynode/flow_graph_filter_delete_node.go b/internal/querynode/flow_graph_filter_delete_node.go index f98c4c3759e5b..deb2d4b66637a 100644 --- a/internal/querynode/flow_graph_filter_delete_node.go +++ b/internal/querynode/flow_graph_filter_delete_node.go @@ -23,9 +23,9 @@ import ( "github.com/opentracing/opentracing-go" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/util/flowgraph" "github.com/milvus-io/milvus/internal/util/trace" ) diff --git a/internal/querynode/flow_graph_filter_delete_node_test.go b/internal/querynode/flow_graph_filter_delete_node_test.go index d5712d8ccbd0e..b905fd569d333 100644 --- a/internal/querynode/flow_graph_filter_delete_node_test.go +++ b/internal/querynode/flow_graph_filter_delete_node_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/flowgraph" ) diff --git a/internal/querynode/flow_graph_filter_dm_node.go b/internal/querynode/flow_graph_filter_dm_node.go index 40421cfe18600..d207591170c15 100644 --- a/internal/querynode/flow_graph_filter_dm_node.go +++ b/internal/querynode/flow_graph_filter_dm_node.go @@ -25,10 +25,10 @@ import ( "github.com/opentracing/opentracing-go" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/util/flowgraph" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/trace" diff --git a/internal/querynode/flow_graph_filter_dm_node_test.go b/internal/querynode/flow_graph_filter_dm_node_test.go index b4d34ba60bffa..25517102ff6d0 100644 --- a/internal/querynode/flow_graph_filter_dm_node_test.go +++ b/internal/querynode/flow_graph_filter_dm_node_test.go @@ -21,11 +21,11 @@ import ( "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/flowgraph" ) diff --git a/internal/querynode/flow_graph_insert_node.go b/internal/querynode/flow_graph_insert_node.go index b971cb378aa62..b087f119700f5 100644 --- a/internal/querynode/flow_graph_insert_node.go +++ b/internal/querynode/flow_graph_insert_node.go @@ -29,10 +29,10 @@ import ( "github.com/opentracing/opentracing-go" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/proto/segcorepb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/flowgraph" diff --git a/internal/querynode/flow_graph_insert_node_test.go b/internal/querynode/flow_graph_insert_node_test.go index bf05e7798183d..dc3efcf57bfc5 100644 --- a/internal/querynode/flow_graph_insert_node_test.go +++ b/internal/querynode/flow_graph_insert_node_test.go @@ -26,9 +26,9 @@ import ( "github.com/bits-and-blooms/bloom/v3" "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/flowgraph" ) diff --git a/internal/querynode/impl.go b/internal/querynode/impl.go index 6d32686812b27..b3ca6d911f69b 100644 --- a/internal/querynode/impl.go +++ b/internal/querynode/impl.go @@ -27,12 +27,12 @@ import ( "go.uber.org/zap" "golang.org/x/sync/errgroup" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/timerecord" diff --git a/internal/querynode/impl_test.go b/internal/querynode/impl_test.go index 098293b5fe741..52a1d31017c45 100644 --- a/internal/querynode/impl_test.go +++ b/internal/querynode/impl_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" queryPb "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/etcd" diff --git a/internal/querynode/impl_utils.go b/internal/querynode/impl_utils.go index 5551e5bbc3225..cce55827eeea4 100644 --- a/internal/querynode/impl_utils.go +++ b/internal/querynode/impl_utils.go @@ -3,7 +3,7 @@ package querynode import ( "context" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/querypb" ) diff --git a/internal/querynode/load_index_info.go b/internal/querynode/load_index_info.go index 13546563bffc6..3ba729968bcb9 100644 --- a/internal/querynode/load_index_info.go +++ b/internal/querynode/load_index_info.go @@ -28,8 +28,8 @@ import ( "path/filepath" "unsafe" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/funcutil" ) diff --git a/internal/querynode/load_index_info_test.go b/internal/querynode/load_index_info_test.go index 6eaac5d74294c..b395dd7fae5f9 100644 --- a/internal/querynode/load_index_info_test.go +++ b/internal/querynode/load_index_info_test.go @@ -19,11 +19,11 @@ package querynode import ( "testing" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/querypb" ) diff --git a/internal/querynode/meta_replica.go b/internal/querynode/meta_replica.go index 415593ebba3f0..5eda8d0aa2a01 100644 --- a/internal/querynode/meta_replica.go +++ b/internal/querynode/meta_replica.go @@ -31,13 +31,13 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/concurrency" ) diff --git a/internal/querynode/meta_replica_test.go b/internal/querynode/meta_replica_test.go index 1932ee93a872c..4ab2d8cba6a15 100644 --- a/internal/querynode/meta_replica_test.go +++ b/internal/querynode/meta_replica_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/concurrency" ) diff --git a/internal/querynode/metrics_info.go b/internal/querynode/metrics_info.go index 4bfc8a3e188ba..c9064b220d95d 100644 --- a/internal/querynode/metrics_info.go +++ b/internal/querynode/metrics_info.go @@ -19,9 +19,9 @@ package querynode import ( "context" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/ratelimitutil" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/querynode/metrics_info_test.go b/internal/querynode/metrics_info_test.go index 0674a991b1a20..36cfc0be28f3e 100644 --- a/internal/querynode/metrics_info_test.go +++ b/internal/querynode/metrics_info_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/etcd" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/sessionutil" diff --git a/internal/querynode/mock_test.go b/internal/querynode/mock_test.go index 2ac4029961e7c..8a4ce4baef0b7 100644 --- a/internal/querynode/mock_test.go +++ b/internal/querynode/mock_test.go @@ -35,17 +35,17 @@ import ( "github.com/golang/protobuf/proto" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util" "github.com/milvus-io/milvus/internal/util/etcd" diff --git a/internal/querynode/plan.go b/internal/querynode/plan.go index 3a63c08ceb366..67843dc611c1c 100644 --- a/internal/querynode/plan.go +++ b/internal/querynode/plan.go @@ -29,7 +29,7 @@ import ( "fmt" "unsafe" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/querypb" ) diff --git a/internal/querynode/plan_test.go b/internal/querynode/plan_test.go index 94a386951b892..d379679b3afdd 100644 --- a/internal/querynode/plan_test.go +++ b/internal/querynode/plan_test.go @@ -24,8 +24,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/internal/proto/querypb" ) diff --git a/internal/querynode/query_shard_test.go b/internal/querynode/query_shard_test.go index 9aba81ce8dac4..4f1181bffb698 100644 --- a/internal/querynode/query_shard_test.go +++ b/internal/querynode/query_shard_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" ) func genSimpleQueryShard(ctx context.Context) (*queryShard, error) { diff --git a/internal/querynode/reduce_test.go b/internal/querynode/reduce_test.go index f932ef52d823a..2685ad71a49e4 100644 --- a/internal/querynode/reduce_test.go +++ b/internal/querynode/reduce_test.go @@ -27,8 +27,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/commonpb" ) func TestReduce_parseSliceInfo(t *testing.T) { diff --git a/internal/querynode/result.go b/internal/querynode/result.go index 4410010fdc80f..2dd159ef670fc 100644 --- a/internal/querynode/result.go +++ b/internal/querynode/result.go @@ -27,10 +27,10 @@ import ( "go.uber.org/zap" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/proto/segcorepb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/querynode/result_sorter.go b/internal/querynode/result_sorter.go index 37a18749e970a..8ed18826d38c2 100644 --- a/internal/querynode/result_sorter.go +++ b/internal/querynode/result_sorter.go @@ -1,7 +1,7 @@ package querynode import ( - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/segcorepb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/querynode/result_sorter_test.go b/internal/querynode/result_sorter_test.go index eedf6649ba14a..9256b434048dd 100644 --- a/internal/querynode/result_sorter_test.go +++ b/internal/querynode/result_sorter_test.go @@ -4,7 +4,7 @@ import ( "sort" "testing" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/segcorepb" "github.com/stretchr/testify/assert" diff --git a/internal/querynode/result_test.go b/internal/querynode/result_test.go index 5074164ca9786..f2b7e6c25c6b6 100644 --- a/internal/querynode/result_test.go +++ b/internal/querynode/result_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/proto/segcorepb" ) diff --git a/internal/querynode/search.go b/internal/querynode/search.go index 71c771ee87591..ce1a623cf3b79 100644 --- a/internal/querynode/search.go +++ b/internal/querynode/search.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/util/timerecord" ) diff --git a/internal/querynode/segment.go b/internal/querynode/segment.go index 6708cad8d04d8..2da559e982fe9 100644 --- a/internal/querynode/segment.go +++ b/internal/querynode/segment.go @@ -43,12 +43,12 @@ import ( "github.com/golang/protobuf/proto" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/proto/segcorepb" "github.com/milvus-io/milvus/internal/storage" ) diff --git a/internal/querynode/segment_loader.go b/internal/querynode/segment_loader.go index 0bebb91d4dee3..73db5bc4db1e9 100644 --- a/internal/querynode/segment_loader.go +++ b/internal/querynode/segment_loader.go @@ -28,16 +28,16 @@ import ( "github.com/panjf2000/ants/v2" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/concurrency" diff --git a/internal/querynode/segment_loader_test.go b/internal/querynode/segment_loader_test.go index 4b954b6a40d8c..724f7f92db314 100644 --- a/internal/querynode/segment_loader_test.go +++ b/internal/querynode/segment_loader_test.go @@ -28,13 +28,13 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/concurrency" "github.com/milvus-io/milvus/internal/util/funcutil" diff --git a/internal/querynode/segment_test.go b/internal/querynode/segment_test.go index d74a4391edf23..23190f270b681 100644 --- a/internal/querynode/segment_test.go +++ b/internal/querynode/segment_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/proto/segcorepb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/concurrency" diff --git a/internal/querynode/shard_cluster.go b/internal/querynode/shard_cluster.go index c8d3e0bd64278..938f5124cdadd 100644 --- a/internal/querynode/shard_cluster.go +++ b/internal/querynode/shard_cluster.go @@ -26,9 +26,9 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/errorutil" diff --git a/internal/querynode/shard_cluster_test.go b/internal/querynode/shard_cluster_test.go index cebaf21eab4c8..672ff2c2f5115 100644 --- a/internal/querynode/shard_cluster_test.go +++ b/internal/querynode/shard_cluster_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/stretchr/testify/assert" diff --git a/internal/querynode/task.go b/internal/querynode/task.go index 33f2342068b5a..6cc67fa28da20 100644 --- a/internal/querynode/task.go +++ b/internal/querynode/task.go @@ -26,8 +26,8 @@ import ( "golang.org/x/sync/errgroup" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" queryPb "github.com/milvus-io/milvus/internal/proto/querypb" diff --git a/internal/querynode/task_query.go b/internal/querynode/task_query.go index 29961979aacdd..bbc4814f5ea3e 100644 --- a/internal/querynode/task_query.go +++ b/internal/querynode/task_query.go @@ -24,8 +24,8 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/funcutil" diff --git a/internal/querynode/task_search.go b/internal/querynode/task_search.go index cc0277704b3d9..9fd93bbfe6c43 100644 --- a/internal/querynode/task_search.go +++ b/internal/querynode/task_search.go @@ -29,9 +29,9 @@ import ( "go.uber.org/zap" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/funcutil" diff --git a/internal/querynode/task_statistics.go b/internal/querynode/task_statistics.go index 062c7f984b9ef..ebded609331af 100644 --- a/internal/querynode/task_statistics.go +++ b/internal/querynode/task_statistics.go @@ -7,8 +7,8 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/funcutil" diff --git a/internal/querynode/task_test.go b/internal/querynode/task_test.go index 379a005099b43..bedd00f7e7d03 100644 --- a/internal/querynode/task_test.go +++ b/internal/querynode/task_test.go @@ -21,13 +21,13 @@ import ( "testing" "time" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper/rmq" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/rootcoord/alter_alias_task.go b/internal/rootcoord/alter_alias_task.go index 56b036d15a0a4..e1d493b29e581 100644 --- a/internal/rootcoord/alter_alias_task.go +++ b/internal/rootcoord/alter_alias_task.go @@ -3,8 +3,8 @@ package rootcoord import ( "context" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" ) type alterAliasTask struct { diff --git a/internal/rootcoord/alter_alias_task_test.go b/internal/rootcoord/alter_alias_task_test.go index 1cfe9b0aa5bff..ff007e90b14df 100644 --- a/internal/rootcoord/alter_alias_task_test.go +++ b/internal/rootcoord/alter_alias_task_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/milvuspb" ) func Test_alterAliasTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/broker.go b/internal/rootcoord/broker.go index 2b98e983890c1..6aaa0b2554b04 100644 --- a/internal/rootcoord/broker.go +++ b/internal/rootcoord/broker.go @@ -10,8 +10,8 @@ import ( "github.com/milvus-io/milvus/internal/proto/datapb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/funcutil" "go.uber.org/zap" diff --git a/internal/rootcoord/broker_test.go b/internal/rootcoord/broker_test.go index 75cd975072a79..22600f4be0f1b 100644 --- a/internal/rootcoord/broker_test.go +++ b/internal/rootcoord/broker_test.go @@ -6,7 +6,7 @@ import ( "github.com/milvus-io/milvus/internal/proto/indexpb" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/rootcoord/create_alias_task.go b/internal/rootcoord/create_alias_task.go index 89eb90af33d3b..8b05c8971c9b7 100644 --- a/internal/rootcoord/create_alias_task.go +++ b/internal/rootcoord/create_alias_task.go @@ -3,9 +3,9 @@ package rootcoord import ( "context" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/milvuspb" ) type createAliasTask struct { diff --git a/internal/rootcoord/create_alias_task_test.go b/internal/rootcoord/create_alias_task_test.go index eea45f9b9e966..ddd11f81762ed 100644 --- a/internal/rootcoord/create_alias_task_test.go +++ b/internal/rootcoord/create_alias_task_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/milvuspb" ) func Test_createAliasTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/create_collection_task.go b/internal/rootcoord/create_collection_task.go index 1405e42d69e8c..ffdb71029da27 100644 --- a/internal/rootcoord/create_collection_task.go +++ b/internal/rootcoord/create_collection_task.go @@ -10,7 +10,7 @@ import ( "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" @@ -22,9 +22,9 @@ import ( "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/milvuspb" ) type collectionChannels struct { diff --git a/internal/rootcoord/create_collection_task_test.go b/internal/rootcoord/create_collection_task_test.go index 34e415b9688ae..14b8b7fd96c92 100644 --- a/internal/rootcoord/create_collection_task_test.go +++ b/internal/rootcoord/create_collection_task_test.go @@ -7,13 +7,13 @@ import ( "time" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/rootcoord/create_partition_task.go b/internal/rootcoord/create_partition_task.go index 7922d3c786e4c..09540be79ccb2 100644 --- a/internal/rootcoord/create_partition_task.go +++ b/internal/rootcoord/create_partition_task.go @@ -5,13 +5,13 @@ import ( pb "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/milvuspb" ) type createPartitionTask struct { diff --git a/internal/rootcoord/create_partition_task_test.go b/internal/rootcoord/create_partition_task_test.go index 9227bd8603886..99c5da8de81c9 100644 --- a/internal/rootcoord/create_partition_task_test.go +++ b/internal/rootcoord/create_partition_task_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" ) func Test_createPartitionTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/describe_collection_task.go b/internal/rootcoord/describe_collection_task.go index 1d22dc9bd6252..c5696c0ec60e7 100644 --- a/internal/rootcoord/describe_collection_task.go +++ b/internal/rootcoord/describe_collection_task.go @@ -3,10 +3,10 @@ package rootcoord import ( "context" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/rootcoord/describe_collection_task_test.go b/internal/rootcoord/describe_collection_task_test.go index 08845424e6f87..6e1a1f1673ad4 100644 --- a/internal/rootcoord/describe_collection_task_test.go +++ b/internal/rootcoord/describe_collection_task_test.go @@ -8,8 +8,8 @@ import ( "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/stretchr/testify/assert" ) diff --git a/internal/rootcoord/drop_alias_task.go b/internal/rootcoord/drop_alias_task.go index af5f966a784f8..e7e34d5750219 100644 --- a/internal/rootcoord/drop_alias_task.go +++ b/internal/rootcoord/drop_alias_task.go @@ -3,9 +3,9 @@ package rootcoord import ( "context" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/milvuspb" ) type dropAliasTask struct { diff --git a/internal/rootcoord/drop_alias_task_test.go b/internal/rootcoord/drop_alias_task_test.go index ee834f1a4650f..03f4fdb1ce06e 100644 --- a/internal/rootcoord/drop_alias_task_test.go +++ b/internal/rootcoord/drop_alias_task_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" ) func Test_dropAliasTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/drop_collection_task.go b/internal/rootcoord/drop_collection_task.go index 4a47407cbbbf4..c3c4dab7dec7d 100644 --- a/internal/rootcoord/drop_collection_task.go +++ b/internal/rootcoord/drop_collection_task.go @@ -11,9 +11,9 @@ import ( "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/milvuspb" ) type dropCollectionTask struct { diff --git a/internal/rootcoord/drop_collection_task_test.go b/internal/rootcoord/drop_collection_task_test.go index fb007b45f55c3..6ecb53a909015 100644 --- a/internal/rootcoord/drop_collection_task_test.go +++ b/internal/rootcoord/drop_collection_task_test.go @@ -13,8 +13,8 @@ import ( "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/stretchr/testify/assert" ) diff --git a/internal/rootcoord/drop_partition_task.go b/internal/rootcoord/drop_partition_task.go index 106838c3776ee..4d2d1c6c2d323 100644 --- a/internal/rootcoord/drop_partition_task.go +++ b/internal/rootcoord/drop_partition_task.go @@ -9,12 +9,12 @@ import ( "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/milvuspb" ) type dropPartitionTask struct { diff --git a/internal/rootcoord/drop_partition_task_test.go b/internal/rootcoord/drop_partition_task_test.go index 7f12ac3bce15f..3898b0c06d8cf 100644 --- a/internal/rootcoord/drop_partition_task_test.go +++ b/internal/rootcoord/drop_partition_task_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" ) func Test_dropPartitionTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/garbage_collector.go b/internal/rootcoord/garbage_collector.go index 8c1b2cd093fb0..e006a257914d1 100644 --- a/internal/rootcoord/garbage_collector.go +++ b/internal/rootcoord/garbage_collector.go @@ -4,8 +4,8 @@ import ( "context" "time" + "github.com/milvus-io/milvus/api/commonpb" ms "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/rootcoord/has_collection_task.go b/internal/rootcoord/has_collection_task.go index 065af3a7d619b..a61174597b604 100644 --- a/internal/rootcoord/has_collection_task.go +++ b/internal/rootcoord/has_collection_task.go @@ -5,8 +5,8 @@ import ( "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" ) // hasCollectionTask has collection request task diff --git a/internal/rootcoord/has_collection_task_test.go b/internal/rootcoord/has_collection_task_test.go index c493286786c95..b987f65b99e83 100644 --- a/internal/rootcoord/has_collection_task_test.go +++ b/internal/rootcoord/has_collection_task_test.go @@ -6,8 +6,8 @@ import ( "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/stretchr/testify/assert" ) diff --git a/internal/rootcoord/has_partition_task.go b/internal/rootcoord/has_partition_task.go index 3ccdee83f9d81..8c86c92ef1f0b 100644 --- a/internal/rootcoord/has_partition_task.go +++ b/internal/rootcoord/has_partition_task.go @@ -5,8 +5,8 @@ import ( "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" ) // hasPartitionTask has partition request task diff --git a/internal/rootcoord/has_partition_task_test.go b/internal/rootcoord/has_partition_task_test.go index 3e31b3bcd71a2..948c30eff8dce 100644 --- a/internal/rootcoord/has_partition_task_test.go +++ b/internal/rootcoord/has_partition_task_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/stretchr/testify/assert" ) diff --git a/internal/rootcoord/import_manager.go b/internal/rootcoord/import_manager.go index 22049d21cccf4..6fcec6eb7abd2 100644 --- a/internal/rootcoord/import_manager.go +++ b/internal/rootcoord/import_manager.go @@ -27,11 +27,11 @@ import ( "time" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/util/retry" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/rootcoord/import_manager_test.go b/internal/rootcoord/import_manager_test.go index e5246d7ba4445..77857abdf1ce6 100644 --- a/internal/rootcoord/import_manager_test.go +++ b/internal/rootcoord/import_manager_test.go @@ -25,10 +25,10 @@ import ( "time" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/stretchr/testify/assert" diff --git a/internal/rootcoord/meta_table.go b/internal/rootcoord/meta_table.go index 7925fb724ebb2..8f96278672241 100644 --- a/internal/rootcoord/meta_table.go +++ b/internal/rootcoord/meta_table.go @@ -28,12 +28,12 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/kv/rootcoord" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/contextutil" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/rootcoord/meta_table_test.go b/internal/rootcoord/meta_table_test.go index 144ee6106c5a9..b6ce98f288c64 100644 --- a/internal/rootcoord/meta_table_test.go +++ b/internal/rootcoord/meta_table_test.go @@ -27,12 +27,12 @@ import ( "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/metastore/kv/rootcoord" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util" "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/stretchr/testify/assert" diff --git a/internal/rootcoord/metrics_info.go b/internal/rootcoord/metrics_info.go index 81cbecf9c868e..4a60831e1f5f6 100644 --- a/internal/rootcoord/metrics_info.go +++ b/internal/rootcoord/metrics_info.go @@ -19,10 +19,10 @@ package rootcoord import ( "context" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" diff --git a/internal/rootcoord/mock_test.go b/internal/rootcoord/mock_test.go index 0f3b2a624cadf..ae6333dbcb15c 100644 --- a/internal/rootcoord/mock_test.go +++ b/internal/rootcoord/mock_test.go @@ -14,9 +14,9 @@ import ( "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/tso" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/internalpb" diff --git a/internal/rootcoord/proxy_client_manager.go b/internal/rootcoord/proxy_client_manager.go index 96d4c299079fe..1215971a0ae4e 100644 --- a/internal/rootcoord/proxy_client_manager.go +++ b/internal/rootcoord/proxy_client_manager.go @@ -25,9 +25,9 @@ import ( "go.uber.org/zap" "golang.org/x/sync/errgroup" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/metricsinfo" diff --git a/internal/rootcoord/proxy_client_manager_test.go b/internal/rootcoord/proxy_client_manager_test.go index 8a173e95ac7f1..178b003c85c88 100644 --- a/internal/rootcoord/proxy_client_manager_test.go +++ b/internal/rootcoord/proxy_client_manager_test.go @@ -23,7 +23,7 @@ import ( "sync" "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/stretchr/testify/assert" diff --git a/internal/rootcoord/quota_center.go b/internal/rootcoord/quota_center.go index 0483a0227e4e0..a3aad03430c97 100644 --- a/internal/rootcoord/quota_center.go +++ b/internal/rootcoord/quota_center.go @@ -25,8 +25,8 @@ import ( "go.uber.org/zap" "golang.org/x/sync/errgroup" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/tso" diff --git a/internal/rootcoord/quota_center_test.go b/internal/rootcoord/quota_center_test.go index d0c6eeb6eb2b5..b675ee9c491de 100644 --- a/internal/rootcoord/quota_center_test.go +++ b/internal/rootcoord/quota_center_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/rootcoord/root_coord.go b/internal/rootcoord/root_coord.go index 8a2e92f490aa0..ae30f2444f1d2 100644 --- a/internal/rootcoord/root_coord.go +++ b/internal/rootcoord/root_coord.go @@ -40,14 +40,14 @@ import ( "github.com/milvus-io/milvus/internal/metastore/db/dbcore" kvmetestore "github.com/milvus-io/milvus/internal/metastore/kv/rootcoord" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/tso" diff --git a/internal/rootcoord/root_coord_test.go b/internal/rootcoord/root_coord_test.go index a66d84e8e5b04..9dc89cf0419d2 100644 --- a/internal/rootcoord/root_coord_test.go +++ b/internal/rootcoord/root_coord_test.go @@ -18,10 +18,10 @@ import ( "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/milvuspb" ) func TestRootCoord_CreateCollection(t *testing.T) { diff --git a/internal/rootcoord/show_collection_task.go b/internal/rootcoord/show_collection_task.go index 902e9eb20caf3..415aeb6a9e38d 100644 --- a/internal/rootcoord/show_collection_task.go +++ b/internal/rootcoord/show_collection_task.go @@ -5,8 +5,8 @@ import ( "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/util/tsoutil" ) diff --git a/internal/rootcoord/show_collection_task_test.go b/internal/rootcoord/show_collection_task_test.go index becb5a7b7b5a6..359c738702568 100644 --- a/internal/rootcoord/show_collection_task_test.go +++ b/internal/rootcoord/show_collection_task_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/stretchr/testify/assert" ) diff --git a/internal/rootcoord/show_partition_task.go b/internal/rootcoord/show_partition_task.go index ac29dee98fcfc..4935e77203125 100644 --- a/internal/rootcoord/show_partition_task.go +++ b/internal/rootcoord/show_partition_task.go @@ -3,9 +3,9 @@ package rootcoord import ( "context" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/rootcoord/show_partition_task_test.go b/internal/rootcoord/show_partition_task_test.go index 747b4391628ac..4d67e2a997bff 100644 --- a/internal/rootcoord/show_partition_task_test.go +++ b/internal/rootcoord/show_partition_task_test.go @@ -6,9 +6,9 @@ import ( "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/stretchr/testify/assert" ) diff --git a/internal/rootcoord/timeticksync.go b/internal/rootcoord/timeticksync.go index 4f94d758fe5b0..13347345b7dee 100644 --- a/internal/rootcoord/timeticksync.go +++ b/internal/rootcoord/timeticksync.go @@ -22,10 +22,10 @@ import ( "sync" "time" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/timerecord" diff --git a/internal/rootcoord/timeticksync_test.go b/internal/rootcoord/timeticksync_test.go index 85c4fa7db550e..5bd5097292710 100644 --- a/internal/rootcoord/timeticksync_test.go +++ b/internal/rootcoord/timeticksync_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/util/dependency" ) diff --git a/internal/rootcoord/util.go b/internal/rootcoord/util.go index 2bca33abfb150..27b883888ebd7 100644 --- a/internal/rootcoord/util.go +++ b/internal/rootcoord/util.go @@ -27,8 +27,8 @@ import ( "github.com/milvus-io/milvus/internal/metastore/model" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/rootcoord/util_test.go b/internal/rootcoord/util_test.go index 335f93deaef15..8c6229743a02d 100644 --- a/internal/rootcoord/util_test.go +++ b/internal/rootcoord/util_test.go @@ -21,8 +21,8 @@ import ( "github.com/milvus-io/milvus/internal/metastore/model" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/stretchr/testify/assert" ) diff --git a/internal/storage/binlog_iterator.go b/internal/storage/binlog_iterator.go index 563f34606522a..aa073a63849bf 100644 --- a/internal/storage/binlog_iterator.go +++ b/internal/storage/binlog_iterator.go @@ -20,8 +20,8 @@ import ( "errors" "sync/atomic" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) var ( diff --git a/internal/storage/binlog_iterator_test.go b/internal/storage/binlog_iterator_test.go index 0f7f25428f960..aa737e3ab3516 100644 --- a/internal/storage/binlog_iterator_test.go +++ b/internal/storage/binlog_iterator_test.go @@ -19,9 +19,9 @@ package storage import ( "testing" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/storage/binlog_test.go b/internal/storage/binlog_test.go index 7eea1592d87d3..19d5f9a4a6208 100644 --- a/internal/storage/binlog_test.go +++ b/internal/storage/binlog_test.go @@ -25,8 +25,8 @@ import ( "time" "unsafe" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/milvus-io/milvus/internal/util/uniquegenerator" diff --git a/internal/storage/binlog_writer.go b/internal/storage/binlog_writer.go index 5679a6e28daa5..f4ecf16653e27 100644 --- a/internal/storage/binlog_writer.go +++ b/internal/storage/binlog_writer.go @@ -21,8 +21,8 @@ import ( "encoding/binary" "fmt" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/storage/binlog_writer_test.go b/internal/storage/binlog_writer_test.go index 6b5d5bcf2ee7b..64bb439f68853 100644 --- a/internal/storage/binlog_writer_test.go +++ b/internal/storage/binlog_writer_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/storage/data_codec.go b/internal/storage/data_codec.go index 8449530b99aeb..8d096d3b384bd 100644 --- a/internal/storage/data_codec.go +++ b/internal/storage/data_codec.go @@ -29,10 +29,10 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/storage/data_codec_test.go b/internal/storage/data_codec_test.go index 19b90a3ae5093..bece749c408a2 100644 --- a/internal/storage/data_codec_test.go +++ b/internal/storage/data_codec_test.go @@ -24,9 +24,9 @@ import ( "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/uniquegenerator" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) diff --git a/internal/storage/data_sorter.go b/internal/storage/data_sorter.go index db9be80723713..6f724b530dcdc 100644 --- a/internal/storage/data_sorter.go +++ b/internal/storage/data_sorter.go @@ -17,8 +17,8 @@ package storage import ( + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) // DataSorter sorts insert data diff --git a/internal/storage/data_sorter_test.go b/internal/storage/data_sorter_test.go index 7705f19ede64d..d74df13a41722 100644 --- a/internal/storage/data_sorter_test.go +++ b/internal/storage/data_sorter_test.go @@ -20,8 +20,8 @@ import ( "sort" "testing" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/storage/event_data.go b/internal/storage/event_data.go index fa08807d15505..0e3c423b91800 100644 --- a/internal/storage/event_data.go +++ b/internal/storage/event_data.go @@ -24,8 +24,8 @@ import ( "io" "strconv" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/storage/event_reader.go b/internal/storage/event_reader.go index 518bd4a684784..d7eaf48a8f4c5 100644 --- a/internal/storage/event_reader.go +++ b/internal/storage/event_reader.go @@ -20,7 +20,7 @@ import ( "bytes" "fmt" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" ) // EventReader is used to parse the events contained in the Binlog file. diff --git a/internal/storage/event_test.go b/internal/storage/event_test.go index e598da7e09326..82828f58da36b 100644 --- a/internal/storage/event_test.go +++ b/internal/storage/event_test.go @@ -24,8 +24,8 @@ import ( "time" "unsafe" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/stretchr/testify/assert" diff --git a/internal/storage/event_writer.go b/internal/storage/event_writer.go index 5ea14ff87fb6e..41ea7848cc669 100644 --- a/internal/storage/event_writer.go +++ b/internal/storage/event_writer.go @@ -23,8 +23,8 @@ import ( "fmt" "io" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/storage/event_writer_test.go b/internal/storage/event_writer_test.go index bf7161874e56c..ae3d0054c4473 100644 --- a/internal/storage/event_writer_test.go +++ b/internal/storage/event_writer_test.go @@ -21,8 +21,8 @@ import ( "encoding/binary" "testing" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/storage/payload.go b/internal/storage/payload.go index f1066d5e47290..6a228d470f7fa 100644 --- a/internal/storage/payload.go +++ b/internal/storage/payload.go @@ -29,7 +29,7 @@ import ( "reflect" "unsafe" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/storage/payload_benchmark_test.go b/internal/storage/payload_benchmark_test.go index ce2d4bb22f5a2..bfe836bf7f86b 100644 --- a/internal/storage/payload_benchmark_test.go +++ b/internal/storage/payload_benchmark_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" ) // workload setting for benchmark diff --git a/internal/storage/payload_cgo_test.go b/internal/storage/payload_cgo_test.go index 85e8837ee2bc6..e0ef31db83408 100644 --- a/internal/storage/payload_cgo_test.go +++ b/internal/storage/payload_cgo_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" ) func TestPayload_CGO_ReaderandWriter(t *testing.T) { diff --git a/internal/storage/payload_reader.go b/internal/storage/payload_reader.go index 2c354ccafdcea..9ab399ab5cff0 100644 --- a/internal/storage/payload_reader.go +++ b/internal/storage/payload_reader.go @@ -9,7 +9,7 @@ import ( "github.com/apache/arrow/go/v8/parquet" "github.com/apache/arrow/go/v8/parquet/file" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" ) // PayloadReader reads data from payload diff --git a/internal/storage/payload_reader_cgo.go b/internal/storage/payload_reader_cgo.go index 55d9e8e350ee8..b3a9a2451db14 100644 --- a/internal/storage/payload_reader_cgo.go +++ b/internal/storage/payload_reader_cgo.go @@ -12,9 +12,9 @@ import ( "fmt" "unsafe" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) // PayloadReaderCgo reads data from payload diff --git a/internal/storage/payload_test.go b/internal/storage/payload_test.go index d013e3b9927c4..6528e3169d6d7 100644 --- a/internal/storage/payload_test.go +++ b/internal/storage/payload_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" ) func TestPayload_ReaderAndWriter(t *testing.T) { diff --git a/internal/storage/primary_key.go b/internal/storage/primary_key.go index 8320efb28e5e4..5bec21f94c483 100644 --- a/internal/storage/primary_key.go +++ b/internal/storage/primary_key.go @@ -21,8 +21,8 @@ import ( "fmt" "strings" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) type PrimaryKey interface { diff --git a/internal/storage/primary_key_test.go b/internal/storage/primary_key_test.go index 579cfc7baa96f..82ab367287b4c 100644 --- a/internal/storage/primary_key_test.go +++ b/internal/storage/primary_key_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" ) func TestVarCharPrimaryKey(t *testing.T) { diff --git a/internal/storage/print_binlog.go b/internal/storage/print_binlog.go index 408e0957eee5c..9092cd2869373 100644 --- a/internal/storage/print_binlog.go +++ b/internal/storage/print_binlog.go @@ -25,8 +25,8 @@ import ( "golang.org/x/exp/mmap" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/tsoutil" ) diff --git a/internal/storage/print_binlog_test.go b/internal/storage/print_binlog_test.go index 6bed0e1de1547..ce50c7a664b52 100644 --- a/internal/storage/print_binlog_test.go +++ b/internal/storage/print_binlog_test.go @@ -27,10 +27,10 @@ import ( "github.com/milvus-io/milvus/internal/util/uniquegenerator" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/storage/stats.go b/internal/storage/stats.go index 4d3f28b76bfd6..7fff586356154 100644 --- a/internal/storage/stats.go +++ b/internal/storage/stats.go @@ -20,8 +20,8 @@ import ( "encoding/json" "github.com/bits-and-blooms/bloom/v3" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) const ( diff --git a/internal/storage/stats_test.go b/internal/storage/stats_test.go index 52d591d109efe..f5d83be9ae311 100644 --- a/internal/storage/stats_test.go +++ b/internal/storage/stats_test.go @@ -23,8 +23,8 @@ import ( "github.com/bits-and-blooms/bloom/v3" "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) func TestStatsWriter_Int64PrimaryKey(t *testing.T) { diff --git a/internal/storage/utils.go b/internal/storage/utils.go index 0d8167e915c08..8ce05ce4a976c 100644 --- a/internal/storage/utils.go +++ b/internal/storage/utils.go @@ -28,11 +28,11 @@ import ( "github.com/golang/protobuf/proto" "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/proto/segcorepb" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/storage/utils_test.go b/internal/storage/utils_test.go index 102ee4b64bf25..34efeef3d589e 100644 --- a/internal/storage/utils_test.go +++ b/internal/storage/utils_test.go @@ -27,11 +27,11 @@ import ( "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/common" "github.com/stretchr/testify/assert" diff --git a/internal/storage/vector_chunk_manager_test.go b/internal/storage/vector_chunk_manager_test.go index a1c87cc567c47..aad092ac595c0 100644 --- a/internal/storage/vector_chunk_manager_test.go +++ b/internal/storage/vector_chunk_manager_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/types/types.go b/internal/types/types.go index 00f070b1b3636..8af8d5fa91d61 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -21,11 +21,11 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" diff --git a/internal/util/constant.go b/internal/util/constant.go index d89a0eac3e64b..50b33a37820ce 100644 --- a/internal/util/constant.go +++ b/internal/util/constant.go @@ -19,7 +19,7 @@ package util import ( "strings" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" ) // Meta Prefix consts diff --git a/internal/util/errorutil/util.go b/internal/util/errorutil/util.go index 45c1fa1922826..783d276005413 100644 --- a/internal/util/errorutil/util.go +++ b/internal/util/errorutil/util.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "fmt" diff --git a/internal/util/flowgraph/node_test.go b/internal/util/flowgraph/node_test.go index 6bc7957e10aa7..8cbec47f7236b 100644 --- a/internal/util/flowgraph/node_test.go +++ b/internal/util/flowgraph/node_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/util/dependency" ) diff --git a/internal/util/funcutil/func.go b/internal/util/funcutil/func.go index 4ce75a40aa897..8c4afb0ec8699 100644 --- a/internal/util/funcutil/func.go +++ b/internal/util/funcutil/func.go @@ -31,15 +31,15 @@ import ( "strings" "time" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/milvuspb" "go.uber.org/zap" "github.com/go-basic/ipv4" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/retry" diff --git a/internal/util/funcutil/func_test.go b/internal/util/funcutil/func_test.go index d8cf749ccf076..3693da96307ad 100644 --- a/internal/util/funcutil/func_test.go +++ b/internal/util/funcutil/func_test.go @@ -28,9 +28,9 @@ import ( "time" "github.com/jarcoal/httpmock" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/stretchr/testify/assert" grpcCodes "google.golang.org/grpc/codes" grpcStatus "google.golang.org/grpc/status" diff --git a/internal/util/funcutil/policy.go b/internal/util/funcutil/policy.go index b20835c376794..065bd3cba5956 100644 --- a/internal/util/funcutil/policy.go +++ b/internal/util/funcutil/policy.go @@ -7,9 +7,9 @@ import ( "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "go.uber.org/zap" "google.golang.org/protobuf/reflect/protoreflect" ) diff --git a/internal/util/funcutil/policy_test.go b/internal/util/funcutil/policy_test.go index 6405e9dac1ca3..0231ab8c39cda 100644 --- a/internal/util/funcutil/policy_test.go +++ b/internal/util/funcutil/policy_test.go @@ -3,8 +3,8 @@ package funcutil import ( "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/stretchr/testify/assert" ) diff --git a/internal/util/funcutil/verify_response.go b/internal/util/funcutil/verify_response.go index b406b7cbbd422..36414df27efb6 100644 --- a/internal/util/funcutil/verify_response.go +++ b/internal/util/funcutil/verify_response.go @@ -3,7 +3,7 @@ package funcutil import ( "errors" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" ) // errors for VerifyResponse diff --git a/internal/util/importutil/import_wrapper.go b/internal/util/importutil/import_wrapper.go index 3d19250c21ff6..eadb8f51d9d00 100644 --- a/internal/util/importutil/import_wrapper.go +++ b/internal/util/importutil/import_wrapper.go @@ -12,12 +12,12 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/timerecord" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/util/importutil/import_wrapper_test.go b/internal/util/importutil/import_wrapper_test.go index eb8046e0da98a..a85659bdef373 100644 --- a/internal/util/importutil/import_wrapper_test.go +++ b/internal/util/importutil/import_wrapper_test.go @@ -13,11 +13,11 @@ import ( "go.uber.org/zap" "golang.org/x/exp/mmap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/timerecord" diff --git a/internal/util/importutil/json_handler.go b/internal/util/importutil/json_handler.go index a1bd45b7801cc..3036ed18250d8 100644 --- a/internal/util/importutil/json_handler.go +++ b/internal/util/importutil/json_handler.go @@ -7,10 +7,10 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/typeutil" ) diff --git a/internal/util/importutil/json_handler_test.go b/internal/util/importutil/json_handler_test.go index f16062146382b..50590ecd7f61f 100644 --- a/internal/util/importutil/json_handler_test.go +++ b/internal/util/importutil/json_handler_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" ) diff --git a/internal/util/importutil/json_parser.go b/internal/util/importutil/json_parser.go index b6bf42c1080b3..f503fc73c9d39 100644 --- a/internal/util/importutil/json_parser.go +++ b/internal/util/importutil/json_parser.go @@ -7,8 +7,8 @@ import ( "io" "strings" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" diff --git a/internal/util/importutil/json_parser_test.go b/internal/util/importutil/json_parser_test.go index 18173aae04432..ca1d10dd3f4b0 100644 --- a/internal/util/importutil/json_parser_test.go +++ b/internal/util/importutil/json_parser_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/util/importutil/numpy_parser.go b/internal/util/importutil/numpy_parser.go index eff9db01a4975..1a8aa1fa5c71e 100644 --- a/internal/util/importutil/numpy_parser.go +++ b/internal/util/importutil/numpy_parser.go @@ -6,8 +6,8 @@ import ( "io" "strconv" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/milvus-io/milvus/internal/storage" ) diff --git a/internal/util/importutil/numpy_parser_test.go b/internal/util/importutil/numpy_parser_test.go index 87b8195a094f3..62f0ec8405a74 100644 --- a/internal/util/importutil/numpy_parser_test.go +++ b/internal/util/importutil/numpy_parser_test.go @@ -8,7 +8,7 @@ import ( "github.com/sbinet/npyio/npy" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/timerecord" ) diff --git a/internal/util/indexcgowrapper/codec_index_test.go b/internal/util/indexcgowrapper/codec_index_test.go index d32236c863d14..65426bdfcb78e 100644 --- a/internal/util/indexcgowrapper/codec_index_test.go +++ b/internal/util/indexcgowrapper/codec_index_test.go @@ -14,7 +14,7 @@ import ( "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" ) type indexTestCase struct { diff --git a/internal/util/indexcgowrapper/dataset.go b/internal/util/indexcgowrapper/dataset.go index 8fd237739bac2..dc5510605fff0 100644 --- a/internal/util/indexcgowrapper/dataset.go +++ b/internal/util/indexcgowrapper/dataset.go @@ -1,7 +1,7 @@ package indexcgowrapper import ( - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/storage" ) diff --git a/internal/util/indexcgowrapper/helper.go b/internal/util/indexcgowrapper/helper.go index 0bb252c63eac0..4d2ae2a2f89af 100644 --- a/internal/util/indexcgowrapper/helper.go +++ b/internal/util/indexcgowrapper/helper.go @@ -12,8 +12,8 @@ import ( "fmt" "unsafe" + "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" ) func GetBinarySetKeys(cBinarySet C.CBinarySet) ([]string, error) { diff --git a/internal/util/indexcgowrapper/index.go b/internal/util/indexcgowrapper/index.go index 26abf176b49d9..1ec2d7fd159c7 100644 --- a/internal/util/indexcgowrapper/index.go +++ b/internal/util/indexcgowrapper/index.go @@ -15,8 +15,8 @@ import ( "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/indexcgopb" diff --git a/internal/util/indexcgowrapper/index_test.go b/internal/util/indexcgowrapper/index_test.go index 4647e8cef24de..d0c108d98bbd8 100644 --- a/internal/util/indexcgowrapper/index_test.go +++ b/internal/util/indexcgowrapper/index_test.go @@ -7,7 +7,7 @@ import ( "strconv" "testing" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/util/indexparamcheck/scalar_index_checker.go b/internal/util/indexparamcheck/scalar_index_checker.go index 7c23de95ed0cc..2c7128d8f00f5 100644 --- a/internal/util/indexparamcheck/scalar_index_checker.go +++ b/internal/util/indexparamcheck/scalar_index_checker.go @@ -1,6 +1,6 @@ package indexparamcheck -import "github.com/milvus-io/milvus/internal/proto/schemapb" +import "github.com/milvus-io/milvus/api/schemapb" // TODO: check index parameters according to the index type & data type. func CheckIndexValid(dType schemapb.DataType, indexType IndexType, indexParams map[string]string) error { diff --git a/internal/util/indexparamcheck/scalar_index_checker_test.go b/internal/util/indexparamcheck/scalar_index_checker_test.go index dfd6080d7e9eb..157da0a9f3e9b 100644 --- a/internal/util/indexparamcheck/scalar_index_checker_test.go +++ b/internal/util/indexparamcheck/scalar_index_checker_test.go @@ -3,7 +3,7 @@ package indexparamcheck import ( "testing" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/util/metricsinfo/cache.go b/internal/util/metricsinfo/cache.go index bafa20f50e250..2ab874415736e 100644 --- a/internal/util/metricsinfo/cache.go +++ b/internal/util/metricsinfo/cache.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/milvuspb" ) // DefaultMetricsRetention defines the default retention of metrics cache. diff --git a/internal/util/metricsinfo/cache_test.go b/internal/util/metricsinfo/cache_test.go index a9b9fad0cefb9..040ce3b5919a6 100644 --- a/internal/util/metricsinfo/cache_test.go +++ b/internal/util/metricsinfo/cache_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/stretchr/testify/assert" ) diff --git a/internal/util/metricsinfo/metric_type.go b/internal/util/metricsinfo/metric_type.go index 3284c629ef481..67207be90e4f7 100644 --- a/internal/util/metricsinfo/metric_type.go +++ b/internal/util/metricsinfo/metric_type.go @@ -15,8 +15,8 @@ import ( "encoding/json" "fmt" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" ) const ( diff --git a/internal/util/mock/datacoord_client.go b/internal/util/mock/datacoord_client.go index 5b8c69c747db9..f48f69a00c68b 100644 --- a/internal/util/mock/datacoord_client.go +++ b/internal/util/mock/datacoord_client.go @@ -21,10 +21,10 @@ import ( "google.golang.org/grpc" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" ) // DataCoordClient mocks of DataCoordClient diff --git a/internal/util/mock/grpc_datacoord_client.go b/internal/util/mock/grpc_datacoord_client.go index e7f31616597eb..fd8967c2d166a 100644 --- a/internal/util/mock/grpc_datacoord_client.go +++ b/internal/util/mock/grpc_datacoord_client.go @@ -21,10 +21,10 @@ import ( "google.golang.org/grpc" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" ) var _ datapb.DataCoordClient = &GrpcDataCoordClient{} diff --git a/internal/util/mock/grpc_datanode_client.go b/internal/util/mock/grpc_datanode_client.go index 360e80c3201b1..ece1f4017b73d 100644 --- a/internal/util/mock/grpc_datanode_client.go +++ b/internal/util/mock/grpc_datanode_client.go @@ -21,10 +21,10 @@ import ( "google.golang.org/grpc" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" ) var _ datapb.DataNodeClient = &GrpcDataNodeClient{} diff --git a/internal/util/mock/grpc_indexnode_client.go b/internal/util/mock/grpc_indexnode_client.go index 4619635864ad7..e9f4aaea15375 100644 --- a/internal/util/mock/grpc_indexnode_client.go +++ b/internal/util/mock/grpc_indexnode_client.go @@ -21,10 +21,10 @@ import ( "google.golang.org/grpc" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" ) var _ indexpb.IndexNodeClient = &GrpcIndexNodeClient{} diff --git a/internal/util/mock/grpc_proxy_client.go b/internal/util/mock/grpc_proxy_client.go index dbe7fbca84c74..e69c46f5b3e5e 100644 --- a/internal/util/mock/grpc_proxy_client.go +++ b/internal/util/mock/grpc_proxy_client.go @@ -21,9 +21,9 @@ import ( "google.golang.org/grpc" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/proxypb" ) diff --git a/internal/util/mock/grpc_querycoord_client.go b/internal/util/mock/grpc_querycoord_client.go index 795830cf1e4fc..433aa42d4c676 100644 --- a/internal/util/mock/grpc_querycoord_client.go +++ b/internal/util/mock/grpc_querycoord_client.go @@ -21,9 +21,9 @@ import ( "google.golang.org/grpc" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" ) diff --git a/internal/util/mock/grpc_querynode_client.go b/internal/util/mock/grpc_querynode_client.go index e7396f1d7626e..c9f228dd758c3 100644 --- a/internal/util/mock/grpc_querynode_client.go +++ b/internal/util/mock/grpc_querynode_client.go @@ -21,9 +21,9 @@ import ( "google.golang.org/grpc" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" ) diff --git a/internal/util/mock/grpc_rootcoord_client.go b/internal/util/mock/grpc_rootcoord_client.go index 3468bc428ade1..05aab2f16844c 100644 --- a/internal/util/mock/grpc_rootcoord_client.go +++ b/internal/util/mock/grpc_rootcoord_client.go @@ -21,10 +21,10 @@ import ( "google.golang.org/grpc" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" ) diff --git a/internal/util/mock/querynode_client.go b/internal/util/mock/querynode_client.go index 8e91e04d40df5..ea71f180f946b 100644 --- a/internal/util/mock/querynode_client.go +++ b/internal/util/mock/querynode_client.go @@ -19,9 +19,9 @@ package mock import ( "context" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/types" ) diff --git a/internal/util/typeutil/data_format.go b/internal/util/typeutil/data_format.go index 3e9bf23886be6..6527c98dad3bb 100644 --- a/internal/util/typeutil/data_format.go +++ b/internal/util/typeutil/data_format.go @@ -24,10 +24,10 @@ import ( "io" "reflect" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "go.uber.org/zap" ) diff --git a/internal/util/typeutil/data_format_test.go b/internal/util/typeutil/data_format_test.go index 2206d11c8352e..352c972dfe851 100644 --- a/internal/util/typeutil/data_format_test.go +++ b/internal/util/typeutil/data_format_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" ) func TestTransferColumnBasedDataToRowBasedData(t *testing.T) { diff --git a/internal/util/typeutil/hash.go b/internal/util/typeutil/hash.go index a55308a25ca93..ac1c7e84c56d1 100644 --- a/internal/util/typeutil/hash.go +++ b/internal/util/typeutil/hash.go @@ -22,8 +22,8 @@ import ( "github.com/spaolacci/murmur3" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/schemapb" ) const substringLengthForCRC = 100 diff --git a/internal/util/typeutil/hash_test.go b/internal/util/typeutil/hash_test.go index 4ad2b7f050b33..3dd674ff53fa1 100644 --- a/internal/util/typeutil/hash_test.go +++ b/internal/util/typeutil/hash_test.go @@ -21,7 +21,7 @@ import ( "testing" "unsafe" - "github.com/milvus-io/milvus/internal/proto/schemapb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/stretchr/testify/assert" ) diff --git a/internal/util/typeutil/index.go b/internal/util/typeutil/index.go index cb1c28975f1e9..0bffd53c10f40 100644 --- a/internal/util/typeutil/index.go +++ b/internal/util/typeutil/index.go @@ -16,7 +16,7 @@ package typeutil -import "github.com/milvus-io/milvus/internal/proto/commonpb" +import "github.com/milvus-io/milvus/api/commonpb" // CompareIndexParams compares indexParam1 with indexParam2. When all keys of indexParam1 exist in indexParam2, // and the corresponding value are the same as in indexParam2, return true diff --git a/internal/util/typeutil/index_test.go b/internal/util/typeutil/index_test.go index 99f39b38a1780..ab3073cbb6fdb 100644 --- a/internal/util/typeutil/index_test.go +++ b/internal/util/typeutil/index_test.go @@ -19,7 +19,7 @@ package typeutil import ( "testing" - "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/api/commonpb" "github.com/stretchr/testify/assert" ) diff --git a/internal/util/typeutil/schema.go b/internal/util/typeutil/schema.go index 1c45824f535e9..06bcefdab37af 100644 --- a/internal/util/typeutil/schema.go +++ b/internal/util/typeutil/schema.go @@ -21,8 +21,8 @@ import ( "fmt" "strconv" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/schemapb" "go.uber.org/zap" ) diff --git a/internal/util/typeutil/schema_test.go b/internal/util/typeutil/schema_test.go index 61edf791b7178..ee96bb40842a0 100644 --- a/internal/util/typeutil/schema_test.go +++ b/internal/util/typeutil/schema_test.go @@ -22,10 +22,10 @@ import ( "go.uber.org/zap" + "github.com/milvus-io/milvus/api/commonpb" + "github.com/milvus-io/milvus/api/schemapb" "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/schemapb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/scripts/check_proto_product.sh b/scripts/check_proto_product.sh index 5d72630ce4a4f..2a909e96cec0b 100755 --- a/scripts/check_proto_product.sh +++ b/scripts/check_proto_product.sh @@ -21,6 +21,14 @@ SCRIPTS_DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" cd ${SCRIPTS_DIR} GO_SRC_DIR="${SCRIPTS_DIR}/$1" + +if [[ $(uname -s) == "Darwin" ]]; then + if ! brew --prefix --installed grep >/dev/null 2>&1; then + brew install grep + fi + export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH" +fi + if test -z "$(git status | grep -E "*pb.go|*pb.cc|*pb.h")"; then exit 0 else diff --git a/scripts/proto_gen_go.sh b/scripts/proto_gen_go.sh index 6d6cca44ea149..e9d3325c5b2c7 100755 --- a/scripts/proto_gen_go.sh +++ b/scripts/proto_gen_go.sh @@ -35,13 +35,13 @@ echo `which protoc-gen-go` # official go code ship with the crate, so we need to generate it manually. pushd ${PROTO_DIR} -mkdir -p commonpb -mkdir -p schemapb +mkdir -p ../../api/commonpb +mkdir -p ../../api/schemapb mkdir -p etcdpb mkdir -p indexcgopb mkdir -p internalpb -mkdir -p milvuspb +mkdir -p ../../api/milvuspb mkdir -p rootcoordpb mkdir -p segcorepb @@ -52,20 +52,38 @@ mkdir -p datapb mkdir -p querypb mkdir -p planpb -${protoc} --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. --go_out=plugins=grpc,paths=source_relative:./commonpb common.proto -${protoc} --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. --go_out=plugins=grpc,paths=source_relative:./schemapb schema.proto -${protoc} --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. --go_out=plugins=grpc,paths=source_relative:./etcdpb etcd_meta.proto -${protoc} --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. --go_out=plugins=grpc,paths=source_relative:./indexcgopb index_cgo_msg.proto - -${protoc} --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. --go_out=plugins=grpc,paths=source_relative:./rootcoordpb root_coord.proto - -${protoc} --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. --go_out=plugins=grpc,paths=source_relative:./internalpb internal.proto -${protoc} --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. --go_out=plugins=grpc,paths=source_relative:./milvuspb milvus.proto -${protoc} --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. --go_out=plugins=grpc,paths=source_relative:./proxypb proxy.proto -${protoc} --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. --go_out=plugins=grpc,paths=source_relative:./indexpb index_coord.proto -${protoc} --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. --go_out=plugins=grpc,paths=source_relative:./datapb data_coord.proto -${protoc} --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. --go_out=plugins=grpc,paths=source_relative:./querypb query_coord.proto -${protoc} --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. --go_out=plugins=grpc,paths=source_relative:./planpb plan.proto -${protoc} --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. --go_out=plugins=grpc,paths=source_relative:./segcorepb segcore.proto +${protoc} --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. \ + --go_opt="Mmilvus.proto=github.com/milvus-io/milvus/api/milvuspb;milvuspb" \ + --go_opt=Mcommon.proto=github.com/milvus-io/milvus/api/commonpb \ + --go_opt=Mschema.proto=github.com/milvus-io/milvus/api/schemapb \ + --go_out=plugins=grpc,paths=source_relative:./../../api/milvuspb milvus.proto + +${protoc} --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. \ + --go_opt=Mmilvus.proto=github.com/milvus-io/milvus/api/milvuspb \ + --go_opt=Mcommon.proto=github.com/milvus-io/milvus/api/commonpb \ + --go_opt="Mschema.proto=github.com/milvus-io/milvus/api/schemapb;schemapb" \ + --go_out=plugins=grpc,paths=source_relative:./../../api/schemapb schema.proto + +${protoc} --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. \ + --go_opt=Mmilvus.proto=github.com/milvus-io/milvus/api/milvuspb \ + --go_opt="Mcommon.proto=github.com/milvus-io/milvus/api/commonpb;commonpb" \ + --go_opt=Mschema.proto=github.com/milvus-io/milvus/api/schemapb \ + --go_out=plugins=grpc,paths=source_relative:./../../api/commonpb common.proto + +protoc_opt="${protoc} --proto_path=${GOOGLE_PROTO_DIR} --proto_path=. + --go_opt=Mmilvus.proto=github.com/milvus-io/milvus/api/milvuspb + --go_opt=Mcommon.proto=github.com/milvus-io/milvus/api/commonpb + --go_opt=Mschema.proto=github.com/milvus-io/milvus/api/schemapb" + +${protoc_opt} --go_out=plugins=grpc,paths=source_relative:./etcdpb etcd_meta.proto +${protoc_opt} --go_out=plugins=grpc,paths=source_relative:./indexcgopb index_cgo_msg.proto +${protoc_opt} --go_out=plugins=grpc,paths=source_relative:./rootcoordpb root_coord.proto +${protoc_opt} --go_out=plugins=grpc,paths=source_relative:./internalpb internal.proto +${protoc_opt} --go_out=plugins=grpc,paths=source_relative:./proxypb proxy.proto +${protoc_opt} --go_out=plugins=grpc,paths=source_relative:./indexpb index_coord.proto +${protoc_opt} --go_out=plugins=grpc,paths=source_relative:./datapb data_coord.proto +${protoc_opt} --go_out=plugins=grpc,paths=source_relative:./querypb query_coord.proto +${protoc_opt} --go_out=plugins=grpc,paths=source_relative:./planpb plan.proto +${protoc_opt} --go_out=plugins=grpc,paths=source_relative:./segcorepb segcore.proto popd