summaryrefslogtreecommitdiffstats
path: root/container-search
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Bratseth/rank type information 2"Arnstein Ressem2018-09-251-1/+1
|
* Remove deprecated GDFLAG_ALLOW_SLIME flag from getdocsum packets.Tor Egge2018-09-253-16/+8
| | | | It is ignored by backend (slime is always allowed).
* Merge with masterJon Bratseth2018-09-249-199/+288
|\
| * Multiple node java dispatch supportOlli Virtanen2018-09-248-95/+288
| |
| * Remove remains from qr-templates configgjoranv2018-09-211-104/+0
| | | | | | | | + other unused .def and .cfg files from config module
* | Nonfunctional changes onlyJon Bratseth2018-09-211-1/+1
|/
* Merge pull request #6967 from ↵Henning Baldersheim2018-09-197-399/+432
|\ | | | | | | | | vespa-engine/ollivir/move-logic-to-fs4closeablechannel-from-fastsearcher FS4 interfacing code moved to FS4CloseableChannel from FastSearcher
| * FS4 interfacing code moved to FS4CloseableChannel from FastSearcherOlli Virtanen2018-09-147-399/+432
| |
* | Change affinity property name; javadoc cleanupOlli Virtanen2018-09-171-2/+2
| |
* | Reuse node group for allocations by same queryOlli Virtanen2018-09-142-13/+59
|/
* Merge pull request #6901 from ↵Henning Baldersheim2018-09-123-1/+28
|\ | | | | | | | | vespa-engine/geirst/implement-attribute-map-lookup-node-in-java Implement a new function node (AttributeMapLookupNode) for doing look…
| * Implement a new function node (AttributeMapLookupNode) for doing lookup in a ↵Geir Storli2018-09-113-1/+28
| | | | | | | | map attribute.
* | DistributionKey moved from Backend to CloseableChannelOlli Virtanen2018-09-1010-34/+21
|/
* Extend grouping validator to handle attribute map lookup with key source ↵Geir Storli2018-09-103-48/+122
| | | | attribute.
* Extend grouping parser to handle map syntax with indirect key via attribute ↵Geir Storli2018-09-104-11/+124
| | | | vector.
* Use fileAcquirerJon Bratseth2018-09-101-7/+6
|
* Added copyrights and javadocs. Logic and naming in LB cleaned upOlli Virtanen2018-09-065-24/+65
|
* Java dispatch support for multiple groups of single nodesOlli Virtanen2018-09-065-22/+184
|
* Merge pull request #6793 from ↵Tor Egge2018-09-052-22/+87
|\ | | | | | | | | vespa-engine/geirst/extend-grouping-validator-to-handle-attribute-map-syntax Geirst/extend grouping validator to handle attribute map syntax
| * Extend grouping validator to handle map syntax on an attribute vector.Geir Storli2018-09-042-13/+73
| |
| * Simplify setup of tests.Geir Storli2018-09-041-11/+16
| |
* | Nonfunctional changes onlyJon Bratseth2018-09-053-4/+3
|/
* Merge pull request #6749 from vespa-engine/ollivir/dispatch-in-container-searchOlli Virtanen2018-08-3110-33/+195
|\ | | | | Java dispatcher extensions
| * Replace chooseBackend(..) with getChannel(..) to abstract the protocol layerOlli Virtanen2018-08-313-31/+72
| |
| * Create code path for extending java side dispatcherOlli Virtanen2018-08-304-4/+127
| |
| * Clean issues/warnings reported in Eclipse IDEOlli Virtanen2018-08-305-6/+4
| |
* | Revert to previous VIP status management from dispatchJon Bratseth2018-08-302-5/+9
| | | | | | | | | | The new behavior does not work in the (unrealistic, but used in tests) case where there are multiple local one-node content clusters.
* | Revert "Merge pull request #6726 from ↵Jon Bratseth2018-08-301-4/+4
| | | | | | | | | | | | | | vespa-engine/revert-6719-bratseth/initially-down" This reverts commit 05ea4c2b9952bceaf0e009053c2f51a09d15a957, reversing changes made to 03efdabdc9f0e43fc2c362569ae455a7abc9a64b.
* | Revert "Be down initially"Jon Bratseth2018-08-301-4/+4
| |
* | Be down initiallyJon Bratseth2018-08-291-4/+4
|/ | | | | | | | | | | | | | | | | | | | Before ths change containers used to come up in the initial VIP state of up ("in rotation") before having any information about downstream cløusters. This is problematic if the node determines that it should be down when learning the state of downstream clusters, especially when it is determining that it should be down due to failing to complete pings timely due to initialization load. This changes to starting in the down state. Crucially, this requires tracking the current state of clusters in a separate component such that the state survives reconfiguration and we avoid setting the state down briefly on each reconfiguration. In addition to the case where there are downstream clusters deciding the VIP state oif a container, there are two others: - There are no such clusters. In this case the VIP state will be up by default. - Some other component is explicitly deciding the VIP state. This commit makes that case clearer.
* Merge pull request #6679 from vespa-engine/gjoranv/javacc-plugingjoranv2018-08-288-41/+35
|\ | | | | Gjoranv/javacc plugin
| * Switch to new javacc maven plugin:gjoranv2018-08-272-4/+4
| | | | | | | | | | | | | | | | - config model - document - documentapi - indexinglanguage. - searchlib
| * Replace old javacc-plugin with ph-javacc-maven-plugin.gjoranv2018-08-276-37/+31
| |
* | Generate a global rank profile configJon Bratseth2018-08-241-3/+0
|/ | | | | | | This makes available to all regular container clusters a config containing a set of rank profiles containing the expressions resulting from converting all the ml models added in the models/ directory in the application package.
* 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
| | |