alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu-msg-iter: temporarily disable skipping duplicates when threading

Browse Source 
(we need thread-info for all duplicates too, since we do not know which one
  will end up in the final result set)
This commit is contained in:
djcb
2012-12-27 15:59:15 +02:00
parent 5310930ab8
commit 3d875307e2
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/mu-msg-iter.cc
View File

@ -56,7 +56,7 @@ public:
MuMsgFieldId sortfield, MuMsgIterFlags flags): MuMsgFieldId sortfield, MuMsgIterFlags flags):
_enq(enq), _thread_hash (0), _msg(0), _flags(flags), _enq(enq), _thread_hash (0), _msg(0), _flags(flags),
_skip_unreadable(flags & MU_MSG_ITER_FLAG_SKIP_UNREADABLE), _skip_unreadable(flags & MU_MSG_ITER_FLAG_SKIP_UNREADABLE),
_skip_dups (flags & MU_MSG_ITER_FLAG_SKIP_DUPS) { _skip_dups (flags & MU_MSG_ITER_FLAG_SKIP_DUPS) {
bool descending = (flags & MU_MSG_ITER_FLAG_DESCENDING); bool descending = (flags & MU_MSG_ITER_FLAG_DESCENDING);
bool threads = (flags & MU_MSG_ITER_FLAG_THREADS); bool threads = (flags & MU_MSG_ITER_FLAG_THREADS);
@ -71,12 +71,12 @@ public:
if (threads) { if (threads) {
_matches.fetch(); _matches.fetch();
_cursor = _matches.begin(); _cursor = _matches.begin();
_skip_dups = FALSE; { // temporarily turn-off skipping dups
_thread_hash = mu_threader_calculate _skip_dups = FALSE;
(this, _matches.size(), sortfield, descending); _thread_hash = mu_threader_calculate
_skip_dups = (this, _matches.size(), sortfield, descending);
(flags & MU_MSG_ITER_FLAG_SKIP_DUPS); _skip_dups = (flags & MU_MSG_ITER_FLAG_SKIP_DUPS);
}
ThreadKeyMaker keymaker(_thread_hash); ThreadKeyMaker keymaker(_thread_hash);
enq.set_sort_by_key (&keymaker, false); enq.set_sort_by_key (&keymaker, false);
_matches = _enq.get_mset (0, maxnum); _matches = _enq.get_mset (0, maxnum);
@ -89,7 +89,7 @@ public:
_cursor = _matches.begin(); _cursor = _matches.begin();
} }
_cursor = _matches.begin(); _cursor = _matches.begin();
} }
~_MuMsgIter () { ~_MuMsgIter () {
@ -119,13 +119,12 @@ public:
bool looks_like_dup () const { bool looks_like_dup () const {
try { try {
const Xapian::Document doc (cursor().get_document());
const std::string msg_uid const std::string msg_uid
(cursor().get_document().get_value(MU_MSG_FIELD_ID_MSGID)); (doc.get_value(MU_MSG_FIELD_ID_MSGID));
if (_msg_uid_set.find (msg_uid) != _msg_uid_set.end()) { if (_msg_uid_set.find (msg_uid) != _msg_uid_set.end()) {
// std::cerr << "dup: " << msg_uid << std::endl;
return true; return true;
} else { } else {
// std::cerr << "no dup: " << msg_uid << std::endl;
_msg_uid_set.insert (msg_uid); _msg_uid_set.insert (msg_uid);
return false; return false;
} }
@ -207,13 +206,27 @@ mu_msg_iter_new (XapianEnquire *enq, size_t maxnum,
} MU_XAPIAN_CATCH_BLOCK_G_ERROR_RETURN (err, MU_ERROR_XAPIAN, 0); } MU_XAPIAN_CATCH_BLOCK_G_ERROR_RETURN (err, MU_ERROR_XAPIAN, 0);
} }
void void
mu_msg_iter_destroy (MuMsgIter *iter) mu_msg_iter_destroy (MuMsgIter *iter)
{ {
try { delete iter; } MU_XAPIAN_CATCH_BLOCK; try { delete iter; } MU_XAPIAN_CATCH_BLOCK;
} }
void
mu_msg_iter_set_skip_duplicates (MuMsgIter *iter, gboolean skip_duplicates,
GHashTable *preferred_set)
{
g_return_if_fail (iter);
g_return_if_fail (!skip_duplicates && preferred_set);
}
MuMsg* MuMsg*
mu_msg_iter_get_msg_floating (MuMsgIter *iter) mu_msg_iter_get_msg_floating (MuMsgIter *iter)
{ {