GC LoadTypeSet

11 files changed, 24 insertions, 128 deletions

diff --git a/documentapi/src/tests/loadtypes/.gitignore b/documentapi/src/tests/loadtypes/.gitignore
deleted file mode 100644
index 497fe4d4b3f..00000000000
--- a/documentapi/src/tests/loadtypes/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.depend
-Makefile
-documentapi_loadtype_test_app
diff --git a/documentapi/src/tests/loadtypes/CMakeLists.txt b/documentapi/src/tests/loadtypes/CMakeLists.txt
deleted file mode 100644
index bac42f9a27e..00000000000
--- a/documentapi/src/tests/loadtypes/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(documentapi_loadtype_test_app TEST
-    SOURCES
-    loadtypetest.cpp
-    DEPENDS
-    documentapi
-    vdstestlib
-    GTest::GTest
-)
-vespa_add_test(NAME documentapi_loadtype_test_app COMMAND documentapi_loadtype_test_app)
diff --git a/documentapi/src/tests/loadtypes/loadtypetest.cpp b/documentapi/src/tests/loadtypes/loadtypetest.cpp
deleted file mode 100644
index 178b9f9227b..00000000000
--- a/documentapi/src/tests/loadtypes/loadtypetest.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include <vespa/documentapi/loadtypes/loadtypeset.h>
-#include <vespa/config/config.h>
-#include <vespa/config/common/exceptions.h>
-#include <vespa/vespalib/gtest/gtest.h>
-
-namespace documentapi {
-
-void
-assertConfigFailure(const vespalib::string &configId, const vespalib::string &expError)
-{
-    try {
-        LoadTypeSet createdFromConfigId(configId);
-        FAIL() << "Config was expected to fail with error: " << expError;
-    } catch (config::InvalidConfigException &e) {
-        EXPECT_TRUE(e.getMessage().find(expError) != std::string::npos);
-    }
-}
-
-TEST(LoadTypeTest, testConfig)
-{
-    // Using id 0 is illegal. Reserved for default type.
-    assertConfigFailure(
-            "raw:"
-            "type[1]\n"
-            "type[0].id 0\n"
-            "type[0].name \"foo\"\n"
-            "type[0].priority \"\"",
-            "Load type identifiers need to be");
-    // Using name "default" is illegal. Reserved for default type.
-    assertConfigFailure(
-            "raw:"
-            "type[1]\n"
-            "type[0].id 1\n"
-            "type[0].name \"default\"\n"
-            "type[0].priority \"\"", "Load type names need to be");
-    // Identifiers need to be unique.
-    assertConfigFailure(
-            "raw:"
-            "type[2]\n"
-            "type[0].id 1\n"
-            "type[0].name \"test\"\n"
-            "type[0].priority \"\"\n"
-            "type[1].id 1\n"
-            "type[1].name \"testa\"\n"
-            "type[1].priority \"\"",  "Load type identifiers need to be");
-    // Names need to be unique.
-    assertConfigFailure(
-            "raw:"
-            "type[2]\n"
-            "type[0].id 1\n"
-            "type[0].name \"test\"\n"
-            "type[0].priority \"\"\n"
-            "type[1].id 2\n"
-            "type[1].name \"test\"\n"
-            "type[1].priority \"\"" , "Load type names need to be");
-    LoadTypeSet set("raw:"
-            "type[3]\n"
-            "type[0].id 1\n"
-            "type[0].name \"user\"\n"
-            "type[0].priority \"\"\n"
-            "type[1].id 2\n"
-            "type[1].name \"maintenance\"\n"
-            "type[1].priority \"\"\n"
-            "type[2].id 3\n"
-            "type[2].name \"put\"\n"
-            "type[2].priority \"\""
-    );
-}
-
-} // documentapi
-
-GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/documentapi/src/tests/messagebus/messagebus_test.cpp b/documentapi/src/tests/messagebus/messagebus_test.cpp
index 3406db966f0..8f60bbc78e4 100644
--- a/documentapi/src/tests/messagebus/messagebus_test.cpp
+++ b/documentapi/src/tests/messagebus/messagebus_test.cpp
@@ -2,12 +2,9 @@
 
 #include <vespa/document/base/testdocrepo.h>
 #include <vespa/document/datatype/documenttype.h>
-#include <vespa/document/fieldvalue/document.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/update/documentupdate.h>
 #include <vespa/documentapi/documentapi.h>
-#include <vespa/documentapi/loadtypes/loadtypeset.h>
-#include <vespa/vdslib/state/clusterstate.h>
 #include <vespa/vespalib/testkit/testapp.h>
 
 using document::DocumentTypeRepo;
@@ -66,8 +63,7 @@ void Test::testMessage() {
     EXPECT_TRUE(upd1.getType() == DocumentProtocol::MESSAGE_UPDATEDOCUMENT);
     EXPECT_TRUE(upd1.getProtocol() == "document");
 
-    LoadTypeSet set;
-    DocumentProtocol protocol(set, _repo);
+    DocumentProtocol protocol(_repo);
 
     Blob blob = protocol.encode(vespalib::Version(6,221), upd1);
     EXPECT_TRUE(blob.size() > 0);
@@ -89,8 +85,7 @@ void Test::testMessage() {
 }
 
 void Test::testProtocol() {
-    LoadTypeSet set;
-    DocumentProtocol protocol(set, _repo);
+    DocumentProtocol protocol(_repo);
     EXPECT_TRUE(protocol.getName() == "document");
 
     IRoutingPolicy::UP policy = protocol.createPolicy(string("DocumentRouteSelector"), string("file:documentrouteselectorpolicy.cfg"));
diff --git a/documentapi/src/tests/messages/testbase.cpp b/documentapi/src/tests/messages/testbase.cpp
index 18902cb39a7..967c9990800 100644
--- a/documentapi/src/tests/messages/testbase.cpp
+++ b/documentapi/src/tests/messages/testbase.cpp
@@ -19,11 +19,9 @@ TestBase::TestBase() :
     _repo(new DocumentTypeRepo(readDocumenttypesConfig(
             TEST_PATH("../../../test/cfg/testdoctypes.cfg")))),
     _dataPath(TEST_PATH("../../../test/crosslanguagefiles")),
-    _loadTypes(),
-    _protocol(_loadTypes, _repo),
+    _protocol(_repo),
     _tests()
 {
-    _loadTypes.addLoadType(34, "foo", Priority::PRI_NORMAL_2);
 }
 
 int
diff --git a/documentapi/src/tests/messages/testbase.h b/documentapi/src/tests/messages/testbase.h
index e87f9104189..89398552f63 100644
--- a/documentapi/src/tests/messages/testbase.h
+++ b/documentapi/src/tests/messages/testbase.h
@@ -2,10 +2,10 @@
 #pragma once
 
 #include <vespa/documentapi/messagebus/documentprotocol.h>
-#include <vespa/documentapi/loadtypes/loadtypeset.h>
 #include <vespa/messagebus/routable.h>
 #include <vespa/vespalib/component/version.h>
 #include <vespa/vespalib/testkit/testapp.h>
+#include <map>
 
 using namespace documentapi;
 
@@ -24,8 +24,7 @@ typedef bool (TestBase::*TEST_METHOD_PT)();
 class TestBase : public vespalib::TestApp {
     std::shared_ptr<const document::DocumentTypeRepo> _repo;
 protected:
-    const string                  _dataPath;
-    LoadTypeSet                        _loadTypes;
+    const string                       _dataPath;
     DocumentProtocol                   _protocol;
     std::map<uint32_t, TEST_METHOD_PT> _tests;
 
diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp
index a4eaf54c1dc..0c659f589d6 100644
--- a/documentapi/src/tests/policies/policies_test.cpp
+++ b/documentapi/src/tests/policies/policies_test.cpp
@@ -45,7 +45,6 @@ using namespace std::chrono_literals;
 
 class Test : public vespalib::TestApp {
 private:
-    LoadTypeSet          _loadTypes;
     std::shared_ptr<const DocumentTypeRepo> _repo;
     const DataType      *_docType;
 
@@ -140,7 +139,7 @@ Test::Main() {
 void
 Test::testProtocol()
 {
-    mbus::IProtocol::SP protocol(new DocumentProtocol(_loadTypes, _repo));
+    mbus::IProtocol::SP protocol(new DocumentProtocol(_repo));
 
     mbus::IRoutingPolicy::UP policy = protocol->createPolicy("AND", "");
     ASSERT_TRUE(dynamic_cast<ANDPolicy*>(policy.get()) != nullptr);
@@ -220,7 +219,7 @@ Test::requireThatExternPolicySelectsFromExternSlobrok()
     for (uint32_t i = 0; i < 10; ++i) {
         mbus::TestServer *server = new mbus::TestServer(
                 mbus::Identity(make_string("docproc/cluster.default/%d", i)), mbus::RoutingSpec(), slobrok,
-                mbus::IProtocol::SP(new DocumentProtocol(_loadTypes, _repo)));
+                mbus::IProtocol::SP(new DocumentProtocol(_repo)));
         servers.push_back(server);
         server->net.registerSession("chain.default");
     }
@@ -247,7 +246,7 @@ Test::requireThatExternPolicyMergesOneReplyAsProtocol()
     frame.setMessage(newPutDocumentMessage("id:ns:testdoc::"));
     mbus::Slobrok slobrok;
     mbus::TestServer server(mbus::Identity("docproc/cluster.default/0"), mbus::RoutingSpec(), slobrok,
-                            mbus::IProtocol::SP(new DocumentProtocol(_loadTypes, _repo)));
+                            mbus::IProtocol::SP(new DocumentProtocol(_repo)));
     server.net.registerSession("chain.default");
     setupExternPolicy(frame, slobrok, "docproc/cluster.default/0/chain.default", 1);
     EXPECT_TRUE(frame.testMergeOneReply(server.net.getConnectionSpec() + "/chain.default"));
@@ -310,7 +309,7 @@ Test::testExternSend()
     // Setup local source node.
     mbus::Slobrok local;
     mbus::TestServer src(mbus::Identity("src"), mbus::RoutingSpec(), local,
-                         std::make_shared<DocumentProtocol>(_loadTypes, _repo));
+                         std::make_shared<DocumentProtocol>(_repo));
     mbus::Receptor sr;
     mbus::SourceSession::UP ss = src.mb.createSourceSession(sr, mbus::SourceSessionParams().setTimeout(60s));
 
@@ -319,12 +318,12 @@ Test::testExternSend()
                          .addTable(mbus::RoutingTableSpec(DocumentProtocol::NAME)
                                    .addRoute(mbus::RouteSpec("default").addHop("dst"))
                                    .addHop(mbus::HopSpec("dst", "dst/session"))),
-                         slobrok, std::make_shared<DocumentProtocol>(_loadTypes, _repo));
+                         slobrok, std::make_shared<DocumentProtocol>(_repo));
     mbus::Receptor ir;
     mbus::IntermediateSession::UP is = itr.mb.createIntermediateSession("session", true, ir, ir);
 
     mbus::TestServer dst(mbus::Identity("dst"), mbus::RoutingSpec(), slobrok,
-                         std::make_shared<DocumentProtocol>(_loadTypes, _repo));
+                         std::make_shared<DocumentProtocol>(_repo));
     mbus::Receptor dr;
     mbus::DestinationSession::UP ds = dst.mb.createDestinationSession("session", true, dr);
 
@@ -351,7 +350,7 @@ Test::testExternMultipleSlobroks()
 {
     mbus::Slobrok local;
     mbus::TestServer src(mbus::Identity("src"), mbus::RoutingSpec(), local,
-                         std::make_shared<DocumentProtocol>(_loadTypes, _repo));
+                         std::make_shared<DocumentProtocol>(_repo));
     mbus::Receptor sr;
     mbus::SourceSession::UP ss = src.mb.createSourceSession(sr, mbus::SourceSessionParams().setTimeout(60s));
 
@@ -362,7 +361,7 @@ Test::testExternMultipleSlobroks()
         spec.append(vespalib::make_string("tcp/localhost:%d", ext.port()));
 
         mbus::TestServer dst(mbus::Identity("dst"), mbus::RoutingSpec(), ext,
-                             std::make_shared<DocumentProtocol>(_loadTypes, _repo));
+                             std::make_shared<DocumentProtocol>(_repo));
         mbus::DestinationSession::UP ds = dst.mb.createDestinationSession("session", true, dr);
 
         mbus::Message::UP msg = std::make_unique<GetDocumentMessage>(DocumentId("id:ns:testdoc::"));
@@ -378,7 +377,7 @@ Test::testExternMultipleSlobroks()
         spec.append(vespalib::make_string(",tcp/localhost:%d", ext.port()));
 
         mbus::TestServer dst(mbus::Identity("dst"), mbus::RoutingSpec(), ext,
-                             std::make_shared<DocumentProtocol>(_loadTypes, _repo));
+                             std::make_shared<DocumentProtocol>(_repo));
         mbus::DestinationSession::UP ds = dst.mb.createDestinationSession("session", true, dr);
 
         mbus::Message::UP msg = std::make_unique<GetDocumentMessage>(DocumentId("id:ns:testdoc::"));
@@ -592,12 +591,12 @@ Test::testDocumentRouteSelector()
         "route[0].selector \"foo bar\"\n"
         "route[0].feed \"baz\"\n";
     {
-        DocumentProtocol protocol(_loadTypes, _repo, okConfig);
+        DocumentProtocol protocol(_repo, okConfig);
         EXPECT_TRUE(dynamic_cast<DocumentRouteSelectorPolicy*>(protocol.createPolicy("DocumentRouteSelector", "").get()) != nullptr);
         EXPECT_TRUE(dynamic_cast<ErrorPolicy*>(protocol.createPolicy("DocumentRouteSelector", errConfig).get()) != nullptr);
     }
     {
-        DocumentProtocol protocol(_loadTypes, _repo, errConfig);
+        DocumentProtocol protocol(_repo, errConfig);
         EXPECT_TRUE(dynamic_cast<ErrorPolicy*>(protocol.createPolicy("DocumentRouteSelector", "").get()) != nullptr);
         EXPECT_TRUE(dynamic_cast<DocumentRouteSelectorPolicy*>(protocol.createPolicy("DocumentRouteSelector", okConfig).get()) != nullptr);
     }
@@ -802,7 +801,7 @@ Test::requireThatStoragePolicyIsRandomWithoutState()
         mbus::TestServer *srv = new mbus::TestServer(
                 mbus::Identity(vespalib::make_string("storage/cluster.mycluster/distributor/%d", i)),
                 mbus::RoutingSpec(), slobrok,
-                mbus::IProtocol::SP(new DocumentProtocol(_loadTypes, _repo)));
+                mbus::IProtocol::SP(new DocumentProtocol(_repo)));
         servers.push_back(srv);
         srv->net.registerSession("default");
     }
@@ -857,7 +856,7 @@ Test::requireThatStoragePolicyIsTargetedWithState()
         mbus::TestServer *srv = new mbus::TestServer(
                 mbus::Identity(vespalib::make_string("storage/cluster.mycluster/distributor/%d", i)),
                 mbus::RoutingSpec(), slobrok,
-                make_shared<DocumentProtocol>(_loadTypes, _repo));
+                make_shared<DocumentProtocol>(_repo));
         servers.push_back(srv);
         srv->net.registerSession("default");
     }
@@ -897,7 +896,7 @@ Test::requireThatStoragePolicyCombinesSystemAndSlobrokState()
     mbus::Slobrok slobrok;
     mbus::TestServer server(mbus::Identity("storage/cluster.mycluster/distributor/0"),
                             mbus::RoutingSpec(), slobrok,
-                            make_shared<DocumentProtocol>(_loadTypes, _repo));
+                            make_shared<DocumentProtocol>(_repo));
     server.net.registerSession("default");
 
     string param = vespalib::make_string(
@@ -1053,7 +1052,7 @@ Test::trySelect(TestFrame &frame, uint32_t numSelects, const std::vector<string>
 bool
 Test::isErrorPolicy(const string &name, const string &param)
 {
-    DocumentProtocol protocol(_loadTypes, _repo);
+    DocumentProtocol protocol(_repo);
     mbus::IRoutingPolicy::UP policy = protocol.createPolicy(name, param);
 
     return policy && dynamic_cast<ErrorPolicy*>(policy.get()) != nullptr;
diff --git a/documentapi/src/tests/policies/testframe.cpp b/documentapi/src/tests/policies/testframe.cpp
index 585885b7c4b..16ee97ce7f4 100644
--- a/documentapi/src/tests/policies/testframe.cpp
+++ b/documentapi/src/tests/policies/testframe.cpp
@@ -60,9 +60,8 @@ public:
 TestFrame::TestFrame(const std::shared_ptr<const DocumentTypeRepo> &repo, const string &ident) :
     _identity(ident),
     _slobrok(std::make_shared<mbus::Slobrok>()),
-    _set(),
     _net(std::make_shared<MyNetwork>(mbus::RPCNetworkParams(_slobrok->config()).setIdentity(mbus::Identity(ident)))),
-    _mbus(std::make_shared<mbus::MessageBus>(*_net, mbus::MessageBusParams().addProtocol(std::make_shared<DocumentProtocol>(_set, repo)))),
+    _mbus(std::make_shared<mbus::MessageBus>(*_net, mbus::MessageBusParams().addProtocol(std::make_shared<DocumentProtocol>(repo)))),
     _msg(),
     _hop(mbus::HopSpec("foo", "bar")),
     _handler()
diff --git a/documentapi/src/tests/policies/testframe.h b/documentapi/src/tests/policies/testframe.h
index d85cde129c0..41f953922f9 100644
--- a/documentapi/src/tests/policies/testframe.h
+++ b/documentapi/src/tests/policies/testframe.h
@@ -7,7 +7,6 @@
 #include <vespa/messagebus/network/inetwork.h>
 #include <vespa/messagebus/testlib/receptor.h>
 #include <vespa/messagebus/testlib/slobrok.h>
-#include <vespa/documentapi/loadtypes/loadtypeset.h>
 
 using documentapi::string;
 
@@ -15,7 +14,6 @@ class TestFrame : public mbus::IReplyHandler {
 private:
     string                            _identity;
     std::shared_ptr<mbus::Slobrok>    _slobrok;
-    documentapi::LoadTypeSet          _set;
     std::shared_ptr<mbus::INetwork>   _net;
     std::shared_ptr<mbus::MessageBus> _mbus;
     mbus::Message::UP                 _msg;
diff --git a/documentapi/src/tests/policyfactory/policyfactory.cpp b/documentapi/src/tests/policyfactory/policyfactory.cpp
index 729818c5c4a..8c38e93e659 100644
--- a/documentapi/src/tests/policyfactory/policyfactory.cpp
+++ b/documentapi/src/tests/policyfactory/policyfactory.cpp
@@ -2,7 +2,6 @@
 #include <vespa/documentapi/messagebus/iroutingpolicyfactory.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/documentapi/messagebus/documentprotocol.h>
-#include <vespa/documentapi/loadtypes/loadtypeset.h>
 #include <vespa/documentapi/messagebus/messages/removedocumentmessage.h>
 #include <vespa/messagebus/testlib/receptor.h>
 #include <vespa/messagebus/testlib/slobrok.h>
@@ -82,9 +81,8 @@ Test::Main()
 
     std::shared_ptr<const DocumentTypeRepo> repo(new DocumentTypeRepo);
     mbus::Slobrok slobrok;
-    LoadTypeSet loadTypes;
     mbus::TestServer
-        srv(mbus::MessageBusParams().addProtocol(std::make_shared<DocumentProtocol>(loadTypes, repo)),
+        srv(mbus::MessageBusParams().addProtocol(std::make_shared<DocumentProtocol>(repo)),
             mbus::RPCNetworkParams(slobrok.config()));
     mbus::Receptor handler;
     mbus::SourceSession::UP src = srv.mb.createSourceSession(mbus::SourceSessionParams().setReplyHandler(handler));
diff --git a/documentapi/src/tests/routablefactory/routablefactory.cpp b/documentapi/src/tests/routablefactory/routablefactory.cpp
index 32a36ef0b59..92e982b2be4 100644
--- a/documentapi/src/tests/routablefactory/routablefactory.cpp
+++ b/documentapi/src/tests/routablefactory/routablefactory.cpp
@@ -6,7 +6,6 @@
 #include <vespa/messagebus/testlib/slobrok.h>
 #include <vespa/messagebus/testlib/testserver.h>
 #include <vespa/vespalib/testkit/testapp.h>
-#include <vespa/documentapi/loadtypes/loadtypeset.h>
 
 using document::DocumentTypeRepo;
 using namespace documentapi;
@@ -87,7 +86,6 @@ class TestData {
 
 public:
     mbus::Slobrok                _slobrok;
-    LoadTypeSet                  _loadTypes;
     DocumentProtocol::SP         _srcProtocol;
     mbus::TestServer             _srcServer;
     mbus::SourceSession::UP      _srcSession;
@@ -116,13 +114,12 @@ TEST_APPHOOK(Test);
 TestData::TestData() :
     _repo(std::make_shared<DocumentTypeRepo>()),
     _slobrok(),
-    _loadTypes(),
-    _srcProtocol(std::make_shared<DocumentProtocol>(_loadTypes, _repo)),
+    _srcProtocol(std::make_shared<DocumentProtocol>(_repo)),
     _srcServer(mbus::MessageBusParams().addProtocol(_srcProtocol),
                mbus::RPCNetworkParams(_slobrok.config())),
     _srcSession(),
     _srcHandler(),
-    _dstProtocol(std::make_shared<DocumentProtocol>(_loadTypes, _repo)),
+    _dstProtocol(std::make_shared<DocumentProtocol>(_repo)),
     _dstServer(mbus::MessageBusParams().addProtocol(_dstProtocol),
                mbus::RPCNetworkParams(_slobrok.config()).setIdentity(mbus::Identity("dst"))),
     _dstSession(),