isomorfeus-ferret 0.13.11 → 0.14.1

data/ext/isomorfeus_ferret_ext/frb_search.c

@@ -3789,10 +3789,6 @@ VALUE frb_get_q(FrtQuery *q) {
  *
  ****************************************************************************/
 
-/* rdochack
-cTopDocs = rb_define_class_under(mSearch, "TopDocs", rb_cObject);
-*/
-
 /*
  *  Document-class: Ferret::Search::Hit
  *
@@ -3806,9 +3802,6 @@ cTopDocs = rb_define_class_under(mSearch, "TopDocs", rb_cObject);
  */
 static void Init_Hit(void) {
     const char *hit_class = "Hit";
-    /* rdochack
-    cHit = rb_define_class_under(mSearch, "Hit", rb_cObject);
-    */
     cHit = rb_struct_define(hit_class, "doc", "score", NULL);
     rb_set_class_path(cHit, mSearch, hit_class);
     rb_const_set(mSearch, rb_intern(hit_class), cHit);
@@ -3836,9 +3829,6 @@ static void Init_Hit(void) {
  */
 static void Init_TopDocs(void) {
     const char *td_class = "TopDocs";
-    /* rdochack
-    cTopDocs = rb_define_class_under(mSearch, "TopDocs", rb_cObject);
-    */
     cTopDocs = rb_struct_define(td_class,
                                 "total_hits",
                                 "hits",

data/ext/isomorfeus_ferret_ext/frb_store.c

@@ -402,7 +402,7 @@ static VALUE frb_fsdir_new(int argc, VALUE *argv, VALUE klass) {
         frb_create_dir(rpath);
     }
     if (!rb_funcall(rb_cFile, id_is_directory, 1, rpath)) {
-        rb_raise(rb_eIOError, "No directory <%s> found. Use :create => true to create one.", rs2s(rpath));
+        rb_raise(cFileNotFoundError, "No directory <%s> found. Use :create => true to create one.", rs2s(rpath));
     }
     store = frt_open_fs_store(rs2s(rpath));
     if (create) store->clear_all(store);

data/ext/isomorfeus_ferret_ext/frt_hash.h

@@ -58,10 +58,10 @@ typedef struct FrtHash {
      * used outside of the Hash methods */
     FrtHashEntry *(*lookup_i)(struct FrtHash *self,
                               register const void *key);
-    unsigned long  (*hash_i)(const void *key);
-    int                 (*eq_i)(const void *key1, const void *key2);
-    void                (*free_key_i)(void *p);
-    void                (*free_value_i)(void *p);
+    unsigned long (*hash_i)(const void *key);
+    int           (*eq_i)(const void *key1, const void *key2);
+    void          (*free_key_i)(void *p);
+    void          (*free_value_i)(void *p);
 } FrtHash;
 
 /**
@@ -140,8 +140,7 @@ extern FrtHash *frt_h_new(frt_hash_ft hash,
  *    pass NULL in place of this parameter the value will not be destroyed.
  * @return A newly allocated Hash
  */
-extern FrtHash *frt_h_new_str(frt_free_ft free_key,
-                              frt_free_ft free_value);
+extern FrtHash *frt_h_new_str(frt_free_ft free_key, frt_free_ft free_value);
 
 /**
  * Create a new Hash that uses integers as its keys. The Hash will store all
@@ -258,8 +257,7 @@ extern void *frt_h_rem(FrtHash *self, const void *key, bool del_key);
  *                                  the existing key so no key was freed
  *   </pre>
  */
-extern FrtHashKeyStatus frt_h_set(FrtHash *self,
-                                     const void *key, void *value);
+extern FrtHashKeyStatus frt_h_set(FrtHash *self, const void *key, void *value);
 
 /**
  * Add the value +value+ to the Hash referencing it with key +key+. If

data/ext/isomorfeus_ferret_ext/frt_index.c

@@ -170,9 +170,9 @@ static char *fn_for_gen_field(char *buf,
  *
  ***************************************************************************/
 
-static unsigned long long co_hash(const void *key)
+static unsigned long co_hash(const void *key)
 {
-    return (unsigned long long)key;
+    return (unsigned long)key;
 }
 
 static int co_eq(const void *key1, const void *key2)
@@ -1163,6 +1163,7 @@ static FrtLazyDocField *lazy_df_new(ID name, const int size, FrtCompressionType
     self->data = FRT_ALLOC_AND_ZERO_N(FrtLazyDocFieldData, size);
     self->compression = compression;
     self->decompressed = false;
+    self->loaded = false;
     return self;
 }
 
@@ -1400,6 +1401,7 @@ char *frt_lazy_df_get_data(FrtLazyDocField *self, int i) {
                 frt_is_read_bytes(self->doc->fields_in, (frt_uchar *)text, read_len);
                 text[read_len - 1] = '\0';
             }
+            self->loaded = true;
         }
     }
 
@@ -1473,6 +1475,7 @@ static FrtLazyDoc *lazy_doc_new(int size, FrtInStream *fdt_in)
     self->size = size;
     self->fields = FRT_ALLOC_AND_ZERO_N(FrtLazyDocField *, size);
     self->fields_in = frt_is_clone(fdt_in);
+    self->loaded = false;
     return self;
 }
 

data/ext/isomorfeus_ferret_ext/frt_index.h

@@ -529,7 +529,7 @@ extern FrtTVTerm *frt_tv_get_tv_term(FrtTermVector *tv, const char *term);
 
 /* * * FrtLazyDocField * * */
 typedef struct FrtLazyDocFieldData {
-    frt_off_t              start;
+    frt_off_t          start;
     int                length;
     rb_encoding        *encoding;
     FrtCompressionType compression; /* as stored */
@@ -545,6 +545,7 @@ typedef struct FrtLazyDocField {
     int                 len;  /* length of data elements concatenated */
     FrtCompressionType  compression; /* as configured */
     bool                decompressed;
+    bool                loaded;
 } FrtLazyDocField;
 
 extern char *frt_lazy_df_get_data(FrtLazyDocField *self, int i);
@@ -556,6 +557,7 @@ struct FrtLazyDoc {
     int             size;
     FrtLazyDocField **fields;
     FrtInStream     *fields_in;
+    bool            loaded;
 };
 
 extern void frt_lazy_doc_close(FrtLazyDoc *self);

data/ext/isomorfeus_ferret_ext/isomorfeus_ferret.c

@@ -29,6 +29,7 @@ VALUE sym_true;
 VALUE sym_false;
 VALUE sym_path;
 VALUE sym_dir;
+VALUE sym_each;
 
 /* Modules */
 VALUE mIsomorfeus;
@@ -272,12 +273,13 @@ void Init_isomorfeus_ferret_ext(void) {
     id_data = rb_intern("@data");
 
     /* Symbols */
-    sym_yes = ID2SYM(rb_intern("yes"));;
-    sym_no = ID2SYM(rb_intern("no"));;
-    sym_true = ID2SYM(rb_intern("true"));;
-    sym_false = ID2SYM(rb_intern("false"));;
-    sym_path = ID2SYM(rb_intern("path"));;
-    sym_dir = ID2SYM(rb_intern("dir"));;
+    sym_yes = ID2SYM(rb_intern("yes"));
+    sym_no = ID2SYM(rb_intern("no"));
+    sym_true = ID2SYM(rb_intern("true"));
+    sym_false = ID2SYM(rb_intern("false"));
+    sym_path = ID2SYM(rb_intern("path"));
+    sym_dir = ID2SYM(rb_intern("dir"));
+    sym_each = ID2SYM(rb_intern("each"));
 
     mIsomorfeus = rb_define_module("Isomorfeus");
     mFerret = rb_define_module_under(mIsomorfeus, "Ferret");

data/ext/isomorfeus_ferret_ext/isomorfeus_ferret.h

@@ -41,12 +41,12 @@ extern VALUE cLockError;
 extern VALUE cTerm;
 
 /* Ferret Inits */
-extern void Init_Utils();
-extern void Init_Analysis();
-extern void Init_Store();
-extern void Init_Index();
-extern void Init_Search();
-extern void Init_QueryParser();
+extern void Init_Utils(void);
+extern void Init_Analysis(void);
+extern void Init_Store(void);
+extern void Init_Index(void);
+extern void Init_Search(void);
+extern void Init_QueryParser(void);
 
 extern void frb_raise(int excode, const char *msg);
 extern void frb_create_dir(VALUE rpath);

data/lib/isomorfeus/ferret/index/index.rb

@@ -5,6 +5,7 @@ module Isomorfeus
       # information on how to use this class.
       class Index
         include MonitorMixin
+        include Enumerable
         include Isomorfeus::Ferret::Store
         include Isomorfeus::Ferret::Search
 
@@ -383,14 +384,11 @@ module Isomorfeus
         #     puts "hit document number #{doc} with a score of #{score}"
         #   end
         #
-        def search_each(query, options = {}) # :yield: doc, score
+        def search_each(query, options = {}, &block) # :yield: doc, score
           @dir.synchronize do
             ensure_searcher_open()
             query = do_process_query(query)
-
-            @searcher.search_each(query, options) do |doc, score|
-              yield doc, score
-            end
+            @searcher.search_each(query, options, &block)
           end
         end
 
@@ -485,15 +483,11 @@ module Isomorfeus
           end
         end
 
-        # iterate through all documents in the index. This method preloads the
-        # documents so you don't need to call #load on the document to load all the
-        # fields.
-        def each
+        # iterate through all documents in the index.
+        def each(&block)
           @dir.synchronize do
             ensure_reader_open
-            (0...@reader.max_doc).each do |i|
-              yield @reader[i].load unless @reader.deleted?(i)
-            end
+            @reader.each(&block)
           end
         end
 
@@ -679,7 +673,7 @@ module Isomorfeus
             docs_to_add = []
             query = do_process_query(query)
             @searcher.search_each(query, :limit => :all) do |id, score|
-              document = @searcher[id].load
+              document = @searcher[id].to_h
               if new_val.is_a?(Hash)
                 document.merge!(new_val)
               else new_val.is_a?(String) or new_val.is_a?(Symbol)
@@ -850,6 +844,12 @@ module Isomorfeus
           end
         end
 
+        def to_enum
+          @dir.synchronize do
+            ensure_reader_open
+            @reader.to_enum
+          end
+        end
 
         protected
           def ensure_writer_open()

data/lib/isomorfeus/ferret/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Ferret
-    VERSION = '0.13.11'
+    VERSION = '0.14.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-ferret
 version: !ruby/object:Gem::Version
-  version: 0.13.11
+  version: 0.14.1
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2022-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -180,7 +180,9 @@ files:
 - ext/isomorfeus_ferret_ext/extconf.rb
 - ext/isomorfeus_ferret_ext/fio_tmpfile.h
 - ext/isomorfeus_ferret_ext/frb_analysis.c
+- ext/isomorfeus_ferret_ext/frb_field_info.c
 - ext/isomorfeus_ferret_ext/frb_index.c
+- ext/isomorfeus_ferret_ext/frb_lazy_doc.c
 - ext/isomorfeus_ferret_ext/frb_qparser.c
 - ext/isomorfeus_ferret_ext/frb_search.c
 - ext/isomorfeus_ferret_ext/frb_store.c