isomorfeus-ferret 0.17.3 → 0.17.5

data/ext/isomorfeus_ferret_ext/frt_filter.c

@@ -84,13 +84,13 @@ static char *qfilt_to_s(FrtFilter *filt) {
 }
 
 static FrtBitVector *qfilt_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));
     FrtSearcher *sea = frt_isea_new(ir);
     FrtWeight *weight = frt_q_weight(QF(filt)->query, sea);
     FrtScorer *scorer = weight->scorer(weight, ir);
     if (scorer) {
         while (scorer->next(scorer)) {
-            frt_bv_set(bv, scorer->doc);
+            frt_bv_set(bv, scorer->doc_num);
         }
         scorer->destroy(scorer);
     }

data/ext/isomorfeus_ferret_ext/frt_ind.c

@@ -176,7 +176,7 @@ static void index_del_doc_with_key_i(FrtIndex *self, FrtDocument *doc,
         frt_td_destroy(td);
         FRT_RAISE(FRT_ARG_ERROR, "%s", NON_UNIQUE_KEY_ERROR_MSG);
     } else if (td->total_hits == 1) {
-        frt_ir_delete_doc(self->ir, td->hits[0]->doc);
+        frt_ir_delete_doc(self->ir, td->hits[0]->doc_num);
     }
     frt_q_deref(q);
     frt_td_destroy(td);
@@ -255,7 +255,7 @@ FrtDocument *frt_index_get_doc_term(FrtIndex *self, ID field, const char *term)
     return doc;
 }
 
-FrtDocument *frt_index_get_doc_id(FrtIndex *self, const char *id) {
+FrtDocument *frt_index_get_doc_num(FrtIndex *self, const char *id) {
     return frt_index_get_doc_term(self, self->id_field, id);
 }
 

data/ext/isomorfeus_ferret_ext/frt_ind.h

@@ -38,7 +38,7 @@ extern FrtTopDocs *frt_index_search_str(FrtIndex *self, char *query, int first_d
 extern FrtQuery *frt_index_get_query(FrtIndex *self, char *qstr, rb_encoding *encoding);
 extern FrtDocument *frt_index_get_doc(FrtIndex *self, int doc_num);
 extern FrtDocument *frt_index_get_doc_ts(FrtIndex *self, int doc_num);
-extern FrtDocument *frt_index_get_doc_id(FrtIndex *self, const char *id);
+extern FrtDocument *frt_index_get_doc_num(FrtIndex *self, const char *id);
 extern FrtDocument *frt_index_get_doc_term(FrtIndex *self, ID field, const char *term);
 extern void frt_index_delete(FrtIndex *self, int doc_num);
 extern void frt_index_delete_term(FrtIndex *self, ID field, const char *term);

data/ext/isomorfeus_ferret_ext/frt_index.c

@@ -1898,7 +1898,7 @@ static void stde_seek_ti(FrtSegmentTermDocEnum *stde, FrtTermInfo *ti) {
         stde->count = 0;
         stde->doc_freq = ti->doc_freq;
         stde->doc_num = 0;
-        stde->skip_doc = 0;
+        stde->skip_doc_num = 0;
         stde->skip_count = 0;
         stde->num_skips = stde->doc_freq / stde->skip_interval;
         stde->frq_ptr = ti->frq_ptr;
@@ -1934,7 +1934,6 @@ static int stde_freq(FrtTermDocEnum *tde) {
 }
 
 static bool stde_next(FrtTermDocEnum *tde) {
-    int doc_code;
     FrtSegmentTermDocEnum *stde = STDE(tde);
 
     while (true) {
@@ -1942,13 +1941,8 @@ static bool stde_next(FrtTermDocEnum *tde) {
             return false;
         }
 
-        doc_code = frt_is_read_vint(stde->frq_in);
-        stde->doc_num += doc_code >> 1;    /* shift off low bit */
-        if (0 != (doc_code & 1)) {         /* if low bit is set */
-            stde->freq = 1;                /* freq is one */
-        } else {
-            stde->freq = (int)frt_is_read_vint(stde->frq_in); /* read freq */
-        }
+        stde->doc_num += frt_is_read_vint(stde->frq_in);
+        stde->freq = frt_is_read_vint(stde->frq_in);
 
         stde->count++;
 
@@ -1964,17 +1958,11 @@ static bool stde_next(FrtTermDocEnum *tde) {
 static int stde_read(FrtTermDocEnum *tde, int *docs, int *freqs, int req_num) {
     FrtSegmentTermDocEnum *stde = STDE(tde);
     int i = 0;
-    int doc_code;
 
     while (i < req_num && stde->count < stde->doc_freq) {
         /* manually inlined call to next() for speed */
-        doc_code = frt_is_read_vint(stde->frq_in);
-        stde->doc_num += (doc_code >> 1);            /* shift off low bit */
-        if (0 != (doc_code & 1)) {                   /* if low bit is set */
-            stde->freq = 1;                            /* freq is one */
-        } else {
-            stde->freq = frt_is_read_vint(stde->frq_in);  /* else read freq */
-        }
+        stde->doc_num += frt_is_read_vint(stde->frq_in);
+        stde->freq = frt_is_read_vint(stde->frq_in);
 
         stde->count++;
 
@@ -1993,7 +1981,7 @@ 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;
+        int last_skip_doc_num;
         frt_off_t last_frq_ptr;
         frt_off_t last_prx_ptr;
         int num_skipped;
@@ -2008,17 +1996,17 @@ static bool stde_skip_to(FrtTermDocEnum *tde, int target_doc_num) {
         }
 
         /* scan skip data */
-        last_skip_doc = stde->skip_doc;
+        last_skip_doc_num = stde->skip_doc_num;
         last_frq_ptr = frt_is_pos(stde->frq_in);
         last_prx_ptr = -1;
         num_skipped = -1 - (stde->count % stde->skip_interval);
 
-        while (target_doc_num > stde->skip_doc) {
-            last_skip_doc = stde->skip_doc;
+        while (target_doc_num > stde->skip_doc_num) {
+            last_skip_doc_num = stde->skip_doc_num;
             last_frq_ptr = stde->frq_ptr;
             last_prx_ptr = stde->prx_ptr;
 
-            if (0 != stde->skip_doc && stde->skip_doc >= stde->doc_num) {
+            if (0 != stde->skip_doc_num && stde->skip_doc_num >= stde->doc_num) {
                 num_skipped += stde->skip_interval;
             }
 
@@ -2026,9 +2014,9 @@ static bool stde_skip_to(FrtTermDocEnum *tde, int target_doc_num) {
                 break;
             }
 
-            stde->skip_doc += frt_is_read_vint(stde->skip_in);
-            stde->frq_ptr  += frt_is_read_vint(stde->skip_in);
-            stde->prx_ptr  += frt_is_read_vint(stde->skip_in);
+            stde->skip_doc_num += frt_is_read_vint(stde->skip_in);
+            stde->frq_ptr      += frt_is_read_vint(stde->skip_in);
+            stde->prx_ptr      += frt_is_read_vint(stde->skip_in);
 
             stde->skip_count++;
         }
@@ -2038,7 +2026,7 @@ static bool stde_skip_to(FrtTermDocEnum *tde, int target_doc_num) {
             frt_is_seek(stde->frq_in, last_frq_ptr);
             stde->seek_prox(stde, last_prx_ptr);
 
-            stde->doc_num = last_skip_doc;
+            stde->doc_num = last_skip_doc_num;
             stde->count += num_skipped;
         }
     }
@@ -2432,7 +2420,7 @@ static int mtdpe_freq(FrtTermDocEnum *tde) {
 static bool mtdpe_next(FrtTermDocEnum *tde) {
     FrtTermDocEnum *sub_tde;
     int pos = 0, freq = 0;
-    int doc;
+    int doc_num;
     MultipleTermDocPosEnum *mtdpe = MTDPE(tde);
 
     if (0 == mtdpe->pq->size) {
@@ -2440,7 +2428,7 @@ static bool mtdpe_next(FrtTermDocEnum *tde) {
     }
 
     sub_tde = (FrtTermDocEnum *)frt_pq_top(mtdpe->pq);
-    doc = sub_tde->doc_num(sub_tde);
+    doc_num = sub_tde->doc_num(sub_tde);
 
     do {
         freq += sub_tde->freq(sub_tde);
@@ -2463,13 +2451,13 @@ static bool mtdpe_next(FrtTermDocEnum *tde) {
             sub_tde->close(sub_tde);
         }
         sub_tde = (FrtTermDocEnum *)frt_pq_top(mtdpe->pq);
-    } while ((mtdpe->pq->size > 0) && (sub_tde->doc_num(sub_tde) == doc));
+    } while ((mtdpe->pq->size > 0) && (sub_tde->doc_num(sub_tde) == doc_num));
 
     qsort(mtdpe->pos_queue, freq, sizeof(int), &frt_icmp_risky);
 
     mtdpe->pos_queue_index = 0;
     mtdpe->freq = freq;
-    mtdpe->doc_num = doc;
+    mtdpe->doc_num = doc_num;
 
     return true;
 }
@@ -2849,7 +2837,7 @@ frt_uchar *frt_ir_get_norms_i(FrtIndexReader *ir, int field_num) {
     }
     if (!norms) {
         if (NULL == ir->fake_norms) {
-            ir->fake_norms = FRT_ALLOC_AND_ZERO_N(frt_uchar, ir->max_doc(ir));
+            ir->fake_norms = FRT_ALLOC_AND_ZERO_N(frt_uchar, ir->max_doc_num(ir));
         }
         norms = ir->fake_norms;
     }
@@ -2866,7 +2854,7 @@ frt_uchar *frt_ir_get_norms_into(FrtIndexReader *ir, ID field, frt_uchar *buf) {
     if (field_num >= 0) {
         ir->get_norms_into(ir, field_num, buf);
     } else {
-        memset(buf, 0, ir->max_doc(ir));
+        memset(buf, 0, ir->max_doc_num(ir));
     }
     return buf;
 }
@@ -2880,7 +2868,7 @@ void frt_ir_undelete_all(FrtIndexReader *ir) {
 }
 
 void frt_ir_delete_doc(FrtIndexReader *ir, int doc_num) {
-    if (doc_num >= 0 && doc_num < ir->max_doc(ir)) {
+    if (doc_num >= 0 && doc_num < ir->max_doc_num(ir)) {
         pthread_mutex_lock(&ir->mutex);
         ir->acquire_write_lock(ir);
         ir->delete_doc_i(ir, doc_num);
@@ -3252,7 +3240,7 @@ static int sr_num_docs(FrtIndexReader *ir) {
     return num_docs;
 }
 
-static int sr_max_doc(FrtIndexReader *ir) {
+static int sr_max_doc_num(FrtIndexReader *ir) {
     return SR(ir)->fr->size;
 }
 
@@ -3383,7 +3371,7 @@ static FrtIndexReader *sr_setup_i(FrtSegmentReader *sr) {
     char *sr_segment = sr->si->name;
 
     ir->num_docs            = &sr_num_docs;
-    ir->max_doc             = &sr_max_doc;
+    ir->max_doc_num         = &sr_max_doc_num;
     ir->get_doc             = &sr_get_doc;
     ir->get_lazy_doc        = &sr_get_lazy_doc;
     ir->get_norms           = &sr_get_norms;
@@ -3500,8 +3488,8 @@ static int mr_num_docs(FrtIndexReader *ir) {
     return num_docs;
 }
 
-static int mr_max_doc(FrtIndexReader *ir) {
-    return MR(ir)->max_doc;
+static int mr_max_doc_num(FrtIndexReader *ir) {
+    return MR(ir)->max_doc_num;
 }
 
 #define GET_READER()\
@@ -3535,7 +3523,7 @@ static frt_uchar *mr_get_norms(FrtIndexReader *ir, int field_num) {
         int i;
         const int mr_reader_cnt = MR(ir)->r_cnt;
 
-        bytes = FRT_ALLOC_AND_ZERO_N(frt_uchar, MR(ir)->max_doc);
+        bytes = FRT_ALLOC_AND_ZERO_N(frt_uchar, MR(ir)->max_doc_num);
 
         for (i = 0; i < mr_reader_cnt; i++) {
             int fnum = frt_mr_get_field_num(MR(ir), i, field_num);
@@ -3557,7 +3545,7 @@ static frt_uchar *mr_get_norms_into(FrtIndexReader *ir, int field_num, frt_uchar
     pthread_mutex_lock(&ir->mutex);
     bytes = (frt_uchar *)frt_h_get_int(MR(ir)->norms_cache, field_num);
     if (NULL != bytes) {
-        memcpy(buf, bytes, MR(ir)->max_doc);
+        memcpy(buf, bytes, MR(ir)->max_doc_num);
     } else {
         int i;
         const int mr_reader_cnt = MR(ir)->r_cnt;
@@ -3706,7 +3694,7 @@ FrtMultiReader *frt_mr_init(FrtMultiReader *mr, FrtIndexReader **sub_readers, co
 
     mr->sub_readers         = sub_readers;
     mr->r_cnt               = r_cnt;
-    mr->max_doc             = 0;
+    mr->max_doc_num         = 0;
     mr->num_docs_cache      = -1;
     mr->has_deletions       = false;
     mr->starts              = FRT_ALLOC_N(int, (r_cnt+1));
@@ -3714,18 +3702,18 @@ FrtMultiReader *frt_mr_init(FrtMultiReader *mr, FrtIndexReader **sub_readers, co
     for (i = 0; i < r_cnt; i++) {
         FrtIndexReader *sub_reader = sub_readers[i];
         FRT_REF(sub_reader);
-        mr->starts[i] = mr->max_doc;
-        mr->max_doc += sub_reader->max_doc(sub_reader); /* compute max_docs */
+        mr->starts[i] = mr->max_doc_num;
+        mr->max_doc_num += sub_reader->max_doc_num(sub_reader); /* compute max_docs */
 
         if (sub_reader->has_deletions(sub_reader)) {
             mr->has_deletions = true;
         }
     }
-    mr->starts[r_cnt]       = mr->max_doc;
+    mr->starts[r_cnt]       = mr->max_doc_num;
     mr->norms_cache         = frt_h_new_int(&free);
 
     ir->num_docs            = &mr_num_docs;
-    ir->max_doc             = &mr_max_doc;
+    ir->max_doc_num         = &mr_max_doc_num;
     ir->get_doc             = &mr_get_doc;
     ir->get_lazy_doc        = &mr_get_lazy_doc;
     ir->get_norms           = &mr_get_norms;
@@ -3980,14 +3968,14 @@ typedef struct SkipBuffer {
     FrtOutStream *buf;
     FrtOutStream *frq_out;
     FrtOutStream *prx_out;
-    int last_doc;
-    frt_off_t last_frq_ptr;
-    frt_off_t last_prx_ptr;
+    int          last_doc_num;
+    frt_off_t    last_frq_ptr;
+    frt_off_t    last_prx_ptr;
 } SkipBuffer;
 
 static void skip_buf_reset(SkipBuffer *skip_buf) {
     frt_ramo_reset(skip_buf->buf);
-    skip_buf->last_doc = 0;
+    skip_buf->last_doc_num = 0;
     skip_buf->last_frq_ptr = frt_os_pos(skip_buf->frq_out);
     skip_buf->last_prx_ptr = frt_os_pos(skip_buf->prx_out);
 }
@@ -4000,15 +3988,15 @@ static SkipBuffer *skip_buf_new(FrtOutStream *frq_out, FrtOutStream *prx_out) {
     return skip_buf;
 }
 
-static void skip_buf_add(SkipBuffer *skip_buf, int doc) {
+static void skip_buf_add(SkipBuffer *skip_buf, int doc_num) {
     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, doc_num - skip_buf->last_doc_num);
     frt_os_write_vint(skip_buf->buf, frq_ptr - skip_buf->last_frq_ptr);
     frt_os_write_vint(skip_buf->buf, prx_ptr - skip_buf->last_prx_ptr);
 
-    skip_buf->last_doc = doc;
+    skip_buf->last_doc_num = doc_num;
     skip_buf->last_frq_ptr = frq_ptr;
     skip_buf->last_prx_ptr = prx_ptr;
 }
@@ -4069,7 +4057,7 @@ static void dw_flush_streams(FrtDocWriter *dw) {
 }
 
 static void dw_flush(FrtDocWriter *dw) {
-    int i, j, last_doc, doc_code, doc_freq, last_pos, posting_count;
+    int i, j, last_doc, doc_num, doc_freq, last_pos, posting_count;
     int skip_interval = dw->skip_interval;
     FrtFieldInfos *fis = dw->fis;
     const int fields_count = fis->size;
@@ -4117,15 +4105,11 @@ static void dw_flush(FrtDocWriter *dw) {
                     skip_buf_add(skip_buf, last_doc);
                 }
 
-                doc_code = (p->doc_num - last_doc) << 1;
+                doc_num = (p->doc_num - last_doc);
                 last_doc = p->doc_num;
 
-                if (p->freq == 1) {
-                    frt_os_write_vint(frq_out, 1|doc_code);
-                } else {
-                    frt_os_write_vint(frq_out, doc_code);
-                    frt_os_write_vint(frq_out, p->freq);
-                }
+                frt_os_write_vint(frq_out, doc_num);
+                frt_os_write_vint(frq_out, p->freq);
 
                 last_pos = 0;
                 for (occ = p->first_occ; NULL != occ; occ = occ->next) {
@@ -4616,8 +4600,8 @@ static void iw_cp_fields(FrtIndexWriter *iw, FrtSegmentReader *sr, const char *s
 
     if (map) {
         int i;
-        const int max_doc = sr_max_doc(IR(sr));
-        for (i = 0; i < max_doc; i++) {
+        const int max_doc_num = sr_max_doc_num(IR(sr));
+        for (i = 0; i < max_doc_num; i++) {
             int j, data_len = 0;
             const int field_cnt = frt_is_read_vint(fdt_in);
             int tv_cnt;
@@ -4801,7 +4785,7 @@ static void iw_add_segment(FrtIndexWriter *iw, FrtSegmentReader *sr) {
     const int fis_size = sub_fis->size;
     bool must_map_fields = false;
 
-    si->doc_cnt = IR(sr)->max_doc(IR(sr));
+    si->doc_cnt = IR(sr)->max_doc_num(IR(sr));
     /* Merge FrtFieldInfos */
     for (j = 0; j < fis_size; j++) {
         FrtFieldInfo *fi = sub_fis->fields[j];

data/ext/isomorfeus_ferret_ext/frt_index.h

@@ -297,7 +297,7 @@ struct FrtSegmentTermDocEnum {
     int num_skips;
     int skip_interval;
     int skip_count;
-    int skip_doc;
+    int skip_doc_num;
     int prx_cnt;
     int position;
     frt_off_t frq_ptr;
@@ -507,7 +507,7 @@ typedef enum {
 struct FrtIndexReader {
     int             type;
     int             (*num_docs)(FrtIndexReader *ir);
-    int             (*max_doc)(FrtIndexReader *ir);
+    int             (*max_doc_num)(FrtIndexReader *ir);
     FrtDocument     *(*get_doc)(FrtIndexReader *ir, int doc_num);
     FrtLazyDoc      *(*get_lazy_doc)(FrtIndexReader *ir, int doc_num);
     frt_uchar       *(*get_norms)(FrtIndexReader *ir, int field_num);
@@ -595,7 +595,7 @@ extern FrtSegmentReader *frt_sr_alloc();
 
 struct FrtMultiReader {
     FrtIndexReader ir;
-    int            max_doc;
+    int            max_doc_num;
     int            num_docs_cache;
     int            r_cnt;
     int            *starts;

data/ext/isomorfeus_ferret_ext/frt_q_boolean.c

@@ -82,7 +82,7 @@ static bool dssc_advance_after_current(FrtScorer *self) {
     /* repeat until minimum number of matches is found */
     while (true) {
         FrtScorer *top = (FrtScorer *)frt_pq_top(scorer_queue);
-        self->doc = top->doc;
+        self->doc_num = top->doc_num;
         dssc->cum_score = top->score(top);
         dssc->num_matches = 1;
         /* Until all sub-scorers are after self->doc */
@@ -103,7 +103,7 @@ static bool dssc_advance_after_current(FrtScorer *self) {
                 }
             }
             top = (FrtScorer *)frt_pq_top(scorer_queue);
-            if (top->doc != self->doc) {
+            if (top->doc_num != self->doc_num) {
                 /* All remaining subscorers are after self->doc */
                 break;
             } else {
@@ -144,12 +144,12 @@ static bool dssc_skip_to(FrtScorer *self, int doc_num) {
     if (scorer_queue->size < dssc->min_num_matches) {
         return false;
     }
-    if (doc_num <= self->doc) {
-        doc_num = self->doc + 1;
+    if (doc_num <= self->doc_num) {
+        doc_num = self->doc_num + 1;
     }
     while (true) {
         FrtScorer *top = (FrtScorer *)frt_pq_top(scorer_queue);
-        if (top->doc >= doc_num) {
+        if (top->doc_num >= doc_num) {
             return dssc_advance_after_current(self);
         } else if (top->skip_to(top, doc_num)) {
             frt_pq_down(scorer_queue);
@@ -193,7 +193,7 @@ static FrtScorer *disjunction_sum_scorer_new(FrtScorer **sub_scorers, int ss_cnt
     DSSc(self)->ss_cnt = ss_cnt;
 
     /* The document number of the current match */
-    self->doc = -1;
+    self->doc_num = -1;
     DSSc(self)->cum_score = -1.0;
 
     /* The number of subscorers that provide the current match. */
@@ -246,15 +246,15 @@ static FrtScorer *counting_disjunction_sum_scorer_new(
 #define CSc(scorer) ((ConjunctionScorer *)(scorer))
 
 typedef struct ConjunctionScorer {
-    FrtScorer          super;
-    bool            first_time : 1;
-    bool            more : 1;
-    float           coord;
-    FrtScorer        **sub_scorers;
-    int             ss_cnt;
-    int             first_idx;
-    Coordinator    *coordinator;
-    int             last_scored_doc;
+    FrtScorer   super;
+    bool        first_time : 1;
+    bool        more : 1;
+    float       coord;
+    FrtScorer   **sub_scorers;
+    int         ss_cnt;
+    int         first_idx;
+    Coordinator *coordinator;
+    int         last_scored_doc_num;
 } ConjunctionScorer;
 
 static void csc_sort_scorers(ConjunctionScorer *csc) {
@@ -263,8 +263,8 @@ static void csc_sort_scorers(ConjunctionScorer *csc) {
     for (i = 1; i < csc->ss_cnt; i++) {
         previous = current;
         current = csc->sub_scorers[i];
-        if (previous->doc > current->doc) {
-            if (!current->skip_to(current, previous->doc)) {
+        if (previous->doc_num > current->doc_num) {
+            if (!current->skip_to(current, previous->doc_num)) {
                 csc->more = false;
                 return;
             }
@@ -322,15 +322,15 @@ static bool csc_do_next(FrtScorer *self) {
     FrtScorer *last_sc = csc->sub_scorers[FRT_PREV_NUM(first_idx, sub_sc_cnt)];
 
     /* skip to doc with all clauses */
-    while (csc->more && (first_sc->doc < last_sc->doc)) {
+    while (csc->more && (first_sc->doc_num < last_sc->doc_num)) {
         /* skip first upto last */
-        csc->more = first_sc->skip_to(first_sc, last_sc->doc);
+        csc->more = first_sc->skip_to(first_sc, last_sc->doc_num);
         /* move first to last */
         last_sc = first_sc;
         first_idx = FRT_NEXT_NUM(first_idx, sub_sc_cnt);
         first_sc = csc->sub_scorers[first_idx];
     }
-    self->doc = first_sc->doc;
+    self->doc_num = first_sc->doc_num;
     csc->first_idx = first_idx;
     return csc->more;
 }
@@ -404,9 +404,9 @@ static FrtScorer *conjunction_scorer_new(FrtSimilarity *similarity) {
 static float ccsc_score(FrtScorer *self) {
     ConjunctionScorer *csc = CSc(self);
 
-    int doc;
-    if ((doc = self->doc) > csc->last_scored_doc) {
-        csc->last_scored_doc = doc;
+    int doc_num;
+    if ((doc_num = self->doc_num) > csc->last_scored_doc_num) {
+        csc->last_scored_doc_num = doc_num;
         csc->coordinator->num_matches += csc->ss_cnt;
     }
 
@@ -418,7 +418,7 @@ static FrtScorer *counting_conjunction_sum_scorer_new(
     FrtScorer *self = conjunction_scorer_new(frt_sim_create_default());
     ConjunctionScorer *csc = CSc(self);
     csc->coordinator = coordinator;
-    csc->last_scored_doc = -1;
+    csc->last_scored_doc_num = -1;
     csc->sub_scorers = FRT_ALLOC_N(FrtScorer *, ss_cnt);
     memcpy(csc->sub_scorers, sub_scorers, sizeof(FrtScorer *) * ss_cnt);
     csc->ss_cnt = ss_cnt;
@@ -449,7 +449,7 @@ static float smsc_score(FrtScorer *self) {
 static bool smsc_next(FrtScorer *self) {
     FrtScorer *scorer = SMSc(self)->scorer;
     if (scorer->next(scorer)) {
-        self->doc = scorer->doc;
+        self->doc_num = scorer->doc_num;
         return true;
     }
     return false;
@@ -458,7 +458,7 @@ static bool smsc_next(FrtScorer *self) {
 static bool smsc_skip_to(FrtScorer *self, int doc_num) {
     FrtScorer *scorer = SMSc(self)->scorer;
     if (scorer->skip_to(scorer, doc_num)) {
-        self->doc = scorer->doc;
+        self->doc_num = scorer->doc_num;
         return true;
     }
     return false;
@@ -505,24 +505,24 @@ static float rossc_score(FrtScorer *self) {
     ReqOptSumScorer *rossc = ROSSc(self);
     FrtScorer *req_scorer = rossc->req_scorer;
     FrtScorer *opt_scorer = rossc->opt_scorer;
-    int cur_doc = req_scorer->doc;
+    int cur_doc_num = req_scorer->doc_num;
     float req_score = req_scorer->score(req_scorer);
 
     if (rossc->first_time_opt) {
         rossc->first_time_opt = false;
-        if (! opt_scorer->skip_to(opt_scorer, cur_doc)) {
+        if (! opt_scorer->skip_to(opt_scorer, cur_doc_num)) {
             FRT_SCORER_NULLIFY(rossc->opt_scorer);
             return req_score;
         }
     } else if (opt_scorer == NULL) {
         return req_score;
-    } else if ((opt_scorer->doc < cur_doc)
-             && ! opt_scorer->skip_to(opt_scorer, cur_doc)) {
+    } else if ((opt_scorer->doc_num < cur_doc_num)
+             && ! opt_scorer->skip_to(opt_scorer, cur_doc_num)) {
         FRT_SCORER_NULLIFY(rossc->opt_scorer);
         return req_score;
     }
     /* assert (@opt_scorer != nil) and (@opt_scorer.doc() >= cur_doc) */
-    return (opt_scorer->doc == cur_doc)
+    return (opt_scorer->doc_num == cur_doc_num)
         ? req_score + opt_scorer->score(opt_scorer)
         : req_score;
 }
@@ -530,7 +530,7 @@ static float rossc_score(FrtScorer *self) {
 static bool rossc_next(FrtScorer *self) {
     FrtScorer *req_scorer = ROSSc(self)->req_scorer;
     if (req_scorer->next(req_scorer)) {
-        self->doc = req_scorer->doc;
+        self->doc_num = req_scorer->doc_num;
         return true;
     }
     return false;
@@ -539,7 +539,7 @@ static bool rossc_next(FrtScorer *self) {
 static bool rossc_skip_to(FrtScorer *self, int doc_num) {
     FrtScorer *req_scorer = ROSSc(self)->req_scorer;
     if (req_scorer->skip_to(req_scorer, doc_num)) {
-        self->doc = req_scorer->doc;
+        self->doc_num = req_scorer->doc_num;
         return true;
     }
     return false;
@@ -598,25 +598,25 @@ typedef struct ReqExclScorer {
 static bool rxsc_to_non_excluded(FrtScorer *self) {
     FrtScorer *req_scorer = RXSc(self)->req_scorer;
     FrtScorer *excl_scorer = RXSc(self)->excl_scorer;
-    int excl_doc = excl_scorer->doc, req_doc;
+    int excl_doc_num = excl_scorer->doc_num, req_doc_num;
 
     do {
         /* may be excluded */
-        req_doc = req_scorer->doc;
-        if (req_doc < excl_doc) {
+        req_doc_num = req_scorer->doc_num;
+        if (req_doc_num < excl_doc_num) {
             /* req_scorer advanced to before excl_scorer, ie. not excluded */
-            self->doc = req_doc;
+            self->doc_num = req_doc_num;
             return true;
-        } else if (req_doc > excl_doc) {
-            if (! excl_scorer->skip_to(excl_scorer, req_doc)) {
+        } else if (req_doc_num > excl_doc_num) {
+            if (! excl_scorer->skip_to(excl_scorer, req_doc_num)) {
                 /* emptied, no more exclusions */
                 FRT_SCORER_NULLIFY(RXSc(self)->excl_scorer);
-                self->doc = req_doc;
+                self->doc_num = req_doc_num;
                 return true;
             }
-            excl_doc = excl_scorer->doc;
-            if (excl_doc > req_doc) {
-                self->doc = req_doc;
+            excl_doc_num = excl_scorer->doc_num;
+            if (excl_doc_num > req_doc_num) {
+                self->doc_num = req_doc_num;
                 return true; /* not excluded */
             }
         }
@@ -648,7 +648,7 @@ static bool rxsc_next(FrtScorer *self) {
         return false;
     }
     if (excl_scorer == NULL) {
-        self->doc = req_scorer->doc;
+        self->doc_num = req_scorer->doc_num;
         /* req_scorer->next() already returned true */
         return true;
     }
@@ -673,7 +673,7 @@ static bool rxsc_skip_to(FrtScorer *self, int doc_num) {
     }
     if (excl_scorer == NULL) {
         if (req_scorer->skip_to(req_scorer, doc_num)) {
-            self->doc = req_scorer->doc;
+            self->doc_num = req_scorer->doc_num;
             return true;
         }
         return false;
@@ -697,7 +697,7 @@ static FrtExplanation *rxsc_explain(FrtScorer *self, int doc_num) {
     FrtExplanation *e;
 
     if (excl_scorer->skip_to(excl_scorer, doc_num)
-        && excl_scorer->doc == doc_num) {
+        && excl_scorer->doc_num == doc_num) {
         e = frt_expl_new(0.0, "excluded:");
     } else {
         e = frt_expl_new(0.0, "not excluded:");
@@ -927,7 +927,7 @@ static bool bsc_next(FrtScorer *self) {
         cnt_sum_sc = bsc_init_counting_sum_scorer(BSc(self));
     }
     if (cnt_sum_sc->next(cnt_sum_sc)) {
-        self->doc = cnt_sum_sc->doc;
+        self->doc_num = cnt_sum_sc->doc_num;
         return true;
     } else {
         return false;
@@ -941,7 +941,7 @@ static bool bsc_skip_to(FrtScorer *self, int doc_num) {
         cnt_sum_sc = bsc_init_counting_sum_scorer(BSc(self));
     }
     if (cnt_sum_sc->skip_to(cnt_sum_sc, doc_num)) {
-        self->doc = cnt_sum_sc->doc;
+        self->doc_num = cnt_sum_sc->doc_num;
         return true;
     } else {
         return false;

data/ext/isomorfeus_ferret_ext/frt_q_const_score.c

@@ -21,11 +21,11 @@ static float cssc_score(FrtScorer *self) {
 }
 
 static bool cssc_next(FrtScorer *self) {
-    return ((self->doc = frt_bv_scan_next(CScSc(self)->bv)) >= 0);
+    return ((self->doc_num = frt_bv_scan_next(CScSc(self)->bv)) >= 0);
 }
 
 static bool cssc_skip_to(FrtScorer *self, int doc_num) {
-    return ((self->doc = frt_bv_scan_next_from(CScSc(self)->bv, doc_num)) >= 0);
+    return ((self->doc_num = frt_bv_scan_next_from(CScSc(self)->bv, doc_num)) >= 0);
 }
 
 static FrtExplanation *cssc_explain(FrtScorer *self, int doc_num) {