diff options
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java index 7f5df94d020..da1eb5f7ecc 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java @@ -300,13 +300,7 @@ public class QueryProfileProperties extends Properties { if (zoneInfo == ZoneInfo.defaultInfo()) return context; if (context == null || context.isEmpty()) return zoneContext; if (context == zoneContext) return context; - if (context.containsKey(ENVIRONMENT) && context.containsKey(REGION) && context.containsKey(INSTANCE)) return context; - - Map<String, String> contextWithZoneInfo = new HashMap<>(context); - contextWithZoneInfo.putIfAbsent(ENVIRONMENT, zoneInfo.zone().environment().name()); - contextWithZoneInfo.putIfAbsent(REGION, zoneInfo.zone().region()); - contextWithZoneInfo.putIfAbsent(INSTANCE, zoneInfo.application().instance()); - return Collections.unmodifiableMap(contextWithZoneInfo); + return new ChainedMap(zoneContext, context); } private boolean reachableTypesAreComplete(CompoundName prefix, CompiledQueryProfile profile, StringBuilder firstMissingName, Map<String,String> context) { |