From 243e843aace77a40a322907c3f7ef967bfc7d66d Mon Sep 17 00:00:00 2001
From: Tinkerrr <xiaojun.lin@zilliz.com>
Date: Thu, 26 Mar 2020 18:28:24 +0800
Subject: [PATCH] fix #1747 (#1757)

* fix

Signed-off-by: Nicky <nicky.xj.lin@gmail.com>

* update.

Signed-off-by: Nicky <nicky.xj.lin@gmail.com>

* lint pass

Signed-off-by: xiaojun.lin <xiaojun.lin@zilliz.com>

* UPDATE CASE: search with tag not exist

Signed-off-by: zw <zw@zilliz.com>

Co-authored-by: zw <zw@zilliz.com>
---
 CHANGELOG.md                                    | 1 +
 core/src/db/DBImpl.cpp                          | 9 ++++++++-
 core/src/utils/Error.h                          | 1 +
 tests/milvus_python_test/test_search_vectors.py | 3 +--
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7335e4b46..a8e532d138 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ Please mark all change in change log and use the issue from GitHub
 -   \#1728 Optimize request handler to combine similar query
 -   \#1734 Opentracing for combined search request
 -   \#1735 Fix search out of memory with ivf_flat 
+-   \#1747 Expected error status if search with partition_tag not existed
 -   \#1756 Fix memory exhausted during searching 
 
 ## Feature
diff --git a/core/src/db/DBImpl.cpp b/core/src/db/DBImpl.cpp
index 7fef4b5407..cbb70b9466 100644
--- a/core/src/db/DBImpl.cpp
+++ b/core/src/db/DBImpl.cpp
@@ -1130,7 +1130,10 @@ DBImpl::Query(const std::shared_ptr<server::Context>& context, const std::string
     } else {
         // get files from specified partitions
         std::set<std::string> partition_name_array;
-        GetPartitionsByTags(table_id, partition_tags, partition_name_array);
+        status = GetPartitionsByTags(table_id, partition_tags, partition_name_array);
+        if (!status.ok()) {
+            return status;  // didn't match any partition.
+        }
 
         for (auto& partition_name : partition_name_array) {
             status = GetFilesToSearch(partition_name, files_array);
@@ -1665,6 +1668,10 @@ DBImpl::GetPartitionsByTags(const std::string& table_id, const std::vector<std::
         }
     }
 
+    if (partition_name_array.empty()) {
+        return Status(PARTITION_NOT_FOUND, "Cannot find the specified partitions");
+    }
+
     return Status::OK();
 }
 
diff --git a/core/src/utils/Error.h b/core/src/utils/Error.h
index d98bd2d6e9..dd493072d2 100644
--- a/core/src/utils/Error.h
+++ b/core/src/utils/Error.h
@@ -93,6 +93,7 @@ constexpr ErrorCode DB_INCOMPATIB_META = ToDbErrorCode(6);
 constexpr ErrorCode DB_INVALID_META_URI = ToDbErrorCode(7);
 constexpr ErrorCode DB_EMPTY_TABLE = ToDbErrorCode(8);
 constexpr ErrorCode DB_BLOOM_FILTER_ERROR = ToDbErrorCode(9);
+constexpr ErrorCode PARTITION_NOT_FOUND = ToDbErrorCode(10);
 
 // knowhere error code
 constexpr ErrorCode KNOWHERE_ERROR = ToKnowhereErrorCode(1);
diff --git a/tests/milvus_python_test/test_search_vectors.py b/tests/milvus_python_test/test_search_vectors.py
index 38e91d1d3d..02e62a2e62 100644
--- a/tests/milvus_python_test/test_search_vectors.py
+++ b/tests/milvus_python_test/test_search_vectors.py
@@ -327,8 +327,7 @@ class TestSearchBase:
         search_param = get_search_param(index_type)
         status, result = connect.search_vectors(collection, top_k, query_vec, partition_tags=["new_tag"], params=search_param)
         logging.getLogger().info(result)
-        assert status.OK()
-        assert len(result) == 0
+        assert not status.OK()
 
     def test_search_l2_index_params_partition_E(self, connect, collection, get_simple_index):
         '''