diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2021-01-06 13:36:23 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2021-01-06 13:39:43 +0100 |
commit | de1d36b97e0109229e46f2617432bea6c31a5132 (patch) | |
tree | 53248f21c4ccff84bcd2e541b7c2e84eaf49f0c6 /searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/shrink_lid_space_flush_target_test.cpp | |
parent | 293ea711b89d760bdea84f22d1b66ff94dad6667 (diff) |
Wire in use of flush tokens for flush targets.
Diffstat (limited to 'searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/shrink_lid_space_flush_target_test.cpp')
-rw-r--r-- | searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/shrink_lid_space_flush_target_test.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/shrink_lid_space_flush_target_test.cpp b/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/shrink_lid_space_flush_target_test.cpp index 6c502bccce1..acf3f66653d 100644 --- a/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/shrink_lid_space_flush_target_test.cpp +++ b/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/shrink_lid_space_flush_target_test.cpp @@ -3,6 +3,7 @@ #include <vespa/searchcore/proton/flushengine/shrink_lid_space_flush_target.h> #include <vespa/searchlib/common/i_compactable_lid_space.h> +#include <vespa/searchlib/common/flush_token.h> using namespace proton; using search::SerialNum; @@ -84,7 +85,7 @@ TEST_F("require that flush target returns no estimated memory gain when not able TEST_F("require that flush target returns no estimated memory gain right after shrink", Fixture) { - auto task = f._ft->initFlush(20); + auto task = f._ft->initFlush(20, std::make_shared<search::FlushToken>()); EXPECT_TRUE(validTask(task)); task->run(); auto memoryGain = f._ft->getApproxMemoryGain(); @@ -96,7 +97,7 @@ TEST_F("require that flush target returns no estimated memory gain right after s TEST_F("require that flush target returns no task when not able to flush", Fixture) { f._lidSpace->setCanShrink(false); - auto task = f._ft->initFlush(20); + auto task = f._ft->initFlush(20, std::make_shared<search::FlushToken>()); EXPECT_FALSE(validTask(task)); EXPECT_EQUAL(20u, f._ft->getFlushedSerialNum()); EXPECT_NOT_EQUAL(IFlushTarget::Time(), f._ft->getLastFlushTime()); @@ -105,14 +106,14 @@ TEST_F("require that flush target returns no task when not able to flush", Fixtu TEST_F("require that flush target returns valid task when able to flush again", Fixture) { f._lidSpace->setCanShrink(false); - auto task = f._ft->initFlush(20); + auto task = f._ft->initFlush(20, std::make_shared<search::FlushToken>()); EXPECT_FALSE(validTask(task)); EXPECT_EQUAL(20u, f._ft->getFlushedSerialNum()); EXPECT_NOT_EQUAL(IFlushTarget::Time(), f._ft->getLastFlushTime()); f._lidSpace->setCanShrink(true); auto memoryGain = f._ft->getApproxMemoryGain(); EXPECT_EQUAL(16, memoryGain.gain()); - task = f._ft->initFlush(20); + task = f._ft->initFlush(20, std::make_shared<search::FlushToken>()); EXPECT_TRUE(validTask(task)); task->run(); EXPECT_EQUAL(20u, f._ft->getFlushedSerialNum()); |