Changeset 4d029545b40f84527ced49dc4058d41efd235873

Timestamp:

04/30/08 20:42:59 (8 months ago)

Author:

David Balmain <dbalmain@…>

Parents:

76d73d55aa0ba896da711c5ed3d0e2b3e236ef3e

Children:

3021e363641eff71706f13f24f0d3775d2645bfd

git-committer:

David Balmain <dbalmain@gmail.com> / 2008-04-30T20:42:59Z+1000

Message:

Full test coverage for RangeQuery?

Location:

c

Files:

• .rake/gcov.history (modified) (previous)
• Rakefile (modified) (2 diffs)
• include/index.h (modified) (1 diff)
• include/internal.h (modified) (1 diff)
• src/q_phrase.c (modified) (2 diffs)
• src/q_range.c (modified) (7 diffs)
• src/term_vectors.c (modified) (3 diffs)
• test/test_search.c (modified) (19 diffs)
• test/test_term_vectors.c (modified) (1 diff)

c/Rakefile

@@ -265 +265 @@
   gcov_sorted_keys.each do |fn|
     res = $gcov_results.files[fn]
-    puts "%25s %6.2f%% (%4d)" % [fn, res.percent, res.line_count]
-  end
-  puts "Total Lines:         %s" % $gcov_results.total_lines
-  puts "Total Lines covered: %s (%0.2f%%)" % 
+    puts "%23s %6.2f%% (%4d)" % [fn, res.percent, res.line_count]
+  end
+  puts "Total Lines:   %s" % $gcov_results.total_lines
+  puts "Covered Lines: %s (%0.2f%%)" % 
             [$gcov_results.covered_lines, $gcov_results.percent]
 end
@@ -296 +296 @@
 
 task :do_gcov do
-  CFLAGS << " -fprofile-arcs -ftest-coverage"
+  CFLAGS << " -fprofile-arcs -ftest-coverage -DNDEBUG"
+  FileList['**/*.gcda'].each{|fn| rm fn}
   run_tests
   gcov_result_map = {}

c/include/index.h

@@ -560 +560 @@
 
 extern void frt_tv_destroy(FrtTermVector *tv);
-extern int frt_tv_get_tv_term_index(FrtTermVector *tv, const char *term);
+extern int frt_tv_get_term_index(FrtTermVector *tv, const char *term);
+extern int frt_tv_scan_to_term_index(FrtTermVector *tv, const char *term);
 extern FrtTVTerm *frt_tv_get_tv_term(FrtTermVector *tv, const char *term);
 

c/include/internal.h

@@ -943 +943 @@
 #define ts_next                                 frt_ts_next
 #define tv_destroy                              frt_tv_destroy
+#define tv_get_term_index                       frt_tv_get_term_index
 #define tv_get_tv_term                          frt_tv_get_tv_term
-#define tv_get_tv_term_index                    frt_tv_get_tv_term_index
+#define tv_scan_to_term_index                   frt_tv_scan_to_term_index
 #define u16                                     frt_u16
 #define u32                                     frt_u32

c/src/q_phrase.c

@@ -462 +462 @@
 
     for (i = 0; i < pp_cnt; i++) {
+        bool res;
         pp = phsc->phrase_pos[i];
         /* we should always have at least one position or this functions
          * shouldn't have been called. */
-        assert(pp_first_position(pp));
+        res = pp_first_position(pp);
+        assert(res);(void)res;
         if (check_repeats && i > 0) {
             if (!sphsc_check_repeats(pp, phsc->phrase_pos, i - 1)) {
@@ -779 +781 @@
             TVPosEnum *tvpe = tvpe_new(tv_term->positions, tv_term->freq, 0);
             /* got tv_term so tvpe_next should always return true once here */
-            assert(tvpe_next(tvpe));
+            bool res = tvpe_next(tvpe);
+            assert(res);(void)res;
             pq_push(tvpe_pq, tvpe);
             total_positions += tv_term->freq;

c/src/q_range.c

@@ -409 +409 @@
                     break;
                 case TRC_NONE:
-                    RAISE(ARG_ERROR, "Nil bounds for range. A range must "
-                          "include either lower bound or an upper bound");
+                    /* should never happen. Error should have been raised */
+                    assert(false);
             }
             tde->close(tde);
@@ -468 +468 @@
     Range *range = RQ(((ConstantScoreQuery *)self)->original)->range;
     if (tv->field == range->field) {
+        const int term_cnt = tv->term_cnt;
         int i, j;
         char *upper_text = range->upper_term;
         char *lower_text = range->lower_term;
         int upper_limit = range->include_upper ? 1 : 0;
-        int lower_limit = range->include_lower ? 1 : 0;
-
-        for (i = tv->term_cnt - 1; i >= 0; i--) {
+
+        i = lower_text ? tv_scan_to_term_index(tv, lower_text) : 0;
+        if (i < term_cnt && !range->include_lower && lower_text
+            && 0 == strcmp(lower_text, tv->terms[i].text)) {
+            i++;
+        }
+
+        for (; i < term_cnt; i++) {
             TVTerm *tv_term = &(tv->terms[i]);
             char *text = tv_term->text;
-            if ((!upper_text || strcmp(text, upper_text) < upper_limit) && 
-                (!lower_text || strcmp(lower_text, text) < lower_limit)) {
-                const int tv_term_freq = tv_term->freq;
-                for (j = 0; j < tv_term_freq; j++) {
-                    int pos = tv_term->positions[j];
-                    matchv_add(mv, pos, pos);
-                }
+            const int tv_term_freq = tv_term->freq;
+            if (upper_text && strcmp(text, upper_text) >= upper_limit) {
+                break;
+            } 
+            for (j = 0; j < tv_term_freq; j++) {
+                int pos = tv_term->positions[j];
+                matchv_add(mv, pos, pos);
             }
         }
@@ -528 +534 @@
               const char *upper_term, bool include_lower, bool include_upper)
 {
-    Query *self     = q_new(RangeQuery);
-
-    RQ(self)->range = range_new(field, lower_term, upper_term,
-                                include_lower, include_upper); 
+    Query *self;
+    Range *range            = range_new(field, lower_term, upper_term,
+                                        include_lower, include_upper); 
+    self                    = q_new(RangeQuery);
+    RQ(self)->range         = range;
 
     self->type              = RANGE_QUERY;
@@ -553 +560 @@
     TVTerm *tv_term = &(tv->terms[i]);\
     char *text = tv_term->text;\
-    double num = sscanf(text, "%lg%n", &num, &len);\
-    if ((int)strlen(text) != len) { /* We have a number */\
+    double num;\
+    sscanf(text, "%lg%n", &num, &len);\
+    if ((int)strlen(text) == len) { /* We have a number */\
         if (cond) {\
             const int tv_term_freq = tv_term->freq;\
@@ -574 +582 @@
         const char *lt = range->lower_term;
         const char *ut = range->upper_term;
-        if ((!lt || (sscanf(lt,"%lg%n",&lnum,&len) && (int)strlen(lt) == len))&&
-            (!ut || (sscanf(ut,"%lg%n",&unum,&len) && (int)strlen(ut) == len)))
+        if ((!lt
+             || (sscanf(lt,"%lg%n",&lnum,&len) && (int)strlen(lt) == len))
+            &&
+            (!ut
+             || (sscanf(ut,"%lg%n",&unum,&len) && (int)strlen(ut) == len)))
         {
             TypedRangeCheck check = TRC_NONE;
@@ -615 +626 @@
                     break;
                 case TRC_NONE:
-                    RAISE(ARG_ERROR, "Nil bounds for range. A range must "
-                          "include either lower bound or an upper bound");
+                    /* should never happen. Error should have been raised */
+                    assert(false);
             }
 
@@ -655 +666 @@
                const char *upper_term, bool include_lower, bool include_upper)
 {
-    Query *self     = q_new(RangeQuery);
-
-    RQ(self)->range = trange_new(field, lower_term, upper_term,
-                                 include_lower, include_upper); 
+    Query *self;
+    Range *range            = trange_new(field, lower_term, upper_term,
+                                         include_lower, include_upper); 
+    self                    = q_new(RangeQuery);
+    RQ(self)->range         = range;
 
     self->type              = TYPED_RANGE_QUERY;

c/src/term_vectors.c

@@ -25 +25 @@
 }
 
-int tv_get_tv_term_index(TermVector *tv, const char *term)
+int tv_scan_to_term_index(TermVector *tv, const char *term)
 {
     int lo = 0;                 /* search starts array */
@@ -33 +33 @@
     char *mid_term;
 
-    while (hi > lo) {
+    while (hi >= lo) {
         mid = (lo + hi) >> 1;
         mid_term = tv->terms[mid].text;
@@ -47 +47 @@
         }
     }
-    if (hi >= 0 && strcmp(term, tv->terms[hi].text) == 0) {
-        return hi;
-    }
-    return -1;
+    return lo;
 }
 
-extern TVTerm *tv_get_tv_term(TermVector *tv, const char *term)
+int tv_get_term_index(TermVector *tv, const char *term)
 {
-    int index = tv_get_tv_term_index(tv, term);
+    int index = tv_scan_to_term_index(tv, term);
+    if (index < tv->term_cnt && (0 == strcmp(term, tv->terms[index].text))) {
+        /* found term */
+        return index;
+    }
+    else {
+        return -1;
+    }
+}
+
+TVTerm *tv_get_tv_term(TermVector *tv, const char *term)
+{
+    int index = tv_get_term_index(tv, term);
     if (index >= 0) {
         return &(tv->terms[index]);

c/test/test_search.c

@@ -7 +7 @@
 
 #define ARRAY_SIZE 40
+
+static Symbol date, field, cat, number;
 
 static void test_byte_float_conversion(TestCase *tc, void *data)
@@ -85 +87 @@
     ary_push(positions[3].terms, (char *)"term5");
 
-    Afequal(1.0/4, sim_length_norm(dsim, I("field"), 16));
+    Afequal(1.0/4, sim_length_norm(dsim, field, 16));
     Afequal(1.0/4, sim_query_norm(dsim, 16));
     Afequal(3.0, sim_tf(dsim, 9));
@@ -93 +95 @@
     searcher.doc_freq = &my_doc_freq;
     searcher.max_doc = &my_max_doc;
-    Afequal(1.0, sim_idf_term(dsim, I("field"), positions[0].terms[0], &searcher));
-    Afequal(12.0, sim_idf_phrase(dsim, I("field"), positions, 4, &searcher));
+    Afequal(1.0, sim_idf_term(dsim, field, positions[0].terms[0], &searcher));
+    Afequal(12.0, sim_idf_phrase(dsim, field, positions, 4, &searcher));
 
     ary_free(positions[0].terms);
@@ -156 +158 @@
 };
 
-static Symbol date, field, cat, number;
-
 #define SEARCH_DOCS_SIZE 18
 struct Data test_data[SEARCH_DOCS_SIZE] = {
@@ -163 +163 @@
         "cat1/",                ".123"},
     {"20051001", "word1 word2 the quick brown fox the quick brown fox",
-        "cat1/sub1",            "0.954"},
+        "cat1/sub1",            "0.0"},
     {"20051002", "word1 word3 one two one",
         "cat1/sub1/subsub1",    "908.123434"},
@@ -201 +201 @@
         "cat1/",                "-1.0"}
 };
+
 static void prepare_search_index(Store *store)
 {
@@ -209 +210 @@
                               INDEX_YES,
                               TERM_VECTOR_WITH_POSITIONS_OFFSETS);
+    FieldInfo *fi = fi_new(I("empty-field"), STORE_NO, INDEX_NO, TERM_VECTOR_NO);
+    fis_add_field(fis, fi);
     index_create(store, fis);
     fis_deref(fis);
@@ -333 +336 @@
 }
 
+void check_match_vector(TestCase *tc, Searcher *searcher, Query *query,
+                        int doc, Symbol field, char *ranges)
+{
+    static int range_array[ARRAY_SIZE];
+    MatchVector *mv = searcher_get_match_vector(searcher, query, doc, field);
+    int num_matches = s2l(ranges, range_array)/2;
+    if (Aiequal(num_matches, mv->size)) {
+        int i;
+        for (i = 0; i < num_matches; i++) {
+            Aiequal(range_array[i*2    ], mv->matches[i].start);
+            Aiequal(range_array[i*2 + 1], mv->matches[i].end);
+        }
+    }
+    matchv_destroy(mv);
+}
+
 static void test_term_query(TestCase *tc, void *data)
 {
-    MatchVector *mv;
     HashSet *hs;
     Searcher *searcher = (Searcher *)data;
@@ -392 +410 @@
     /* test get_matchv_i */
     check_hits(tc, searcher, tq, "1,11,14,16,17", -1);
-    mv = searcher_get_match_vector(searcher, tq, 1, field);
-    if (Aiequal(2, mv->size)) {
-        Aiequal(3, mv->matches[0].start);
-        Aiequal(3, mv->matches[0].end);
-        Aiequal(7, mv->matches[1].start);
-        Aiequal(7, mv->matches[1].end);
-    }
-    matchv_destroy(mv);
+    check_match_vector(tc, searcher, tq, 1, field, "3,3,7,7");
 
     /* test extract_terms */
@@ -555 +566 @@
 static void test_phrase_query(TestCase *tc, void *data)
 {
-    MatchVector *mv;
     Searcher *searcher = (Searcher *)data;
     Explanation *explanation;
@@ -671 +681 @@
     phq_add_term(phq, "brown", 1);
     check_hits(tc, searcher, phq, "1", -1);
-    mv = searcher_get_match_vector(searcher, phq, 1, field);
-    if (Aiequal(2, mv->size)) {
-        Aiequal(3, mv->matches[0].start);
-        Aiequal(4, mv->matches[0].end);
-        Aiequal(7, mv->matches[1].start);
-        Aiequal(8, mv->matches[1].end);
-    }
-    matchv_destroy(mv);
+    check_match_vector(tc, searcher, phq, 1, field, "3,4,7,8");
+
     phq_set_slop(phq, 4);
     check_hits(tc, searcher, phq, "1,16,17", -1);
-    mv = searcher_get_match_vector(searcher, phq, 1, field);
-    if (Aiequal(2, mv->size)) {
-        Aiequal(3, mv->matches[0].start);
-        Aiequal(4, mv->matches[0].end);
-        Aiequal(7, mv->matches[1].start);
-        Aiequal(8, mv->matches[1].end);
-    }
-    matchv_destroy(mv);
-    mv = searcher_get_match_vector(searcher, phq, 16, field);
-    if (Aiequal(1, mv->size)) {
-        Aiequal(2, mv->matches[0].start);
-        Aiequal(5, mv->matches[0].end);
-    }
-    matchv_destroy(mv);
+    check_match_vector(tc, searcher, phq, 16, field, "2,5");
+
     phq_add_term(phq, "chicken", 1);
     check_hits(tc, searcher, phq, "", -1);
-    mv = searcher_get_match_vector(searcher, phq, 16, field);
-    Aiequal(0, mv->size);
-    matchv_destroy(mv);
+    check_match_vector(tc, searcher, phq, 16, field, "");
     q_deref(phq);
 }
@@ -760 +750 @@
     Searcher *searcher = (Searcher *)data;
     Query *phq, *q;
-    MatchVector *mv;
 
     phq = phq_new(field);
@@ -834 +823 @@
     phq_append_multi_term(phq, "red");
     check_hits(tc, searcher, phq, "1,11", -1);
-    mv = searcher_get_match_vector(searcher, phq, 1, field);
-    if (Aiequal(2, mv->size)) {
-        Aiequal(3, mv->matches[0].start);
-        Aiequal(4, mv->matches[0].end);
-        Aiequal(7, mv->matches[1].start);
-        Aiequal(8, mv->matches[1].end);
-    }
-    matchv_destroy(mv);
+    check_match_vector(tc, searcher, phq, 1, field, "3,4,7,8");
+
     phq_set_slop(phq, 1);
     check_hits(tc, searcher, phq, "1,11,17", -1);
-    mv = searcher_get_match_vector(searcher, phq, 1, field);
-    if (Aiequal(2, mv->size)) {
-        Aiequal(3, mv->matches[0].start);
-        Aiequal(4, mv->matches[0].end);
-        Aiequal(7, mv->matches[1].start);
-        Aiequal(8, mv->matches[1].end);
-    }
-    matchv_destroy(mv);
-    mv = searcher_get_match_vector(searcher, phq, 17, field);
-    if (Aiequal(1, mv->size)) {
-        Aiequal(5, mv->matches[0].start);
-        Aiequal(7, mv->matches[0].end);
-    }
-    matchv_destroy(mv);
+    check_match_vector(tc, searcher, phq, 1, field, "3,4,7,8");
+    check_match_vector(tc, searcher, phq, 17, field, "5,7");
+
     phq_add_term(phq, "chicken", 1);
     phq_append_multi_term(phq, "turtle");
     check_hits(tc, searcher, phq, "", -1);
-    mv = searcher_get_match_vector(searcher, phq, 17, field);
-    Aiequal(0, mv->size);
-    matchv_destroy(mv);
+    check_match_vector(tc, searcher, phq, 17, field, "");
     q_deref(phq);
 }
@@ -1064 +1034 @@
 }
 
+static void rq_new_lower_gt_upper(void *p)
+{ (void)p; rq_new(date, "20050101", "20040101", true, true); }
+
+static void rq_new_include_lower_and_null_lower(void *p)
+{ (void)p; rq_new(date, NULL, "20040101", true, true); }
+
+static void rq_new_include_upper_and_null_upper(void *p)
+{ (void)p; rq_new(date, "20050101", NULL, true, true); }
+
+static void rq_new_null_lower_and_upper(void *p)
+{ (void)p; rq_new(date, NULL, NULL, false, false); }
+
 static void test_range_query(TestCase *tc, void *data)
 {
     Searcher *searcher = (Searcher *)data;
     Query *rq;
+
+    Araise(ARG_ERROR, &rq_new_lower_gt_upper, NULL);
+    Araise(ARG_ERROR, &rq_new_include_lower_and_null_lower, NULL);
+    Araise(ARG_ERROR, &rq_new_include_upper_and_null_upper, NULL);
+    Araise(ARG_ERROR, &rq_new_null_lower_and_upper, NULL);
+
     rq = rq_new(date, "20051006", "20051010", true, true);
     check_hits(tc, searcher, rq, "6,7,8,9,10", -1);
@@ -1129 +1117 @@
     check_hits(tc, searcher, rq, "", -1);
     q_deref(rq);
+
+    /* test get_matchv_i */
+    /* NOTE: if you are reading this to learn how to use RangeQuery the
+     * following is not a good idea. You should usually only use a RangeQuery
+     * on an untokenized field. This is just done for testing purposes to
+     * check that it works correctly. */
+    rq = rq_new(field, "word1", "word3", true, true);
+    check_hits(tc, searcher, rq, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17", -1);
+    check_match_vector(tc, searcher, rq, 2, I("not a field"), "");
+    check_match_vector(tc, searcher, rq, 2, field, "0,0,1,1");
+    q_deref(rq);
+
+    rq = rq_new(field, "word1", "word3", false, true);
+    check_match_vector(tc, searcher, rq, 2, field, "1,1");
+    q_deref(rq);
+
+    rq = rq_new(field, "word1", "word3", true, false);
+    check_match_vector(tc, searcher, rq, 2, field, "0,0");
+    q_deref(rq);
+
+    rq = rq_new(field, "word1", "word3", false, false);
+    check_match_vector(tc, searcher, rq, 2, field, "");
+    q_deref(rq);
 }
 
@@ -1194 +1205 @@
 }
 
+static void trq_new_int_lower_gt_upper(void *p)
+{ (void)p; trq_new(date, "20050101", "20040101", true, true); }
+
+static void trq_new_float_lower_gt_upper(void *p)
+{ (void)p; trq_new(number, "2.5", "-2.5", true, true); }
+
+static void trq_new_string_lower_gt_upper(void *p)
+{ (void)p; trq_new(cat, "cat_b", "cat_a", true, true); }
+
+static void trq_new_include_lower_and_null_lower(void *p)
+{ (void)p; trq_new(date, NULL, "20040101", true, true); }
+
+static void trq_new_include_upper_and_null_upper(void *p)
+{ (void)p; trq_new(date, "20050101", NULL, true, true); }
+
+static void trq_new_null_lower_and_upper(void *p)
+{ (void)p; trq_new(date, NULL, NULL, false, false); }
+
 static void test_typed_range_query(TestCase *tc, void *data)
 {
     Searcher *searcher = (Searcher *)data;
     Query *trq;
+
+    Araise(ARG_ERROR, trq_new_int_lower_gt_upper, NULL);
+    Araise(ARG_ERROR, trq_new_float_lower_gt_upper, NULL);
+    Araise(ARG_ERROR, trq_new_string_lower_gt_upper, NULL);
+    Araise(ARG_ERROR, trq_new_include_lower_and_null_lower, NULL);
+    Araise(ARG_ERROR, trq_new_include_upper_and_null_upper, NULL);
+    Araise(ARG_ERROR, trq_new_null_lower_and_upper, NULL);
+
     trq = trq_new(number, "-1.0", "1.0", true, true);
     check_hits(tc, searcher, trq, "0,1,4,10,15,17", -1);
+    check_match_vector(tc, searcher, trq, 0, number, "0,0");
+    check_match_vector(tc, searcher, trq, 10, number, "0,0");
+    check_match_vector(tc, searcher, trq, 17, number, "0,0");
+    check_match_vector(tc, searcher, trq, 2, number, "");
     q_deref(trq);
 
     trq = trq_new(number, "-1.0", "1.0", false, false);
     check_hits(tc, searcher, trq, "0,1,4,15", -1);
-    q_deref(trq);
-
+    check_match_vector(tc, searcher, trq, 0, number, "0,0");
+    check_match_vector(tc, searcher, trq, 10, number, "");
+    check_match_vector(tc, searcher, trq, 17, number, "");
+    q_deref(trq);
+
+    trq = trq_new(number, "-1.0", "1.0", false, true);
+    check_hits(tc, searcher, trq, "0,1,4,10,15", -1);
+    check_match_vector(tc, searcher, trq, 0, number, "0,0");
+    check_match_vector(tc, searcher, trq, 10, number, "0,0");
+    check_match_vector(tc, searcher, trq, 17, number, "");
+    q_deref(trq);
+
+    trq = trq_new(number, "-1.0", "1.0", true, false);
+    check_hits(tc, searcher, trq, "0,1,4,15,17", -1);
+    check_match_vector(tc, searcher, trq, 0, number, "0,0");
+    check_match_vector(tc, searcher, trq, 10, number, "");
+    check_match_vector(tc, searcher, trq, 17, number, "0,0");
+    q_deref(trq);
+
+    /* test field with no numbers */
+    trq = trq_new(field, "-1.0", "1.0", false, true);
+    check_hits(tc, searcher, trq, "", -1);
+    check_match_vector(tc, searcher, trq, 0, number, "");
+    q_deref(trq);
+
+    /* test empty field */
+    trq = trq_new(I("empty-field"), "-1.0", "1.0", false, true);
+    check_hits(tc, searcher, trq, "", -1);
+    check_match_vector(tc, searcher, trq, 0, number, "");
+    q_deref(trq);
+
+    /* FIXME: This was a hexidecimal test but unfortunately scanf doesn't do
+     * hexidecimal on some machines. Would be nice to test for this in
+     * ./configure when we eventually integrate autotools */
     /* text hexadecimal */
     trq = trq_new(number, "1.0", "10", false, true);
@@ -1213 +1286 @@
     /* test single bound */
     trq = trq_new(number, NULL, "0", false, true);
+    check_hits(tc, searcher, trq, "1,5,11,15,16,17", -1);
+    check_match_vector(tc, searcher, trq, 1, number, "0.0");
+    check_match_vector(tc, searcher, trq, 5, number, "0,0");
+    q_deref(trq);
+
+    trq = trq_new_less(number, "0", true);
+    check_hits(tc, searcher, trq, "1,5,11,15,16,17", -1);
+    check_match_vector(tc, searcher, trq, 1, number, "0.0");
+    check_match_vector(tc, searcher, trq, 5, number, "0,0");
+    q_deref(trq);
+
+    trq = trq_new(number, NULL, "0", false, false);
     check_hits(tc, searcher, trq, "5,11,15,16,17", -1);
+    check_match_vector(tc, searcher, trq, 1, number, "");
+    check_match_vector(tc, searcher, trq, 5, number, "0,0");
+    q_deref(trq);
+
+    trq = trq_new_less(number, "0", false);
+    check_hits(tc, searcher, trq, "5,11,15,16,17", -1);
+    check_match_vector(tc, searcher, trq, 1, number, "");
+    check_match_vector(tc, searcher, trq, 5, number, "0,0");
     q_deref(trq);
 
     /* test single bound */
+    trq = trq_new(number, "0", NULL, true, false);
+    check_hits(tc, searcher, trq, "0,1,2,3,4,6,7,8,9,10,12,13,14", -1);
+    check_match_vector(tc, searcher, trq, 1, number, "0.0");
+    check_match_vector(tc, searcher, trq, 0, number, "0,0");
+    q_deref(trq);
+
+    trq = trq_new_more(number, "0", true);
+    check_hits(tc, searcher, trq, "0,1,2,3,4,6,7,8,9,10,12,13,14", -1);
+    check_match_vector(tc, searcher, trq, 1, number, "0.0");
+    check_match_vector(tc, searcher, trq, 0, number, "0,0");
+    q_deref(trq);
+
     trq = trq_new(number, "0", NULL, false, false);
-    check_hits(tc, searcher, trq, "0,1,2,3,4,6,7,8,9,10,12,13,14", -1);
+    check_hits(tc, searcher, trq, "0,2,3,4,6,7,8,9,10,12,13,14", -1);
+    check_match_vector(tc, searcher, trq, 1, number, "");
+    check_match_vector(tc, searcher, trq, 0, number, "0,0");
+    q_deref(trq);
+
+    trq = trq_new_more(number, "0", false);
+    check_hits(tc, searcher, trq, "0,2,3,4,6,7,8,9,10,12,13,14", -1);
+    check_match_vector(tc, searcher, trq, 1, number, "");
+    check_match_vector(tc, searcher, trq, 0, number, "0,0");
     q_deref(trq);