cherry pick from nebula : fix bug (vesoft-inc#5607) (vesoft-inc#2859)

fix bug (vesoft-inc#5607) Co-authored-by: hs.zhang <22708345+cangfengzhs@users.noreply.github.com>
yixinglu · Jun 21, 2023 · 800aae0 · 800aae0
1 parent 0ca947b
commit 800aae0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/clients/meta/MetaClient.cpp b/src/clients/meta/MetaClient.cpp
@@ -1369,6 +1369,8 @@ Status MetaClient::handleResponse(const RESP& resp) {
       return Status::Error("Related fulltext index exists, please drop it first");
     case nebula::cpp2::ErrorCode::E_HOST_CAN_NOT_BE_ADDED:
       return Status::Error("Could not add a host, which is not a storage and not expired either");
+    case nebula::cpp2::ErrorCode::E_ACCESS_ES_FAILURE:
+      return Status::Error("Access elasticsearch failed");
     default:
       return Status::Error("Unknown error %d!", static_cast<int>(resp.get_code()));
   }

diff --git a/src/graph/executor/query/FulltextIndexScanExecutor.cpp b/src/graph/executor/query/FulltextIndexScanExecutor.cpp
@@ -90,6 +90,9 @@ StatusOr<plugin::ESQueryResult> FulltextIndexScanExecutor::accessFulltextIndex(
         limit = std::numeric_limits<int32_t>::max();
       }
       int64_t count = limit - offset;
+      if (count == 0) {
+        return plugin::ESQueryResult();
+      }
       execFunc = [=, &esAdapter]() { return esAdapter.queryString(index, query, offset, count); };
       break;
     }