Merge pull request #303 from junjiejiangjjj/empty-query

Fix empty query

Author: liliu-z

python/setup.py

@@ -142,7 +142,7 @@ def parse_requirements(file_name: str) -> List[str]:
 
 
 setup(name='milvus-lite',
-      version='2.5.1',
+      version='2.5.2',
       description='A lightweight version of Milvus wrapped with Python.',
       author='Milvus Team',
       author_email='milvus-team@zilliz.com',

python/src/milvus_lite/server.py

@@ -92,7 +92,7 @@ def start(self) -> bool:
             fcntl.lockf(self._lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
             start_env = {
                     "LD_LIBRARY_PATH": str(self._bin_path) + ':' + os.environ.get('LD_LIBRARY_PATH', ''),
-                    "DYLD_LIBRARY_PATH": str(self._bin_path) + ':' + os.environ.get('LD_LIBRARY_PATH', '')
+                    "DYLD_LIBRARY_PATH": str(self._bin_path) + ':' + os.environ.get('DYLD_LIBRARY_PATH', '')
             }
             src_env = os.environ.copy()
             if "LD_LIBRARY_PATH" in src_env:

src/function/bm25_stat.h

@@ -22,7 +22,6 @@
 #include <tuple>
 #include <vector>
 #include "common.h"
-#include "function/bm25_stat.h"
 #include "function/function_executor.h"
 #include "log/Log.h"
 #include "pb/schema.pb.h"

src/insert_task.cpp

@@ -198,6 +198,17 @@ SegcoreWrapper::Retrieve(const std::string& plan, RetrieveResult* result) {
         auto status = Status(::CreateRetrievePlanByExpr(
             collection_, plan.c_str(), plan.size(), &retrieve_plan.plan_));
         CHECK_STATUS(status, "Create retrieve plan failed, invalid expr");
+        if (::GetRowCount(segment_) == 0) {
+            milvus::proto::segcore::RetrieveResults empty_ret;
+            auto serialized_results = empty_ret.SerializeAsString();
+            result->retrieve_result_.proto_blob =
+                new uint8_t[serialized_results.size()];
+            std::memcpy(const_cast<void*>(result->retrieve_result_.proto_blob),
+                        serialized_results.data(),
+                        serialized_results.size());
+            result->retrieve_result_.proto_size = serialized_results.size();
+            return Status::Ok();
+        }
         auto job = ::AsyncRetrieve({},
                                    segment_,
                                    retrieve_plan.plan_,

src/segcore_wrapper.cpp

@@ -27,6 +27,16 @@ def setUp(self):
     def tearDown(self):
         self.milvus_client.drop_collection(self.collection_name)
 
+    def test_query_empty(self):
+        self.milvus_client.query(self.collection_name, limit=3)
+        rows = [
+            {'id': 1, 'vector': [0.0, 1], 'a': 100},
+        ]
+        insert_result = self.milvus_client.insert(self.collection_name, rows)
+        self.assertEqual(insert_result['insert_count'], 1)
+        self.milvus_client.delete(self.collection_name, ids=[1])
+        self.milvus_client.query(self.collection_name, limit=3)
+
     def test_query(self):
         rows = [
             {'id': 1, 'vector': [0.0, 1], 'a': 100},