isomorfeus-ferret 0.17.3 → 0.17.4

data/ext/isomorfeus_ferret_ext/frt_q_filtered_query.c

@@ -25,8 +25,8 @@ static bool fqsc_next(FrtScorer *self) {
     FrtScorer *sub_sc = FQSc(self)->sub_scorer;
     FrtBitVector *bv = FQSc(self)->bv;
     while (sub_sc->next(sub_sc)) {
-        self->doc = sub_sc->doc;
-        if (frt_bv_get(bv, self->doc)) return true;
+        self->doc_num = sub_sc->doc_num;
+        if (frt_bv_get(bv, self->doc_num)) return true;
     }
     return false;
 }
@@ -36,8 +36,8 @@ static bool fqsc_skip_to(FrtScorer *self, int doc_num) {
     FrtBitVector *bv = FQSc(self)->bv;
     if (sub_sc->skip_to(sub_sc, doc_num)) {
         do {
-            self->doc = sub_sc->doc;
-            if (frt_bv_get(bv, self->doc)) {
+            self->doc_num = sub_sc->doc_num;
+            if (frt_bv_get(bv, self->doc_num)) {
                 return true;
             }
         } while (sub_sc->next(sub_sc));

data/ext/isomorfeus_ferret_ext/frt_q_match_all.c

@@ -10,10 +10,10 @@
 #define MASc(scorer) ((MatchAllScorer *)(scorer))
 
 typedef struct MatchAllScorer {
-    FrtScorer       super;
-    FrtIndexReader  *ir;
-    int             max_doc;
-    float           score;
+    FrtScorer      super;
+    FrtIndexReader *ir;
+    int            max_doc_num;
+    float          score;
 } MatchAllScorer;
 
 static float masc_score(FrtScorer *self) {
@@ -21,9 +21,9 @@ static float masc_score(FrtScorer *self) {
 }
 
 static bool masc_next(FrtScorer *self) {
-    while (self->doc < (MASc(self)->max_doc - 1)) {
-        self->doc++;
-        if (!MASc(self)->ir->is_deleted(MASc(self)->ir, self->doc)) {
+    while (self->doc_num < (MASc(self)->max_doc_num - 1)) {
+        self->doc_num++;
+        if (!MASc(self)->ir->is_deleted(MASc(self)->ir, self->doc_num)) {
             return true;
         }
     }
@@ -31,7 +31,7 @@ static bool masc_next(FrtScorer *self) {
 }
 
 static bool masc_skip_to(FrtScorer *self, int doc_num) {
-    self->doc = doc_num - 1;
+    self->doc_num = doc_num - 1;
     return masc_next(self);
 }
 
@@ -50,9 +50,9 @@ static FrtScorer *masc_new(FrtWeight *weight, FrtIndexReader *ir) {
     FrtScorer *self     = frt_scorer_new(MatchAllScorer, weight->similarity);
     MASc(self)->ir      = ir;
     FRT_REF(ir);
-    MASc(self)->max_doc = ir->max_doc(ir);
+    MASc(self)->max_doc_num = ir->max_doc_num(ir);
     MASc(self)->score   = weight->value;
-    self->doc           = -1;
+    self->doc_num       = -1;
     self->score         = &masc_score;
     self->next          = &masc_next;
     self->skip_to       = &masc_skip_to;

data/ext/isomorfeus_ferret_ext/frt_q_multi_term.c

@@ -54,33 +54,33 @@ static BoostedTerm *boosted_term_new(const char *term, float boost) {
 #define TDE_READ_SIZE 16
 
 typedef struct TermDocEnumWrapper {
-    const char   *term;
+    const char     *term;
     FrtTermDocEnum *tde;
-    float        boost;
-    int          doc;
-    int          freq;
-    int          docs[TDE_READ_SIZE];
-    int          freqs[TDE_READ_SIZE];
-    int          pointer;
-    int          pointer_max;
+    float          boost;
+    int            doc_num;
+    int            freq;
+    int            doc_nums[TDE_READ_SIZE];
+    int            freqs[TDE_READ_SIZE];
+    int            pointer;
+    int            pointer_max;
 } TermDocEnumWrapper;
 
 static bool tdew_less_than(const TermDocEnumWrapper *tdew1, const TermDocEnumWrapper *tdew2) {
-    return (tdew1->doc < tdew2->doc);
+    return (tdew1->doc_num < tdew2->doc_num);
 }
 
 static bool tdew_next(TermDocEnumWrapper *self) {
     self->pointer++;
     if (self->pointer >= self->pointer_max) {
         /* refill buffer */
-        self->pointer_max = self->tde->read(self->tde, self->docs, self->freqs, TDE_READ_SIZE);
+        self->pointer_max = self->tde->read(self->tde, self->doc_nums, self->freqs, TDE_READ_SIZE);
         if (self->pointer_max != 0) {
             self->pointer = 0;
         } else {
             return false;
         }
     }
-    self->doc = self->docs[self->pointer];
+    self->doc_num = self->doc_nums[self->pointer];
     self->freq = self->freqs[self->pointer];
     return true;
 }
@@ -89,8 +89,8 @@ static bool tdew_skip_to(TermDocEnumWrapper *self, int doc_num) {
     FrtTermDocEnum *tde = self->tde;
 
     while (++(self->pointer) < self->pointer_max) {
-        if (self->docs[self->pointer] >= doc_num) {
-            self->doc = self->docs[self->pointer];
+        if (self->doc_nums[self->pointer] >= doc_num) {
+            self->doc_num = self->doc_nums[self->pointer];
             self->freq = self->freqs[self->pointer];
             return true;
         }
@@ -100,7 +100,7 @@ static bool tdew_skip_to(TermDocEnumWrapper *self, int doc_num) {
     if (tde->skip_to(tde, doc_num)) {
         self->pointer_max = 1;
         self->pointer = 0;
-        self->docs[0] = self->doc = tde->doc_num(tde);
+        self->doc_nums[0] = self->doc_num = tde->doc_num(tde);
         self->freqs[0] = self->freq = tde->freq(tde);
         return true;
     } else {
@@ -118,7 +118,7 @@ static TermDocEnumWrapper *tdew_new(const char *term, FrtTermDocEnum *tde, float
     self->term = term;
     self->tde = tde;
     self->boost = boost;
-    self->doc = -1;
+    self->doc_num = -1;
     return self;
 }
 
@@ -144,11 +144,11 @@ typedef struct MultiTermScorer {
 
 static float multi_tsc_score(FrtScorer *self) {
     return MTSc(self)->total_score * MTSc(self)->weight_value
-        * frt_sim_decode_norm(self->similarity, MTSc(self)->norms[self->doc]);
+        * frt_sim_decode_norm(self->similarity, MTSc(self)->norms[self->doc_num]);
 }
 
 static bool multi_tsc_next(FrtScorer *self) {
-    int curr_doc;
+    int curr_doc_num;
     float total_score = 0.0f;
     TermDocEnumWrapper *tdew;
     MultiTermScorer *mtsc = MTSc(self);
@@ -170,7 +170,7 @@ static bool multi_tsc_next(FrtScorer *self) {
         return false;
     }
 
-    self->doc = curr_doc = tdew->doc;
+    self->doc_num = curr_doc_num = tdew->doc_num;
     do {
         int freq = tdew->freq;
         if (freq < SCORE_CACHE_SIZE) {
@@ -186,7 +186,7 @@ static bool multi_tsc_next(FrtScorer *self) {
         }
 
     } while (((tdew = (TermDocEnumWrapper *)frt_pq_top(tdew_pq)) != NULL)
-             && tdew->doc == curr_doc);
+             && tdew->doc_num == curr_doc_num);
     mtsc->total_score = total_score;
     return true;
 }
@@ -207,11 +207,11 @@ static bool multi_tsc_advance_to(FrtScorer *self, int target_doc_num) {
         MTSc(self)->tdew_pq = tdew_pq;
     }
     if (tdew_pq->size == 0) {
-        self->doc = -1;
+        self->doc_num = -1;
         return false;
     }
     while ((tdew = (TermDocEnumWrapper *)frt_pq_top(tdew_pq)) != NULL
-           && (target_doc_num > tdew->doc)) {
+           && (target_doc_num > tdew->doc_num)) {
         if (tdew_skip_to(tdew, target_doc_num)) {
             frt_pq_down(tdew_pq);
         } else {
@@ -231,11 +231,11 @@ static FrtExplanation *multi_tsc_explain(FrtScorer *self, int doc_num) {
     TermDocEnumWrapper *tdew;
 
     if (multi_tsc_advance_to(self, doc_num) &&
-        (tdew = (TermDocEnumWrapper *)frt_pq_top(mtsc->tdew_pq))->doc == doc_num) {
+        (tdew = (TermDocEnumWrapper *)frt_pq_top(mtsc->tdew_pq))->doc_num == doc_num) {
 
         FrtPriorityQueue *tdew_pq = MTSc(self)->tdew_pq;
         FrtExplanation *expl = frt_expl_new(0.0f, "The sum of:");
-        int curr_doc = self->doc = tdew->doc;
+        int curr_doc_num = self->doc_num = tdew->doc_num;
         float total_score = 0.0f;
 
         do {
@@ -256,7 +256,7 @@ static FrtExplanation *multi_tsc_explain(FrtScorer *self, int doc_num) {
             }
 
         } while (((tdew = (TermDocEnumWrapper *)frt_pq_top(tdew_pq)) != NULL)
-                 && tdew->doc == curr_doc);
+                 && tdew->doc_num == curr_doc_num);
         expl->value = total_score;
         return expl;
     } else {
@@ -444,7 +444,7 @@ static FrtExplanation *multi_tw_explain(FrtWeight *self, FrtIndexReader *ir, int
 static FrtWeight *multi_tw_new(FrtQuery *query, FrtSearcher *searcher) {
     int i;
     int doc_freq         = 0;
-    FrtWeight *self         = w_new(FrtWeight, query);
+    FrtWeight *self      = w_new(FrtWeight, query);
     FrtPriorityQueue *bt_pq = MTQ(query)->boosted_terms;
 
     self->scorer         = &multi_tw_scorer;
@@ -460,7 +460,7 @@ static FrtWeight *multi_tw_new(FrtQuery *query, FrtSearcher *searcher) {
                                        ((BoostedTerm *)bt_pq->heap[i])->term);
     }
     self->idf += frt_sim_idf(self->similarity, doc_freq,
-                         searcher->max_doc(searcher));
+                         searcher->max_doc_num(searcher));
 
     return self;
 }

data/ext/isomorfeus_ferret_ext/frt_q_phrase.c

@@ -42,7 +42,7 @@ typedef struct PhPos {
     FrtTermDocEnum *tpe;
     int            offset;
     int            count;
-    int            doc;
+    int            doc_num;
     int            position;
 } PhPos;
 
@@ -53,10 +53,10 @@ static bool pp_next(PhPos *self) {
     if (!tpe->next(tpe)) {
         tpe->close(tpe);            /* close stream */
         self->tpe = NULL;
-        self->doc = INT_MAX;        /* sentinel value */
+        self->doc_num = INT_MAX;        /* sentinel value */
         return false;
     }
-    self->doc = tpe->doc_num(tpe);
+    self->doc_num = tpe->doc_num(tpe);
     self->position = 0;
     return true;
 }
@@ -68,10 +68,10 @@ static bool pp_skip_to(PhPos *self, int doc_num) {
     if (!tpe->skip_to(tpe, doc_num)) {
         tpe->close(tpe);            /* close stream */
         self->tpe = NULL;
-        self->doc = INT_MAX;        /* sentinel value */
+        self->doc_num = INT_MAX;        /* sentinel value */
         return false;
     }
-    self->doc = tpe->doc_num(tpe);
+    self->doc_num = tpe->doc_num(tpe);
     self->position = 0;
     return true;
 }
@@ -95,7 +95,7 @@ static bool pp_first_position(PhPos *self) {
 
 #define PP_pp(p) (*(PhPos **)p)
 static int pp_cmp(const void *const p1, const void *const p2) {
-    int cmp = PP_pp(p1)->doc - PP_pp(p2)->doc;
+    int cmp = PP_pp(p1)->doc_num - PP_pp(p2)->doc_num;
     if (cmp == 0) {
         cmp = PP_pp(p1)->position - PP_pp(p2)->position;
         if (cmp == 0) {
@@ -128,7 +128,7 @@ static PhPos *pp_new(FrtTermDocEnum *tpe, int offset) {
     PhPos *self = FRT_ALLOC(PhPos);
 
     self->tpe = tpe;
-    self->count = self->doc = self->position = -1;
+    self->count = self->doc_num = self->position = -1;
     self->offset = offset;
 
     return self;
@@ -179,9 +179,9 @@ static bool phsc_do_next(FrtScorer *self) {
     PhPos *last  = phrase_positions[FRT_PREV_NUM(pp_first_idx, pp_cnt)];
     while (phsc->more) {
         /* find doc with all the terms */
-        while (phsc->more && first->doc < last->doc) {
+        while (phsc->more && first->doc_num < last->doc_num) {
             /* skip first upto last */
-            phsc->more = pp_skip_to(first, last->doc);
+            phsc->more = pp_skip_to(first, last->doc_num);
             last = first;
             pp_first_idx = FRT_NEXT_NUM(pp_first_idx, pp_cnt);
             first = phrase_positions[pp_first_idx];
@@ -200,7 +200,7 @@ static bool phsc_do_next(FrtScorer *self) {
                 last =  phrase_positions[FRT_PREV_NUM(pp_first_idx, pp_cnt)];
                 phsc->more = pp_next(last);     /* trigger further scanning */
             } else {
-                self->doc = first->doc;
+                self->doc_num = first->doc_num;
                 return true;                    /* found a match */
             }
 
@@ -215,7 +215,7 @@ static float phsc_score(FrtScorer *self) {
     /* normalize */
     return raw_score * frt_sim_decode_norm(
         self->similarity,
-        phsc->norms[self->doc]);
+        phsc->norms[self->doc_num]);
 }
 
 static bool phsc_next(FrtScorer *self) {
@@ -253,7 +253,7 @@ static FrtExplanation *phsc_explain(FrtScorer *self, int doc_num) {
 
     phsc_skip_to(self, doc_num);
 
-    phrase_freq = (self->doc == doc_num) ? phsc->freq : 0.0f;
+    phrase_freq = (self->doc_num == doc_num) ? phsc->freq : 0.0f;
     return frt_expl_new(frt_sim_tf(self->similarity, phrase_freq),
                     "tf(phrase_freq=%f)", phrase_freq);
 }

data/ext/isomorfeus_ferret_ext/frt_q_range.c

@@ -186,7 +186,7 @@ static char *frt_rfilt_to_s(FrtFilter *filt) {
 }
 
 static FrtBitVector *frt_rfilt_get_bv_i(FrtFilter *filt, FrtIndexReader *ir) {
-    FrtBitVector *bv = frt_bv_new_capa(ir->max_doc(ir));
+    FrtBitVector *bv = frt_bv_new_capa(ir->max_doc_num(ir));
     FrtRange *range = RF(filt)->range;
     FrtFieldInfo *fi = frt_fis_get_field(ir->fis, range->field);
     /* the field info exists we need to add docs to the bit vector, otherwise
@@ -318,7 +318,7 @@ static FrtBitVector *frt_trfilt_get_bv_i(FrtFilter *filt, FrtIndexReader *ir) {
     if ((!lt || (sscanf(lt, "%lg%n", &lnum, &len) && (int)strlen(lt) == len)) &&
         (!ut || (sscanf(ut, "%lg%n", &unum, &len) && (int)strlen(ut) == len)))
     {
-        FrtBitVector *bv = frt_bv_new_capa(ir->max_doc(ir));
+        FrtBitVector *bv = frt_bv_new_capa(ir->max_doc_num(ir));
         FrtFieldInfo *fi = frt_fis_get_field(ir->fis, range->field);
         /* the field info exists we need to add docs to the bit vector,
          * otherwise we just return an empty bit vector */