isomorfeus-ferret 0.17.2 → 0.17.3

data/ext/isomorfeus_ferret_ext/frt_q_phrase.c

@@ -61,8 +61,7 @@ static bool pp_next(PhPos *self) {
     return true;
 }
 
-static bool pp_skip_to(PhPos *self, int doc_num)
-{
+static bool pp_skip_to(PhPos *self, int doc_num) {
     FrtTermDocEnum *tpe = self->tpe;
     assert(tpe);
 
@@ -77,8 +76,7 @@ static bool pp_skip_to(PhPos *self, int doc_num)
     return true;
 }
 
-static bool pp_next_position(PhPos *self)
-{
+static bool pp_next_position(PhPos *self) {
     FrtTermDocEnum *tpe = self->tpe;
     self->count--;
     if (self->count >= 0) {         /* read subsequent pos's */
@@ -89,16 +87,14 @@ static bool pp_next_position(PhPos *self)
     }
 }
 
-static bool pp_first_position(PhPos *self)
-{
+static bool pp_first_position(PhPos *self) {
     FrtTermDocEnum *tpe = self->tpe;
     self->count = tpe->freq(tpe);   /* read first pos */
     return pp_next_position(self);
 }
 
 #define PP_pp(p) (*(PhPos **)p)
-static int pp_cmp(const void *const p1, const void *const p2)
-{
+static int pp_cmp(const void *const p1, const void *const p2) {
     int cmp = PP_pp(p1)->doc - PP_pp(p2)->doc;
     if (cmp == 0) {
         cmp = PP_pp(p1)->position - PP_pp(p2)->position;
@@ -109,13 +105,11 @@ static int pp_cmp(const void *const p1, const void *const p2)
     return cmp;
 }
 
-static int pp_pos_cmp(const void *const p1, const void *const p2)
-{
+static int pp_pos_cmp(const void *const p1, const void *const p2) {
     return PP_pp(p1)->position - PP_pp(p2)->position;
 }
 
-static bool pp_less_than(const PhPos *pp1, const PhPos *pp2)
-{
+static bool pp_less_than(const PhPos *pp1, const PhPos *pp2) {
     if (pp1->position == pp2->position) {
         return pp1->offset < pp2->offset;
     } else {
@@ -123,16 +117,14 @@ static bool pp_less_than(const PhPos *pp1, const PhPos *pp2)
     }
 }
 
-static void pp_destroy(PhPos *pp)
-{
+static void pp_destroy(PhPos *pp) {
     if (pp->tpe) {
         pp->tpe->close(pp->tpe);
     }
     free(pp);
 }
 
-static PhPos *pp_new(FrtTermDocEnum *tpe, int offset)
-{
+static PhPos *pp_new(FrtTermDocEnum *tpe, int offset) {
     PhPos *self = FRT_ALLOC(PhPos);
 
     self->tpe = tpe;
@@ -148,8 +140,7 @@ static PhPos *pp_new(FrtTermDocEnum *tpe, int offset)
 
 #define PhSc(scorer) ((PhraseScorer *)(scorer))
 
-typedef struct PhraseScorer
-{
+typedef struct PhraseScorer {
     FrtScorer  super;
     float (*phrase_freq)(FrtScorer *self);
     float   freq;
@@ -165,8 +156,7 @@ typedef struct PhraseScorer
     bool    check_repeats : 1;
 } PhraseScorer;
 
-static void phsc_init(PhraseScorer *phsc)
-{
+static void phsc_init(PhraseScorer *phsc) {
     int i;
     for (i = phsc->pp_cnt - 1; i >= 0; i--) {
         if (!(phsc->more = pp_next(phsc->phrase_pos[i]))) break;
@@ -179,8 +169,7 @@ static void phsc_init(PhraseScorer *phsc)
     }
 }
 
-static bool phsc_do_next(FrtScorer *self)
-{
+static bool phsc_do_next(FrtScorer *self) {
     PhraseScorer *phsc = PhSc(self);
     const int pp_cnt = phsc->pp_cnt;
     int pp_first_idx = phsc->pp_first_idx;
@@ -220,8 +209,7 @@ static bool phsc_do_next(FrtScorer *self)
     return false;
 }
 
-static float phsc_score(FrtScorer *self)
-{
+static float phsc_score(FrtScorer *self) {
     PhraseScorer *phsc = PhSc(self);
     float raw_score = frt_sim_tf(self->similarity, phsc->freq) * phsc->value;
     /* normalize */
@@ -230,8 +218,7 @@ static float phsc_score(FrtScorer *self)
         phsc->norms[self->doc]);
 }
 
-static bool phsc_next(FrtScorer *self)
-{
+static bool phsc_next(FrtScorer *self) {
     PhraseScorer *phsc = PhSc(self);
     if (phsc->first_time) {
         phsc_init(phsc);
@@ -243,8 +230,7 @@ static bool phsc_next(FrtScorer *self)
     return phsc_do_next(self);
 }
 
-static bool phsc_skip_to(FrtScorer *self, int doc_num)
-{
+static bool phsc_skip_to(FrtScorer *self, int doc_num) {
     PhraseScorer *phsc = PhSc(self);
     int i;
     for (i = phsc->pp_cnt - 1; i >= 0; i--) {
@@ -261,8 +247,7 @@ static bool phsc_skip_to(FrtScorer *self, int doc_num)
     return phsc_do_next(self);
 }
 
-static FrtExplanation *phsc_explain(FrtScorer *self, int doc_num)
-{
+static FrtExplanation *phsc_explain(FrtScorer *self, int doc_num) {
     PhraseScorer *phsc = PhSc(self);
     float phrase_freq;
 
@@ -273,8 +258,7 @@ static FrtExplanation *phsc_explain(FrtScorer *self, int doc_num)
                     "tf(phrase_freq=%f)", phrase_freq);
 }
 
-static void phsc_destroy(FrtScorer *self)
-{
+static void phsc_destroy(FrtScorer *self) {
     PhraseScorer *phsc = PhSc(self);
     int i;
     for (i = phsc->pp_cnt - 1; i >= 0; i--) {
@@ -289,8 +273,7 @@ static FrtScorer *phsc_new(FrtWeight *weight,
                         FrtPhrasePosition *positions, int pos_cnt,
                         FrtSimilarity *similarity,
                         frt_uchar *norms,
-                        int slop)
-{
+                        int slop) {
     int i;
     FrtScorer *self             = frt_scorer_new(PhraseScorer, similarity);
     FrtHashSet *term_set        = NULL;
@@ -342,8 +325,7 @@ static FrtScorer *phsc_new(FrtWeight *weight,
  * ExactPhraseScorer
  ***************************************************************************/
 
-static float ephsc_phrase_freq(FrtScorer *self)
-{
+static float ephsc_phrase_freq(FrtScorer *self) {
     PhraseScorer *phsc = PhSc(self);
     int i;
     int pp_first_idx = 0;
@@ -387,8 +369,7 @@ static float ephsc_phrase_freq(FrtScorer *self)
 static FrtScorer *exact_phrase_scorer_new(FrtWeight *weight,
                                        FrtTermDocEnum **term_pos_enum,
                                        FrtPhrasePosition *positions, int pp_cnt,
-                                       FrtSimilarity *similarity, frt_uchar *norms)
-{
+                                       FrtSimilarity *similarity, frt_uchar *norms) {
     FrtScorer *self = phsc_new(weight,
                             term_pos_enum,
                             positions,
@@ -407,8 +388,7 @@ static FrtScorer *exact_phrase_scorer_new(FrtWeight *weight,
 
 static bool sphsc_check_repeats(PhPos *pp,
                                 PhPos **positions,
-                                const int p_cnt)
-{
+                                const int p_cnt) {
     int j;
     for (j = 0; j < p_cnt; j++) {
         PhPos *ppj = positions[j];
@@ -432,8 +412,7 @@ static bool sphsc_check_repeats(PhPos *pp,
     return true;
 }
 
-static float sphsc_phrase_freq(FrtScorer *self)
-{
+static float sphsc_phrase_freq(FrtScorer *self) {
     PhraseScorer *phsc = PhSc(self);
     PhPos *pp;
     FrtPriorityQueue *pq = frt_pq_new(phsc->pp_cnt, (frt_lt_ft)&pp_less_than, NULL);
@@ -494,8 +473,7 @@ static FrtScorer *sloppy_phrase_scorer_new(FrtWeight *weight,
                                         FrtTermDocEnum **term_pos_enum,
                                         FrtPhrasePosition *positions,
                                         int pp_cnt, FrtSimilarity *similarity,
-                                        int slop, frt_uchar *norms)
-{
+                                        int slop, frt_uchar *norms) {
     FrtScorer *self = phsc_new(weight,
                             term_pos_enum,
                             positions,
@@ -514,13 +492,11 @@ static FrtScorer *sloppy_phrase_scorer_new(FrtWeight *weight,
  *
  ***************************************************************************/
 
-static char *phw_to_s(FrtWeight *self)
-{
+static char *phw_to_s(FrtWeight *self) {
     return frt_strfmt("PhraseWeight(%f)", self->value);
 }
 
-static FrtScorer *phw_scorer(FrtWeight *self, FrtIndexReader *ir)
-{
+static FrtScorer *phw_scorer(FrtWeight *self, FrtIndexReader *ir) {
     int i;
     FrtScorer *phsc = NULL;
     FrtPhraseQuery *phq = PhQ(self->query);
@@ -561,8 +537,7 @@ static FrtScorer *phw_scorer(FrtWeight *self, FrtIndexReader *ir)
     return phsc;
 }
 
-static FrtExplanation *phw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_num)
-{
+static FrtExplanation *phw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_num) {
     FrtExplanation *expl;
     FrtExplanation *idf_expl1;
     FrtExplanation *idf_expl2;
@@ -659,16 +634,14 @@ static FrtExplanation *phw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_
     if (query_expl->value == 1.0) {
         frt_expl_destroy(expl);
         return field_expl;
-    }
-    else {
+    } else {
         expl->value = (query_expl->value * field_expl->value);
         frt_expl_add_detail(expl, field_expl);
         return expl;
     }
 }
 
-static FrtWeight *phw_new(FrtQuery *query, FrtSearcher *searcher)
-{
+static FrtWeight *phw_new(FrtQuery *query, FrtSearcher *searcher) {
     FrtWeight *self        = w_new(FrtWeight, query);
 
     self->scorer        = &phw_scorer;
@@ -690,8 +663,7 @@ static FrtWeight *phw_new(FrtQuery *query, FrtSearcher *searcher)
  ***************************************************************************/
 
 /* ** TVPosEnum ** */
-typedef struct TVPosEnum
-{
+typedef struct TVPosEnum {
     int index;
     int size;
     int offset;
@@ -699,20 +671,17 @@ typedef struct TVPosEnum
     int positions[1];
 } TVPosEnum;
 
-static bool tvpe_next(TVPosEnum *self)
-{
+static bool tvpe_next(TVPosEnum *self) {
     if (++(self->index) < self->size) {
         self->pos = self->positions[self->index] - self->offset;
         return true;
-    }
-    else {
+    } else {
         self->pos = -1;
         return false;
     }
 }
 
-static int tvpe_skip_to(TVPosEnum *self, int position)
-{
+static int tvpe_skip_to(TVPosEnum *self, int position) {
     int i;
     int search_pos = position + self->offset;
     for (i = self->index + 1; i < self->size; i++) {
@@ -729,13 +698,11 @@ static int tvpe_skip_to(TVPosEnum *self, int position)
     return true;
 }
 
-static bool tvpe_lt(TVPosEnum *tvpe1, TVPosEnum *tvpe2)
-{
+static bool tvpe_lt(TVPosEnum *tvpe1, TVPosEnum *tvpe2) {
     return tvpe1->pos < tvpe2->pos;
 }
 
-static TVPosEnum *tvpe_new(int *positions, int size, int offset)
-{
+static TVPosEnum *tvpe_new(int *positions, int size, int offset) {
     TVPosEnum *self = (TVPosEnum*)frt_emalloc(sizeof(TVPosEnum) + size*sizeof(int));
     memcpy(self->positions, positions, size * sizeof(int));
     self->size = size;
@@ -745,8 +712,7 @@ static TVPosEnum *tvpe_new(int *positions, int size, int offset)
     return self;
 }
 
-static TVPosEnum *tvpe_new_merge(char **terms, int t_cnt, FrtTermVector *tv, int offset)
-{
+static TVPosEnum *tvpe_new_merge(char **terms, int t_cnt, FrtTermVector *tv, int offset) {
     int i, total_positions = 0;
     FrtPriorityQueue *tvpe_pq = frt_pq_new(t_cnt, (frt_lt_ft)tvpe_lt, &free);
     TVPosEnum *self = NULL;
@@ -787,8 +753,7 @@ static TVPosEnum *tvpe_new_merge(char **terms, int t_cnt, FrtTermVector *tv, int
     return self;
 }
 
-static TVPosEnum *get_tvpe(FrtTermVector *tv, char **terms, int t_cnt, int offset)
-{
+static TVPosEnum *get_tvpe(FrtTermVector *tv, char **terms, int t_cnt, int offset) {
     TVPosEnum *tvpe = NULL;
     if (t_cnt == 1) {
         FrtTVTerm *tv_term = frt_tv_get_tv_term(tv, terms[0]);
@@ -801,8 +766,7 @@ static TVPosEnum *get_tvpe(FrtTermVector *tv, char **terms, int t_cnt, int offse
     return tvpe;
 }
 
-static FrtMatchVector *phq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv, FrtTermVector *tv)
-{
+static FrtMatchVector *phq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv, FrtTermVector *tv) {
     if (tv->field == PhQ(self)->field) {
         const int pos_cnt = PhQ(self)->pos_cnt;
         int i;
@@ -872,8 +836,7 @@ static FrtMatchVector *phq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv, FrtT
                 if (tvpe && ((i == 0 && tvpe_next(tvpe))
                              || tvpe_skip_to(tvpe, tvpe_a[i-1]->pos))) {
                     tvpe_a[i] = tvpe;
-                }
-                else {
+                } else {
                     done = true;
                     free(tvpe);
                     break;
@@ -889,8 +852,7 @@ static FrtMatchVector *phq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv, FrtT
                         last = first;
                         first_index = FRT_NEXT_NUM(first_index, pos_cnt);
                         first = tvpe_a[first_index];
-                    }
-                    else {
+                    } else {
                         done = true;
                         break;
                     }
@@ -917,8 +879,7 @@ static FrtMatchVector *phq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv, FrtT
 
 #define PhQ_INIT_CAPA 4
 
-static void phq_extract_terms(FrtQuery *self, FrtHashSet *term_set)
-{
+static void phq_extract_terms(FrtQuery *self, FrtHashSet *term_set) {
     FrtPhraseQuery *phq = PhQ(self);
     int i, j;
     for (i = 0; i < phq->pos_cnt; i++) {
@@ -948,8 +909,7 @@ static char *phq_to_s(FrtQuery *self, ID default_field) {
     if (phq->pos_cnt == 0) {
         if (default_field != phq->field) {
             return frt_strfmt("%s:\"\"", field_name);
-        }
-        else {
+        } else {
             return frt_estrdup("\"\"");
         }
     }
@@ -988,8 +948,7 @@ static char *phq_to_s(FrtQuery *self, ID default_field) {
         pos = positions[i].pos;
         if (pos == last_pos) {
             buffer[buf_index - 1] = '&';
-        }
-        else {
+        } else {
             for (j = last_pos; j < pos - 1; j++) {
                 memcpy(buffer + buf_index, "<> ", 3);
                 buf_index += 3;
@@ -1026,8 +985,7 @@ static char *phq_to_s(FrtQuery *self, ID default_field) {
     return buffer;
 }
 
-static void phq_destroy(FrtQuery *self)
-{
+static void phq_destroy(FrtQuery *self) {
     FrtPhraseQuery *phq = PhQ(self);
     int i;
     for (i = 0; i < phq->pos_cnt; i++) {
@@ -1037,8 +995,7 @@ static void phq_destroy(FrtQuery *self)
     frt_q_destroy_i(self);
 }
 
-static FrtQuery *phq_rewrite(FrtQuery *self, FrtIndexReader *ir)
-{
+static FrtQuery *phq_rewrite(FrtQuery *self, FrtIndexReader *ir) {
     FrtPhraseQuery *phq = PhQ(self);
     (void)ir;
     if (phq->pos_cnt == 1) {
@@ -1049,8 +1006,7 @@ static FrtQuery *phq_rewrite(FrtQuery *self, FrtIndexReader *ir)
             FrtQuery *tq = frt_tq_new(phq->field, terms[0]);
             tq->boost = self->boost;
             return tq;
-        }
-        else {
+        } else {
             FrtQuery *q = frt_multi_tq_new(phq->field);
             int i;
             for (i = 0; i < t_cnt; i++) {
@@ -1065,8 +1021,7 @@ static FrtQuery *phq_rewrite(FrtQuery *self, FrtIndexReader *ir)
     }
 }
 
-static unsigned long long phq_hash(FrtQuery *self)
-{
+static unsigned long long phq_hash(FrtQuery *self) {
     int i, j;
     FrtPhraseQuery *phq = PhQ(self);
     unsigned long long hash = frt_str_hash(rb_id2name(phq->field));
@@ -1080,8 +1035,7 @@ static unsigned long long phq_hash(FrtQuery *self)
     return (hash ^ phq->slop);
 }
 
-static int phq_eq(FrtQuery *self, FrtQuery *o)
-{
+static int phq_eq(FrtQuery *self, FrtQuery *o) {
     int i, j;
     FrtPhraseQuery *phq1 = PhQ(self);
     FrtPhraseQuery *phq2 = PhQ(o);
@@ -1134,8 +1088,7 @@ FrtQuery *frt_phq_new(ID field) {
     return frt_phq_init(self, field);
 }
 
-void frt_phq_add_term_abs(FrtQuery *self, const char *term, int position)
-{
+void frt_phq_add_term_abs(FrtQuery *self, const char *term, int position) {
     FrtPhraseQuery *phq = PhQ(self);
     int index = phq->pos_cnt;
     FrtPhrasePosition *pp;
@@ -1150,33 +1103,28 @@ void frt_phq_add_term_abs(FrtQuery *self, const char *term, int position)
     phq->pos_cnt++;
 }
 
-void frt_phq_add_term(FrtQuery *self, const char *term, int pos_inc)
-{
+void frt_phq_add_term(FrtQuery *self, const char *term, int pos_inc) {
     FrtPhraseQuery *phq = PhQ(self);
     int position;
     if (phq->pos_cnt == 0) {
         position = 0;
-    }
-    else {
+    } else {
         position = phq->positions[phq->pos_cnt - 1].pos + pos_inc;
     }
     frt_phq_add_term_abs(self, term, position);
 }
 
-void frt_phq_append_multi_term(FrtQuery *self, const char *term)
-{
+void frt_phq_append_multi_term(FrtQuery *self, const char *term) {
     FrtPhraseQuery *phq = PhQ(self);
     int index = phq->pos_cnt - 1;
 
     if (index < 0) {
         frt_phq_add_term(self, term, 0);
-    }
-    else {
+    } else {
         frt_ary_push(phq->positions[index].terms, frt_estrdup(term));
     }
 }
 
-void frt_phq_set_slop(FrtQuery *self, int slop)
-{
+void frt_phq_set_slop(FrtQuery *self, int slop) {
     PhQ(self)->slop = slop;
 }

data/ext/isomorfeus_ferret_ext/frt_q_range.c

@@ -60,23 +60,20 @@ static char *range_to_s(FrtRange *range, ID default_field, float boost) {
     return buffer;
 }
 
-static void range_destroy(FrtRange *range)
-{
+static void range_destroy(FrtRange *range) {
     free(range->lower_term);
     free(range->upper_term);
     free(range);
 }
 
-static unsigned long long range_hash(FrtRange *filt)
-{
+static unsigned long long range_hash(FrtRange *filt) {
     return filt->include_lower | (filt->include_upper << 1)
         | ((frt_str_hash(rb_id2name(filt->field))
             ^ (filt->lower_term ? frt_str_hash(filt->lower_term) : 0)
             ^ (filt->upper_term ? frt_str_hash(filt->upper_term) : 0)) << 2);
 }
 
-static int range_eq(FrtRange *filt, FrtRange *o)
-{
+static int range_eq(FrtRange *filt, FrtRange *o) {
     if ((filt->lower_term && !o->lower_term) || (!filt->lower_term && o->lower_term)) { return false; }
     if ((filt->upper_term && !o->upper_term) || (!filt->upper_term && o->upper_term)) { return false; }
     return ((filt->field == o->field)
@@ -149,8 +146,7 @@ static FrtRange *trange_new(ID field, const char *lower_term, const char *upper_
                 FRT_RAISE(FRT_ARG_ERROR, "Upper bound must be greater than lower bound."
                       " numbers \"%lg\" < \"%lg\"", upper_num, lower_num);
             }
-        }
-        else {
+        } else {
             if (upper_term && lower_term &&
                 (strcmp(upper_term, lower_term) < 0)) {
                 FRT_RAISE(FRT_ARG_ERROR, "Upper bound must be greater than lower bound."
@@ -182,16 +178,14 @@ static void frt_rfilt_destroy_i(FrtFilter *filt) {
     frt_filt_destroy_i(filt);
 }
 
-static char *frt_rfilt_to_s(FrtFilter *filt)
-{
+static char *frt_rfilt_to_s(FrtFilter *filt) {
     char *rstr = range_to_s(RF(filt)->range, (ID)NULL, 1.0);
     char *rfstr = frt_strfmt("RangeFilter< %s >", rstr);
     free(rstr);
     return rfstr;
 }
 
-static FrtBitVector *frt_rfilt_get_bv_i(FrtFilter *filt, FrtIndexReader *ir)
-{
+static FrtBitVector *frt_rfilt_get_bv_i(FrtFilter *filt, FrtIndexReader *ir) {
     FrtBitVector *bv = frt_bv_new_capa(ir->max_doc(ir));
     FrtRange *range = RF(filt)->range;
     FrtFieldInfo *fi = frt_fis_get_field(ir->fis, range->field);