diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2018-01-12 08:47:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-12 08:47:52 +0100 |
| commit | 02d24f0ebf5a63e8ce1e1f840fc3a67c7c844adc (patch) | |
| tree | 5a316f4fe0c0a9923cb968115f2ddbf9907bdcd7 /searchcore/src/tests/proton/documentdb | |
| parent | 8ac63b426892e2478104a2e8ec6b122162f09f2e (diff) | |
Revert "Balder/group multiple commits rebased 1"
Diffstat (limited to 'searchcore/src/tests/proton/documentdb')
| -rw-r--r-- | searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp index e56271b3d5a..b8ffc41d3cd 100644 --- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp @@ -9,6 +9,7 @@ #include <vespa/searchcore/proton/feedoperation/putoperation.h> #include <vespa/searchcore/proton/feedoperation/removeoperation.h> #include <vespa/searchcore/proton/feedoperation/updateoperation.h> +#include <vespa/searchcore/proton/feedoperation/wipehistoryoperation.h> #include <vespa/searchcore/proton/persistenceengine/i_resource_write_filter.h> #include <vespa/searchcore/proton/server/configstore.h> #include <vespa/searchcore/proton/server/ddbstate.h> @@ -17,8 +18,10 @@ #include <vespa/searchcore/proton/server/i_feed_handler_owner.h> #include <vespa/searchcore/proton/server/ireplayconfig.h> #include <vespa/searchcore/proton/test/dummy_feed_view.h> +#include <vespa/searchlib/common/idestructorcallback.h> #include <vespa/searchlib/index/docbuilder.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> +#include <vespa/searchlib/transactionlog/translogclient.h> #include <vespa/searchlib/transactionlog/translogserver.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/util/closuretask.h> @@ -39,7 +42,6 @@ using search::index::schema::CollectionType; using search::index::schema::DataType; using vespalib::makeLambdaTask; using search::transactionlog::TransLogServer; -using search::transactionlog::DomainConfig; using storage::spi::PartitionId; using storage::spi::RemoveResult; using storage::spi::Result; @@ -394,7 +396,7 @@ struct FeedHandlerFixture FeedHandler handler; FeedHandlerFixture() : _fileHeaderContext(), - tls("mytls", 9016, "mytlsdir", _fileHeaderContext, DomainConfig().setPartSizeLimit(0x10000)), + tls("mytls", 9016, "mytlsdir", _fileHeaderContext, 0x10000), tlsSpec("tcp/localhost:9016"), writeService(), schema(), |