diff options
author | Arnstein Ressem <aressem@gmail.com> | 2021-06-04 22:11:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-04 22:11:01 +0200 |
commit | 068e90e7628e253e5a187f2e44fb06efe990f111 (patch) | |
tree | 571b22a158af02af83880f6295a4b12f8b1a386e /configserver | |
parent | fdf2daaaf6c882bbec77156aeab0b8099ef84ffd (diff) |
Revert "Searchdefinition/schemas cleanup"
Diffstat (limited to 'configserver')
3 files changed, 11 insertions, 7 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java index 42f4dbd5762..ca7489012e2 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java @@ -80,7 +80,7 @@ public class ZooKeeperClient { try { writeUserDefs(app); writeSomeOf(app); - writeSchemas(app); + writeSearchDefinitions(app); writeUserIncludeDirs(app, app.getUserIncludeDirs()); write(app.getMetaData()); } catch (Exception e) { @@ -90,8 +90,8 @@ public class ZooKeeperClient { } } - private void writeSchemas(ApplicationPackage app) throws IOException { - Collection<NamedReader> sds = app.getSchemas(); + private void writeSearchDefinitions(ApplicationPackage app) throws IOException { + Collection<NamedReader> sds = app.getSearchDefinitions(); if (sds.isEmpty()) return; Path zkPath = getZooKeeperAppPath(USERAPP_ZK_SUBPATH).append(SCHEMAS_DIR); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java index 9f1bfa0b4e4..48c47587c8b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java @@ -132,13 +132,13 @@ public class ZKApplicationPackage implements ApplicationPackage { } @Override - public List<NamedReader> getSchemas() { + public List<NamedReader> searchDefinitionContents() { List<NamedReader> schemas = new ArrayList<>(); for (String sd : zkApplication.getChildren(ConfigCurator.USERAPP_ZK_SUBPATH + "/" + SCHEMAS_DIR)) { if (sd.endsWith(SD_NAME_SUFFIX)) schemas.add(new NamedReader(sd, new StringReader(zkApplication.getData(ConfigCurator.USERAPP_ZK_SUBPATH + "/" + SCHEMAS_DIR, sd)))); } - // TODO: Remove when 7.414.19 is oldest version in use + // TODO: Remove when everything is written to SCHEMAS_DIR (July 2021) for (String sd : zkApplication.getChildren(ConfigCurator.USERAPP_ZK_SUBPATH + "/" + SEARCH_DEFINITIONS_DIR)) { if (sd.endsWith(SD_NAME_SUFFIX)) schemas.add(new NamedReader(sd, new StringReader(zkApplication.getData(ConfigCurator.USERAPP_ZK_SUBPATH + "/" + SEARCH_DEFINITIONS_DIR, sd)))); @@ -165,6 +165,11 @@ public class ZKApplicationPackage implements ApplicationPackage { return fileRegistry; } + @Override + public List<NamedReader> getSearchDefinitions() { + return searchDefinitionContents(); + } + private Reader retrieveConfigDefReader(String def) { try { return zkApplication.getDataReader(ConfigCurator.DEFCONFIGS_ZK_SUBPATH, def); @@ -258,7 +263,6 @@ public class ZKApplicationPackage implements ApplicationPackage { @Override public Reader getRankingExpression(String name) { Optional<Reader> reader = zkApplication.getOptionalDataReader(ConfigCurator.USERAPP_ZK_SUBPATH + "/" + SCHEMAS_DIR, name); - // TODO: Remove when 7.414.19 is oldest version in use return reader.orElseGet(() -> zkApplication.getDataReader(ConfigCurator.USERAPP_ZK_SUBPATH + "/" + SEARCH_DEFINITIONS_DIR, name)); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java index a71f75f5035..80d01fa4d36 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java @@ -78,7 +78,7 @@ public class ZKApplicationPackageTest { assertTrue(Pattern.compile(".*<slobroks>.*",Pattern.MULTILINE+Pattern.DOTALL).matcher(IOUtils.readAll(zkApp.getFile(Path.fromString("services.xml")).createReader())).matches()); DeployState deployState = new DeployState.Builder().applicationPackage(zkApp).build(); assertEquals(deployState.getSchemas().size(), 5); - assertEquals(zkApp.getSchemas().size(), 5); + assertEquals(zkApp.searchDefinitionContents().size(), 5); assertEquals(IOUtils.readAll(zkApp.getRankingExpression("foo.expression")), "foo()+1\n"); assertEquals(zkApp.getFiles(Path.fromString(""), "xml").size(), 3); assertEquals(zkApp.getFileReference(Path.fromString("components/file.txt")).getAbsolutePath(), "/home/vespa/test/file.txt"); |