File 0001-Revert-BasicIndexingQueue-Use-xapian-slots... of Package baloo5

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Revert-BasicIndexingQueue-Use-xapian-slots-to-fetch-.patch of Package baloo5 (Revision 2a8224bc62ffc675c601364dd3e1ea99)

Currently displaying revision 2a8224bc62ffc675c601364dd3e1ea99 , Show latest

From a85d450a1a321e284d253041ae5701a3966fede5 Mon Sep 17 00:00:00 2001
From: Vishesh Handa <me@vhanda.in>
Date: Tue, 28 Apr 2015 12:08:51 +0200
Subject: [PATCH 1/1] Revert "BasicIndexingQueue: Use xapian slots to fetch the
 mtime"

This reverts commit cbf04acd7951a25f42fb3ead1e14943dd10dbebb.

The Xapian Database seems to be getting corrupted a lot lately, and it
gets stuck on accessing the value via Xapian::get_value. Lets revert to
the previous method. We'll use more disk io, but at least we won't go
crazy.
---
 src/file/basicindexingqueue.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/file/basicindexingqueue.cpp b/src/file/basicindexingqueue.cpp
index 77366b1070364b26a75d38960ad4db43b16e8e12..68410b625f7121a032622cbab122d1b68cd2731a 100644
--- a/src/file/basicindexingqueue.cpp
+++ b/src/file/basicindexingqueue.cpp
@@ -138,7 +138,7 @@ bool BasicIndexingQueue::shouldIndex(FileMapping& file, const QString& mimetype)
     }
 
     XapianDocument doc = m_db->xapianDatabase()->document(file.id());
-    const QByteArray dtStr = doc.value(0);
+    const QString dtStr = doc.fetchTermStartsWith("DT_M");
     if (dtStr.isEmpty()) {
         return true;
     }
@@ -149,8 +149,10 @@ bool BasicIndexingQueue::shouldIndex(FileMapping& file, const QString& mimetype)
     if (mimetype == QLatin1String("inode/directory"))
         return false;
 
-    const uint time_t = dtStr.toUInt();
-    if (time_t != fileInfo.lastModified().toTime_t()) {
+    // The 4 is for "DT_M"
+    const QDateTime mtime = QDateTime::fromString(dtStr.mid(4), Qt::ISODate);
+
+    if (mtime != fileInfo.lastModified()) {
         return true;
     }
 
-- 
2.3.5

Places

File 0001-Revert-BasicIndexingQueue-Use-xapian-slots-to-fetch-.patch of Package baloo5 (Revision 2a8224bc62ffc675c601364dd3e1ea99)

Places