wordtriez 0.0.2 → 0.0.3

data/ext/hat-trie/text.c

@@ -107,11 +107,11 @@ void add_ngrams(hattrie_t* trie, int upto_n, char* text, uint8_t incr_existing_k
   add_ngrams_with_suffix(trie, upto_n, text, blank_suffix, incr_existing_keys_only);
 }
 
-inline void incr_value(
+static inline void incr_value(
   hattrie_t* trie,
   char* buffer,
   char* buffer_pre,
-  char* head,
+  char* key,
   size_t len,
   size_t suffix_len,
   uint8_t incr_existing_keys_only)
@@ -119,13 +119,16 @@ inline void incr_value(
   value_t* value = NULL;
 
   assert(buffer_pre - len >= buffer);
-  memcpy(buffer_pre - len, head, len);
+  
   if (incr_existing_keys_only) {
-    value = hattrie_tryget(trie, buffer_pre - len, len + suffix_len);
+    value = hattrie_tryget(trie, key, len);
     if (value) {
+      memcpy(buffer_pre - len, key, len);
+      value = hattrie_get(trie, buffer_pre - len, len + suffix_len);
       (*value)++;
     }
   } else {
+    memcpy(buffer_pre - len, key, len);
     value = hattrie_get(trie, buffer_pre - len, len + suffix_len);
     (*value)++;
   }

data/lib/wordtriez.rb

@@ -41,7 +41,7 @@ class Wordtriez
     _internal_walk(s).each &p
   end
 
-  def search_with_prefix prefix, opts={}, &p
+  def search prefix, opts={}, &p
     opts  = opts.dup
 
     limit = opts.delete :limit

data/test/wordtriez_test.rb

@@ -38,11 +38,11 @@ class WordtriezTest < Test::Unit::TestCase
     assert_equal nil, t['万塘路一锅鸡']
     assert_equal v2, t['万塘路']
 
-    a = t.search_with_prefix ''
+    a = t.search ''
     assert_equal [['万塘路', v2]], a
 
     t['马当路'] = 3
-    a = t.search_with_prefix '万塘'
+    a = t.search '万塘'
     assert_equal [['路', v2]], a
   end
 
@@ -58,11 +58,11 @@ class WordtriezTest < Test::Unit::TestCase
     end
     assert_equal as.size * bs.size, t.size
 
-    a = t.search_with_prefix 'a'
+    a = t.search 'a'
     assert_equal bs.to_a, a.map(&:first).sort
 
     a = []
-    t.search_with_prefix 'b', sort: true, limit: 3 do |k, v|
+    t.search 'b', sort: true, limit: 3 do |k, v|
       a << k
     end
     assert_equal 3, a.size
@@ -105,7 +105,7 @@ class WordtriezTest < Test::Unit::TestCase
     sequences.each do |seq, id|
       t.change_all(:suffix, seq){ id }
     end
-    assert_equal 2, t.search_with_prefix('CGGT').map(&:last).flatten.first
+    assert_equal 2, t.search('CGGT').map(&:last).flatten.first
   end
 
   def test_nul_char_in_keys
@@ -214,12 +214,12 @@ class WordtriezTest < Test::Unit::TestCase
     assert_equal '一锅鸡', lcs
   end
 
-  def test_should_not_segfault_when_search_with_prefix
+  def test_should_not_segfault_when_search
     t = Wordtriez.new
     # bursts when 16384
     16_385.times{ |i| t["a#{i}"] = i }
     expected_postfices = 16_385.times.map &:to_s
-    actual_postfices = t.search_with_prefix("a").map(&:first)
+    actual_postfices = t.search("a").map(&:first)
     assert_equal expected_postfices.sort, actual_postfices.sort
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordtriez
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: