summaryrefslogtreecommitdiffstats
path: root/container-search
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6405 from vespa-engine/gjoranv/federation-non-publicJon Bratseth2018-08-212-4/+0
|\ | | | | Gjoranv/federation non public
| * Revert "Remove ConfiguredHttpClientSearcher"gjoranv2018-08-211-0/+38
| | | | | | | | - Do not remove until Vespa 7
| * Remove PublicApi for federation.http and federation.vespa.gjoranv2018-07-172-4/+0
| |
| * Remove ConfiguredHttpClientSearchergjoranv2018-07-171-38/+0
| |
* | Nonfunctional changes onlyJon Bratseth2018-08-211-1/+1
| |
* | Nonfunctional changes onlyJon Bratseth2018-08-202-1/+4
| |
* | Correct typoJon Bratseth2018-08-151-1/+2
| |
* | Clean up, add testJon Bratseth2018-08-154-13/+20
| |
* | Don't rely on shared groupingrequest instances to look up resultsJon Bratseth2018-08-154-18/+18
| | | | | | | | | | | | | | Instead of setting the id of the grouping result in the query when the result is parsed, which relies on sharing the same grouping instance across all query copies to be useful, create it on demand.
* | Revert "Merge pull request #6582 from ↵Jon Bratseth2018-08-15133-443/+1704
| | | | | | | | | | | | | | vespa-engine/revert-6557-revert-6553-revert-6512-henrhoi/object-structured-grouping" This reverts commit 506ea9c1367748ddd4ff20203fc13211d635f5a6, reversing changes made to 4f6b34dcf9ad904f0ddb89eb506f5920360d5344.
* | Revert "Revert "Revert "Added a object structure for GroupingRequest ↵Henning Baldersheim2018-08-15133-1704/+443
| | | | | | | | objects, accessable from…"""
* | Fix Select and grouping bugsJon Bratseth2018-08-14132-406/+1679
| | | | | | | | | | | | | | | | | | | | - Deep copy the grouping structure on query copy. It is mutable but we have neglected doing this right until now. - Fix a bug in the previous commit where the last constructed Query.Model was shared between all instances. - Fix a bug in the previous commit where the query string instead of the query tree was reset when a new select expression is set. - Don't use deprecated method. - Clean up Javadoc and formatting.
* | Revert "Revert "Added a object structure for GroupingRequest objects, ↵Jon Bratseth2018-08-136-48/+36
| | | | | | | | accessable from…""
* | Revert "Added a object structure for GroupingRequest objects, accessable ↵Henning Baldersheim2018-08-106-36/+48
| | | | | | | | from…"
* | Merge pull request #6512 from vespa-engine/henrhoi/object-structured-groupingJon Bratseth2018-08-106-48/+36
|\ \ | | | | | | Added a object structure for GroupingRequest objects, accessable from…
| * | Removed creation of empty groupingRequest-list, and setGrouping()-funtionHenrik2018-08-102-14/+1
| | |
| * | Removed test that no longer makes senseHenrik2018-08-102-14/+2
| | |
| * | Added requested changesHenrik2018-08-103-13/+6
| | |
| * | Removed typoHenrik2018-08-101-1/+1
| | |
| * | Now adding GroupingStep List to Select, instead of as a query-propertyHenrik2018-08-085-7/+12
| | |
| * | GroupingRequest.getRequests() now returning query.getSelect().getGrouping() ↵Henrik2018-08-074-22/+15
| | | | | | | | | | | | and marked deprecated
| * | Added a object structure for GroupingRequest objects, accessable from ↵Henrik2018-08-074-14/+36
| | | | | | | | | | | | query.getSelect().getGrouping()
* | | Merge pull request #6520 from vespa-engine/henrhoi/post-api-requestmap-changeJon Bratseth2018-08-092-5/+6
|\ \ \ | | | | | | | | henrhoi/post-api-requestmap-change
| * | | URL-parameters now overrides JSON-parametersHenrik2018-08-091-1/+2
| | | |
| * | | Now adding all entries from request.propertyMap() to requestMap, which will ↵Henrik2018-08-082-5/+5
| |/ / | | | | | | | | | be overwritten if duplicate in JSON payload
* | | Test that distribution key is carried from direct search to rpc summaryJon Bratseth2018-08-0910-37/+68
| | |
* | | Prepare to optimizeJon Bratseth2018-08-073-3/+5
|/ /
* | Added urls for the Select ReferenceHenrik2018-08-071-2/+2
| |
* | Changes from review.Henrik2018-08-076-28/+48
| |
* | Solve conflicting filesHenrik2018-08-062-8/+13
|\ \
| * | Changed queryFromRequest to requestMapFromRequest, and creating queryProfile ↵Henrik2018-08-062-17/+8
| | | | | | | | | | | | and Query out of that map
| * | Solved queryProfile always being null when using JSON-query. QueryProfile ↵Henrik2018-07-302-5/+20
| | | | | | | | | | | | was set before getting the JSON-payload with queryProfileName
* | | Added parsing of multiple pipesHenrik2018-08-062-6/+32
| | |
* | | Committing for Travis rebuild, talked with @mpolden. Said it would solve the ↵Henrik2018-08-031-1/+1
| | | | | | | | | | | | Travis build stopping at controller-server
* | | Added class doc for SelectParser.javaHenrik2018-08-031-0/+9
| | |
* | | Added SELECT parameter to provider.def - missed that ProviderConfig.java was ↵Henrik2018-08-032-2/+3
| | | | | | | | | | | | created from config and did not get my code-changes
* | | Added parsing of Grouping from JSON to String. Now parsing ↵Henrik2018-08-025-54/+69
| | | | | | | | | | | | grouping-parameter and setting the query's groupingrequest when parameter is present
* | | Added copyrightHenrik2018-08-021-8/+1
| | |
* | | SelectParser now handles ''all'' testcases from YQLParserTestCase. Class may ↵Henrik2018-08-022-146/+588
| | | | | | | | | | | | need some cleaning and removal of unuses code
* | | Created new parameter SELECT with subparameters WHERE and GROUPING. Started ↵Henrik2018-08-0210-2/+1662
|/ / | | | | | | on a SelectParser which will parse the SELECT parameters to a QueryTree. Also added a new type for queryies 'SELECT', and will now use the SelectParser when getting the QueryTree. Started on testing the same testcases as in YQLParser, looks promising.
* | Merge pull request #6444 from vespa-engine/bratseth/java-model-inferenceJon Bratseth2018-07-233-6/+10
|\ \ | | | | | | Bratseth/java model inference
| * | Java model evaluation WIPJon Bratseth2018-07-201-4/+4
| | |
| * | Model inference WIPJon Bratseth2018-07-052-2/+6
| | |
* | | Handle missing content typeJon Bratseth2018-07-201-5/+3
| | |
* | | Now generates config-file programmatically. Added the predetermined sources ↵Henrik2018-07-172-2/+2
| |/ |/| | | | | from the genreated config.json to the autocompletion of yql-syntax. Now also possible to add possible values for all parameters, just put the parameter (full name with underscore instead of dots) and a list of possible values in the config-file to be generated. Model.sources, Ranking.rankprofile, Ranking.properties, ranking.features have now possible values on value-input.
* | Deprecate HttpSearcher and its subclasses.gjoranv2018-07-066-1/+7
| |
* | Set distribution key whe dispatching to content nodeJon Bratseth2018-07-0514-47/+83
| |
* | Fix author tag for SimonBjørn Christian Seime2018-07-05140-141/+141
| |
* | Replace 'tonytv' with full name in author tagsBjørn Christian Seime2018-07-0572-72/+72
| |
* | Merge pull request #6271 from vespa-engine/henrhoi/json-query-apiJon Bratseth2018-07-054-20/+560
|\ \ | |/ |/| Henrhoi/json query api