aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-06-06 00:41:59 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2018-06-06 00:41:59 +0200
commit66494fdccc94f3947d42f2fd3f9a80b6f3939aff (patch)
tree8204414e27054385d2028cd738608ab999caa08e /container-search/src/main/java/com/yahoo
parente084b310ce793a54fabef807a334a3b8dfc684d0 (diff)
Also block optimization in QueryRewrite from handling NonReducibleCompositeItem
Diffstat (limited to 'container-search/src/main/java/com/yahoo')
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java
index d4b3175aac9..2d941681f2a 100644
--- a/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java
+++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java
@@ -6,6 +6,7 @@ import com.yahoo.prelude.query.CompositeItem;
import com.yahoo.prelude.query.EquivItem;
import com.yahoo.prelude.query.Item;
import com.yahoo.prelude.query.NearItem;
+import com.yahoo.prelude.query.NonReducibleCompositeItem;
import com.yahoo.prelude.query.NotItem;
import com.yahoo.prelude.query.NullItem;
import com.yahoo.prelude.query.OrItem;
@@ -214,7 +215,7 @@ public class QueryRewrite {
parent.setItem(i, newChild);
}
}
- return numChildren == 1 ? parent.getItem(0) : item;
+ return ((numChildren == 1) && !(parent instanceof NonReducibleCompositeItem)) ? parent.getItem(0) : item;
}
private static Item rewriteSddocname(Item item) {