dovecot-2.2: lib-storage: mail_search_args_simplify() handles no...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/d68d1c95b52c
changeset: 19476:d68d1c95b52c
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Dec 06 19:27:45 2015 +0200
description:
lib-storage: mail_search_args_simplify() handles now "a AND (a OR b)" -> "a"

diffstat:

 src/lib-storage/mail-search-args-simplify.c      |  31 ++++++++++++++++-------
 src/lib-storage/test-mail-search-args-simplify.c |   9 ++++++
 2 files changed, 30 insertions(+), 10 deletions(-)

diffs (94 lines):

diff -r c4cfb7f95bc6 -r d68d1c95b52c src/lib-storage/mail-search-args-simplify.c
--- a/src/lib-storage/mail-search-args-simplify.c	Sun Dec 06 19:26:44 2015 +0200
+++ b/src/lib-storage/mail-search-args-simplify.c	Sun Dec 06 19:27:45 2015 +0200
@@ -314,7 +314,8 @@
 {
 	const struct mail_search_arg *arg;
 
-	i_assert(parent_arg->type == SEARCH_SUB);
+	i_assert(parent_arg->type == SEARCH_SUB ||
+		 parent_arg->type == SEARCH_OR);
 
 	for (arg = wanted_args; arg != NULL; arg = arg->next) {
 		if (!mail_search_args_have_equal(parent_arg->value.subargs, arg))
@@ -334,15 +335,19 @@
 }
 
 static bool
-mail_search_args_simplify_or_drop_redundent_args(struct mail_search_arg *parent_arg)
+mail_search_args_simplify_drop_redundent_args(struct mail_search_arg **argsp,
+					      bool and_arg)
 {
 	struct mail_search_arg *arg, **argp, one_arg, *lowest_arg = NULL;
+	enum mail_search_arg_type child_subargs_type;
 	unsigned int count, lowest_count = UINT_MAX;
 	bool ret = FALSE;
 
+	child_subargs_type = and_arg ? SEARCH_OR : SEARCH_SUB;
+
 	/* find the arg which has the lowest number of child args */
-	for (arg = parent_arg->value.subargs; arg != NULL; arg = arg->next) {
-		if (arg->type != SEARCH_SUB) {
+	for (arg = *argsp; arg != NULL; arg = arg->next) {
+		if (arg->type != child_subargs_type) {
 			one_arg = *arg;
 			one_arg.next = NULL;
 			lowest_arg = &one_arg;
@@ -358,8 +363,8 @@
 
 	/* if there are any args that include lowest_arg, drop the arg since
 	   it's redundant. (non-SUB duplicates are dropped elsewhere.) */
-	for (argp = &parent_arg->value.subargs; *argp != NULL; ) {
-		if (*argp != lowest_arg && (*argp)->type == SEARCH_SUB &&
+	for (argp = argsp; *argp != NULL; ) {
+		if (*argp != lowest_arg && (*argp)->type == child_subargs_type &&
 		    (*argp)->value.subargs != lowest_arg &&
 		    mail_search_args_have_all_equal(*argp, lowest_arg)) {
 			*argp = (*argp)->next;
@@ -478,10 +483,11 @@
 		if (args->type == SEARCH_SUB ||
 		    args->type == SEARCH_OR ||
 		    args->type == SEARCH_INTHREAD) {
-			if (args->type == SEARCH_OR) {
-				if (mail_search_args_simplify_or_drop_redundent_args(args))
+			if (args->type != SEARCH_INTHREAD) {
+				if (mail_search_args_simplify_drop_redundent_args(&args->value.subargs, args->type == SEARCH_SUB))
 					ctx.removals = TRUE;
-				if (mail_search_args_simplify_extract_common_and(args, pool))
+				if (args->type == SEARCH_OR &&
+				    mail_search_args_simplify_extract_common_and(args, pool))
 					ctx.removals = TRUE;
 			}
 			if (mail_search_args_simplify_sub(box, pool, args->value.subargs,
@@ -613,6 +619,11 @@
 		if (mail_search_args_simplify_sub(args->box, args->pool, args->args, TRUE))
 			removals = TRUE;
 	}
-	while (removals)
+	for (;;) {
+		if (mail_search_args_simplify_drop_redundent_args(&args->args, TRUE))
+			removals = TRUE;
+		if (!removals)
+			break;
 		removals = mail_search_args_simplify_sub(args->box, args->pool, args->args, TRUE);
+	}
 }
diff -r c4cfb7f95bc6 -r d68d1c95b52c src/lib-storage/test-mail-search-args-simplify.c
--- a/src/lib-storage/test-mail-search-args-simplify.c	Sun Dec 06 19:26:44 2015 +0200
+++ b/src/lib-storage/test-mail-search-args-simplify.c	Sun Dec 06 19:27:45 2015 +0200
@@ -120,6 +120,15 @@
 	{ "OR ( TEXT unique1 TEXT unique2 ) ( TEXT unique3 TEXT unique4 )", "(OR (TEXT unique1 TEXT unique2) (TEXT unique3 TEXT unique4))" },
 	{ "OR ( TEXT common1 TEXT unique1 ) OR ( TEXT common1 TEXT unique2 ) TEXT unique3", "(OR (TEXT common1 TEXT unique1) OR (TEXT common1 TEXT unique2) TEXT unique3)" },
 	{ "OR ( TEXT common1 TEXT unique1 ) OR ( TEXT common1 TEXT common2 ) ( TEXT common2 TEXT unique2 )", "(OR (TEXT common1 TEXT unique1) OR (TEXT common1 TEXT common2) (TEXT common2 TEXT unique2))" },
+
+	/* SUB: drop redundant args */
+	{ "( OR TEXT common1 TEXT unique1 ) TEXT common1", "TEXT common1" },
+	{ "( OR TEXT unique1 TEXT common1 ) TEXT common1", "TEXT common1" },
+	{ "TEXT common1 ( OR TEXT common1 TEXT unique1 )", "TEXT common1" },
+	{ "TEXT common1 ( OR TEXT unique1 TEXT common1 )", "TEXT common1" },
+	{ "( OR TEXT common1 TEXT common2 ) ( OR TEXT common1 OR TEXT common2 TEXT unique1 )", "(OR TEXT common1 TEXT common2)" },
+	{ "TEXT common1 ( OR TEXT unique1 TEXT common1 ) ( OR TEXT unique3 TEXT common1 )", "TEXT common1" },
+	{ "OR ( TEXT common1 ( OR TEXT unique1 TEXT common1 ) ) TEXT unique1", "(OR TEXT common1 TEXT unique1)" },
 };
 
 static struct mail_search_args *