Merge remote-tracking branch 'origin/develop'

mldrugdiscovery · Jul 13, 2018 · 1bfa6bf · 1bfa6bf
2 parents 4197cf2 + 7592671
commit 1bfa6bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/similarity_search/include/logging.h b/similarity_search/include/logging.h
@@ -128,7 +128,7 @@ class RuntimeErrorWrapper {
 
 #define CHECK_MSG(condition,message) \
   if (!(condition)) {\
-    LOG(LIB_ERROR) << "Check failed: " << #condition;  \
+    LOG(LIB_ERROR) << "Check failed: " << #condition << " " << string(message);  \
     throw runtime_error("Check failed: " + string(message)); \
   }
 

diff --git a/similarity_search/src/method/hnsw.cc b/similarity_search/src/method/hnsw.cc
@@ -684,7 +684,7 @@ namespace similarity {
     void
     Hnsw<dist_t>::Search(KNNQuery<dist_t> *query, IdType) const
     {
-        if (this->data_.empty()) {
+        if (this->data_.empty() and this->data_rearranged_.empty()) {
           return;
         }
         bool useOld = searchAlgoType_ == kOld || (searchAlgoType_ == kHybrid && ef_ >= 1000);