From 27bcc7e03be01b200654254af59a20566567ca33 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Sun, 10 Oct 2021 11:25:02 +0200 Subject: Guarantee we always have an executor --- container-search/src/main/java/com/yahoo/search/query/Model.java | 3 ++- .../src/main/java/com/yahoo/search/searchchain/Execution.java | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'container-search/src/main/java') diff --git a/container-search/src/main/java/com/yahoo/search/query/Model.java b/container-search/src/main/java/com/yahoo/search/query/Model.java index 2dd4d5c86b1..81efadbba0a 100644 --- a/container-search/src/main/java/com/yahoo/search/query/Model.java +++ b/container-search/src/main/java/com/yahoo/search/query/Model.java @@ -90,7 +90,8 @@ public class Model implements Cloneable { private Set restrict = new LinkedHashSet<>(); private String searchPath; private String documentDbName = null; - private Execution execution = new Execution(new Execution.Context(null, null, null, null, null, null)); + private Execution execution = new Execution(new Execution.Context(null, null, + null, null, null, Runnable::run)); public Model(Query query) { setParent(query); diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java index aaf74cfd355..6c3bb68d976 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java @@ -3,6 +3,7 @@ package com.yahoo.search.searchchain; import com.yahoo.component.chain.Chain; import com.yahoo.language.Linguistics; +import com.yahoo.language.simple.SimpleLinguistics; import com.yahoo.prelude.IndexFacts; import com.yahoo.prelude.Ping; import com.yahoo.prelude.Pong; @@ -17,6 +18,7 @@ import com.yahoo.search.cluster.PingableSearcher; import com.yahoo.search.rendering.RendererRegistry; import com.yahoo.search.statistics.TimeTracker; +import java.util.Objects; import java.util.concurrent.Executor; import java.util.concurrent.Executors; @@ -123,14 +125,14 @@ public class Execution extends com.yahoo.processing.execution.Execution { this.tokenRegistry = tokenRegistry; this.rendererRegistry = rendererRegistry; this.linguistics = linguistics; - this.executor = executor; + this.executor = Objects.requireNonNull(executor, "The executor cannot be null"); } /** @deprecated pass an executor */ @Deprecated // TODO: Remove on Vespa 8 public Context(SearchChainRegistry searchChainRegistry, IndexFacts indexFacts, SpecialTokenRegistry tokenRegistry, RendererRegistry rendererRegistry, Linguistics linguistics) { - this(searchChainRegistry, indexFacts, tokenRegistry, rendererRegistry, linguistics, null); + this(searchChainRegistry, indexFacts, tokenRegistry, rendererRegistry, linguistics, Runnable::run); } /** Creates a context stub with no information. This is for unit testing. */ -- cgit v1.2.3