ffi-radix_tree 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 273613cad863a6795457a41a30cac700b0f1a1a0be3e53359ab6dff4c405cc00
-  data.tar.gz: 3533ae343c7fbf6d4a5cee15ad33f69bd7c63f0df3a1e239d684a9605215268d
+  metadata.gz: 63946ad680524b97f53dd06a3bb4514ce3ab4b12a2f2d5a23fef32e36941bfba
+  data.tar.gz: 4235440c2f4f348c3d9f9e496ba5dbf1b0c5c4645b674cd04086ce60f57da650
 SHA512:
-  metadata.gz: 3b1cfcf6c1121b84d4b0f51f76dff086e76e854ca2de8eb9d4c3d70446566c4524572194f5490d7c8625e60e61701ce02383d168d47462732f4aee423685789d
-  data.tar.gz: f1c75e06b8af34d66d463c3b2702854ce711a08ae33eb4e6d69d58d72954e01d2e7777b80bcdd1f95d6bdf40fedafb4f11f7fbea1d39df1af0ee25354f7fc2a2
+  metadata.gz: 7ac02fdf65f154c8c3746a565b2b6d3afe738643b9227f82313ddc7bc12cfce6f2f617ac535a876fa2b6da60588fe8564b9d24d86212f71f568fcf2d08ce9ff3
+  data.tar.gz: ee16b0514b5a1efef08d3a95c7646e78e9ab44d2f110a3b928aa5335964f63a86b1fb064847c9ba9ac417c4c951bc72259e8039a07556b8c0739806affe9bd37

data/lib/ffi/radix_tree/version.rb

@@ -1,5 +1,5 @@
 module FFI
   module RadixTree
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/lib/ffi/radix_tree.rb

@@ -84,6 +84,7 @@ module FFI
     attach_function :greedy_match, [:pointer, :string, :pointer, :pointer], :int
     attach_function :greedy_substring_match, [:pointer, :string, :pointer, :pointer], :int
     attach_function :match_free, [:pointer], :void
+    attach_function :match_sizes_free, [:pointer], :void
     attach_function :multi_match_free, [:pointer, :int], :void
     attach_function :has_key, [:pointer, :string], :bool
 
@@ -97,6 +98,8 @@ module FFI
         ::FFI::RadixTree.has_key(@ptr, key)
       end
 
+      alias_method :key?, :has_key?
+
       def push(key, value)
         push_response = nil
         @first_character_present[key[0]] = true
@@ -207,8 +210,8 @@ module FFI
           ::FFI::MemoryPointer.new(:pointer) do |match_sizes_array|
             array_size = ::FFI::RadixTree.greedy_match(@ptr, string, match_array, match_sizes_array)
             if array_size > 0
-              array_sizes_pointer = match_sizes_array.read_pointer
-              match_sizes = array_sizes_pointer.get_array_of_int(0, array_size)
+              match_sizes_pointer = match_sizes_array.read_pointer
+              match_sizes = match_sizes_pointer.get_array_of_int(0, array_size)
               array_pointer = match_array.read_pointer
               char_arrays = array_pointer.get_array_of_pointer(0, array_size)
               char_arrays.each_with_index do |ptr, index|
@@ -221,7 +224,7 @@ module FFI
         get_response
       ensure
         ::FFI::RadixTree.multi_match_free(array_pointer, array_size) if array_pointer
-        ::FFI::RadixTree.match_free(match_sizes_pointer) if match_sizes_pointer
+        ::FFI::RadixTree.match_sizes_free(match_sizes_pointer) if match_sizes_pointer
       end
 
       def greedy_substring_match(string)
@@ -234,8 +237,8 @@ module FFI
           ::FFI::MemoryPointer.new(:pointer) do |match_sizes_array|
             array_size = ::FFI::RadixTree.greedy_substring_match(@ptr, string, match_array, match_sizes_array)
             if array_size > 0
-              array_sizes_pointer = match_sizes_array.read_pointer
-              match_sizes = array_sizes_pointer.get_array_of_int(0, array_size)
+              match_sizes_pointer = match_sizes_array.read_pointer
+              match_sizes = match_sizes_pointer.get_array_of_int(0, array_size)
               array_pointer = match_array.read_pointer
               char_arrays = array_pointer.get_array_of_pointer(0, array_size)
               char_arrays.each_with_index do |ptr, index|
@@ -248,7 +251,7 @@ module FFI
         get_response
       ensure
         ::FFI::RadixTree.multi_match_free(array_pointer, array_size) if array_pointer
-        ::FFI::RadixTree.match_free(match_sizes_pointer) if match_sizes_pointer
+        ::FFI::RadixTree.match_sizes_free(match_sizes_pointer) if match_sizes_pointer
       end
     end
   end

data/vendor/radixtree/ffi_radix_tree.cpp

@@ -32,20 +32,19 @@ bool has_key(radix_tree<std::string, std::vector<char>>* map_pointer, const char
 }
 
 void match_free(const char* match) {
-  if (match != NULL) {
-    delete[] match;
-    match = NULL;
-  }
+  delete[] match;
+}
+
+void match_sizes_free(const int* match_sizes) {
+  delete[] match_sizes;
 }
 
 void multi_match_free(const char** match, int length) {
   if (match != NULL) {
     for (int i=0; i<length; ++i) {
       delete[] match[i];
-      match[i] = NULL;
     }
     delete[] match;
-    match = NULL;
   }
 }
 
@@ -110,12 +109,12 @@ const char* longest_prefix_value(radix_tree<std::string, std::vector<char>>* map
   return NULL;
 }
 
-unsigned char* fetch(radix_tree<std::string, std::vector<char>>* map_pointer, const char* key, int* read_size) {
+char* fetch(radix_tree<std::string, std::vector<char>>* map_pointer, const char* key, int* read_size) {
   auto iter = map_pointer->find(std::string(key));
   long counter = 0;
 
   if (iter != map_pointer->end()) {
-    unsigned char *return_val  = new unsigned char[iter->second.size()]{0};
+    char *return_val  = new char[iter->second.size()]{0};
     for( auto& val : iter->second ) {
       return_val[counter] = val;
       counter++;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-radix_tree
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Brandon Dewitt
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-03 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -152,7 +152,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: radix tree implementation in c++ with FFI bindings
 test_files: []