Merge pull request #4692 from vespa-engine/bratseth/store-converted-expressions-in-zk

Bratseth/store converted expressions in zk

1 files changed, 8 insertions, 2 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
index acb537debe7..6da2b0f8125 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
@@ -53,7 +53,13 @@ public interface ApplicationPackage {
     String DOCPROCCHAINS_DIR = "docproc/chains";
     String PROCESSORCHAINS_DIR = "processor/chains";
     String ROUTINGTABLES_DIR = "routing/tables";
-    String MODELS_DIR = "models";
+
+    /** Machine-learned models - only present in user-uploaded package instances */
+    Path MODELS_DIR = Path.fromString("models");
+    /** Files generated from machine-learned models */
+    Path MODELS_GENERATED_DIR = Path.fromString("models.generated");
+    /** Files generated from machine-learned models which should be replicated in ZooKeeper */
+    Path MODELS_GENERATED_REPLICATED_DIR = MODELS_GENERATED_DIR.append("replicated");
 
     // NOTE: this directory is created in serverdb during deploy, and should not exist in the original user application
     /** Do not use */
@@ -131,7 +137,7 @@ public interface ApplicationPackage {
      */
     List<NamedReader> getFiles(Path pathFromRoot, String suffix, boolean recurse);
 
-    /** Same as getFiles(pathFromRoot,suffix,false) */
+    /** Same as getFiles(pathFromRoot, suffix, false) */
     default List<NamedReader> getFiles(Path pathFromRoot, String suffix) {
         return getFiles(pathFromRoot,suffix,false);
     }