aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/search
Commit message (Collapse)AuthorAgeFilesLines
* Fix Select and grouping bugsJon Bratseth2018-08-14119-356/+1561
| | | | | | | | | | - 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-134-30/+31
| | | | accessable from…""
* Revert "Added a object structure for GroupingRequest objects, accessable ↵Henning Baldersheim2018-08-104-31/+30
| | | | from…"
* Merge pull request #6512 from vespa-engine/henrhoi/object-structured-groupingJon Bratseth2018-08-104-30/+31
|\ | | | | 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-101-1/+1
| |
| * Added requested changesHenrik2018-08-102-10/+4
| |
| * Removed typoHenrik2018-08-101-1/+1
| |
| * Now adding GroupingStep List to Select, instead of as a query-propertyHenrik2018-08-084-6/+9
| |
| * 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-073-10/+34
| | | | | | | | query.getSelect().getGrouping()
* | Merge pull request #6520 from vespa-engine/henrhoi/post-api-requestmap-changeJon Bratseth2018-08-091-0/+3
|\ \ | | | | | | 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-081-0/+2
| |/ | | | | | | be overwritten if duplicate in JSON payload
* | Test that distribution key is carried from direct search to rpc summaryJon Bratseth2018-08-091-3/+3
| |
* | Prepare to optimizeJon Bratseth2018-08-072-3/+3
|/
* Added urls for the Select ReferenceHenrik2018-08-071-2/+2
|
* Changes from review.Henrik2018-08-075-28/+17
|
* 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-061-6/+22
| |
* | 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-031-1/+2
| | | | | | | | created from config and did not get my code-changes
* | Added parsing of Grouping from JSON to String. Now parsing ↵Henrik2018-08-024-46/+46
| | | | | | | | 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-021-107/+230
| | | | | | | | need some cleaning and removal of unuses code
* | Created new parameter SELECT with subparameters WHERE and GROUPING. Started ↵Henrik2018-08-028-2/+1224
|/ | | | 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-232-5/+9
|\ | | | | Bratseth/java model inference
| * Java model evaluation WIPJon Bratseth2018-07-201-4/+4
| |
| * Model inference WIPJon Bratseth2018-07-051-1/+5
| |
* | Handle missing content typeJon Bratseth2018-07-201-5/+3
| |
* | Deprecate HttpSearcher and its subclasses.gjoranv2018-07-066-1/+7
| |
* | Set distribution key whe dispatching to content nodeJon Bratseth2018-07-052-4/+8
| |
* | Fix author tag for SimonBjørn Christian Seime2018-07-05108-109/+109
| |
* | Replace 'tonytv' with full name in author tagsBjørn Christian Seime2018-07-0544-44/+44
| |
* | Merge pull request #6271 from vespa-engine/henrhoi/json-query-apiJon Bratseth2018-07-052-14/+92
|\ \ | |/ |/| Henrhoi/json query api
| * Separated code - made a separate method for creating queries from requestsHenrik2018-07-042-27/+28
| |
| * Now throwing QueryException for errors when parsing JSON to SlimeHenrik2018-06-291-1/+4
| |
| * Removed unused importsHenrik2018-06-281-1/+0
| |
| * Added changes from Architect-meeting and from pull-request-commentsHenrik2018-06-281-9/+9
| |
| * Removed wildcard imports, unnused dependency and a few other changesHenrik2018-06-252-37/+18
| |
| * POST-queries seems to be working and tests and maven builds are successful.Henrik2018-06-252-52/+42
| |
| * Added simple handling of JSON-queries.Henrik2018-06-222-9/+113
| |
* | Merge pull request #6287 from ↵Harald Musum2018-06-277-11/+17
|\ \ | | | | | | | | | | | | vespa-engine/bratseth/dont-fail-allocation-on-bootstrap Bratseth/dont fail allocation on bootstrap
| * | Nonfunctional changes onlyJon Bratseth2018-06-267-11/+17
| | |
* | | Merge pull request #6276 from vespa-engine/arnej/doubleformatter-not-neededJon Bratseth2018-06-252-5/+2
|\ \ \ | |/ / |/| | Arnej/doubleformatter not needed
| * | stop using DoubleParserArne Juul2018-06-251-2/+1
| | |
| * | stop using DoubleFormatterArne Juul2018-06-251-3/+1
| | | | | | | | | | | | | | | * also, update expected results in those places where slight differences in Double formatting was seen.