summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--searchcore/src/tests/grouping/grouping.cpp8
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp2
-rw-r--r--staging_vespalib/src/vespa/vespalib/util/doom.cpp2
-rw-r--r--staging_vespalib/src/vespa/vespalib/util/doom.h2
4 files changed, 7 insertions, 7 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.
diff --git a/staging_vespalib/src/vespa/vespalib/util/doom.cpp b/staging_vespalib/src/vespa/vespalib/util/doom.cpp
index 329f4cad913..72b854338dc 100644
--- a/staging_vespalib/src/vespa/vespalib/util/doom.cpp
+++ b/staging_vespalib/src/vespa/vespalib/util/doom.cpp
@@ -4,7 +4,7 @@
namespace vespalib {
-Doom::Doom(const vespalib::Clock &clock, steady_time softDoom,
+Doom::Doom(const Clock &clock, steady_time softDoom,
steady_time hardDoom, bool explicitSoftDoom)
: _clock(clock),
_softDoom(softDoom),
diff --git a/staging_vespalib/src/vespa/vespalib/util/doom.h b/staging_vespalib/src/vespa/vespalib/util/doom.h
index dc3d124fc71..a1280942ad7 100644
--- a/staging_vespalib/src/vespa/vespalib/util/doom.h
+++ b/staging_vespalib/src/vespa/vespalib/util/doom.h
@@ -11,7 +11,7 @@ public:
Doom(const Clock &clock, steady_time doom)
: Doom(clock, doom, doom, false)
{}
- Doom(const Clock &clock, vespalib::steady_time softDoom,
+ Doom(const Clock &clock, steady_time softDoom,
steady_time hardDoom, bool explicitSoftDoom);
bool soft_doom() const { return (_clock.getTimeNSAssumeRunning() > _softDoom); }