summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add an optional diversification filter that is applied inline when selecting ↵Henning Baldersheim2018-07-273-13/+56
| | | | the best.
* Remove unused code only used in testsHenning Baldersheim2018-07-273-29/+8
|
* Select the hits to rerank in the selectBest part instead of a later copy.Henning Baldersheim2018-07-279-72/+68
| | | | Stick to full hits instead of feature_t.
* Merge pull request #6483 from vespa-engine/balder/add-getSortedHeapHitsHenning Baldersheim2018-07-263-91/+108
|\ | | | | Balder/add get sorted heap hits
| * Simplify since reRank i snot incremental.Henning Baldersheim2018-07-261-8/+4
| |
| * Split reRank in 2 where one is using the other for later reuse.Henning Baldersheim2018-07-262-2/+14
| |
| * Add test for getSortedHeapHitsHenning Baldersheim2018-07-261-2/+13
| |
| * Fix up clang-tidy warningsHenning Baldersheim2018-07-261-64/+56
| |
| * Add getSortedHeapHitsHenning Baldersheim2018-07-262-21/+27
|/
* Merge pull request #6480 from vespa-engine/arnej/abi-compatMorten Tokle2018-07-261-3/+7
|\ | | | | preserve binary compatibility
| * preserve binary compatibilityArne Juul2018-07-261-3/+7
| |
* | Merge pull request #6479 from vespa-engine/balder/refactor-diversity-for-reuseHenning Baldersheim2018-07-265-143/+185
|\ \ | | | | | | Balder/refactor diversity for reuse
| * | Restructure for code reuse and hiding implementation.Henning Baldersheim2018-07-265-164/+150
| | |
| * | Restructure for code reuse and hiding implementation.Henning Baldersheim2018-07-261-0/+16
| | |
| * | Make diversifier virtual for easier reuse and minimal runtime impact.Henning Baldersheim2018-07-262-42/+50
| | |
| * | No need for templated argument anymoreHenning Baldersheim2018-07-261-23/+34
| | |
| * | Split in filter and recorder for reuse.Henning Baldersheim2018-07-261-18/+39
| |/
* | Merge pull request #6368 from vespa-engine/bjorncs/move-athenz-principal-filterBjørn Christian Seime2018-07-265-86/+85
|\ \ | | | | | | Move AthenzPrincipalFilter to jdisc-security-filters
| * | Move AthenzPrincipalFilter to jdisc-security-filtersBjørn Christian Seime2018-07-265-86/+85
| | |
* | | Merge pull request #6469 from ↵Tor Brede Vekterli2018-07-26129-365/+386
|\ \ \ | |_|/ |/| | | | | | | | vespa-engine/vekterli/remove-dangerous-stringref-c_str-function Remove dangerous stringref::c_str()
| * | Don't string wrap refs that are guaranteed to be zero-terminatedTor Brede Vekterli2018-07-269-11/+12
| | |
| * | Remove stringref::c_str()Tor Brede Vekterli2018-07-25128-365/+385
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The expected semantics of c_str() (a null-terminated string) cannot be satisfied with a string reference, so remove the function entirely to prevent people from using it in buggy ways. Replaces c_str() with data() in places where it is presumed safe, otherwise constructs temporary string instances. Certain callsites have been de-stringref'd in favor of regular strings, in particular where C APIs have been transitively called. The vast majority of these were called with string parameters anyway, so should not cause much extra allocation.
* | | Merge pull request #6478 from vespa-engine/balder/random-deinline-and-some-moreHenning Baldersheim2018-07-265-9/+10
|\ \ \ | | | | | | | | Balder/random deinline and some more
| * | | Add finalHenning Baldersheim2018-07-261-1/+1
| | | |
| * | | = default and std::make_uniqueHenning Baldersheim2018-07-262-7/+5
| | | |
| * | | DeinlineHenning Baldersheim2018-07-262-1/+4
| | |/ | |/|
* | | Merge pull request #6476 from vespa-engine/bjorncs/simple-detector-configBjørn Christian Seime2018-07-263-8/+46
|\ \ \ | | | | | | | | Add config for simple-linguistics
| * | | Add missing newline at end of fileBjørn Christian Seime2018-07-261-1/+2
| | | |
| * | | Add config for simple-linguisticsBjørn Christian Seime2018-07-263-8/+45
| | | | | | | | | | | | | | | | Add a config parameter for enabling/disabling optimaize detector
* | | | Merge pull request #6477 from vespa-engine/freva/fixesValerij Fredriksen2018-07-262-21/+0
|\ \ \ \ | |_|/ / |/| | | Remove convergeSuspend
| * | | Remove sout from testValerij Fredriksen2018-07-261-3/+0
| | | |
| * | | Remove convergeSuspendValerij Fredriksen2018-07-261-18/+0
| |/ /
* | | Merge pull request #6475 from vespa-engine/balder/random-cleanupHenning Baldersheim2018-07-266-39/+23
|\ \ \ | | | | | | | | nested namespaces
| * | | nested namespacesHenning Baldersheim2018-07-266-39/+23
| | | |
* | | | Merge pull request #6470 from vespa-engine/bjorncs/improve-controller-resilienceMorten Tokle2018-07-2618-407/+199
|\ \ \ \ | | | | | | | | | | Bjorncs/improve controller resilience
| * | | | Handle zms keys in addition to zts keysBjørn Christian Seime2018-07-255-24/+44
| | | | |
| * | | | Move NTokenValidator to vespa-athenz + load pub keys from fileBjørn Christian Seime2018-07-2518-408/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move NTokenValidator from controller-server to vespa-athenz - Remodel ZmsKeystore as AthenzTruststore - Use file-backed truststore on controller (replaces download of public keys) - Remove ZmsClient.getPublicKey/getPublicKeys
* | | | | Merge pull request #6474 from vespa-engine/freva/periodic-maintainer-fixValerij Fredriksen2018-07-263-7/+8
|\ \ \ \ \ | | | | | | | | | | | | [VESPA-12637] Check if deployment is still needed after acquiring the lock
| * | | | | Check if redeployment is still needed after acquiring the lockValerij Fredriksen2018-07-263-4/+6
| | | | | |
| * | | | | Use immutable collections insteadValerij Fredriksen2018-07-261-3/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #6473 from vespa-engine/arnej/wait-for-destroyed-processHenning Baldersheim2018-07-261-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | we want to wait until the "du" process is dead, to ensure not startin…
| * | | | we want to wait until the "du" process is dead, to ensure not starting too ↵Arne Juul2018-07-261-0/+1
|/ / / / | | | | | | | | | | | | many of them
* | | | Merge pull request #6472 from vespa-engine/gjoranv/enforce-providedKristian Aune2018-07-252-6/+10
|\ \ \ \ | | | | | | | | | | Exclude guava and slf4j-api in container-core
| * | | | Exclude guava and slf4j-api in container-coregjoranv2018-07-252-6/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | .. to prevent embedding them in container-disc and potentially other bundles. - Must be compile scope in linguistics because they're needed to run tests in modules depending on linguistics, e.g. indexinglanguage.
* | | | Merge pull request #6471 from vespa-engine/gjoranv/slf4j-api-providedBjørn Christian Seime2018-07-251-0/+6
|\ \ \ \ | |/ / / |/| | | Must exclude slf4j from language-detector to avoid compile scope.
| * | | Must exclude slf4j from language-detector to avoid compile scope.gjoranv2018-07-251-0/+6
| | | | | | | | | | | | | | | | | | | | .. and linkage error: java.lang.LinkageError: loader constraint violation: when resolving method "org.slf4j.impl.StaticLoggerBinder.getLoggerFactory()Lorg/slf4j/ILoggerFactory;" the class loader (instance of org/apache/felix/framework/BundleWiringImpl$BundleClassLoader) of the current class, org/slf4j/LoggerFactory, and the class loader (instance of sun/misc/Launcher$AppClassLoader) for the method's defining class, org/slf4j/impl/StaticLoggerBinder, have different Class objects for the type org/slf4j/ILoggerFactory used in the signature
* | | | Merge pull request #6468 from vespa-engine/toregge/track-document-db-destructionHenning Baldersheim2018-07-2513-31/+137
|\ \ \ \ | | | | | | | | | | Track document db destruction.
| * | | | Track document db destruction.Tor Egge2018-07-2513-31/+137
| | |_|/ | |/| | | | | | | | | | Wait until document db has been destroyed when pruning old document dbs.
* | | | Merge pull request #6465 from vespa-engine/balder/nested-namespacesHenning Baldersheim2018-07-2538-243/+101
|\ \ \ \ | | | | | | | | | | Nested namespaces
| * | | | Add missing newline.Henning Baldersheim2018-07-252-2/+2
| | | | |