isomorfeus-ferret 0.13.0 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be4c84d556459a8ed5d2585068378c156bdb2d68507ca2786844b2c69a4e7f35
-  data.tar.gz: '0096ef29b274ea39567e876d95d8441ff80589a8d3403c5aed3801c62377cffd'
+  metadata.gz: 958c051fa7f771e25ee1fb29c47aad9ab1cd7a570750f73450ae582474ef6fb5
+  data.tar.gz: beba6b22ba7493f324be38997fee4f4a56efc896281fcbb2f3521ebef6795029
 SHA512:
-  metadata.gz: 55aa9f39fd4971e1a80bbcdeba14906928140fd023a7ee3e581ef2bafc63a8a664f5b0fbaf86dec1119ac62fd441703d33a4b6ee3731f811736a1b2eedcef9a3
-  data.tar.gz: 3843bd29450fb925069733913aee9f66958dfe41aba052d7d14a18cb7f2d4df376e0756d7c97bcd01527120a6a77776d9bee2a1c0a488648fc61f500dfe6e98e
+  metadata.gz: 98bef5c79e3d4e8854d6a4cb68e2cb796c6f27bbaf1c7b7669ab895e8656d12d033651f8d8b29ac8d7504b46dba7567aa52f2ac297285ff2c6c62e52c48d0019
+  data.tar.gz: 165497f356ab32cdc6250b3eada43d9ec36d61ee992114bffa9c38372c7894455caeb95aa789cf025c2538c7f9e1eddafe87e66b58536424a4c8e116a123af88

data/README.md

@@ -26,7 +26,7 @@ It should work on *nixes, *nuxes, *BSDs and also works on Windows.
 - The :store option no longer accepts :compress, compression must now be specified by the separate :compress options (see below).
 - The ASCII-specific Tokenizers and Analyzers have been removed
 
-### Sring Encoding support
+### String Encoding support
 
 #### Input strings and stored fields
 
@@ -37,12 +37,13 @@ All Ruby string encodings are supported.
 When fields are stored, they are now stored with the encoding, so that when they are retrieved again, they
 retain the original encoding with positions matching the string in its original encoding.
 
-#### Tokens and Filters
+#### Tokens, Terms, Filters and Queries
 
 Tokens are internally converted to UTF-8, which may change their length compared to their original encoding,
-yet they retain position information according to the source in its original encoding.
-The benefit is, that Filters, Stemmers or anything else working with Tokens only needs to support UTF-8 encoding,
-greatly simplifying things and ensuring consistent query results.
+yet they retain position information according to the source in its original encoding. Terms are likewise stored in UTF-8 encoding.
+Queries are converted to UTF-8 encoding too.
+The benefit is, that Filters, Stemmers or anything else working with Tokens and Terms only needs to support UTF-8 encoding,
+greatly simplifying things and ensuring consistent query results, independent of source encoding.
 
 ### Compression
 
@@ -50,6 +51,7 @@ Compression semantics have changed, now Brotli, BZip2 and LZ4 compression codecs
 - BZip2: slow compression, slow decompression, high compression ratio
 - Brotli: slow compression, fast decrompression, high compression ratio, recommended for general purpose.
 - LZ4: fast compression, fast decrompression, low compression ratio
+
 To see performance and compression ratios `rake ferret_compression_bench` can be run from the cloned repo.
 It uses data and code within the misc/ferret_vs_lucene directory.
 
@@ -96,6 +98,7 @@ Ensure your locale is set to C.UTF-8, because the internal c tests don't know ho
 
 ## Benchmarks
 
+### Indexing and Searching
 - clone repo
 - bundle install
 - rake ferret_vs_lucene
@@ -104,20 +107,37 @@ A recent Java JDK must be installed to compile and run lucene benchmarks.
 
 Results on Linux:
 ```
-Ferret:
-Indexing Secs: 7.36  Docs: 19043, 2587 docs/s
-Searching took: 0.3366296s for 8000 queries
-thats 23765 q/s
-
-Lucene:
-Indexing Secs: 4.22  Docs: 19043, 4516 docs/s
-Searching took: 1.48s for 8000 queries
-thats 5420 q/s
----------------------------------------------------
-Lucene 9.0.0 0b18b3b965cedaf5eb129aa41243a44c83ca826d - jpountz - 2021-12-01 14:23:49
-JVM 17.0.1 (Private Build)
+Ferret 0.13.0:
+Indexing: 9.35 secs, Docs: 19043, 2035 docs/s
+Searching took: 0.3133133s for 8000 queries
+thats 25533 q/s
+Total found: 42000
+Index size: 28Mb
+
+Lucene 9.1.0:
+Indexing: 4.20 secs, Docs: 19043, 4538 docs/s
+Searching took: 1.64s for 8000 queries
+thats 4875 q/s
+Total found: 41000
+index size: 35Mb
+
+JVM 11.0.14.1 (Ubuntu)
 ```
 
+### Storing Fields with Compression, Indexing and Retrieval
+- clone repo
+- bundle install
+- rake ferret_compression_benchmark
+
+Results on Linux, 0.13.0:
+
+| Compression | Index & Store | Retrieve      | Index size |
+|-------------|---------------|---------------|------------|
+| none        |   2008 docs/s | 153853 docs/s |      43 MB |
+| brotli      |   1726 docs/s |  58315 docs/s |      36 MB |
+| bzip2       |   1438 docs/s |  15382 docs/s |      38 MB |
+| lz4         |   1932 docs/s | 127100 docs/s |      41 MB |
+
 ## Future
 
 Lots of things to do:

data/ext/isomorfeus_ferret_ext/frb_index.c

@@ -64,6 +64,7 @@ static ID id_fld_num_map;
 static ID id_field_num;
 static ID id_boost;
 
+extern rb_encoding *utf8_encoding;
 extern void frb_set_term(VALUE rterm, FrtTerm *t);
 extern FrtAnalyzer *frb_get_cwrapped_analyzer(VALUE ranalyzer);
 extern VALUE frb_get_analyzer(FrtAnalyzer *a);
@@ -181,8 +182,9 @@ static VALUE frb_get_field_info(FrtFieldInfo *fi) {
             fi->rfi = TypedData_Wrap_Struct(cFieldInfo, &frb_field_info_t, fi);
             FRT_REF(fi);
         }
+        return fi->rfi;
     }
-    return fi->rfi;
+    return Qnil;
 }
 
 /*
@@ -411,8 +413,9 @@ static VALUE frb_get_field_infos(FrtFieldInfos *fis) {
             fis->rfis = TypedData_Wrap_Struct(cFieldInfos, &frb_field_infos_t, fis);
             FRT_REF(fis);
         }
+        return fis->rfis;
     }
-    return fis->rfis;
+    return Qnil;
 }
 
 /*
@@ -496,11 +499,6 @@ static VALUE frb_fis_get(VALUE self, VALUE ridx) {
         case T_STRING:
             rfi = frb_get_field_info(frt_fis_get_field(fis, frb_field(ridx)));
             break;
-            /*
-        case T_STRING:
-            rfi = frb_get_field_info(frt_fis_get_field(fis, StringValuePtr(ridx)));
-            break;
-            */
         default:
             rb_raise(rb_eArgError, "Can't index FieldInfos with %s",
                      rs2s(rb_obj_as_string(ridx)));
@@ -1219,6 +1217,7 @@ static VALUE frb_get_tv_term(FrtTVTerm *tv_term) {
     VALUE rtext;
     VALUE rpositions = Qnil;
     rtext = rb_str_new2(tv_term->text);
+    rb_enc_associate(rtext, utf8_encoding);
     if (tv_term->positions) {
         int *positions = tv_term->positions;
         rpositions = rb_ary_new2(freq);
@@ -1697,10 +1696,9 @@ frb_iw_delete(VALUE self, VALUE rfield, VALUE rterm)
  *  Get the FieldInfos object for this FrtIndexWriter. This is useful if you need
  *  to dynamically add new fields to the index with specific properties.
  */
-static VALUE
-frb_iw_field_infos(VALUE self)
-{
-    FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
+static VALUE frb_iw_field_infos(VALUE self) {
+    FrtIndexWriter *iw;
+    TypedData_Get_Struct(self, FrtIndexWriter, &frb_index_writer_t, iw);
     return frb_get_field_infos(iw->fis);
 }
 
@@ -2715,10 +2713,9 @@ frb_ir_fields(VALUE self)
  *
  *  Get the FieldInfos object for this IndexReader.
  */
-static VALUE
-frb_ir_field_infos(VALUE self)
-{
-    FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
+static VALUE frb_ir_field_infos(VALUE self) {
+    FrtIndexReader *ir;
+    TypedData_Get_Struct(self, FrtIndexReader, &frb_index_reader_t, ir);
     return frb_get_field_infos(ir->fis);
 }
 
@@ -3085,10 +3082,6 @@ static void Init_TermDocEnum(void) {
     rb_define_method(cTermDocEnum, "to_json",        frb_tde_to_json, -1);
 }
 
-/* rdochack
-cTermVector = rb_define_class_under(mIndex, "TermVector", rb_cObject);
-*/
-
 /*
  *  Document-class: Ferret::Index::TermVector::TVOffsets
  *
@@ -3107,9 +3100,6 @@ cTermVector = rb_define_class_under(mIndex, "TermVector", rb_cObject);
  */
 static void Init_TVOffsets(void) {
     const char *tv_offsets_class = "TVOffsets";
-    /* rdochack
-    cTVOffsets = rb_define_class_under(cTermVector, "TVOffsets", rb_cObject);
-    */
     cTVOffsets = rb_struct_define(tv_offsets_class, "start", "end", NULL);
     rb_set_class_path(cTVOffsets, cTermVector, tv_offsets_class);
     rb_const_set(mIndex, rb_intern(tv_offsets_class), cTVOffsets);
@@ -3130,13 +3120,8 @@ static void Init_TVOffsets(void) {
  *    tv_term = tv.find {|tvt| tvt.term = "fox"}
  *    offsets = tv_term.positions.collect {|pos| tv.offsets[pos]}
  */
-static void
-Init_TVTerm(void)
-{
+static void Init_TVTerm(void) {
     const char *tv_term_class = "TVTerm";
-    /* rdochack
-    cTVTerm = rb_define_class_under(cTermVector, "TVTerm", rb_cObject);
-    */
     cTVTerm = rb_struct_define(tv_term_class, "text", "freq", "positions", NULL);
     rb_set_class_path(cTVTerm, cTermVector, tv_term_class);
     rb_const_set(mIndex, rb_intern(tv_term_class), cTVTerm);
@@ -3172,15 +3157,9 @@ Init_TVTerm(void)
  *  particular that you need to store both positions and offsets if you want
  *  to associate offsets with particular terms.
  */
-static void
-Init_TermVector(void)
-{
+static void Init_TermVector(void) {
     const char *tv_class = "TermVector";
-    /* rdochack
-    cTermVector = rb_define_class_under(mIndex, "TermVector", rb_cObject);
-    */
-    cTermVector = rb_struct_define(tv_class,
-                                   "field", "terms", "offsets", NULL);
+    cTermVector = rb_struct_define(tv_class, "field", "terms", "offsets", NULL);
     rb_set_class_path(cTermVector, mIndex, tv_class);
     rb_const_set(mIndex, rb_intern(tv_class), cTermVector);
 

data/ext/isomorfeus_ferret_ext/frt_global.c

@@ -232,71 +232,6 @@ void frt_dummy_free(void *p) {
     (void)p; /* suppress unused argument warning */
 }
 
-#ifdef HAVE_GDB
-#define CMD_BUF_SIZE (128 + FILENAME_MAX)
-/* need to declare this as it is masked by default in linux */
-
-static char *build_shell_command(void) {
-    int   pid = getpid();
-    char *buf = FRT_ALLOC_N(char, CMD_BUF_SIZE);
-    char *command =
-        "gdb -quiet -ex='bt' -ex='quit' %s %d 2>/dev/null | grep '^[ #]'";
-
-    snprintf(buf, CMD_BUF_SIZE, command, frt_progname(), pid);
-    return buf;
-}
-
-#endif
-
-/**
- * Call out to gdb to get our stacktrace.
- */
-char *frt_get_stacktrace(void) {
-#ifdef HAVE_GDB
-    FILE *stream;
-    char *gdb_filename = NULL, *buf = NULL, *stack = NULL;
-    int   offset = -FRT_BUFFER_SIZE;
-
-    if ( !(buf = build_shell_command()) ) {
-        fprintf(EXCEPTION_STREAM,
-                "Unable to build stacktrace shell command\n");
-        goto cleanup;
-    }
-
-    if ( !(stream = popen(buf, "r")) ) {
-        fprintf(EXCEPTION_STREAM,
-                "Unable to exec stacktrace shell command: '%s'\n", buf);
-        goto cleanup;
-    }
-
-    do {
-        offset += FRT_BUFFER_SIZE;
-        FRT_REALLOC_N(stack, char, offset + FRT_BUFFER_SIZE);
-        FRT_ZEROSET_N(stack + offset, char, FRT_BUFFER_SIZE);
-    } while(fread(stack + offset, 1, FRT_BUFFER_SIZE, stream) == FRT_BUFFER_SIZE);
-
-    pclose(stream);
-
- cleanup:
-    if (gdb_filename) free(gdb_filename);
-    if (buf) free(buf);
-    return stack;
-#else
-    return NULL;
-#endif
-}
-
-void frt_print_stacktrace(void) {
-    char *stack = frt_get_stacktrace();
-
-    if (stack) {
-        fprintf(EXCEPTION_STREAM, "Stack trace:\n%s", stack);
-        free(stack);
-    } else {
-        fprintf(EXCEPTION_STREAM, "Stack trace not available\n");
-    }
-}
-
 typedef struct FreeMe {
     void *p;
     frt_free_ft free_func;
@@ -321,55 +256,7 @@ void frt_register_for_cleanup(void *p, frt_free_ft free_func) {
     free_me->free_func = free_func;
 }
 
-#define MAX_PROG_NAME 200
-static char name[MAX_PROG_NAME]; /* program name for error msgs */
-
-/* frt_setprogname: set stored name of program */
-void frt_setprogname(const char *str) {
-    strncpy(name, str, sizeof(name) - 1);
-}
-
-const char *frt_progname(void) {
-    return name;
-}
-
-static const char *signal_to_string(int signum) {
-    switch (signum)
-    {
-        case SIGILL:  return "SIGILL";
-        case SIGABRT: return "SIGABRT";
-        case SIGFPE:  return "SIGFPE";
-#if !defined POSH_OS_WIN32 && !defined POSH_OS_WIN64
-        case SIGBUS:  return "SIGBUS";
-#endif
-        case SIGSEGV: return "SIGSEGV";
-    }
-
-    return "Unknown Signal";
-}
-
-static void sighandler_crash(int signum) {
-    frt_print_stacktrace();
-    FRT_XEXIT("Signal", "Exiting on signal %s (%d)", signal_to_string(signum), signum);
-}
-
-#define SETSIG_IF_UNSET(sig, handler) do { \
-    signal(sig, handler);                  \
-} while(0)
-
 void frt_init(int argc, const char *const argv[]) {
-    if (argc > 0) {
-        frt_setprogname(argv[0]);
-    }
-
-    SETSIG_IF_UNSET(SIGILL , sighandler_crash);
-    SETSIG_IF_UNSET(SIGABRT, sighandler_crash);
-    SETSIG_IF_UNSET(SIGFPE , sighandler_crash);
-#if !defined POSH_OS_WIN32 && !defined POSH_OS_WIN64
-    SETSIG_IF_UNSET(SIGBUS , sighandler_crash);
-#endif
-    SETSIG_IF_UNSET(SIGSEGV, sighandler_crash);
-
     atexit(&frt_hash_finalize);
 
     utf8_encoding = rb_enc_find("UTF-8");
@@ -429,41 +316,3 @@ void frt_init(int argc, const char *const argv[]) {
     FRT_SORT_FIELD_DOC_REV->compare = frt_sort_field_doc_compare; /* compare */
     FRT_SORT_FIELD_DOC_REV->get_val = frt_sort_field_doc_get_val; /* get_val */
 }
-
-/**
- * For general use when testing
- *
- * TODO wrap in #ifdef
- */
-
-static bool p_switch = false;
-static bool p_switch_tmp = false;
-
-void p(const char *format, ...) {
-    va_list args;
-
-    if (!p_switch) return;
-
-    va_start(args, format);
-    vfprintf(stderr, format, args);
-    va_end(args);
-}
-
-void p_on(void) {
-    fprintf(stderr, "> > > > > STARTING PRINT\n");
-    p_switch = true;
-}
-
-void p_off(void) {
-    fprintf(stderr, "< < < < < STOPPING PRINT\n");
-    p_switch = false;
-}
-
-void frt_p_pause(void) {
-    p_switch_tmp = p_switch;
-    p_switch = false;
-}
-
-void frt_p_resume(void) {
-    p_switch = p_switch_tmp;
-}

data/ext/isomorfeus_ferret_ext/frt_global.h

@@ -105,9 +105,6 @@ extern char *frt_dbl_to_s(char *buf, double num);
 extern char *frt_strfmt(const char *fmt, ...);
 extern char *frt_vstrfmt(const char *fmt, va_list args);
 
-extern char *frt_get_stacktrace();
-extern void  frt_print_stacktrace();
-
 extern void frt_register_for_cleanup(void *p, frt_free_ft free_func);
 
 /**
@@ -277,18 +274,6 @@ extern bool frt_x_do_logging;
 #endif
 
 extern void frt_init(int arc, const char *const argv[]);
-extern void frt_setprogname(const char *str);
-extern const char *frt_progname();
 extern void frt_micro_sleep(const int micro_seconds);
 
-/**
- * For general use during testing. Switch this on and off for print statements
- * to only print when p_on is called and not after p_off is called
- */
-extern void p(const char *format, ...);
-extern void p_on();
-extern void p_off();
-extern void frt_p_pause();
-extern void frt_p_resume();
-
 #endif

data/ext/isomorfeus_ferret_ext/frt_index.c

@@ -14,6 +14,7 @@
 #undef close
 #undef read
 
+extern rb_encoding *utf8_encoding;
 extern void frt_micro_sleep(const int micro_seconds);
 
 #define GET_LOCK(lock, name, store, err_msg) do {\
@@ -1710,8 +1711,7 @@ static FrtTermVector *frt_fr_read_term_vector(FrtFieldsReader *fr, int field_num
             total_len = delta_start + delta_len;
             frt_is_read_bytes(fdt_in, buffer + delta_start, delta_len);
             buffer[total_len++] = '\0';
-            term->text = (char *)memcpy(FRT_ALLOC_N(char, total_len),
-                                        buffer, total_len);
+            term->text = (char *)memcpy(FRT_ALLOC_N(char, total_len), buffer, total_len);
 
             /* read freq */
             freq = term->freq = frt_is_read_vint(fdt_in);
@@ -1822,8 +1822,7 @@ FrtTermVector *frt_fr_get_field_tv(FrtFieldsReader *fr, int doc_num, int field_n
  *
  ****************************************************************************/
 
-FrtFieldsWriter *frt_fw_open(FrtStore *store, const char *segment, FrtFieldInfos *fis)
-{
+FrtFieldsWriter *frt_fw_open(FrtStore *store, const char *segment, FrtFieldInfos *fis) {
     FrtFieldsWriter *fw = FRT_ALLOC(FrtFieldsWriter);
     char file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
     size_t segment_len = strlen(segment);
@@ -1844,8 +1843,7 @@ FrtFieldsWriter *frt_fw_open(FrtStore *store, const char *segment, FrtFieldInfos
     return fw;
 }
 
-void frt_fw_close(FrtFieldsWriter *fw)
-{
+void frt_fw_close(FrtFieldsWriter *fw) {
     frt_os_close(fw->fdt_out);
     frt_os_close(fw->fdx_out);
     frt_ram_destroy_buffer(fw->buffer);
@@ -2046,8 +2044,7 @@ void frt_fw_add_doc(FrtFieldsWriter *fw, FrtDocument *doc) {
     frt_ramo_write_to(fw->buffer, fdt_out);
 }
 
-void frt_fw_write_tv_index(FrtFieldsWriter *fw)
-{
+void frt_fw_write_tv_index(FrtFieldsWriter *fw) {
     int i;
     const int tv_cnt = frt_ary_size(fw->tv_fields);
     FrtOutStream *fdt_out = fw->fdt_out;
@@ -5548,9 +5545,24 @@ FrtHash *frt_dw_invert_field(FrtDocWriter *dw, FrtFieldInverter *fld_inv, FrtDoc
         for (i = 0; i < df_size; i++) {
             int len = df->lengths[i];
             char *data_ptr = df->data[i];
-            if (len > FRT_MAX_WORD_SIZE) {
-                len = FRT_MAX_WORD_SIZE - 1;
-                data_ptr = (char *)memcpy(buf, df->data[i], len);
+            if (df->encodings[i] == utf8_encoding) {
+                if (len >= FRT_MAX_WORD_SIZE) {
+                    len = FRT_MAX_WORD_SIZE - 1;  // TODO: this may invalidate mbc's
+                    data_ptr = (char *)memcpy(buf, df->data[i], len);
+                    buf[len] = '\0';
+                }
+            } else if (df->encodings[i] != utf8_encoding) {
+                if (len >= FRT_MAX_WORD_SIZE)
+                    len = FRT_MAX_WORD_SIZE - 1;
+                const unsigned char *sp = (unsigned char *)df->data[i];
+                unsigned char *dp = (unsigned char *)&buf;
+                rb_econv_t *ec = rb_econv_open(rb_enc_name(df->encodings[i]), "UTF-8", RUBY_ECONV_INVALID_REPLACE);
+                assert(ec != NULL);
+                rb_econv_convert(ec, &sp, (unsigned char *)df->data[i] + len, &dp, (unsigned char *)&buf + FRT_MAX_WORD_SIZE - 1, 0);
+                rb_econv_close(ec);
+                len = dp - (unsigned char *)&buf;
+                buf[len] = '\0';
+                data_ptr = buf;
             }
             dw_add_posting(mp, curr_plists, fld_plists, doc_num, data_ptr, len, i);
             if (store_offsets) {

data/ext/isomorfeus_ferret_ext/frt_lang.c

@@ -61,7 +61,6 @@ void FRT_VEXIT(const char *err_type, const char *fmt, va_list args)
 # endif
 {
     fflush(stdout);
-    fprintf(EXCEPTION_STREAM, "\n%s: ", frt_progname());
 
 # ifdef FRT_HAS_VARARGS
     fprintf(EXCEPTION_STREAM, "%s occurred at <%s>:%d in %s\n",
@@ -76,7 +75,6 @@ void FRT_VEXIT(const char *err_type, const char *fmt, va_list args)
     }
 
     fprintf(EXCEPTION_STREAM, "\n");
-    frt_print_stacktrace();
     if (frt_x_abort_on_exception) {
         exit(2);                 /* conventional value for failed execution */
     }

data/ext/isomorfeus_ferret_ext/frt_q_boolean.c

@@ -1286,6 +1286,7 @@ FrtBooleanClause *frt_bc_alloc(void) {
 FrtBooleanClause *frt_bc_init(FrtBooleanClause *self, FrtQuery *query, FrtBCType occur) {
     self->ref_cnt = 1;
     self->query = query;
+    self->rbc = Qnil;
     frt_bc_set_occur(self, occur);
     return self;
 }

data/ext/isomorfeus_ferret_ext/isomorfeus_ferret.c

@@ -250,9 +250,7 @@ void Init_Ferret(void) {
 }
 
 void Init_isomorfeus_ferret_ext(void) {
-    const char *const progname[] = {"ruby"};
-
-    frt_init(1, progname);
+    frt_init(0, NULL);
 
     /* IDs */
     id_new = rb_intern("new");

data/ext/isomorfeus_ferret_ext/test.c

@@ -279,22 +279,10 @@ static void append_to_msg_buf(const char *fmt, ...)
     va_end(args);
 }
 
-
-static void Tstack(void) {
-    if (show_stack) {
-        char *stack = frt_get_stacktrace();
-        if (stack) {
-            append_to_msg_buf("\n\nStack trace:\n%s\n", stack);
-            free(stack);
-        }
-    }
-}
-
 static void vTmsg_nf(const char *fmt, va_list args)
 {
     if (verbose) {
         vappend_to_msg_buf(fmt, args);
-        Tstack();
     }
 }
 
@@ -305,8 +293,6 @@ void vTmsg(const char *fmt, va_list args)
         vappend_to_msg_buf(fmt, args);
         va_end(args);
         append_to_msg_buf("\n");
-
-        Tstack();
     }
 }
 
@@ -348,8 +334,6 @@ void tst_msg(const char *func, const char *fname, int line_num, const char *fmt,
         va_start(args, fmt);
         vappend_to_msg_buf(fmt, args);
         va_end(args);
-
-        Tstack();
     }
 }
 

data/ext/isomorfeus_ferret_ext/test_global.c

@@ -145,50 +145,6 @@ static void test_dbl_to_s(TestCase *tc, void *data)
     Asequal("NaN", frt_dbl_to_s(buf, NAN));
 }
 
-
-/**
- * Generate a stacktrace, make sure it does something
- */
-static void test_stacktrace(TestCase *tc, void *data)
-{
-    FILE *old_stream = frt_x_exception_stream;
-    (void)data; /* suppress warning */
-    int tfd = fio_tmpfile();
-    frt_x_exception_stream = fdopen(tfd, "w+");
-    Atrue(frt_x_exception_stream != NULL);
-    if (frt_x_exception_stream) {
-        frt_print_stacktrace();
-        long int f = ftell(frt_x_exception_stream);
-        Assert(f, "Stream position should not be 0");
-        fclose(frt_x_exception_stream);
-    }
-    frt_x_exception_stream = old_stream;
-}
-
-/**
- * Generate a normally fatal signal, which gets caught
- */
- /*
-static void test_sighandler(TestCase *tc, void *data)
-{
-    bool  old_abort = frt_x_abort_on_exception;
-    FILE *old_stream = frt_x_exception_stream;
-    (void)data;
-    (void)tc;
-
-    frt_x_exception_stream = false;
-    frt_x_exception_stream = tmpfile();
-
-    raise(SIGSEGV);
-
-    Assert(ftell(frt_x_exception_stream), "Stream position should not be 0");
-    fclose(frt_x_exception_stream);
-
-    frt_x_exception_stream = old_stream;
-    frt_x_abort_on_exception = old_abort;
-}
-*/
-
 static void test_count_leading_zeros(TestCase *tc, void *data)
 {
     (void)data;
@@ -284,8 +240,6 @@ TestSuite *ts_global(TestSuite *suite)
     tst_run_test(suite, test_alloc, NULL);
     tst_run_test(suite, test_strfmt, NULL);
     tst_run_test(suite, test_dbl_to_s, NULL);
-    tst_run_test(suite, test_stacktrace, NULL);
-    // tst_run_test(suite, test_sighandler, NULL);
     tst_run_test(suite, test_count_leading_zeros, NULL);
     tst_run_test(suite, test_count_leading_ones, NULL);
     tst_run_test(suite, test_count_trailing_zeros, NULL);

data/ext/isomorfeus_ferret_ext/test_search.c

@@ -266,7 +266,6 @@ void tst_check_hits(TestCase *tc, FrtSearcher *searcher, FrtQuery *query, const
     int i, count;
     int total_hits = s2l(expected_hits, num_array);
     FrtTopDocs *top_docs = frt_searcher_search(searcher, query, 0, total_hits + 1, NULL, NULL, NULL);
-    frt_p_pause();
     if (!tc->failed && !Aiequal(total_hits, top_docs->total_hits)) {
         int i;
         Tmsg_nf("\texpected docs:\n\t    ");
@@ -314,7 +313,6 @@ void tst_check_hits(TestCase *tc, FrtSearcher *searcher, FrtQuery *query, const
         count = frt_searcher_search_unscored(searcher, query, num_array2, ARRAY_SIZE, num_array2[3]);
         Aaiequal(num_array + 3, num_array2, count);
     }
-    frt_p_resume();
 }
 
 void check_match_vector(TestCase *tc, FrtSearcher *searcher, FrtQuery *query,

data/lib/isomorfeus/ferret/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Ferret
-    VERSION = '0.13.0'
+    VERSION = '0.13.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-ferret
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.3
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-16 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -154,13 +154,13 @@ files:
 - ext/isomorfeus_ferret_ext/brotli_encode.h
 - ext/isomorfeus_ferret_ext/brotli_port.h
 - ext/isomorfeus_ferret_ext/brotli_types.h
-- ext/isomorfeus_ferret_ext/bzip_blocksort.c
-- ext/isomorfeus_ferret_ext/bzip_huffman.c
 - ext/isomorfeus_ferret_ext/bzlib.c
 - ext/isomorfeus_ferret_ext/bzlib.h
+- ext/isomorfeus_ferret_ext/bzlib_blocksort.c
 - ext/isomorfeus_ferret_ext/bzlib_compress.c
 - ext/isomorfeus_ferret_ext/bzlib_crctable.c
 - ext/isomorfeus_ferret_ext/bzlib_decompress.c
+- ext/isomorfeus_ferret_ext/bzlib_huffman.c
 - ext/isomorfeus_ferret_ext/bzlib_private.h
 - ext/isomorfeus_ferret_ext/bzlib_randtable.c
 - ext/isomorfeus_ferret_ext/extconf.rb