triez 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88f05351da6b711cefe44c0e5060f5c04380e5b6
-  data.tar.gz: 41ff89af13fd30d8def221fa396d1097816f39c1
+  metadata.gz: 331dc65dd70b83b8986fe4d07b5242e1cd8264d4
+  data.tar.gz: 8fb8aabd4adabb3388723640b1382bd6f6accae1
 SHA512:
-  metadata.gz: b8047e6c017a559b9916dfcdf235f39b560e486d190a14963a32c2cf565725f128e26c2b3f07d83273fe79ab566349220cc048a1eec347f35aa6308832887124
-  data.tar.gz: 8f64787cd1db06201d18e5ddc235d960a5ab6d08a63c212e13619094c47bc688feb59ababc950ec4e70bc8382ff89a255154a03913eb16ac784690aeb2d6f787
+  metadata.gz: 5bcae2775f541197179171682c27e19e59cdedf92d46da2293b25c2150fdce768a49976479fd400cc318075630e4a191ada4a7041380c2676d6cf0a3d4d98a33
+  data.tar.gz: 9e80343627118747019fe21c5087c979bd33149bdfbad0a056cc291a5cb63f4b3893fa915edc85574c4cfe95aefa82789d7867106208f9fa534cbe6eea7c911f

data/changes

@@ -1,3 +1,8 @@
+1.0.3
+
+2014-09-14
+  fix a segfault. see https://github.com/luikore/triez/issues/3. thanks @canadaduane for reporting this.
+
 1.0.2
 
 2013-06-01

data/ext/hat-trie/ahtable.c

@@ -15,7 +15,6 @@
 
 const double ahtable_max_load_factor = 100000.0; /* arbitrary large number => don't resize */
 const size_t ahtable_initial_size = 4096;
-static const uint16_t LONG_KEYLEN_MASK = 0x7fff;
 
 static size_t keylen(slot_t s) {
     if (0x1 & *s) {

data/ext/hat-trie/hat-trie.c

@@ -112,8 +112,9 @@ static inline int hattrie_clrval(hattrie_t *T, node_ptr n)
 }
 
 /* find node in trie */
-static node_ptr hattrie_find(hattrie_t* T, const char **key, size_t *len)
+static node_ptr hattrie_find(hattrie_t* T, const char **key, size_t *len, int* found)
 {
+    *found = 1;
     node_ptr parent = T->root;
     assert(*parent.flag & NODE_TYPE_TRIE);
 
@@ -124,7 +125,7 @@ static node_ptr hattrie_find(hattrie_t* T, const char **key, size_t *len)
     /* if the trie node consumes value, use it */
     if (*node.flag & NODE_TYPE_TRIE) {
         if (!(node.t->flag & NODE_HAS_VAL)) {
-            node.flag = NULL;
+            *found = 0;
         }
         return node;
     }
@@ -394,8 +395,9 @@ value_t* hattrie_get(hattrie_t* T, const char* key, size_t len)
 value_t* hattrie_tryget(hattrie_t* T, const char* key, size_t len)
 {
     /* find node for given key */
-    node_ptr node = hattrie_find(T, &key, &len);
-    if (node.flag == NULL) {
+    int found;
+    node_ptr node = hattrie_find(T, &key, &len, &found);
+    if (!found) {
         return NULL;
     }
 
@@ -468,8 +470,9 @@ int hattrie_del(hattrie_t* T, const char* key, size_t len)
     assert(*parent.flag & NODE_TYPE_TRIE);
 
     /* find node for deletion */
-    node_ptr node = hattrie_find(T, &key, &len);
-    if (node.flag == NULL) {
+    int found;
+    node_ptr node = hattrie_find(T, &key, &len, &found);
+    if (!found) {
         return -1;
     }
 
@@ -648,7 +651,8 @@ hattrie_iter_t* hattrie_iter_begin(const hattrie_t* T, bool sorted)
 
 hattrie_iter_t* hattrie_iter_with_prefix(const hattrie_t* T, bool sorted, const char* prefix, size_t prefix_len)
 {
-    node_ptr node = hattrie_find((hattrie_t*)T, &prefix, &prefix_len);
+    int found;
+    node_ptr node = hattrie_find((hattrie_t*)T, &prefix, &prefix_len, &found);
 
     hattrie_iter_t* i = malloc_or_die(sizeof(hattrie_iter_t));
     i->T = T;

data/lib/triez.rb

@@ -1,7 +1,7 @@
 require_relative "../ext/triez"
 
 class Triez
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 
   private :_internal_set_type
   private :_internal_search

data/test/triez_test.rb

@@ -213,4 +213,11 @@ class TriezTest < Test::Unit::TestCase
     end
     assert_equal '一锅鸡', lcs
   end
+
+  def test_should_not_segfault_when_search_with_prefix
+    t = Triez.new
+    # bursts when 16384
+    16_385.times{ |i| t["a#{i}"] = rand(10)+1 }
+    t.search_with_prefix("a")
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: triez
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Zete Lui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies: []
 description: fast, efficient, unicode aware HAT trie with prefix / suffix support.
 email: 
@@ -17,17 +17,13 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- copying
 - changes
-- readme.md
-- lib/triez.rb
-- test/triez_test.rb
-- ext/triez.cc
+- copying
 - ext/common.h
 - ext/extconf.rb
+- ext/hat-trie/COPYING
 - ext/hat-trie/ahtable.c
 - ext/hat-trie/ahtable.h
-- ext/hat-trie/COPYING
 - ext/hat-trie/hat-trie.c
 - ext/hat-trie/hat-trie.h
 - ext/hat-trie/misc.c
@@ -35,6 +31,10 @@ files:
 - ext/hat-trie/murmurhash3.c
 - ext/hat-trie/murmurhash3.h
 - ext/hat-trie/pstdint.h
+- ext/triez.cc
+- lib/triez.rb
+- readme.md
+- test/triez_test.rb
 homepage: https://github.com/luikore/triez
 licenses: []
 metadata: {}
@@ -54,9 +54,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: fast, efficient, unicode aware HAT trie with prefix / suffix support
 test_files: []
-has_rdoc: false