rroonga 12.0.8 → 12.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 908cb7325ae81681705d729d998fc1a8340110f4917c2cbe3f909e89e49b022e
-  data.tar.gz: d3dd3039d9dfc63b4d13aaa9bbd7db3db7f9024ca5894755b1aeb0e7f1217571
+  metadata.gz: a85769bf192cecc677daaaddb349b4728bdeb7d240d1ecb4fc9660495c5fa2de
+  data.tar.gz: 05375332c1e8f93a9e1fb1b584a9e92d8923af6848ffdef223702a17d32852a8
 SHA512:
-  metadata.gz: 8ab6d48f53a1f0672f814c423b40df8fe4d5963eee26345bcd308440fe4456ea65b9af4d7ca0614771194931a18388a3a2f6fef0ccafb846759fbc750dfd3f6e
-  data.tar.gz: ba3747fa4338baf72277de7acaf5a35354bb032224d992af00c3c7e6ce0e58c3aeed355cb3d4e811335a3f99d8cbadc114c629f1915e7397fdd638e86e39176b
+  metadata.gz: 3ec5e421bb75cdf1c944fcf36f70778f59113da9a8c4c20df7318fd56e21a1f00856fe9a9f308cab584183c32cbf055758b3e6bd52d415771c3f0c28080588bf
+  data.tar.gz: d7d630a97a5831323c70ececc208016d4a5a02b4ddd476e043038eca71e8b6d37410d01c7eac8d5eb71b0788d7fbcc915d76737dfa38c0f3db02f1cc92b9884f

data/doc/text/news.md

@@ -1,5 +1,15 @@
 # NEWS
 
+## 12.1.0: 2022-12-05 {#version-12-1-0}
+
+### Fixes
+
+  * [{Groonga::PatriciaTrie}] Fixed a bug that `Groonga::PatriciaTrie#scan` returned wrong offsets if there are many hit words. [GitHub#207][Patch by Naoya Murakami]
+
+### Thanks
+
+  * Naoya Murakami
+
 ## 12.0.8: 2022-09-28 {#version-12-0-8}
 
 ### Improvements

data/ext/groonga/rb-grn-patricia-trie.c

@@ -445,10 +445,14 @@ rb_grn_patricia_trie_scan (VALUE self, VALUE rb_string)
     grn_pat_scan_hit hits[1024];
     const char *string;
     long string_length;
+    const char *original_string;
+    long rest_offset;
     grn_bool block_given;
 
     string = StringValuePtr(rb_string);
     string_length = RSTRING_LEN(rb_string);
+    original_string = string;
+    rest_offset = 0;
 
     rb_grn_table_key_support_deconstruct(SELF(self), &table, &context,
                                          NULL, NULL, NULL,
@@ -481,7 +485,7 @@ rb_grn_patricia_trie_scan (VALUE self, VALUE rb_string)
             matched_info = rb_ary_new_from_args(4,
                                                 record,
                                                 term,
-                                                UINT2NUM(hits[i].offset),
+                                                UINT2NUM(hits[i].offset + rest_offset),
                                                 UINT2NUM(hits[i].length));
             if (block_given) {
                 rb_yield(matched_info);
@@ -490,6 +494,7 @@ rb_grn_patricia_trie_scan (VALUE self, VALUE rb_string)
             }
             previous_offset = hits[i].offset;
         }
+        rest_offset = rest - original_string;
         string_length -= rest - string;
         string = rest;
     }

data/ext/groonga/rb-grn.h

@@ -92,8 +92,8 @@ RB_GRN_BEGIN_DECLS
 #define RB_GRN_HAVE_FLOAT32 GRN_VERSION_OR_LATER(10, 0, 2)
 
 #define RB_GRN_MAJOR_VERSION 12
-#define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 8
+#define RB_GRN_MINOR_VERSION 1
+#define RB_GRN_MICRO_VERSION 0
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))

data/test/test-patricia-trie.rb

@@ -154,6 +154,23 @@ class PatriciaTrieTest < Test::Unit::TestCase
                  words.scan('muTEki リンクの冒険 ミリバール アルパカ ガッ'))
   end
 
+  def test_scan_for_many_words
+    Groonga::Context.default_options = {:encoding => "utf-8"}
+    words = Groonga::PatriciaTrie.create(:key_type => "ShortText",
+                                         :key_normalize => true)
+    words.add("x")
+    dot = words.add(".")
+    longtext = ""
+    scanned = []
+
+    1025.times.each do |i|
+      longtext += "."
+      scanned.push([dot, ".", i, 1])
+    end
+    assert_equal(scanned,
+                 words.scan(longtext))
+  end
+
   def test_scan_no_database
     Groonga::Context.open(encoding: "utf-8") do |context|
       Groonga::PatriciaTrie.create(context: context,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 12.0.8
+  version: 12.1.0
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2022-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-client
@@ -387,7 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
+rubygems_version: 3.3.24
 signing_key:
 specification_version: 4
 summary: Ruby bindings for Groonga that provide full text search and column store