Merge remote-tracking branch 'source/crud' into crud2

milvus-io · Feb 26, 2020 · ad69e8f · ad69e8f
2 parents bfe012a + ccd8074
commit ad69e8f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/core/src/server/delivery/request/DeleteByIDRequest.cpp b/core/src/server/delivery/request/DeleteByIDRequest.cpp
@@ -81,10 +81,6 @@ DeleteByIDRequest::OnExecute() {
 
         rc.RecordSection("check validation");
 
-#ifdef MILVUS_ENABLE_PROFILING
-        std::string fname = "/tmp/search_nq_" + this->delete_by_range_param_->table_name() + ".profiling";
-        ProfilerStart(fname.c_str());
-#endif
         status = DBWrapper::DB()->DeleteVectors(table_name_, vector_ids_);
         if (!status.ok()) {
             return status;

diff --git a/core/src/server/delivery/request/SearchByIDRequest.cpp b/core/src/server/delivery/request/SearchByIDRequest.cpp
@@ -21,10 +21,15 @@
 
 #include "server/Config.h"
 #include "server/DBWrapper.h"
+#include "utils/CommonUtil.h"
 #include "utils/Log.h"
 #include "utils/TimeRecorder.h"
 #include "utils/ValidationUtil.h"
 
+#ifdef MILVUS_ENABLE_PROFILING
+#include <gperftools/profiler.h>
+#endif
+
 namespace milvus {
 namespace server {
 
@@ -129,8 +134,7 @@ SearchByIDRequest::OnExecute() {
         engine::ResultDistances result_distances;
 
 #ifdef MILVUS_ENABLE_PROFILING
-        std::string fname =
-            "/tmp/search_nq_" + std::to_string(this->search_param_->query_record_array_size()) + ".profiling";
+        std::string fname = "/tmp/search_by_id_" + CommonUtil::GetCurrentTimeStr() + ".profiling";
         ProfilerStart(fname.c_str());
 #endif
 

diff --git a/tests/milvus_python_test/test_get_vector_by_id.py b/tests/milvus_python_test/test_get_vector_by_id.py
@@ -361,22 +361,22 @@ def test_get_vector_table_not_existed(self, connect, jac_table):
         status, res = connect.get_vector_by_id(table_new, 1) 
         assert not status.OK()
 
-    def test_get_vector_partition(self, connect, table):
+    def test_get_vector_partition(self, connect, jac_table):
         '''
         target: test get_vector_by_id
         method: add vector, and get
         expected: status ok, vector returned
         '''
         tmp, vectors = gen_binary_vectors(nb, dim)
-        status = connect.create_partition(table, tag)
-        status, ids = connect.add_vectors(table, vectors, partition_tag=tag)
+        status = connect.create_partition(jac_table, tag)
+        status, ids = connect.add_vectors(jac_table, vectors, partition_tag=tag)
         assert status.OK()
-        status = connect.flush([table])
+        status = connect.flush([jac_table])
         assert status.OK()
-        status, res = connect.get_vector_by_id(table, ids[0])
+        status, res = connect.get_vector_by_id(jac_table, ids[0])
         logging.getLogger().info(res)
         assert status.OK()
-        assert res == vectors[0] 
+        assert res == vectors[0]
 
 
 class TestGetVectorIdIngalid(object):