isomorfeus-ferret 0.13.9 → 0.13.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 744efe9c78deef0c563e39ae29eb4e755f8afb493be0fe80416a55987db97ce7
-  data.tar.gz: d1f814f14b5a6ef18f612e545b54b0a113544f994c22901e7204ae191ebb644e
+  metadata.gz: 0625b49341ee2fc35e80e673e368789532c06ce6c93e779072cacc1206847a4b
+  data.tar.gz: 7e81488d430471a37a872f80319efdcf8378e55dc4a583e33ff12bea942b9416
 SHA512:
-  metadata.gz: 3fd11e3b3f0f04625c14b9b709d69ef6f1a1abdfdf5c50ad5e151a3fd87e300595e29639ac9455c66f8db5452d9569bb1585f6b2f9f57ac5c3103f2ff09bb8d1
-  data.tar.gz: 27ace1a41fcc7557490865e740dfbe9906ce999288bb31306efa9b02f519552f9092391ff64a3ededc6a2285a0e78533a80d43ad48e85abc97c1a154e0060a67
+  metadata.gz: 38cf613eac98374898aa9a5c998cc3534d18d6badba3560cd1660413acd189cb6e618eba38f3bf828cef23fcafb9e44b2de349363b55585af9ea79927ff9b2cf
+  data.tar.gz: 88564c30711737b48bec8879df788b46e03b06a041a98aaf3147c7375ef0d313d48f789805303774b4d0ed4531603ee8baaa46935b81abafb6df8ba7ccdb56a6

data/ext/isomorfeus_ferret_ext/bm_store.c

@@ -6,7 +6,7 @@
 #define N 10
 #define write_byte(os, b) os->buf.buf[os->buf.pos++] = (frt_uchar)b
 
-void my_os_write_voff_t(FrtOutStream *os, register off_t num) {
+void my_os_write_voff_t(FrtOutStream *os, register frt_off_t num) {
     if (!(num&0x7f)) {
         if (os->buf.pos >= FRT_BUFFER_SIZE) {
             frt_os_write_byte(os, (frt_uchar)num);
@@ -48,7 +48,7 @@ void my_os_write_voff_t(FrtOutStream *os, register off_t num) {
 
 static void vint_out(void) {
     int n;
-    off_t i;
+    frt_off_t i;
     FrtOutStream *os;
 
     for (n = 0; n < N; n++) {
@@ -63,7 +63,7 @@ static void vint_out(void) {
 
 static void unrolled_vint_out(void) {
     int n;
-    off_t i;
+    frt_off_t i;
     FrtOutStream *os;
 
     for (n = 0; n < N; n++) {

data/ext/isomorfeus_ferret_ext/frt_analysis.c

@@ -64,7 +64,7 @@ static inline int get_cp(char *start, char *end, int *cp_len, rb_encoding *enc)
 /*** FrtToken ****************************************************************/
 /*****************************************************************************/
 
-FrtToken *frt_tk_set(FrtToken *tk, char *text, int tlen, off_t start, off_t end, int pos_inc, rb_encoding *encoding) {
+FrtToken *frt_tk_set(FrtToken *tk, char *text, int tlen, frt_off_t start, frt_off_t end, int pos_inc, rb_encoding *encoding) {
     if (tlen >= FRT_MAX_WORD_SIZE) {
         tlen = FRT_MAX_WORD_SIZE - 1; // TODO: this may invalidate mbc's
     }
@@ -92,7 +92,7 @@ static FrtToken *frt_tk_set_ts(FrtToken *tk, char *start, char *end, char *text,
     return frt_tk_set(tk, start, (int)(end - start), (off_t)(start - text), (off_t)(end - text), pos_inc, encoding);
 }
 
-FrtToken *frt_tk_set_no_len(FrtToken *tk, char *text, off_t start, off_t end, int pos_inc, rb_encoding *encoding) {
+FrtToken *frt_tk_set_no_len(FrtToken *tk, char *text, frt_off_t start, frt_off_t end, int pos_inc, rb_encoding *encoding) {
     return frt_tk_set(tk, text, (int)strlen(text), start, end, pos_inc, encoding);
 }
 

data/ext/isomorfeus_ferret_ext/frt_analysis.h

@@ -13,15 +13,15 @@
 typedef struct FrtToken {
     char  text[FRT_MAX_WORD_SIZE];
     int   len;
-    off_t start;
-    off_t end;
+    frt_off_t start;
+    frt_off_t end;
     int   pos_inc;
 } FrtToken;
 
 extern FrtToken *frt_tk_new();
 extern void      frt_tk_destroy(void *p);
-extern FrtToken *frt_tk_set(FrtToken *tk, char *text, int tlen, off_t start, off_t end, int pos_inc, rb_encoding *encoding);
-extern FrtToken *frt_tk_set_no_len(FrtToken *tk, char *text, off_t start, off_t end, int pos_inc, rb_encoding *encoding);
+extern FrtToken *frt_tk_set(FrtToken *tk, char *text, int tlen, frt_off_t start, frt_off_t end, int pos_inc, rb_encoding *encoding);
+extern FrtToken *frt_tk_set_no_len(FrtToken *tk, char *text, frt_off_t start, frt_off_t end, int pos_inc, rb_encoding *encoding);
 extern int       frt_tk_eq(FrtToken *tk1, FrtToken *tk2);
 extern int       frt_tk_cmp(FrtToken *tk1, FrtToken *tk2);
 

data/ext/isomorfeus_ferret_ext/frt_compound_io.c

@@ -12,8 +12,8 @@ extern FrtStore *frt_store_new();
  ****************************************************************************/
 
 typedef struct FileEntry {
-    off_t offset;
-    off_t length;
+    frt_off_t offset;
+    frt_off_t length;
 } FileEntry;
 
 static void cmpd_touch(FrtStore *store, const char *file_name) {
@@ -76,7 +76,7 @@ static void cmpd_close_i(FrtStore *store) {
     free(store->dir.cmpd);
 }
 
-static off_t cmpd_length(FrtStore *store, const char *file_name) {
+static frt_off_t cmpd_length(FrtStore *store, const char *file_name) {
     FileEntry *fe = (FileEntry *)frt_h_get(store->dir.cmpd->entries, file_name);
     if (fe != NULL) {
         return fe->length;
@@ -85,7 +85,7 @@ static off_t cmpd_length(FrtStore *store, const char *file_name) {
     }
 }
 
-static void cmpdi_seek_i(FrtInStream *is, off_t pos) {
+static void cmpdi_seek_i(FrtInStream *is, frt_off_t pos) {
     (void)is;
     (void)pos;
 }
@@ -95,7 +95,7 @@ static void cmpdi_close_i(FrtInStream *is) {
     free(is->d.cis);
 }
 
-static off_t cmpdi_length_i(FrtInStream *is) {
+static frt_off_t cmpdi_length_i(FrtInStream *is) {
     return (is->d.cis->length);
 }
 
@@ -104,7 +104,7 @@ static off_t cmpdi_length_i(FrtInStream *is) {
  */
 static void cmpdi_read_i(FrtInStream *is, frt_uchar *b, int len) {
     FrtCompoundInStream *cis = is->d.cis;
-    off_t start = frt_is_pos(is);
+    frt_off_t start = frt_is_pos(is);
 
     if ((start + len) > cis->length) {
         FRT_RAISE(FRT_EOF_ERROR, "Tried to read past end of file. File length is "
@@ -123,7 +123,7 @@ static const struct FrtInStreamMethods CMPD_IN_STREAM_METHODS = {
     cmpdi_close_i
 };
 
-static FrtInStream *cmpd_create_input(FrtInStream *sub_is, off_t offset, off_t length) {
+static FrtInStream *cmpd_create_input(FrtInStream *sub_is, frt_off_t offset, frt_off_t length) {
     FrtInStream *is = frt_is_new();
     FrtCompoundInStream *cis = FRT_ALLOC(FrtCompoundInStream);
 
@@ -182,7 +182,7 @@ static void cmpd_close_lock_i(FrtLock *lock) {
 
 FrtStore *frt_open_cmpd_store(FrtStore *store, const char *name) {
     int count, i;
-    off_t offset;
+    frt_off_t offset;
     char *fname;
     FileEntry *volatile entry = NULL;
     FrtStore *new_store = NULL;
@@ -273,9 +273,9 @@ void frt_cw_add_file(FrtCompoundWriter *cw, char *id) {
 }
 
 static void cw_copy_file(FrtCompoundWriter *cw, FrtCWFileEntry *src, FrtOutStream *os) {
-    off_t start_ptr = frt_os_pos(os);
-    off_t end_ptr;
-    off_t remainder, length, len;
+    frt_off_t start_ptr = frt_os_pos(os);
+    frt_off_t end_ptr;
+    frt_off_t remainder, length, len;
     frt_uchar buffer[FRT_BUFFER_SIZE];
 
     FrtInStream *is = cw->store->open_input(cw->store, src->name);

data/ext/isomorfeus_ferret_ext/frt_config.h

@@ -1,6 +1,8 @@
 #ifndef FRT_DEFINES_H
 #define FRT_DEFINES_H
 
+#define _FILE_OFFSET_BITS 64
+
 #include <sys/types.h>
 #include <limits.h>
 #include "frt_posh.h"
@@ -24,6 +26,12 @@ typedef posh_i32_t frt_i32;
 typedef posh_u64_t frt_u64;
 typedef posh_i64_t frt_i64;
 
+#if defined POSH_OS_WIN64
+typedef off64_t frt_off_t;
+#else
+typedef off_t frt_off_t;
+#endif
+
 #if ( LONG_MAX == 2147483647 ) && defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
 #define FRT_OFF_T_PFX "ll"
 #else

data/ext/isomorfeus_ferret_ext/frt_fs_store.c

@@ -225,7 +225,7 @@ static void fs_destroy(FrtStore *store)
     free(store->dir.path);
 }
 
-static off_t fs_length(FrtStore *store, const char *filename)
+static frt_off_t fs_length(FrtStore *store, const char *filename)
 {
     char path[FRT_MAX_FILE_PATH];
     struct stat stt;
@@ -247,9 +247,12 @@ static void fso_flush_i(FrtOutStream *os, const frt_uchar *src, int len)
     }
 }
 
-static void fso_seek_i(FrtOutStream *os, off_t pos)
-{
+static void fso_seek_i(FrtOutStream *os, frt_off_t pos) {
+#if (defined POSH_OS_WIN32 || defined POSH_OS_WIN64)
+    if (_lseeki64(os->file.fd, pos, SEEK_SET) < 0) {
+#else
     if (lseek(os->file.fd, pos, SEEK_SET) < 0) {
+#endif
         FRT_RAISE(FRT_IO_ERROR, "seeking position %"FRT_OFF_T_PFX"d: <%s>",
               pos, strerror(errno));
     }
@@ -286,7 +289,7 @@ static FrtOutStream *fs_new_output(FrtStore *store, const char *filename)
 static void fsi_read_i(FrtInStream *is, frt_uchar *path, int len)
 {
     int fd = is->f->file.fd;
-    off_t pos = frt_is_pos(is);
+    frt_off_t pos = frt_is_pos(is);
     if (pos != lseek(fd, 0, SEEK_CUR)) {
         lseek(fd, pos, SEEK_SET);
     }
@@ -299,9 +302,12 @@ static void fsi_read_i(FrtInStream *is, frt_uchar *path, int len)
     }
 }
 
-static void fsi_seek_i(FrtInStream *is, off_t pos)
-{
+static void fsi_seek_i(FrtInStream *is, frt_off_t pos) {
+#if (defined POSH_OS_WIN32 || defined POSH_OS_WIN64)
+    if (_lseeki64(is->f->file.fd, pos, SEEK_SET) < 0) {
+#else
     if (lseek(is->f->file.fd, pos, SEEK_SET) < 0) {
+#endif
         FRT_RAISE(FRT_IO_ERROR, "seeking pos %"FRT_OFF_T_PFX"d: <%s>",
               pos, strerror(errno));
     }
@@ -315,7 +321,7 @@ static void fsi_close_i(FrtInStream *is)
     if (is->d.path) free(is->d.path);
 }
 
-static off_t fsi_length_i(FrtInStream *is)
+static frt_off_t fsi_length_i(FrtInStream *is)
 {
     struct stat stt;
     if (fstat(is->f->file.fd, &stt)) {

data/ext/isomorfeus_ferret_ext/frt_index.c

@@ -1565,7 +1565,7 @@ static void frt_fr_read_compressed_fields(FrtFieldsReader *fr, FrtDocField *df,
 FrtDocument *frt_fr_get_doc(FrtFieldsReader *fr, int doc_num)
 {
     int i, j;
-    off_t pos;
+    frt_off_t pos;
     int stored_cnt;
     FrtDocument *doc = frt_doc_new();
     FrtInStream *fdx_in = fr->fdx_in;
@@ -1612,7 +1612,7 @@ FrtLazyDoc *frt_fr_get_lazy_doc(FrtFieldsReader *fr, int doc_num)
 {
     int start = 0;
     int i, j;
-    off_t pos;
+    frt_off_t pos;
     int stored_cnt;
     FrtLazyDoc *lazy_doc;
     FrtInStream *fdx_in = fr->fdx_in;
@@ -1642,7 +1642,7 @@ FrtLazyDoc *frt_fr_get_lazy_doc(FrtFieldsReader *fr, int doc_num)
         lazy_doc_add_field(lazy_doc, lazy_df, i);
     }
     /* correct the starts to their correct absolute positions */
-    const off_t abs_start = frt_is_pos(fdt_in);
+    const frt_off_t abs_start = frt_is_pos(fdt_in);
     for (i = 0; i < stored_cnt; i++) {
         FrtLazyDocField *lazy_df = lazy_doc->fields[i];
         const int df_size = lazy_df->size;
@@ -1719,7 +1719,7 @@ FrtHash *frt_fr_get_tv(FrtFieldsReader *fr, int doc_num)
     int i;
     FrtInStream *fdx_in = fr->fdx_in;
     FrtInStream *fdt_in = fr->fdt_in;
-    off_t data_ptr, field_index_ptr;
+    frt_off_t data_ptr, field_index_ptr;
     int field_cnt;
     int *field_nums;
 
@@ -1757,7 +1757,7 @@ FrtTermVector *frt_fr_get_field_tv(FrtFieldsReader *fr, int doc_num, int field_n
 
     if (doc_num >= 0 && doc_num < fr->size) {
         int i, fnum = -1;
-        off_t field_index_ptr;
+        frt_off_t field_index_ptr;
         int field_cnt;
         int offset = 0;
         FrtInStream *fdx_in = fr->fdx_in;
@@ -2038,7 +2038,7 @@ void frt_fw_add_postings(FrtFieldsWriter *fw,
     int i, delta_start, delta_length;
     const char *last_term = FRT_EMPTY_STRING;
     FrtOutStream *fdt_out = fw->fdt_out;
-    off_t fdt_start_pos = frt_os_pos(fdt_out);
+    frt_off_t fdt_start_pos = frt_os_pos(fdt_out);
     FrtPostingList *plist;
     FrtPosting *posting;
     FrtOccurence *occ;
@@ -2152,7 +2152,7 @@ static void sti_ensure_index_is_read(FrtSegmentTermIndex *sti, FrtTermEnum *inde
     if (NULL == sti->index_terms) {
         int i;
         int index_cnt = sti->index_cnt;
-        off_t index_ptr = 0;
+        frt_off_t index_ptr = 0;
         ste_reset(index_te);
         frt_is_seek(STE(index_te)->is, sti->index_ptr);
         STE(index_te)->size = sti->index_cnt;
@@ -2789,7 +2789,7 @@ static void tw_add(FrtTermWriter *tw, const char *term, int term_len, FrtTermInf
 }
 
 void frt_tiw_add(FrtTermInfosWriter *tiw, const char *term, int term_len, FrtTermInfo *ti) {
-    off_t tis_pos;
+    frt_off_t tis_pos;
 
     if (0 == (tiw->tis_writer->counter % tiw->index_interval)) {
         /* add an index term */
@@ -2962,8 +2962,8 @@ static bool stde_skip_to(FrtTermDocEnum *tde, int target_doc_num) {
     if (stde->doc_freq >= stde->skip_interval
         && target_doc_num > stde->doc_num) {       /* optimized case */
         int last_skip_doc;
-        off_t last_frq_ptr;
-        off_t last_prx_ptr;
+        frt_off_t last_frq_ptr;
+        frt_off_t last_prx_ptr;
         int num_skipped;
 
         if (NULL == stde->skip_in) {
@@ -3034,7 +3034,7 @@ static void stde_skip_prox(FrtSegmentTermDocEnum *stde) {
     (void)stde;
 }
 
-static void stde_seek_prox(FrtSegmentTermDocEnum *stde, off_t prx_ptr) {
+static void stde_seek_prox(FrtSegmentTermDocEnum *stde, frt_off_t prx_ptr) {
     (void)stde;
     (void)prx_ptr;
 }
@@ -3130,7 +3130,7 @@ static void stpe_skip_prox(FrtSegmentTermDocEnum *stde)
     frt_is_skip_vints(stde->prx_in, stde->freq);
 }
 
-static void stpe_seek_prox(FrtSegmentTermDocEnum *stde, off_t prx_ptr)
+static void stpe_seek_prox(FrtSegmentTermDocEnum *stde, frt_off_t prx_ptr)
 {
     frt_is_seek(stde->prx_in, prx_ptr);
     stde->prx_cnt = 0;
@@ -5108,8 +5108,8 @@ typedef struct SkipBuffer
     FrtOutStream *frq_out;
     FrtOutStream *prx_out;
     int last_doc;
-    off_t last_frq_ptr;
-    off_t last_prx_ptr;
+    frt_off_t last_frq_ptr;
+    frt_off_t last_prx_ptr;
 } SkipBuffer;
 
 static void skip_buf_reset(SkipBuffer *skip_buf)
@@ -5131,8 +5131,8 @@ static SkipBuffer *skip_buf_new(FrtOutStream *frq_out, FrtOutStream *prx_out)
 
 static void skip_buf_add(SkipBuffer *skip_buf, int doc)
 {
-    off_t frq_ptr = frt_os_pos(skip_buf->frq_out);
-    off_t prx_ptr = frt_os_pos(skip_buf->prx_out);
+    frt_off_t frq_ptr = frt_os_pos(skip_buf->frq_out);
+    frt_off_t prx_ptr = frt_os_pos(skip_buf->prx_out);
 
     frt_os_write_vint(skip_buf->buf, doc - skip_buf->last_doc);
     frt_os_write_vint(skip_buf->buf, frq_ptr - skip_buf->last_frq_ptr);
@@ -5143,9 +5143,9 @@ static void skip_buf_add(SkipBuffer *skip_buf, int doc)
     skip_buf->last_prx_ptr = prx_ptr;
 }
 
-static off_t skip_buf_write(SkipBuffer *skip_buf)
+static frt_off_t skip_buf_write(SkipBuffer *skip_buf)
 {
-  off_t skip_ptr = frt_os_pos(skip_buf->frq_out);
+  frt_off_t skip_ptr = frt_os_pos(skip_buf->frq_out);
   frt_ramo_write_to(skip_buf->buf, skip_buf->frq_out);
   return skip_ptr;
 }
@@ -5378,7 +5378,7 @@ static void dw_add_posting(FrtMemoryPool *mp,
     }
 }
 
-static void dw_add_offsets(FrtDocWriter *dw, int pos, off_t start, off_t end)
+static void dw_add_offsets(FrtDocWriter *dw, int pos, frt_off_t start, frt_off_t end)
 {
     if (pos >= dw->offsets_capa) {
         int old_capa = dw->offsets_capa;
@@ -5402,7 +5402,7 @@ FrtHash *frt_dw_invert_field(FrtDocWriter *dw, FrtFieldInverter *fld_inv, FrtDoc
     int doc_num = dw->doc_num;
     int i;
     const int df_size = df->size;
-    off_t start_offset = 0;
+    frt_off_t start_offset = 0;
 
     if (fld_inv->is_tokenized) {
         FrtToken *tk;
@@ -5701,7 +5701,7 @@ static void sm_destroy(SegmentMerger *sm)
 static void sm_merge_fields(SegmentMerger *sm)
 {
     int i, j;
-    off_t start, end = 0;
+    frt_off_t start, end = 0;
     char file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
     FrtOutStream *fdt_out, *fdx_out;
     FrtStore *store = sm->store;
@@ -5818,12 +5818,12 @@ static char *sm_cache_term(SegmentMerger *sm, char *term, int term_len)
 static void sm_merge_term_info(SegmentMerger *sm, SegmentMergeInfo **matches,
                                int match_size)
 {
-    off_t frq_ptr = frt_os_pos(sm->frq_out);
-    off_t prx_ptr = frt_os_pos(sm->prx_out);
+    frt_off_t frq_ptr = frt_os_pos(sm->frq_out);
+    frt_off_t prx_ptr = frt_os_pos(sm->prx_out);
 
     int df = sm_append_postings(sm, matches, match_size); /* append posting data */
 
-    off_t skip_ptr = skip_buf_write(sm->skip_buf);
+    frt_off_t skip_ptr = skip_buf_write(sm->skip_buf);
 
     if (df > 0) {
         /* add an entry to the dictionary with ptrs to prox and freq files */
@@ -6370,7 +6370,7 @@ static void iw_cp_fields(FrtIndexWriter *iw, FrtSegmentReader *sr, const char *s
             int j, data_len = 0;
             const int field_cnt = frt_is_read_vint(fdt_in);
             int tv_cnt;
-            off_t doc_start_ptr = frt_os_pos(fdt_out);
+            frt_off_t doc_start_ptr = frt_os_pos(fdt_out);
 
             frt_os_write_u64(fdx_out, doc_start_ptr);
             frt_os_write_vint(fdt_out, field_cnt);

data/ext/isomorfeus_ferret_ext/frt_index.h

@@ -224,9 +224,9 @@ extern void frt_sis_put(FrtSegmentInfos *sis, FILE *stream);
 
 typedef struct FrtTermInfo {
     int   doc_freq;
-    off_t frq_ptr;
-    off_t prx_ptr;
-    off_t skip_offset;
+    frt_off_t frq_ptr;
+    frt_off_t prx_ptr;
+    frt_off_t skip_offset;
 } FrtTermInfo;
 
 #define frt_ti_set(ti, mdf, mfp, mpp, mso) do {\
@@ -265,14 +265,14 @@ FrtTermInfo *frt_te_get_ti(struct FrtTermEnum *te);
 /* FrtSegmentTermIndex */
 
 typedef struct FrtSegmentTermIndex {
-    off_t       index_ptr;
-    off_t       ptr;
+    frt_off_t       index_ptr;
+    frt_off_t       ptr;
     int         index_cnt;
     int         size;
     char        **index_terms;
     int         *index_term_lens;
     FrtTermInfo *index_term_infos;
-    off_t       *index_ptrs;
+    frt_off_t       *index_ptrs;
 } FrtSegmentTermIndex;
 
 /* FrtSegmentFieldIndex */
@@ -281,7 +281,7 @@ typedef struct FrtSegmentFieldIndex {
     frt_mutex_t mutex;
     int         skip_interval;
     int         index_interval;
-    off_t       index_ptr;
+    frt_off_t       index_ptr;
     FrtTermEnum *index_te;
     FrtHash     *field_dict;
 } FrtSegmentFieldIndex;
@@ -349,7 +349,7 @@ typedef struct FrtTermInfosWriter {
     int           field_count;
     int           index_interval;
     int           skip_interval;
-    off_t         last_index_ptr;
+    frt_off_t         last_index_ptr;
     FrtOutStream  *tfx_out;
     FrtTermWriter *tix_writer;
     FrtTermWriter *tis_writer;
@@ -385,7 +385,7 @@ struct FrtTermDocEnum {
 typedef struct FrtSegmentTermDocEnum FrtSegmentTermDocEnum;
 struct FrtSegmentTermDocEnum {
     FrtTermDocEnum tde;
-    void (*seek_prox)(FrtSegmentTermDocEnum *stde, off_t prx_ptr);
+    void (*seek_prox)(FrtSegmentTermDocEnum *stde, frt_off_t prx_ptr);
     void (*skip_prox)(FrtSegmentTermDocEnum *stde);
     FrtTermInfosReader *tir;
     FrtInStream        *frq_in;
@@ -402,9 +402,9 @@ struct FrtSegmentTermDocEnum {
     int skip_doc;
     int prx_cnt;
     int position;
-    off_t frq_ptr;
-    off_t prx_ptr;
-    off_t skip_ptr;
+    frt_off_t frq_ptr;
+    frt_off_t prx_ptr;
+    frt_off_t skip_ptr;
     bool have_skipped : 1;
 };
 
@@ -429,8 +429,8 @@ extern FrtTermDocEnum *frt_mtdpe_new(FrtIndexReader *ir, int field_num, char **t
  ****************************************************************************/
 
 typedef struct FrtOffset {
-    off_t start;
-    off_t end;
+    frt_off_t start;
+    frt_off_t end;
 } FrtOffset;
 
 /****************************************************************************
@@ -529,7 +529,7 @@ extern FrtTVTerm *frt_tv_get_tv_term(FrtTermVector *tv, const char *term);
 
 /* * * FrtLazyDocField * * */
 typedef struct FrtLazyDocFieldData {
-    off_t              start;
+    frt_off_t              start;
     int                length;
     rb_encoding        *encoding;
     FrtCompressionType compression; /* as stored */
@@ -595,7 +595,7 @@ typedef struct FrtFieldsWriter {
     FrtOutStream  *fdx_out;
     FrtOutStream  *buffer;
     FrtTVField    *tv_fields;
-    off_t         start_ptr;
+    frt_off_t         start_ptr;
 } FrtFieldsWriter;
 
 extern FrtFieldsWriter *frt_fw_open(FrtStore *store, const char *segment, FrtFieldInfos *fis);
@@ -846,8 +846,8 @@ extern void frt_iw_add_readers(FrtIndexWriter *iw, FrtIndexReader **readers, con
 #define FRT_CW_INIT_CAPA 16
 typedef struct FrtCWFileEntry {
     char  *name;
-    off_t dir_offset;
-    off_t data_offset;
+    frt_off_t dir_offset;
+    frt_off_t data_offset;
 } FrtCWFileEntry;
 
 typedef struct FrtCompoundWriter {

data/ext/isomorfeus_ferret_ext/frt_ram_store.c

@@ -136,7 +136,7 @@ static void ram_clear_all(FrtStore *store) {
     }
 }
 
-static off_t ram_length(FrtStore *store, const char *filename) {
+static frt_off_t ram_length(FrtStore *store, const char *filename) {
     FrtRAMFile *rf = (FrtRAMFile *)frt_h_get(store->dir.ht, filename);
     if (rf != NULL) {
         return rf->len;
@@ -151,7 +151,7 @@ static void ramo_flush_i(FrtOutStream *os, const frt_uchar *src, int len) {
     FrtRAMFile *rf = os->file.rf;
     int buffer_number, buffer_offset, bytes_in_buffer, bytes_to_copy;
     int src_offset;
-    off_t pointer = os->pointer;
+    frt_off_t pointer = os->pointer;
 
     buffer_number = (int)(pointer / FRT_BUFFER_SIZE);
     buffer_offset = pointer % FRT_BUFFER_SIZE;
@@ -179,7 +179,7 @@ static void ramo_flush_i(FrtOutStream *os, const frt_uchar *src, int len) {
     }
 }
 
-static void ramo_seek_i(FrtOutStream *os, off_t pos) {
+static void ramo_seek_i(FrtOutStream *os, frt_off_t pos) {
     os->pointer = pos;
 }
 
@@ -248,7 +248,7 @@ static void rami_read_i(FrtInStream *is, frt_uchar *b, int len) {
     int offset = 0;
     int buffer_number, buffer_offset, bytes_in_buffer, bytes_to_copy;
     int remainder = len;
-    off_t start = is->d.pointer;
+    frt_off_t start = is->d.pointer;
     frt_uchar *buffer;
 
     while (remainder > 0) {
@@ -271,11 +271,11 @@ static void rami_read_i(FrtInStream *is, frt_uchar *b, int len) {
     is->d.pointer += len;
 }
 
-static off_t rami_length_i(FrtInStream *is) {
+static frt_off_t rami_length_i(FrtInStream *is) {
     return is->f->file.rf->len;
 }
 
-static void rami_seek_i(FrtInStream *is, off_t pos) {
+static void rami_seek_i(FrtInStream *is, frt_off_t pos) {
     is->d.pointer = pos;
 }
 

data/ext/isomorfeus_ferret_ext/frt_store.c

@@ -125,7 +125,7 @@ off_t frt_os_pos(FrtOutStream *os)
     return os->buf.start + os->buf.pos;
 }
 
-void frt_os_seek(FrtOutStream *os, off_t new_pos)
+void frt_os_seek(FrtOutStream *os, frt_off_t new_pos)
 {
     frt_os_flush(os);
     os->buf.start = new_pos;
@@ -202,9 +202,9 @@ FrtInStream *frt_is_new(void) {
  */
 static void is_refill(FrtInStream *is)
 {
-    off_t start = is->buf.start + is->buf.pos;
-    off_t last = start + FRT_BUFFER_SIZE;
-    off_t flen = is->m->length_i(is);
+    frt_off_t start = is->buf.start + is->buf.pos;
+    frt_off_t last = start + FRT_BUFFER_SIZE;
+    frt_off_t flen = is->m->length_i(is);
 
     if (last > flen) {          /* don't read past EOF */
         last = flen;
@@ -254,7 +254,7 @@ off_t frt_is_pos(FrtInStream *is)
 frt_uchar *frt_is_read_bytes(FrtInStream *is, frt_uchar *buf, int len)
 {
     int i;
-    off_t start;
+    frt_off_t start;
 
     if ((is->buf.pos + len) < is->buf.len) {
         for (i = 0; i < len; i++) {
@@ -273,7 +273,7 @@ frt_uchar *frt_is_read_bytes(FrtInStream *is, frt_uchar *buf, int len)
     return buf;
 }
 
-void frt_is_seek(FrtInStream *is, off_t pos) {
+void frt_is_seek(FrtInStream *is, frt_off_t pos) {
     if (pos >= is->buf.start && pos < (is->buf.start + is->buf.len)) {
         is->buf.pos = pos - is->buf.start;  /* seek within buffer */
     } else {
@@ -384,7 +384,7 @@ unsigned int frt_is_read_vint(FrtInStream *is)
 /* optimized to use unchecked read_byte if there is definitely space */
 off_t frt_is_read_voff_t(FrtInStream *is)
 {
-    register off_t res, b;
+    register frt_off_t res, b;
     register int shift = 7;
 
     if (is->buf.pos > (is->buf.len - VINT_MAX_LEN)) {
@@ -553,7 +553,7 @@ void frt_os_write_vint(FrtOutStream *os, register unsigned int num)
 }
 
 /* optimized to use an unchecked write if there is space */
-void frt_os_write_voff_t(FrtOutStream *os, register off_t num)
+void frt_os_write_voff_t(FrtOutStream *os, register frt_off_t num)
 {
     if (os->buf.pos > VINT_END) {
         while (num > 127) {

data/ext/isomorfeus_ferret_ext/frt_store.h

@@ -13,9 +13,9 @@
 typedef struct FrtBuffer
 {
     frt_uchar buf[FRT_BUFFER_SIZE];
-    off_t start;
-    off_t pos;
-    off_t len;
+    frt_off_t start;
+    frt_off_t pos;
+    frt_off_t len;
 } FrtBuffer;
 
 typedef struct FrtOutStream FrtOutStream;
@@ -38,7 +38,7 @@ struct FrtOutStreamMethods {
      * @param pos the position to seek in the stream
      * @raise FRT_IO_ERROR if there is an error seeking in the output stream
      */
-    void (*seek_i)(struct FrtOutStream *os, off_t pos);
+    void (*seek_i)(struct FrtOutStream *os, frt_off_t pos);
 
     /**
      * Close any resources used by the output stream +os+
@@ -54,7 +54,7 @@ typedef struct FrtRAMFile
     char        *name;
     frt_uchar   **buffers;
     int         bufcnt;
-    off_t       len;
+    frt_off_t       len;
     _Atomic unsigned int ref_cnt;
 } FrtRAMFile;
 
@@ -66,7 +66,7 @@ struct FrtOutStream
         int fd;
         FrtRAMFile *rf;
     } file;
-    off_t  pointer;             /* only used by RAMOut */
+    frt_off_t  pointer;             /* only used by RAMOut */
     const struct FrtOutStreamMethods *m;
 };
 
@@ -95,7 +95,7 @@ struct FrtInStreamMethods
      * @param pos the position to seek
      * @raise FRT_IO_ERROR if the seek fails
      */
-    void (*seek_i)(struct FrtInStream *is, off_t pos);
+    void (*seek_i)(struct FrtInStream *is, frt_off_t pos);
 
     /**
      * Returns the length of the input stream +is+
@@ -103,7 +103,7 @@ struct FrtInStreamMethods
      * @param is self
      * @raise FRT_IO_ERROR if there is an error getting the file length
      */
-    off_t (*length_i)(struct FrtInStream *is);
+    frt_off_t (*length_i)(struct FrtInStream *is);
 
     /**
      * Close the resources allocated to the inputstream +is+
@@ -126,7 +126,7 @@ struct FrtInStream {
     FrtBuffer buf;
     struct FrtInStreamFile *f;
     union {
-        off_t pointer;          /* only used by RAMIn */
+        frt_off_t pointer;      /* only used by RAMIn */
         char *path;             /* only used by FSIn */
         FrtCompoundInStream *cis;
     } d;
@@ -137,8 +137,8 @@ struct FrtInStream {
 struct FrtCompoundInStream
 {
     FrtInStream *sub;
-    off_t offset;
-    off_t length;
+    frt_off_t offset;
+    frt_off_t length;
 };
 
 #define frt_is_length(mis) mis->m->length_i(mis)
@@ -274,7 +274,7 @@ struct FrtStore {
      * @return the length of the file in bytes
      * @raise FRT_IO_ERROR if there is an error checking the file length
      */
-    off_t (*length)(FrtStore *store, const char *filename);
+    frt_off_t (*length)(FrtStore *store, const char *filename);
 
     /**
      * Allocate the resources needed for the output stream in the +store+ with
@@ -465,7 +465,7 @@ extern void frt_os_close(FrtOutStream *os);
  * @param os the FrtOutStream to get the position from
  * @return the current position in FrtOutStream +os+
  */
-extern off_t frt_os_pos(FrtOutStream *os);
+extern frt_off_t frt_os_pos(FrtOutStream *os);
 
 /**
  * Set the current position in FrtOutStream +os+.
@@ -474,7 +474,7 @@ extern off_t frt_os_pos(FrtOutStream *os);
  * @param pos the new position in the FrtOutStream
  * @raise FRT_IO_ERROR if there is a file-system IO error seeking the file
  */
-extern void frt_os_seek(FrtOutStream *os, off_t new_pos);
+extern void frt_os_seek(FrtOutStream *os, frt_off_t new_pos);
 
 /**
  * Write a single byte +b+ to the FrtOutStream +os+
@@ -541,14 +541,14 @@ extern void frt_os_write_u64(FrtOutStream *os, frt_u64 num);
 extern void frt_os_write_vint(FrtOutStream *os, register unsigned int num);
 
 /**
- * Write an unsigned off_t to FrtOutStream in compressed VINT format.
+ * Write an unsigned frt_off_t to FrtOutStream in compressed VINT format.
  * TODO: describe VINT format
  *
  * @param os FrtOutStream to write to
- * @param num the off_t to write
+ * @param num the frt_off_t to write
  * @raise FRT_IO_ERROR if there is an error writing to the file-system
  */
-extern void frt_os_write_voff_t(FrtOutStream *os, register off_t num);
+extern void frt_os_write_voff_t(FrtOutStream *os, register frt_off_t num);
 
 /**
  * Write an unsigned 64bit int to FrtOutStream in compressed VINT format.
@@ -591,7 +591,7 @@ extern void frt_os_write_string(FrtOutStream *os, const char *str);
  * @param is the FrtInStream to get the current position from
  * @return the current position within the FrtInStream +is+
  */
-extern off_t frt_is_pos(FrtInStream *is);
+extern frt_off_t frt_is_pos(FrtInStream *is);
 
 /**
  * Set the current position in FrtInStream +is+ to +pos+.
@@ -601,7 +601,7 @@ extern off_t frt_is_pos(FrtInStream *is);
  * @raise FRT_IO_ERROR if there is a error seeking from the file-system
  * @raise FRT_EOF_ERROR if there is an attempt to seek past the end of the file
  */
-extern void frt_is_seek(FrtInStream *is, off_t pos);
+extern void frt_is_seek(FrtInStream *is, frt_off_t pos);
 
 /**
  * Close the FrtInStream freeing all allocated resources.
@@ -705,15 +705,15 @@ extern unsigned int frt_is_read_vint(FrtInStream *is);
 extern void frt_is_skip_vints(FrtInStream *is, register int cnt);
 
 /**
- * Read a compressed (VINT) unsigned off_t from the FrtInStream.
+ * Read a compressed (VINT) unsigned frt_off_t from the FrtInStream.
  * TODO: describe VINT format
  *
  * @param is the FrtInStream to read from
- * @return a off_t
+ * @return a frt_off_t
  * @raise FRT_IO_ERROR if there is a error reading from the file-system
  * @raise FRT_EOF_ERROR if there is an attempt to read past the end of the file
  */
-extern off_t frt_is_read_voff_t(FrtInStream *is);
+extern frt_off_t frt_is_read_voff_t(FrtInStream *is);
 
 /**
  * Read a compressed (VINT) unsigned 64bit int from the FrtInStream.

data/ext/isomorfeus_ferret_ext/test_index.c

@@ -998,7 +998,7 @@ static void test_simulated_crashed_writer(TestCase *tc, void *data)
 {
     int i;
     long gen;
-    off_t length;
+    frt_off_t length;
     FrtStore *store = (FrtStore *)data;
     FrtIndexWriter *iw;
     FrtIndexReader *ir;
@@ -1059,7 +1059,7 @@ static void test_simulated_corrupt_index1(TestCase *tc, void *data)
 {
     int i;
     long gen;
-    off_t length;
+    frt_off_t length;
     FrtStore *store = (FrtStore *)data;
     FrtIndexWriter *iw;
     FrtIndexReader *ir;

data/lib/isomorfeus/ferret/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Ferret
-    VERSION = '0.13.9'
+    VERSION = '0.13.10'
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-ferret
 version: !ruby/object:Gem::Version
-  version: 0.13.9
+  version: 0.13.10
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-04 00:00:00.000000000 Z
+date: 2022-05-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement