recoll / Code / Diff of /src/rcldb/rcldb.cpp

Diff of /src/rcldb/rcldb.cpp [9ba0b3] .. [7876fb]

Switch to unified view

-a/src/rcldb/rcldb.cpp
+b/src/rcldb/rcldb.cpp
 ...
         // flushes on allterms_begin(), used in
         // subDocs(). This issue has been gone for a long time
                 // (now: Xapian 1.2) and the separate objects seem to
                 // trigger other Xapian issues, so the query db is now
                 // a clone of the update one.
-//        m_ndb->xrdb = Xapian::Database(dir);
         m_ndb->xrdb = m_ndb->xwdb;
         LOGDEB(("Db::open: lastdocid: %d\n",
             m_ndb->xwdb.get_lastdocid()));
                 LOGDEB2(("Db::open: resetting updated\n"));
                 updated.resize(m_ndb->xwdb.get_lastdocid() + 1);
 ...
+    }
     m_flushtxtsz = m_curtxtsz;
     return true;
+}
+void Db::setExistingFlags(const string& udi, unsigned int docid)
+{
+    if (m_mode == DbRO)
+        return;
+    if (docid == (unsigned int)-1) {
+        LOGERR(("Db::setExistingFlags: called with bogus docid !!\n"));
+        return;
+    }
+#ifdef IDX_THREADS
+    PTMutexLocker lock(m_ndb->m_mutex);
+#endif
+    i_setExistingFlags(udi, docid);
+}
+void Db::i_setExistingFlags(const string& udi, unsigned int docid)
+{
+    // Set the up to date flag for the document and its subdocs
+    if (docid >= updated.size()) {
+        LOGERR(("needUpdate: existing docid beyond "
+                "updated.size(). Udi [%s], docid %u, "
+                "updated.size() %u\n", udi.c_str(),
+                unsigned(docid), (unsigned)updated.size()));
+        return;
+    } else {
+        updated[docid] = true;
+    }
+    // Set the existence flag for all the subdocs (if any)
+    vector<Xapian::docid> docids;
+    if (!m_ndb->subDocs(udi, 0, docids)) {
+        LOGERR(("Rcl::Db::needUpdate: can't get subdocs\n"));
+        return;
+    }
+    for (vector<Xapian::docid>::iterator it = docids.begin();
+         it != docids.end(); it++) {
+        if (*it < updated.size()) {
+            LOGDEB2(("Db::needUpdate: docid %d set\n", *it));
+            updated[*it] = true;
+        }
+    }
+}
 // Test if doc given by udi has changed since last indexed (test sigs)
-bool Db::needUpdate(const string &udi, const string& sig, bool *existed)
+bool Db::needUpdate(const string &udi, const string& sig,
+                    unsigned int *docidp, string *osigp)
+{
     if (m_ndb == 0)
         return false;
+    if (osigp)
+        osigp->clear();
+    if (docidp)
+        *docidp = 0;
     // If we are doing an in place or full reset, no need to test.
     if (o_inPlaceReset || m_mode == DbTrunc) {
-    // For in place reset, pretend the doc existed, to enable subdoc purge
+    // For in place reset, pretend the doc existed, to enable
-  if (existed)
+  // subdoc purge. The value is only used as a boolean in this case.
-      *existed = o_inPlaceReset;
+  if (docidp && o_inPlaceReset) {
+      *docidp = -1;
+        }
     return true;
+    }
-    if (existed)
-        *existed = false;
     string uniterm = make_uniterm(udi);
     string ermsg;
 #ifdef IDX_THREADS
 ...
     if (!m_reason.empty()) {
         LOGERR(("Db::needUpdate: get_document error: %s\n", m_reason.c_str()));
         return true;
+    }
-    if (existed)
+    if (docidp) {
-        *existed = true;
+        *docidp = *docid;
+    }
     // Retrieve old file/doc signature from value
     string osig;
     XAPTRY(osig = xdoc.get_value(VALUE_SIG), m_ndb->xrdb, m_reason);
     if (!m_reason.empty()) {
         LOGERR(("Db::needUpdate: get_value error: %s\n", m_reason.c_str()));
         return true;
+    }
     LOGDEB2(("Db::needUpdate: oldsig [%s] new [%s]\n",
              osig.c_str(), sig.c_str()));
+    if (osigp) {
+        *osigp = osig;
+    }
     // Compare new/old sig
     if (sig != osig) {
         LOGDEB(("Db::needUpdate:yes: olsig [%s] new [%s] [%s]\n",
                 osig.c_str(), sig.c_str(), uniterm.c_str()));
         // Db is not up to date. Let's index the file
         return true;
+    }
-    // Up to date.
+    // Up to date. Set the existance flags in the map for the doc and
+    // its subdocs.
     LOGDEB(("Db::needUpdate:no: [%s]\n", uniterm.c_str()));
+    i_setExistingFlags(udi, *docid);
-    if (m_mode    != DbRO) {
-        // Set the up to date flag for the document and its subdocs
-        if (*docid >= updated.size()) {
-            LOGERR(("needUpdate: existing docid beyond "
-                    "updated.size(). Udi [%s], docid %u, "
-                    "updated.size() %u\n", udi.c_str(),
-                    unsigned(*docid), (unsigned)updated.size()));
-        } else {
-            updated[*docid] = true;
-        // Set the existence flag for all the subdocs (if any)
-        vector<Xapian::docid> docids;
-        if (!m_ndb->subDocs(udi, 0, docids)) {
-            LOGERR(("Rcl::Db::needUpdate: can't get subdocs\n"));
-            return true;
-        for (vector<Xapian::docid>::iterator it = docids.begin();
-             it != docids.end(); it++) {
-            if (*it < updated.size()) {
-                LOGDEB2(("Db::needUpdate: docid %d set\n", *it));
-                updated[*it] = true;
     return false;
+}
 // Return existing stem db languages
 vector<string> Db::getStemLangs()