Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6405 from vespa-engine/gjoranv/federation-non-public | Jon Bratseth | 2018-08-21 | 2 | -4/+0 |
|\ | | | | | Gjoranv/federation non public | ||||
| * | Revert "Remove ConfiguredHttpClientSearcher" | gjoranv | 2018-08-21 | 1 | -0/+38 |
| | | | | | | | | - Do not remove until Vespa 7 | ||||
| * | Remove PublicApi for federation.http and federation.vespa. | gjoranv | 2018-07-17 | 2 | -4/+0 |
| | | |||||
| * | Remove ConfiguredHttpClientSearcher | gjoranv | 2018-07-17 | 1 | -38/+0 |
| | | |||||
* | | Nonfunctional changes only | Jon Bratseth | 2018-08-21 | 1 | -1/+1 |
| | | |||||
* | | Nonfunctional changes only | Jon Bratseth | 2018-08-20 | 2 | -1/+4 |
| | | |||||
* | | Correct typo | Jon Bratseth | 2018-08-15 | 1 | -1/+2 |
| | | |||||
* | | Clean up, add test | Jon Bratseth | 2018-08-15 | 4 | -13/+20 |
| | | |||||
* | | Don't rely on shared groupingrequest instances to look up results | Jon Bratseth | 2018-08-15 | 4 | -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 Bratseth | 2018-08-15 | 133 | -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 Baldersheim | 2018-08-15 | 133 | -1704/+443 |
| | | | | | | | | objects, accessable from…""" | ||||
* | | Fix Select and grouping bugs | Jon Bratseth | 2018-08-14 | 132 | -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 Bratseth | 2018-08-13 | 6 | -48/+36 |
| | | | | | | | | accessable from…"" | ||||
* | | Revert "Added a object structure for GroupingRequest objects, accessable ↵ | Henning Baldersheim | 2018-08-10 | 6 | -36/+48 |
| | | | | | | | | from…" | ||||
* | | Merge pull request #6512 from vespa-engine/henrhoi/object-structured-grouping | Jon Bratseth | 2018-08-10 | 6 | -48/+36 |
|\ \ | | | | | | | Added a object structure for GroupingRequest objects, accessable from… | ||||
| * | | Removed creation of empty groupingRequest-list, and setGrouping()-funtion | Henrik | 2018-08-10 | 2 | -14/+1 |
| | | | |||||
| * | | Removed test that no longer makes sense | Henrik | 2018-08-10 | 2 | -14/+2 |
| | | | |||||
| * | | Added requested changes | Henrik | 2018-08-10 | 3 | -13/+6 |
| | | | |||||
| * | | Removed typo | Henrik | 2018-08-10 | 1 | -1/+1 |
| | | | |||||
| * | | Now adding GroupingStep List to Select, instead of as a query-property | Henrik | 2018-08-08 | 5 | -7/+12 |
| | | | |||||
| * | | GroupingRequest.getRequests() now returning query.getSelect().getGrouping() ↵ | Henrik | 2018-08-07 | 4 | -22/+15 |
| | | | | | | | | | | | | and marked deprecated | ||||
| * | | Added a object structure for GroupingRequest objects, accessable from ↵ | Henrik | 2018-08-07 | 4 | -14/+36 |
| | | | | | | | | | | | | query.getSelect().getGrouping() | ||||
* | | | Merge pull request #6520 from vespa-engine/henrhoi/post-api-requestmap-change | Jon Bratseth | 2018-08-09 | 2 | -5/+6 |
|\ \ \ | | | | | | | | | henrhoi/post-api-requestmap-change | ||||
| * | | | URL-parameters now overrides JSON-parameters | Henrik | 2018-08-09 | 1 | -1/+2 |
| | | | | |||||
| * | | | Now adding all entries from request.propertyMap() to requestMap, which will ↵ | Henrik | 2018-08-08 | 2 | -5/+5 |
| |/ / | | | | | | | | | | be overwritten if duplicate in JSON payload | ||||
* | | | Test that distribution key is carried from direct search to rpc summary | Jon Bratseth | 2018-08-09 | 10 | -37/+68 |
| | | | |||||
* | | | Prepare to optimize | Jon Bratseth | 2018-08-07 | 3 | -3/+5 |
|/ / | |||||
* | | Added urls for the Select Reference | Henrik | 2018-08-07 | 1 | -2/+2 |
| | | |||||
* | | Changes from review. | Henrik | 2018-08-07 | 6 | -28/+48 |
| | | |||||
* | | Solve conflicting files | Henrik | 2018-08-06 | 2 | -8/+13 |
|\ \ | |||||
| * | | Changed queryFromRequest to requestMapFromRequest, and creating queryProfile ↵ | Henrik | 2018-08-06 | 2 | -17/+8 |
| | | | | | | | | | | | | and Query out of that map | ||||
| * | | Solved queryProfile always being null when using JSON-query. QueryProfile ↵ | Henrik | 2018-07-30 | 2 | -5/+20 |
| | | | | | | | | | | | | was set before getting the JSON-payload with queryProfileName | ||||
* | | | Added parsing of multiple pipes | Henrik | 2018-08-06 | 2 | -6/+32 |
| | | | |||||
* | | | Committing for Travis rebuild, talked with @mpolden. Said it would solve the ↵ | Henrik | 2018-08-03 | 1 | -1/+1 |
| | | | | | | | | | | | | Travis build stopping at controller-server | ||||
* | | | Added class doc for SelectParser.java | Henrik | 2018-08-03 | 1 | -0/+9 |
| | | | |||||
* | | | Added SELECT parameter to provider.def - missed that ProviderConfig.java was ↵ | Henrik | 2018-08-03 | 2 | -2/+3 |
| | | | | | | | | | | | | created from config and did not get my code-changes | ||||
* | | | Added parsing of Grouping from JSON to String. Now parsing ↵ | Henrik | 2018-08-02 | 5 | -54/+69 |
| | | | | | | | | | | | | grouping-parameter and setting the query's groupingrequest when parameter is present | ||||
* | | | Added copyright | Henrik | 2018-08-02 | 1 | -8/+1 |
| | | | |||||
* | | | SelectParser now handles ''all'' testcases from YQLParserTestCase. Class may ↵ | Henrik | 2018-08-02 | 2 | -146/+588 |
| | | | | | | | | | | | | need some cleaning and removal of unuses code | ||||
* | | | Created new parameter SELECT with subparameters WHERE and GROUPING. Started ↵ | Henrik | 2018-08-02 | 10 | -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-inference | Jon Bratseth | 2018-07-23 | 3 | -6/+10 |
|\ \ | | | | | | | Bratseth/java model inference | ||||
| * | | Java model evaluation WIP | Jon Bratseth | 2018-07-20 | 1 | -4/+4 |
| | | | |||||
| * | | Model inference WIP | Jon Bratseth | 2018-07-05 | 2 | -2/+6 |
| | | | |||||
* | | | Handle missing content type | Jon Bratseth | 2018-07-20 | 1 | -5/+3 |
| | | | |||||
* | | | Now generates config-file programmatically. Added the predetermined sources ↵ | Henrik | 2018-07-17 | 2 | -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. | gjoranv | 2018-07-06 | 6 | -1/+7 |
| | | |||||
* | | Set distribution key whe dispatching to content node | Jon Bratseth | 2018-07-05 | 14 | -47/+83 |
| | | |||||
* | | Fix author tag for Simon | Bjørn Christian Seime | 2018-07-05 | 140 | -141/+141 |
| | | |||||
* | | Replace 'tonytv' with full name in author tags | Bjørn Christian Seime | 2018-07-05 | 72 | -72/+72 |
| | | |||||
* | | Merge pull request #6271 from vespa-engine/henrhoi/json-query-api | Jon Bratseth | 2018-07-05 | 4 | -20/+560 |
|\ \ | |/ |/| | Henrhoi/json query api |