Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add an optional diversification filter that is applied inline when selecting ↵ | Henning Baldersheim | 2018-07-27 | 3 | -13/+56 |
| | | | | the best. | ||||
* | Remove unused code only used in tests | Henning Baldersheim | 2018-07-27 | 3 | -29/+8 |
| | |||||
* | Select the hits to rerank in the selectBest part instead of a later copy. | Henning Baldersheim | 2018-07-27 | 9 | -72/+68 |
| | | | | Stick to full hits instead of feature_t. | ||||
* | Merge pull request #6483 from vespa-engine/balder/add-getSortedHeapHits | Henning Baldersheim | 2018-07-26 | 3 | -91/+108 |
|\ | | | | | Balder/add get sorted heap hits | ||||
| * | Simplify since reRank i snot incremental. | Henning Baldersheim | 2018-07-26 | 1 | -8/+4 |
| | | |||||
| * | Split reRank in 2 where one is using the other for later reuse. | Henning Baldersheim | 2018-07-26 | 2 | -2/+14 |
| | | |||||
| * | Add test for getSortedHeapHits | Henning Baldersheim | 2018-07-26 | 1 | -2/+13 |
| | | |||||
| * | Fix up clang-tidy warnings | Henning Baldersheim | 2018-07-26 | 1 | -64/+56 |
| | | |||||
| * | Add getSortedHeapHits | Henning Baldersheim | 2018-07-26 | 2 | -21/+27 |
|/ | |||||
* | Merge pull request #6480 from vespa-engine/arnej/abi-compat | Morten Tokle | 2018-07-26 | 1 | -3/+7 |
|\ | | | | | preserve binary compatibility | ||||
| * | preserve binary compatibility | Arne Juul | 2018-07-26 | 1 | -3/+7 |
| | | |||||
* | | Merge pull request #6479 from vespa-engine/balder/refactor-diversity-for-reuse | Henning Baldersheim | 2018-07-26 | 5 | -143/+185 |
|\ \ | | | | | | | Balder/refactor diversity for reuse | ||||
| * | | Restructure for code reuse and hiding implementation. | Henning Baldersheim | 2018-07-26 | 5 | -164/+150 |
| | | | |||||
| * | | Restructure for code reuse and hiding implementation. | Henning Baldersheim | 2018-07-26 | 1 | -0/+16 |
| | | | |||||
| * | | Make diversifier virtual for easier reuse and minimal runtime impact. | Henning Baldersheim | 2018-07-26 | 2 | -42/+50 |
| | | | |||||
| * | | No need for templated argument anymore | Henning Baldersheim | 2018-07-26 | 1 | -23/+34 |
| | | | |||||
| * | | Split in filter and recorder for reuse. | Henning Baldersheim | 2018-07-26 | 1 | -18/+39 |
| |/ | |||||
* | | Merge pull request #6368 from vespa-engine/bjorncs/move-athenz-principal-filter | Bjørn Christian Seime | 2018-07-26 | 5 | -86/+85 |
|\ \ | | | | | | | Move AthenzPrincipalFilter to jdisc-security-filters | ||||
| * | | Move AthenzPrincipalFilter to jdisc-security-filters | Bjørn Christian Seime | 2018-07-26 | 5 | -86/+85 |
| | | | |||||
* | | | Merge pull request #6469 from ↵ | Tor Brede Vekterli | 2018-07-26 | 129 | -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-terminated | Tor Brede Vekterli | 2018-07-26 | 9 | -11/+12 |
| | | | |||||
| * | | Remove stringref::c_str() | Tor Brede Vekterli | 2018-07-25 | 128 | -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-more | Henning Baldersheim | 2018-07-26 | 5 | -9/+10 |
|\ \ \ | | | | | | | | | Balder/random deinline and some more | ||||
| * | | | Add final | Henning Baldersheim | 2018-07-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | = default and std::make_unique | Henning Baldersheim | 2018-07-26 | 2 | -7/+5 |
| | | | | |||||
| * | | | Deinline | Henning Baldersheim | 2018-07-26 | 2 | -1/+4 |
| | |/ | |/| | |||||
* | | | Merge pull request #6476 from vespa-engine/bjorncs/simple-detector-config | Bjørn Christian Seime | 2018-07-26 | 3 | -8/+46 |
|\ \ \ | | | | | | | | | Add config for simple-linguistics | ||||
| * | | | Add missing newline at end of file | Bjørn Christian Seime | 2018-07-26 | 1 | -1/+2 |
| | | | | |||||
| * | | | Add config for simple-linguistics | Bjørn Christian Seime | 2018-07-26 | 3 | -8/+45 |
| | | | | | | | | | | | | | | | | Add a config parameter for enabling/disabling optimaize detector | ||||
* | | | | Merge pull request #6477 from vespa-engine/freva/fixes | Valerij Fredriksen | 2018-07-26 | 2 | -21/+0 |
|\ \ \ \ | |_|/ / |/| | | | Remove convergeSuspend | ||||
| * | | | Remove sout from test | Valerij Fredriksen | 2018-07-26 | 1 | -3/+0 |
| | | | | |||||
| * | | | Remove convergeSuspend | Valerij Fredriksen | 2018-07-26 | 1 | -18/+0 |
| |/ / | |||||
* | | | Merge pull request #6475 from vespa-engine/balder/random-cleanup | Henning Baldersheim | 2018-07-26 | 6 | -39/+23 |
|\ \ \ | | | | | | | | | nested namespaces | ||||
| * | | | nested namespaces | Henning Baldersheim | 2018-07-26 | 6 | -39/+23 |
| | | | | |||||
* | | | | Merge pull request #6470 from vespa-engine/bjorncs/improve-controller-resilience | Morten Tokle | 2018-07-26 | 18 | -407/+199 |
|\ \ \ \ | | | | | | | | | | | Bjorncs/improve controller resilience | ||||
| * | | | | Handle zms keys in addition to zts keys | Bjørn Christian Seime | 2018-07-25 | 5 | -24/+44 |
| | | | | | |||||
| * | | | | Move NTokenValidator to vespa-athenz + load pub keys from file | Bjørn Christian Seime | 2018-07-25 | 18 | -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-fix | Valerij Fredriksen | 2018-07-26 | 3 | -7/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | [VESPA-12637] Check if deployment is still needed after acquiring the lock | ||||
| * | | | | | Check if redeployment is still needed after acquiring the lock | Valerij Fredriksen | 2018-07-26 | 3 | -4/+6 |
| | | | | | | |||||
| * | | | | | Use immutable collections instead | Valerij Fredriksen | 2018-07-26 | 1 | -3/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #6473 from vespa-engine/arnej/wait-for-destroyed-process | Henning Baldersheim | 2018-07-26 | 1 | -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 Juul | 2018-07-26 | 1 | -0/+1 |
|/ / / / | | | | | | | | | | | | | many of them | ||||
* | | | | Merge pull request #6472 from vespa-engine/gjoranv/enforce-provided | Kristian Aune | 2018-07-25 | 2 | -6/+10 |
|\ \ \ \ | | | | | | | | | | | Exclude guava and slf4j-api in container-core | ||||
| * | | | | Exclude guava and slf4j-api in container-core | gjoranv | 2018-07-25 | 2 | -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-provided | Bjørn Christian Seime | 2018-07-25 | 1 | -0/+6 |
|\ \ \ \ | |/ / / |/| | | | Must exclude slf4j from language-detector to avoid compile scope. | ||||
| * | | | Must exclude slf4j from language-detector to avoid compile scope. | gjoranv | 2018-07-25 | 1 | -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-destruction | Henning Baldersheim | 2018-07-25 | 13 | -31/+137 |
|\ \ \ \ | | | | | | | | | | | Track document db destruction. | ||||
| * | | | | Track document db destruction. | Tor Egge | 2018-07-25 | 13 | -31/+137 |
| | |_|/ | |/| | | | | | | | | | | Wait until document db has been destroyed when pruning old document dbs. | ||||
* | | | | Merge pull request #6465 from vespa-engine/balder/nested-namespaces | Henning Baldersheim | 2018-07-25 | 38 | -243/+101 |
|\ \ \ \ | | | | | | | | | | | Nested namespaces | ||||
| * | | | | Add missing newline. | Henning Baldersheim | 2018-07-25 | 2 | -2/+2 |
| | | | | |