diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-05-26 19:54:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-26 19:54:07 +0200 |
commit | 3523d7387ef2ec068a6c4c8bfe9b93031fdfbabd (patch) | |
tree | b751390733fc6be65f9cff10cd6782077557ba61 | |
parent | 7420f19e0180cbb684f1e3459102fe78e7f86372 (diff) | |
parent | 1a68848bec5533ed48a5b61981c2aa227c938846 (diff) |
Merge pull request #17996 from vespa-engine/balder/wire-deploylogger-in-to-search
Wire the deploylogger into serach so that it is available during pars…
21 files changed, 71 insertions, 52 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentOnlySearch.java b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentOnlySearch.java index 5940f908be8..6e17bd0f0bb 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentOnlySearch.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentOnlySearch.java @@ -1,6 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition; +import com.yahoo.config.application.api.ApplicationPackage; +import com.yahoo.config.application.api.DeployLogger; import com.yahoo.searchdefinition.document.SDDocumentType; /** @@ -11,8 +13,8 @@ import com.yahoo.searchdefinition.document.SDDocumentType; */ public class DocumentOnlySearch extends Search { - public DocumentOnlySearch() { - // empty + public DocumentOnlySearch(ApplicationPackage applicationPackage, DeployLogger deployLogger) { + super(applicationPackage, deployLogger); } @Override diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Search.java b/config-model/src/main/java/com/yahoo/searchdefinition/Search.java index a90cc7c9450..b07740620f8 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/Search.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/Search.java @@ -2,6 +2,8 @@ package com.yahoo.searchdefinition; import com.yahoo.config.application.api.ApplicationPackage; +import com.yahoo.config.application.api.DeployLogger; +import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.document.Field; import com.yahoo.searchdefinition.derived.SummaryClass; import com.yahoo.searchdefinition.document.Attribute; @@ -28,6 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.TreeMap; +import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Stream; @@ -43,7 +46,6 @@ import java.util.stream.Stream; // Ensure that after the processing step, all implicit instances of the above types are explicitly represented public class Search implements ImmutableSearch { - private static final Logger log = Logger.getLogger(Search.class.getName()); private static final String SD_DOC_FIELD_NAME = "sddocname"; private static final List<String> RESERVED_NAMES = Arrays.asList( "index", "index_url", "summary", "attribute", "select_input", "host", SummaryClass.DOCUMENT_ID_FIELD, @@ -60,7 +62,7 @@ public class Search implements ImmutableSearch { private String name; /** True if this doesn't define a search, just a document type */ - private boolean documentsOnly = false; + private final boolean documentsOnly; private boolean rawAsBase64 = false; @@ -92,26 +94,33 @@ public class Search implements ImmutableSearch { private Optional<ImportedFields> importedFields = Optional.empty(); private final ApplicationPackage applicationPackage; + private final DeployLogger deployLogger; - /** - * Creates a search definition which just holds a set of documents which should not (here, directly) be searchable - */ - protected Search() { - applicationPackage = null; - documentsOnly = true; + /** Testin only */ + public Search(String name) { + this(name, null, new BaseDeployLogger()); } - /** * Creates a proper search definition * * @param name of the the searchdefinition * @param applicationPackage the application containing this */ - public Search(String name, ApplicationPackage applicationPackage) { - this.applicationPackage = applicationPackage; + public Search(String name, ApplicationPackage applicationPackage, DeployLogger deployLogger) { + this(applicationPackage, deployLogger, false); this.name = name; } + protected Search(ApplicationPackage applicationPackage, DeployLogger deployLogger) { + this(applicationPackage, deployLogger, true); + } + + private Search(ApplicationPackage applicationPackage, DeployLogger deployLogger, boolean documentsOnly) { + this.applicationPackage = applicationPackage; + this.deployLogger = deployLogger; + this.documentsOnly = documentsOnly; + } + protected void setName(String name) { this.name = name; } @@ -323,7 +332,7 @@ public class Search implements ImmutableSearch { */ public void addExtraField(SDField field) { if (fields.containsKey(field.getName())) { - log.warning("Duplicate field " + field.getName() + " in search definition " + getName()); + deployLogger.logApplicationPackage(Level.WARNING, "Duplicate field " + field.getName() + " in search definition " + getName()); } else { field.setIsExtraField(true); fields.put(field.getName(), field); @@ -435,7 +444,7 @@ public class Search implements ImmutableSearch { if (current.getRankType() != null && !consolidated.getRankType().equals(current.getRankType())) { - log.warning("Conflicting rank type settings for " + + deployLogger.logApplicationPackage(Level.WARNING, "Conflicting rank type settings for " + first.getName() + " in " + this + ", using " + consolidated.getRankType()); } diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj index 4823a6400f8..0cc1db5a2d7 100644 --- a/config-model/src/main/javacc/SDParser.jj +++ b/config-model/src/main/javacc/SDParser.jj @@ -425,7 +425,7 @@ Search rootSchema(String dir) : Search search; } { - ( ( <SCHEMA> | <SEARCH> ) name = identifier() { search = new Search(name, app); + ( ( <SCHEMA> | <SEARCH> ) name = identifier() { search = new Search(name, app, deployLogger); rankProfileRegistry.add(new DefaultRankProfile(search, rankProfileRegistry)); rankProfileRegistry.add(new UnrankedRankProfile(search, rankProfileRegistry));} lbrace() (rootSchemaItem(search) (<NL>)*)* <RBRACE> (<NL>)* <EOF>) @@ -466,7 +466,7 @@ Object rootSchemaItem(Search search) : { } */ Search rootDocument(String dir) : { - Search search = new DocumentOnlySearch(); + Search search = new DocumentOnlySearch(app, deployLogger); } { ( (rootDocumentItem(search) (<NL>)*)*<EOF> ) diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java index c2dd3e45dea..f475fbe6d78 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java @@ -135,7 +135,7 @@ public class DocumentGraphValidatorTest { } private static Search createSearchWithName(String name, Search... parents) { - Search campaignSearch = new Search(name, null); + Search campaignSearch = new Search(name); SDDocumentType document = new SDDocumentType(name); campaignSearch.addDocument(document); document.setDocumentReferences(new DocumentReferences(Collections.emptyMap())); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java index e46208c770d..6b65303fe56 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java @@ -23,14 +23,16 @@ import static org.junit.Assert.assertTrue; */ public class DocumentReferenceResolverTest { + private static final String BAR = "bar"; + private static final String FOO = "foo"; @Rule public final ExpectedException exceptionRule = ExpectedException.none(); @Test public void reference_from_one_document_to_another_is_resolved() { // Create bar document with no fields - Search barSearch = new Search(); - SDDocumentType barDocument = new SDDocumentType("bar", barSearch); + Search barSearch = new Search(BAR); + SDDocumentType barDocument = new SDDocumentType(BAR, barSearch); barSearch.addDocument(barDocument); // Create foo document with document reference to bar and add another field @@ -38,7 +40,7 @@ public class DocumentReferenceResolverTest { ("bar_ref", ReferenceDataType.createWithInferredId(barDocument.getDocumentType())); AttributeUtils.addAttributeAspect(fooRefToBarField); SDField irrelevantField = new SDField("irrelevant_stuff", DataType.INT); - Search fooSearch = new Search(); + Search fooSearch = new Search(FOO); SDDocumentType fooDocument = new SDDocumentType("foo", fooSearch); fooDocument.addField(fooRefToBarField); fooDocument.addField(irrelevantField); @@ -60,7 +62,7 @@ public class DocumentReferenceResolverTest { SDField fooRefToBarField = new SDField( "bar_ref", ReferenceDataType.createWithInferredId(TemporaryStructuredDataType.create("bar"))); AttributeUtils.addAttributeAspect(fooRefToBarField); - Search fooSearch = new Search(); + Search fooSearch = new Search(FOO); SDDocumentType fooDocument = new SDDocumentType("foo", fooSearch); fooDocument.addField(fooRefToBarField); fooSearch.addDocument(fooDocument); @@ -76,14 +78,14 @@ public class DocumentReferenceResolverTest { @Test public void throws_exception_if_reference_is_not_an_attribute() { // Create bar document with no fields - Search barSearch = new Search(); + Search barSearch = new Search(BAR); SDDocumentType barDocument = new SDDocumentType("bar", barSearch); barSearch.addDocument(barDocument); // Create foo document with document reference to bar SDField fooRefToBarField = new SDField ("bar_ref", ReferenceDataType.createWithInferredId(barDocument.getDocumentType())); - Search fooSearch = new Search(); + Search fooSearch = new Search(FOO); SDDocumentType fooDocument = new SDDocumentType("foo", fooSearch); fooDocument.addField(fooRefToBarField); fooSearch.addDocument(fooDocument); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java index fcbb89b5c42..f12129155b1 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java @@ -18,30 +18,33 @@ public class ImportedFieldsEnumeratorTest { @Test public void imported_fields_are_enumerated_and_copied_from_correct_search_instance() { - Search parentSearch = new Search(); - SDDocumentType parentDocument = new SDDocumentType("parent", parentSearch); + String PARENT = "parent"; + Search parentSearch = new Search(PARENT); + SDDocumentType parentDocument = new SDDocumentType(PARENT, parentSearch); var parentField = new SDField("their_field", DataType.INT); AttributeUtils.addAttributeAspect(parentField); parentDocument.addField(parentField); parentSearch.addDocument(parentDocument); - Search fooSearch = new Search(); + String FOO = "foo"; + Search fooSearch = new Search(FOO); SDField fooRefToParent = new SDField( "foo_ref", ReferenceDataType.createWithInferredId(parentDocument.getDocumentType())); AttributeUtils.addAttributeAspect(fooRefToParent); var fooImports = fooSearch.temporaryImportedFields().get(); fooImports.add(new TemporaryImportedField("my_first_import", "foo_ref", "their_field")); fooImports.add(new TemporaryImportedField("my_second_import", "foo_ref", "their_field")); - SDDocumentType fooDocument = new SDDocumentType("foo", fooSearch); + SDDocumentType fooDocument = new SDDocumentType(FOO, fooSearch); fooSearch.addDocument(fooDocument); - Search barSearch = new Search(); + String BAR = "bar"; + Search barSearch = new Search(BAR); SDField barRefToParent = new SDField( "bar_ref", ReferenceDataType.createWithInferredId(parentDocument.getDocumentType())); AttributeUtils.addAttributeAspect(barRefToParent); var barImports = barSearch.temporaryImportedFields().get(); barImports.add(new TemporaryImportedField("my_cool_import", "my_ref", "their_field")); - SDDocumentType barDocument = new SDDocumentType("bar", barSearch); + SDDocumentType barDocument = new SDDocumentType(BAR, barSearch); barSearch.addDocument(barDocument); var enumerator = new ImportedFieldsEnumerator(List.of(parentSearch, fooSearch, barSearch)); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java index 02ec597c3ed..84819439048 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java @@ -33,7 +33,7 @@ public class RankProfileRegistryTest { @Test(expected = IllegalArgumentException.class) public void testRankProfileDuplicateNameIsIllegal() { - Search search = new Search("foo", null); + Search search = new Search("foo"); RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search); RankProfile barRankProfile = new RankProfile("bar", search, rankProfileRegistry); rankProfileRegistry.add(barRankProfile); @@ -42,7 +42,7 @@ public class RankProfileRegistryTest { @Test public void testRankProfileDuplicateNameLegalForOverridableRankProfiles() { - Search search = new Search("foo", null); + Search search = new Search("foo"); RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search); for (String rankProfileName : RankProfileRegistry.overridableRankProfileNames) { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java index 0f83a4db98f..b208a5dffcd 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java @@ -38,7 +38,7 @@ public class RankProfileTestCase extends SchemaTestCase { @Test public void testRankProfileInheritance() { - Search search = new Search("test", null); + Search search = new Search("test"); RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search); SDDocumentType document = new SDDocumentType("test"); SDField a = document.addField("a", DataType.STRING); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java index 47862a2611b..139dae65c63 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java @@ -21,7 +21,7 @@ public class EmptyRankProfileTestCase extends SchemaTestCase { @Test public void testDeriving() { - Search search = new Search("test", null); + Search search = new Search("test"); RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search); SDDocumentType doc = new SDDocumentType("test"); search.addDocument(doc); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java index 130450e483d..b2cac8cd4c2 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java @@ -23,7 +23,7 @@ public class IdTestCase extends AbstractExportingTestCase { @Test public void testExplicitUpperCaseIdField() { - Search search = new Search("test", null); + Search search = new Search("test"); SDDocumentType document = new SDDocumentType("test"); search.addDocument(document); SDField uri = new SDField("URI", DataType.URI); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java index 1b51fd354f3..c0a8a47e4ee 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java @@ -143,7 +143,7 @@ public class InheritanceTestCase extends AbstractExportingTestCase { @Test public void testIndexSettingInheritance() { SDDocumentType parent = new SDDocumentType("parent"); - Search parentSearch = new Search("parent", null); + Search parentSearch = new Search("parent"); parentSearch.addDocument(parent); SDField prefixed = parent.addField("prefixed", DataType.STRING); prefixed.parseIndexingScript("{ index }"); @@ -151,7 +151,7 @@ public class InheritanceTestCase extends AbstractExportingTestCase { SDDocumentType child = new SDDocumentType("child"); child.inherit(parent); - Search childSearch = new Search("child", null); + Search childSearch = new Search("child"); childSearch.addDocument(child); prefixed = (SDField)child.getField("prefixed"); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/LiteralBoostTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/LiteralBoostTestCase.java index be720cbe4dd..2e36319bd8c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/LiteralBoostTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/LiteralBoostTestCase.java @@ -30,7 +30,7 @@ public class LiteralBoostTestCase extends AbstractExportingTestCase { */ @Test public void testLiteralBoost() { - Search search=new Search("literalboost", null); + Search search=new Search("literalboost"); RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search); SDDocumentType document=new SDDocumentType("literalboost"); search.addDocument(document); @@ -62,7 +62,7 @@ public class LiteralBoostTestCase extends AbstractExportingTestCase { */ @Test public void testNonDefaultRankLiteralBoost() { - Search search=new Search("literalboost", null); + Search search=new Search("literalboost"); RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search); SDDocumentType document=new SDDocumentType("literalboost"); search.addDocument(document); @@ -88,7 +88,7 @@ public class LiteralBoostTestCase extends AbstractExportingTestCase { /** Tests literal boosts in two fields going to the same index */ @Test public void testTwoLiteralBoostFields() { - Search search=new Search("msb", null); + Search search=new Search("msb"); RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search); SDDocumentType document=new SDDocumentType("msb"); search.addDocument(document); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java index 0c677456a87..f72f67f3711 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java @@ -62,7 +62,7 @@ public class SearchOrdererTestCase extends SchemaTestCase { } private static Search createSchema(String name, Map<String, Search> schemas) { - Search search = new Search(name, null); + Search search = new Search(name); SDDocumentType document = new SDDocumentType(name); document.setDocumentReferences(new DocumentReferences(emptyMap())); search.addDocument(document); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java index 07d7405b1db..24d694cd442 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java @@ -72,7 +72,7 @@ public class SummaryMapTestCase extends SchemaTestCase { } @Test public void testPositionDeriving() { - Search search = new Search("store", null); + Search search = new Search("store"); SDDocumentType document = new SDDocumentType("store"); search.addDocument(document); String fieldName = "location"; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypeConversionTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypeConversionTestCase.java index c03e915aa8b..364eb9dc014 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypeConversionTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypeConversionTestCase.java @@ -25,7 +25,7 @@ public class TypeConversionTestCase extends SchemaTestCase { /** Tests that exact-string stuff is not spilled over to the default index */ @Test public void testExactStringToStringTypeConversion() { - Search search = new Search("test", null); + Search search = new Search("test"); RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search); SDDocumentType document = new SDDocumentType("test"); search.addDocument(document); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/VsmFieldsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/VsmFieldsTestCase.java index 37b49955bbf..b813f08d49e 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/VsmFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/VsmFieldsTestCase.java @@ -20,7 +20,7 @@ public class VsmFieldsTestCase { @Test public void reference_type_field_is_unsearchable() { - Search search = new Search("test", MockApplicationPackage.createEmpty()); + Search search = new Search("test", MockApplicationPackage.createEmpty(), new TestableDeployLogger()); search.addDocument(new SDDocumentType("test")); SDField refField = new TemporarySDField("ref_field", ReferenceDataType.createWithInferredId(TemporaryStructuredDataType.create("parent_type"))); refField.parseIndexingScript("{ summary }"); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java index defaf565a8b..83949ea6f8d 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java @@ -6,6 +6,7 @@ import com.yahoo.document.DataType; import com.yahoo.document.Field; import com.yahoo.searchdefinition.DocumentReference; import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.derived.TestableDeployLogger; import com.yahoo.searchdefinition.document.ImportedField; import com.yahoo.searchdefinition.document.ImportedFields; import com.yahoo.searchdefinition.document.ImportedSimpleField; @@ -44,14 +45,14 @@ public class AddAttributeTransformToSummaryOfImportedFieldsTest { } private static Search createSearchWithDocument(String documentName) { - Search search = new Search(documentName, MockApplicationPackage.createEmpty()); + Search search = new Search(documentName, MockApplicationPackage.createEmpty(), new TestableDeployLogger()); SDDocumentType document = new SDDocumentType(documentName, search); search.addDocument(document); return search; } private static ImportedFields createSingleImportedField(String fieldName) { - Search targetSearch = new Search("target_doc", MockApplicationPackage.createEmpty()); + Search targetSearch = new Search("target_doc", MockApplicationPackage.createEmpty(), new TestableDeployLogger()); SDField targetField = new SDField("target_field", DataType.INT); DocumentReference documentReference = new DocumentReference(new Field("reference_field"), targetSearch); ImportedField importedField = new ImportedSimpleField(fieldName, documentReference, targetField); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingScriptRewriterTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingScriptRewriterTestCase.java index 7863c544b60..833dbc14a53 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingScriptRewriterTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingScriptRewriterTestCase.java @@ -153,7 +153,7 @@ public class IndexingScriptRewriterTestCase extends SchemaTestCase { private static ScriptExpression processField(SDField unprocessedField) { SDDocumentType sdoc = new SDDocumentType("test"); sdoc.addField(unprocessedField); - Search search = new Search("test", null); + Search search = new Search("test"); search.addDocument(sdoc); new Processing().process(search, new BaseDeployLogger(), new RankProfileRegistry(), new QueryProfiles(), true, false); return unprocessedField.getIndexingScript(); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ParentChildSearchModel.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ParentChildSearchModel.java index 7d6a8507dd3..ecafd7a4222 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ParentChildSearchModel.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ParentChildSearchModel.java @@ -10,6 +10,7 @@ import com.yahoo.document.TemporaryStructuredDataType; import com.yahoo.searchdefinition.DocumentReference; import com.yahoo.searchdefinition.DocumentReferences; import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.derived.TestableDeployLogger; import com.yahoo.searchdefinition.document.SDDocumentType; import com.yahoo.searchdefinition.document.SDField; import com.yahoo.searchdefinition.document.TemporaryImportedField; @@ -29,7 +30,7 @@ public class ParentChildSearchModel { } protected Search createSearch(String name) { - Search result = new Search(name, app); + Search result = new Search(name, app, new TestableDeployLogger()); result.addDocument(new SDDocumentType(name)); return result; } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java index cec313f98d8..28e70130e75 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java @@ -6,6 +6,7 @@ import com.yahoo.document.DataType; import com.yahoo.document.Field; import com.yahoo.searchdefinition.DocumentReference; import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.derived.TestableDeployLogger; import com.yahoo.searchdefinition.document.ImportedField; import com.yahoo.searchdefinition.document.ImportedFields; import com.yahoo.searchdefinition.document.ImportedSimpleField; @@ -45,14 +46,14 @@ public class ValidateFieldTypesTest { } private static Search createSearchWithDocument(String documentName) { - Search search = new Search(documentName, MockApplicationPackage.createEmpty()); + Search search = new Search(documentName, MockApplicationPackage.createEmpty(), new TestableDeployLogger()); SDDocumentType document = new SDDocumentType(documentName, search); search.addDocument(document); return search; } private static ImportedFields createSingleImportedField(String fieldName, DataType dataType) { - Search targetSearch = new Search("target_doc", MockApplicationPackage.createEmpty()); + Search targetSearch = new Search("target_doc", MockApplicationPackage.createEmpty(), new TestableDeployLogger()); SDField targetField = new SDField("target_field", dataType); DocumentReference documentReference = new DocumentReference(new Field("reference_field"), targetSearch); ImportedField importedField = new ImportedSimpleField(fieldName, documentReference, targetField); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java index ea4b3db5ebb..66b60ec3782 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java @@ -40,7 +40,7 @@ public class SearchClusterTest { public void testSdConfigLogical() { // sd1 SDDocumentType sdt1 = new SDDocumentType("s1"); - Search search1 = new Search("s1", null); + Search search1 = new Search("s1"); SDField f1 = new SDField("f1", DataType.STRING); f1.addAttribute(new Attribute("f1", DataType.STRING)); f1.setIndexingScript(new ScriptExpression(new StatementExpression(new AttributeExpression("f1")))); @@ -49,7 +49,7 @@ public class SearchClusterTest { // sd2 SDDocumentType sdt2 = new SDDocumentType("s2"); - Search search2 = new Search("s2", null); + Search search2 = new Search("s2"); SDField f2=new SDField("f2", DataType.STRING); f2.addAttribute(new Attribute("f2", DataType.STRING)); f2.setIndexingScript(new ScriptExpression(new StatementExpression(new AttributeExpression("f2")))); |