Ticket #450: dbcheck.patch

dbcheck.cc

@@ -140 +140 @@
     // We build this up from the documents, and then check it against the
     // equivalent built up from the posting lists.
     map<string, string> posting_reprs;
+    map<Xapian::valueno, string> value_reprs;
 
+    Xapian::termcount doclen_lower_bound = Xapian::termcount(-1);
+    Xapian::termcount doclen_upper_bound = 0;
+
     for (Xapian::PostingIterator dociter = db.postlist_begin(string());
          dociter != db.postlist_end(string());
          ++dociter) {
@@ -148 +152 @@
         TEST_EQUAL(dociter.get_wdf(), 1);
         Xapian::Document doc(db.get_document(did));
         Xapian::termcount doclen(db.get_doclength(did));
+        if (doclen < doclen_lower_bound)
+            doclen_lower_bound = doclen;
+        if (doclen > doclen_upper_bound)
+            doclen_upper_bound = doclen;
         totlen += doclen;
 
         Xapian::termcount found_termcount = 0;
@@ -196 +204 @@
                 i->second += "," + posting_repr;
             }
         }
+
+        Xapian::termcount vcount = 0;
+        for (Xapian::ValueIterator v = doc.values_begin();
+             v != doc.values_end();
+             ++v, ++vcount) {
+            TEST((*v).size() != 0);
+            string value_repr = "(" + str(did) + "," + *v + ")";
+
+            // Append the values to the value lists.
+            map<Xapian::valueno, string>::iterator i;
+            i = value_reprs.find(v.get_valueno());
+            if (i == value_reprs.end()) {
+                value_reprs[v.get_valueno()] = value_repr;
+            } else {
+                i->second += "," + value_repr;
+            }
+        }
+        TEST_EQUAL(vcount, doc.values_count());
         TEST(t2 == db.termlist_end(did));
         Xapian::termcount expected_termcount = doc.termlist_count();
         TEST_EQUAL(expected_termcount, found_termcount);
         TEST_EQUAL(doclen, wdf_sum);
     }
 
+    TEST_REL(doclen_lower_bound, >=, db.get_doclength_lower_bound());
+    TEST_REL(doclen_upper_bound, <=, db.get_doclength_upper_bound());
+
     Xapian::TermIterator t;
     map<string, string>::const_iterator i;
     for (t = db.allterms_begin(), i = posting_reprs.begin();
@@ -213 +242 @@
 
         Xapian::doccount tf_count = 0;
         Xapian::termcount cf_count = 0;
+        Xapian::termcount wdf_upper_bound = 0;
         string posting_repr;
         bool need_comma = false;
         for (Xapian::PostingIterator p = db.postlist_begin(*t);
@@ -233 +263 @@
             posting_repr += "(" + str(*p) + "," +
                     str(p.get_wdf()) + "/" + str(p.get_doclength()) +
                     posrepr + ")";
+            if (wdf_upper_bound < p.get_wdf())
+                wdf_upper_bound = p.get_wdf();
             need_comma = true;
         }
 
@@ -240 +272 @@
         TEST_EQUAL(tf_count, t.get_termfreq());
         TEST_EQUAL(tf_count, db.get_termfreq(*t));
         TEST_EQUAL(cf_count, db.get_collection_freq(*t));
+        TEST_REL(wdf_upper_bound, <=, db.get_wdf_upper_bound(*t));
     }
     TEST(i == posting_reprs.end());
 
+    map<Xapian::valueno, string>::const_iterator j;
+    for (j = value_reprs.begin(); j != value_reprs.end(); ++j) {
+        string value_repr;
+        string value_lower_bound;
+        string value_upper_bound;
+        bool first = true;
+        for (Xapian::ValueIterator v = db.valuestream_begin(j->first);
+             v != db.valuestream_end(j->first); ++v) {
+            if (first) {
+                value_lower_bound = *v;
+                value_upper_bound = *v;
+                first = false;
+            } else {
+                value_repr += ",";
+                if (*v > value_upper_bound) {
+                    value_upper_bound = *v;
+                }
+                if (*v < value_lower_bound) {
+                    value_lower_bound = *v;
+                }
+            }
+            value_repr += "(" + str(v.get_docid()) + "," + *v + ")";
+        }
+        TEST_EQUAL(value_repr, j->second);
+        TEST_REL(value_upper_bound, <=, db.get_value_upper_bound(j->first));
+        TEST_REL(value_lower_bound, >=, db.get_value_lower_bound(j->first));
+    }
+
     if (expected_doccount == 0) {
         TEST_EQUAL(0, db.get_avlength());
     } else {