Mercurial > dovecot > original-hg > dovecot-1.2

annotate src/lib-storage/index/index-search.c @ 9582:4432650c0699 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-storage: Fixed header searches to work correctly when there are multiple headers with same name.
author Timo Sirainen <tss@iki.fi>
date Wed, 16 Jun 2010 18:29:45 +0100
parents ef3b30b24c7c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9532
00cd9aacd03c Updated copyright notices to include year 2010.
Timo Sirainen <tss@iki.fi>
parents: 9310
diff changeset
1 /* Copyright (c) 2002-2010 Dovecot authors, see the included COPYING file */
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
2
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
3 #include "lib.h"
4949
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
4 #include "ioloop.h"
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
5 #include "array.h"
764
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their
Timo Sirainen <tss@iki.fi>
parents: 761
diff changeset
6 #include "istream.h"
7279
ef13dd179331 More fixes to SEARCH BEFORE/ON/SINCE timezone handling.
Timo Sirainen <tss@iki.fi>
parents: 7269
diff changeset
7 #include "utc-offset.h"
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
8 #include "str.h"
9310
f834d95f173a Moved all struct timeval comparing/calculation code to lib/time-util.
Timo Sirainen <tss@iki.fi>
parents: 9034
diff changeset
9 #include "time-util.h"
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
10 #include "message-address.h"
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
11 #include "message-date.h"
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
12 #include "message-search.h"
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
13 #include "message-parser.h"
7620
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
14 #include "mail-index-modseq.h"
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
15 #include "index-storage.h"
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
16 #include "index-mail.h"
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
17 #include "index-sort.h"
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
18 #include "mail-search.h"
7647
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
19 #include "mailbox-search-result-private.h"
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
20
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
21 #include <stdlib.h>
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
22 #include <ctype.h>
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
23
883
39e0b536e708 Storage can now specify if errors should be sent to user as BAD or NO.
Timo Sirainen <tss@iki.fi>
parents: 881
diff changeset
24 #define TXT_UNKNOWN_CHARSET "[BADCHARSET] Unknown charset"
608
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body
Timo Sirainen <tss@iki.fi>
parents: 569
diff changeset
25 #define TXT_INVALID_SEARCH_KEY "Invalid search key"
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body
Timo Sirainen <tss@iki.fi>
parents: 569
diff changeset
26
4949
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
27 #define SEARCH_NOTIFY_INTERVAL_SECS 10
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
28
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
29 #define SEARCH_COST_DENTRY 3ULL
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
30 #define SEARCH_COST_ATTR 1ULL
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
31 #define SEARCH_COST_FILES_READ 25ULL
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
32 #define SEARCH_COST_KBYTE 15ULL
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
33 #define SEARCH_COST_CACHE 1ULL
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
34
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
35 #define SEARCH_MIN_NONBLOCK_USECS 200000
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
36 #define SEARCH_MAX_NONBLOCK_USECS 250000
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
37 #define SEARCH_INITIAL_MAX_COST 30000
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
38 #define SEARCH_RECALC_MIN_USECS 50000
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
39
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
40 struct index_search_context {
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
41 struct mail_search_context mail_ctx;
2224
a816e2d88406 Added mail_index_transaction_get_updated_view() which can be used to access
Timo Sirainen <tss@iki.fi>
parents: 2190
diff changeset
42 struct mail_index_view *view;
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
43 struct index_mailbox *ibox;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
44
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
45 uint32_t seq1, seq2;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
46 struct mail *mail;
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
47 struct index_mail *imail;
7909
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
48 struct mail_thread_context *thread_ctx;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
49
568
f2aa58c2afd0 SEARCH CHARSET support. Currently we do it through iconv() and only ASCII
Timo Sirainen <tss@iki.fi>
parents: 559
diff changeset
50 const char *error;
924
4f697dde0fca THREAD=REFERENCES implementation. Doesn't crash, but I'm not sure how
Timo Sirainen <tss@iki.fi>
parents: 903
diff changeset
51
4949
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
52 struct timeval search_start_time, last_notify;
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
53 struct timeval last_nonblock_timeval;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
54 unsigned long long cost, next_time_check_cost;
4949
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
55
3325
38eaa792c405 Don't call index_mail_parse_header() twice when searching headers. Caused
Timo Sirainen <tss@iki.fi>
parents: 3301
diff changeset
56 unsigned int failed:1;
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
57 unsigned int sorted:1;
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
58 unsigned int have_seqsets:1;
7620
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
59 unsigned int have_index_args:1;
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
60 };
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
61
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
62 struct search_header_context {
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
63 struct index_search_context *index_context;
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
64 struct mail_search_arg *args;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
65
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
66 struct message_header_line *hdr;
924
4f697dde0fca THREAD=REFERENCES implementation. Doesn't crash, but I'm not sure how
Timo Sirainen <tss@iki.fi>
parents: 903
diff changeset
67
3325
38eaa792c405 Don't call index_mail_parse_header() twice when searching headers. Caused
Timo Sirainen <tss@iki.fi>
parents: 3301
diff changeset
68 unsigned int parse_headers:1;
924
4f697dde0fca THREAD=REFERENCES implementation. Doesn't crash, but I'm not sure how
Timo Sirainen <tss@iki.fi>
parents: 903
diff changeset
69 unsigned int custom_header:1;
4f697dde0fca THREAD=REFERENCES implementation. Doesn't crash, but I'm not sure how
Timo Sirainen <tss@iki.fi>
parents: 903
diff changeset
70 unsigned int threading:1;
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
71 };
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
72
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
73 struct search_body_context {
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
74 struct index_search_context *index_ctx;
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
75 struct istream *input;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
76 const struct message_part *part;
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
77 };
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
78
5522
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds.
Timo Sirainen <tss@iki.fi>
parents: 5516
diff changeset
79 static const enum message_header_parser_flags hdr_parser_flags =
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds.
Timo Sirainen <tss@iki.fi>
parents: 5516
diff changeset
80 MESSAGE_HEADER_PARSER_FLAG_CLEAN_ONELINE;
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds.
Timo Sirainen <tss@iki.fi>
parents: 5516
diff changeset
81
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
82 static void search_parse_msgset_args(unsigned int messages_count,
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
83 struct mail_search_arg *args,
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
84 uint32_t *seq1_r, uint32_t *seq2_r);
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
85
6966
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
86 static void search_init_arg(struct mail_search_arg *arg,
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
87 struct index_search_context *ctx)
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
88 {
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
89 switch (arg->type) {
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
90 case SEARCH_SEQSET:
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
91 ctx->have_seqsets = TRUE;
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
92 break;
7618
6dbd70663adf Added support for SEARCH_UIDSET.
Timo Sirainen <tss@iki.fi>
parents: 7414
diff changeset
93 case SEARCH_UIDSET:
7909
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
94 case SEARCH_INTHREAD:
6966
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
95 case SEARCH_FLAGS:
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
96 case SEARCH_KEYWORDS:
7620
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
97 case SEARCH_MODSEQ:
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
98 if (arg->type == SEARCH_MODSEQ)
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
99 mail_index_modseq_enable(ctx->ibox->index);
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
100 ctx->have_index_args = TRUE;
6966
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
101 break;
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
102 case SEARCH_ALL:
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
103 if (!arg->not)
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
104 arg->match_always = TRUE;
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
105 break;
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
106 default:
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
107 break;
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
108 }
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
109 }
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
110
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
111 static void search_seqset_arg(struct mail_search_arg *arg,
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
112 struct index_search_context *ctx)
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
113 {
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
114 if (arg->type == SEARCH_SEQSET) {
7619
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
115 if (seq_range_exists(&arg->value.seqset, ctx->mail_ctx.seq))
6966
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
116 ARG_SET_RESULT(arg, 1);
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
117 else
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
118 ARG_SET_RESULT(arg, 0);
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
119 }
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
120 }
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
121
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
122 static int search_arg_match_keywords(struct index_search_context *ctx,
6965
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
123 struct mail_search_arg *arg)
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
124 {
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
125 ARRAY_TYPE(keyword_indexes) keyword_indexes_arr;
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
126 const struct mail_keywords *search_kws = arg->value.keywords;
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
127 const unsigned int *keyword_indexes;
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
128 unsigned int i, j, count;
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
129
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
130 t_array_init(&keyword_indexes_arr, 128);
6966
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
131 mail_index_lookup_keywords(ctx->view, ctx->mail_ctx.seq,
6965
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
132 &keyword_indexes_arr);
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
133 keyword_indexes = array_get(&keyword_indexes_arr, &count);
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
134
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
135 /* there probably aren't many keywords, so O(n*m) for now */
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
136 for (i = 0; i < search_kws->count; i++) {
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
137 for (j = 0; j < count; j++) {
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
138 if (search_kws->idx[i] == keyword_indexes[j])
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
139 break;
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
140 }
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
141 if (j == count)
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
142 return 0;
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
143 }
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
144 return 1;
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
145 }
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
146
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
147 /* Returns >0 = matched, 0 = not matched, -1 = unknown */
6966
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
148 static int search_arg_match_index(struct index_search_context *ctx,
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
149 struct mail_search_arg *arg,
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
150 const struct mail_index_record *rec)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
151 {
6962
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
152 enum mail_flags flags;
7620
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
153 uint64_t modseq;
6965
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
154 int ret;
1947
777da553d1d3 Recent-flag should work now
Timo Sirainen <tss@iki.fi>
parents: 1917
diff changeset
155
6962
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
156 switch (arg->type) {
7618
6dbd70663adf Added support for SEARCH_UIDSET.
Timo Sirainen <tss@iki.fi>
parents: 7414
diff changeset
157 case SEARCH_UIDSET:
7909
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
158 case SEARCH_INTHREAD:
7619
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
159 return seq_range_exists(&arg->value.seqset, rec->uid);
6962
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
160 case SEARCH_FLAGS:
7426
11e7ec83665d Ignore \Recent flag in indexes when searching them (leftovers from v1.0).
Timo Sirainen <tss@iki.fi>
parents: 7414
diff changeset
161 /* recent flag shouldn't be set, but indexes from v1.0.x
11e7ec83665d Ignore \Recent flag in indexes when searching them (leftovers from v1.0).
Timo Sirainen <tss@iki.fi>
parents: 7414
diff changeset
162 may contain it. */
11e7ec83665d Ignore \Recent flag in indexes when searching them (leftovers from v1.0).
Timo Sirainen <tss@iki.fi>
parents: 7414
diff changeset
163 flags = rec->flags & ~MAIL_RECENT;
6962
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
164 if ((arg->value.flags & MAIL_RECENT) != 0 &&
6966
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
165 index_mailbox_is_recent(ctx->ibox, rec->uid))
6962
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
166 flags |= MAIL_RECENT;
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
167 return (flags & arg->value.flags) == arg->value.flags;
6965
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
168 case SEARCH_KEYWORDS:
7226
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents: 7086
diff changeset
169 T_BEGIN {
6966
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
170 ret = search_arg_match_keywords(ctx, arg);
7226
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents: 7086
diff changeset
171 } T_END;
6965
ae369569e7de SEARCH_KEYWORDS now uses struct mail_keywords instead of a string array.
Timo Sirainen <tss@iki.fi>
parents: 6962
diff changeset
172 return ret;
7620
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
173 case SEARCH_MODSEQ: {
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
174 if (arg->value.flags != 0) {
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
175 modseq = mail_index_modseq_lookup_flags(ctx->view,
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
176 arg->value.flags, ctx->mail_ctx.seq);
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
177 } else if (arg->value.keywords != NULL) {
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
178 modseq = mail_index_modseq_lookup_keywords(ctx->view,
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
179 arg->value.keywords, ctx->mail_ctx.seq);
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
180 } else {
7625
98a03cf8ad5d CONDSTORE fixes
Timo Sirainen <tss@iki.fi>
parents: 7620
diff changeset
181 modseq = mail_index_modseq_lookup(ctx->view,
7620
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
182 ctx->mail_ctx.seq);
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
183 }
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
184 return modseq >= arg->value.modseq->modseq;
4b8c1c164d8f Initial CONDSTORE support.
Timo Sirainen <tss@iki.fi>
parents: 7619
diff changeset
185 }
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
186 default:
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
187 return -1;
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
188 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
189 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
190
4907
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
191 static void search_index_arg(struct mail_search_arg *arg,
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
192 struct index_search_context *ctx)
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
193 {
6966
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
194 const struct mail_index_record *rec;
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
195
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
196 rec = mail_index_lookup(ctx->view, ctx->mail_ctx.seq);
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
197 switch (search_arg_match_index(ctx, arg, rec)) {
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
198 case -1:
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
199 /* unknown */
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
200 break;
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
201 case 0:
1069
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
202 ARG_SET_RESULT(arg, 0);
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
203 break;
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
204 default:
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
205 ARG_SET_RESULT(arg, 1);
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
206 break;
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
207 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
208 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
209
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
210 /* Returns >0 = matched, 0 = not matched, -1 = unknown */
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
211 static int search_arg_match_cached(struct index_search_context *ctx,
5599
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
212 struct mail_search_arg *arg)
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
213 {
7910
c1bbdc2b262e FETCH X-MAILBOX and SEARCH X-MAILBOX can be used with virtual mailboxes to
Timo Sirainen <tss@iki.fi>
parents: 7909
diff changeset
214 const char *str;
7279
ef13dd179331 More fixes to SEARCH BEFORE/ON/SINCE timezone handling.
Timo Sirainen <tss@iki.fi>
parents: 7269
diff changeset
215 struct tm *tm;
6962
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
216 uoff_t virtual_size;
5599
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
217 time_t date;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
218 int timezone_offset;
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
219
5599
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
220 switch (arg->type) {
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
221 /* internal dates */
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
222 case SEARCH_BEFORE:
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
223 case SEARCH_ON:
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
224 case SEARCH_SINCE:
6280
eb7c9d8ece54 mail_*() APIs changed to return int and return the actual data as pointer.
Timo Sirainen <tss@iki.fi>
parents: 6277
diff changeset
225 if (mail_get_received_date(ctx->mail, &date) < 0)
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
226 return -1;
7279
ef13dd179331 More fixes to SEARCH BEFORE/ON/SINCE timezone handling.
Timo Sirainen <tss@iki.fi>
parents: 7269
diff changeset
227
7640
c78e9204f3f2 Implemented WITHIN extension.
Timo Sirainen <tss@iki.fi>
parents: 7625
diff changeset
228 if ((arg->value.search_flags &
c78e9204f3f2 Implemented WITHIN extension.
Timo Sirainen <tss@iki.fi>
parents: 7625
diff changeset
229 MAIL_SEARCH_ARG_FLAG_USE_TZ) == 0) {
c78e9204f3f2 Implemented WITHIN extension.
Timo Sirainen <tss@iki.fi>
parents: 7625
diff changeset
230 tm = localtime(&date);
c78e9204f3f2 Implemented WITHIN extension.
Timo Sirainen <tss@iki.fi>
parents: 7625
diff changeset
231 date += utc_offset(tm, date)*60;
c78e9204f3f2 Implemented WITHIN extension.
Timo Sirainen <tss@iki.fi>
parents: 7625
diff changeset
232 }
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
233
5599
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
234 switch (arg->type) {
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
235 case SEARCH_BEFORE:
5599
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
236 return date < arg->value.time;
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
237 case SEARCH_ON:
5599
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
238 return date >= arg->value.time &&
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
239 date < arg->value.time + 3600*24;
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
240 case SEARCH_SINCE:
5599
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
241 return date >= arg->value.time;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
242 default:
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
243 /* unreachable */
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
244 break;
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
245 }
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
246
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
247 /* sent dates */
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
248 case SEARCH_SENTBEFORE:
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
249 case SEARCH_SENTON:
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
250 case SEARCH_SENTSINCE:
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
251 /* NOTE: RFC-3501 specifies that timezone is ignored
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
252 in searches. date is returned as UTC, so change it. */
6280
eb7c9d8ece54 mail_*() APIs changed to return int and return the actual data as pointer.
Timo Sirainen <tss@iki.fi>
parents: 6277
diff changeset
253 if (mail_get_date(ctx->mail, &date, &timezone_offset) < 0)
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
254 return -1;
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
255
7640
c78e9204f3f2 Implemented WITHIN extension.
Timo Sirainen <tss@iki.fi>
parents: 7625
diff changeset
256 if ((arg->value.search_flags &
c78e9204f3f2 Implemented WITHIN extension.
Timo Sirainen <tss@iki.fi>
parents: 7625
diff changeset
257 MAIL_SEARCH_ARG_FLAG_USE_TZ) == 0)
c78e9204f3f2 Implemented WITHIN extension.
Timo Sirainen <tss@iki.fi>
parents: 7625
diff changeset
258 date += timezone_offset * 60;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
259
5599
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
260 switch (arg->type) {
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
261 case SEARCH_SENTBEFORE:
5599
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
262 return date < arg->value.time;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
263 case SEARCH_SENTON:
5599
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
264 return date >= arg->value.time &&
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
265 date < arg->value.time + 3600*24;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
266 case SEARCH_SENTSINCE:
5599
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
267 return date >= arg->value.time;
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
268 default:
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
269 /* unreachable */
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
270 break;
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
271 }
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
272
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
273 /* sizes */
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
274 case SEARCH_SMALLER:
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
275 case SEARCH_LARGER:
6280
eb7c9d8ece54 mail_*() APIs changed to return int and return the actual data as pointer.
Timo Sirainen <tss@iki.fi>
parents: 6277
diff changeset
276 if (mail_get_virtual_size(ctx->mail, &virtual_size) < 0)
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
277 return -1;
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
278
5599
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
279 if (arg->type == SEARCH_SMALLER)
6962
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
280 return virtual_size < arg->value.size;
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
281 else
6962
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
282 return virtual_size > arg->value.size;
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
283
8077
6d51328896d6 Added the concept of Global UIDs that are preserved across copies.
Timo Sirainen <tss@iki.fi>
parents: 8074
diff changeset
284 case SEARCH_GUID:
6d51328896d6 Added the concept of Global UIDs that are preserved across copies.
Timo Sirainen <tss@iki.fi>
parents: 8074
diff changeset
285 if (mail_get_special(ctx->mail, MAIL_FETCH_GUID, &str) < 0)
6d51328896d6 Added the concept of Global UIDs that are preserved across copies.
Timo Sirainen <tss@iki.fi>
parents: 8074
diff changeset
286 return -1;
6d51328896d6 Added the concept of Global UIDs that are preserved across copies.
Timo Sirainen <tss@iki.fi>
parents: 8074
diff changeset
287 return strcmp(str, arg->value.str) == 0;
7910
c1bbdc2b262e FETCH X-MAILBOX and SEARCH X-MAILBOX can be used with virtual mailboxes to
Timo Sirainen <tss@iki.fi>
parents: 7909
diff changeset
288 case SEARCH_MAILBOX:
c1bbdc2b262e FETCH X-MAILBOX and SEARCH X-MAILBOX can be used with virtual mailboxes to
Timo Sirainen <tss@iki.fi>
parents: 7909
diff changeset
289 if (mail_get_special(ctx->mail, MAIL_FETCH_MAILBOX_NAME,
c1bbdc2b262e FETCH X-MAILBOX and SEARCH X-MAILBOX can be used with virtual mailboxes to
Timo Sirainen <tss@iki.fi>
parents: 7909
diff changeset
290 &str) < 0)
c1bbdc2b262e FETCH X-MAILBOX and SEARCH X-MAILBOX can be used with virtual mailboxes to
Timo Sirainen <tss@iki.fi>
parents: 7909
diff changeset
291 return -1;
c1bbdc2b262e FETCH X-MAILBOX and SEARCH X-MAILBOX can be used with virtual mailboxes to
Timo Sirainen <tss@iki.fi>
parents: 7909
diff changeset
292
c1bbdc2b262e FETCH X-MAILBOX and SEARCH X-MAILBOX can be used with virtual mailboxes to
Timo Sirainen <tss@iki.fi>
parents: 7909
diff changeset
293 if (strcasecmp(str, "INBOX") == 0)
c1bbdc2b262e FETCH X-MAILBOX and SEARCH X-MAILBOX can be used with virtual mailboxes to
Timo Sirainen <tss@iki.fi>
parents: 7909
diff changeset
294 return strcasecmp(arg->value.str, "INBOX") == 0;
c1bbdc2b262e FETCH X-MAILBOX and SEARCH X-MAILBOX can be used with virtual mailboxes to
Timo Sirainen <tss@iki.fi>
parents: 7909
diff changeset
295 return strcmp(str, arg->value.str) == 0;
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
296 default:
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
297 return -1;
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
298 }
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
299 }
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
300
4907
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
301 static void search_cached_arg(struct mail_search_arg *arg,
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
302 struct index_search_context *ctx)
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
303 {
5599
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
304 switch (search_arg_match_cached(ctx, arg)) {
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
305 case -1:
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
306 /* unknown */
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
307 break;
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
308 case 0:
1069
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
309 ARG_SET_RESULT(arg, 0);
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
310 break;
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
311 default:
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
312 ARG_SET_RESULT(arg, 1);
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
313 break;
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
314 }
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
315 }
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
316
5599
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
317 static int search_sent(enum mail_search_arg_type type, time_t search_time,
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
318 const unsigned char *sent_value, size_t sent_value_len)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
319 {
5599
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
320 time_t sent_time;
408
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
321 int timezone_offset;
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
322
880
d5168cca2052 SEARCHing headers with "" value should always match if the header is found.
Timo Sirainen <tss@iki.fi>
parents: 825
diff changeset
323 if (sent_value == NULL)
d5168cca2052 SEARCHing headers with "" value should always match if the header is found.
Timo Sirainen <tss@iki.fi>
parents: 825
diff changeset
324 return 0;
d5168cca2052 SEARCHing headers with "" value should always match if the header is found.
Timo Sirainen <tss@iki.fi>
parents: 825
diff changeset
325
1340
087a9f4304ca s/latest IMAP4rev1 draft/RFC-3501/
Timo Sirainen <tss@iki.fi>
parents: 1322
diff changeset
326 /* NOTE: RFC-3501 specifies that timezone is ignored
935
bd2d99a3d601 Even more rfc822 date timezone fixes
Timo Sirainen <tss@iki.fi>
parents: 934
diff changeset
327 in searches. sent_time is returned as UTC, so change it. */
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
328 if (!message_date_parse(sent_value, sent_value_len,
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
329 &sent_time, &timezone_offset))
408
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
330 return 0;
1604
6a18854e6856 Still more timezone fixes
Timo Sirainen <tss@iki.fi>
parents: 1552
diff changeset
331 sent_time += timezone_offset * 60;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
332
408
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
333 switch (type) {
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
334 case SEARCH_SENTBEFORE:
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
335 return sent_time < search_time;
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
336 case SEARCH_SENTON:
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
337 return sent_time >= search_time &&
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
338 sent_time < search_time + 3600*24;
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
339 case SEARCH_SENTSINCE:
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
340 return sent_time >= search_time;
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
341 default:
546
e1254b838e0b Added --enable-asserts (default) and fixed some warnings when building
Timo Sirainen <tss@iki.fi>
parents: 534
diff changeset
342 i_unreached();
408
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
343 }
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
344 }
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
345
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
346 static struct message_search_context *
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
347 msg_search_arg_context(struct index_search_context *ctx,
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
348 struct mail_search_arg *arg)
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
349 {
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
350 struct message_search_context *arg_ctx = arg->context;
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
351 enum message_search_flags flags;
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
352 int ret;
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
353
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
354 if (arg_ctx != NULL)
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
355 return arg_ctx;
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
356
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
357 flags = (arg->type == SEARCH_BODY || arg->type == SEARCH_BODY_FAST) ?
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
358 MESSAGE_SEARCH_FLAG_SKIP_HEADERS : 0;
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
359
7805
d440b7cad709 Removed pool parameter from message_search_init().
Timo Sirainen <tss@iki.fi>
parents: 7798
diff changeset
360 ret = message_search_init(arg->value.str,
7642
077bb84e9e77 Make mail_search_args an independent structure that can be used for multiple
Timo Sirainen <tss@iki.fi>
parents: 7640
diff changeset
361 ctx->mail_ctx.args->charset, flags,
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
362 &arg_ctx);
5527
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
363 if (ret > 0) {
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
364 arg->context = arg_ctx;
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
365 return arg_ctx;
5527
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
366 }
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
367 if (ret == 0)
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
368 ctx->error = TXT_UNKNOWN_CHARSET;
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
369 else
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
370 ctx->error = TXT_INVALID_SEARCH_KEY;
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
371 return NULL;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
372 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
373
7284
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
374 static void compress_lwsp(string_t *dest, const unsigned char *src,
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
375 unsigned int src_len)
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
376 {
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
377 unsigned int i;
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
378 bool prev_lwsp = TRUE;
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
379
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
380 for (i = 0; i < src_len; i++) {
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
381 if (IS_LWSP(src[i])) {
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
382 if (!prev_lwsp) {
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
383 prev_lwsp = TRUE;
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
384 str_append_c(dest, ' ');
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
385 }
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
386 } else {
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
387 prev_lwsp = FALSE;
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
388 str_append_c(dest, src[i]);
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
389 }
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
390 }
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
391 }
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
392
4907
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
393 static void search_header_arg(struct mail_search_arg *arg,
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
394 struct search_header_context *ctx)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
395 {
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
396 struct message_search_context *msg_search_ctx;
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
397 struct message_block block;
6574
ab3a1a8ade55 Header searches didn't decode MIME encoded words.
Timo Sirainen <tss@iki.fi>
parents: 6492
diff changeset
398 struct message_header_line hdr;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
399 int ret;
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
400
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
401 /* first check that the field name matches to argument. */
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
402 switch (arg->type) {
408
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
403 case SEARCH_SENTBEFORE:
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
404 case SEARCH_SENTON:
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
405 case SEARCH_SENTSINCE:
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
406 /* date is handled differently than others */
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
407 if (strcasecmp(ctx->hdr->name, "Date") == 0) {
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
408 if (ctx->hdr->continues) {
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
409 ctx->hdr->use_full_value = TRUE;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
410 return;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
411 }
5599
6789ba80419b Parse search dates already in IMAP code.
Timo Sirainen <tss@iki.fi>
parents: 5527
diff changeset
412 ret = search_sent(arg->type, arg->value.time,
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
413 ctx->hdr->full_value,
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
414 ctx->hdr->full_value_len);
1070
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
415 ARG_SET_RESULT(arg, ret);
408
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
416 }
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
417 return;
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
418
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
419 case SEARCH_HEADER:
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
420 case SEARCH_HEADER_ADDRESS:
7284
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
421 case SEARCH_HEADER_COMPRESS_LWSP:
10
82b7de533f98 s/user_data/context/ and some s/Data/Context/
Timo Sirainen <tss@iki.fi>
parents: 5
diff changeset
422 ctx->custom_header = TRUE;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
423
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
424 if (strcasecmp(ctx->hdr->name, arg->hdr_field_name) != 0)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
425 return;
5513
Timo Sirainen <tss@iki.fi>
parents: 5507
diff changeset
426 break;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
427 default:
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
428 return;
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
429 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
430
880
d5168cca2052 SEARCHing headers with "" value should always match if the header is found.
Timo Sirainen <tss@iki.fi>
parents: 825
diff changeset
431 if (arg->value.str[0] == '\0') {
d5168cca2052 SEARCHing headers with "" value should always match if the header is found.
Timo Sirainen <tss@iki.fi>
parents: 825
diff changeset
432 /* we're just testing existence of the field. always matches. */
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
433 ARG_SET_RESULT(arg, 1);
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
434 return;
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
435 }
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
436
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
437 if (ctx->hdr->continues) {
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
438 ctx->hdr->use_full_value = TRUE;
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
439 return;
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
440 }
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
441
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
442 memset(&block, 0, sizeof(block));
7281
e5b840b3c5c2 Header searches shouldn't include the header name or ":" in matching.
Timo Sirainen <tss@iki.fi>
parents: 7279
diff changeset
443
e5b840b3c5c2 Header searches shouldn't include the header name or ":" in matching.
Timo Sirainen <tss@iki.fi>
parents: 7279
diff changeset
444 /* We're searching only for values, so drop header name and middle
e5b840b3c5c2 Header searches shouldn't include the header name or ":" in matching.
Timo Sirainen <tss@iki.fi>
parents: 7279
diff changeset
445 parts. We use header searching so that MIME words will be decoded. */
e5b840b3c5c2 Header searches shouldn't include the header name or ":" in matching.
Timo Sirainen <tss@iki.fi>
parents: 7279
diff changeset
446 hdr = *ctx->hdr;
e5b840b3c5c2 Header searches shouldn't include the header name or ":" in matching.
Timo Sirainen <tss@iki.fi>
parents: 7279
diff changeset
447 hdr.name = ""; hdr.name_len = 0;
e5b840b3c5c2 Header searches shouldn't include the header name or ":" in matching.
Timo Sirainen <tss@iki.fi>
parents: 7279
diff changeset
448 hdr.middle_len = 0;
e5b840b3c5c2 Header searches shouldn't include the header name or ":" in matching.
Timo Sirainen <tss@iki.fi>
parents: 7279
diff changeset
449 block.hdr = &hdr;
e5b840b3c5c2 Header searches shouldn't include the header name or ":" in matching.
Timo Sirainen <tss@iki.fi>
parents: 7279
diff changeset
450
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
451 msg_search_ctx = msg_search_arg_context(ctx->index_context, arg);
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
452 if (msg_search_ctx == NULL)
7284
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
453 return;
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
454
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
455 T_BEGIN {
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
456 struct message_address *addr;
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
457 string_t *str;
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
458
7284
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
459 switch (arg->type) {
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
460 case SEARCH_HEADER:
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
461 /* simple match */
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
462 break;
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
463 case SEARCH_HEADER_ADDRESS:
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
464 /* we have to match against normalized address */
6940
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6899
diff changeset
465 addr = message_address_parse(pool_datastack_create(),
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6899
diff changeset
466 ctx->hdr->full_value,
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6899
diff changeset
467 ctx->hdr->full_value_len,
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6899
diff changeset
468 (unsigned int)-1, TRUE);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6899
diff changeset
469 str = t_str_new(ctx->hdr->value_len);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6899
diff changeset
470 message_address_write(str, addr);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6899
diff changeset
471 hdr.value = hdr.full_value = str_data(str);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6899
diff changeset
472 hdr.value_len = hdr.full_value_len = str_len(str);
7284
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
473 break;
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
474 case SEARCH_HEADER_COMPRESS_LWSP:
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
475 /* convert LWSP to single spaces */
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
476 str = t_str_new(hdr.full_value_len);
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
477 compress_lwsp(str, hdr.full_value, hdr.full_value_len);
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
478 hdr.value = hdr.full_value = str_data(str);
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
479 hdr.value_len = hdr.full_value_len = str_len(str);
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
480 break;
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
481 default:
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
482 i_unreached();
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
483 }
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
484 ret = message_search_more(msg_search_ctx, &block) ? 1 : 0;
346d4a44c2f4 SEARCH SUBJECT now changes LWSP to spaces to match ENVELOPE's subject field.
Timo Sirainen <tss@iki.fi>
parents: 7281
diff changeset
485 } T_END;
568
f2aa58c2afd0 SEARCH CHARSET support. Currently we do it through iconv() and only ASCII
Timo Sirainen <tss@iki.fi>
parents: 559
diff changeset
486
9582
4432650c0699 lib-storage: Fixed header searches to work correctly when there are multiple headers with same name.
Timo Sirainen <tss@iki.fi>
parents: 9540
diff changeset
487 /* there may be multiple headers. don't mark this failed yet. */
4432650c0699 lib-storage: Fixed header searches to work correctly when there are multiple headers with same name.
Timo Sirainen <tss@iki.fi>
parents: 9540
diff changeset
488 if (ret > 0)
4432650c0699 lib-storage: Fixed header searches to work correctly when there are multiple headers with same name.
Timo Sirainen <tss@iki.fi>
parents: 9540
diff changeset
489 ARG_SET_RESULT(arg, 1);
1069
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
490 }
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
491
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
492 static void search_header_unmatch(struct mail_search_arg *arg,
6411
6a64e64fa3a3 Renamed __attr_*__ to ATTR_*. Renamed __attrs_used__ to ATTRS_DEFINED.
Timo Sirainen <tss@iki.fi>
parents: 6280
diff changeset
493 void *context ATTR_UNUSED)
1069
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
494 {
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
495 switch (arg->type) {
1070
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
496 case SEARCH_SENTBEFORE:
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
497 case SEARCH_SENTON:
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
498 case SEARCH_SENTSINCE:
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
499 if (arg->not) {
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
500 /* date header not found, so we match only for
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
501 NOT searches */
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
502 ARG_SET_RESULT(arg, 0);
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
503 }
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
504 break;
1069
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
505 case SEARCH_HEADER:
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
506 case SEARCH_HEADER_ADDRESS:
7328
e0e212e7deeb SEARCH NOT SUBJECT didn't work correctly.
Timo Sirainen <tss@iki.fi>
parents: 7284
diff changeset
507 case SEARCH_HEADER_COMPRESS_LWSP:
1069
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
508 ARG_SET_RESULT(arg, 0);
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
509 break;
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
510 default:
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
511 break;
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
512 }
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
513 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
514
4907
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
515 static void search_header(struct message_header_line *hdr,
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
516 struct search_header_context *ctx)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
517 {
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
518 if (hdr == NULL) {
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
519 /* end of headers, mark all unknown SEARCH_HEADERs unmatched */
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
520 mail_search_args_foreach(ctx->args, search_header_unmatch, ctx);
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
521 return;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
522 }
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
523
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
524 if (hdr->eoh)
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
525 return;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
526
3325
38eaa792c405 Don't call index_mail_parse_header() twice when searching headers. Caused
Timo Sirainen <tss@iki.fi>
parents: 3301
diff changeset
527 if (ctx->parse_headers)
38eaa792c405 Don't call index_mail_parse_header() twice when searching headers. Caused
Timo Sirainen <tss@iki.fi>
parents: 3301
diff changeset
528 index_mail_parse_header(NULL, hdr, ctx->index_context->imail);
924
4f697dde0fca THREAD=REFERENCES implementation. Doesn't crash, but I'm not sure how
Timo Sirainen <tss@iki.fi>
parents: 903
diff changeset
529
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
530 if (ctx->custom_header || strcasecmp(hdr->name, "Date") == 0) {
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
531 ctx->hdr = hdr;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
532
10
82b7de533f98 s/user_data/context/ and some s/Data/Context/
Timo Sirainen <tss@iki.fi>
parents: 5
diff changeset
533 ctx->custom_header = FALSE;
82b7de533f98 s/user_data/context/ and some s/Data/Context/
Timo Sirainen <tss@iki.fi>
parents: 5
diff changeset
534 mail_search_args_foreach(ctx->args, search_header_arg, ctx);
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
535 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
536 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
537
4907
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
538 static void search_body(struct mail_search_arg *arg,
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
539 struct search_body_context *ctx)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
540 {
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
541 struct message_search_context *msg_search_ctx;
3863
55df57c028d4 Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents: 3795
diff changeset
542 int ret;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
543
608
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body
Timo Sirainen <tss@iki.fi>
parents: 569
diff changeset
544 if (ctx->index_ctx->error != NULL)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
545 return;
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
546
4942
b382b21409b5 Added support for X-BODY-FAST and X-TEXT-FAST SEARCH arguments. FTS plugin
Timo Sirainen <tss@iki.fi>
parents: 4939
diff changeset
547 switch (arg->type) {
b382b21409b5 Added support for X-BODY-FAST and X-TEXT-FAST SEARCH arguments. FTS plugin
Timo Sirainen <tss@iki.fi>
parents: 4939
diff changeset
548 case SEARCH_BODY:
b382b21409b5 Added support for X-BODY-FAST and X-TEXT-FAST SEARCH arguments. FTS plugin
Timo Sirainen <tss@iki.fi>
parents: 4939
diff changeset
549 case SEARCH_BODY_FAST:
b382b21409b5 Added support for X-BODY-FAST and X-TEXT-FAST SEARCH arguments. FTS plugin
Timo Sirainen <tss@iki.fi>
parents: 4939
diff changeset
550 case SEARCH_TEXT:
b382b21409b5 Added support for X-BODY-FAST and X-TEXT-FAST SEARCH arguments. FTS plugin
Timo Sirainen <tss@iki.fi>
parents: 4939
diff changeset
551 case SEARCH_TEXT_FAST:
b382b21409b5 Added support for X-BODY-FAST and X-TEXT-FAST SEARCH arguments. FTS plugin
Timo Sirainen <tss@iki.fi>
parents: 4939
diff changeset
552 break;
b382b21409b5 Added support for X-BODY-FAST and X-TEXT-FAST SEARCH arguments. FTS plugin
Timo Sirainen <tss@iki.fi>
parents: 4939
diff changeset
553 default:
3795
e6c42de08336 Allow message_body_search() to return "message_part is broken" error. If it
Timo Sirainen <tss@iki.fi>
parents: 3467
diff changeset
554 return;
4942
b382b21409b5 Added support for X-BODY-FAST and X-TEXT-FAST SEARCH arguments. FTS plugin
Timo Sirainen <tss@iki.fi>
parents: 4939
diff changeset
555 }
3795
e6c42de08336 Allow message_body_search() to return "message_part is broken" error. If it
Timo Sirainen <tss@iki.fi>
parents: 3467
diff changeset
556
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
557 msg_search_ctx = msg_search_arg_context(ctx->index_ctx, arg);
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
558 if (msg_search_ctx == NULL) {
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
559 ARG_SET_RESULT(arg, 0);
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
560 return;
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
561 }
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
562
3795
e6c42de08336 Allow message_body_search() to return "message_part is broken" error. If it
Timo Sirainen <tss@iki.fi>
parents: 3467
diff changeset
563 i_stream_seek(ctx->input, 0);
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
564 ret = message_search_msg(msg_search_ctx, ctx->input, ctx->part);
7241
a6c066f50877 Added mail_set_cache_corrupted() to rebuild the cache file and force
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
565 if (ret < 0 && ctx->input->stream_errno == 0) {
a6c066f50877 Added mail_set_cache_corrupted() to rebuild the cache file and force
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
566 /* try again without cached parts */
a6c066f50877 Added mail_set_cache_corrupted() to rebuild the cache file and force
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
567 mail_set_cache_corrupted(ctx->index_ctx->mail,
a6c066f50877 Added mail_set_cache_corrupted() to rebuild the cache file and force
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
568 MAIL_FETCH_MESSAGE_PARTS);
3795
e6c42de08336 Allow message_body_search() to return "message_part is broken" error. If it
Timo Sirainen <tss@iki.fi>
parents: 3467
diff changeset
569
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
570 i_stream_seek(ctx->input, 0);
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
571 ret = message_search_msg(msg_search_ctx, ctx->input, NULL);
7241
a6c066f50877 Added mail_set_cache_corrupted() to rebuild the cache file and force
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
572 i_assert(ret >= 0 || ctx->input->stream_errno != 0);
3795
e6c42de08336 Allow message_body_search() to return "message_part is broken" error. If it
Timo Sirainen <tss@iki.fi>
parents: 3467
diff changeset
573 }
290
3dcc2275b4ca IOBuffer cleanup, hopefully fixes some mbox problems.
Timo Sirainen <tss@iki.fi>
parents: 223
diff changeset
574
3795
e6c42de08336 Allow message_body_search() to return "message_part is broken" error. If it
Timo Sirainen <tss@iki.fi>
parents: 3467
diff changeset
575 ARG_SET_RESULT(arg, ret > 0);
5
1b34ec11fff8 Message data is parsed in blocks (no longer entirely mmap()ed). Several
Timo Sirainen <tss@iki.fi>
parents: 0
diff changeset
576 }
1b34ec11fff8 Message data is parsed in blocks (no longer entirely mmap()ed). Several
Timo Sirainen <tss@iki.fi>
parents: 0
diff changeset
577
8982
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
578 static int search_arg_match_text(struct mail_search_arg *args,
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
579 struct index_search_context *ctx, int ret)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
580 {
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
581 struct istream *input;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
582 struct mailbox_header_lookup_ctx *headers_ctx;
8982
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
583 struct mail_search_arg *arg;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
584 const char *const *headers;
3863
55df57c028d4 Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents: 3795
diff changeset
585 bool have_headers, have_body;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
586
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
587 /* first check what we need to use */
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
588 headers = mail_search_args_analyze(args, &have_headers, &have_body);
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
589 if (!have_headers && !have_body)
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
590 return ret;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
591
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
592 if (have_headers) {
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
593 struct search_header_context hdr_ctx;
5
1b34ec11fff8 Message data is parsed in blocks (no longer entirely mmap()ed). Several
Timo Sirainen <tss@iki.fi>
parents: 0
diff changeset
594
8982
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
595 if (have_body &&
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
596 ctx->mail->lookup_abort == MAIL_LOOKUP_ABORT_NEVER) {
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
597 /* just open the mail bypassing any caching, since
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
598 we're going to read through the body anyway */
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
599 headers = NULL;
8982
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
600 }
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
601
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
602 if (headers == NULL) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
603 headers_ctx = NULL;
6280
eb7c9d8ece54 mail_*() APIs changed to return int and return the actual data as pointer.
Timo Sirainen <tss@iki.fi>
parents: 6277
diff changeset
604 if (mail_get_stream(ctx->mail, NULL, NULL, &input) < 0)
8982
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
605 return -1;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
606 } else {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
607 /* FIXME: do this once in init */
3301
dd19f2e8575f Don't even try to allow searching zero number of headers.
Timo Sirainen <tss@iki.fi>
parents: 3248
diff changeset
608 i_assert(*headers != NULL);
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
609 headers_ctx =
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
610 mailbox_header_lookup_init(&ctx->ibox->box,
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
611 headers);
6280
eb7c9d8ece54 mail_*() APIs changed to return int and return the actual data as pointer.
Timo Sirainen <tss@iki.fi>
parents: 6277
diff changeset
612 if (mail_get_header_stream(ctx->mail, headers_ctx,
eb7c9d8ece54 mail_*() APIs changed to return int and return the actual data as pointer.
Timo Sirainen <tss@iki.fi>
parents: 6277
diff changeset
613 &input) < 0) {
8011
2d902d1f8bea struct mailbox_header_lookup_ctx can now be referenced/unreferenced so it
Timo Sirainen <tss@iki.fi>
parents: 7910
diff changeset
614 mailbox_header_lookup_unref(&headers_ctx);
8982
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
615 return -1;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
616 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
617 }
715
3e952f64b2ec Non-envelope-cached header searching wasn't working. Also now search works
Timo Sirainen <tss@iki.fi>
parents: 678
diff changeset
618
568
f2aa58c2afd0 SEARCH CHARSET support. Currently we do it through iconv() and only ASCII
Timo Sirainen <tss@iki.fi>
parents: 559
diff changeset
619 memset(&hdr_ctx, 0, sizeof(hdr_ctx));
f2aa58c2afd0 SEARCH CHARSET support. Currently we do it through iconv() and only ASCII
Timo Sirainen <tss@iki.fi>
parents: 559
diff changeset
620 hdr_ctx.index_context = ctx;
f2aa58c2afd0 SEARCH CHARSET support. Currently we do it through iconv() and only ASCII
Timo Sirainen <tss@iki.fi>
parents: 559
diff changeset
621 hdr_ctx.custom_header = TRUE;
f2aa58c2afd0 SEARCH CHARSET support. Currently we do it through iconv() and only ASCII
Timo Sirainen <tss@iki.fi>
parents: 559
diff changeset
622 hdr_ctx.args = args;
5516
96f0b56489a2 Don't feed index_mail_parser headers while searching message bodies, unless
Timo Sirainen <tss@iki.fi>
parents: 5513
diff changeset
623 hdr_ctx.parse_headers = headers == NULL &&
96f0b56489a2 Don't feed index_mail_parser headers while searching message bodies, unless
Timo Sirainen <tss@iki.fi>
parents: 5513
diff changeset
624 index_mail_want_parse_headers(ctx->imail);
608
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body
Timo Sirainen <tss@iki.fi>
parents: 569
diff changeset
625
5516
96f0b56489a2 Don't feed index_mail_parser headers while searching message bodies, unless
Timo Sirainen <tss@iki.fi>
parents: 5513
diff changeset
626 if (hdr_ctx.parse_headers)
96f0b56489a2 Don't feed index_mail_parser headers while searching message bodies, unless
Timo Sirainen <tss@iki.fi>
parents: 5513
diff changeset
627 index_mail_parse_header_init(ctx->imail, headers_ctx);
5522
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds.
Timo Sirainen <tss@iki.fi>
parents: 5516
diff changeset
628 message_parse_header(input, NULL, hdr_parser_flags,
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds.
Timo Sirainen <tss@iki.fi>
parents: 5516
diff changeset
629 search_header, &hdr_ctx);
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
630 if (headers_ctx != NULL)
8011
2d902d1f8bea struct mailbox_header_lookup_ctx can now be referenced/unreferenced so it
Timo Sirainen <tss@iki.fi>
parents: 7910
diff changeset
631 mailbox_header_lookup_unref(&headers_ctx);
715
3e952f64b2ec Non-envelope-cached header searching wasn't working. Also now search works
Timo Sirainen <tss@iki.fi>
parents: 678
diff changeset
632 } else {
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
633 struct message_size hdr_size;
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
634
6280
eb7c9d8ece54 mail_*() APIs changed to return int and return the actual data as pointer.
Timo Sirainen <tss@iki.fi>
parents: 6277
diff changeset
635 if (mail_get_stream(ctx->mail, &hdr_size, NULL, &input) < 0)
8982
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
636 return -1;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
637
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
638 i_stream_seek(input, hdr_size.physical_size);
5
1b34ec11fff8 Message data is parsed in blocks (no longer entirely mmap()ed). Several
Timo Sirainen <tss@iki.fi>
parents: 0
diff changeset
639 }
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
640
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
641 if (have_body) {
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
642 struct search_body_context body_ctx;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
643
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
644 if (ctx->mail->lookup_abort != MAIL_LOOKUP_ABORT_NEVER)
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
645 return -1;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
646
608
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body
Timo Sirainen <tss@iki.fi>
parents: 569
diff changeset
647 memset(&body_ctx, 0, sizeof(body_ctx));
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body
Timo Sirainen <tss@iki.fi>
parents: 569
diff changeset
648 body_ctx.index_ctx = ctx;
764
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their
Timo Sirainen <tss@iki.fi>
parents: 761
diff changeset
649 body_ctx.input = input;
6280
eb7c9d8ece54 mail_*() APIs changed to return int and return the actual data as pointer.
Timo Sirainen <tss@iki.fi>
parents: 6277
diff changeset
650 (void)mail_get_parts(ctx->mail, &body_ctx.part);
608
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body
Timo Sirainen <tss@iki.fi>
parents: 569
diff changeset
651
8982
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
652 ret = mail_search_args_foreach(args, search_body, &body_ctx);
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
653 } else {
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
654 /* see if we have a decision */
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
655 ret = 1;
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
656 arg = ctx->mail_ctx.args->args;
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
657 for (; arg != NULL; arg = arg->next) {
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
658 if (arg->result == 0) {
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
659 ret = 0;
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
660 break;
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
661 }
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
662 if (arg->result < 0)
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
663 ret = -1;
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
664 }
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
665 }
8982
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
666 return ret;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
667 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
668
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
669 static bool search_msgset_fix_limits(unsigned int messages_count,
7619
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
670 ARRAY_TYPE(seq_range) *seqset, bool not)
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
671 {
7619
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
672 struct seq_range *range;
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
673 unsigned int count;
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
674
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
675 i_assert(messages_count > 0);
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
676
7619
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
677 range = array_get_modifiable(seqset, &count);
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
678 if (count > 0) {
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
679 i_assert(range[0].seq1 != 0);
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
680 if (range[count-1].seq2 == (uint32_t)-1) {
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
681 /* "*" used, make sure the last message is in the range
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
682 (e.g. with count+1:* we still want to include it) */
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
683 seq_range_array_add(seqset, 0, messages_count);
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
684 }
7619
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
685 /* remove all non-existing messages */
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
686 seq_range_array_remove_range(seqset, messages_count + 1,
7619
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
687 (uint32_t)-1);
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
688 }
7619
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
689 if (!not)
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
690 return array_count(seqset) > 0;
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
691 else {
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
692 /* if all messages are in the range, it can't match */
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
693 range = array_get_modifiable(seqset, &count);
7828
7caab06fb890 SEARCH: Fixed NOT <seqset> not matching anything.
Timo Sirainen <tss@iki.fi>
parents: 7805
diff changeset
694 return range[0].seq1 != 1 ||
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
695 range[count-1].seq2 != messages_count;
7619
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
696 }
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
697 }
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
698
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
699 static void search_msgset_fix(unsigned int messages_count,
7619
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
700 ARRAY_TYPE(seq_range) *seqset,
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
701 uint32_t *seq1_r, uint32_t *seq2_r, bool not)
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
702 {
7619
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
703 const struct seq_range *range;
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
704 unsigned int count;
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
705 uint32_t min_seq, max_seq;
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
706
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
707 if (!search_msgset_fix_limits(messages_count, seqset, not)) {
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
708 *seq1_r = (uint32_t)-1;
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
709 *seq2_r = 0;
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
710 return;
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
711 }
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
712
7619
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
713 range = array_get(seqset, &count);
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
714 if (!not) {
7619
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
715 min_seq = range[0].seq1;
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
716 max_seq = range[count-1].seq2;
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
717 } else {
7619
56f55bd35aa5 Moved IMAP messageset handling to lib-imap/ and searching to lib-storage/.
Timo Sirainen <tss@iki.fi>
parents: 7618
diff changeset
718 min_seq = range[0].seq1 > 1 ? 1 : range[0].seq2 + 1;
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
719 max_seq = range[count-1].seq2 < messages_count ?
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
720 messages_count : range[count-1].seq1 - 1;
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
721 if (min_seq > max_seq) {
5605
8b97d6bbff35 Don't try to handle 0 in messagesets by returning a nice error message.
Timo Sirainen <tss@iki.fi>
parents: 5599
diff changeset
722 *seq1_r = (uint32_t)-1;
8b97d6bbff35 Don't try to handle 0 in messagesets by returning a nice error message.
Timo Sirainen <tss@iki.fi>
parents: 5599
diff changeset
723 *seq2_r = 0;
8b97d6bbff35 Don't try to handle 0 in messagesets by returning a nice error message.
Timo Sirainen <tss@iki.fi>
parents: 5599
diff changeset
724 return;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
725 }
962
3b139ccc1858 SEARCH didn't properly complain about invalid messagesets. high:low never
Timo Sirainen <tss@iki.fi>
parents: 951
diff changeset
726 }
4439
12b5fbb3a05c Searching (storing, fetching) with sequence sets containing commas was
Timo Sirainen <tss@iki.fi>
parents: 4438
diff changeset
727
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
728 if (*seq1_r < min_seq || *seq1_r == 0)
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
729 *seq1_r = min_seq;
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
730 if (*seq2_r > max_seq)
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
731 *seq2_r = max_seq;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
732 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
733
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
734 static void search_or_parse_msgset_args(unsigned int messages_count,
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
735 struct mail_search_arg *args,
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
736 uint32_t *seq1_r, uint32_t *seq2_r)
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
737 {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
738 uint32_t seq1, seq2, min_seq1 = 0, max_seq2 = 0;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
739
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
740 for (; args != NULL; args = args->next) {
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
741 seq1 = 1; seq2 = messages_count;
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
742
7908
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
743 switch (args->type) {
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
744 case SEARCH_SUB:
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
745 i_assert(!args->not);
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
746 search_parse_msgset_args(messages_count,
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
747 args->value.subargs,
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
748 &seq1, &seq2);
7908
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
749 break;
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
750 case SEARCH_OR:
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
751 i_assert(!args->not);
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
752 search_or_parse_msgset_args(messages_count,
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
753 args->value.subargs,
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
754 &seq1, &seq2);
7908
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
755 break;
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
756 case SEARCH_SEQSET:
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
757 search_msgset_fix(messages_count, &args->value.seqset,
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
758 &seq1, &seq2, args->not);
7908
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
759 break;
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
760 default:
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
761 break;
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
762 }
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
763
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
764 if (min_seq1 == 0) {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
765 min_seq1 = seq1;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
766 max_seq2 = seq2;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
767 } else {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
768 if (seq1 < min_seq1)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
769 min_seq1 = seq1;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
770 if (seq2 > max_seq2)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
771 max_seq2 = seq2;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
772 }
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
773 }
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
774 i_assert(min_seq1 != 0);
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
775
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
776 if (min_seq1 > *seq1_r)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
777 *seq1_r = min_seq1;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
778 if (max_seq2 < *seq2_r)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
779 *seq2_r = max_seq2;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
780 }
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
781
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
782 static void search_parse_msgset_args(unsigned int messages_count,
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
783 struct mail_search_arg *args,
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
784 uint32_t *seq1_r, uint32_t *seq2_r)
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
785 {
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
786 for (; args != NULL; args = args->next) {
7908
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
787 switch (args->type) {
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
788 case SEARCH_SUB:
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
789 i_assert(!args->not);
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
790 search_parse_msgset_args(messages_count,
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
791 args->value.subargs,
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
792 seq1_r, seq2_r);
7908
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
793 break;
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
794 case SEARCH_OR:
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
795 /* go through our children and use the widest seqset
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
796 range */
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
797 i_assert(!args->not);
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
798 search_or_parse_msgset_args(messages_count,
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
799 args->value.subargs,
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
800 seq1_r, seq2_r);
7908
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
801 break;
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
802 case SEARCH_SEQSET:
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
803 search_msgset_fix(messages_count, &args->value.seqset,
6485
2eff72b212fe Simplify search tree by canonicalizing message sets, converting NOT away
Timo Sirainen <tss@iki.fi>
parents: 6457
diff changeset
804 seq1_r, seq2_r, args->not);
7908
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
805 break;
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
806 default:
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
807 break;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
808 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
809 }
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
810 }
962
3b139ccc1858 SEARCH didn't properly complain about invalid messagesets. high:low never
Timo Sirainen <tss@iki.fi>
parents: 951
diff changeset
811
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
812 static void search_limit_lowwater(struct index_search_context *ctx,
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
813 uint32_t uid_lowwater, uint32_t *first_seq)
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
814 {
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
815 uint32_t seq1, seq2;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
816
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
817 if (uid_lowwater == 0)
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
818 return;
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
819
6677
90bcf480312d Renamed mail_index_lookup_uid_range() to mail_index_lookup_seq_range(), made
Timo Sirainen <tss@iki.fi>
parents: 6574
diff changeset
820 mail_index_lookup_seq_range(ctx->view, uid_lowwater, (uint32_t)-1,
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
821 &seq1, &seq2);
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
822 if (*first_seq < seq1)
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
823 *first_seq = seq1;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
824 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
825
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
826 static bool search_limit_by_flags(struct index_search_context *ctx,
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
827 struct mail_search_arg *args,
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
828 uint32_t *seq1, uint32_t *seq2)
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
829 {
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
830 const struct mail_index_header *hdr;
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
831
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
832 hdr = mail_index_get_header(ctx->view);
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
833 for (; args != NULL; args = args->next) {
6962
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
834 if (args->type != SEARCH_FLAGS) {
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
835 if (args->type == SEARCH_ALL) {
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
836 if (args->not)
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
837 return FALSE;
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
838 }
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
839 continue;
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
840 }
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
841 if ((args->value.flags & MAIL_SEEN) != 0) {
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
842 /* SEEN with 0 seen? */
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
843 if (!args->not && hdr->seen_messages_count == 0)
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
844 return FALSE;
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
845
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
846 if (hdr->seen_messages_count == hdr->messages_count) {
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
847 /* UNSEEN with all seen? */
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
848 if (args->not)
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
849 return FALSE;
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
850
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
851 /* SEEN with all seen */
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
852 args->match_always = TRUE;
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
853 } else if (args->not) {
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
854 /* UNSEEN with lowwater limiting */
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
855 search_limit_lowwater(ctx,
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
856 hdr->first_unseen_uid_lowwater, seq1);
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
857 }
6962
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
858 }
659e4a606aae Replaced SEARCH_<flag> with a generic SEARCH_FLAGS. Use value.size for
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
859 if ((args->value.flags & MAIL_DELETED) != 0) {
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
860 /* DELETED with 0 deleted? */
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
861 if (!args->not && hdr->deleted_messages_count == 0)
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
862 return FALSE;
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
863
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
864 if (hdr->deleted_messages_count ==
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
865 hdr->messages_count) {
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
866 /* UNDELETED with all deleted? */
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
867 if (args->not)
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
868 return FALSE;
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
869
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
870 /* DELETED with all deleted */
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
871 args->match_always = TRUE;
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
872 } else if (!args->not) {
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
873 /* DELETED with lowwater limiting */
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
874 search_limit_lowwater(ctx,
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
875 hdr->first_deleted_uid_lowwater, seq1);
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
876 }
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
877 }
962
3b139ccc1858 SEARCH didn't properly complain about invalid messagesets. high:low never
Timo Sirainen <tss@iki.fi>
parents: 951
diff changeset
878 }
3b139ccc1858 SEARCH didn't properly complain about invalid messagesets. high:low never
Timo Sirainen <tss@iki.fi>
parents: 951
diff changeset
879
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
880 return *seq1 <= *seq2;
327
276b7a53c264 Modify log fixes. STORE and SEARCH didn't handle properly message sequence
Timo Sirainen <tss@iki.fi>
parents: 317
diff changeset
881 }
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
882
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
883 static void search_get_seqset(struct index_search_context *ctx,
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
884 unsigned int messages_count,
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
885 struct mail_search_arg *args)
327
276b7a53c264 Modify log fixes. STORE and SEARCH didn't handle properly message sequence
Timo Sirainen <tss@iki.fi>
parents: 317
diff changeset
886 {
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
887 if (messages_count == 0) {
2899
1a05764af1e0 UID FETCH * gave error message with empty mailbox.
Timo Sirainen <tss@iki.fi>
parents: 2892
diff changeset
888 /* no messages, don't check sequence ranges. although we could
1a05764af1e0 UID FETCH * gave error message with empty mailbox.
Timo Sirainen <tss@iki.fi>
parents: 2892
diff changeset
889 give error message then for FETCH, we shouldn't do it for
1a05764af1e0 UID FETCH * gave error message with empty mailbox.
Timo Sirainen <tss@iki.fi>
parents: 2892
diff changeset
890 UID FETCH. */
1985
3ccd4eb52ee4 don't crash when requesting messages from empty mailbox
Timo Sirainen <tss@iki.fi>
parents: 1958
diff changeset
891 ctx->seq1 = 1;
3ccd4eb52ee4 don't crash when requesting messages from empty mailbox
Timo Sirainen <tss@iki.fi>
parents: 1958
diff changeset
892 ctx->seq2 = 0;
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
893 return;
1985
3ccd4eb52ee4 don't crash when requesting messages from empty mailbox
Timo Sirainen <tss@iki.fi>
parents: 1958
diff changeset
894 }
3ccd4eb52ee4 don't crash when requesting messages from empty mailbox
Timo Sirainen <tss@iki.fi>
parents: 1958
diff changeset
895
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
896 ctx->seq1 = 1;
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
897 ctx->seq2 = messages_count;
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
898
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
899 search_parse_msgset_args(messages_count, args, &ctx->seq1, &ctx->seq2);
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
900 if (ctx->seq1 == 0) {
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
901 ctx->seq1 = 1;
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
902 ctx->seq2 = messages_count;
327
276b7a53c264 Modify log fixes. STORE and SEARCH didn't handle properly message sequence
Timo Sirainen <tss@iki.fi>
parents: 317
diff changeset
903 }
4438
00db36e1b734 Don't crash when different search conditions reduce the search range so that
Timo Sirainen <tss@iki.fi>
parents: 4432
diff changeset
904 if (ctx->seq1 > ctx->seq2) {
4432
c13d8fe698f8 Don't crash if seqset restrictions caused no messages to be searched.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4431
diff changeset
905 /* no matches */
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
906 return;
4432
c13d8fe698f8 Don't crash if seqset restrictions caused no messages to be searched.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4431
diff changeset
907 }
327
276b7a53c264 Modify log fixes. STORE and SEARCH didn't handle properly message sequence
Timo Sirainen <tss@iki.fi>
parents: 317
diff changeset
908
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
909 /* UNSEEN and DELETED in root search level may limit the range */
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
910 if (!search_limit_by_flags(ctx, args, &ctx->seq1, &ctx->seq2)) {
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
911 /* no matches */
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
912 ctx->seq1 = 1;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
913 ctx->seq2 = 0;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
914 }
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
915 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
916
7909
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
917 static int search_build_subthread(struct mail_thread_iterate_context *iter,
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
918 ARRAY_TYPE(seq_range) *uids)
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
919 {
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
920 struct mail_thread_iterate_context *child_iter;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
921 const struct mail_thread_child_node *node;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
922 int ret = 0;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
923
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
924 while ((node = mail_thread_iterate_next(iter, &child_iter)) != NULL) {
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
925 if (child_iter != NULL) {
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
926 if (search_build_subthread(child_iter, uids) < 0)
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
927 ret = -1;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
928 }
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
929 seq_range_array_add(uids, 0, node->uid);
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
930 }
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
931 if (mail_thread_iterate_deinit(&iter) < 0)
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
932 ret = -1;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
933 return ret;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
934 }
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
935
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
936 static int search_build_inthread_result(struct index_search_context *ctx,
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
937 struct mail_search_arg *arg)
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
938 {
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
939 struct mail_thread_iterate_context *iter, *child_iter;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
940 const struct mail_thread_child_node *node;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
941 const ARRAY_TYPE(seq_range) *search_uids;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
942 ARRAY_TYPE(seq_range) thread_uids;
8074
05565bfadc6b INTHREAD search may have failed randomly.
Timo Sirainen <tss@iki.fi>
parents: 8011
diff changeset
943 int ret = 0;
7909
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
944
9034
b77fbbee8749 Search: Added an assert.
Timo Sirainen <tss@iki.fi>
parents: 8995
diff changeset
945 /* mail_search_args_init() must have been called by now */
b77fbbee8749 Search: Added an assert.
Timo Sirainen <tss@iki.fi>
parents: 8995
diff changeset
946 i_assert(arg->value.search_args != NULL);
b77fbbee8749 Search: Added an assert.
Timo Sirainen <tss@iki.fi>
parents: 8995
diff changeset
947
7909
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
948 p_array_init(&arg->value.seqset, ctx->mail_ctx.args->pool, 64);
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
949 if (mailbox_search_result_build(ctx->mail_ctx.transaction,
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
950 arg->value.search_args,
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
951 MAILBOX_SEARCH_RESULT_FLAG_UPDATE |
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
952 MAILBOX_SEARCH_RESULT_FLAG_QUEUE_SYNC,
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
953 &arg->value.search_result) < 0)
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
954 return -1;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
955 if (ctx->thread_ctx == NULL) {
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
956 /* failed earlier */
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
957 return -1;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
958 }
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
959
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
960 search_uids = mailbox_search_result_get(arg->value.search_result);
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
961 if (array_count(search_uids) == 0) {
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
962 /* search found nothing - no threads can match */
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
963 return 0;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
964 }
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
965
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
966 t_array_init(&thread_uids, 128);
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
967 iter = mail_thread_iterate_init(ctx->thread_ctx,
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
968 arg->value.thread_type, FALSE);
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
969 while ((node = mail_thread_iterate_next(iter, &child_iter)) != NULL) {
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
970 seq_range_array_add(&thread_uids, 0, node->uid);
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
971 if (child_iter != NULL) {
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
972 if (search_build_subthread(child_iter,
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
973 &thread_uids) < 0)
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
974 ret = -1;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
975 }
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
976 if (seq_range_array_have_common(&thread_uids, search_uids)) {
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
977 /* yes, we want this thread */
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
978 seq_range_array_merge(&arg->value.seqset, &thread_uids);
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
979 }
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
980 array_clear(&thread_uids);
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
981 }
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
982 if (mail_thread_iterate_deinit(&iter) < 0)
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
983 ret = -1;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
984 return ret;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
985 }
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
986
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
987 static int search_build_inthreads(struct index_search_context *ctx,
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
988 struct mail_search_arg *arg)
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
989 {
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
990 int ret = 0;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
991
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
992 for (; arg != NULL; arg = arg->next) {
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
993 switch (arg->type) {
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
994 case SEARCH_OR:
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
995 case SEARCH_SUB:
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
996 if (search_build_inthreads(ctx, arg->value.subargs) < 0)
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
997 ret = -1;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
998 break;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
999 case SEARCH_INTHREAD:
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1000 if (search_build_inthread_result(ctx, arg) < 0)
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1001 ret = -1;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1002 break;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1003 default:
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1004 break;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1005 }
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1006 }
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1007 return ret;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1008 }
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1009
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
1010 struct mail_search_context *
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
1011 index_storage_search_init(struct mailbox_transaction_context *_t,
7642
077bb84e9e77 Make mail_search_args an independent structure that can be used for multiple
Timo Sirainen <tss@iki.fi>
parents: 7640
diff changeset
1012 struct mail_search_args *args,
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
1013 const enum mail_sort_type *sort_program)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
1014 {
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
1015 struct index_transaction_context *t =
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
1016 (struct index_transaction_context *)_t;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
1017 struct index_search_context *ctx;
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
1018 struct mailbox_status status;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
1019
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
1020 ctx = i_new(struct index_search_context, 1);
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
1021 ctx->mail_ctx.transaction = _t;
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
1022 ctx->ibox = t->ibox;
2224
a816e2d88406 Added mail_index_transaction_get_updated_view() which can be used to access
Timo Sirainen <tss@iki.fi>
parents: 2190
diff changeset
1023 ctx->view = t->trans_view;
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1024 ctx->mail_ctx.args = args;
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1025 ctx->mail_ctx.sort_program = index_sort_program_init(_t, sort_program);
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1026 ctx->next_time_check_cost = SEARCH_INITIAL_MAX_COST;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1027 if (gettimeofday(&ctx->last_nonblock_timeval, NULL) < 0)
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1028 i_fatal("gettimeofday() failed: %m");
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
1029
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
1030 mailbox_get_status(_t->box, STATUS_MESSAGES, &status);
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
1031 ctx->mail_ctx.progress_max = status.messages;
8507
f323bf2465bd Give more correct "* OK searched n%" notifications with fts and virtual mailboxes.
Timo Sirainen <tss@iki.fi>
parents: 8497
diff changeset
1032
7647
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1033 i_array_init(&ctx->mail_ctx.results, 5);
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1034 array_create(&ctx->mail_ctx.module_contexts, default_pool,
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1035 sizeof(void *), 5);
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1036
7642
077bb84e9e77 Make mail_search_args an independent structure that can be used for multiple
Timo Sirainen <tss@iki.fi>
parents: 7640
diff changeset
1037 mail_search_args_reset(ctx->mail_ctx.args->args, TRUE);
7909
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1038 if (args->have_inthreads) {
8146
70b53e9b232e Rewrote thread indexing code. It's a lot simpler and takes less disk space.
Timo Sirainen <tss@iki.fi>
parents: 8077
diff changeset
1039 if (mail_thread_init(_t->box, NULL, &ctx->thread_ctx) < 0)
7909
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1040 ctx->failed = TRUE;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1041 if (search_build_inthreads(ctx, args->args) < 0)
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1042 ctx->failed = TRUE;
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1043 }
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
1044
9540
ef3b30b24c7c lib-storage: Use mailbox_status() to get number of messages in search code.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
1045 search_get_seqset(ctx, status.messages, args->args);
7642
077bb84e9e77 Make mail_search_args an independent structure that can be used for multiple
Timo Sirainen <tss@iki.fi>
parents: 7640
diff changeset
1046 (void)mail_search_args_foreach(args->args, search_init_arg, ctx);
6275
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
1047
913b188f4dd4 Removed explicit locking from views and maps. They were already locked all
Timo Sirainen <tss@iki.fi>
parents: 5613
diff changeset
1048 /* Need to reset results for match_always cases */
7642
077bb84e9e77 Make mail_search_args an independent structure that can be used for multiple
Timo Sirainen <tss@iki.fi>
parents: 7640
diff changeset
1049 mail_search_args_reset(ctx->mail_ctx.args->args, FALSE);
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
1050 return &ctx->mail_ctx;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
1051 }
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
1052
5527
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
1053 static void search_arg_deinit(struct mail_search_arg *arg,
6411
6a64e64fa3a3 Renamed __attr_*__ to ATTR_*. Renamed __attrs_used__ to ATTRS_DEFINED.
Timo Sirainen <tss@iki.fi>
parents: 6280
diff changeset
1054 void *context ATTR_UNUSED)
5527
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
1055 {
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
1056 struct message_search_context *search_ctx = arg->context;
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
1057
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
1058 if (search_ctx != NULL) {
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
1059 message_search_deinit(&search_ctx);
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
1060 arg->context = NULL;
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
1061 }
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
1062 }
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
1063
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
1064 int index_storage_search_deinit(struct mail_search_context *_ctx)
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
1065 {
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
1066 struct index_search_context *ctx = (struct index_search_context *)_ctx;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
1067 int ret;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
1068
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
1069 ret = ctx->failed || ctx->error != NULL ? -1 : 0;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
1070
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
1071 if (ctx->error != NULL) {
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
1072 mail_storage_set_error(ctx->ibox->box.storage,
5613
f717fb4b31c0 Error handling rewrite.
Timo Sirainen <tss@iki.fi>
parents: 5605
diff changeset
1073 MAIL_ERROR_PARAMS, ctx->error);
962
3b139ccc1858 SEARCH didn't properly complain about invalid messagesets. high:low never
Timo Sirainen <tss@iki.fi>
parents: 951
diff changeset
1074 }
327
276b7a53c264 Modify log fixes. STORE and SEARCH didn't handle properly message sequence
Timo Sirainen <tss@iki.fi>
parents: 317
diff changeset
1075
7642
077bb84e9e77 Make mail_search_args an independent structure that can be used for multiple
Timo Sirainen <tss@iki.fi>
parents: 7640
diff changeset
1076 mail_search_args_reset(ctx->mail_ctx.args->args, FALSE);
077bb84e9e77 Make mail_search_args an independent structure that can be used for multiple
Timo Sirainen <tss@iki.fi>
parents: 7640
diff changeset
1077 (void)mail_search_args_foreach(ctx->mail_ctx.args->args,
5527
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
1078 search_arg_deinit, NULL);
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
1079
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1080 if (ctx->mail_ctx.sort_program != NULL)
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1081 index_sort_program_deinit(&ctx->mail_ctx.sort_program);
7909
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1082 if (ctx->thread_ctx != NULL)
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1083 mail_thread_deinit(&ctx->thread_ctx);
7647
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1084 array_free(&ctx->mail_ctx.results);
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1085 array_free(&ctx->mail_ctx.module_contexts);
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
1086 i_free(ctx);
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
1087 return ret;
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
1088 }
327
276b7a53c264 Modify log fixes. STORE and SEARCH didn't handle properly message sequence
Timo Sirainen <tss@iki.fi>
parents: 317
diff changeset
1089
3863
55df57c028d4 Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents: 3795
diff changeset
1090 static bool search_match_next(struct index_search_context *ctx)
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1091 {
8982
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1092 static enum mail_lookup_abort cache_lookups[] = {
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1093 MAIL_LOOKUP_ABORT_NOT_IN_CACHE,
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1094 MAIL_LOOKUP_ABORT_READ_MAIL,
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1095 MAIL_LOOKUP_ABORT_NEVER
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1096 };
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1097 unsigned int i;
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1098 int ret = -1;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1099
8982
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1100 /* try to avoid doing extra work for as long as possible */
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1101 for (i = 0; i < N_ELEMENTS(cache_lookups) && ret < 0; i++) {
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1102 ctx->mail->lookup_abort = cache_lookups[i];
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1103 ret = mail_search_args_foreach(ctx->mail_ctx.args->args,
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1104 search_cached_arg, ctx);
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1105 if (ret >= 0)
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1106 break;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1107
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1108 ret = search_arg_match_text(ctx->mail_ctx.args->args, ctx, ret);
8982
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1109 if (ret >= 0)
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1110 break;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1111 }
8982
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1112 ctx->mail->lookup_abort = MAIL_LOOKUP_ABORT_NEVER;
947fab5a8992 Search: Perform all lookups from cache before attempting any uncached lookups.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
1113 return ret > 0;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1114 }
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1115
4949
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1116 static void index_storage_search_notify(struct mailbox *box,
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1117 struct index_search_context *ctx)
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1118 {
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1119 float percentage;
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1120 unsigned int msecs, secs;
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1121
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1122 if (ctx->last_notify.tv_sec == 0) {
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1123 /* set the search time in here, in case a plugin
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1124 already spent some time indexing the mailbox */
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1125 ctx->search_start_time = ioloop_timeval;
8508
689a63a99363 fts: Hide "Searching .." notify while indexing.
Timo Sirainen <tss@iki.fi>
parents: 8507
diff changeset
1126 } else if (box->storage->callbacks->notify_ok != NULL &&
689a63a99363 fts: Hide "Searching .." notify while indexing.
Timo Sirainen <tss@iki.fi>
parents: 8507
diff changeset
1127 !ctx->mail_ctx.progress_hidden) {
8507
f323bf2465bd Give more correct "* OK searched n%" notifications with fts and virtual mailboxes.
Timo Sirainen <tss@iki.fi>
parents: 8497
diff changeset
1128 percentage = ctx->mail_ctx.progress_cur * 100.0 /
f323bf2465bd Give more correct "* OK searched n%" notifications with fts and virtual mailboxes.
Timo Sirainen <tss@iki.fi>
parents: 8497
diff changeset
1129 ctx->mail_ctx.progress_max;
9310
f834d95f173a Moved all struct timeval comparing/calculation code to lib/time-util.
Timo Sirainen <tss@iki.fi>
parents: 9034
diff changeset
1130 msecs = timeval_diff_msecs(&ioloop_timeval,
f834d95f173a Moved all struct timeval comparing/calculation code to lib/time-util.
Timo Sirainen <tss@iki.fi>
parents: 9034
diff changeset
1131 &ctx->search_start_time);
4949
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1132 secs = (msecs / (percentage / 100.0) - msecs) / 1000;
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1133
7226
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents: 7086
diff changeset
1134 T_BEGIN {
6940
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6899
diff changeset
1135 const char *text;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6899
diff changeset
1136
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6899
diff changeset
1137 text = t_strdup_printf("Searched %d%% of the mailbox, "
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6899
diff changeset
1138 "ETA %d:%02d", (int)percentage,
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6899
diff changeset
1139 secs/60, secs%60);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6899
diff changeset
1140 box->storage->callbacks->
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6899
diff changeset
1141 notify_ok(box, text,
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6899
diff changeset
1142 box->storage->callback_context);
7226
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents: 7086
diff changeset
1143 } T_END;
4949
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1144 }
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1145 ctx->last_notify = ioloop_timeval;
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1146 }
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1147
7647
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1148 static bool search_arg_is_static(struct mail_search_arg *arg)
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1149 {
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1150 struct mail_search_arg *subarg;
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1151
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1152 switch (arg->type) {
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1153 case SEARCH_OR:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1154 case SEARCH_SUB:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1155 /* they're static only if all subargs are static */
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1156 subarg = arg->value.subargs;
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1157 for (; subarg != NULL; subarg = subarg->next) {
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1158 if (!search_arg_is_static(subarg))
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1159 return FALSE;
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1160 }
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1161 return TRUE;
7908
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
1162 case SEARCH_SEQSET:
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
1163 /* changes between syncs, but we can't really handle this
1e69c84a1e5a Search code cleanups and minor optimizations.
Timo Sirainen <tss@iki.fi>
parents: 7828
diff changeset
1164 currently. seqsets should be converted to uidsets first. */
7647
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1165 case SEARCH_FLAGS:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1166 case SEARCH_KEYWORDS:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1167 case SEARCH_MODSEQ:
7909
bf9c51edbc66 Added non-optimized support for SEARCH INTHREAD.
Timo Sirainen <tss@iki.fi>
parents: 7908
diff changeset
1168 case SEARCH_INTHREAD:
7647
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1169 break;
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1170 case SEARCH_ALL:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1171 case SEARCH_UIDSET:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1172 case SEARCH_BEFORE:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1173 case SEARCH_ON:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1174 case SEARCH_SINCE:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1175 case SEARCH_SENTBEFORE:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1176 case SEARCH_SENTON:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1177 case SEARCH_SENTSINCE:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1178 case SEARCH_SMALLER:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1179 case SEARCH_LARGER:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1180 case SEARCH_HEADER:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1181 case SEARCH_HEADER_ADDRESS:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1182 case SEARCH_HEADER_COMPRESS_LWSP:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1183 case SEARCH_BODY:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1184 case SEARCH_TEXT:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1185 case SEARCH_BODY_FAST:
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1186 case SEARCH_TEXT_FAST:
8077
6d51328896d6 Added the concept of Global UIDs that are preserved across copies.
Timo Sirainen <tss@iki.fi>
parents: 8074
diff changeset
1187 case SEARCH_GUID:
7910
c1bbdc2b262e FETCH X-MAILBOX and SEARCH X-MAILBOX can be used with virtual mailboxes to
Timo Sirainen <tss@iki.fi>
parents: 7909
diff changeset
1188 case SEARCH_MAILBOX:
7647
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1189 return TRUE;
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1190 }
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1191 return FALSE;
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1192 }
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1193
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1194 static void search_set_static_matches(struct mail_search_arg *arg)
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1195 {
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1196 for (; arg != NULL; arg = arg->next) {
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1197 if (search_arg_is_static(arg))
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1198 arg->result = 1;
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1199 }
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1200 }
879208fdc7e3 Implemented CONTEXT=SEARCH extension.
Timo Sirainen <tss@iki.fi>
parents: 7642
diff changeset
1201
7671
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1202 static bool search_has_static_nonmatches(struct mail_search_arg *arg)
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1203 {
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1204 for (; arg != NULL; arg = arg->next) {
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1205 if (arg->result == 0 && search_arg_is_static(arg))
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1206 return TRUE;
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1207 }
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1208 return FALSE;
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1209 }
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1210
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1211 static unsigned long long search_mail_get_cost(struct mail_private *mail)
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1212 {
8995
e14f1d4b6688 Split struct mail_private.stats_dentry_lookup_count to open/stat counts.
Timo Sirainen <tss@iki.fi>
parents: 8984
diff changeset
1213 return mail->stats_open_lookup_count * SEARCH_COST_DENTRY +
e14f1d4b6688 Split struct mail_private.stats_dentry_lookup_count to open/stat counts.
Timo Sirainen <tss@iki.fi>
parents: 8984
diff changeset
1214 mail->stats_stat_lookup_count * SEARCH_COST_DENTRY +
e14f1d4b6688 Split struct mail_private.stats_dentry_lookup_count to open/stat counts.
Timo Sirainen <tss@iki.fi>
parents: 8984
diff changeset
1215 mail->stats_fstat_lookup_count * SEARCH_COST_ATTR +
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1216 mail->stats_cache_hit_count * SEARCH_COST_CACHE +
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1217 mail->stats_files_read_count * SEARCH_COST_FILES_READ +
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1218 (mail->stats_files_read_bytes/1024) * SEARCH_COST_KBYTE;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1219 }
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1220
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1221 static bool search_would_block(struct index_search_context *ctx)
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1222 {
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1223 struct timeval now;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1224 unsigned long long guess_cost;
9310
f834d95f173a Moved all struct timeval comparing/calculation code to lib/time-util.
Timo Sirainen <tss@iki.fi>
parents: 9034
diff changeset
1225 long long usecs;
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1226 bool ret;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1227
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1228 if (ctx->cost < ctx->next_time_check_cost)
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1229 return FALSE;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1230
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1231 if (gettimeofday(&now, NULL) < 0)
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1232 i_fatal("gettimeofday() failed: %m");
9310
f834d95f173a Moved all struct timeval comparing/calculation code to lib/time-util.
Timo Sirainen <tss@iki.fi>
parents: 9034
diff changeset
1233
f834d95f173a Moved all struct timeval comparing/calculation code to lib/time-util.
Timo Sirainen <tss@iki.fi>
parents: 9034
diff changeset
1234 usecs = timeval_diff_usecs(&now, &ctx->last_nonblock_timeval);
f834d95f173a Moved all struct timeval comparing/calculation code to lib/time-util.
Timo Sirainen <tss@iki.fi>
parents: 9034
diff changeset
1235 if (usecs < 0) {
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1236 /* clock moved backwards. */
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1237 ctx->last_nonblock_timeval = now;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1238 ctx->next_time_check_cost = SEARCH_INITIAL_MAX_COST;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1239 return TRUE;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1240 } else if (usecs < SEARCH_MIN_NONBLOCK_USECS) {
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1241 /* not finished yet. estimate the next time lookup */
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1242 ret = FALSE;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1243 } else {
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1244 /* done, or close enough anyway */
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1245 ctx->last_nonblock_timeval = now;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1246 ret = TRUE;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1247 }
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1248 guess_cost = ctx->cost *
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1249 (SEARCH_MAX_NONBLOCK_USECS / (double)usecs);
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1250 if (usecs < SEARCH_RECALC_MIN_USECS) {
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1251 /* the estimate may not be very good since we spent
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1252 so little time doing this search. don't allow huge changes
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1253 to the guess, but allow anyway large enough so that we can
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1254 move to right direction. */
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1255 if (guess_cost > ctx->next_time_check_cost*3)
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1256 guess_cost = ctx->next_time_check_cost*3;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1257 else if (guess_cost < ctx->next_time_check_cost/3)
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1258 guess_cost = ctx->next_time_check_cost/3;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1259 }
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1260 if (ret)
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1261 ctx->cost = 0;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1262 ctx->next_time_check_cost = guess_cost;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1263 return ret;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1264 }
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1265
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1266 int index_storage_search_next_nonblock(struct mail_search_context *_ctx,
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1267 struct mail *mail, bool *tryagain_r)
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
1268 {
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
1269 struct index_search_context *ctx = (struct index_search_context *)_ctx;
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1270 struct mailbox *box = _ctx->transaction->box;
8497
8a511d7da23f Fixed searching in virtual mailboxes.
Timo Sirainen <tss@iki.fi>
parents: 8481
diff changeset
1271 struct mail_private *mail_private = (struct mail_private *)mail;
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1272 unsigned long long cost1, cost2;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1273 bool old_stats_track, match = FALSE;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
1274
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1275 *tryagain_r = FALSE;
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1276
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1277 if (ctx->sorted) {
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1278 /* everything searched at this point already. just returning
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1279 matches from sort list */
6277
5f66277bbe40 mail_index_lookup*() can't fail anymore. Changed several APIs not to return
Timo Sirainen <tss@iki.fi>
parents: 6276
diff changeset
1280 if (!index_sort_list_next(ctx->mail_ctx.sort_program, mail))
5f66277bbe40 mail_index_lookup*() can't fail anymore. Changed several APIs not to return
Timo Sirainen <tss@iki.fi>
parents: 6276
diff changeset
1281 return 0;
5f66277bbe40 mail_index_lookup*() can't fail anymore. Changed several APIs not to return
Timo Sirainen <tss@iki.fi>
parents: 6276
diff changeset
1282 return 1;
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1283 }
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1284
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1285 if (search_would_block(ctx)) {
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1286 /* this lookup is useful when a large number of
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1287 messages match */
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1288 *tryagain_r = TRUE;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1289 return 0;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1290 }
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1291
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
1292 ctx->mail = mail;
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
1293
4949
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1294 if (ioloop_time - ctx->last_notify.tv_sec >=
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1295 SEARCH_NOTIFY_INTERVAL_SECS)
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1296 index_storage_search_notify(box, ctx);
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1297
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1298 old_stats_track = mail_private->stats_track;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1299 mail_private->stats_track = TRUE;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1300 cost1 = search_mail_get_cost(mail_private);
8477
c033b3e2d9b6 mail_storage.search_next_update_seq returns now bool. It was never failing.
Timo Sirainen <tss@iki.fi>
parents: 8411
diff changeset
1301 while (box->v.search_next_update_seq(_ctx)) {
6277
5f66277bbe40 mail_index_lookup*() can't fail anymore. Changed several APIs not to return
Timo Sirainen <tss@iki.fi>
parents: 6276
diff changeset
1302 mail_set_seq(mail, _ctx->seq);
8497
8a511d7da23f Fixed searching in virtual mailboxes.
Timo Sirainen <tss@iki.fi>
parents: 8481
diff changeset
1303 ctx->imail = mail_private->v.get_index_mail(mail);
453
0f6fd6802265 Modify log now stores the changes in ranges, so store 1:100 doesn't
Timo Sirainen <tss@iki.fi>
parents: 450
diff changeset
1304
8481
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1305 T_BEGIN {
8477
c033b3e2d9b6 mail_storage.search_next_update_seq returns now bool. It was never failing.
Timo Sirainen <tss@iki.fi>
parents: 8411
diff changeset
1306 match = search_match_next(ctx);
7671
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1307
8411
abd0ef855a33 Implemented imap-response-codes draft.
Timo Sirainen <tss@iki.fi>
parents: 8146
diff changeset
1308 if (ctx->mail->expunged)
abd0ef855a33 Implemented imap-response-codes draft.
Timo Sirainen <tss@iki.fi>
parents: 8146
diff changeset
1309 _ctx->seen_lost_data = TRUE;
abd0ef855a33 Implemented imap-response-codes draft.
Timo Sirainen <tss@iki.fi>
parents: 8146
diff changeset
1310
8477
c033b3e2d9b6 mail_storage.search_next_update_seq returns now bool. It was never failing.
Timo Sirainen <tss@iki.fi>
parents: 8411
diff changeset
1311 if (!match &&
7671
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1312 search_has_static_nonmatches(_ctx->args->args)) {
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1313 /* if there are saved search results remember
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1314 that this message never matches */
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1315 mailbox_search_results_never(_ctx, mail->uid);
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1316 }
7226
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents: 7086
diff changeset
1317 } T_END;
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1318 cost2 = search_mail_get_cost(mail_private);
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1319 ctx->cost += cost2 - cost1;
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1320 cost1 = cost2;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1321
7671
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1322 mail_search_args_reset(_ctx->args->args, FALSE);
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1323
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1324 if (ctx->error != NULL)
8477
c033b3e2d9b6 mail_storage.search_next_update_seq returns now bool. It was never failing.
Timo Sirainen <tss@iki.fi>
parents: 8411
diff changeset
1325 ctx->failed = TRUE;
c033b3e2d9b6 mail_storage.search_next_update_seq returns now bool. It was never failing.
Timo Sirainen <tss@iki.fi>
parents: 8411
diff changeset
1326 else if (match) {
7671
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1327 if (_ctx->sort_program == NULL)
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1328 break;
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1329
7671
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1330 index_sort_list_add(_ctx->sort_program, mail);
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1331 }
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1332 match = FALSE;
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1333
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1334 if (search_would_block(ctx)) {
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1335 *tryagain_r = TRUE;
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1336 break;
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1337 }
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
1338 }
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
1339 ctx->mail = NULL;
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
1340 ctx->imail = NULL;
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1341 mail_private->stats_track = old_stats_track;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1342
8984
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1343 if (!match && _ctx->sort_program != NULL &&
e7bfb3c134f9 Use the new mail_private.stats_* fields to stop non-blocking searches after about 250 ms.
Timo Sirainen <tss@iki.fi>
parents: 8982
diff changeset
1344 !*tryagain_r && !ctx->failed) {
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1345 /* finished searching the messages. now sort them and start
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1346 returning the messages. */
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1347 ctx->sorted = TRUE;
7671
882888286bf5 Saved search results: Remember what messages' static checks never match, so
Timo Sirainen <tss@iki.fi>
parents: 7647
diff changeset
1348 index_sort_list_finish(_ctx->sort_program);
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1349 return index_storage_search_next_nonblock(_ctx, mail,
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1350 tryagain_r);
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1351 }
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1352
8479
bcdbf33ae9b8 Fix to previous search_next_update_seq change.
Timo Sirainen <tss@iki.fi>
parents: 8477
diff changeset
1353 return ctx->failed ? -1 : (match ? 1 : 0);
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
1354 }
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1355
8477
c033b3e2d9b6 mail_storage.search_next_update_seq returns now bool. It was never failing.
Timo Sirainen <tss@iki.fi>
parents: 8411
diff changeset
1356 bool index_storage_search_next_update_seq(struct mail_search_context *_ctx)
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1357 {
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1358 struct index_search_context *ctx = (struct index_search_context *)_ctx;
8481
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1359 uint32_t uid;
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1360 int ret;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1361
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1362 if (_ctx->seq == 0) {
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1363 /* first time */
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1364 _ctx->seq = ctx->seq1;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1365 } else {
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1366 _ctx->seq++;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1367 }
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1368
8481
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1369 if (!ctx->have_seqsets && !ctx->have_index_args &&
8507
f323bf2465bd Give more correct "* OK searched n%" notifications with fts and virtual mailboxes.
Timo Sirainen <tss@iki.fi>
parents: 8497
diff changeset
1370 _ctx->update_result == NULL) {
f323bf2465bd Give more correct "* OK searched n%" notifications with fts and virtual mailboxes.
Timo Sirainen <tss@iki.fi>
parents: 8497
diff changeset
1371 ctx->mail_ctx.progress_cur = _ctx->seq;
8477
c033b3e2d9b6 mail_storage.search_next_update_seq returns now bool. It was never failing.
Timo Sirainen <tss@iki.fi>
parents: 8411
diff changeset
1372 return _ctx->seq <= ctx->seq2;
8507
f323bf2465bd Give more correct "* OK searched n%" notifications with fts and virtual mailboxes.
Timo Sirainen <tss@iki.fi>
parents: 8497
diff changeset
1373 }
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1374
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1375 ret = 0;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1376 while (_ctx->seq <= ctx->seq2) {
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1377 /* check if the sequence matches */
7642
077bb84e9e77 Make mail_search_args an independent structure that can be used for multiple
Timo Sirainen <tss@iki.fi>
parents: 7640
diff changeset
1378 ret = mail_search_args_foreach(ctx->mail_ctx.args->args,
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1379 search_seqset_arg, ctx);
8481
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1380 if (ret != 0 && ctx->have_index_args) {
6966
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
1381 /* check if flags/keywords match before anything else
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
1382 is done. mail_set_seq() can be a bit slow. */
7642
077bb84e9e77 Make mail_search_args an independent structure that can be used for multiple
Timo Sirainen <tss@iki.fi>
parents: 7640
diff changeset
1383 ret = mail_search_args_foreach(ctx->mail_ctx.args->args,
6966
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
1384 search_index_arg, ctx);
7bb6ef75715c Optimize searching flags and keywords.
Timo Sirainen <tss@iki.fi>
parents: 6965
diff changeset
1385 }
8481
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1386 if (ret != 0 && _ctx->update_result != NULL) {
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1387 /* see if this message never matches */
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1388 mail_index_lookup_uid(ctx->view, _ctx->seq, &uid);
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1389 if (seq_range_exists(&_ctx->update_result->never_uids,
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1390 uid))
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1391 ret = 0;
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1392 }
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1393 if (ret != 0)
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1394 break;
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1395
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1396 /* doesn't, try next one */
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1397 _ctx->seq++;
7642
077bb84e9e77 Make mail_search_args an independent structure that can be used for multiple
Timo Sirainen <tss@iki.fi>
parents: 7640
diff changeset
1398 mail_search_args_reset(ctx->mail_ctx.args->args, FALSE);
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1399 }
8481
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1400
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1401 if (ret != 0 && _ctx->update_result != NULL) {
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1402 mail_index_lookup_uid(ctx->view, _ctx->seq, &uid);
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1403 if (seq_range_exists(&_ctx->update_result->uids, uid)) {
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1404 /* we already know that the static data
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1405 matches. mark it as such. */
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1406 search_set_static_matches(_ctx->args->args);
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1407 }
9db582413fef Moved search update result checks to search_next_update_seq().
Timo Sirainen <tss@iki.fi>
parents: 8479
diff changeset
1408 }
8507
f323bf2465bd Give more correct "* OK searched n%" notifications with fts and virtual mailboxes.
Timo Sirainen <tss@iki.fi>
parents: 8497
diff changeset
1409 ctx->mail_ctx.progress_cur = _ctx->seq;
8477
c033b3e2d9b6 mail_storage.search_next_update_seq returns now bool. It was never failing.
Timo Sirainen <tss@iki.fi>
parents: 8411
diff changeset
1410 return ret != 0;
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1411 }