isomorfeus-ferret 0.13.10 → 0.14.0

data/ext/isomorfeus_ferret_ext/frt_config.h

@@ -26,7 +26,7 @@ typedef posh_i32_t frt_i32;
 typedef posh_u64_t frt_u64;
 typedef posh_i64_t frt_i64;
 
-#if defined POSH_OS_WIN64
+#if (defined POSH_OS_WIN32 || defined POSH_OS_WIN64)
 typedef off64_t frt_off_t;
 #else
 typedef off_t frt_off_t;

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_hashset.c

@@ -3,7 +3,7 @@
 
 /*
  * The HashSet contains an array +elems+ of the elements that have been added.
- * It always has +size+ elements so +size+ ane +elems+ can be used to iterate
+ * It always has +size+ elements so +size+ and +elems+ can be used to iterate
  * over all alements in the HashSet. It also uses a Hash to keep track of
  * which elements have been added and their index in the +elems+ array.
  */
@@ -37,7 +37,7 @@ FrtHashSet *frt_hs_new_ptr(frt_free_ft free_func)
     return hs;
 }
 
-static void clear(FrtHashSet *hs, bool destroy)
+static void hs_clear(FrtHashSet *hs, bool destroy)
 {
     FrtHashSetEntry *curr, *next = hs->first;
     frt_free_ft do_free = destroy ? hs->free_elem_i : &frt_dummy_free;
@@ -52,20 +52,20 @@ static void clear(FrtHashSet *hs, bool destroy)
 
 void frt_hs_clear(FrtHashSet *hs)
 {
-    clear(hs, true);
+    hs_clear(hs, true);
     frt_h_clear(hs->ht);
 }
 
 void frt_hs_free(FrtHashSet *hs)
 {
-    clear(hs, false);
+    hs_clear(hs, false);
     frt_h_destroy(hs->ht);
     free(hs);
 }
 
 void frt_hs_destroy(FrtHashSet *hs)
 {
-    clear(hs, true);
+    hs_clear(hs, true);
     frt_h_destroy(hs->ht);
     free(hs);
 }

data/ext/isomorfeus_ferret_ext/frt_index.c

@@ -116,7 +116,7 @@ char *frt_fn_for_generation(char *buf, const char *base, const char *ext, frt_i6
     } else {
         char b[FRT_SEGMENT_NAME_MAX_LENGTH];
         char *u = u64_to_str36(b, FRT_SEGMENT_NAME_MAX_LENGTH, (frt_u64)gen);
-        if (ext == NULL) {
+        if (ext == NULL || (strcmp(ext, "") == 0)) {
             sprintf(buf, "%s_%s", base, u);
         } else {
             sprintf(buf, "%s_%s.%s", base, u, ext);
@@ -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)
@@ -303,6 +303,7 @@ FrtFieldInfo *frt_fi_init(FrtFieldInfo *fi, ID name, FrtStoreValue store, FrtCom
     fi_set_compression(fi, compression);
     fi_set_index(fi, index);
     fi_set_term_vector(fi, term_vector);
+    fi->number = 0;
     fi->ref_cnt = 1;
     fi->rfi = Qnil;
     return fi;
@@ -394,6 +395,7 @@ FrtFieldInfo *frt_fis_add_field(FrtFieldInfos *fis, FrtFieldInfo *fi) {
     if (!frt_h_set_safe(fis->field_dict, (void *)fi->name, fi)) {
         FRT_RAISE(FRT_ARG_ERROR, "Field :%s already exists", rb_id2name(fi->name));
     }
+    FRT_REF(fi);
     fi->number = fis->size;
     fis->fields[fis->size] = fi;
     fis->size++;
@@ -1161,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;
 }
 
@@ -1398,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;
         }
     }
 
@@ -1471,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/frt_q_parser.c

@@ -2801,6 +2801,7 @@ FrtQParser *frt_qp_init(FrtQParser *self, FrtAnalyzer *analyzer) {
     qp_push_fields(self, self->def_fields, false);
 
     self->analyzer = analyzer;
+    if (analyzer) FRT_REF(analyzer);
     self->ts_cache = frt_h_new_ptr((frt_free_ft)&frt_ts_deref);
     self->buf_index = 0;
     self->dynbuf = NULL;

data/ext/isomorfeus_ferret_ext/frt_store.h

@@ -44,7 +44,7 @@ struct FrtOutStreamMethods {
      * Close any resources used by the output stream +os+
      *
      * @param os self
-     * @raise FRT_IO_ERROR if there is an closing the file
+     * @raise FRT_IO_ERROR if there is an error closing the file
      */
     void (*close_i)(struct FrtOutStream *os);
 };

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/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
 
@@ -485,15 +486,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 +676,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 +847,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.10'
+    VERSION = '0.14.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-ferret
 version: !ruby/object:Gem::Version
-  version: 0.13.10
+  version: 0.14.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-07 00:00:00.000000000 Z
+date: 2022-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -181,6 +181,7 @@ files:
 - ext/isomorfeus_ferret_ext/fio_tmpfile.h
 - ext/isomorfeus_ferret_ext/frb_analysis.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