diff options
author | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-03-17 11:13:24 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-03-17 11:13:24 +0000 |
commit | 4e6777f02b47a9da44ea7b86cd58cb88fb93f253 (patch) | |
tree | b91b958db826f42b1eaeb858225fceaf8880fba2 /searchcore/src/tests | |
parent | b09d7deb64e5a723c5a052dd2b1db225f632405f (diff) |
Remove union based fusion schema. It was used to keep data for removed
indexed fields in old documents intact until history was wiped, in case
the user wanted to revert the config change.
Diffstat (limited to 'searchcore/src/tests')
3 files changed, 3 insertions, 6 deletions
diff --git a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp index a8c6cd885a2..60f04bb0fa7 100644 --- a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp +++ b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp @@ -188,7 +188,7 @@ Fixture::initViewSet(ViewSet &views) { Matchers::SP matchers(new Matchers(_clock, _queryLimiter, _constantValueRepo)); IndexManager::SP indexMgr(new IndexManager(BASE_DIR, searchcorespi::index::WarmupConfig(), - 2, 0, Schema(), Schema(), views._reconfigurer, + 2, 0, Schema(), views._reconfigurer, views._writeService, _summaryExecutor, TuneFileIndexManager(), TuneFileAttributes(), views._fileHeaderContext)); AttributeManager::SP attrMgr(new AttributeManager(BASE_DIR, diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp index 841e7632730..5110d92ce6a 100644 --- a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp +++ b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp @@ -323,11 +323,9 @@ struct FixtureBase test::runInMaster(_writeService, func); } void init() { - Schema::SP unionSchema(new Schema()); DocumentSubDbInitializer::SP task = _subDb.createInitializer(*_snapshot->_cfg, Traits::configSerial(), - unionSchema, ProtonConfig::Summary(), ProtonConfig::Index()); vespalib::ThreadStackExecutor executor(1, 1024 * 1024); diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp index ca53364f1b5..27a2706aae8 100644 --- a/searchcore/src/tests/proton/index/indexmanager_test.cpp +++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp @@ -174,7 +174,7 @@ Document::UP Fixture::addDocument(uint32_t id) { void Fixture::resetIndexManager() { _index_manager.reset(0); _index_manager.reset( - new IndexManager(index_dir, searchcorespi::index::WarmupConfig(), 2, 0, getSchema(), getSchema(), + new IndexManager(index_dir, searchcorespi::index::WarmupConfig(), 2, 0, getSchema(), _reconfigurer, _writeService, _writeService.getMasterExecutor(), TuneFileIndexManager(), TuneFileAttributes(), _fileHeaderContext)); @@ -694,8 +694,7 @@ TEST_F("require that wipeHistory updates schema on disk", Fixture) { Schema empty_schema; f.addDocument(docid); f.flushIndexManager(); - f.runAsMaster([&]() { f._index_manager->setSchema(empty_schema, - empty_schema); }); + f.runAsMaster([&]() { f._index_manager->setSchema(empty_schema); }); f.addDocument(docid); f.flushIndexManager(); |