hnswlib 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f313f103d9a4a6e6ae92f21cc92a4aaaecd3121e3a2c5be533f87954afb5ac7d
-  data.tar.gz: 3b7ec61621c905759f466df1ac76c18a76186a5ef5c84517ada5c1493524ec5c
+  metadata.gz: dfe29cb17343b0e602684976fa3bd91a9756226e42fdaedded8398e8d97dc83d
+  data.tar.gz: 5b1fca956e5a4bb3e28b46dd891f969a4dbfe7b1f03295657322ffc77b089595
 SHA512:
-  metadata.gz: 12717a35c16fb2ef3f8884fb541559349410e43c9ba35c98de4fbf4a5faa6cd58ffba2cd26ac049ffaea855cf2c4e33f77ffefea023b901cbd8605ada3b63d5c
-  data.tar.gz: c134905c5c268313a8a6bfff69567a66ca62e3d2e1a9d133cd87592262994eaf3731ac3b59e1eaed212a9dfa514f2c91b9eceb11f420e6f988d15f9250dbe863
+  metadata.gz: 213e43f294b0c6e306aef4a700df4b733b1cbd40253a61d91b15b272b7f0e2b095a5eebc79efb5d5d8af8b01048752a87bad4f610b528d49c1809d09e8e9c51b
+  data.tar.gz: 2cffaef5381339dd85d8ad93aff9bf1e3ac271a7797b9e5a8c6122836d3401da17380f31db6594577d5412a0c1372609ed3e3b717c401b603370113d8d811e05

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.5.3] - 2022-03-05
+
+- Add error handling for std::runtime_error throwed from hnswlib.
+- Add memory release for existing search index when loading index.
+
 ## [0.5.2] - 2022-02-19
 
 - Update bundled hnswlib version to 0.6.2.

data/ext/hnswlib/hnswlibext.hpp

@@ -277,7 +277,12 @@ class RbHnswlibHierarchicalNSW {
       const size_t random_seed = (size_t)NUM2INT(kw_values[4]);
 
       hnswlib::HierarchicalNSW<float>* ptr = get_hnsw_hierarchicalnsw(self);
-      new (ptr) hnswlib::HierarchicalNSW<float>(space, max_elements, m, ef_construction, random_seed);
+      try {
+        new (ptr) hnswlib::HierarchicalNSW<float>(space, max_elements, m, ef_construction, random_seed);
+      } catch(const std::runtime_error& e) {
+        rb_raise(rb_eRuntimeError, "%s", e.what());
+        return Qnil;
+      }
 
       return Qnil;
     };
@@ -334,8 +339,14 @@ class RbHnswlibHierarchicalNSW {
         vec[i] = (float)NUM2DBL(rb_ary_entry(arr, i));
       }
 
-      std::priority_queue<std::pair<float, size_t>> result =
-        get_hnsw_hierarchicalnsw(self)->searchKnn((void *)vec, (size_t)NUM2INT(k));
+      std::priority_queue<std::pair<float, size_t>> result;
+      try {
+        result = get_hnsw_hierarchicalnsw(self)->searchKnn((void *)vec, (size_t)NUM2INT(k));
+      } catch(const std::runtime_error& e) {
+        ruby_xfree(vec);
+        rb_raise(rb_eRuntimeError, "%s", e.what());
+        return Qnil;
+      }
 
       ruby_xfree(vec);
 
@@ -376,7 +387,21 @@ class RbHnswlibHierarchicalNSW {
       } else {
         space = RbHnswlibInnerProductSpace::get_hnsw_ipspace(ivspace);
       }
-      get_hnsw_hierarchicalnsw(self)->loadIndex(filename, space);
+      hnswlib::HierarchicalNSW<float>* index = get_hnsw_hierarchicalnsw(self);
+      if (index->data_level0_memory_) free(index->data_level0_memory_);
+      if (index->linkLists_) {
+        for (hnswlib::tableint i = 0; i < index->cur_element_count; i++) {
+          if (index->element_levels_[i] > 0 && index->linkLists_[i]) free(index->linkLists_[i]);
+        }
+        free(index->linkLists_);
+      }
+      if (index->visited_list_pool_) delete index->visited_list_pool_;
+      try {
+        index->loadIndex(filename, space);
+      } catch(const std::runtime_error& e) {
+        rb_raise(rb_eRuntimeError, "%s", e.what());
+        return Qnil;
+      }
       RB_GC_GUARD(_filename);
       return Qnil;
     };
@@ -389,8 +414,9 @@ class RbHnswlibHierarchicalNSW {
         for (size_t i = 0; i < vec.size(); i++) {
           rb_ary_store(ret, i, DBL2NUM((double)vec[i]));
         }
-      } catch(std::runtime_error const& e) {
+      } catch(const std::runtime_error& e) {
         rb_raise(rb_eRuntimeError, "%s", e.what());
+        return Qnil;
       }
       return ret;
     };
@@ -404,7 +430,12 @@ class RbHnswlibHierarchicalNSW {
     };
 
     static VALUE _hnsw_hierarchicalnsw_mark_deleted(VALUE self, VALUE idx) {
-      get_hnsw_hierarchicalnsw(self)->markDelete((size_t)NUM2INT(idx));
+      try {
+        get_hnsw_hierarchicalnsw(self)->markDelete((size_t)NUM2INT(idx));
+      } catch(const std::runtime_error& e) {
+        rb_raise(rb_eRuntimeError, "%s", e.what());
+        return Qnil;
+      }
       return Qnil;
     };
 
@@ -413,7 +444,12 @@ class RbHnswlibHierarchicalNSW {
         rb_raise(rb_eArgError, "Cannot resize, max element is less than the current number of elements.");
         return Qnil;
       }
-      get_hnsw_hierarchicalnsw(self)->resizeIndex((size_t)NUM2INT(new_max_elements));
+      try {
+        get_hnsw_hierarchicalnsw(self)->resizeIndex((size_t)NUM2INT(new_max_elements));
+      } catch(const std::runtime_error& e) {
+        rb_raise(rb_eRuntimeError, "%s", e.what());
+        return Qnil;
+      }
       return Qnil;
     };
 
@@ -510,7 +546,12 @@ class RbHnswlibBruteforceSearch {
       const size_t max_elements = (size_t)NUM2INT(kw_values[1]);
 
       hnswlib::BruteforceSearch<float>* ptr = get_hnsw_bruteforcesearch(self);
-      new (ptr) hnswlib::BruteforceSearch<float>(space, max_elements);
+      try {
+        new (ptr) hnswlib::BruteforceSearch<float>(space, max_elements);
+      } catch(const std::runtime_error& e) {
+        rb_raise(rb_eRuntimeError, "%s", e.what());
+        return Qnil;
+      }
 
       return Qnil;
     };
@@ -538,7 +579,13 @@ class RbHnswlibBruteforceSearch {
         vec[i] = (float)NUM2DBL(rb_ary_entry(arr, i));
       }
 
-      get_hnsw_bruteforcesearch(self)->addPoint((void *)vec, (size_t)NUM2INT(idx));
+      try {
+        get_hnsw_bruteforcesearch(self)->addPoint((void *)vec, (size_t)NUM2INT(idx));
+      } catch(const std::runtime_error& e) {
+        ruby_xfree(vec);
+        rb_raise(rb_eRuntimeError, "%s", e.what());
+        return Qfalse;
+      }
 
       ruby_xfree(vec);
       return Qtrue;
@@ -609,7 +656,14 @@ class RbHnswlibBruteforceSearch {
       } else {
         space = RbHnswlibInnerProductSpace::get_hnsw_ipspace(ivspace);
       }
-      get_hnsw_bruteforcesearch(self)->loadIndex(filename, space);
+      hnswlib::BruteforceSearch<float>* index = get_hnsw_bruteforcesearch(self);
+      if (index->data_) free(index->data_);
+      try {
+        index->loadIndex(filename, space);
+      } catch(const std::runtime_error& e) {
+        rb_raise(rb_eRuntimeError, "%s", e.what());
+        return Qnil;
+      }
       RB_GC_GUARD(_filename);
       return Qnil;
     };

data/lib/hnswlib/version.rb

@@ -3,7 +3,7 @@
 # Hnswlib.rb provides Ruby bindings for the Hnswlib.
 module Hnswlib
   # The version of Hnswlib.rb you install.
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 
   # The version of Hnswlib included with gem.
   HSWLIB_VERSION = '0.6.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hnswlib
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - yoshoku
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-19 00:00:00.000000000 Z
+date: 2022-03-05 00:00:00.000000000 Z
 dependencies: []
 description: Hnswlib.rb provides Ruby bindings for the Hnswlib.
 email: