diff options
author | Henrik <henrik.hoiness@online.no> | 2018-08-06 15:29:18 +0200 |
---|---|---|
committer | Henrik <henrik.hoiness@online.no> | 2018-08-06 15:29:18 +0200 |
commit | a9ce32c11684e612d5bf68686ee21414677d01ee (patch) | |
tree | fe15f2cba213c33cc94e2aaba1cb866ebdbbd641 /container-search/src | |
parent | c31c1eee87a00774f34e985b70568af0eea0c82b (diff) | |
parent | 2764585ef3ab81e74af7aa7ca2709c6c4d8046a6 (diff) |
Solve conflicting files
Diffstat (limited to 'container-search/src')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/Query.java | 2 | ||||
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java | 19 |
2 files changed, 13 insertions, 8 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/Query.java b/container-search/src/main/java/com/yahoo/search/Query.java index 4ec0b6e426c..cfb1c9a26be 100644 --- a/container-search/src/main/java/com/yahoo/search/Query.java +++ b/container-search/src/main/java/com/yahoo/search/Query.java @@ -193,6 +193,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { public static final CompoundName GROUPING_SESSION_CACHE = new CompoundName("groupingSessionCache"); public static final CompoundName TIMEOUT = new CompoundName("timeout"); + private static QueryProfileType argumentType; static { argumentType = new QueryProfileType("native"); @@ -216,6 +217,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { } public static QueryProfileType getArgumentType() { return argumentType; } + /** The aliases of query properties */ private static Map<String,CompoundName> propertyAliases; static { diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java index d9fa6d8097f..c9e723db6d0 100644 --- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java +++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java @@ -283,13 +283,16 @@ public class SearchHandler extends LoggingRequestHandler { private HttpSearchResponse handleBody(HttpRequest request){ - // Find query profile - String queryProfileName = request.getProperty("queryProfile"); + + Map<String, String> requestMap = requestMapFromRequest(request); + + // Get query profile + String queryProfileName = requestMap.getOrDefault("queryProfile", null); CompiledQueryProfile queryProfile = queryProfileRegistry.findQueryProfile(queryProfileName); - boolean benchmarkOutput = VespaHeaders.benchmarkOutput(request); - Query query = queryFromRequest(request, queryProfile); + Query query = new Query(request, requestMap, queryProfile); + boolean benchmarkOutput = VespaHeaders.benchmarkOutput(request); boolean benchmarkCoverage = VespaHeaders.benchmarkCoverage(benchmarkOutput, request.getJDiscRequest().headers()); // Find and execute search chain if we have a valid query @@ -558,7 +561,8 @@ public class SearchHandler extends LoggingRequestHandler { return searchChainRegistry; } - private Query queryFromRequest(HttpRequest request, CompiledQueryProfile queryProfile){ + private Map<String, String> requestMapFromRequest(HttpRequest request) { + if (request.getMethod() == com.yahoo.jdisc.http.HttpRequest.Method.POST && JSON_CONTENT_TYPE.equals(request.getHeader(com.yahoo.jdisc.http.HttpHeaders.Names.CONTENT_TYPE))) { Inspector inspector; @@ -588,11 +592,10 @@ public class SearchHandler extends LoggingRequestHandler { requestMap.remove("select.grouping"); } - return new Query(request, requestMap, queryProfile); - + return requestMap; } else { - return new Query(request, queryProfile); + return request.propertyMap(); } } |