summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-12-16 22:43:49 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-12-16 22:43:49 +0000
commit3415614a539e1e923513ac941c3b9ea7d171ae95 (patch)
tree6f199f3d76355f17e5e16d0cd45382aa14a670c6 /searchcore
parent9156592055b871be41b1f634ee37842854dc73a4 (diff)
No need to use explicit namespace here.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/tests/grouping/grouping.cpp8
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/searchcore/src/tests/grouping/grouping.cpp b/searchcore/src/tests/grouping/grouping.cpp
index 667f83d18f9..e5ac6ed15b0 100644
--- a/searchcore/src/tests/grouping/grouping.cpp
+++ b/searchcore/src/tests/grouping/grouping.cpp
@@ -479,18 +479,18 @@ TEST_F("test session timeout", DoomFixture()) {
GroupingSession::UP s2(new GroupingSession(id2, initContext2, world.attributeContext));
mgr.insert(std::move(s1));
mgr.insert(std::move(s2));
- mgr.pruneTimedOutSessions(steady_time(duration(5)));
+ mgr.pruneTimedOutSessions(steady_time(5ns));
SessionManager::Stats stats(mgr.getGroupingStats());
ASSERT_EQUAL(2u, stats.numCached);
- mgr.pruneTimedOutSessions(steady_time(duration(10)));
+ mgr.pruneTimedOutSessions(steady_time(10ns));
stats = mgr.getGroupingStats();
ASSERT_EQUAL(2u, stats.numCached);
- mgr.pruneTimedOutSessions(steady_time(duration(11)));
+ mgr.pruneTimedOutSessions(steady_time(11ns));
stats = mgr.getGroupingStats();
ASSERT_EQUAL(1u, stats.numCached);
- mgr.pruneTimedOutSessions(steady_time(duration(21)));
+ mgr.pruneTimedOutSessions(steady_time(21ns));
stats = mgr.getGroupingStats();
ASSERT_EQUAL(0u, stats.numCached);
}
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
index 44d3e618b93..4f55d7fc127 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
@@ -125,7 +125,7 @@ StoreOnlyDocSubDB::StoreOnlyDocSubDB(const Config &cfg, const Context &ctx)
_subDbType(cfg._subDbType),
_fileHeaderContext(*this, ctx._fileHeaderContext, _docTypeName, _baseDir),
_lidReuseDelayer(),
- _commitTimeTracker(vespalib::from_s(3600)),
+ _commitTimeTracker(3600s),
_gidToLidChangeHandler(std::make_shared<DummyGidToLidChangeHandler>())
{
vespalib::mkdir(_baseDir, false); // Assume parent is created.