diff options
author | Harald Musum <musum@yahoo-inc.com> | 2017-04-06 21:02:52 +0200 |
---|---|---|
committer | Harald Musum <musum@yahoo-inc.com> | 2017-04-06 21:02:52 +0200 |
commit | 45313bbb719625790bcf3920b90c8c7147c07494 (patch) | |
tree | 83e3cfd9676e79b4c0654f193b5b5e74ddaada28 | |
parent | 06caa70aa47c8c390b58193c46d504a32b8fabb7 (diff) |
Remove unused apps and fix no longer valid <searchdefinitions> in services.xml
14 files changed, 14 insertions, 298 deletions
diff --git a/config-model/src/test/cfg/application/validation/search_content/hosts.xml b/config-model/src/test/cfg/application/validation/search_content/hosts.xml deleted file mode 100644 index e2b97e374e6..00000000000 --- a/config-model/src/test/cfg/application/validation/search_content/hosts.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<hosts> - <host name="localhost"> - <alias>node1</alias> - </host> -</hosts> diff --git a/config-model/src/test/cfg/application/validation/search_content/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/search_content/searchdefinitions/simple.sd deleted file mode 100644 index 3647689de10..00000000000 --- a/config-model/src/test/cfg/application/validation/search_content/searchdefinitions/simple.sd +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -search simple { - document simple { - field foo type raw { } - field bar type raw { indexing: summary } - } -} diff --git a/config-model/src/test/cfg/application/validation/search_content/services.xml b/config-model/src/test/cfg/application/validation/search_content/services.xml deleted file mode 100644 index c415b2aad4c..00000000000 --- a/config-model/src/test/cfg/application/validation/search_content/services.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<services> - <admin version="2.0"> - <adminserver hostalias="node1" /> - <logserver hostalias="node1" /> - </admin> - <search version="2.0"> - <qrservers> - <qrserver hostalias="node1" /> - </qrservers> - <cluster indexingmode="realtime"> - <searchdefinitions> - <searchdefinition name="simple" /> - </searchdefinitions> - <clustercontrollers> - <clustercontroller hostalias="node1" /> - </clustercontrollers> - <topleveldispatchers> - <topleveldispatcher hostalias="node1" /> - </topleveldispatchers> - <row index="0"> - <searchnodes> - <searchnode hostalias="node1" index="0" /> - </searchnodes> - </row> - </cluster> - </search> -</services> diff --git a/config-model/src/test/cfg/search/data/nextgen-simple-v2/searchdefinitions/nextgendoc.sd b/config-model/src/test/cfg/search/data/nextgen-simple-v2/searchdefinitions/nextgendoc.sd deleted file mode 100644 index 461e7123c01..00000000000 --- a/config-model/src/test/cfg/search/data/nextgen-simple-v2/searchdefinitions/nextgendoc.sd +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -search nextgendoc { - document nextgendoc { - field body type string { - indexing: summary | index - } - } -} diff --git a/config-model/src/test/cfg/search/data/nextgen-simple-v2/services.xml b/config-model/src/test/cfg/search/data/nextgen-simple-v2/services.xml deleted file mode 100644 index cce1cf40419..00000000000 --- a/config-model/src/test/cfg/search/data/nextgen-simple-v2/services.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<services version="1.0"> - - <admin version="2.0"> - - <adminserver hostalias="node1" /> - - <logserver hostalias="node1" /> - <slobroks> - <slobrok hostalias="node1" /> - </slobroks> - </admin> - - <search version="2.0"> - <qrservers> - <qrserver hostalias="node1" /> - </qrservers> - <cluster name="search" indexingmode="realtime"> - <searchdefinitions> - <searchdefinition name="nextgendoc" /> - </searchdefinitions> - <clustercontrollers> - <clustercontroller hostalias="node1" /> - </clustercontrollers> - <topleveldispatchers> - <topleveldispatcher hostalias="node1" /> - </topleveldispatchers> - <row index="0"> - <searchnodes> - <searchnode hostalias="node1" index="0" /> - </searchnodes> - </row> - </cluster> - </search> - -</services> diff --git a/config-model/src/test/cfg/search/data/onlybundles/components/testbundle.jar b/config-model/src/test/cfg/search/data/onlybundles/components/testbundle.jar Binary files differdeleted file mode 100644 index 69f6e335092..00000000000 --- a/config-model/src/test/cfg/search/data/onlybundles/components/testbundle.jar +++ /dev/null diff --git a/config-model/src/test/cfg/search/data/onlybundles/services.xml b/config-model/src/test/cfg/search/data/onlybundles/services.xml deleted file mode 100644 index 427b0c6d23f..00000000000 --- a/config-model/src/test/cfg/search/data/onlybundles/services.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<services> - <admin version="2.0"> - <adminserver hostalias="node1"/> - <logserver hostalias="node1"/> - </admin> - - <search version="2.0"> - <qrservers> - <qrserver hostalias="node1" /> - </qrservers> - <cluster name="music" indexingmode="realtime"> - <visibilitydelay>15.7</visibilitydelay> - <searchdefinitions> - <searchdefinition name="music2" /> - </searchdefinitions> - <documents selection="music" /> - <clustercontrollers> - <clustercontroller hostalias="node1" /> - </clustercontrollers> - <topleveldispatchers> - <topleveldispatcher hostalias="node1" /> - </topleveldispatchers> - <row index="0"> - <searchnodes> - <searchnode hostalias="node1" index="0" /> - </searchnodes> - </row> - </cluster> - - </search> - -</services> diff --git a/config-model/src/test/cfg/search/data/v2/onlybundles/components/testbundle.jar b/config-model/src/test/cfg/search/data/v2/onlybundles/components/testbundle.jar Binary files differdeleted file mode 100644 index 69f6e335092..00000000000 --- a/config-model/src/test/cfg/search/data/v2/onlybundles/components/testbundle.jar +++ /dev/null diff --git a/config-model/src/test/cfg/search/data/v2/onlybundles/services.xml b/config-model/src/test/cfg/search/data/v2/onlybundles/services.xml deleted file mode 100644 index 7d5048ba9a2..00000000000 --- a/config-model/src/test/cfg/search/data/v2/onlybundles/services.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<services> - <admin version="2.0"> - <adminserver hostalias="node1"/> - <logserver hostalias="node1"/> - </admin> - - <search version="2.0"> - <qrservers> - <qrserver hostalias="node1"/> - </qrservers> - <cluster name="music"> - <visibilitydelay>15.7</visibilitydelay> - <searchdefinitions> - <searchdefinition name="music2"/> - </searchdefinitions> - <documents selection="music"/> - <clustercontrollers> - <clustercontroller hostalias="node1"/> - </clustercontrollers> - <topleveldispatchers> - <topleveldispatcher hostalias="node1"/> - </topleveldispatchers> - <row index="0"> - <searchnodes> - <searchnode hostalias="node1" index="0"/> - </searchnodes> - </row> - </cluster> - - </search> - -</services> diff --git a/config-model/src/test/cfg/search/data/v2/twoFeedTargetClusters/hosts.xml b/config-model/src/test/cfg/search/data/v2/twoFeedTargetClusters/hosts.xml deleted file mode 100644 index 9215f81ad98..00000000000 --- a/config-model/src/test/cfg/search/data/v2/twoFeedTargetClusters/hosts.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<hosts> - <host name="zarya"> - <alias>node1</alias> - </host> -</hosts> diff --git a/config-model/src/test/cfg/search/data/v2/twoFeedTargetClusters/searchdefinitions/music.sd b/config-model/src/test/cfg/search/data/v2/twoFeedTargetClusters/searchdefinitions/music.sd deleted file mode 100755 index 392e19213b1..00000000000 --- a/config-model/src/test/cfg/search/data/v2/twoFeedTargetClusters/searchdefinitions/music.sd +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -search music { - document music { - field f1 type string { - indexing: summary | index - # index-to: f1, all - } - field f2 type string { - indexing: summary | index - # index-to: f2, all - } - } -} diff --git a/config-model/src/test/cfg/search/data/v2/twoFeedTargetClusters/services.xml b/config-model/src/test/cfg/search/data/v2/twoFeedTargetClusters/services.xml deleted file mode 100644 index 8c78597b5b5..00000000000 --- a/config-model/src/test/cfg/search/data/v2/twoFeedTargetClusters/services.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<services> - <admin version="2.0"> - <adminserver hostalias="node1"/> - <logserver hostalias="node1"/> - </admin> - <search version="2.0"> - <qrservers> - <qrserver hostalias="node1"/> - </qrservers> - <cluster name="music1"> - <searchdefinitions> - <searchdefinition name="music"/> - </searchdefinitions> - <!-- The point with this test is to have a 'documents' tag without a 'feedname' attribute --> - <documents selection="music.f1"/> - <clustercontrollers> - <clustercontroller hostalias="node1"/> - </clustercontrollers> - <topleveldispatchers> - <topleveldispatcher hostalias="node1"/> - </topleveldispatchers> - <row index="0"> - <searchnodes> - <searchnode hostalias="node1" index="0"/> - </searchnodes> - </row> - </cluster> - - <cluster name="music2"> - <searchdefinitions> - <searchdefinition name="music"/> - </searchdefinitions> - <!-- The point with this test is to have a 'documents' tag without a 'feedname' attribute --> - <documents selection="music.f2"/> - <clustercontrollers> - <clustercontroller hostalias="node1"/> - </clustercontrollers> - <topleveldispatchers> - <topleveldispatcher hostalias="node1"/> - </topleveldispatchers> - <row index="0"> - <searchnodes> - <searchnode hostalias="node1" index="0"/> - </searchnodes> - </row> - <row index="1"> - <searchnodes> - <searchnode hostalias="node1" index="0"/> - </searchnodes> - </row> - </cluster> - </search> -</services> diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java index f62cbbd0963..7426db0001b 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java @@ -50,31 +50,6 @@ public class SearchClusterTest { @Test public void testSdConfigLogical() throws IOException, SAXException { - String services = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + - "<services version=\"1.0\">" + - " <admin version='2.0'>" + - " <adminserver hostalias='node0' />" + - " </admin>" + - " <search version=\"2.0\">" + - " <qrservers>" + - " <qrserver hostalias=\"node0\" />" + - " </qrservers>" + - " <cluster name=\"s1\" indexingmode=\"realtime\">" + - " <searchdefinitions>" + - " <searchdefinition name=\"s1\" />" + - " <searchdefinition name=\"s2\" />" + - " </searchdefinitions>" + - " <documents selection=\"music\" feedname=\"a\" />" + - " <row index=\"0\">" + - " <searchnodes>" + - " <searchnode hostalias=\"node2\" index=\"0\" />" + - " </searchnodes>" + - " </row>" + - " </cluster>" + - " </search>" + - "</services>"; - ApplicationPackage app = new VespaModelCreatorWithMockPkg(vespaHosts, services).appPkg; - // sd1 SDDocumentType sdt1=new SDDocumentType("s1"); Search search1 = new Search("s1", null); diff --git a/configserver/src/test/apps/zkapp/services.xml b/configserver/src/test/apps/zkapp/services.xml index aee18cc450a..778b63ce29f 100644 --- a/configserver/src/test/apps/zkapp/services.xml +++ b/configserver/src/test/apps/zkapp/services.xml @@ -10,51 +10,23 @@ </slobroks> </admin> - <clients version="2.0"> - <gateways protocols="http"> - <gateway hostalias="node1" /> - </gateways> - </clients> + <jdisc version="1.0"> + <documentapi/> + <search/> + <nodes> + <node hostalias="node1"/> + </nodes> + </jdisc> - <search version="2.0"> - <qrservers> - <qrserver hostalias="node1" /> - </qrservers> - <cluster name="music" indexingmode="realtime"> - <searchdefinitions> - <searchdefinition name="music" /> - </searchdefinitions> - <clustercontrollers> - <clustercontroller hostalias="node1" /> - </clustercontrollers> - <topleveldispatchers> - <topleveldispatcher hostalias="node1" /> - </topleveldispatchers> - <row index="0"> - <searchnodes> - <searchnode hostalias="node1" index="0" /> - </searchnodes> - </row> - </cluster> - </search> + <content version="1.0"> + <redundancy>1"</redundancy> + <documents> + <document name="music" mode="index"/> + </documents> - <storage version="3.0"> - <cluster redundancy="1"> -<!-- -Do not reshuffle nodes or change index values - this will cause -massive document redistribution. - -If you want to discontinue use of a node, set it in the 'retired' state, -this will rebalance the documents out of the node. Once node is empty, -you can stop it and delete the reference to it in vespa-services and -vespa-hosts files. ---> - <group index="0" name="mycluster"> + <group index="0" name="mycluster"> <node hostalias="node1" index="0"/> </group> - - <fleetcontroller hostalias="node1" /> - </cluster> - </storage> + </content> </services> |