From aad8f82d4124f32816cdada69fb89d8dc2610a7d Mon Sep 17 00:00:00 2001 From: chen qingxiang <67679556+godchen0212@users.noreply.github.com> Date: Wed, 5 Aug 2020 16:24:47 +0800 Subject: [PATCH] fix index bug caused by json parse (#3129) * fix index bug caused by json parse Signed-off-by: godchen0212 --- core/src/server/delivery/request/CreateIndexReq.cpp | 2 +- core/src/server/grpc_impl/GrpcRequestHandler.cpp | 4 +++- .../milvus_python_test/collection/test_collection_count.py | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/src/server/delivery/request/CreateIndexReq.cpp b/core/src/server/delivery/request/CreateIndexReq.cpp index fb30232c22..1f96aa3ae6 100644 --- a/core/src/server/delivery/request/CreateIndexReq.cpp +++ b/core/src/server/delivery/request/CreateIndexReq.cpp @@ -104,7 +104,7 @@ CreateIndexReq::OnExecute() { } // validate index parameters - status = ValidateIndexParams(json_params_, dimension, index_type); + status = ValidateIndexParams(json_params_[engine::PARAM_INDEX_EXTRA_PARAMS], dimension, index_type); if (!status.ok()) { return status; } diff --git a/core/src/server/grpc_impl/GrpcRequestHandler.cpp b/core/src/server/grpc_impl/GrpcRequestHandler.cpp index 6c96671947..2526af78bc 100644 --- a/core/src/server/grpc_impl/GrpcRequestHandler.cpp +++ b/core/src/server/grpc_impl/GrpcRequestHandler.cpp @@ -813,7 +813,9 @@ GrpcRequestHandler::CreateIndex(::grpc::ServerContext* context, const ::milvus:: for (int i = 0; i < request->extra_params_size(); i++) { const ::milvus::grpc::KeyValuePair& extra = request->extra_params(i); if (extra.key() == EXTRA_PARAM_KEY) { - json_params = json::parse(extra.value()); + json_params[EXTRA_PARAM_KEY] = json::parse(extra.value()); + } else { + json_params[extra.key()] = extra.value(); } } diff --git a/tests/milvus_python_test/collection/test_collection_count.py b/tests/milvus_python_test/collection/test_collection_count.py index 2e7851c711..77b471e0af 100644 --- a/tests/milvus_python_test/collection/test_collection_count.py +++ b/tests/milvus_python_test/collection/test_collection_count.py @@ -306,7 +306,7 @@ class TestCollectionCountBinary: connect.create_partition(binary_collection, tag) res_ids = connect.insert(binary_collection, entities, partition_tag=tag) connect.flush([binary_collection]) - res = connect.count_entities(binary_collections) + res = connect.count_entities(binary_collection) assert res == insert_count @pytest.mark.level(2) @@ -510,7 +510,7 @@ class TestCollectionMultiCollections: for i in range(collection_num): collection_name = gen_unique_str(collection_id) collection_list.append(collection_name) - connect.create_collection(collection_name, fields) + connect.create_collection(collection_name, default_fields) res = connect.insert(collection_name, entities) connect.flush(collection_list) for i in range(collection_num): @@ -535,7 +535,7 @@ class TestCollectionMultiCollections: for i in range(int(collection_num / 2), collection_num): collection_name = gen_unique_str(collection_id) collection_list.append(collection_name) - connect.create_collection(collection_name, fields) + connect.create_collection(collection_name, default_fields) res = connect.insert(collection_name, binary_entities) connect.flush(collection_list) for i in range(collection_num):