isomorfeus-ferret 0.17.3 → 0.17.5

data/ext/isomorfeus_ferret_ext/frt_q_term.c

@@ -19,7 +19,7 @@
 
 typedef struct TermScorer {
     FrtScorer      super;
-    int            docs[TDE_READ_SIZE];
+    int            doc_nums[TDE_READ_SIZE];
     int            freqs[TDE_READ_SIZE];
     int            pointer;
     int            pointer_max;
@@ -42,7 +42,7 @@ static float tsc_score(FrtScorer *self) {
         score = frt_sim_tf(self->similarity, (float)freq) * ts->weight_value;
     }
     /* normalize for field */
-    score *= frt_sim_decode_norm(self->similarity, ts->norms[self->doc]);
+    score *= frt_sim_decode_norm(self->similarity, ts->norms[self->doc_num]);
     return score;
 }
 
@@ -52,14 +52,14 @@ static bool tsc_next(FrtScorer *self) {
     ts->pointer++;
     if (ts->pointer >= ts->pointer_max) {
         /* refill buffer */
-        ts->pointer_max = ts->tde->read(ts->tde, ts->docs, ts->freqs, TDE_READ_SIZE);
+        ts->pointer_max = ts->tde->read(ts->tde, ts->doc_nums, ts->freqs, TDE_READ_SIZE);
         if (ts->pointer_max != 0) {
             ts->pointer = 0;
         } else {
             return false;
         }
     }
-    self->doc = ts->docs[ts->pointer];
+    self->doc_num = ts->doc_nums[ts->pointer];
     return true;
 }
 
@@ -69,8 +69,8 @@ static bool tsc_skip_to(FrtScorer *self, int doc_num) {
 
     /* first scan in cache */
     while (++(ts->pointer) < ts->pointer_max) {
-        if (ts->docs[ts->pointer] >= doc_num) {
-            self->doc = ts->docs[ts->pointer];
+        if (ts->doc_nums[ts->pointer] >= doc_num) {
+            self->doc_num = ts->doc_nums[ts->pointer];
             return true;
         }
     }
@@ -79,7 +79,7 @@ static bool tsc_skip_to(FrtScorer *self, int doc_num) {
     if (tde->skip_to(tde, doc_num)) {
         ts->pointer_max = 1;
         ts->pointer = 0;
-        ts->docs[0] = self->doc = tde->doc_num(tde);
+        ts->doc_nums[0] = self->doc_num = tde->doc_num(tde);
         ts->freqs[0] = tde->freq(tde);
         return true;
     } else {
@@ -93,7 +93,7 @@ static FrtExplanation *tsc_explain(FrtScorer *self, int doc_num) {
     int tf = 0;
 
     tsc_skip_to(self, doc_num);
-    if (self->doc == doc_num) {
+    if (self->doc_num == doc_num) {
         tf = ts->freqs[ts->pointer];
     }
     return frt_expl_new(frt_sim_tf(self->similarity, (float)tf),
@@ -208,7 +208,7 @@ static FrtWeight *tw_new(FrtQuery *query, FrtSearcher *searcher) {
                         searcher->doc_freq(searcher,
                                            TQ(query)->field,
                                            TQ(query)->term),
-                        searcher->max_doc(searcher)); /* compute idf */
+                        searcher->max_doc_num(searcher)); /* compute idf */
 
     return self;
 }

data/ext/isomorfeus_ferret_ext/frt_search.c

@@ -76,7 +76,7 @@ char *frt_expl_to_html(FrtExplanation *expl) {
 
 static bool hit_lt(FrtHit *hit1, FrtHit *hit2) {
     if (hit1->score == hit2->score) {
-        return hit1->doc > hit2->doc;
+        return hit1->doc_num > hit2->doc_num;
     } else {
         return hit1->score < hit2->score;
     }
@@ -188,7 +188,7 @@ char *frt_td_to_s(FrtTopDocs *td) {
                           td->total_hits);
     for (i = 0; i < td->size; i++) {
         hit = td->hits[i];
-        frt_estrcat(buffer, frt_strfmt("\t%d:%f\n", hit->doc, hit->score));
+        frt_estrcat(buffer, frt_strfmt("\t%d:%f\n", hit->doc_num, hit->score));
     }
     return buffer;
 }
@@ -432,11 +432,11 @@ FrtScorer *frt_scorer_create(size_t size, FrtSimilarity *similarity) {
 }
 
 bool frt_scorer_doc_less_than(const FrtScorer *s1, const FrtScorer *s2) {
-    return s1->doc < s2->doc;
+    return s1->doc_num < s2->doc_num;
 }
 
 int frt_scorer_doc_cmp(const void *p1, const void *p2) {
-    return (*(FrtScorer **)p1)->doc - (*(FrtScorer **)p2)->doc;
+    return (*(FrtScorer **)p1)->doc_num - (*(FrtScorer **)p2)->doc_num;
 }
 
 /***************************************************************************
@@ -912,9 +912,9 @@ static FrtLazyDoc *isea_get_lazy_doc(FrtSearcher *self, int doc_num) {
     return ir->get_lazy_doc(ir, doc_num);
 }
 
-static int isea_max_doc(FrtSearcher *self) {
+static int isea_max_doc_num(FrtSearcher *self) {
     FrtIndexReader *ir = ISEA(self)->ir;
-    return ir->max_doc(ir);
+    return ir->max_doc_num(ir);
 }
 
 #define IS_FILTERED(bits, post_filter, scorer, searcher) \
@@ -976,10 +976,10 @@ static FrtTopDocs *isea_search_w(FrtSearcher *self,
     }
 
     while (scorer->next(scorer)) {
-        if (bits && !frt_bv_get(bits, scorer->doc)) continue;
+        if (bits && !frt_bv_get(bits, scorer->doc_num)) continue;
         score = scorer->score(scorer);
         if (post_filter &&
-            !(filter_factor = post_filter->filter_func(scorer->doc,
+            !(filter_factor = post_filter->filter_func(scorer->doc_num,
                                                        score,
                                                        self,
                                                        post_filter->arg))) {
@@ -988,7 +988,7 @@ static FrtTopDocs *isea_search_w(FrtSearcher *self,
         total_hits++;
         if (filter_factor < 1.0f) score *= filter_factor;
         if (score > max_score) max_score = score;
-        hit.doc = scorer->doc; hit.score = score;
+        hit.doc_num = scorer->doc_num; hit.score = score;
         hq_insert(hq, &hit);
     }
     scorer->destroy(scorer);
@@ -1039,16 +1039,16 @@ static void isea_search_each_w(FrtSearcher *self, FrtWeight *weight, FrtFilter *
 
     while (scorer->next(scorer)) {
         float score;
-        if (bits && !frt_bv_get(bits, scorer->doc)) continue;
+        if (bits && !frt_bv_get(bits, scorer->doc_num)) continue;
         score = scorer->score(scorer);
         if (post_filter &&
-            !(filter_factor = post_filter->filter_func(scorer->doc,
+            !(filter_factor = post_filter->filter_func(scorer->doc_num,
                                                        score,
                                                        self,
                                                        post_filter->arg))) {
             continue;
         }
-        fn(self, scorer->doc, filter_factor * score, arg);
+        fn(self, scorer->doc_num, filter_factor * score, arg);
     }
     scorer->destroy(scorer);
 }
@@ -1076,7 +1076,7 @@ static int isea_search_unscored_w(FrtSearcher *self, FrtWeight *weight, int *buf
     if (scorer) {
         if (scorer->skip_to(scorer, offset_docnum)) {
             do {
-                buf[count++] = scorer->doc;
+                buf[count++] = scorer->doc_num;
             } while (count < limit && scorer->next(scorer));
         }
         scorer->destroy(scorer);
@@ -1142,7 +1142,7 @@ FrtSearcher *frt_isea_init(FrtSearcher *self, FrtIndexReader *ir) {
     self->doc_freq          = &frt_isea_doc_freq;
     self->get_doc           = &isea_get_doc;
     self->get_lazy_doc      = &isea_get_lazy_doc;
-    self->max_doc           = &isea_max_doc;
+    self->max_doc_num       = &isea_max_doc_num;
     self->create_weight     = &sea_create_weight;
     self->search            = &isea_search;
     self->search_w          = &isea_search_w;
@@ -1175,7 +1175,7 @@ FrtSearcher *frt_isea_new(FrtIndexReader *ir) {
 typedef struct CachedDFSearcher {
     FrtSearcher super;
     FrtHash     *df_map;
-    int      max_doc;
+    int         max_doc_num;
 } CachedDFSearcher;
 
 static int cdfsea_doc_freq(FrtSearcher *self, ID field, const char *text) {
@@ -1193,9 +1193,9 @@ static FrtDocument *cdfsea_get_doc(FrtSearcher *self, int doc_num) {
     return NULL;
 }
 
-static int cdfsea_max_doc(FrtSearcher *self) {
+static int cdfsea_max_doc_num(FrtSearcher *self) {
     (void)self;
-    return CDFSEA(self)->max_doc;
+    return CDFSEA(self)->max_doc_num;
 }
 
 static FrtWeight *cdfsea_create_weight(FrtSearcher *self, FrtQuery *query) {
@@ -1269,16 +1269,16 @@ static void cdfsea_close(FrtSearcher *self) {
     free(self);
 }
 
-static FrtSearcher *cdfsea_new(FrtHash *df_map, int max_doc) {
-    FrtSearcher *self          = (FrtSearcher *)FRT_ALLOC(CachedDFSearcher);
+static FrtSearcher *cdfsea_new(FrtHash *df_map, int max_doc_num) {
+    FrtSearcher *self       = (FrtSearcher *)FRT_ALLOC(CachedDFSearcher);
 
     CDFSEA(self)->df_map    = df_map;
-    CDFSEA(self)->max_doc   = max_doc;
+    CDFSEA(self)->max_doc_num = max_doc_num;
 
     self->similarity        = frt_sim_create_default();
     self->doc_freq          = &cdfsea_doc_freq;
     self->get_doc           = &cdfsea_get_doc;
-    self->max_doc           = &cdfsea_max_doc;
+    self->max_doc_num       = &cdfsea_max_doc_num;
     self->create_weight     = &cdfsea_create_weight;
     self->search            = &cdfsea_search;
     self->search_w          = &cdfsea_search_w;
@@ -1350,8 +1350,8 @@ static FrtLazyDoc *msea_get_lazy_doc(FrtSearcher *self, int doc_num) {
     return s->get_lazy_doc(s, doc_num - msea->starts[i]);
 }
 
-static int msea_max_doc(FrtSearcher *self) {
-    return MSEA(self)->max_doc;
+static int msea_max_doc_num(FrtSearcher *self) {
+    return MSEA(self)->max_doc_num;
 }
 
 static int *msea_get_doc_freqs(FrtSearcher *self, FrtHashSet *terms) {
@@ -1389,7 +1389,7 @@ static FrtWeight *msea_create_weight(FrtSearcher *self, FrtQuery *query) {
     frt_hs_destroy(terms);
     free(doc_freqs);
 
-    cdfsea = cdfsea_new(df_map, MSEA(self)->max_doc);
+    cdfsea = cdfsea_new(df_map, MSEA(self)->max_doc_num);
 
     w = frt_q_weight(rewritten_query, cdfsea);
     frt_q_deref(rewritten_query);
@@ -1546,7 +1546,7 @@ static FrtTopDocs *msea_search_w(FrtSearcher *self,
             int start = MSEA(self)->starts[i];
             for (j = 0; j < td->size; j++) {
                 FrtHit *hit = td->hits[j];
-                hit->doc += start;
+                hit->doc_num += start;
                 hq_insert(hq, hit);
             }
             td->size = 0;
@@ -1657,25 +1657,25 @@ FrtSearcher *frt_msea_alloc(void) {
 }
 
 FrtSearcher *frt_msea_init(FrtSearcher *self, FrtSearcher **searchers, int s_cnt) {
-    int i, max_doc = 0;
+    int i, max_doc_num = 0;
     int *starts = FRT_ALLOC_N(int, s_cnt + 1);
     for (i = 0; i < s_cnt; i++) {
-        starts[i] = max_doc;
-        max_doc += searchers[i]->max_doc(searchers[i]);
+        starts[i] = max_doc_num;
+        max_doc_num += searchers[i]->max_doc_num(searchers[i]);
         FRT_REF(searchers[i]);
     }
-    starts[i] = max_doc;
+    starts[i] = max_doc_num;
 
     MSEA(self)->s_cnt       = s_cnt;
     MSEA(self)->searchers   = searchers;
     MSEA(self)->starts      = starts;
-    MSEA(self)->max_doc     = max_doc;
+    MSEA(self)->max_doc_num = max_doc_num;
     self->ref_cnt           = 1;
     self->similarity        = frt_sim_create_default();
     self->doc_freq          = &msea_doc_freq;
     self->get_doc           = &msea_get_doc;
     self->get_lazy_doc      = &msea_get_lazy_doc;
-    self->max_doc           = &msea_max_doc;
+    self->max_doc_num       = &msea_max_doc_num;
     self->create_weight     = &msea_create_weight;
     self->search            = &msea_search;
     self->search_w          = &msea_search_w;

data/ext/isomorfeus_ferret_ext/frt_search.h

@@ -68,7 +68,7 @@ extern FrtMatchVector *frt_matchv_compact_with_breaks(FrtMatchVector *self);
  ***************************************************************************/
 
 typedef struct FrtHit {
-    int   doc;
+    int   doc_num;
     float score;
 } FrtHit;
 
@@ -504,7 +504,7 @@ struct FrtSpanEnum {
     FrtQuery *query;
     bool     (*next)(FrtSpanEnum *self);
     bool     (*skip_to)(FrtSpanEnum *self, int target_doc);
-    int      (*doc)(FrtSpanEnum *self);
+    int      (*doc_num)(FrtSpanEnum *self);
     int      (*start)(FrtSpanEnum *self);
     int      (*end)(FrtSpanEnum *self);
     char     *(*to_s)(FrtSpanEnum *self);
@@ -645,7 +645,7 @@ extern FrtQuery *frt_spanprq_new(ID field, const char *prefix);
 
 struct FrtScorer {
     FrtSimilarity  *similarity;
-    int            doc;
+    int            doc_num;
     float          (*score)(FrtScorer *self);
     bool           (*next)(FrtScorer *self);
     bool           (*skip_to)(FrtScorer *self, int doc_num);
@@ -795,7 +795,7 @@ struct FrtSearcher {
     int            (*doc_freq)(FrtSearcher *self, ID field, const char *term);
     FrtDocument    *(*get_doc)(FrtSearcher *self, int doc_num);
     FrtLazyDoc     *(*get_lazy_doc)(FrtSearcher *self, int doc_num);
-    int            (*max_doc)(FrtSearcher *self);
+    int            (*max_doc_num)(FrtSearcher *self);
     FrtWeight      *(*create_weight)(FrtSearcher *self, FrtQuery *query);
     FrtTopDocs     *(*search)(FrtSearcher *self, FrtQuery *query, int first_doc, int num_docs, FrtFilter *filter, FrtSort *sort, FrtPostFilter *post_filter, bool load_fields);
     FrtTopDocs     *(*search_w)(FrtSearcher *self, FrtWeight *weight, int first_doc, int num_docs, FrtFilter *filter, FrtSort *sort, FrtPostFilter *post_filter, bool load_fields);
@@ -822,7 +822,7 @@ struct FrtSearcher {
 
 #define frt_searcher_get_doc(s, dn)         s->get_doc(s, dn)
 #define frt_searcher_get_lazy_doc(s, dn)    s->get_lazy_doc(s, dn)
-#define frt_searcher_max_doc(s)             s->max_doc(s)
+#define frt_searcher_max_doc(s)             s->max_doc_num(s)
 #define frt_searcher_rewrite(s, q)          s->rewrite(s, q)
 #define frt_searcher_explain(s, q, dn)      s->explain(s, q, dn)
 #define frt_searcher_close(s)               s->close(s)
@@ -868,7 +868,7 @@ typedef struct FrtMultiSearcher {
     int         s_cnt;
     FrtSearcher **searchers;
     int         *starts;
-    int         max_doc;
+    int         max_doc_num;
 } FrtMultiSearcher;
 
 extern FrtSearcher *frt_msea_alloc(void);

data/ext/isomorfeus_ferret_ext/frt_similarity.c

@@ -63,7 +63,7 @@ static float simdef_sloppy_freq(struct FrtSimilarity *s, int distance) {
 
 static float simdef_idf_term(struct FrtSimilarity *s, ID field, char *term, FrtSearcher *searcher) {
     return s->idf(s, searcher->doc_freq(searcher, field, term),
-                  searcher->max_doc(searcher));
+                  searcher->max_doc_num(searcher));
 }
 
 static float simdef_idf_phrase(struct FrtSimilarity *s, ID field, FrtPhrasePosition *positions, int pp_cnt, FrtSearcher *searcher) {

data/ext/isomorfeus_ferret_ext/frt_sort.c

@@ -145,12 +145,12 @@ FrtSortField *FRT_SORT_FIELD_SCORE_REV;
 
 void frt_sort_field_doc_get_val(void *index, FrtHit *hit, FrtComparable *comparable) {
     (void)index;
-    comparable->val.l = hit->doc;
+    comparable->val.l = hit->doc_num;
 }
 
 int frt_sort_field_doc_compare(void *index_ptr, FrtHit *hit1, FrtHit *hit2) {
-    int val1 = hit1->doc;
-    int val2 = hit2->doc;
+    int val1 = hit1->doc_num;
+    int val2 = hit2->doc_num;
     (void)index_ptr;
 
     if (val1 > val2) return 1;
@@ -174,12 +174,12 @@ FrtSortField *FRT_SORT_FIELD_DOC_REV;
  ***************************************************************************/
 
 static void sf_byte_get_val(void *index, FrtHit *hit, FrtComparable *comparable) {
-    comparable->val.l = ((long *)index)[hit->doc];
+    comparable->val.l = ((long *)index)[hit->doc_num];
 }
 
 static int sf_byte_compare(void *index, FrtHit *hit1, FrtHit *hit2) {
-    long val1 = ((long *)index)[hit1->doc];
-    long val2 = ((long *)index)[hit2->doc];
+    long val1 = ((long *)index)[hit1->doc_num];
+    long val2 = ((long *)index)[hit2->doc_num];
     if (val1 > val2) return 1;
     else if (val1 < val2) return -1;
     else return 0;
@@ -198,12 +198,12 @@ FrtSortField *frt_sort_field_byte_new(ID field, bool reverse) {
  ***************************************************************************/
 
 static void sf_int_get_val(void *index, FrtHit *hit, FrtComparable *comparable) {
-    comparable->val.l = ((long *)index)[hit->doc];
+    comparable->val.l = ((long *)index)[hit->doc_num];
 }
 
 static int sf_int_compare(void *index, FrtHit *hit1, FrtHit *hit2) {
-    long val1 = ((long *)index)[hit1->doc];
-    long val2 = ((long *)index)[hit2->doc];
+    long val1 = ((long *)index)[hit1->doc_num];
+    long val2 = ((long *)index)[hit2->doc_num];
     if (val1 > val2) return 1;
     else if (val1 < val2) return -1;
     else return 0;
@@ -222,12 +222,12 @@ FrtSortField *frt_sort_field_int_new(ID field, bool reverse) {
  ***************************************************************************/
 
 static void sf_float_get_val(void *index, FrtHit *hit, FrtComparable *comparable) {
-    comparable->val.f = ((float *)index)[hit->doc];
+    comparable->val.f = ((float *)index)[hit->doc_num];
 }
 
 static int sf_float_compare(void *index, FrtHit *hit1, FrtHit *hit2) {
-    float val1 = ((float *)index)[hit1->doc];
-    float val2 = ((float *)index)[hit2->doc];
+    float val1 = ((float *)index)[hit1->doc_num];
+    float val2 = ((float *)index)[hit2->doc_num];
     if (val1 > val2) return 1;
     else if (val1 < val2) return -1;
     else return 0;
@@ -248,14 +248,14 @@ FrtSortField *frt_sort_field_float_new(ID field, bool reverse) {
 static void sf_string_get_val(void *index, FrtHit *hit, FrtComparable *comparable) {
     comparable->val.s
         = ((FrtStringIndex *)index)->values[
-        ((FrtStringIndex *)index)->index[hit->doc]];
+        ((FrtStringIndex *)index)->index[hit->doc_num]];
 }
 
 static int sf_string_compare(void *index, FrtHit *hit1, FrtHit *hit2) {
     char *s1 = ((FrtStringIndex *)index)->values[
-        ((FrtStringIndex *)index)->index[hit1->doc]];
+        ((FrtStringIndex *)index)->index[hit1->doc_num]];
     char *s2 = ((FrtStringIndex *)index)->values[
-        ((FrtStringIndex *)index)->index[hit2->doc]];
+        ((FrtStringIndex *)index)->index[hit2->doc_num]];
 
     if (s1 == NULL) return s2 ? 1 : 0;
     if (s2 == NULL) return -1;
@@ -427,7 +427,7 @@ static bool fshq_lt(Sorter *sorter, FrtHit *hit1, FrtHit *hit2) {
     if (diff != 0) {
         return diff > 0;
     } else {
-        return hit1->doc > hit2->doc;
+        return hit1->doc_num > hit2->doc_num;
     }
 }
 
@@ -584,7 +584,7 @@ bool frt_fdshq_lt(FrtFieldDoc *fd1, FrtFieldDoc *fd2) {
                     else { all_equal = false; }
                     break;
                 case FRT_SORT_TYPE_DOC:
-                    if (fd1->hit.doc < fd2->hit.doc) { all_equal = false; c = true; }
+                    if (fd1->hit.doc_num < fd2->hit.doc_num) { all_equal = false; c = true; }
                     break;
                 case FRT_SORT_TYPE_INTEGER:
                     if (cmps1[i].val.l < cmps2[i].val.l) { all_equal = false; c = true; }
@@ -631,7 +631,7 @@ bool frt_fdshq_lt(FrtFieldDoc *fd1, FrtFieldDoc *fd2) {
                     else { all_equal = false; }
                     break;
                 case FRT_SORT_TYPE_DOC:
-                    if (fd1->hit.doc > fd2->hit.doc) { all_equal = false; c = true; }
+                    if (fd1->hit.doc_num > fd2->hit.doc_num) { all_equal = false; c = true; }
                     break;
                 case FRT_SORT_TYPE_INTEGER:
                     if (cmps1[i].val.l > cmps2[i].val.l) { all_equal = false; c = true; }
@@ -670,9 +670,9 @@ bool frt_fdshq_lt(FrtFieldDoc *fd1, FrtFieldDoc *fd2) {
     }
     if (all_equal) {
         if (cmps1[0].reverse) {
-            if (fd1->hit.doc > fd2->hit.doc) c = true;
+            if (fd1->hit.doc_num > fd2->hit.doc_num) c = true;
         } else {
-            if (fd1->hit.doc > fd2->hit.doc) c = true;
+            if (fd1->hit.doc_num > fd2->hit.doc_num) c = true;
         }
     }
     return c;

data/ext/isomorfeus_ferret_ext/test.c

@@ -250,7 +250,7 @@ static const char *curr_err_func = "";
 static void vappend_to_msg_buf(const char *fmt, va_list args) {
     int v = vsnprintf(msg_bufp, MSG_BUF_HAVE, fmt, args);
     if (v < 0) {
-        rb_raise(rb_eStandardError, "Error: can't write to test message buffer\n");
+        rb_raise(rb_eStandardError, "Error: can't write to test message buffer, error: %i\n", v);
     } else {
         msg_bufp += v;
     }

data/ext/isomorfeus_ferret_ext/test_file_deleter.c

@@ -16,7 +16,6 @@ const FrtConfig lucene_config = {
     10000,          /* maximum field length (number of terms) */
 };
 
-
 static FrtFieldInfos *prep_fis(void) {
     return frt_fis_new(0 | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM);
 }
@@ -72,7 +71,7 @@ static void test_delete_leftover_files(TestCase *tc, void *data) {
     /* Delete one doc so we get a .del file: */
     ir = frt_ir_open(NULL, store);
     frt_ir_delete_doc(ir, 7);
-    Aiequal(1, ir->max_doc(ir) - ir->num_docs(ir));
+    Aiequal(1, ir->max_doc_num(ir) - ir->num_docs(ir));
 
     /* Set one norm so we get a .s0 file: */
     frt_ir_set_norm(ir, 21, rb_intern(content_f), 12);

data/ext/isomorfeus_ferret_ext/test_filter.c

@@ -65,22 +65,21 @@ static void check_filtered_hits(TestCase *tc, FrtSearcher *searcher, FrtQuery *q
     Aiequal(total_hits, top_docs->size);
 
     if ((top >= 0) && top_docs->size) {
-        Aiequal(top, top_docs->hits[0]->doc);
+        Aiequal(top, top_docs->hits[0]->doc_num);
     }
 
     for (i = 0; i < top_docs->size; i++) {
         FrtHit *hit = top_docs->hits[i];
         char buf[1000];
-        sprintf(buf, "doc %d was found unexpectedly", hit->doc);
-        Assert(frt_ary_includes(num_array, total_hits, hit->doc), buf);
+        sprintf(buf, "doc %d was found unexpectedly", hit->doc_num);
+        Assert(frt_ary_includes(num_array, total_hits, hit->doc_num), buf);
         /* only check the explanation if we got the correct docs. Obviously we
          * might want to remove this to visually check the explanations */
         if (total_hits == top_docs->total_hits) {
-            FrtExplanation *e = searcher->explain(searcher, query, hit->doc);
+            FrtExplanation *e = searcher->explain(searcher, query, hit->doc_num);
             float escore = e->value;
             if (post_filter) {
-                escore *= post_filter->filter_func(hit->doc, escore, searcher,
-                                                   post_filter->arg);
+                escore *= post_filter->filter_func(hit->doc_num, escore, searcher, post_filter->arg);
             }
             Afequal(hit->score, escore);
             frt_expl_destroy(e);