aboutsummaryrefslogtreecommitdiffstats
path: root/searchcore/src/tests/proton/index
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2021-10-28 21:03:14 +0200
committerTor Egge <Tor.Egge@online.no>2021-10-28 21:03:14 +0200
commit85115fc4804effd03d89c229be30d13a9d6471c5 (patch)
treecd28081347dda032c7d5e8ee2716f0974e9db5cc /searchcore/src/tests/proton/index
parent13472dff416a84e4295cf11e618ab17e97a59f82 (diff)
Rename ISequencedTaskExecutor::sync() to sync_all().
Diffstat (limited to 'searchcore/src/tests/proton/index')
-rw-r--r--searchcore/src/tests/proton/index/fusionrunner_test.cpp2
-rw-r--r--searchcore/src/tests/proton/index/indexmanager_test.cpp12
2 files changed, 7 insertions, 7 deletions
diff --git a/searchcore/src/tests/proton/index/fusionrunner_test.cpp b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
index 5793e366126..ca10ff01a69 100644
--- a/searchcore/src/tests/proton/index/fusionrunner_test.cpp
+++ b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
@@ -182,7 +182,7 @@ void Test::createIndex(const string &dir, uint32_t id, bool fusion) {
addDocument(doc_builder, memory_index, *_selector, id, id + 1, "bar");
addDocument(doc_builder, memory_index, *_selector, id, id + 2, "baz");
addDocument(doc_builder, memory_index, *_selector, id, id + 3, "qux");
- _threadingService.indexFieldWriter().sync();
+ _threadingService.indexFieldWriter().sync_all();
const uint32_t docIdLimit =
std::min(memory_index.getDocIdLimit(), _selector->getDocIdLimit());
diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp
index 7021f04d845..be1e2c79f70 100644
--- a/searchcore/src/tests/proton/index/indexmanager_test.cpp
+++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp
@@ -145,7 +145,7 @@ struct IndexManagerTest : public ::testing::Test {
_index_manager->commit(serialNum,
emptyDestructorCallback);
});
- _writeService.indexFieldWriter().sync();
+ _writeService.indexFieldWriter().sync_all();
}
void removeDocument(uint32_t docId) {
SerialNum serialNum = ++_serial_num;
@@ -185,7 +185,7 @@ IndexManagerTest::addDocument(uint32_t id)
runAsIndex([&]() { _index_manager->putDocument(id, *doc, serialNum);
_index_manager->commit(serialNum,
emptyDestructorCallback); });
- _writeService.indexFieldWriter().sync();
+ _writeService.indexFieldWriter().sync_all();
return doc;
}
@@ -406,9 +406,9 @@ TEST_F(IndexManagerTest, require_that_flush_stats_are_calculated)
Document::UP doc = addDocument(docid);
inverter.invertDocument(docid, *doc);
- invertThreads->sync();
+ invertThreads->sync_all();
inverter.pushDocuments(std::shared_ptr<vespalib::IDestructorCallback>());
- pushThreads->sync();
+ pushThreads->sync_all();
index_size = fic.getMemoryUsage().allocatedBytes() - fixed_index_size;
/// Must account for both docid 0 being reserved and the extra after.
@@ -425,9 +425,9 @@ TEST_F(IndexManagerTest, require_that_flush_stats_are_calculated)
inverter.invertDocument(docid + 10, *doc);
doc = addDocument(docid + 100);
inverter.invertDocument(docid + 100, *doc);
- invertThreads->sync();
+ invertThreads->sync_all();
inverter.pushDocuments(std::shared_ptr<vespalib::IDestructorCallback>());
- pushThreads->sync();
+ pushThreads->sync_all();
index_size = fic.getMemoryUsage().allocatedBytes() - fixed_index_size;
/// Must account for both docid 0 being reserved and the extra after.
selector_size = (docid + 100 + 1) * sizeof(Source);