summaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileCompiler.java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-11-21 16:12:43 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2019-11-21 16:12:43 +0100
commit84987609bef4e825d407493dded4c470eb0be263 (patch)
treee3411c6686f83e5b6861b5ea09f9f1e3ec021c8f /container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileCompiler.java
parent19a60aa0d4a5d4a8db1f3b024f9d9dbdfe900a96 (diff)
Add some test cases: No functional changes
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileCompiler.java')
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileCompiler.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileCompiler.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileCompiler.java
index 3cc7570576b..cffe941b912 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileCompiler.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileCompiler.java
@@ -82,7 +82,6 @@ public class QueryProfileCompiler {
variants.addAll(parentVariants);
variants.addAll(combined(variants, parentVariants)); // parents and children may have different variant dimensions
}
-
variants.addAll(wildcardExpanded(variants));
return variants;
}
@@ -152,8 +151,10 @@ public class QueryProfileCompiler {
Set<DimensionBindingForPath> variants = new HashSet<>();
if (profileVariants != null) {
for (QueryProfileVariant variant : profile.getVariants().getVariants()) {
+ // Allow switching order since we're entering another profile
DimensionBinding combinedVariant =
DimensionBinding.createFrom(profile.getDimensions(), variant.getDimensionValues()).combineWith(currentVariant);
+
if (combinedVariant.isInvalid()) continue; // values at this point in the graph are unreachable
variants.addAll(collectVariantsFromValues(path, variant.values(), combinedVariant));