isomorfeus-ferret 0.13.5 → 0.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f2a4a6ea097a25d4d32a958c730fffca81ded61133f37ef4c86ca5b78ecef77
-  data.tar.gz: 7be1f98b64559be5f02e39d7a74894476046fef3fdd46d1e69ee3079c74c9681
+  metadata.gz: 524b384c2ab35457603726287160b443a50939473bab7852e5e6f5f886ded0a7
+  data.tar.gz: b304d0386bc0b14e68167bfcc1b62346f81c02f6eff25c3a6633bb0a1919083e
 SHA512:
-  metadata.gz: d173777ee520433e8df0e1a07853f92b65aa350427668baea67a957a28a8cadc05790396d8d5167282c4c83fb1e874eec3316c226e8c961f9f3161f3bf3ecb79
-  data.tar.gz: c64a96813a4b2546e21825cb4a6310c9384a8090bafe51e9c65c49d8c2b8bc69ab3deed82780e6df09089b6a915d6b7e7418bcac30f3d9770c1358800aa2286d
+  metadata.gz: b378ce12aa56bb35e57eec2c8df64152a7a7bd5cb1345d4a7dc0264e236fddcea3ffbc41a7213401cf50ff163c3172169fbf93699a4a7f96505f300782bc9a92
+  data.tar.gz: 6954e297df285f7726bd925a6f4dda4300f06d059dc4b674a494e775b901f7ea9e529e62be8793049c6df20a17515c41741f63155fbdd661de4595694deb4c27

data/ext/isomorfeus_ferret_ext/frt_compound_io.c

@@ -329,7 +329,7 @@ static void cw_copy_file(FrtCompoundWriter *cw, FrtCWFileEntry *src, FrtOutStrea
     frt_is_close(is);
 }
 
-void frt_cw_close(FrtCompoundWriter *cw)
+void frt_cw_close(FrtCompoundWriter *cw, FrtDeleter *dlr)
 {
     FrtOutStream *os = NULL;
     int i;
@@ -356,6 +356,9 @@ void frt_cw_close(FrtCompoundWriter *cw)
     for (i = 0; i < frt_ary_size(cw->file_entries); i++) {
         cw->file_entries[i].data_offset = frt_os_pos(os);
         cw_copy_file(cw, &cw->file_entries[i], os);
+        if (dlr) {
+            frt_deleter_queue_file(dlr, cw->file_entries[i].name);
+        }
     }
 
     /* Write the data offsets into the directory of the compound stream */

data/ext/isomorfeus_ferret_ext/frt_fs_store.c

@@ -272,15 +272,13 @@ static const struct FrtOutStreamMethods FS_OUT_STREAM_METHODS = {
 static FrtOutStream *fs_new_output(FrtStore *store, const char *filename)
 {
     char path[FRT_MAX_FILE_PATH];
-    int fd = open(join_path(path, store->dir.path, filename),
-                  O_WRONLY | O_CREAT | O_BINARY, store->file_mode);
-    FrtOutStream *os;
+    int fd = open(join_path(path, store->dir.path, filename), O_WRONLY | O_CREAT | O_BINARY, store->file_mode);
     if (fd < 0) {
         FRT_RAISE(FRT_IO_ERROR, "couldn't create OutStream %s: <%s>",
               path, strerror(errno));
     }
 
-    os = frt_os_new();
+    FrtOutStream *os = frt_os_new();
     os->file.fd = fd;
     os->m = &FS_OUT_STREAM_METHODS;
     return os;

data/ext/isomorfeus_ferret_ext/frt_index.c

@@ -681,15 +681,13 @@ static char *si_norm_file_name(FrtSegmentInfo *si, char *buf, int field_num)
     if (field_num >= si->norm_gens_size
         || 0 > (norm_gen = si->norm_gens[field_num])) {
         return NULL;
-    }
-    else {
+    } else {
         const char *ext = (si->use_compound_file && norm_gen > 0) ? "s" : "f";
         return fn_for_gen_field(buf, si->name, ext, norm_gen, field_num);
     }
 }
 
-static void deleter_queue_file(FrtDeleter *dlr, const char *file_name);
-#define DEL(file_name) deleter_queue_file(dlr, file_name)
+void frt_deleter_queue_file(FrtDeleter *dlr, const char *file_name);
 
 static void si_delete_files(FrtSegmentInfo *si, FrtFieldInfos *fis, FrtDeleter *dlr)
 {
@@ -700,7 +698,7 @@ static void si_delete_files(FrtSegmentInfo *si, FrtFieldInfos *fis, FrtDeleter *
 
     for (i = si->norm_gens_size - 1; i >= 0; i--) {
         if (0 <= si->norm_gens[i]) {
-            DEL(si_norm_file_name(si, file_name, fis->fields[i]->number));
+            frt_deleter_queue_file(dlr, si_norm_file_name(si, file_name, fis->fields[i]->number));
         }
     }
 
@@ -710,15 +708,14 @@ static void si_delete_files(FrtSegmentInfo *si, FrtFieldInfos *fis, FrtDeleter *
 
     if (si->use_compound_file) {
         memcpy(ext, "cfs", 4);
-        DEL(file_name);
+        frt_deleter_queue_file(dlr, file_name);
         if (0 <= si->del_gen) {
-            DEL(frt_fn_for_generation(file_name, si->name, "del", si->del_gen));
+            frt_deleter_queue_file(dlr, frt_fn_for_generation(file_name, si->name, "del", si->del_gen));
         }
-    }
-    else {
+    } else {
         for (i = FRT_NELEMS(INDEX_EXTENSIONS) - 1; i >= 0; i--) {
             memcpy(ext, INDEX_EXTENSIONS[i], 4);
-            DEL(file_name);
+            frt_deleter_queue_file(dlr, file_name);
         }
     }
 }
@@ -3695,8 +3692,7 @@ static bool file_name_filter_is_cfs_file(const char *file_name) {
  ****************************************************************************/
 
 #define DELETABLE_START_CAPA 8
-FrtDeleter *frt_deleter_new(FrtSegmentInfos *sis, FrtStore *store)
-{
+FrtDeleter *frt_deleter_new(FrtSegmentInfos *sis, FrtStore *store) {
     FrtDeleter *dlr = FRT_ALLOC(FrtDeleter);
     dlr->sis = sis;
     dlr->store = store;
@@ -3704,19 +3700,16 @@ FrtDeleter *frt_deleter_new(FrtSegmentInfos *sis, FrtStore *store)
     return dlr;
 }
 
-void frt_deleter_destroy(FrtDeleter *dlr)
-{
+void frt_deleter_destroy(FrtDeleter *dlr) {
     frt_hs_destroy(dlr->pending);
     free(dlr);
 }
 
-static void deleter_queue_file(FrtDeleter *dlr, const char *file_name)
-{
+void frt_deleter_queue_file(FrtDeleter *dlr, const char *file_name) {
     frt_hs_add(dlr->pending, frt_estrdup(file_name));
 }
 
-void frt_deleter_delete_file(FrtDeleter *dlr, char *file_name)
-{
+void frt_deleter_delete_file(FrtDeleter *dlr, char *file_name) {
     FrtStore *store = dlr->store;
     FRT_TRY
         if (store->exists(store, file_name)) {
@@ -3728,8 +3721,7 @@ void frt_deleter_delete_file(FrtDeleter *dlr, char *file_name)
     FRT_XENDTRY
 }
 
-static void deleter_commit_pending_deletions(FrtDeleter *dlr)
-{
+static void deleter_commit_pending_deletions(FrtDeleter *dlr) {
     FrtHashSetEntry *hse, *hse_next = dlr->pending->first;
     while ((hse = hse_next) != NULL) {
         hse_next = hse->next;
@@ -3737,23 +3729,13 @@ static void deleter_commit_pending_deletions(FrtDeleter *dlr)
     }
 }
 
-void frt_deleter_delete_files(FrtDeleter *dlr, char **files, int file_cnt)
-{
-    int i;
-    for (i = file_cnt - 1; i >= 0; i--) {
-        deleter_queue_file(dlr, files[i]);
-    }
-    deleter_commit_pending_deletions(dlr);
-}
-
 struct DelFilesArg {
     char  curr_seg_file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
     FrtDeleter *dlr;
     FrtHash *current;
 };
 
-static void frt_deleter_find_deletable_files_i(const char *file_name, void *arg)
-{
+static void frt_deleter_find_deletable_files_i(const char *file_name, void *arg) {
     struct DelFilesArg *dfa = (struct DelFilesArg *)arg;
     FrtDeleter *dlr = dfa->dlr;
 
@@ -3773,8 +3755,7 @@ static void frt_deleter_find_deletable_files_i(const char *file_name, void *arg)
         if (NULL != p) {
             *p = '\0';
             extension = p + 1;
-        }
-        else {
+        } else {
             extension = NULL;
         }
 
@@ -3789,16 +3770,14 @@ static void frt_deleter_find_deletable_files_i(const char *file_name, void *arg)
         if (NULL == (si = (FrtSegmentInfo *)frt_h_get(dfa->current, segment_name))) {
             /* Delete if segment is not referenced: */
             do_delete = true;
-        }
-        else {
+        } else {
             char tmp_fn[FRT_SEGMENT_NAME_MAX_LENGTH];
             /* OK, segment is referenced, but file may still be orphan'd: */
             if (file_name_filter_is_cfs_file(file_name)
                 && si->use_compound_file) {
                 /* This file is stored in a CFS file for this segment: */
                 do_delete = true;
-            }
-            else if (0 == strcmp("del", extension)) {
+            } else if (0 == strcmp("del", extension)) {
                 /* This is a _segmentName_N.del file: */
                 if (!frt_fn_for_generation(tmp_fn, segment_name, "del", si->del_gen)
                     || 0 != strcmp(file_name, tmp_fn)) {
@@ -3807,8 +3786,7 @@ static void frt_deleter_find_deletable_files_i(const char *file_name, void *arg)
                      * this segment, then delete it: */
                     do_delete = true;
                 }
-            }
-            else if (NULL != extension
+            } else if (NULL != extension
                      && ('s' == *extension || 'f' == *extension)
                      && isdigit(extension[1])) {
                 si_norm_file_name(si, tmp_fn, atoi(extension + 1));
@@ -3817,15 +3795,14 @@ static void frt_deleter_find_deletable_files_i(const char *file_name, void *arg)
                     /* This is an orphan'd norms file: */
                     do_delete = true;
                 }
-            }
-            else if (0 == strcmp("cfs", extension) && !si->use_compound_file) {
+            } else if (0 == strcmp("cfs", extension) && !si->use_compound_file) {
                 /* This is a partially written _segmentName.cfs: */
                 do_delete = true;
             }
         }
 
         if (do_delete) {
-            deleter_queue_file(dlr, file_name);
+            frt_deleter_queue_file(dlr, file_name);
         }
     }
 }
@@ -3837,8 +3814,7 @@ static void frt_deleter_find_deletable_files_i(const char *file_name, void *arg)
  * create the unused file (eg when merging segments), and we only remove from
  * deletable when a file is successfully deleted.
  */
-void frt_deleter_find_deletable_files(FrtDeleter *dlr)
-{
+void frt_deleter_find_deletable_files(FrtDeleter *dlr) {
     /* Gather all "current" segments: */
     int i;
     FrtSegmentInfos *sis = dlr->sis;
@@ -4207,7 +4183,7 @@ static void norm_rewrite(Norm *norm, FrtStore *store, FrtDeleter *dlr,
     const int field_num = norm->field_num;
 
     if (si_norm_file_name(si, norm_file_name, field_num)) {
-        deleter_queue_file(dlr, norm_file_name);
+        frt_deleter_queue_file(dlr, norm_file_name);
     }
     frt_si_advance_norm_gen(si, field_num);
     si_norm_file_name(si, norm_file_name, field_num);
@@ -4363,7 +4339,7 @@ static void sr_commit_i(FrtIndexReader *ir)
     if (SR(ir)->undelete_all || SR(ir)->deleted_docs_dirty) {
         if (si->del_gen >= 0) {
             frt_fn_for_generation(tmp_file_name, segment, "del", si->del_gen);
-            deleter_queue_file(ir->deleter, tmp_file_name);
+            frt_deleter_queue_file(ir->deleter, tmp_file_name);
         }
         if (SR(ir)->undelete_all) {
             si->del_gen = -1;
@@ -5687,7 +5663,6 @@ static SegmentMergeInfo *smi_new(int base, FrtStore *store, FrtSegmentInfo *si)
         smi->store = frt_open_cmpd_store(store, file_name);
     }
 
-
     sprintf(file_name, "%s.fdx", segment);
     smi->doc_cnt = smi->max_doc
         = smi->store->length(smi->store, file_name) / FIELDS_IDX_PTR_SIZE;
@@ -6116,14 +6091,7 @@ int frt_iw_doc_count(FrtIndexWriter *iw)
     return doc_cnt;
 }
 
-#define MOVE_TO_COMPOUND_DIR(file_name)\
-    deleter_queue_file(dlr, file_name);\
-    frt_cw_add_file(cw, file_name)
-
-static void iw_create_compound_file(FrtStore *store, FrtFieldInfos *fis,
-                                    FrtSegmentInfo *si, char *cfs_file_name,
-                                    FrtDeleter *dlr)
-{
+static void iw_create_compound_file(FrtStore *store, FrtFieldInfos *fis, FrtSegmentInfo *si, char *cfs_file_name, FrtDeleter *dlr) {
     int i;
     FrtCompoundWriter *cw;
     char file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
@@ -6137,19 +6105,18 @@ static void iw_create_compound_file(FrtStore *store, FrtFieldInfos *fis,
     cw = frt_open_cw(store, cfs_file_name);
     for (i = 0; i < FRT_NELEMS(COMPOUND_EXTENSIONS); i++) {
         memcpy(ext, COMPOUND_EXTENSIONS[i], 4);
-        MOVE_TO_COMPOUND_DIR(file_name);
+        frt_cw_add_file(cw, file_name);
     }
 
     /* Field norm file_names */
     for (i = fis->size - 1; i >= 0; i--) {
-        if (fi_has_norms(fis->fields[i])
-            && si_norm_file_name(si, file_name, i)) {
-            MOVE_TO_COMPOUND_DIR(file_name);
+        if (fi_has_norms(fis->fields[i]) && si_norm_file_name(si, file_name, i)) {
+            frt_cw_add_file(cw, file_name);
         }
     }
 
     /* Perform the merge */
-    frt_cw_close(cw);
+    frt_cw_close(cw, dlr);
 }
 
 static void iw_commit_compound_file(FrtIndexWriter *iw, FrtSegmentInfo *si)

data/ext/isomorfeus_ferret_ext/frt_index.h

@@ -627,9 +627,9 @@ struct FrtDeleter {
 
 extern FrtDeleter *frt_deleter_new(FrtSegmentInfos *sis, FrtStore *store);
 extern void frt_deleter_destroy(FrtDeleter *dlr);
+extern void frt_deleter_queue_file(FrtDeleter *dlr, const char *file_name);
 extern void frt_deleter_delete_file(FrtDeleter *dlr, char *file_name);
 extern void frt_deleter_find_deletable_files(FrtDeleter *dlr);
-extern void frt_deleter_delete_files(FrtDeleter *dlr, char **files, int file_cnt);
 
 /****************************************************************************
  *
@@ -859,6 +859,6 @@ typedef struct FrtCompoundWriter {
 
 extern FrtCompoundWriter *frt_open_cw(FrtStore *store, char *name);
 extern void frt_cw_add_file(FrtCompoundWriter *cw, char *id);
-extern void frt_cw_close(FrtCompoundWriter *cw);
+extern void frt_cw_close(FrtCompoundWriter *cw, FrtDeleter *dlr);
 
 #endif

data/ext/isomorfeus_ferret_ext/test.c

@@ -810,7 +810,7 @@ void Init_Test(void) {
     rb_define_singleton_method(mTest, "filter",         frb_ts_filter, 0);
     rb_define_singleton_method(mTest, "fs_store",       frb_ts_fs_store, 0);
     rb_define_singleton_method(mTest, "global",         frb_ts_global, 0);
-    rb_define_singleton_method(mTest, "hash",           frb_ts_hash, 0);
+    rb_define_singleton_method(mTest, "test_hash",      frb_ts_hash, 0);
     rb_define_singleton_method(mTest, "hashset",        frb_ts_hashset, 0);
     rb_define_singleton_method(mTest, "helper",         frb_ts_helper, 0);
     rb_define_singleton_method(mTest, "highlighter",    frb_ts_highlighter, 0);

data/ext/isomorfeus_ferret_ext/test_compound_io.c

@@ -48,7 +48,7 @@ void test_compound_writer(TestCase *tc, void *data)
     cw = frt_open_cw(store, (char *)"cfile");
     frt_cw_add_file(cw, (char *)"file1");
     frt_cw_add_file(cw, (char *)"file2");
-    frt_cw_close(cw);
+    frt_cw_close(cw, NULL);
 
     is = store->open_input(store, "cfile");
     Aiequal(2, frt_is_read_vint(is));
@@ -94,7 +94,7 @@ void test_compound_io(TestCase *tc, void *data)
     frt_cw_add_file(cw, (char *)"file1");
     frt_cw_add_file(cw, (char *)"file2");
     frt_cw_add_file(cw, (char *)"file3");
-    frt_cw_close(cw);
+    frt_cw_close(cw, NULL);
 
     c_reader = frt_open_cmpd_store(store, "cfile");
     is1 = c_reader->open_input(c_reader, "file1");
@@ -137,7 +137,7 @@ void test_compound_io_many_files(TestCase *tc, void *data)
         frt_os_write_vint(os, MAGIC);
         frt_os_close(os);
     }
-    frt_cw_close(cw);
+    frt_cw_close(cw, NULL);
 
     c_reader = frt_open_cmpd_store(store, "_.cfs");
     for (i = 0; i < TEST_FILE_CNT; i++) {

data/ext/isomorfeus_ferret_ext/test_hash.c

@@ -45,6 +45,7 @@ static void test_hash_str(TestCase *tc, void *data)
 
     size_t res;
     f = temp_open();
+    Assert(f != NULL, "Could not open tempfile");
     frt_h_str_print_keys(h, f);
     fseek(f, 0, SEEK_SET);
     res = fread(buf, 1, 100, f);

data/lib/isomorfeus/ferret/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Ferret
-    VERSION = '0.13.5'
+    VERSION = '0.13.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-ferret
 version: !ruby/object:Gem::Version
-  version: 0.13.5
+  version: 0.13.6
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake