From 2d9a668a8159498e91e123693bd3f03bd761b218 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 20 Mar 2019 15:23:38 +0000 Subject: Update as default changed on vespa 7. --- .../src/tests/fef/properties/properties_test.cpp | 21 +++++++++++++++++++++ .../src/vespa/searchlib/fef/indexproperties.cpp | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) (limited to 'searchlib') diff --git a/searchlib/src/tests/fef/properties/properties_test.cpp b/searchlib/src/tests/fef/properties/properties_test.cpp index 474764bde0b..380bbcfce5f 100644 --- a/searchlib/src/tests/fef/properties/properties_test.cpp +++ b/searchlib/src/tests/fef/properties/properties_test.cpp @@ -470,6 +470,27 @@ TEST("test stuff") { p.add("vespa.execute.onsummary.operation", "++"); EXPECT_EQUAL(execute::onsummary::Operation::lookup(p), "++"); } + { + EXPECT_EQUAL(softtimeout::Enabled::NAME, vespalib::string("vespa.softtimeout.enable")); + EXPECT_TRUE(softtimeout::Enabled::DEFAULT_VALUE); + Properties p; + p.add(softtimeout::Enabled::NAME, "false"); + EXPECT_FALSE(softtimeout::Enabled::lookup(p)); + } + { + EXPECT_EQUAL(softtimeout::Factor::NAME, vespalib::string("vespa.softtimeout.factor")); + EXPECT_EQUAL(0.5, softtimeout::Factor::DEFAULT_VALUE); + Properties p; + p.add(softtimeout::Factor::NAME, "0.33"); + EXPECT_EQUAL(0.33, softtimeout::Factor::lookup(p)); + } + { + EXPECT_EQUAL(softtimeout::TailCost::NAME, vespalib::string("vespa.softtimeout.tailcost")); + EXPECT_EQUAL(0.1, softtimeout::TailCost::DEFAULT_VALUE); + Properties p; + p.add(softtimeout::TailCost::NAME, "0.17"); + EXPECT_EQUAL(0.17, softtimeout::TailCost::lookup(p)); + } } } diff --git a/searchlib/src/vespa/searchlib/fef/indexproperties.cpp b/searchlib/src/vespa/searchlib/fef/indexproperties.cpp index fd73ce5a0f0..dfe0e17c33d 100644 --- a/searchlib/src/vespa/searchlib/fef/indexproperties.cpp +++ b/searchlib/src/vespa/searchlib/fef/indexproperties.cpp @@ -267,7 +267,7 @@ MinHitsPerThread::lookup(const Properties &props, uint32_t defaultValue) namespace softtimeout { const vespalib::string Enabled::NAME("vespa.softtimeout.enable"); -const bool Enabled::DEFAULT_VALUE(false); +const bool Enabled::DEFAULT_VALUE(true); bool Enabled::lookup(const Properties &props) { return lookupBool(props, NAME, DEFAULT_VALUE); -- cgit v1.2.3