Merge pull request #18857 from vespa-engine/balder/debug-1

Balder/debug 1

3 files changed, 14 insertions, 15 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java b/config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java
index e31d90c2800..7fd36b0d142 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java
@@ -38,6 +38,7 @@ public class DistributableResource {
         Objects.requireNonNull(blob, "Blob cannot be null");
         this.name = name;
         this.blob = blob;
+        path = name;
         pathType = PathType.BLOB;
     }
 
@@ -87,7 +88,7 @@ public class DistributableResource {
                 fileReference = fileRegistry.addUri(path);
                 break;
             case BLOB:
-                fileReference = fileRegistry.addBlob(blob);
+                fileReference = fileRegistry.addBlob(path, blob);
                 break;
             default:
                 throw new IllegalArgumentException("Unknown path type " + pathType);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
index 3a88779a979..87d3753ca2e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
@@ -37,6 +37,7 @@ import java.nio.file.Paths;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -143,25 +144,22 @@ public class RankSetupValidator extends Validator {
         writeConfig(dir, ImportedFieldsConfig.getDefName() + ".cfg", ifcb.build());
     }
 
-    private void writeExtraVerifyRanksetupConfig(String dir, DocumentDatabase db) throws IOException {
-        List<String> config = new ArrayList<>();
-
-        // Assist verify-ranksetup in finding the actual ONNX model files
-        for (OnnxModel model : db.getDerivedConfiguration().getSearch().onnxModels().asMap().values()) {
+    private void writeExtraVerifyRanksetupConfig(List<String> config, Collection<? extends DistributableResource> resources) {
+        for (DistributableResource model : resources) {
             String modelPath = getFileRepositoryPath(model.getFilePath().getName(), model.getFileReference());
             int index = config.size() / 2;
             config.add(String.format("file[%d].ref \"%s\"", index, model.getFileReference()));
             config.add(String.format("file[%d].path \"%s\"", index, modelPath));
+            log.log(Level.FINE, index + ": " + model.getPathType() + " -> " + model.getName() + " -> " + modelPath + " -> " + model.getFileReference());
         }
+    }
 
-        for (RankExpressionBody expr : db.getDerivedConfiguration().getSearch().rankExpressionFiles().asMap().values()) {
-            int index = config.size() / 2;
-            String modelPath = (expr.getPathType() == DistributableResource.PathType.BLOB)
-                    ? getFileRepositoryPath(expr.getName(), expr.getFileReference())
-                    : getFileRepositoryPath(expr.getFilePath().getName(), expr.getFileReference());
-            config.add(String.format("file[%d].ref \"%s\"", index, expr.getFileReference()));
-            config.add(String.format("file[%d].path \"%s\"", index, modelPath));
-        }
+    private void writeExtraVerifyRanksetupConfig(String dir, DocumentDatabase db) throws IOException {
+        List<String> config = new ArrayList<>();
+
+        // Assist verify-ranksetup in finding the actual ONNX model files
+        writeExtraVerifyRanksetupConfig(config, db.getDerivedConfiguration().getSearch().onnxModels().asMap().values());
+        writeExtraVerifyRanksetupConfig(config, db.getDerivedConfiguration().getSearch().rankExpressionFiles().asMap().values());
 
         String configContent = config.isEmpty() ? "" : StringUtilities.implodeMultiline(config);
         IOUtils.writeFile(dir + "verify-ranksetup.cfg", configContent, false);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java
index 2133a9ba899..777217b03fa 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java
@@ -53,7 +53,7 @@ public class FileSenderTest {
         }
 
         @Override
-        public FileReference addBlob(ByteBuffer blob) {
+        public FileReference addBlob(String name, ByteBuffer blob) {
             return null;
         }