isomorfeus-ferret 0.17.2 → 0.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d39decdeae08fb0fa83f242e3162938e10a9a7549ba3efcc1f5fbb06238e695
-  data.tar.gz: 89679c3ca82432887764672840965ddcc7633ea64ee5e79c92fbd4a9615e6771
+  metadata.gz: fb825b23a8f4d4422995bd20a52c24fd554c552352ba47e1af7059af60cacd33
+  data.tar.gz: 565707f28c6ea121d2c37b77c95d9a63f4c9a6ec663c5c0c96f59c499ca26f84
 SHA512:
-  metadata.gz: 84b855487d6c7c390be71b36398f38ef016459773f0bd0412b79953ed752acef3a8584a43c455721c145ca95e4f384bee070d20baa25b709ed641cbb8db9ba2d
-  data.tar.gz: a229b8f4d6e93ad9b98d8ea87bff6ae124cc75d789302609a2994149264dc1d28f28bde4a24e389b0ee28d935a6b42a7c8671ed2e75ea42db026bd01769ac817
+  metadata.gz: 3f907b655cdb94f7b69422da855b0972229cf37170e4ede27ded73ae46c77f7e16745e5d1a86856e40bc4e73dda042dccd921fd3f2757e76b8ffbedffa33bbdb
+  data.tar.gz: ab559729203ecc983ab1fb32e8efa584110e4d5ea30f0ddacead13613138453287370244a4845dc01df222c5e0685537468f16a90a3c271e28b69fb8b95e5f58

data/ext/isomorfeus_ferret_ext/benchmark.c

@@ -1,6 +1,4 @@
 #include <unistd.h>
-#include <string.h>
-#include "ruby.h"
 #include "frt_global.h"
 #include "benchmark.h"
 #include "benchmarks_all.h"
@@ -13,14 +11,12 @@ static VALUE mBenchmark;
 
 #define RUSAGE_SELF		0
 
-struct rusage
-{
+struct rusage {
 	struct timeval ru_utime;	/* user time used */
 	struct timeval ru_stime;	/* system time used */
 };
 
-int getrusage(int who, struct rusage *rusage)
-{
+int getrusage(int who, struct rusage *rusage) {
 	FILETIME	starttime;
 	FILETIME	exittime;
 	FILETIME	kerneltime;
@@ -58,8 +54,7 @@ int getrusage(int who, struct rusage *rusage)
 #include <sys/resource.h>
 #endif
 
-static int bmtcmp(const void *p1, const void *p2)
-{
+static int bmtcmp(const void *p1, const void *p2) {
     BenchMarkTimes *bmt1 = *(BenchMarkTimes **)p1;
     BenchMarkTimes *bmt2 = *(BenchMarkTimes **)p2;
 
@@ -68,8 +63,7 @@ static int bmtcmp(const void *p1, const void *p2)
     else return 0;
 }
 
-void bm_add(BenchMark *benchmark, bm_run_ft run, const char *name)
-{
+void bm_add(BenchMark *benchmark, bm_run_ft run, const char *name) {
     BenchMarkUnit *unit =
         (BenchMarkUnit *)frt_emalloc(sizeof(BenchMarkUnit) +
                                  benchmark->count * sizeof(BenchMarkTimes *));
@@ -84,14 +78,12 @@ void bm_add(BenchMark *benchmark, bm_run_ft run, const char *name)
     }
     if (benchmark->tail) {
         benchmark->tail = benchmark->tail->next = unit;
-    }
-    else {
+    } else {
         benchmark->tail = benchmark->head = unit;
     }
 }
 
-static void bm_clear(BenchMark *benchmark)
-{
+static void bm_clear(BenchMark *benchmark) {
     BenchMarkUnit *unit, *next = benchmark->head;
     while (NULL != (unit = next)) {
         next = unit->next;
@@ -111,8 +103,7 @@ static void bm_clear(BenchMark *benchmark)
   ((double)after.tv_sec  + ((double)after.tv_usec/1000000)) - \
   ((double)before.tv_sec + ((double)before.tv_usec/1000000))
 
-static void bm_single_run(BenchMarkUnit *unit, BenchMarkTimes *bm_times)
-{
+static void bm_single_run(BenchMarkUnit *unit, BenchMarkTimes *bm_times) {
     struct timeval tv_before, tv_after;
     struct rusage ru_before, ru_after;
 
@@ -134,8 +125,7 @@ static void bm_single_run(BenchMarkUnit *unit, BenchMarkTimes *bm_times)
 #define DO_SETUP(bm) if (bm->setup) bm->setup();
 #define DO_TEARDOWN(bm) if (bm->teardown) bm->teardown();
 
-static void bm_run(BenchMark *benchmark)
-{
+static void bm_run(BenchMark *benchmark) {
     int i;
     BenchMarkUnit *unit;
     int max_name_len = 0;
@@ -171,8 +161,7 @@ static void bm_run(BenchMark *benchmark)
             unit->final_times.stime = stime/result_count;
             unit->final_times.rtime = rtime/result_count;
         }
-    }
-    else {
+    } else {
         DO_SETUP(benchmark);
         for (unit = benchmark->head; unit; unit = unit->next) {
             bm_single_run(unit, &(unit->final_times));

data/ext/isomorfeus_ferret_ext/benchmarks_all.h

@@ -10,8 +10,7 @@ void bm_hash_implementations(BenchMark *bm);
 void bm_specialized_string_hash(BenchMark *bm);
 void bm_bitvector_implementations(BenchMark *bm);
 
-const struct BenchMarkList
-{
+const struct BenchMarkList {
     void (*initialize)(BenchMark *benchmark);
     const char *name;
 } all_benchmarks[] = {

data/ext/isomorfeus_ferret_ext/bm_hash.c

@@ -61,8 +61,7 @@ static FrtHashEntry *h_lookup_str(FrtHash *ht, register const void *key) {
     }
     if (he->key == dummy_key) {
         freeslot = he;
-    }
-    else {
+    } else {
         if ((he->hash == hash)
             && 0 == strcmp((const char *)he->key, (const char *)key)) {
             return he;

data/ext/isomorfeus_ferret_ext/brotli_dec_decode.c

@@ -2033,8 +2033,10 @@ static BROTLI_NOINLINE BrotliDecoderErrorCode SafeProcessCommands(
 }
 
 BrotliDecoderResult BrotliDecoderDecompress(
-    size_t encoded_size, const uint8_t* encoded_buffer, size_t* decoded_size,
-    uint8_t* decoded_buffer) {
+    size_t encoded_size,
+    const uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(encoded_size)],
+    size_t* decoded_size,
+    uint8_t decoded_buffer[BROTLI_ARRAY_PARAM(*decoded_size)]) {
   BrotliDecoderState s;
   BrotliDecoderResult result;
   size_t total_out = 0;

data/ext/isomorfeus_ferret_ext/brotli_enc_encode.c

@@ -1470,8 +1470,9 @@ static size_t MakeUncompressedStream(
 
 BROTLI_BOOL BrotliEncoderCompress(
     int quality, int lgwin, BrotliEncoderMode mode, size_t input_size,
-    const uint8_t* input_buffer, size_t* encoded_size,
-    uint8_t* encoded_buffer) {
+    const uint8_t input_buffer[BROTLI_ARRAY_PARAM(input_size)],
+    size_t* encoded_size,
+    uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(*encoded_size)]) {
   BrotliEncoderState* s;
   size_t out_size = *encoded_size;
   const uint8_t* input_start = input_buffer;

data/ext/isomorfeus_ferret_ext/frb_analysis.c

@@ -499,7 +499,7 @@ static FrtToken *cwrts_next(FrtTokenStream *ts) {
     return frb_set_token(&(ts->token), rtoken);
 }
 
-static FrtTokenStream *cwrts_reset(FrtTokenStream *ts, char *text, rb_encoding *encoding) {
+static FrtTokenStream *cwrts_reset(FrtTokenStream *ts, const char *text, rb_encoding *encoding) {
     ts->t = ts->text = text;
     ts->length = strlen(text);
     ts->encoding = encoding;
@@ -643,7 +643,7 @@ static FrtToken *rets_next(FrtTokenStream *ts) {
     }
 }
 
-static FrtTokenStream *rets_reset(FrtTokenStream *ts, char *text, rb_encoding *encoding) {
+static FrtTokenStream *rets_reset(FrtTokenStream *ts, const char *text, rb_encoding *encoding) {
     frt_ts_reset(ts, text, encoding);
     RETS(ts)->curr_ind = 0;
     return ts;
@@ -1139,7 +1139,7 @@ static void cwa_destroy_i(FrtAnalyzer *a) {
     free(a);
 }
 
-static FrtTokenStream *cwa_get_ts(FrtAnalyzer *a, ID field, char *text, rb_encoding *encoding) {
+static FrtTokenStream *cwa_get_ts(FrtAnalyzer *a, ID field, const char *text, rb_encoding *encoding) {
     VALUE rstr = rb_str_new_cstr(text);
     rb_enc_associate(rstr, encoding);
     VALUE rts = rb_funcall(CWA(a)->ranalyzer, id_token_stream, 2, rb_str_new_cstr(rb_id2name(field)), rstr);
@@ -1277,8 +1277,7 @@ static VALUE frb_letter_analyzer_init(int argc, VALUE *argv, VALUE self) {
 }
 
 static VALUE
-get_rstopwords(const char **stop_words)
-{
+get_rstopwords(const char **stop_words) {
     char **w = (char **)stop_words;
     VALUE rstopwords = rb_ary_new();
 

data/ext/isomorfeus_ferret_ext/frb_field_info.c

@@ -41,16 +41,15 @@ void frb_fi_get_params(VALUE roptions, unsigned int *bits, float *boost) {
     v = rb_hash_aref(roptions, sym_compression);
     if (Qnil != v) Check_Type(v, T_SYMBOL);
     if (v == sym_no || v == sym_false || v == Qfalse) {
-        *bits &= ~FRT_FI_IS_COMPRESSED_BM;
         *bits &= ~FRT_FI_COMPRESSION_BROTLI_BM;
         *bits &= ~FRT_FI_COMPRESSION_BZ2_BM;
         *bits &= ~FRT_FI_COMPRESSION_LZ4_BM;
     } else if (v == sym_yes || v == sym_true || v == Qtrue || v == sym_brotli) {
-        *bits |= FRT_FI_IS_COMPRESSED_BM | FRT_FI_COMPRESSION_BROTLI_BM;
+        *bits |= FRT_FI_COMPRESSION_BROTLI_BM;
     } else if (v == sym_bz2) {
-        *bits |= FRT_FI_IS_COMPRESSED_BM | FRT_FI_COMPRESSION_BZ2_BM;
+        *bits |= FRT_FI_COMPRESSION_BZ2_BM;
     } else if (v == sym_lz4) {
-        *bits |= FRT_FI_IS_COMPRESSED_BM | FRT_FI_COMPRESSION_LZ4_BM;
+        *bits |= FRT_FI_COMPRESSION_LZ4_BM;
     } else if (v == Qnil) {
         /* leave as default */
     } else {