Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix Select and grouping bugs | Jon Bratseth | 2018-08-14 | 119 | -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 Bratseth | 2018-08-13 | 4 | -30/+31 |
| | | | | accessable from…"" | ||||
* | Revert "Added a object structure for GroupingRequest objects, accessable ↵ | Henning Baldersheim | 2018-08-10 | 4 | -31/+30 |
| | | | | from…" | ||||
* | Merge pull request #6512 from vespa-engine/henrhoi/object-structured-grouping | Jon Bratseth | 2018-08-10 | 4 | -30/+31 |
|\ | | | | | 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 | 1 | -1/+1 |
| | | |||||
| * | Added requested changes | Henrik | 2018-08-10 | 2 | -10/+4 |
| | | |||||
| * | 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 | 4 | -6/+9 |
| | | |||||
| * | 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 | 3 | -10/+34 |
| | | | | | | | | query.getSelect().getGrouping() | ||||
* | | Merge pull request #6520 from vespa-engine/henrhoi/post-api-requestmap-change | Jon Bratseth | 2018-08-09 | 1 | -0/+3 |
|\ \ | | | | | | | 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 | 1 | -0/+2 |
| |/ | | | | | | | be overwritten if duplicate in JSON payload | ||||
* | | Test that distribution key is carried from direct search to rpc summary | Jon Bratseth | 2018-08-09 | 1 | -3/+3 |
| | | |||||
* | | Prepare to optimize | Jon Bratseth | 2018-08-07 | 2 | -3/+3 |
|/ | |||||
* | Added urls for the Select Reference | Henrik | 2018-08-07 | 1 | -2/+2 |
| | |||||
* | Changes from review. | Henrik | 2018-08-07 | 5 | -28/+17 |
| | |||||
* | 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 | 1 | -6/+22 |
| | | |||||
* | | 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 | 1 | -1/+2 |
| | | | | | | | | created from config and did not get my code-changes | ||||
* | | Added parsing of Grouping from JSON to String. Now parsing ↵ | Henrik | 2018-08-02 | 4 | -46/+46 |
| | | | | | | | | 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 | 1 | -107/+230 |
| | | | | | | | | need some cleaning and removal of unuses code | ||||
* | | Created new parameter SELECT with subparameters WHERE and GROUPING. Started ↵ | Henrik | 2018-08-02 | 8 | -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-inference | Jon Bratseth | 2018-07-23 | 2 | -5/+9 |
|\ | | | | | Bratseth/java model inference | ||||
| * | Java model evaluation WIP | Jon Bratseth | 2018-07-20 | 1 | -4/+4 |
| | | |||||
| * | Model inference WIP | Jon Bratseth | 2018-07-05 | 1 | -1/+5 |
| | | |||||
* | | Handle missing content type | Jon Bratseth | 2018-07-20 | 1 | -5/+3 |
| | | |||||
* | | 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 | 2 | -4/+8 |
| | | |||||
* | | Fix author tag for Simon | Bjørn Christian Seime | 2018-07-05 | 108 | -109/+109 |
| | | |||||
* | | Replace 'tonytv' with full name in author tags | Bjørn Christian Seime | 2018-07-05 | 44 | -44/+44 |
| | | |||||
* | | Merge pull request #6271 from vespa-engine/henrhoi/json-query-api | Jon Bratseth | 2018-07-05 | 2 | -14/+92 |
|\ \ | |/ |/| | Henrhoi/json query api | ||||
| * | Separated code - made a separate method for creating queries from requests | Henrik | 2018-07-04 | 2 | -27/+28 |
| | | |||||
| * | Now throwing QueryException for errors when parsing JSON to Slime | Henrik | 2018-06-29 | 1 | -1/+4 |
| | | |||||
| * | Removed unused imports | Henrik | 2018-06-28 | 1 | -1/+0 |
| | | |||||
| * | Added changes from Architect-meeting and from pull-request-comments | Henrik | 2018-06-28 | 1 | -9/+9 |
| | | |||||
| * | Removed wildcard imports, unnused dependency and a few other changes | Henrik | 2018-06-25 | 2 | -37/+18 |
| | | |||||
| * | POST-queries seems to be working and tests and maven builds are successful. | Henrik | 2018-06-25 | 2 | -52/+42 |
| | | |||||
| * | Added simple handling of JSON-queries. | Henrik | 2018-06-22 | 2 | -9/+113 |
| | | |||||
* | | Merge pull request #6287 from ↵ | Harald Musum | 2018-06-27 | 7 | -11/+17 |
|\ \ | | | | | | | | | | | | | vespa-engine/bratseth/dont-fail-allocation-on-bootstrap Bratseth/dont fail allocation on bootstrap | ||||
| * | | Nonfunctional changes only | Jon Bratseth | 2018-06-26 | 7 | -11/+17 |
| | | | |||||
* | | | Merge pull request #6276 from vespa-engine/arnej/doubleformatter-not-needed | Jon Bratseth | 2018-06-25 | 2 | -5/+2 |
|\ \ \ | |/ / |/| | | Arnej/doubleformatter not needed | ||||
| * | | stop using DoubleParser | Arne Juul | 2018-06-25 | 1 | -2/+1 |
| | | | |||||
| * | | stop using DoubleFormatter | Arne Juul | 2018-06-25 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | * also, update expected results in those places where slight differences in Double formatting was seen. |