summaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/searchdefinition
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-11-05 17:30:39 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2021-11-05 20:37:49 +0100
commitf8494afee15a5d9eb58c06ffbc63cec74f81b31c (patch)
tree0374ed0afb0184858fa99cff38f31c1fb33dbec2 /config-model/src/main/java/com/yahoo/searchdefinition
parent89d3340928b4d1014aebb3cc8919614fe3b3cf25 (diff)
Just fetch file references directly from fileregistry as there is no need to assiciate them with services.
Diffstat (limited to 'config-model/src/main/java/com/yahoo/searchdefinition')
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java8
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/LargeRankExpressions.java6
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/OnnxModels.java7
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/RankingConstants.java6
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/Schema.java7
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java8
6 files changed, 0 insertions, 42 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 77133d9b03d..245288c283e 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java
@@ -4,11 +4,8 @@ package com.yahoo.searchdefinition;
import com.yahoo.config.FileReference;
import com.yahoo.config.application.api.FileRegistry;
import com.yahoo.path.Path;
-import com.yahoo.vespa.model.AbstractService;
-import com.yahoo.vespa.model.utils.FileSender;
import java.nio.ByteBuffer;
-import java.util.Collection;
import java.util.Objects;
public class DistributableResource {
@@ -57,11 +54,6 @@ public class DistributableResource {
this.pathType = PathType.URI;
}
- /** Initiate sending of this constant to some services over file distribution */
- public void sendTo(Collection<? extends AbstractService> services) {
- FileSender.send(fileReference, services);
- }
-
public String getName() { return name; }
public String getFileName() { return path; }
public Path getFilePath() { return Path.fromString(path); }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/LargeRankExpressions.java b/config-model/src/main/java/com/yahoo/searchdefinition/LargeRankExpressions.java
index c33400fdcc1..3fdea71da2c 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/LargeRankExpressions.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/LargeRankExpressions.java
@@ -2,9 +2,7 @@
package com.yahoo.searchdefinition;
import com.yahoo.config.application.api.FileRegistry;
-import com.yahoo.vespa.model.AbstractService;
-import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -37,8 +35,4 @@ public class LargeRankExpressions {
return Collections.unmodifiableMap(expressions);
}
- /** Initiate sending of these constants to some services over file distribution */
- public void sendTo(Collection<? extends AbstractService> services) {
- expressions.values().forEach(constant -> constant.sendTo(services));
- }
}
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/OnnxModels.java b/config-model/src/main/java/com/yahoo/searchdefinition/OnnxModels.java
index e249fe59f14..c9c12100552 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/OnnxModels.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/OnnxModels.java
@@ -2,9 +2,7 @@
package com.yahoo.searchdefinition;
import com.yahoo.config.application.api.FileRegistry;
-import com.yahoo.vespa.model.AbstractService;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -66,9 +64,4 @@ public class OnnxModels {
return Collections.unmodifiableMap(allModels);
}
- /** Initiate sending of these models to some services over file distribution */
- public void sendTo(Collection<? extends AbstractService> services) {
- asMap().values().forEach(model -> model.sendTo(services));
- }
-
}
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankingConstants.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankingConstants.java
index 1e0eacaea16..5020e9a061c 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/RankingConstants.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankingConstants.java
@@ -2,9 +2,7 @@
package com.yahoo.searchdefinition;
import com.yahoo.config.application.api.FileRegistry;
-import com.yahoo.vespa.model.AbstractService;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -77,8 +75,4 @@ public class RankingConstants {
return Collections.unmodifiableMap(allConstants);
}
- /** Initiate sending of these constants to some services over file distribution */
- public void sendTo(Collection<? extends AbstractService> services) {
- asMap().values().forEach(constant -> constant.sendTo(services));
- }
}
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java b/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java
index 36d4ba9699e..512d908ce5b 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java
@@ -21,7 +21,6 @@ import com.yahoo.searchdefinition.document.TemporaryImportedFields;
import com.yahoo.searchdefinition.document.annotation.SDAnnotationType;
import com.yahoo.vespa.documentmodel.DocumentSummary;
import com.yahoo.vespa.documentmodel.SummaryField;
-import com.yahoo.vespa.model.AbstractService;
import java.io.Reader;
import java.util.ArrayList;
@@ -219,12 +218,6 @@ public class Schema implements ImmutableSchema {
@Override
public OnnxModels onnxModels() { return onnxModels; }
- public void sendTo(Collection<? extends AbstractService> services) {
- rankingConstants.sendTo(services);
- largeRankExpressions.sendTo(services);
- onnxModels.sendTo(services);
- }
-
public Optional<TemporaryImportedFields> temporaryImportedFields() {
return temporaryImportedFields;
}
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java
index faee6d67dbf..3081637c975 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java
@@ -16,10 +16,8 @@ import com.yahoo.searchdefinition.Schema;
import com.yahoo.vespa.config.search.core.OnnxModelsConfig;
import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
import com.yahoo.vespa.config.search.core.RankingExpressionsConfig;
-import com.yahoo.vespa.model.AbstractService;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -144,12 +142,6 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ
return rankProfiles.get(name);
}
- public void sendTo(Collection<? extends AbstractService> services) {
- rankingConstants.sendTo(services);
- largeRankExpressions.sendTo(services);
- onnxModels.sendTo(services);
- }
-
@Override
public String getDerivedName() { return "rank-profiles"; }