summaryrefslogtreecommitdiffstats
path: root/container-search/src/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21787 from vespa-engine/bjorncs/grouping-max-infv7.564.19Henning Baldersheim2022-03-233-24/+32
|\ | | | | Bjorncs/grouping max inf
| * Move all max resolving to resolveMaxBjørn Christian Seime2022-03-231-23/+17
| |
| * Allow 'inf' as value to max()Bjørn Christian Seime2022-03-233-8/+22
| |
* | Merge pull request #21783 from vespa-engine/bratseth/cleanup-57gjoranv2022-03-233-19/+11
|\ \ | | | | | | No functional changes
| * | No functional changesJon Bratseth2022-03-233-19/+11
| |/
* / Use 7 inste4ad ofo 30 for MultiTermItemJon Marius Venstad2022-03-221-3/+2
|/
* Merge pull request #21748 from vespa-engine/bjorncs/default-max-groupingJon Bratseth2022-03-184-7/+54
|\ | | | | Introduce query parameters for default max hits/groups in grouping qu…
| * Mark new static fields as betaBjørn Christian Seime2022-03-181-2/+3
| |
| * Introduce query parameters for default max hits/groups in grouping queriesBjørn Christian Seime2022-03-184-7/+53
| |
* | Reserve slot for MultiTermItem in serialisation format tableJon Marius Venstad2022-03-181-1/+2
| |
* | Clearer serialisation code for ItemJon Marius Venstad2022-03-181-16/+14
| |
* | Avoid invalid escape sequenceJon Marius Venstad2022-03-181-1/+1
| |
* | Update abi-spec, and some more non-functional changesJon Marius Venstad2022-03-182-16/+6
| |
* | Non-functional changesJon Marius Venstad2022-03-183-7/+7
| |
* | Walk down tree trunk, rather than to all leaves, to check for cyclesJon Marius Venstad2022-03-181-6/+2
| |
* | Fix typoJon Marius Venstad2022-03-184-8/+7
|/
* Merge pull request #21634 from vespa-engine/bjorncs/fix-grouping-result-mergingHenning Baldersheim2022-03-182-39/+29
|\ | | | | Fix grouping result merging
| * Fix grouping result mergingBjørn Christian Seime2022-03-102-39/+29
| | | | | | | | | | Ensure query is propagated to aggregated grouping result. Populate grouping hit as context to hits inside each grouping in grouping result aggregator prior to postMerge().
* | Merge pull request #21722 from vespa-engine/bratseth/deprecate-some-orgjsonJon Bratseth2022-03-173-15/+14
|\ \ | | | | | | Deprecate public org.json
| * | Decprecate public org.jsonJon Bratseth2022-01-313-15/+14
| | |
* | | Merge branch 'master' into bratseth/balancedJon Bratseth2022-03-159-152/+128
|\ \ \ | | |/ | |/|
| * | Merge pull request #21611 from vespa-engine/bratseth/dispatchHenning Baldersheim2022-03-094-108/+69
| |\ \ | | | | | | | | Bratseth/dispatch
| | * | CleanupJon Bratseth2022-03-091-5/+3
| | | |
| | * | SimplifyJon Bratseth2022-03-092-24/+12
| | | |
| | * | SimplifyJon Bratseth2022-03-091-7/+5
| | | |
| | * | SimplifyJon Bratseth2022-03-091-27/+19
| | | |
| | * | Don't assume equal-sized groupsJon Bratseth2022-03-092-8/+3
| | | |
| | * | CleanupJon Bratseth2022-03-091-7/+1
| | | |
| | * | CleanupJon Bratseth2022-03-091-25/+25
| | | |
| | * | CleanupJon Bratseth2022-03-091-6/+2
| | | |
| * | | Add FlatteningSearcherJon Bratseth2022-03-075-45/+61
| |/ /
* / / Improve 'not balanced' info messageJon Bratseth2022-03-154-8/+8
|/ /
* | typoKristian Aune2022-03-071-1/+1
| |
* | Don't convert true and false to 1.0 and 0.0Jon Bratseth2022-03-041-1/+0
| |
* | No functional changesJon Bratseth2022-03-022-21/+3
| |
* | Merge grouping results incrementally in search invokerBjørn Christian Seime2022-03-012-3/+64
| |
* | 'tokenize', to make this work better as a query typeJon Bratseth2022-02-233-12/+5
| |
* | Update ABI specJon Bratseth2022-02-231-1/+0
| |
* | Add grammar:noneJon Bratseth2022-02-235-5/+57
| |
* | Update comment to match how connectivity is handled in the search backend.Geir Storli2022-02-221-1/+1
| |
* | Remove TODO on changing toString to YQL formatJon Bratseth2022-02-221-3/+0
| | | | | | | | | | | | It would be nice but it breaks 842 tests for us, and probably a lot for applications too, so it is just not worth the effort.
* | Merge pull request #21228 from vespa-engine/bratseth/resolve-slice-dimensionLester Solbakken2022-02-171-2/+3
|\ \ | | | | | | Resolve slice dimension
| * | Resolve slice dimensionJon Bratseth2022-02-161-2/+3
| | |
* | | detect and debug log invalid summary classArne H Juul2022-02-162-0/+10
|/ /
* | Merge branch 'master' into arnej/wset-and-map-renderingArne H Juul2022-02-1123-175/+405
|\ \ | | | | | | | | | | | | Conflicts: container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
| * \ Merge pull request #21105 from ↵Jon Bratseth2022-02-107-106/+158
| |\ \ | | | | | | | | | | | | | | | | vespa-engine/bratseth/presentation-format-tensors-take-2 Bratseth/presentation format tensors take 2
| | * | Extract methodJon Bratseth2022-02-081-49/+49
| | | |
| | * | Handle query profile values in type checkingJon Bratseth2022-02-081-6/+18
| | | |
| | * | Revert "Revert "Bratseth/presentation format tensors""Jon Bratseth2022-02-086-69/+109
| | | | | | | | | | | | | | | | This reverts commit 154c8837f1ca166816d289db82fed90baca72e54.
| * | | Deprecate public API in JsonRenderer that leaks JacksonBjørn Christian Seime2022-02-081-27/+58
| |/ /