annoy-rb 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f81b49dd55acb002949f5da8cd3e1dc39ab14b2020cf61e9046dfe71356d603f
-  data.tar.gz: 3cd782e87cc70d0517504bdfc233e720c5aeaa15d4f03c7887e0d859f84cc2cc
+  metadata.gz: 70396ca8391b29a97b873c9e19a604cbc7257ce4b78cdf8381be4e892c518b62
+  data.tar.gz: 56feaa427374443780b141a3edf3707cf350409a229367f052436f773b6d1c75
 SHA512:
-  metadata.gz: dda8c77484034cbaaf3f9b5a6ea6558040350ef3e75121b699aab5f011722a0d79039c037ee63641cd1da7588d5e7dedb56fae91a37489300e1780934eaec80d
-  data.tar.gz: 8ad8aef4eac7ec930f4f1ffea12db8d944a7ee36e2140c7533ab4054586024af42befc3a113312d6289e5587a45b4f500c109dccad17330f0a20b5e349018a9a
+  metadata.gz: a3c736168dcea72535931d759c849ffc006bfcfecf3cdca704fc0b1859712a810817bfc7581f87dc40754bedea07563dd5ad777ca54b028acc4d5c3dcf3f6671
+  data.tar.gz: 65ada80b03e1e1ffec4353f7db9c77c2aca8bc79523229b8b52865f38524a272bac10c650d0333b46fee2d13c8109a1fa61ee41d2eb022eaeefdee0509a3bf54

data/.github/workflows/build.yml

@@ -0,0 +1,21 @@
+name: build
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7' ]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set upt Ruby ${{ matrix.ruby }}
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Build and test with Rake
+        run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3
+          bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.1
+- Fix to free char array of error message before calling rb_raise.
+- Fix to use array allocated with ruby_xmalloc instead of vector class in C++.
+
 ## 0.2.0
 - Update bundled Annoy version to 1.17.0.
 - Support multithreaded index building.

data/README.md

@@ -1,6 +1,6 @@
 # Annoy.rb
 
-[![Build Status](https://travis-ci.org/yoshoku/annoy.rb.svg?branch=master)](https://travis-ci.org/yoshoku/annoy.rb)
+[![Build Status](https://github.com/yoshoku/annoy.rb/workflows/build/badge.svg)](https://github.com/yoshoku/annoy.rb/actions?query=workflow%3Abuild)
 [![Gem Version](https://badge.fury.io/rb/annoy-rb.svg)](https://badge.fury.io/rb/annoy-rb)
 [![License](https://img.shields.io/badge/License-Apache%202.0-yellowgreen.svg)](https://github.com/yoshoku/annoy.rb/blob/master/LICENSE.txt)
 [![Documentation](http://img.shields.io/badge/api-reference-blue.svg)](https://yoshoku.github.io/annoy.rb/doc/)
@@ -25,6 +25,10 @@ Or install it yourself as:
 
 Note: Annoy.rb does not require the installation of another external library.
 
+## Documentation
+
+* [Annoy.rb API Documentation](https://yoshoku.github.io/annoy.rb/doc/)
+
 ## Usage
 
 ```ruby

data/ext/annoy/annoy.hpp

@@ -101,18 +101,21 @@ template<class T, typename F> class RbAnnoyIndex
         return Qfalse;
       }
 
-      std::vector<F> vec(n_dims, 0);
+      F* vec = (F*)ruby_xmalloc(n_dims * sizeof(F));
       for (int i = 0; i < n_dims; i++) {
         vec[i] = typeid(F) == typeid(double) ? NUM2DBL(rb_ary_entry(arr, i)) : NUM2UINT(rb_ary_entry(arr, i));
       }
 
       char* error;
-      if (!get_annoy_index(self)->add_item(idx, &vec[0], &error)) {
-        rb_raise(rb_eRuntimeError, "%s", error);
+      if (!get_annoy_index(self)->add_item(idx, vec, &error)) {
+        VALUE error_str = rb_str_new_cstr(error);
         free(error);
+        ruby_xfree(vec);
+        rb_raise(rb_eRuntimeError, "%s", StringValuePtr(error_str));
         return Qfalse;
       }
 
+      ruby_xfree(vec);
       return Qtrue;
     };
 
@@ -120,13 +123,12 @@ template<class T, typename F> class RbAnnoyIndex
       const int n_trees = NUM2INT(_n_trees);
       const int n_jobs = NUM2INT(_n_jobs);
       char* error;
-
       if (!get_annoy_index(self)->build(n_trees, n_jobs, &error)) {
-        rb_raise(rb_eRuntimeError, "%s", error);
+        VALUE error_str = rb_str_new_cstr(error);
         free(error);
+        rb_raise(rb_eRuntimeError, "%s", StringValuePtr(error_str));
         return Qfalse;
       }
-
       return Qtrue;
     };
 
@@ -134,13 +136,12 @@ template<class T, typename F> class RbAnnoyIndex
       const char* filename = StringValuePtr(_filename);
       const bool prefault = _prefault == Qtrue ? true : false;
       char* error;
-
       if (!get_annoy_index(self)->save(filename, prefault, &error)) {
-        rb_raise(rb_eRuntimeError, "%s", error);
+        VALUE error_str = rb_str_new_cstr(error);
         free(error);
+        rb_raise(rb_eRuntimeError, "%s", StringValuePtr(error_str));
         return Qfalse;
       }
-
       return Qtrue;
     };
 
@@ -148,13 +149,12 @@ template<class T, typename F> class RbAnnoyIndex
       const char* filename = StringValuePtr(_filename);
       const bool prefault = _prefault == Qtrue ? true : false;
       char* error;
-
       if (!get_annoy_index(self)->load(filename, prefault, &error)) {
-        rb_raise(rb_eRuntimeError, "%s", error);
+        VALUE error_str = rb_str_new_cstr(error);
         free(error);
+        rb_raise(rb_eRuntimeError, "%s", StringValuePtr(error_str));
         return Qfalse;
       }
-
       return Qtrue;
     };
 
@@ -208,7 +208,7 @@ template<class T, typename F> class RbAnnoyIndex
         return Qfalse;
       }
 
-      std::vector<F> vec(n_dims, 0);
+      F* vec = (F*)ruby_xmalloc(n_dims * sizeof(F));
       for (int i = 0; i < n_dims; i++) {
         vec[i] = typeid(F) == typeid(double) ? NUM2DBL(rb_ary_entry(_vec, i)) : NUM2UINT(rb_ary_entry(_vec, i));
       }
@@ -219,7 +219,9 @@ template<class T, typename F> class RbAnnoyIndex
       std::vector<int> neighbors;
       std::vector<F> distances;
 
-      get_annoy_index(self)->get_nns_by_vector(&vec[0], n_neighbors, search_k, &neighbors, include_distances ? &distances : NULL);
+      get_annoy_index(self)->get_nns_by_vector(vec, n_neighbors, search_k, &neighbors, include_distances ? &distances : NULL);
+
+      ruby_xfree(vec);
 
       const int sz_neighbors = neighbors.size();
       VALUE neighbors_arr = rb_ary_new2(sz_neighbors);
@@ -246,15 +248,16 @@ template<class T, typename F> class RbAnnoyIndex
     static VALUE _annoy_index_get_item(VALUE self, VALUE _idx) {
       const int idx = NUM2INT(_idx);
       const int n_dims = get_annoy_index(self)->get_f();
-      std::vector<F> vec(n_dims, 0);
+      F* vec = (F*)ruby_xmalloc(n_dims * sizeof(F));
       VALUE arr = rb_ary_new2(n_dims);
 
-      get_annoy_index(self)->get_item(idx, &vec[0]);
+      get_annoy_index(self)->get_item(idx, vec);
 
       for (int i = 0; i < n_dims; i++) {
         rb_ary_store(arr, i, typeid(F) == typeid(double) ? DBL2NUM(vec[i]) : UINT2NUM(vec[i]));
       }
 
+      ruby_xfree(vec);
       return arr;
     };
 
@@ -279,8 +282,9 @@ template<class T, typename F> class RbAnnoyIndex
       const char* filename = StringValuePtr(_filename);
       char* error;
       if (!get_annoy_index(self)->on_disk_build(filename, &error)) {
-        rb_raise(rb_eRuntimeError, "%s", error);
+        VALUE error_str = rb_str_new_cstr(error);
         free(error);
+        rb_raise(rb_eRuntimeError, "%s", StringValuePtr(error_str));
         return Qfalse;
       }
       return Qtrue;

data/lib/annoy/version.rb

@@ -3,5 +3,5 @@
 # Annoy.rb is a Ruby wrapper for Annoy (Approximate Nearest Neighbors Oh Yeah).
 module Annoy
   # The version of Annoy.rb you are using.
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: annoy-rb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - yoshoku
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-19 00:00:00.000000000 Z
+date: 2020-10-24 00:00:00.000000000 Z
 dependencies: []
 description: Annoy.rb is a Ruby binding for the Annoy (Approximate Nearest Neighbors
   Oh Yeah).
@@ -19,9 +19,9 @@ extensions:
 - ext/annoy/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -45,7 +45,7 @@ metadata:
   source_code_uri: https://github.com/yoshoku/annoy.rb
   changelog_uri: https://github.com/yoshoku/annoy.rb/blob/master/CHANGELOG.md
   documentation_uri: https://yoshoku.github.io/annoy.rb/doc/
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -60,8 +60,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Ruby binding for the Annoy (Approximate Nearest Neighbors Oh Yeah).
 test_files: []

data/.travis.yml

@@ -1,12 +0,0 @@
----
-os: linux
-dist: xenial
-language: ruby
-cache: bundler
-rvm:
-  - '2.5'
-  - '2.6'
-  - '2.7'
-
-before_install:
-  - gem install bundler -v 2.1.2