diff options
Diffstat (limited to 'config-model/src/test/java')
87 files changed, 746 insertions, 749 deletions
diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java index adb6e423a39..0ccbec529ed 100644 --- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java @@ -13,8 +13,8 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.document.DataType; import com.yahoo.io.IOUtils; import com.yahoo.path.Path; -import com.yahoo.searchdefinition.DocumentOnlySearch; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.DocumentOnlySchema; +import com.yahoo.searchdefinition.Schema; import com.yahoo.vespa.config.ConfigDefinition; import com.yahoo.vespa.config.ConfigDefinitionKey; import com.yahoo.vespa.model.VespaModel; @@ -58,7 +58,7 @@ public class ApplicationDeployTest { List<NamedSchema> schemas = tester.getSchemas(); assertEquals(schemas.size(), 5); for (NamedSchema searchDefinition : schemas) { - Search s = searchDefinition.getSearch(); + Schema s = searchDefinition.getSearch(); switch (s.getName()) { case "music": case "laptop": @@ -66,7 +66,7 @@ public class ApplicationDeployTest { case "sock": break; case "product": - assertTrue(s instanceof DocumentOnlySearch); + assertTrue(s instanceof DocumentOnlySchema); assertEquals(DataType.STRING, s.getDocument().getField("title").getDataType()); break; default: diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/ArraysTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/ArraysTestCase.java index 801459693de..bcd9d462528 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/ArraysTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/ArraysTestCase.java @@ -22,12 +22,12 @@ public class ArraysTestCase extends SchemaTestCase { @Test public void testArrayImporting() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/arrays.sd"); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/arrays.sd"); - SDField tags = (SDField)search.getDocument().getField("tags"); + SDField tags = (SDField) schema.getDocument().getField("tags"); assertEquals(DataType.STRING, ((CollectionDataType)tags.getDataType()).getNestedType()); - SDField ratings = (SDField)search.getDocument().getField("ratings"); + SDField ratings = (SDField) schema.getDocument().getField("ratings"); assertTrue(ratings.getDataType() instanceof ArrayDataType); assertEquals(DataType.INT, ((ArrayDataType)ratings.getDataType()).getNestedType()); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/ArraysWeightedSetsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/ArraysWeightedSetsTestCase.java index 45ec5176bc7..d824460a36a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/ArraysWeightedSetsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/ArraysWeightedSetsTestCase.java @@ -19,21 +19,21 @@ import static org.junit.Assert.assertTrue; public class ArraysWeightedSetsTestCase extends SchemaTestCase { @Test public void testArrayWeightedSetsImporting() throws java.io.IOException, com.yahoo.searchdefinition.parser.ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/arraysweightedsets.sd"); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/arraysweightedsets.sd"); - SDField tags = (SDField) search.getDocument().getField("tags"); + SDField tags = (SDField) schema.getDocument().getField("tags"); assertTrue(tags.getDataType() instanceof ArrayDataType); assertEquals(DataType.STRING, ((CollectionDataType)tags.getDataType()).getNestedType()); - SDField ratings = (SDField) search.getDocument().getField("ratings"); + SDField ratings = (SDField) schema.getDocument().getField("ratings"); assertTrue(ratings.getDataType() instanceof ArrayDataType); assertEquals(DataType.INT, ((CollectionDataType)ratings.getDataType()).getNestedType()); - SDField flags = (SDField) search.getDocument().getField("flags"); + SDField flags = (SDField) schema.getDocument().getField("flags"); assertTrue(flags.getDataType() instanceof WeightedSetDataType); assertEquals(DataType.STRING, ((CollectionDataType)flags.getDataType()).getNestedType()); - SDField banners = (SDField) search.getDocument().getField("banners"); + SDField banners = (SDField) schema.getDocument().getField("banners"); assertTrue(banners.getDataType() instanceof WeightedSetDataType); assertEquals(DataType.INT, ((CollectionDataType)banners.getDataType()).getNestedType()); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java index 869cc2678b2..0b5bb8fe486 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java @@ -32,9 +32,9 @@ public class AttributeSettingsTestCase extends SchemaTestCase { @Test public void testAttributeSettings() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/attributesettings.sd"); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/attributesettings.sd"); - SDField f1=(SDField) search.getDocument().getField("f1"); + SDField f1=(SDField) schema.getDocument().getField("f1"); assertEquals(1, f1.getAttributes().size()); Attribute a1 = f1.getAttributes().get(f1.getName()); assertThat(a1.getType(), is(Attribute.Type.LONG)); @@ -45,7 +45,7 @@ public class AttributeSettingsTestCase extends SchemaTestCase { assertFalse(a1.isRemoveIfZero()); assertFalse(a1.isCreateIfNonExistent()); - SDField f2=(SDField) search.getDocument().getField("f2"); + SDField f2=(SDField) schema.getDocument().getField("f2"); assertEquals(1, f2.getAttributes().size()); Attribute a2 = f2.getAttributes().get(f2.getName()); assertThat(a2.getType(), is(Attribute.Type.LONG)); @@ -56,7 +56,7 @@ public class AttributeSettingsTestCase extends SchemaTestCase { assertFalse(a2.isRemoveIfZero()); assertFalse(a2.isCreateIfNonExistent()); assertThat(f2.getAliasToName().get("f2alias"), is("f2")); - SDField f3=(SDField) search.getDocument().getField("f3"); + SDField f3=(SDField) schema.getDocument().getField("f3"); assertEquals(1, f3.getAttributes().size()); assertThat(f3.getAliasToName().get("f3alias"), is("f3")); @@ -69,17 +69,17 @@ public class AttributeSettingsTestCase extends SchemaTestCase { assertFalse(a3.isRemoveIfZero()); assertFalse(a3.isCreateIfNonExistent()); - assertWeightedSet(search,"f4",true,true); - assertWeightedSet(search,"f5",true,true); - assertWeightedSet(search,"f6",true,true); - assertWeightedSet(search,"f7",true,false); - assertWeightedSet(search,"f8",true,false); - assertWeightedSet(search,"f9",false,true); - assertWeightedSet(search,"f10",false,true); + assertWeightedSet(schema, "f4", true, true); + assertWeightedSet(schema, "f5", true, true); + assertWeightedSet(schema, "f6", true, true); + assertWeightedSet(schema, "f7", true, false); + assertWeightedSet(schema, "f8", true, false); + assertWeightedSet(schema, "f9", false, true); + assertWeightedSet(schema, "f10", false, true); } - private void assertWeightedSet(Search search, String name, boolean createIfNonExistent, boolean removeIfZero) { - SDField f4 = (SDField) search.getDocument().getField(name); + private void assertWeightedSet(Schema schema, String name, boolean createIfNonExistent, boolean removeIfZero) { + SDField f4 = (SDField) schema.getDocument().getField(name); assertEquals(1, f4.getAttributes().size()); Attribute a4 = f4.getAttributes().get(f4.getName()); assertThat(a4.getType(), is(Attribute.Type.STRING)); @@ -93,14 +93,14 @@ public class AttributeSettingsTestCase extends SchemaTestCase { @Test public void requireThatFastAccessCanBeSet() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/attributesettings.sd"); - SDField field = (SDField) search.getDocument().getField("fast_access"); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/attributesettings.sd"); + SDField field = (SDField) schema.getDocument().getField("fast_access"); assertEquals(1, field.getAttributes().size()); Attribute attr = field.getAttributes().get(field.getName()); assertTrue(attr.isFastAccess()); } - private Search getSearch(String sd) throws ParseException { + private Schema getSearch(String sd) throws ParseException { SearchBuilder builder = new SearchBuilder(); builder.importString(sd); builder.build(); @@ -108,8 +108,8 @@ public class AttributeSettingsTestCase extends SchemaTestCase { } private Attribute getAttributeF(String sd) throws ParseException { - Search search = getSearch(sd); - SDField field = (SDField) search.getDocument().getField("f"); + Schema schema = getSearch(sd); + SDField field = (SDField) schema.getDocument().getField("f"); return field.getAttributes().get(field.getName()); } @@ -183,7 +183,7 @@ public class AttributeSettingsTestCase extends SchemaTestCase { assertTrue(attr.isMutable()); } - private Search getSearchWithMutables() throws ParseException { + private Schema getSearchWithMutables() throws ParseException { return getSearch( "search test {\n" + " document test { \n" + diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java index 050d5299c7d..faeb033a427 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java @@ -18,8 +18,8 @@ public class CommentTestCase extends SchemaTestCase { @Test public void testComments() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/comment.sd"); - SDField field = search.getConcreteField("a"); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/comment.sd"); + SDField field = schema.getConcreteField("a"); assertEquals("{ input a | tokenize normalize stem:\"BEST\" | summary a | index a; }", field.getIndexingScript().toString()); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/DiversityTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/DiversityTestCase.java index 6c4eb4748c8..e6191772904 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/DiversityTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/DiversityTestCase.java @@ -43,7 +43,7 @@ public class DiversityTestCase { " }\n" + "}\n"); builder.build(); - Search s = builder.getSearch(); + Schema s = builder.getSearch(); RankProfile.MatchPhaseSettings matchPhase = rankProfileRegistry.get(s, "parent").getMatchPhaseSettings(); RankProfile.DiversitySettings diversity = matchPhase.getDiversity(); assertEquals("b", diversity.getAttribute()); 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 4fae4d92cb0..f57c63b440f 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java @@ -30,21 +30,21 @@ public class DocumentGraphValidatorTest { @Test public void simple_ref_dag_is_allowed() { - Search advertiserSearch = createSearchWithName("advertiser"); - Search campaignSearch = createSearchWithName("campaign"); - Search adSearch = createSearchWithName("ad"); - createDocumentReference(adSearch, advertiserSearch, "advertiser_ref"); - createDocumentReference(adSearch, campaignSearch, "campaign_ref"); + Schema advertiserSchema = createSearchWithName("advertiser"); + Schema campaignSchema = createSearchWithName("campaign"); + Schema adSchema = createSearchWithName("ad"); + createDocumentReference(adSchema, advertiserSchema, "advertiser_ref"); + createDocumentReference(adSchema, campaignSchema, "campaign_ref"); DocumentGraphValidator validator = new DocumentGraphValidator(); - validator.validateDocumentGraph(documentListOf(advertiserSearch, campaignSearch, adSearch)); + validator.validateDocumentGraph(documentListOf(advertiserSchema, campaignSchema, adSchema)); } @Test public void simple_inheritance_dag_is_allowed() { - Search grandfather = createSearchWithName("grandfather"); - Search father = createSearchWithName("father", grandfather); - Search son = createSearchWithName("son", father); + Schema grandfather = createSearchWithName("grandfather"); + Schema father = createSearchWithName("father", grandfather); + Schema son = createSearchWithName("son", father); DocumentGraphValidator validator = new DocumentGraphValidator(); validator.validateDocumentGraph(documentListOf(son, father, grandfather)); @@ -52,16 +52,16 @@ public class DocumentGraphValidatorTest { @Test public void complex_dag_is_allowed() { - Search grandfather = createSearchWithName("grandfather"); - Search father = createSearchWithName("father", grandfather); - Search mother = createSearchWithName("mother", grandfather); + Schema grandfather = createSearchWithName("grandfather"); + Schema father = createSearchWithName("father", grandfather); + Schema mother = createSearchWithName("mother", grandfather); createDocumentReference(father, mother, "wife_ref"); - Search son = createSearchWithName("son", father, mother); - Search daughter = createSearchWithName("daughter", father, mother); + Schema son = createSearchWithName("son", father, mother); + Schema daughter = createSearchWithName("daughter", father, mother); createDocumentReference(daughter, son, "brother_ref"); - Search randomGuy1 = createSearchWithName("randomguy1"); - Search randomGuy2 = createSearchWithName("randomguy2"); + Schema randomGuy1 = createSearchWithName("randomguy1"); + Schema randomGuy2 = createSearchWithName("randomguy2"); createDocumentReference(randomGuy1, mother, "secret_ref"); DocumentGraphValidator validator = new DocumentGraphValidator(); @@ -70,54 +70,54 @@ public class DocumentGraphValidatorTest { @Test public void ref_cycle_is_forbidden() { - Search search1 = createSearchWithName("doc1"); - Search search2 = createSearchWithName("doc2"); - Search search3 = createSearchWithName("doc3"); - createDocumentReference(search1, search2, "ref_2"); - createDocumentReference(search2, search3, "ref_3"); - createDocumentReference(search3, search1, "ref_1"); + Schema schema1 = createSearchWithName("doc1"); + Schema schema2 = createSearchWithName("doc2"); + Schema schema3 = createSearchWithName("doc3"); + createDocumentReference(schema1, schema2, "ref_2"); + createDocumentReference(schema2, schema3, "ref_3"); + createDocumentReference(schema3, schema1, "ref_1"); DocumentGraphValidator validator = new DocumentGraphValidator(); exceptionRule.expect(DocumentGraphValidator.DocumentGraphException.class); exceptionRule.expectMessage("Document dependency cycle detected: doc1->doc2->doc3->doc1."); - validator.validateDocumentGraph(documentListOf(search1, search2, search3)); + validator.validateDocumentGraph(documentListOf(schema1, schema2, schema3)); } @Test public void inherit_cycle_is_forbidden() { - Search search1 = createSearchWithName("doc1"); - Search search2 = createSearchWithName("doc2", search1); - Search search3 = createSearchWithName("doc3", search2); - search1.getDocument().inherit(search3.getDocument()); + Schema schema1 = createSearchWithName("doc1"); + Schema schema2 = createSearchWithName("doc2", schema1); + Schema schema3 = createSearchWithName("doc3", schema2); + schema1.getDocument().inherit(schema3.getDocument()); DocumentGraphValidator validator = new DocumentGraphValidator(); exceptionRule.expect(DocumentGraphValidator.DocumentGraphException.class); exceptionRule.expectMessage("Document dependency cycle detected: doc1->doc3->doc2->doc1."); - validator.validateDocumentGraph(documentListOf(search1, search2, search3)); + validator.validateDocumentGraph(documentListOf(schema1, schema2, schema3)); } @Test public void combined_inherit_and_ref_cycle_is_forbidden() { - Search search1 = createSearchWithName("doc1"); - Search search2 = createSearchWithName("doc2", search1); - Search search3 = createSearchWithName("doc3", search2); - createDocumentReference(search1, search3, "ref_1"); + Schema schema1 = createSearchWithName("doc1"); + Schema schema2 = createSearchWithName("doc2", schema1); + Schema schema3 = createSearchWithName("doc3", schema2); + createDocumentReference(schema1, schema3, "ref_1"); DocumentGraphValidator validator = new DocumentGraphValidator(); exceptionRule.expect(DocumentGraphValidator.DocumentGraphException.class); exceptionRule.expectMessage("Document dependency cycle detected: doc1->doc3->doc2->doc1."); - validator.validateDocumentGraph(documentListOf(search1, search2, search3)); + validator.validateDocumentGraph(documentListOf(schema1, schema2, schema3)); } @Test public void self_reference_is_forbidden() { - Search adSearch = createSearchWithName("ad"); - createDocumentReference(adSearch, adSearch, "ad_ref"); + Schema adSchema = createSearchWithName("ad"); + createDocumentReference(adSchema, adSchema, "ad_ref"); DocumentGraphValidator validator = new DocumentGraphValidator(); exceptionRule.expect(DocumentGraphValidator.DocumentGraphException.class); exceptionRule.expectMessage("Document dependency cycle detected: ad->ad."); - validator.validateDocumentGraph(documentListOf(adSearch)); + validator.validateDocumentGraph(documentListOf(adSchema)); } /** @@ -127,8 +127,8 @@ public class DocumentGraphValidatorTest { @Test public void self_inheritance_forbidden() { try { - Search adSearch = createSearchWithName("ad"); - SDDocumentType document = adSearch.getDocument(); + Schema adSchema = createSearchWithName("ad"); + SDDocumentType document = adSchema.getDocument(); document.inherit(document); fail("Expected exception"); } @@ -137,22 +137,22 @@ public class DocumentGraphValidatorTest { } } - private static List<SDDocumentType> documentListOf(Search... searches) { - return Arrays.stream(searches).map(Search::getDocument).collect(toList()); + private static List<SDDocumentType> documentListOf(Schema... schemas) { + return Arrays.stream(schemas).map(Schema::getDocument).collect(toList()); } - private static Search createSearchWithName(String name, Search... parents) { - Search campaignSearch = new Search(name); + private static Schema createSearchWithName(String name, Schema... parents) { + Schema campaignSchema = new Schema(name); SDDocumentType document = new SDDocumentType(name); - campaignSearch.addDocument(document); + campaignSchema.addDocument(document); document.setDocumentReferences(new DocumentReferences(Collections.emptyMap())); Arrays.stream(parents) - .map(Search::getDocument) + .map(Schema::getDocument) .forEach(document::inherit); - return campaignSearch; + return campaignSchema; } - private static void createDocumentReference(Search from, Search to, String refFieldName) { + private static void createDocumentReference(Schema from, Schema to, String refFieldName) { SDField refField = new TemporarySDField(refFieldName, ReferenceDataType.createWithInferredId(TemporaryStructuredDataType.create(to.getName()))); SDDocumentType fromDocument = from.getDocument(); fromDocument.addField(refField); 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 28c96f39556..260b7a98fe7 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java @@ -31,28 +31,28 @@ public class DocumentReferenceResolverTest { @Test public void reference_from_one_document_to_another_is_resolved() { // Create bar document with no fields - Search barSearch = new Search(BAR); - SDDocumentType barDocument = new SDDocumentType(BAR, barSearch); - barSearch.addDocument(barDocument); + Schema barSchema = new Schema(BAR); + SDDocumentType barDocument = new SDDocumentType(BAR, barSchema); + barSchema.addDocument(barDocument); // Create foo document with document reference to bar and add another field SDField fooRefToBarField = new SDField ("bar_ref", ReferenceDataType.createWithInferredId(barDocument.getDocumentType())); AttributeUtils.addAttributeAspect(fooRefToBarField); SDField irrelevantField = new SDField("irrelevant_stuff", DataType.INT); - Search fooSearch = new Search(FOO); - SDDocumentType fooDocument = new SDDocumentType("foo", fooSearch); + Schema fooSchema = new Schema(FOO); + SDDocumentType fooDocument = new SDDocumentType("foo", fooSchema); fooDocument.addField(fooRefToBarField); fooDocument.addField(irrelevantField); - fooSearch.addDocument(fooDocument); + fooSchema.addDocument(fooDocument); - DocumentReferenceResolver resolver = new DocumentReferenceResolver(asList(fooSearch, barSearch)); + DocumentReferenceResolver resolver = new DocumentReferenceResolver(asList(fooSchema, barSchema)); resolver.resolveReferences(fooDocument); assertTrue(fooDocument.getDocumentReferences().isPresent()); Map<String, DocumentReference> fooReferenceMap = fooDocument.getDocumentReferences().get().referenceMap(); assertEquals(1, fooReferenceMap.size()); - assertSame(barSearch, fooReferenceMap.get("bar_ref").targetSearch()); + assertSame(barSchema, fooReferenceMap.get("bar_ref").targetSearch()); assertSame(fooRefToBarField, fooReferenceMap.get("bar_ref").referenceField()); } @@ -62,12 +62,12 @@ public class DocumentReferenceResolverTest { SDField fooRefToBarField = new SDField( "bar_ref", ReferenceDataType.createWithInferredId(TemporaryStructuredDataType.create("bar"))); AttributeUtils.addAttributeAspect(fooRefToBarField); - Search fooSearch = new Search(FOO); - SDDocumentType fooDocument = new SDDocumentType("foo", fooSearch); + Schema fooSchema = new Schema(FOO); + SDDocumentType fooDocument = new SDDocumentType("foo", fooSchema); fooDocument.addField(fooRefToBarField); - fooSearch.addDocument(fooDocument); + fooSchema.addDocument(fooDocument); - DocumentReferenceResolver resolver = new DocumentReferenceResolver(singletonList(fooSearch)); + DocumentReferenceResolver resolver = new DocumentReferenceResolver(singletonList(fooSchema)); exceptionRule.expect(IllegalArgumentException.class); exceptionRule.expectMessage( @@ -78,19 +78,19 @@ public class DocumentReferenceResolverTest { @Test public void throws_exception_if_reference_is_not_an_attribute() { // Create bar document with no fields - Search barSearch = new Search(BAR); - SDDocumentType barDocument = new SDDocumentType("bar", barSearch); - barSearch.addDocument(barDocument); + Schema barSchema = new Schema(BAR); + SDDocumentType barDocument = new SDDocumentType("bar", barSchema); + barSchema.addDocument(barDocument); // Create foo document with document reference to bar SDField fooRefToBarField = new SDField ("bar_ref", ReferenceDataType.createWithInferredId(barDocument.getDocumentType())); - Search fooSearch = new Search(FOO); - SDDocumentType fooDocument = new SDDocumentType("foo", fooSearch); + Schema fooSchema = new Schema(FOO); + SDDocumentType fooDocument = new SDDocumentType("foo", fooSchema); fooDocument.addField(fooRefToBarField); - fooSearch.addDocument(fooDocument); + fooSchema.addDocument(fooDocument); - DocumentReferenceResolver resolver = new DocumentReferenceResolver(asList(fooSearch, barSearch)); + DocumentReferenceResolver resolver = new DocumentReferenceResolver(asList(fooSchema, barSchema)); exceptionRule.expect(IllegalArgumentException.class); exceptionRule.expectMessage( "The field 'bar_ref' is an invalid document reference. The field must be an attribute."); 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 f12129155b1..5f507a1d5d6 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java @@ -19,35 +19,35 @@ public class ImportedFieldsEnumeratorTest { @Test public void imported_fields_are_enumerated_and_copied_from_correct_search_instance() { String PARENT = "parent"; - Search parentSearch = new Search(PARENT); - SDDocumentType parentDocument = new SDDocumentType(PARENT, parentSearch); + Schema parentSchema = new Schema(PARENT); + SDDocumentType parentDocument = new SDDocumentType(PARENT, parentSchema); var parentField = new SDField("their_field", DataType.INT); AttributeUtils.addAttributeAspect(parentField); parentDocument.addField(parentField); - parentSearch.addDocument(parentDocument); + parentSchema.addDocument(parentDocument); String FOO = "foo"; - Search fooSearch = new Search(FOO); + Schema fooSchema = new Schema(FOO); SDField fooRefToParent = new SDField( "foo_ref", ReferenceDataType.createWithInferredId(parentDocument.getDocumentType())); AttributeUtils.addAttributeAspect(fooRefToParent); - var fooImports = fooSearch.temporaryImportedFields().get(); + var fooImports = fooSchema.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); - fooSearch.addDocument(fooDocument); + SDDocumentType fooDocument = new SDDocumentType(FOO, fooSchema); + fooSchema.addDocument(fooDocument); String BAR = "bar"; - Search barSearch = new Search(BAR); + Schema barSchema = new Schema(BAR); SDField barRefToParent = new SDField( "bar_ref", ReferenceDataType.createWithInferredId(parentDocument.getDocumentType())); AttributeUtils.addAttributeAspect(barRefToParent); - var barImports = barSearch.temporaryImportedFields().get(); + var barImports = barSchema.temporaryImportedFields().get(); barImports.add(new TemporaryImportedField("my_cool_import", "my_ref", "their_field")); - SDDocumentType barDocument = new SDDocumentType(BAR, barSearch); - barSearch.addDocument(barDocument); + SDDocumentType barDocument = new SDDocumentType(BAR, barSchema); + barSchema.addDocument(barDocument); - var enumerator = new ImportedFieldsEnumerator(List.of(parentSearch, fooSearch, barSearch)); + var enumerator = new ImportedFieldsEnumerator(List.of(parentSchema, fooSchema, barSchema)); enumerator.enumerateImportedFields(parentDocument); assertImportedFieldsAre(parentDocument, List.of()); // No imported fields in parent diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java index 5dccd0afd76..f7687640202 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java @@ -21,10 +21,10 @@ public class IncorrectRankingExpressionFileRefTestCase extends SchemaTestCase { public void testIncorrectRef() throws IOException, ParseException { try { RankProfileRegistry registry = new RankProfileRegistry(); - Search search = SearchBuilder.buildFromFile("src/test/examples/incorrectrankingexpressionfileref.sd", + Schema schema = SearchBuilder.buildFromFile("src/test/examples/incorrectrankingexpressionfileref.sd", registry, new QueryProfileRegistry()); - new DerivedConfiguration(search, registry); // cause rank profile parsing + new DerivedConfiguration(schema, registry); // cause rank profile parsing fail("parsing should have failed"); } catch (IllegalArgumentException e) { String message = Exceptions.toMessageString(e); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/IndexSettingsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/IndexSettingsTestCase.java index 12b9a7a9937..7dec8df6e8c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/IndexSettingsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/IndexSettingsTestCase.java @@ -21,19 +21,19 @@ public class IndexSettingsTestCase extends SchemaTestCase { @Test public void testStemmingSettings() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/indexsettings.sd"); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/indexsettings.sd"); - SDField usingDefault=(SDField) search.getDocument().getField("usingdefault"); - assertEquals(Stemming.SHORTEST,usingDefault.getStemming(search)); + SDField usingDefault=(SDField) schema.getDocument().getField("usingdefault"); + assertEquals(Stemming.SHORTEST,usingDefault.getStemming(schema)); - SDField notStemmed=(SDField) search.getDocument().getField("notstemmed"); - assertEquals(Stemming.NONE,notStemmed.getStemming(search)); + SDField notStemmed=(SDField) schema.getDocument().getField("notstemmed"); + assertEquals(Stemming.NONE,notStemmed.getStemming(schema)); - SDField allStemmed=(SDField) search.getDocument().getField("allstemmed"); - assertEquals(Stemming.SHORTEST,allStemmed.getStemming(search)); + SDField allStemmed=(SDField) schema.getDocument().getField("allstemmed"); + assertEquals(Stemming.SHORTEST,allStemmed.getStemming(schema)); - SDField multiStemmed=(SDField) search.getDocument().getField("multiplestems"); - assertEquals(Stemming.MULTIPLE, multiStemmed.getStemming(search)); + SDField multiStemmed=(SDField) schema.getDocument().getField("multiplestems"); + assertEquals(Stemming.MULTIPLE, multiStemmed.getStemming(schema)); } @Test @@ -52,10 +52,10 @@ public class IndexSettingsTestCase extends SchemaTestCase { " }", "}" )); - Search search = builder.getSearch(); - Index contentIndex = search.getIndex("content"); + Schema schema = builder.getSearch(); + Index contentIndex = schema.getIndex("content"); assertTrue(contentIndex.useInterleavedFeatures()); - Index extraIndex = search.getIndex("extra"); + Index extraIndex = schema.getIndex("extra"); assertTrue(extraIndex.useInterleavedFeatures()); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java index 4f24f8a50d5..c5e593c706f 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java @@ -17,9 +17,9 @@ public class OutsideTestCase extends SchemaTestCase { @Test public void testOutsideIndex() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/outsidedoc.sd"); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/outsidedoc.sd"); - Index defaultIndex=search.getIndex("default"); + Index defaultIndex= schema.getIndex("default"); assertTrue(defaultIndex.isPrefix()); assertEquals("default.default",defaultIndex.aliasIterator().next()); } 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 21ab7a75f46..d2486395340 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java @@ -33,24 +33,24 @@ public class RankProfileRegistryTest { @Test(expected = IllegalArgumentException.class) public void testRankProfileDuplicateNameIsIllegal() { - Search search = new Search("foo"); - RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search); - RankProfile barRankProfile = new RankProfile("bar", search, rankProfileRegistry, search.rankingConstants()); + Schema schema = new Schema("foo"); + RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(schema); + RankProfile barRankProfile = new RankProfile("bar", schema, rankProfileRegistry, schema.rankingConstants()); rankProfileRegistry.add(barRankProfile); rankProfileRegistry.add(barRankProfile); } @Test public void testRankProfileDuplicateNameLegalForOverridableRankProfiles() { - Search search = new Search("foo"); - RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search); + Schema schema = new Schema("foo"); + RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(schema); for (String rankProfileName : RankProfileRegistry.overridableRankProfileNames) { - assertNull(rankProfileRegistry.get(search, rankProfileName).getFunctions().get("foo")); - RankProfile rankProfileWithAddedFunction = new RankProfile(rankProfileName, search, rankProfileRegistry, search.rankingConstants()); + assertNull(rankProfileRegistry.get(schema, rankProfileName).getFunctions().get("foo")); + RankProfile rankProfileWithAddedFunction = new RankProfile(rankProfileName, schema, rankProfileRegistry, schema.rankingConstants()); rankProfileWithAddedFunction.addFunction(new ExpressionFunction("foo", RankingExpression.from("1+2")), true); rankProfileRegistry.add(rankProfileWithAddedFunction); - assertNotNull(rankProfileRegistry.get(search, rankProfileName).getFunctions().get("foo")); + assertNotNull(rankProfileRegistry.get(schema, rankProfileName).getFunctions().get("foo")); } } 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 de43dc94c71..25581d2173c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java @@ -43,14 +43,14 @@ public class RankProfileTestCase extends SchemaTestCase { @Test public void testRankProfileInheritance() { - Search search = new Search("test"); - RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search); + Schema schema = new Schema("test"); + RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(schema); SDDocumentType document = new SDDocumentType("test"); SDField a = document.addField("a", DataType.STRING); a.setRankType(RankType.IDENTITY); document.addField("b", DataType.STRING); - search.addDocument(document); - RankProfile child = new RankProfile("child", search, rankProfileRegistry, search.rankingConstants()); + schema.addDocument(document); + RankProfile child = new RankProfile("child", schema, rankProfileRegistry, schema.rankingConstants()); child.setInherited("default"); rankProfileRegistry.add(child); @@ -249,10 +249,10 @@ public class RankProfileTestCase extends SchemaTestCase { SearchBuilder builder = new SearchBuilder(rankProfileRegistry); builder.importString(sd); builder.build(); - Search search = builder.getSearch(); - AttributeFields attributeFields = new AttributeFields(search); - verifyRankProfile(rankProfileRegistry.get(search, "parent"), attributeFields, deployProperties, termwiseLimit); - verifyRankProfile(rankProfileRegistry.get(search, "child"), attributeFields, deployProperties, termwiseLimit); + Schema schema = builder.getSearch(); + AttributeFields attributeFields = new AttributeFields(schema); + verifyRankProfile(rankProfileRegistry.get(schema, "parent"), attributeFields, deployProperties, termwiseLimit); + verifyRankProfile(rankProfileRegistry.get(schema, "child"), attributeFields, deployProperties, termwiseLimit); } private void verifyRankProfile(RankProfile rankProfile, AttributeFields attributeFields, ModelContext.Properties deployProperties, @@ -291,13 +291,13 @@ public class RankProfileTestCase extends SchemaTestCase { " rank-profile p2 {}", "}")); builder.build(); - Search search = builder.getSearch(); + Schema schema = builder.getSearch(); assertEquals(4, registry.all().size()); - assertAttributeTypeSettings(registry.get(search, "default"), search); - assertAttributeTypeSettings(registry.get(search, "unranked"), search); - assertAttributeTypeSettings(registry.get(search, "p1"), search); - assertAttributeTypeSettings(registry.get(search, "p2"), search); + assertAttributeTypeSettings(registry.get(schema, "default"), schema); + assertAttributeTypeSettings(registry.get(schema, "unranked"), schema); + assertAttributeTypeSettings(registry.get(schema, "p1"), schema); + assertAttributeTypeSettings(registry.get(schema, "p2"), schema); } @Test @@ -318,12 +318,12 @@ public class RankProfileTestCase extends SchemaTestCase { } } - private static RawRankProfile createRawRankProfile(RankProfile profile, Search search) { - return new RawRankProfile(profile, new LargeRankExpressions(new MockFileRegistry()), new QueryProfileRegistry(), new ImportedMlModels(), new AttributeFields(search), new TestProperties()); + private static RawRankProfile createRawRankProfile(RankProfile profile, Schema schema) { + return new RawRankProfile(profile, new LargeRankExpressions(new MockFileRegistry()), new QueryProfileRegistry(), new ImportedMlModels(), new AttributeFields(schema), new TestProperties()); } - private static void assertAttributeTypeSettings(RankProfile profile, Search search) { - RawRankProfile rawProfile = createRawRankProfile(profile, search); + private static void assertAttributeTypeSettings(RankProfile profile, Schema schema) { + RawRankProfile rawProfile = createRawRankProfile(profile, schema); assertEquals("tensor(x[10])", findProperty(rawProfile.configProperties(), "vespa.type.attribute.a").get()); assertEquals("tensor(y{})", findProperty(rawProfile.configProperties(), "vespa.type.attribute.b").get()); assertEquals("tensor(x[5])", findProperty(rawProfile.configProperties(), "vespa.type.attribute.c").get()); @@ -340,13 +340,13 @@ public class RankProfileTestCase extends SchemaTestCase { " rank-profile p2 {}", "}")); builder.build(true); - Search search = builder.getSearch(); + Schema schema = builder.getSearch(); assertEquals(4, registry.all().size()); - assertQueryFeatureTypeSettings(registry.get(search, "default"), search); - assertQueryFeatureTypeSettings(registry.get(search, "unranked"), search); - assertQueryFeatureTypeSettings(registry.get(search, "p1"), search); - assertQueryFeatureTypeSettings(registry.get(search, "p2"), search); + assertQueryFeatureTypeSettings(registry.get(schema, "default"), schema); + assertQueryFeatureTypeSettings(registry.get(schema, "unranked"), schema); + assertQueryFeatureTypeSettings(registry.get(schema, "p1"), schema); + assertQueryFeatureTypeSettings(registry.get(schema, "p2"), schema); } private static QueryProfileRegistry setupQueryProfileTypes() { @@ -365,8 +365,8 @@ public class RankProfileTestCase extends SchemaTestCase { return registry; } - private static void assertQueryFeatureTypeSettings(RankProfile profile, Search search) { - RawRankProfile rawProfile =createRawRankProfile(profile, search); + private static void assertQueryFeatureTypeSettings(RankProfile profile, Schema schema) { + RawRankProfile rawProfile =createRawRankProfile(profile, schema); assertEquals("tensor(x[10])", findProperty(rawProfile.configProperties(), "vespa.type.query.tensor1").get()); assertEquals("tensor(y{})", findProperty(rawProfile.configProperties(), "vespa.type.query.tensor2").get()); assertFalse(findProperty(rawProfile.configProperties(), "vespa.type.query.tensor3").isPresent()); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java index 987e92c8c68..5bc4aa9c386 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java @@ -49,12 +49,12 @@ public class RankPropertiesTestCase extends SchemaTestCase { " }", "}")); builder.build(); - Search search = builder.getSearch(); - AttributeFields attributeFields = new AttributeFields(search); + Schema schema = builder.getSearch(); + AttributeFields attributeFields = new AttributeFields(schema); { // Check declared model - RankProfile parent = rankProfileRegistry.get(search, "parent"); + RankProfile parent = rankProfileRegistry.get(schema, "parent"); assertEquals("query(a) = 1500", parent.getRankProperties().get(0).toString()); // Check derived model @@ -64,11 +64,11 @@ public class RankPropertiesTestCase extends SchemaTestCase { { // Check declared model - RankProfile parent = rankProfileRegistry.get(search, "child"); + RankProfile parent = rankProfileRegistry.get(schema, "child"); assertEquals("query(a) = 2000", parent.getRankProperties().get(0).toString()); // Check derived model - RawRankProfile rawChild = new RawRankProfile(rankProfileRegistry.get(search, "child"), + RawRankProfile rawChild = new RawRankProfile(rankProfileRegistry.get(schema, "child"), new LargeRankExpressions(new MockFileRegistry()), new QueryProfileRegistry(), new ImportedMlModels(), @@ -126,8 +126,8 @@ public class RankPropertiesTestCase extends SchemaTestCase { " }", "}")); builder.build(); - Search search = builder.getSearch(); - RankProfile a = rankProfileRegistry.get(search, "a"); + Schema schema = builder.getSearch(); + RankProfile a = rankProfileRegistry.get(schema, "a"); List<RankProfile.ExecuteOperation> operations = a.getExecuteOperations(); assertEquals(3, operations.size()); assertEquals(RankProfile.ExecuteOperation.Phase.onmatch, operations.get(0).phase); @@ -140,7 +140,7 @@ public class RankPropertiesTestCase extends SchemaTestCase { assertEquals("synthetic_attribute_c", operations.get(2).attribute); assertEquals("--", operations.get(2).operation); - AttributeFields attributeFields = new AttributeFields(search); + AttributeFields attributeFields = new AttributeFields(schema); RawRankProfile raw = new RawRankProfile(a, new LargeRankExpressions(new MockFileRegistry()), new QueryProfileRegistry(), new ImportedMlModels(), attributeFields, new TestProperties()); assertEquals(7, raw.configProperties().size()); assertEquals("(vespa.execute.onmatch.attribute, synthetic_attribute_a)", raw.configProperties().get(0).toString()); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java index eb71e73be60..8bfd9c898e4 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java @@ -43,9 +43,9 @@ public class RankingConstantTest { "}" )); searchBuilder.build(); - Search search = searchBuilder.getSearch(); + Schema schema = searchBuilder.getSearch(); - Iterator<RankingConstant> constantIterator = search.rankingConstants().asMap().values().iterator(); + Iterator<RankingConstant> constantIterator = schema.rankingConstants().asMap().values().iterator(); RankingConstant constant = constantIterator.next(); assertEquals(TENSOR_NAME, constant.getName()); assertEquals(TENSOR_FILE, constant.getFileName()); @@ -101,8 +101,8 @@ public class RankingConstantTest { "}" )); searchBuilder.build(); - Search search = searchBuilder.getSearch(); - RankingConstant constant = search.rankingConstants().asMap().values().iterator().next(); + Schema schema = searchBuilder.getSearch(); + RankingConstant constant = schema.rankingConstants().asMap().values().iterator().next(); assertEquals("simplename", constant.getFileName()); } @@ -120,8 +120,8 @@ public class RankingConstantTest { "}" )); searchBuilder.build(); - Search search = searchBuilder.getSearch(); - RankingConstant constant = search.rankingConstants().asMap().values().iterator().next(); + Schema schema = searchBuilder.getSearch(); + RankingConstant constant = schema.rankingConstants().asMap().values().iterator().next(); assertEquals(RankingConstant.PathType.URI, constant.getPathType()); assertEquals("http://somewhere.far.away/in/another-galaxy", constant.getUri()); } @@ -140,8 +140,8 @@ public class RankingConstantTest { "}" )); searchBuilder.build(); - Search search = searchBuilder.getSearch(); - RankingConstant constant = search.rankingConstants().asMap().values().iterator().next(); + Schema schema = searchBuilder.getSearch(); + RankingConstant constant = schema.rankingConstants().asMap().values().iterator().next(); assertEquals(RankingConstant.PathType.URI, constant.getPathType()); assertEquals("https://somewhere.far.away:4443/in/another-galaxy", constant.getUri()); } @@ -160,8 +160,8 @@ public class RankingConstantTest { "}" )); searchBuilder.build(); - Search search = searchBuilder.getSearch(); - RankingConstant constant = search.rankingConstants().asMap().values().iterator().next(); + Schema schema = searchBuilder.getSearch(); + RankingConstant constant = schema.rankingConstants().asMap().values().iterator().next(); assertEquals(RankingConstant.PathType.URI, constant.getPathType()); assertEquals("http://somewhere.far.away:4080/in/another-galaxy", constant.getUri()); } @@ -180,8 +180,8 @@ public class RankingConstantTest { "}" )); searchBuilder.build(); - Search search = searchBuilder.getSearch(); - RankingConstant constant = search.rankingConstants().asMap().values().iterator().next(); + Schema schema = searchBuilder.getSearch(); + RankingConstant constant = schema.rankingConstants().asMap().values().iterator().next(); assertEquals(RankingConstant.PathType.URI, constant.getPathType()); assertEquals("http:somewhere.far.away/in/another-galaxy", constant.getUri()); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java index 9af026e164d..2904f9ed299 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java @@ -67,7 +67,7 @@ public class RankingExpressionConstantsTestCase extends SchemaTestCase { "\n" + "}\n"); builder.build(); - Search s = builder.getSearch(); + Schema s = builder.getSearch(); RankProfile parent = rankProfileRegistry.get(s, "parent").compile(queryProfileRegistry, new ImportedMlModels()); assertEquals("0.0", parent.getFirstPhaseRanking().getRoot().toString()); @@ -111,7 +111,7 @@ public class RankingExpressionConstantsTestCase extends SchemaTestCase { "\n" + "}\n"); builder.build(); - Search s = builder.getSearch(); + Schema s = builder.getSearch(); try { rankProfileRegistry.get(s, "test").compile(new QueryProfileRegistry(), new ImportedMlModels()); fail("Should have caused an exception"); @@ -142,7 +142,7 @@ public class RankingExpressionConstantsTestCase extends SchemaTestCase { "\n" + "}\n"); builder.build(); - Search s = builder.getSearch(); + Schema s = builder.getSearch(); RankProfile profile = rankProfileRegistry.get(s, "test"); assertEquals("safeLog(popShareSlowDecaySignal,-9.21034037)", profile.getFunctions().get("POP_SLOW_SCORE").function().getBody().getRoot().toString()); } @@ -170,7 +170,7 @@ public class RankingExpressionConstantsTestCase extends SchemaTestCase { "\n" + "}\n"); builder.build(); - Search s = builder.getSearch(); + Schema s = builder.getSearch(); RankProfile profile = rankProfileRegistry.get(s, "test"); assertEquals("safeLog(popShareSlowDecaySignal,myValue)", profile.getFunctions().get("POP_SLOW_SCORE").function().getBody().getRoot().toString()); assertEquals("safeLog(popShareSlowDecaySignal,-9.21034037)", @@ -194,7 +194,7 @@ public class RankingExpressionConstantsTestCase extends SchemaTestCase { "\n" + "}\n"); builder.build(); - Search s = builder.getSearch(); + Schema s = builder.getSearch(); RankProfile profile = rankProfileRegistry.get(s, "test"); assertEquals("k1 + (k2 + k3) / 100000000.0", profile.compile(new QueryProfileRegistry(), new ImportedMlModels()).getFunctions().get("rank_default").function().getBody().getRoot().toString()); @@ -220,7 +220,7 @@ public class RankingExpressionConstantsTestCase extends SchemaTestCase { "\n" + "}\n"); builder.build(); - Search s = builder.getSearch(); + Schema s = builder.getSearch(); RankProfile profile = rankProfileRegistry.get(s, "test"); assertEquals("0.5 + 50 * (attribute(rating_yelp) - 3)", profile.compile(new QueryProfileRegistry(), new ImportedMlModels()).getFunctions().get("rank_default").function().getBody().getRoot().toString()); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java index fdc08130375..52b8481f330 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java @@ -66,7 +66,7 @@ public class RankingExpressionInliningTestCase extends SchemaTestCase { "\n" + "}\n"); builder.build(); - Search s = builder.getSearch(); + Schema s = builder.getSearch(); RankProfile parent = rankProfileRegistry.get(s, "parent").compile(new QueryProfileRegistry(), new ImportedMlModels()); assertEquals("7.0 * (3 + attribute(a) + attribute(b) * (attribute(a) * 3 + if (7.0 < attribute(a), 1, 2) == 0))", @@ -126,7 +126,7 @@ public class RankingExpressionInliningTestCase extends SchemaTestCase { "\n" + "}\n"); builder.build(); - Search s = builder.getSearch(); + Schema s = builder.getSearch(); RankProfile parent = rankProfileRegistry.get(s, "parent").compile(new QueryProfileRegistry(), new ImportedMlModels()); assertEquals("17.0", parent.getFirstPhaseRanking().getRoot().toString()); @@ -182,7 +182,7 @@ public class RankingExpressionInliningTestCase extends SchemaTestCase { "\n" + "}\n"); builder.build(); - Search s = builder.getSearch(); + Schema s = builder.getSearch(); RankProfile test = rankProfileRegistry.get(s, "test").compile(new QueryProfileRegistry(), new ImportedMlModels()); assertEquals("attribute(a) + C + (attribute(b) + 1)", test.getFirstPhaseRanking().getRoot().toString()); @@ -216,7 +216,7 @@ public class RankingExpressionInliningTestCase extends SchemaTestCase { " }\n" + "}\n"); builder.build(); - Search s = builder.getSearch(); + Schema s = builder.getSearch(); RankProfile test = rankProfileRegistry.get(s, "test").compile(new QueryProfileRegistry(), new ImportedMlModels()); assertEquals("foo(2)", test.getFirstPhaseRanking().getRoot().toString()); assertTrue("Does not contain expected warning", deployLogger.contains("Function 'foo' replaces " + @@ -246,9 +246,9 @@ public class RankingExpressionInliningTestCase extends SchemaTestCase { return b.toString(); } - private String getRankingExpression(String name, RankProfile rankProfile, Search search) { + private String getRankingExpression(String name, RankProfile rankProfile, Schema schema) { Optional<String> rankExpression = - new RawRankProfile(rankProfile, new LargeRankExpressions(new MockFileRegistry()), new QueryProfileRegistry(), new ImportedMlModels(), new AttributeFields(search), new TestProperties()) + new RawRankProfile(rankProfile, new LargeRankExpressions(new MockFileRegistry()), new QueryProfileRegistry(), new ImportedMlModels(), new AttributeFields(schema), new TestProperties()) .configProperties() .stream() .filter(r -> r.getFirst().equals("rankingExpression(" + name + ").rankingScript")) diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionShadowingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionShadowingTestCase.java index f84f3d8c83f..192ac38a854 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionShadowingTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionShadowingTestCase.java @@ -46,7 +46,7 @@ public class RankingExpressionShadowingTestCase extends SchemaTestCase { "\n" + "}\n"); builder.build(); - Search s = builder.getSearch(); + Schema s = builder.getSearch(); RankProfile test = rankProfileRegistry.get(s, "test").compile(new QueryProfileRegistry(), new ImportedMlModels()); List<Pair<String, String>> testRankProperties = createRawRankProfile(test, new QueryProfileRegistry(), s).configProperties(); assertEquals("(rankingExpression(sin@).rankingScript, 2 * 2)", @@ -87,7 +87,7 @@ public class RankingExpressionShadowingTestCase extends SchemaTestCase { "\n" + "}\n"); builder.build(); - Search s = builder.getSearch(); + Schema s = builder.getSearch(); RankProfile test = rankProfileRegistry.get(s, "test").compile(new QueryProfileRegistry(), new ImportedMlModels()); List<Pair<String, String>> testRankProperties = createRawRankProfile(test, new QueryProfileRegistry(), s).configProperties(); assertEquals("(rankingExpression(tan@).rankingScript, 2 * 2)", @@ -133,7 +133,7 @@ public class RankingExpressionShadowingTestCase extends SchemaTestCase { "\n" + "}\n"); builder.build(); - Search s = builder.getSearch(); + Schema s = builder.getSearch(); RankProfile test = rankProfileRegistry.get(s, "test").compile(new QueryProfileRegistry(), new ImportedMlModels()); List<Pair<String, String>> testRankProperties = createRawRankProfile(test, new QueryProfileRegistry(), s).configProperties(); assertEquals("(rankingExpression(sin@).rankingScript, 4.0 * 4.0)", @@ -194,7 +194,7 @@ public class RankingExpressionShadowingTestCase extends SchemaTestCase { " }\n" + "}\n"); builder.build(); - Search s = builder.getSearch(); + Schema s = builder.getSearch(); RankProfile test = rankProfileRegistry.get(s, "test").compile(queryProfiles, new ImportedMlModels()); List<Pair<String, String>> testRankProperties = createRawRankProfile(test, queryProfiles, s).configProperties(); assertEquals("(rankingExpression(autogenerated_ranking_feature@).rankingScript, reduce(query(q) * constant(W_hidden), sum, input) + constant(b_input))", @@ -213,12 +213,12 @@ public class RankingExpressionShadowingTestCase extends SchemaTestCase { testRankProperties.get(8).toString()); } - private static RawRankProfile createRawRankProfile(RankProfile profile, QueryProfileRegistry queryProfiles, Search search) { + private static RawRankProfile createRawRankProfile(RankProfile profile, QueryProfileRegistry queryProfiles, Schema schema) { return new RawRankProfile(profile, new LargeRankExpressions(new MockFileRegistry()), queryProfiles, new ImportedMlModels(), - new AttributeFields(search), + new AttributeFields(schema), new TestProperties()); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java index 66e773cf3f8..0f42e7c5211 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java @@ -22,8 +22,8 @@ public class RankingExpressionValidationTestCase extends SchemaTestCase { private void assertFailsExpression(String expression) throws ParseException { try { RankProfileRegistry registry = new RankProfileRegistry(); - Search search = importWithExpression(expression, registry); - new DerivedConfiguration(search, registry); // cause rank profile parsing + Schema schema = importWithExpression(expression, registry); + new DerivedConfiguration(schema, registry); // cause rank profile parsing fail("No exception on incorrect ranking expression " + expression); } catch (IllegalArgumentException e) { // Success @@ -31,7 +31,7 @@ public class RankingExpressionValidationTestCase extends SchemaTestCase { } } - private Search importWithExpression(String expression, RankProfileRegistry registry) throws ParseException { + private Schema importWithExpression(String expression, RankProfileRegistry registry) throws ParseException { SearchBuilder builder = new SearchBuilder(registry); builder.importString("search test {" + " document test { " + diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/ReservedWordsAsFieldNamesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/ReservedWordsAsFieldNamesTestCase.java index 9bb588a690b..9a1fe665e9b 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/ReservedWordsAsFieldNamesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/ReservedWordsAsFieldNamesTestCase.java @@ -15,10 +15,10 @@ public class ReservedWordsAsFieldNamesTestCase extends SchemaTestCase { @Test public void testIt() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/reserved_words_as_field_names.sd"); - assertNotNull(search.getDocument().getField("inline")); - assertNotNull(search.getDocument().getField("constants")); - assertNotNull(search.getDocument().getField("reference")); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/reserved_words_as_field_names.sd"); + assertNotNull(schema.getDocument().getField("inline")); + assertNotNull(schema.getDocument().getField("constants")); + assertNotNull(schema.getDocument().getField("reference")); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SchemaImporterTestCase.java index 990fe8cb3d0..d382dc9f34a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/SchemaImporterTestCase.java @@ -30,7 +30,7 @@ import static org.junit.Assert.fail; * * @author bratseth */ -public class SearchImporterTestCase extends SchemaTestCase { +public class SchemaImporterTestCase extends SchemaTestCase { @Test @SuppressWarnings("deprecation") @@ -39,30 +39,30 @@ public class SearchImporterTestCase extends SchemaTestCase { SearchBuilder sb = new SearchBuilder(rankProfileRegistry, new QueryProfileRegistry()); sb.importFile("src/test/examples/simple.sd"); sb.build(); - Search search = sb.getSearch(); - assertEquals("simple",search.getName()); - assertTrue(search.hasDocument()); + Schema schema = sb.getSearch(); + assertEquals("simple", schema.getName()); + assertTrue(schema.hasDocument()); - SDDocumentType document = search.getDocument(); + SDDocumentType document = schema.getDocument(); assertEquals("simple", document.getName()); assertEquals(23, document.getFieldCount()); SDField field; Attribute attribute; - new MakeAliases(search, new BaseDeployLogger(), rankProfileRegistry, new QueryProfiles()).process(true, false); + new MakeAliases(schema, new BaseDeployLogger(), rankProfileRegistry, new QueryProfiles()).process(true, false); // First field field=(SDField) document.getField("title"); assertEquals(DataType.STRING,field.getDataType()); assertEquals("{ input title | tokenize normalize stem:\"BEST\" | summary title | index title; }", field.getIndexingScript().toString()); - assertFalse(search.getIndex("default").isPrefix()); - assertTrue(search.getIndex("title").isPrefix()); - Iterator<String> titleAliases=search.getIndex("title").aliasIterator(); + assertFalse(schema.getIndex("default").isPrefix()); + assertTrue(schema.getIndex("title").isPrefix()); + Iterator<String> titleAliases= schema.getIndex("title").aliasIterator(); assertEquals("aliaz",titleAliases.next()); assertEquals("analias.totitle",titleAliases.next()); assertEquals("analias.todefault", - search.getIndex("default").aliasIterator().next()); + schema.getIndex("default").aliasIterator().next()); assertEquals(RankType.IDENTITY, field.getRankType()); assertEquals(0, field.getAttributes().size()); assertNull(field.getStemming()); @@ -78,7 +78,7 @@ public class SearchImporterTestCase extends SchemaTestCase { field.getSummaryField("dyndesc").getTransform()); assertNull(field.getStemming()); assertTrue(field.getNormalizing().doRemoveAccents()); - assertEquals("hallo",search.getIndex("description").aliasIterator().next()); + assertEquals("hallo", schema.getIndex("description").aliasIterator().next()); // Third field field=(SDField) document.getField("chatter"); @@ -104,24 +104,24 @@ public class SearchImporterTestCase extends SchemaTestCase { assertEquals(1, field.getAttributes().size()); // Seventh field - field= search.getConcreteField("categories"); + field= schema.getConcreteField("categories"); assertEquals("{ input categories_src | lowercase | normalize | tokenize normalize stem:\"BEST\" | index categories; }", field.getIndexingScript().toString()); assertTrue(field.isHeader()); // Eight field - field= search.getConcreteField("categoriesagain"); + field= schema.getConcreteField("categoriesagain"); assertEquals("{ input categoriesagain_src | lowercase | normalize | tokenize normalize stem:\"BEST\" | index categoriesagain; }", field.getIndexingScript().toString()); assertTrue(field.isHeader()); // Ninth field - field= search.getConcreteField("exactemento"); + field= schema.getConcreteField("exactemento"); assertEquals("{ input exactemento_src | lowercase | tokenize normalize stem:\"BEST\" | index exactemento | summary exactemento; }", field.getIndexingScript().toString()); // Tenth field - field = search.getConcreteField("category_arr"); + field = schema.getConcreteField("category_arr"); assertEquals(1, field.getAttributes().size()); attribute = field.getAttributes().get("category_arr"); assertNotNull(attribute); @@ -131,7 +131,7 @@ public class SearchImporterTestCase extends SchemaTestCase { assertTrue(field.isHeader()); // Eleventh field - field = search.getConcreteField("measurement_arr"); + field = schema.getConcreteField("measurement_arr"); assertEquals(1, field.getAttributes().size()); attribute = field.getAttributes().get("measurement_arr"); assertEquals("measurement_arr", attribute.getName()); @@ -139,24 +139,24 @@ public class SearchImporterTestCase extends SchemaTestCase { assertEquals(Attribute.CollectionType.ARRAY, attribute.getCollectionType()); // Rank Profiles - RankProfile profile=rankProfileRegistry.get(search, "default"); + RankProfile profile=rankProfileRegistry.get(schema, "default"); assertNotNull(profile); assertNull(profile.getInheritedName()); assertNull(profile.getDeclaredRankSetting("measurement", RankProfile.RankSetting.Type.RANKTYPE)); assertEquals(RankType.EMPTY, profile.getRankSetting("measurement", RankProfile.RankSetting.Type.RANKTYPE).getValue()); - profile=rankProfileRegistry.get(search, "experimental"); + profile=rankProfileRegistry.get(schema, "experimental"); assertNotNull(profile); assertEquals("default",profile.getInheritedName()); assertEquals(RankType.IDENTITY, profile.getDeclaredRankSetting("measurement", RankProfile.RankSetting.Type.RANKTYPE).getValue()); - profile=rankProfileRegistry.get(search, "other"); + profile=rankProfileRegistry.get(schema, "other"); assertNotNull(profile); assertEquals("experimental",profile.getInheritedName()); // The extra-document field - SDField exact=search.getConcreteField("exact"); + SDField exact= schema.getConcreteField("exact"); assertNotNull("Extra field was parsed",exact); assertEquals("exact",exact.getName()); assertEquals(Stemming.NONE,exact.getStemming()); @@ -178,10 +178,10 @@ public class SearchImporterTestCase extends SchemaTestCase { @Test public void testIdImporting() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/strange.sd"); - SDField idecidemyide=(SDField) search.getDocument().getField("idecidemyide"); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/strange.sd"); + SDField idecidemyide=(SDField) schema.getDocument().getField("idecidemyide"); assertEquals(5,idecidemyide.getId()); - SDField sodoi=(SDField) search.getDocument().getField("sodoi"); + SDField sodoi=(SDField) schema.getDocument().getField("sodoi"); assertEquals(7,sodoi.getId()); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/StemmingSettingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/StemmingSettingTestCase.java index e11efeac31c..6155b1521b0 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/StemmingSettingTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/StemmingSettingTestCase.java @@ -20,32 +20,32 @@ public class StemmingSettingTestCase extends SchemaTestCase { @Test public void testStemmingSettings() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/stemmingsetting.sd"); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/stemmingsetting.sd"); - SDField artist = (SDField)search.getDocument().getField("artist"); - assertEquals(Stemming.SHORTEST, artist.getStemming(search)); + SDField artist = (SDField) schema.getDocument().getField("artist"); + assertEquals(Stemming.SHORTEST, artist.getStemming(schema)); - SDField title = (SDField)search.getDocument().getField("title"); - assertEquals(Stemming.NONE, title.getStemming(search)); + SDField title = (SDField) schema.getDocument().getField("title"); + assertEquals(Stemming.NONE, title.getStemming(schema)); - SDField song = (SDField)search.getDocument().getField("song"); - assertEquals(Stemming.MULTIPLE, song.getStemming(search)); + SDField song = (SDField) schema.getDocument().getField("song"); + assertEquals(Stemming.MULTIPLE, song.getStemming(schema)); - SDField track = (SDField)search.getDocument().getField("track"); - assertEquals(Stemming.SHORTEST, track.getStemming(search)); + SDField track = (SDField) schema.getDocument().getField("track"); + assertEquals(Stemming.SHORTEST, track.getStemming(schema)); - SDField backward = (SDField)search.getDocument().getField("backward"); - assertEquals(Stemming.SHORTEST, backward.getStemming(search)); + SDField backward = (SDField) schema.getDocument().getField("backward"); + assertEquals(Stemming.SHORTEST, backward.getStemming(schema)); - Index defaultIndex = search.getIndex("default"); + Index defaultIndex = schema.getIndex("default"); assertEquals(Stemming.SHORTEST, defaultIndex.getStemming()); } @Test public void requireThatStemmingIsDefaultBest() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/stemmingdefault.sd"); - assertNull(search.getConcreteField("my_str").getStemming()); - assertEquals(Stemming.BEST, search.getConcreteField("my_str").getStemming(search)); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/stemmingdefault.sd"); + assertNull(schema.getConcreteField("my_str").getStemming()); + assertEquals(Stemming.BEST, schema.getConcreteField("my_str").getStemming(schema)); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java index 52e155fc9a5..a3adfc8dd9f 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java @@ -265,7 +265,7 @@ public class SummaryTestCase { DeployLoggerStub logger = new DeployLoggerStub(); SearchBuilder.createFromStrings(logger, parent, child); logger.entries.forEach(e -> System.out.println(e)); - //assertTrue(logger.entries.isEmpty()); + // assertTrue(logger.entries.isEmpty()); } private static class TestValue { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java index 5d0e69f9ac4..a517f2544a6 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java @@ -7,7 +7,7 @@ import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.document.DocumenttypesConfig; import com.yahoo.document.config.DocumentmanagerConfig; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.parser.ParseException; @@ -54,8 +54,8 @@ public abstract class AbstractExportingTestCase extends SchemaTestCase { return export(dirName, builder, config); } - DerivedConfiguration derive(String dirName, SearchBuilder builder, Search search) throws IOException { - DerivedConfiguration config = new DerivedConfiguration(search, + DerivedConfiguration derive(String dirName, SearchBuilder builder, Schema schema) throws IOException { + DerivedConfiguration config = new DerivedConfiguration(schema, builder.getRankProfileRegistry(), builder.getQueryProfileRegistry()); return export(dirName, builder, config); @@ -117,8 +117,8 @@ public abstract class AbstractExportingTestCase extends SchemaTestCase { return derived; } - protected DerivedConfiguration assertCorrectDeriving(SearchBuilder builder, Search search, String name) throws IOException { - DerivedConfiguration derived = derive(name, builder, search); + protected DerivedConfiguration assertCorrectDeriving(SearchBuilder builder, Schema schema, String name) throws IOException { + DerivedConfiguration derived = derive(name, builder, schema); assertCorrectConfigFiles(name); return derived; } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java index c36a682fbd8..43dfb9f3bc5 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.derived; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.document.Attribute; @@ -25,10 +25,10 @@ public class AttributeListTestCase extends SchemaTestCase { @Test public void testDeriving() throws IOException, ParseException { // Test attribute importing - Search search = SearchBuilder.buildFromFile("src/test/examples/simple.sd"); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/simple.sd"); // Test attribute deriving - AttributeFields attributeFields = new AttributeFields(search); + AttributeFields attributeFields = new AttributeFields(schema); Iterator attributes = attributeFields.attributeIterator(); Attribute attribute; attribute = (Attribute)attributes.next(); @@ -71,8 +71,8 @@ public class AttributeListTestCase extends SchemaTestCase { @Test public void fields_in_array_of_struct_are_derived_into_array_attributes() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/derived/array_of_struct_attribute/test.sd"); - Iterator<Attribute> attributes = new AttributeFields(search).attributeIterator(); + Schema schema = SearchBuilder.buildFromFile("src/test/derived/array_of_struct_attribute/test.sd"); + Iterator<Attribute> attributes = new AttributeFields(schema).attributeIterator(); assertAttribute("elem_array.name", Attribute.Type.STRING, Attribute.CollectionType.ARRAY, true, attributes.next()); assertAttribute("elem_array.weight", Attribute.Type.INTEGER, Attribute.CollectionType.ARRAY, false, attributes.next()); @@ -81,8 +81,8 @@ public class AttributeListTestCase extends SchemaTestCase { @Test public void fields_in_map_of_struct_are_derived_into_array_attributes() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/derived/map_of_struct_attribute/test.sd"); - Iterator<Attribute> attributes = new AttributeFields(search).attributeIterator(); + Schema schema = SearchBuilder.buildFromFile("src/test/derived/map_of_struct_attribute/test.sd"); + Iterator<Attribute> attributes = new AttributeFields(schema).attributeIterator(); assertAttribute("str_elem_map.key", Attribute.Type.STRING, Attribute.CollectionType.ARRAY, true, attributes.next()); assertAttribute("str_elem_map.value.name", Attribute.Type.STRING, Attribute.CollectionType.ARRAY, false, attributes.next()); @@ -101,7 +101,7 @@ public class AttributeListTestCase extends SchemaTestCase { @Test public void only_zcurve_attribute_is_derived_from_array_of_position_field() throws ParseException { - Search search = SearchBuilder.createFromString( + Schema schema = SearchBuilder.createFromString( joinLines("search test {", " document test {", " field pos_array type array<position> {", @@ -109,7 +109,7 @@ public class AttributeListTestCase extends SchemaTestCase { " }", " }", "}")).getSearch(); - Iterator<Attribute> attributes = new AttributeFields(search).attributeIterator(); + Iterator<Attribute> attributes = new AttributeFields(schema).attributeIterator(); assertAttribute("pos_array_zcurve", Attribute.Type.LONG, Attribute.CollectionType.ARRAY, true, attributes.next()); assertFalse(attributes.hasNext()); @@ -117,8 +117,8 @@ public class AttributeListTestCase extends SchemaTestCase { @Test public void fields_in_map_of_primitive_are_derived_into_array_attributes() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/derived/map_attribute/test.sd"); - Iterator<Attribute> attributes = new AttributeFields(search).attributeIterator(); + Schema schema = SearchBuilder.buildFromFile("src/test/derived/map_attribute/test.sd"); + Iterator<Attribute> attributes = new AttributeFields(schema).attributeIterator(); assertAttribute("str_map.key", Attribute.Type.STRING, Attribute.CollectionType.ARRAY, true, attributes.next()); assertAttribute("str_map.value", Attribute.Type.STRING, Attribute.CollectionType.ARRAY, false, attributes.next()); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/CasingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/CasingTestCase.java index 554a78c36ef..ad4ca1ebb46 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/CasingTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/CasingTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.derived; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.parser.ParseException; @@ -20,17 +20,17 @@ public class CasingTestCase extends SchemaTestCase { @Test public void testCasing() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/casing.sd"); - assertEquals(search.getIndex("color").getName(), "color"); - assertEquals(search.getIndex("Foo").getName(), "Foo"); - assertEquals(search.getIndex("Price").getName(), "Price"); - assertEquals(search.getAttribute("artist").getName(), "artist"); - assertEquals(search.getAttribute("Drummer").getName(), "Drummer"); - assertEquals(search.getAttribute("guitarist").getName(), "guitarist"); - assertEquals(search.getAttribute("title").getName(), "title"); - assertEquals(search.getAttribute("Trumpetist").getName(), "Trumpetist"); - assertEquals(search.getAttribute("Saxophonist").getName(), "Saxophonist"); - assertEquals(search.getAttribute("TenorSaxophonist").getName(), "TenorSaxophonist"); - assertEquals(search.getAttribute("Flutist").getName(), "Flutist"); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/casing.sd"); + assertEquals(schema.getIndex("color").getName(), "color"); + assertEquals(schema.getIndex("Foo").getName(), "Foo"); + assertEquals(schema.getIndex("Price").getName(), "Price"); + assertEquals(schema.getAttribute("artist").getName(), "artist"); + assertEquals(schema.getAttribute("Drummer").getName(), "Drummer"); + assertEquals(schema.getAttribute("guitarist").getName(), "guitarist"); + assertEquals(schema.getAttribute("title").getName(), "title"); + assertEquals(schema.getAttribute("Trumpetist").getName(), "Trumpetist"); + assertEquals(schema.getAttribute("Saxophonist").getName(), "Saxophonist"); + assertEquals(schema.getAttribute("TenorSaxophonist").getName(), "TenorSaxophonist"); + assertEquals(schema.getAttribute("Flutist").getName(), "Flutist"); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/CombinedAttributeAndIndexSearchTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/CombinedAttributeAndIndexSchemaTestCase.java index dcf6a84fd2e..bb339688fcb 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/CombinedAttributeAndIndexSearchTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/CombinedAttributeAndIndexSchemaTestCase.java @@ -11,7 +11,7 @@ import java.io.IOException; * * @author bratseth */ -public class CombinedAttributeAndIndexSearchTestCase extends AbstractExportingTestCase { +public class CombinedAttributeAndIndexSchemaTestCase extends AbstractExportingTestCase { @Test public void testMultipleSummaries() throws IOException, ParseException { 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 8778a177b81..41ad7cd3bd1 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 @@ -4,7 +4,7 @@ package com.yahoo.searchdefinition.derived; import com.yahoo.document.DataType; import com.yahoo.search.query.profile.QueryProfileRegistry; import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.document.SDDocumentType; @@ -20,18 +20,18 @@ public class EmptyRankProfileTestCase extends SchemaTestCase { @Test public void testDeriving() { - Search search = new Search("test"); - RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search); + Schema schema = new Schema("test"); + RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(schema); SDDocumentType doc = new SDDocumentType("test"); - search.addDocument(doc); + schema.addDocument(doc); doc.addField(new SDField("a", DataType.STRING)); SDField field = new SDField("b", DataType.STRING); field.setLiteralBoost(500); doc.addField(field); doc.addField(new SDField("c", DataType.STRING)); - search = SearchBuilder.buildFromRawSearch(search, rankProfileRegistry, new QueryProfileRegistry()); - new DerivedConfiguration(search, rankProfileRegistry); + schema = SearchBuilder.buildFromRawSearch(schema, rankProfileRegistry, new QueryProfileRegistry()); + new DerivedConfiguration(schema, rankProfileRegistry); } } 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 1c63b8c462e..398a13209dd 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 @@ -4,7 +4,7 @@ package com.yahoo.searchdefinition.derived; import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.document.DataType; import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.document.SDDocumentType; import com.yahoo.searchdefinition.document.SDField; import com.yahoo.searchdefinition.processing.Processing; @@ -23,14 +23,14 @@ public class IdTestCase extends AbstractExportingTestCase { @Test public void testExplicitUpperCaseIdField() { - Search search = new Search("test"); + Schema schema = new Schema("test"); SDDocumentType document = new SDDocumentType("test"); - search.addDocument(document); + schema.addDocument(document); SDField uri = new SDField("URI", DataType.URI); uri.parseIndexingScript("{ summary | index }"); document.addField(uri); - new Processing().process(search, new BaseDeployLogger(), new RankProfileRegistry(), new QueryProfiles(), true, false); + new Processing().process(schema, new BaseDeployLogger(), new RankProfileRegistry(), new QueryProfiles(), true, false); assertNull(document.getField("uri")); assertNull(document.getField("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 a07eb1015a1..59950cee638 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 @@ -4,7 +4,7 @@ package com.yahoo.searchdefinition.derived; import com.yahoo.document.DataType; import com.yahoo.document.config.DocumentmanagerConfig; import com.yahoo.searchdefinition.Index; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.document.SDDocumentType; import com.yahoo.searchdefinition.document.SDField; @@ -143,20 +143,20 @@ public class InheritanceTestCase extends AbstractExportingTestCase { @Test public void testIndexSettingInheritance() { SDDocumentType parent = new SDDocumentType("parent"); - Search parentSearch = new Search("parent"); - parentSearch.addDocument(parent); + Schema parentSchema = new Schema("parent"); + parentSchema.addDocument(parent); SDField prefixed = parent.addField("prefixed", DataType.STRING); prefixed.parseIndexingScript("{ index }"); prefixed.addIndex(new Index("prefixed", true)); SDDocumentType child = new SDDocumentType("child"); child.inherit(parent); - Search childSearch = new Search("child"); - childSearch.addDocument(child); + Schema childSchema = new Schema("child"); + childSchema.addDocument(child); prefixed = (SDField)child.getField("prefixed"); assertNotNull(prefixed); - assertEquals(new Index("prefixed", true), childSearch.getIndex("prefixed")); + assertEquals(new Index("prefixed", true), childSchema.getIndex("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 070d7ff5337..b12ca6d1c62 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 @@ -6,7 +6,7 @@ import com.yahoo.document.DataType; import com.yahoo.search.query.profile.QueryProfileRegistry; import com.yahoo.searchdefinition.RankProfile; import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.document.SDDocumentType; import com.yahoo.searchdefinition.document.SDField; @@ -29,19 +29,19 @@ public class LiteralBoostTestCase extends AbstractExportingTestCase { */ @Test public void testLiteralBoost() { - Search search=new Search("literalboost"); - RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search); + Schema schema =new Schema("literalboost"); + RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(schema); SDDocumentType document=new SDDocumentType("literalboost"); - search.addDocument(document); + schema.addDocument(document); SDField field1= document.addField("a", DataType.STRING); field1.parseIndexingScript("{ index }"); field1.setLiteralBoost(20); - RankProfile other=new RankProfile("other", search, rankProfileRegistry, search.rankingConstants()); + RankProfile other=new RankProfile("other", schema, rankProfileRegistry, schema.rankingConstants()); rankProfileRegistry.add(other); other.addRankSetting(new RankProfile.RankSetting("a", RankProfile.RankSetting.Type.LITERALBOOST, 333)); - new Processing().process(search, new BaseDeployLogger(), rankProfileRegistry, new QueryProfiles(), true, false); - DerivedConfiguration derived=new DerivedConfiguration(search, rankProfileRegistry); + new Processing().process(schema, new BaseDeployLogger(), rankProfileRegistry, new QueryProfiles(), true, false); + DerivedConfiguration derived=new DerivedConfiguration(schema, rankProfileRegistry); // Check attribute fields derived.getAttributeFields(); // TODO: assert content @@ -49,7 +49,7 @@ public class LiteralBoostTestCase extends AbstractExportingTestCase { // Check il script addition assertIndexing(Arrays.asList("clear_state | guard { input a | tokenize normalize stem:\"BEST\" | index a; }", "clear_state | guard { input a | tokenize | index a_literal; }"), - search); + schema); // Check index info addition IndexInfo indexInfo=derived.getIndexInfo(); @@ -61,23 +61,23 @@ public class LiteralBoostTestCase extends AbstractExportingTestCase { */ @Test public void testNonDefaultRankLiteralBoost() { - Search search=new Search("literalboost"); - RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search); + Schema schema =new Schema("literalboost"); + RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(schema); SDDocumentType document=new SDDocumentType("literalboost"); - search.addDocument(document); + schema.addDocument(document); SDField field1= document.addField("a", DataType.STRING); field1.parseIndexingScript("{ index }"); - RankProfile other=new RankProfile("other", search, rankProfileRegistry, search.rankingConstants()); + RankProfile other=new RankProfile("other", schema, rankProfileRegistry, schema.rankingConstants()); rankProfileRegistry.add(other); other.addRankSetting(new RankProfile.RankSetting("a", RankProfile.RankSetting.Type.LITERALBOOST, 333)); - search = SearchBuilder.buildFromRawSearch(search, rankProfileRegistry, new QueryProfileRegistry()); - DerivedConfiguration derived = new DerivedConfiguration(search, rankProfileRegistry); + schema = SearchBuilder.buildFromRawSearch(schema, rankProfileRegistry, new QueryProfileRegistry()); + DerivedConfiguration derived = new DerivedConfiguration(schema, rankProfileRegistry); // Check il script addition assertIndexing(Arrays.asList("clear_state | guard { input a | tokenize normalize stem:\"BEST\" | index a; }", "clear_state | guard { input a | tokenize | index a_literal; }"), - search); + schema); // Check index info addition IndexInfo indexInfo=derived.getIndexInfo(); @@ -87,10 +87,10 @@ 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"); - RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search); + Schema schema =new Schema("msb"); + RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(schema); SDDocumentType document=new SDDocumentType("msb"); - search.addDocument(document); + schema.addDocument(document); SDField field1= document.addField("title", DataType.STRING); field1.parseIndexingScript("{ summary | index }"); field1.setLiteralBoost(20); @@ -98,13 +98,13 @@ public class LiteralBoostTestCase extends AbstractExportingTestCase { field2.parseIndexingScript("{ summary | index }"); field2.setLiteralBoost(20); - search = SearchBuilder.buildFromRawSearch(search, rankProfileRegistry, new QueryProfileRegistry()); - new DerivedConfiguration(search, rankProfileRegistry); + schema = SearchBuilder.buildFromRawSearch(schema, rankProfileRegistry, new QueryProfileRegistry()); + new DerivedConfiguration(schema, rankProfileRegistry); assertIndexing(Arrays.asList("clear_state | guard { input title | tokenize normalize stem:\"BEST\" | summary title | index title; }", "clear_state | guard { input body | tokenize normalize stem:\"BEST\" | summary body | index body; }", "clear_state | guard { input title | tokenize | index title_literal; }", "clear_state | guard { input body | tokenize | index body_literal; }"), - search); + schema); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SchemaOrdererTestCase.java index 00fc07de221..ef939aa5093 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SchemaOrdererTestCase.java @@ -5,7 +5,7 @@ import com.yahoo.document.ReferenceDataType; import com.yahoo.document.TemporaryStructuredDataType; import com.yahoo.searchdefinition.DocumentReference; import com.yahoo.searchdefinition.DocumentReferences; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.document.SDDocumentType; import com.yahoo.searchdefinition.document.SDField; @@ -26,33 +26,33 @@ import static org.junit.Assert.assertEquals; * @author bratseth * @author bjorncs */ -public class SearchOrdererTestCase extends SchemaTestCase { +public class SchemaOrdererTestCase extends SchemaTestCase { - private static Map<String, Search> createSchemas() { - Map<String, Search> schemas = new HashMap<>(); + private static Map<String, Schema> createSchemas() { + Map<String, Schema> schemas = new HashMap<>(); - Search grandParent = createSchema("grandParent", schemas); + Schema grandParent = createSchema("grandParent", schemas); - Search mother = createSchema("mother", schemas); + Schema mother = createSchema("mother", schemas); inherit(mother, grandParent); - Search father = createSchema("father", schemas); + Schema father = createSchema("father", schemas); inherit(father, grandParent); createDocumentReference(father, mother, "wife_ref"); - Search daugther = createSchema("daughter", schemas); + Schema daugther = createSchema("daughter", schemas); inherit(daugther, father); inherit(daugther, mother); - Search son = createSchema("son", schemas); + Schema son = createSchema("son", schemas); inherit(son, father); inherit(son, mother); - Search product = createSchema("product", schemas); + Schema product = createSchema("product", schemas); - Search pc = createSchema("pc", schemas); + Schema pc = createSchema("pc", schemas); inherit(pc, product); - Search pcAccessory = createSchema("accessory-pc", schemas); + Schema pcAccessory = createSchema("accessory-pc", schemas); inherit(pcAccessory, product); createDocumentReference(pcAccessory, pc, "pc_ref"); @@ -61,34 +61,34 @@ public class SearchOrdererTestCase extends SchemaTestCase { return schemas; } - private static Search createSchema(String name, Map<String, Search> schemas) { - Search search = new Search(name); + private static Schema createSchema(String name, Map<String, Schema> schemas) { + Schema schema = new Schema(name); SDDocumentType document = new SDDocumentType(name); document.setDocumentReferences(new DocumentReferences(emptyMap())); - search.addDocument(document); - schemas.put(search.getName(), search); - return search; + schema.addDocument(document); + schemas.put(schema.getName(), schema); + return schema; } - private static void inherit(Search inheritee, Search inherited) { + private static void inherit(Schema inheritee, Schema inherited) { inheritee.getDocument().inherit(inherited.getDocument()); } private static void assertOrder(List<String> expectedSearchOrder, List<String> inputNames) { - Map<String, Search> schemas = createSchemas(); - List<Search> inputSchemas = inputNames.stream() - .map(schemas::get) - .map(Objects::requireNonNull) - .collect(toList()); + Map<String, Schema> schemas = createSchemas(); + List<Schema> inputSchemas = inputNames.stream() + .map(schemas::get) + .map(Objects::requireNonNull) + .collect(toList()); List<String> actualSearchOrder = new SearchOrderer() .order(inputSchemas) .stream() - .map(Search::getName) + .map(Schema::getName) .collect(toList()); assertEquals(expectedSearchOrder, actualSearchOrder); } - private static void createDocumentReference(Search from, Search to, String refFieldName) { + private static void createDocumentReference(Schema from, Schema to, String refFieldName) { SDField refField = new TemporarySDField(refFieldName, ReferenceDataType.createWithInferredId(TemporaryStructuredDataType.create(to.getName()))); SDDocumentType fromDocument = from.getDocument(); fromDocument.addField(refField); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SimpleInheritTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SimpleInheritTestCase.java index 08d888aba0b..106f5a54cfe 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SimpleInheritTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SimpleInheritTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.derived; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.parser.ParseException; import org.junit.Test; @@ -24,14 +24,14 @@ public class SimpleInheritTestCase extends AbstractExportingTestCase { builder.importFile(expectedResultsDirName + "child.sd"); builder.build(); - Search search = builder.getSearch("child"); + Schema schema = builder.getSearch("child"); String toDirName = "temp/" + name; File toDir = new File(toDirName); toDir.mkdirs(); deleteContent(toDir); - DerivedConfiguration config = new DerivedConfiguration(search, builder.getRankProfileRegistry()); + DerivedConfiguration config = new DerivedConfiguration(schema, builder.getRankProfileRegistry()); config.export(toDirName); checkDir(toDirName, expectedResultsDirName); 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 adc8b82f5fe..6ed03f7b237 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 @@ -28,8 +28,8 @@ import static org.junit.Assert.assertTrue; public class SummaryMapTestCase extends SchemaTestCase { @Test public void testDeriving() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/simple.sd"); - SummaryMap summaryMap=new SummaryMap(search); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/simple.sd"); + SummaryMap summaryMap=new SummaryMap(schema); Iterator transforms=summaryMap.resultTransformIterator(); FieldResultTransform transform = (FieldResultTransform)transforms.next(); @@ -72,14 +72,14 @@ public class SummaryMapTestCase extends SchemaTestCase { } @Test public void testPositionDeriving() { - Search search = new Search("store"); + Schema schema = new Schema("store"); SDDocumentType document = new SDDocumentType("store"); - search.addDocument(document); + schema.addDocument(document); String fieldName = "location"; SDField field = document.addField(fieldName, PositionDataType.INSTANCE); field.parseIndexingScript("{ attribute | summary }"); - new Processing().process(search, new BaseDeployLogger(), new RankProfileRegistry(), new QueryProfiles(), true, false); - SummaryMap summaryMap = new SummaryMap(search); + new Processing().process(schema, new BaseDeployLogger(), new RankProfileRegistry(), new QueryProfiles(), true, false); + SummaryMap summaryMap = new SummaryMap(schema); Iterator transforms = summaryMap.resultTransformIterator(); @@ -186,7 +186,7 @@ public class SummaryMapTestCase extends SchemaTestCase { assertEquals(expFieldName, override.arguments()); } - private Search buildSearch(String field) throws ParseException { + private Schema buildSearch(String field) throws ParseException { var builder = new SearchBuilder(new RankProfileRegistry()); builder.importString(joinLines("search test {", " document test {", diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java index e92f81052de..67403cdd25a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java @@ -2,7 +2,7 @@ package com.yahoo.searchdefinition.derived; import com.yahoo.config.model.application.provider.BaseDeployLogger; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.parser.ParseException; @@ -35,8 +35,8 @@ public class SummaryTestCase extends SchemaTestCase { " }", " }", "}"); - Search search = SearchBuilder.createFromString(sd).getSearch(); - SummaryClass summary = new SummaryClass(search, search.getSummary("default"), new BaseDeployLogger()); + Schema schema = SearchBuilder.createFromString(sd).getSearch(); + SummaryClass summary = new SummaryClass(schema, schema.getSummary("default"), new BaseDeployLogger()); assertEquals(SummaryClassField.Type.RAW, summary.getField("raw_field").getType()); } @@ -50,15 +50,15 @@ public class SummaryTestCase extends SchemaTestCase { " }", " }", "}"); - Search search = SearchBuilder.createFromString(sd).getSearch(); - SummaryClass summary = new SummaryClass(search, search.getSummary("default"), new BaseDeployLogger()); + Schema schema = SearchBuilder.createFromString(sd).getSearch(); + SummaryClass summary = new SummaryClass(schema, schema.getSummary("default"), new BaseDeployLogger()); assertEquals(SummaryClassField.Type.DATA, summary.getField("raw_field").getType()); } @Test public void testDeriving() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/simple.sd"); - SummaryClass summary = new SummaryClass(search, search.getSummary("default"), new BaseDeployLogger()); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/simple.sd"); + SummaryClass summary = new SummaryClass(schema, schema.getSummary("default"), new BaseDeployLogger()); assertEquals("default", summary.getName()); Iterator<SummaryClassField> fields = summary.fieldIterator(); @@ -122,18 +122,18 @@ public class SummaryTestCase extends SchemaTestCase { @Test public void reference_fields_can_be_part_of_summary_classes() throws ParseException { - Search adSearch = buildCampaignAdModel(); + Schema adSchema = buildCampaignAdModel(); - SummaryClass defaultClass = new SummaryClass(adSearch, adSearch.getSummary("default"), new BaseDeployLogger()); + SummaryClass defaultClass = new SummaryClass(adSchema, adSchema.getSummary("default"), new BaseDeployLogger()); assertEquals(SummaryClassField.Type.LONGSTRING, defaultClass.getField("campaign_ref").getType()); assertEquals(SummaryClassField.Type.LONGSTRING, defaultClass.getField("other_campaign_ref").getType()); - SummaryClass myClass = new SummaryClass(adSearch, adSearch.getSummary("my_summary"), new BaseDeployLogger()); + SummaryClass myClass = new SummaryClass(adSchema, adSchema.getSummary("my_summary"), new BaseDeployLogger()); assertNull(myClass.getField("campaign_ref")); assertEquals(SummaryClassField.Type.LONGSTRING, myClass.getField("other_campaign_ref").getType()); } - private static Search buildCampaignAdModel() throws ParseException { + private static Schema buildCampaignAdModel() throws ParseException { SearchBuilder builder = new SearchBuilder(); builder.importString("search campaign { document campaign {} }"); builder.importString(joinLines("search ad {", @@ -173,8 +173,8 @@ public class SummaryTestCase extends SchemaTestCase { assertOmitSummaryFeatures(false, search, "baz"); } - private void assertOmitSummaryFeatures(boolean expected, Search search, String summaryName) { - var summary = new SummaryClass(search, search.getSummary(summaryName), new BaseDeployLogger()); + private void assertOmitSummaryFeatures(boolean expected, Schema schema, String summaryName) { + var summary = new SummaryClass(schema, schema.getSummary(summaryName), new BaseDeployLogger()); var config = new SummaryConfig.Classes(summary.getSummaryClassConfig()); assertEquals(expected, config.omitsummaryfeatures()); } 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 2b65361e922..bfed1efe398 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 @@ -4,7 +4,7 @@ package com.yahoo.searchdefinition.derived; import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.document.DataType; import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.document.SDDocumentType; import com.yahoo.searchdefinition.document.SDField; @@ -23,16 +23,16 @@ 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"); - RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search); + Schema schema = new Schema("test"); + RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(schema); SDDocumentType document = new SDDocumentType("test"); - search.addDocument(document); + schema.addDocument(document); SDField a = new SDField("a", DataType.STRING); a.parseIndexingScript("{ index }"); document.addField(a); - new Processing().process(search, new BaseDeployLogger(), rankProfileRegistry, new QueryProfiles(), true, false); - DerivedConfiguration derived = new DerivedConfiguration(search, rankProfileRegistry); + new Processing().process(schema, new BaseDeployLogger(), rankProfileRegistry, new QueryProfiles(), true, false); + DerivedConfiguration derived = new DerivedConfiguration(schema, rankProfileRegistry); IndexInfo indexInfo = derived.getIndexInfo(); assertFalse(indexInfo.hasCommand("default", "compact-to-term")); } 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 3e3904fa250..55702c9e1a7 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 @@ -7,7 +7,7 @@ import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.document.ReferenceDataType; import com.yahoo.document.TemporaryStructuredDataType; import com.yahoo.searchdefinition.Application; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.document.SDDocumentType; import com.yahoo.searchdefinition.document.SDField; import com.yahoo.searchdefinition.document.TemporarySDField; @@ -23,13 +23,13 @@ public class VsmFieldsTestCase { @Test public void reference_type_field_is_unsearchable() { - Search search = new Search("test", new Application(MockApplicationPackage.createEmpty()), new MockFileRegistry(), new TestableDeployLogger(), new TestProperties()); - search.addDocument(new SDDocumentType("test")); + Schema schema = new Schema("test", new Application(MockApplicationPackage.createEmpty()), new MockFileRegistry(), new TestableDeployLogger(), new TestProperties()); + schema.addDocument(new SDDocumentType("test")); SDField refField = new TemporarySDField("ref_field", ReferenceDataType.createWithInferredId(TemporaryStructuredDataType.create("parent_type"))); refField.parseIndexingScript("{ summary }"); - search.getDocument().addField(refField); + schema.getDocument().addField(refField); - VsmFields vsmFields = new VsmFields(search); + VsmFields vsmFields = new VsmFields(schema); VsmfieldsConfig.Builder cfgBuilder = new VsmfieldsConfig.Builder(); vsmFields.getConfig(cfgBuilder); VsmfieldsConfig cfg = cfgBuilder.build(); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/document/ComplexAttributeFieldUtilsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/document/ComplexAttributeFieldUtilsTestCase.java index a91911f6fef..449e8054728 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/document/ComplexAttributeFieldUtilsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/document/ComplexAttributeFieldUtilsTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.document; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.parser.ParseException; import org.junit.Test; @@ -17,8 +17,8 @@ public class ComplexAttributeFieldUtilsTestCase { private final ImmutableSDField field; FixtureBase(String fieldName, String sdContent) throws ParseException { - Search search = SearchBuilder.createFromString(sdContent).getSearch(); - field = search.getConcreteField(fieldName); + Schema schema = SearchBuilder.createFromString(sdContent).getSearch(); + field = schema.getConcreteField(fieldName); } public ImmutableSDField field() { 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 d7b31af11b8..715b7b803e2 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 @@ -8,7 +8,7 @@ import com.yahoo.document.DataType; import com.yahoo.document.Field; import com.yahoo.searchdefinition.Application; import com.yahoo.searchdefinition.DocumentReference; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.derived.TestableDeployLogger; import com.yahoo.searchdefinition.document.ImportedField; import com.yahoo.searchdefinition.document.ImportedFields; @@ -35,39 +35,39 @@ public class AddAttributeTransformToSummaryOfImportedFieldsTest { @Test public void attribute_summary_transform_applied_to_summary_field_of_imported_field() { - Search search = createSearchWithDocument(DOCUMENT_NAME); - search.setImportedFields(createSingleImportedField(IMPORTED_FIELD_NAME)); - search.addSummary(createDocumentSummary(IMPORTED_FIELD_NAME, search)); + Schema schema = createSearchWithDocument(DOCUMENT_NAME); + schema.setImportedFields(createSingleImportedField(IMPORTED_FIELD_NAME)); + schema.addSummary(createDocumentSummary(IMPORTED_FIELD_NAME, schema)); AddAttributeTransformToSummaryOfImportedFields processor = new AddAttributeTransformToSummaryOfImportedFields( - search,null,null,null); + schema, null, null, null); processor.process(true, false); - SummaryField summaryField = search.getSummaries().get(SUMMARY_NAME).getSummaryField(IMPORTED_FIELD_NAME); + SummaryField summaryField = schema.getSummaries().get(SUMMARY_NAME).getSummaryField(IMPORTED_FIELD_NAME); SummaryTransform actualTransform = summaryField.getTransform(); assertEquals(SummaryTransform.ATTRIBUTE, actualTransform); } - private static Search createSearch(String documentType) { - return new Search(documentType, new Application(MockApplicationPackage.createEmpty()), new MockFileRegistry(), new TestableDeployLogger(), new TestProperties()); + private static Schema createSearch(String documentType) { + return new Schema(documentType, new Application(MockApplicationPackage.createEmpty()), new MockFileRegistry(), new TestableDeployLogger(), new TestProperties()); } - private static Search createSearchWithDocument(String documentName) { - Search search = createSearch(documentName); - SDDocumentType document = new SDDocumentType(documentName, search); - search.addDocument(document); - return search; + private static Schema createSearchWithDocument(String documentName) { + Schema schema = createSearch(documentName); + SDDocumentType document = new SDDocumentType(documentName, schema); + schema.addDocument(document); + return schema; } private static ImportedFields createSingleImportedField(String fieldName) { - Search targetSearch = createSearch("target_doc"); + Schema targetSchema = createSearch("target_doc"); SDField targetField = new SDField("target_field", DataType.INT); - DocumentReference documentReference = new DocumentReference(new Field("reference_field"), targetSearch); + DocumentReference documentReference = new DocumentReference(new Field("reference_field"), targetSchema); ImportedField importedField = new ImportedSimpleField(fieldName, documentReference, targetField); return new ImportedFields(Collections.singletonMap(fieldName, importedField)); } - private static DocumentSummary createDocumentSummary(String fieldName, Search search) { - DocumentSummary summary = new DocumentSummary("mysummary", search); + private static DocumentSummary createDocumentSummary(String fieldName, Schema schema) { + DocumentSummary summary = new DocumentSummary("mysummary", schema); summary.add(new SummaryField(fieldName, DataType.INT)); return summary; } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFieldsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFieldsTestCase.java index f9796432de8..21fab6ee01c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFieldsTestCase.java @@ -3,7 +3,7 @@ package com.yahoo.searchdefinition.processing; import com.yahoo.document.DataType; import com.yahoo.document.PositionDataType; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; @@ -73,7 +73,7 @@ public class AdjustPositionSummaryFieldsTestCase { public void test_pos_default_summary_no_attr_no_rename() { SearchModel model = new SearchModel(false, false, false); model.resolve(); - assertNull(model.childSearch.getSummary("default")); // ImplicitSummaries processing not run in this test + assertNull(model.childSchema.getSummary("default")); // ImplicitSummaries processing not run in this test } @Test @@ -175,21 +175,21 @@ public class AdjustPositionSummaryFieldsTestCase { SearchModel(boolean importedPos, boolean setupPosAttr, boolean setupBadAttr) { super(); if (importedPos) { - createPositionField(parentSearch, setupPosAttr, setupBadAttr); + createPositionField(parentSchema, setupPosAttr, setupBadAttr); } - addRefField(childSearch, parentSearch, "ref"); + addRefField(childSchema, parentSchema, "ref"); if (importedPos) { addImportedField("my_pos", "ref", "pos"); } else { - createPositionField(childSearch, setupPosAttr, setupBadAttr); + createPositionField(childSchema, setupPosAttr, setupBadAttr); } } - private void createPositionField(Search search, boolean setupPosAttr, boolean setupBadAttr) { + private void createPositionField(Schema schema, boolean setupPosAttr, boolean setupBadAttr) { String ilScript = setupPosAttr ? "{ summary | attribute }" : "{ summary }"; - search.getDocument().addField(createField("pos", PositionDataType.INSTANCE, ilScript)); + schema.getDocument().addField(createField("pos", PositionDataType.INSTANCE, ilScript)); if (setupBadAttr) { - search.getDocument().addField(createField("pos_zcurve", DataType.LONG, "{ attribute }")); + schema.getDocument().addField(createField("pos_zcurve", DataType.LONG, "{ attribute }")); } } @@ -198,10 +198,10 @@ public class AdjustPositionSummaryFieldsTestCase { } public void addSummaryField(String summaryName, String fieldName, DataType dataType, SummaryTransform transform, String source) { - DocumentSummary summary = childSearch.getSummary(summaryName); + DocumentSummary summary = childSchema.getSummary(summaryName); if (summary == null) { - summary = new DocumentSummary(summaryName, childSearch); - childSearch.addSummary(summary); + summary = new DocumentSummary(summaryName, childSchema); + childSchema.addSummary(summary); } SummaryField summaryField = new SummaryField(fieldName, dataType); if (source != null) { @@ -218,7 +218,7 @@ public class AdjustPositionSummaryFieldsTestCase { } public void assertNoSummaryField(String summaryName, String fieldName) { - DocumentSummary summary = childSearch.getSummary(summaryName); + DocumentSummary summary = childSchema.getSummary(summaryName); assertNotNull(summary); SummaryField summaryField = summary.getSummaryField(fieldName); assertNull(summaryField); @@ -229,7 +229,7 @@ public class AdjustPositionSummaryFieldsTestCase { } public void assertSummaryField(String summaryName, String fieldName, DataType dataType, SummaryTransform transform, String source) { - DocumentSummary summary = childSearch.getSummary(summaryName); + DocumentSummary summary = childSchema.getSummary(summaryName); assertNotNull(summary); SummaryField summaryField = summary.getSummaryField(fieldName); assertNotNull(summaryField); @@ -244,18 +244,18 @@ public class AdjustPositionSummaryFieldsTestCase { } public void resolve() { - resolve(parentSearch); - resolve(childSearch); + resolve(parentSchema); + resolve(childSchema); } - private static void resolve(Search search) { - new CreatePositionZCurve(search, null, null, null).process(true, false); - assertNotNull(search.temporaryImportedFields().get()); - assertFalse(search.importedFields().isPresent()); - new ImportedFieldsResolver(search, null, null, null).process(true, false); - assertFalse(search.temporaryImportedFields().isPresent()); - assertNotNull(search.importedFields().get()); - new AdjustPositionSummaryFields(search, null, null, null).process(true, false); + private static void resolve(Schema schema) { + new CreatePositionZCurve(schema, null, null, null).process(true, false); + assertNotNull(schema.temporaryImportedFields().get()); + assertFalse(schema.importedFields().isPresent()); + new ImportedFieldsResolver(schema, null, null, null).process(true, false); + assertFalse(schema.temporaryImportedFields().isPresent()); + assertNotNull(schema.importedFields().get()); + new AdjustPositionSummaryFields(schema, null, null, null).process(true, false); } } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AssertIndexingScript.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AssertIndexingScript.java index c9f9e8c50f9..8a0c1e2fe71 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AssertIndexingScript.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AssertIndexingScript.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.processing; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.derived.IndexingScript; import com.yahoo.vespa.indexinglanguage.expressions.Expression; import com.yahoo.vespa.indexinglanguage.parser.ParseException; @@ -17,8 +17,8 @@ import static org.junit.Assert.fail; */ public abstract class AssertIndexingScript { - public static void assertIndexing(List<String> expected, Search search) { - assertIndexing(expected, new IndexingScript(search).expressions()); + public static void assertIndexing(List<String> expected, Schema schema) { + assertIndexing(expected, new IndexingScript(schema).expressions()); } public static void assertIndexing(List<String> expected, IndexingScript script) { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributesExactMatchTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributesExactMatchTestCase.java index 7f72cc96ccf..c2d1023826c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributesExactMatchTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributesExactMatchTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.processing; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.document.Matching; @@ -20,20 +20,20 @@ import static org.junit.Assert.assertFalse; public class AttributesExactMatchTestCase extends SchemaTestCase { @Test public void testAttributesExactMatch() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/attributesexactmatch.sd"); - assertEquals(search.getConcreteField("color").getMatching().getType(), Matching.Type.EXACT); - assertEquals(search.getConcreteField("artist").getMatching().getType(), Matching.Type.WORD); - assertEquals(search.getConcreteField("drummer").getMatching().getType(), Matching.Type.WORD); - assertEquals(search.getConcreteField("guitarist").getMatching().getType(), Matching.Type.TEXT); - assertEquals(search.getConcreteField("saxophonist_arr").getMatching().getType(), Matching.Type.WORD); - assertEquals(search.getConcreteField("flutist").getMatching().getType(), Matching.Type.TEXT); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/attributesexactmatch.sd"); + assertEquals(schema.getConcreteField("color").getMatching().getType(), Matching.Type.EXACT); + assertEquals(schema.getConcreteField("artist").getMatching().getType(), Matching.Type.WORD); + assertEquals(schema.getConcreteField("drummer").getMatching().getType(), Matching.Type.WORD); + assertEquals(schema.getConcreteField("guitarist").getMatching().getType(), Matching.Type.TEXT); + assertEquals(schema.getConcreteField("saxophonist_arr").getMatching().getType(), Matching.Type.WORD); + assertEquals(schema.getConcreteField("flutist").getMatching().getType(), Matching.Type.TEXT); - assertFalse(search.getConcreteField("genre").getMatching().getType().equals(Matching.Type.EXACT)); - assertFalse(search.getConcreteField("title").getMatching().getType().equals(Matching.Type.EXACT)); - assertFalse(search.getConcreteField("trumpetist").getMatching().getType().equals(Matching.Type.EXACT)); - assertFalse(search.getConcreteField("genre").getMatching().getType().equals(Matching.Type.WORD)); - assertFalse(search.getConcreteField("title").getMatching().getType().equals(Matching.Type.WORD)); - assertFalse(search.getConcreteField("trumpetist").getMatching().getType().equals(Matching.Type.WORD)); + assertFalse(schema.getConcreteField("genre").getMatching().getType().equals(Matching.Type.EXACT)); + assertFalse(schema.getConcreteField("title").getMatching().getType().equals(Matching.Type.EXACT)); + assertFalse(schema.getConcreteField("trumpetist").getMatching().getType().equals(Matching.Type.EXACT)); + assertFalse(schema.getConcreteField("genre").getMatching().getType().equals(Matching.Type.WORD)); + assertFalse(schema.getConcreteField("title").getMatching().getType().equals(Matching.Type.WORD)); + assertFalse(schema.getConcreteField("trumpetist").getMatching().getType().equals(Matching.Type.WORD)); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/DictionaryTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/DictionaryTestCase.java index db87ae698b4..643d46e2d48 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/DictionaryTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/DictionaryTestCase.java @@ -3,13 +3,12 @@ package com.yahoo.searchdefinition.processing; import com.yahoo.config.model.test.TestUtil; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.derived.AttributeFields; import com.yahoo.searchdefinition.document.Case; import com.yahoo.searchdefinition.document.Dictionary; import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.Matching; import com.yahoo.searchdefinition.parser.ParseException; import com.yahoo.vespa.config.search.AttributesConfig; import org.junit.Test; @@ -24,13 +23,13 @@ import static org.junit.Assert.fail; * @author baldersheim */ public class DictionaryTestCase { - private static AttributesConfig getConfig(Search search) { - AttributeFields attributes = new AttributeFields(search); + private static AttributesConfig getConfig(Schema schema) { + AttributeFields attributes = new AttributeFields(schema); AttributesConfig.Builder builder = new AttributesConfig.Builder(); attributes.getConfig(builder); return builder.build(); } - private Search createSearch(String def) throws ParseException { + private Schema createSearch(String def) throws ParseException { SearchBuilder sb = SearchBuilder.createFromString(def); return sb.getSearch(); } @@ -47,20 +46,20 @@ public class DictionaryTestCase { " }", " }", "}"); - Search search = createSearch(def); - assertNull(search.getAttribute("s1").getDictionary()); - assertNull(search.getAttribute("n1").getDictionary()); + Schema schema = createSearch(def); + assertNull(schema.getAttribute("s1").getDictionary()); + assertNull(schema.getAttribute("n1").getDictionary()); assertEquals(AttributesConfig.Attribute.Dictionary.Type.BTREE, - getConfig(search).attribute().get(0).dictionary().type()); + getConfig(schema).attribute().get(0).dictionary().type()); assertEquals(AttributesConfig.Attribute.Dictionary.Type.BTREE, - getConfig(search).attribute().get(1).dictionary().type()); + getConfig(schema).attribute().get(1).dictionary().type()); assertEquals(AttributesConfig.Attribute.Dictionary.Match.UNCASED, - getConfig(search).attribute().get(0).dictionary().match()); + getConfig(schema).attribute().get(0).dictionary().match()); assertEquals(AttributesConfig.Attribute.Dictionary.Match.UNCASED, - getConfig(search).attribute().get(1).dictionary().match()); + getConfig(schema).attribute().get(1).dictionary().match()); } - Search verifyDictionaryControl(Dictionary.Type expected, String type, String ... cfg) throws ParseException + Schema verifyDictionaryControl(Dictionary.Type expected, String type, String ... cfg) throws ParseException { String def = TestUtil.joinLines( "search test {", @@ -72,11 +71,11 @@ public class DictionaryTestCase { " }", " }", "}"); - Search search = createSearch(def); + Schema schema = createSearch(def); AttributesConfig.Attribute.Dictionary.Type.Enum expectedConfig = toCfg(expected); - assertEquals(expected, search.getAttribute("n1").getDictionary().getType()); - assertEquals(expectedConfig, getConfig(search).attribute().get(0).dictionary().type()); - return search; + assertEquals(expected, schema.getAttribute("n1").getDictionary().getType()); + assertEquals(expectedConfig, getConfig(schema).attribute().get(0).dictionary().type()); + return schema; } AttributesConfig.Attribute.Dictionary.Type.Enum toCfg(Dictionary.Type v) { @@ -95,12 +94,12 @@ public class DictionaryTestCase { void verifyStringDictionaryControl(Dictionary.Type expectedType, Case expectedCase, Case matchCasing, String ... cfg) throws ParseException { - Search search = verifyDictionaryControl(expectedType, "string", cfg); - ImmutableSDField f = search.getField("n1"); + Schema schema = verifyDictionaryControl(expectedType, "string", cfg); + ImmutableSDField f = schema.getField("n1"); AttributesConfig.Attribute.Dictionary.Match.Enum expectedCaseCfg = toCfg(expectedCase); assertEquals(matchCasing, f.getMatching().getCase()); - assertEquals(expectedCase, search.getAttribute("n1").getDictionary().getMatch()); - assertEquals(expectedCaseCfg, getConfig(search).attribute().get(0).dictionary().match()); + assertEquals(expectedCase, schema.getAttribute("n1").getDictionary().getMatch()); + assertEquals(expectedCaseCfg, getConfig(schema).attribute().get(0).dictionary().match()); } @Test @@ -240,12 +239,12 @@ public class DictionaryTestCase { " }", " }", "}"); - Search search = createSearch(def); - assertEquals(Case.UNCASED, search.getAttribute("s1").getCase()); - assertEquals(Case.UNCASED, search.getAttribute("s2").getCase()); - assertEquals(Case.CASED, search.getAttribute("s3").getCase()); - assertEquals(AttributesConfig.Attribute.Match.UNCASED, getConfig(search).attribute().get(0).match()); - assertEquals(AttributesConfig.Attribute.Match.UNCASED, getConfig(search).attribute().get(1).match()); - assertEquals(AttributesConfig.Attribute.Match.CASED, getConfig(search).attribute().get(2).match()); + Schema schema = createSearch(def); + assertEquals(Case.UNCASED, schema.getAttribute("s1").getCase()); + assertEquals(Case.UNCASED, schema.getAttribute("s2").getCase()); + assertEquals(Case.CASED, schema.getAttribute("s3").getCase()); + assertEquals(AttributesConfig.Attribute.Match.UNCASED, getConfig(schema).attribute().get(0).match()); + assertEquals(AttributesConfig.Attribute.Match.UNCASED, getConfig(schema).attribute().get(1).match()); + assertEquals(AttributesConfig.Attribute.Match.CASED, getConfig(schema).attribute().get(2).match()); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSearchFieldsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSchemaFieldsTestCase.java index 5ef2f2842e1..f3d188abf82 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSearchFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSchemaFieldsTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.processing; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.derived.DerivedConfiguration; @@ -14,14 +14,14 @@ import java.io.IOException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -public class ImplicitSearchFieldsTestCase extends SchemaTestCase { +public class ImplicitSchemaFieldsTestCase extends SchemaTestCase { @Test public void testRequireThatExtraFieldsAreIncluded() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/nextgen/extrafield.sd"); - assertNotNull(search); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/nextgen/extrafield.sd"); + assertNotNull(schema); - SDDocumentType docType = search.getDocument(); + SDDocumentType docType = schema.getDocument(); assertNotNull(docType); assertNotNull(docType.getField("foo")); assertNotNull(docType.getField("bar")); @@ -30,10 +30,10 @@ public class ImplicitSearchFieldsTestCase extends SchemaTestCase { @Test public void testRequireThatSummaryFieldsAreIncluded() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/nextgen/summaryfield.sd"); - assertNotNull(search); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/nextgen/summaryfield.sd"); + assertNotNull(schema); - SDDocumentType docType = search.getDocument(); + SDDocumentType docType = schema.getDocument(); assertNotNull(docType); assertNotNull(docType.getField("foo")); assertNotNull(docType.getField("bar")); @@ -43,10 +43,10 @@ public class ImplicitSearchFieldsTestCase extends SchemaTestCase { @Test public void testRequireThatBoldedSummaryFieldsAreIncluded() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/nextgen/boldedsummaryfields.sd"); - assertNotNull(search); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/nextgen/boldedsummaryfields.sd"); + assertNotNull(schema); - SDDocumentType docType = search.getDocument(); + SDDocumentType docType = schema.getDocument(); assertNotNull(docType); assertNotNull(docType.getField("foo")); assertNotNull(docType.getField("bar")); @@ -57,10 +57,10 @@ public class ImplicitSearchFieldsTestCase extends SchemaTestCase { @Test public void testRequireThatUntransformedSummaryFieldsAreIgnored() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/nextgen/untransformedsummaryfields.sd"); - assertNotNull(search); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/nextgen/untransformedsummaryfields.sd"); + assertNotNull(schema); - SDDocumentType docType = search.getDocument(); + SDDocumentType docType = schema.getDocument(); assertNotNull(docType); assertNotNull(docType.getField("foo")); assertNotNull(docType.getField("bar")); @@ -70,10 +70,10 @@ public class ImplicitSearchFieldsTestCase extends SchemaTestCase { @Test public void testRequireThatDynamicSummaryFieldsAreIgnored() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/nextgen/dynamicsummaryfields.sd"); - assertNotNull(search); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/nextgen/dynamicsummaryfields.sd"); + assertNotNull(schema); - SDDocumentType docType = search.getDocument(); + SDDocumentType docType = schema.getDocument(); assertNotNull(docType); assertNotNull(docType.getField("foo")); assertNotNull(docType.getField("bar")); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitStructTypesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitStructTypesTestCase.java index fb0f1bc2ba2..ec132bd2450 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitStructTypesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitStructTypesTestCase.java @@ -2,7 +2,7 @@ package com.yahoo.searchdefinition.processing; import com.yahoo.document.*; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.document.SDDocumentType; @@ -16,19 +16,19 @@ import static org.junit.Assert.*; public class ImplicitStructTypesTestCase extends SchemaTestCase { @Test public void testRequireThatImplicitStructsAreCreated() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/nextgen/toggleon.sd"); - assertNotNull(search); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/nextgen/toggleon.sd"); + assertNotNull(schema); - SDDocumentType docType = search.getDocument(); + SDDocumentType docType = schema.getDocument(); assertNotNull(docType); assertStruct(docType, PositionDataType.INSTANCE); } @Test public void testRequireThatImplicitStructsAreUsed() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/nextgen/implicitstructtypes.sd"); - assertNotNull(search); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/nextgen/implicitstructtypes.sd"); + assertNotNull(schema); - SDDocumentType docType = search.getDocument(); + SDDocumentType docType = schema.getDocument(); assertNotNull(docType); assertField(docType, "doc_str", DataType.STRING); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSummariesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSummariesTestCase.java index d45d366ee0a..9f4008b5b39 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSummariesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSummariesTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.processing; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.parser.ParseException; import com.yahoo.vespa.documentmodel.SummaryTransform; @@ -29,8 +29,8 @@ public class ImplicitSummariesTestCase { LogHandler log = new LogHandler(); Logger.getLogger("").addHandler(log); - Search search = SearchBuilder.buildFromFile("src/test/examples/implicitsummaries_attribute.sd"); - assertNotNull(search); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/implicitsummaries_attribute.sd"); + assertNotNull(schema); assertTrue(log.records.isEmpty()); } @@ -60,19 +60,19 @@ public class ImplicitSummariesTestCase { @Test public void attribute_combiner_transform_is_set_on_array_of_struct_with_only_struct_field_attributes() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/derived/array_of_struct_attribute/test.sd"); - assertEquals(SummaryTransform.ATTRIBUTECOMBINER, search.getSummaryField("elem_array").getTransform()); + Schema schema = SearchBuilder.buildFromFile("src/test/derived/array_of_struct_attribute/test.sd"); + assertEquals(SummaryTransform.ATTRIBUTECOMBINER, schema.getSummaryField("elem_array").getTransform()); } @Test public void attribute_combiner_transform_is_set_on_map_of_struct_with_only_struct_field_attributes() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/derived/map_of_struct_attribute/test.sd"); - assertEquals(SummaryTransform.ATTRIBUTECOMBINER, search.getSummaryField("str_elem_map").getTransform()); + Schema schema = SearchBuilder.buildFromFile("src/test/derived/map_of_struct_attribute/test.sd"); + assertEquals(SummaryTransform.ATTRIBUTECOMBINER, schema.getSummaryField("str_elem_map").getTransform()); } @Test public void attribute_combiner_transform_is_not_set_when_map_of_struct_has_some_struct_field_attributes() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/derived/map_of_struct_attribute/test.sd"); - assertEquals(SummaryTransform.NONE, search.getSummaryField("int_elem_map").getTransform()); + Schema schema = SearchBuilder.buildFromFile("src/test/derived/map_of_struct_attribute/test.sd"); + assertEquals(SummaryTransform.NONE, schema.getSummaryField("int_elem_map").getTransform()); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSummaryFieldsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSummaryFieldsTestCase.java index b7707f2a517..78dabe9301a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSummaryFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSummaryFieldsTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.processing; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.parser.ParseException; @@ -17,10 +17,10 @@ public class ImplicitSummaryFieldsTestCase extends SchemaTestCase { @Test public void testRequireThatImplicitFieldsAreCreated() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/implicitsummaryfields.sd"); - assertNotNull(search); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/implicitsummaryfields.sd"); + assertNotNull(schema); - DocumentSummary docsum = search.getSummary("default"); + DocumentSummary docsum = schema.getSummary("default"); assertNotNull(docsum); assertNotNull(docsum.getSummaryField("rankfeatures")); assertNotNull(docsum.getSummaryField("summaryfeatures")); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java index 3aeba7cd265..e803d116235 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java @@ -3,7 +3,7 @@ package com.yahoo.searchdefinition.processing; import com.yahoo.document.DataType; import com.yahoo.document.TensorDataType; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.document.ImmutableImportedSDField; import com.yahoo.searchdefinition.document.ImmutableSDField; import com.yahoo.searchdefinition.document.ImportedField; @@ -36,9 +36,9 @@ public class ImportedFieldsResolverTestCase { ImportedField myField = model.importedFields.fields().get(fieldName); assertNotNull(myField); assertEquals(fieldName, myField.fieldName()); - assertSame(model.childSearch.getConcreteField("ref"), myField.reference().referenceField()); - assertSame(model.parentSearch, myField.reference().targetSearch()); - ImmutableSDField targetField = model.parentSearch.getField(targetFieldName); + assertSame(model.childSchema.getConcreteField("ref"), myField.reference().referenceField()); + assertSame(model.parentSchema, myField.reference().targetSearch()); + ImmutableSDField targetField = model.parentSchema.getField(targetFieldName); if (targetField instanceof SDField) { assertSame(targetField, myField.targetField()); } else { @@ -103,48 +103,48 @@ public class ImportedFieldsResolverTestCase { static class SearchModel extends ParentChildSearchModel { - public final Search grandParentSearch; + public final Schema grandParentSchema; public ImportedFields importedFields; public SearchModel() { super(); - grandParentSearch = createSearch("grandparent"); - grandParentSearch.getDocument().addField(createField("ancient_field", DataType.INT, "{ attribute }")); - - parentSearch.getDocument().addField(createField("attribute_field", DataType.INT, "{ attribute }")); - parentSearch.getDocument().addField(createField("attribute_and_index", DataType.INT, "{ attribute | index }")); - parentSearch.getDocument().addField(new TemporarySDField("not_attribute", DataType.INT)); - parentSearch.getDocument().addField(createField("tensor_field", new TensorDataType(TensorType.fromSpec("tensor(x[5])")), "{ attribute }")); - parentSearch.getDocument().addField(createField("predicate_field", DataType.PREDICATE, "{ attribute }")); - addRefField(parentSearch, grandParentSearch, "ref"); - addImportedField(parentSearch, "ancient_field", "ref", "ancient_field"); - - addRefField(childSearch, parentSearch, "ref"); + grandParentSchema = createSearch("grandparent"); + grandParentSchema.getDocument().addField(createField("ancient_field", DataType.INT, "{ attribute }")); + + parentSchema.getDocument().addField(createField("attribute_field", DataType.INT, "{ attribute }")); + parentSchema.getDocument().addField(createField("attribute_and_index", DataType.INT, "{ attribute | index }")); + parentSchema.getDocument().addField(new TemporarySDField("not_attribute", DataType.INT)); + parentSchema.getDocument().addField(createField("tensor_field", new TensorDataType(TensorType.fromSpec("tensor(x[5])")), "{ attribute }")); + parentSchema.getDocument().addField(createField("predicate_field", DataType.PREDICATE, "{ attribute }")); + addRefField(parentSchema, grandParentSchema, "ref"); + addImportedField(parentSchema, "ancient_field", "ref", "ancient_field"); + + addRefField(childSchema, parentSchema, "ref"); } protected SearchModel addImportedField(String fieldName, String referenceFieldName, String targetFieldName) { - return addImportedField(childSearch, fieldName, referenceFieldName, targetFieldName); + return addImportedField(childSchema, fieldName, referenceFieldName, targetFieldName); } - protected SearchModel addImportedField(Search search, String fieldName, String referenceFieldName, String targetFieldName) { - super.addImportedField(search, fieldName, referenceFieldName, targetFieldName); + protected SearchModel addImportedField(Schema schema, String fieldName, String referenceFieldName, String targetFieldName) { + super.addImportedField(schema, fieldName, referenceFieldName, targetFieldName); return this; } public void resolve() { - resolve(grandParentSearch); - resolve(parentSearch); - importedFields = resolve(childSearch); + resolve(grandParentSchema); + resolve(parentSchema); + importedFields = resolve(childSchema); } - private static ImportedFields resolve(Search search) { - assertNotNull(search.temporaryImportedFields().get()); - assertFalse(search.importedFields().isPresent()); - new ImportedFieldsResolver(search, null, null, null).process(true, false); - assertFalse(search.temporaryImportedFields().isPresent()); - assertNotNull(search.importedFields().get()); - return search.importedFields().get(); + private static ImportedFields resolve(Schema schema) { + assertNotNull(schema.temporaryImportedFields().get()); + assertFalse(schema.importedFields().isPresent()); + new ImportedFieldsResolver(schema, null, null, null).process(true, false); + assertFalse(schema.temporaryImportedFields().isPresent()); + assertNotNull(schema.importedFields().get()); + return schema.importedFields().get(); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java index 65010d96ec0..dbf099c61f0 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.processing; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.derived.AttributeFields; import com.yahoo.searchdefinition.document.ImportedComplexField; @@ -24,7 +24,7 @@ public class ImportedFieldsTestCase { @Test public void fields_can_be_imported_from_referenced_document_types() throws ParseException { - Search search = buildAdSearch(joinLines( + Schema schema = buildAdSearch(joinLines( "search ad {", " document ad {", " field campaign_ref type reference<campaign> { indexing: attribute }", @@ -33,9 +33,9 @@ public class ImportedFieldsTestCase { " import field campaign_ref.budget as my_budget {}", " import field person_ref.name as my_name {}", "}")); - assertEquals(2, search.importedFields().get().fields().size()); - assertSearchContainsImportedField("my_budget", "campaign_ref", "campaign", "budget", search); - assertSearchContainsImportedField("my_name", "person_ref", "person", "name", search); + assertEquals(2, schema.importedFields().get().fields().size()); + assertSearchContainsImportedField("my_budget", "campaign_ref", "campaign", "budget", schema); + assertSearchContainsImportedField("my_name", "person_ref", "person", "name", schema); } @Rule @@ -55,9 +55,9 @@ public class ImportedFieldsTestCase { @Test public void fail_duplicate_import() throws ParseException { exception.expect(IllegalArgumentException.class); - exception.expectMessage("For search 'ad', import field as 'my_budget': Field already imported"); - Search search = buildAdSearch(joinLines( - "search ad {", + exception.expectMessage("For schema 'ad', import field as 'my_budget': Field already imported"); + Schema schema = buildAdSearch(joinLines( + "schema ad {", " document ad {", " field campaign_ref type reference<campaign> { indexing: attribute }", " }", @@ -66,7 +66,7 @@ public class ImportedFieldsTestCase { "}")); } - private static Search buildAdSearch(String sdContent) throws ParseException { + private static Schema buildAdSearch(String sdContent) throws ParseException { SearchBuilder builder = new SearchBuilder(); builder.importString(joinLines("search campaign {", " document campaign {", @@ -84,29 +84,29 @@ public class ImportedFieldsTestCase { } private static void checkStructImport(AncestorStructSdBuilder parentBuilder) throws ParseException { - Search search = buildChildSearch(parentBuilder.build(), new ChildStructSdBuilder().build()); - checkImportedStructFields(search, parentBuilder); + Schema schema = buildChildSearch(parentBuilder.build(), new ChildStructSdBuilder().build()); + checkImportedStructFields(schema, parentBuilder); } private static void checkNestedStructImport(AncestorStructSdBuilder grandParentBuilder) throws ParseException { - Search search = buildChildSearch(grandParentBuilder.build(), - new IntermediateParentStructSdBuilder().build(), - new ChildStructSdBuilder().build()); - checkImportedStructFields(search, grandParentBuilder); - } - - private static void checkImportedStructFields(Search search, AncestorStructSdBuilder ancestorBuilder) { - assertEquals(3, search.importedFields().get().fields().size()); - checkImportedField("my_elem_array.name", "parent_ref", "parent", "elem_array.name", search, ancestorBuilder.elem_array_name_attr); - checkImportedField("my_elem_array.weight", "parent_ref", "parent", "elem_array.weight", search, ancestorBuilder.elem_array_weight_attr); - checkImportedField("my_elem_map.key", "parent_ref", "parent", "elem_map.key", search, ancestorBuilder.elem_map_key_attr); - checkImportedField("my_elem_map.value.name", "parent_ref", "parent", "elem_map.value.name", search, ancestorBuilder.elem_map_value_name_attr); - checkImportedField("my_elem_map.value.weight", "parent_ref", "parent", "elem_map.value.weight", search, ancestorBuilder.elem_map_value_weight_attr); - checkImportedField("my_str_int_map.key", "parent_ref", "parent", "str_int_map.key", search, ancestorBuilder.str_int_map_key_attr); - checkImportedField("my_str_int_map.value", "parent_ref", "parent", "str_int_map.value", search, ancestorBuilder.str_int_map_value_attr); - checkImportedField("my_elem_array", "parent_ref", "parent", "elem_array", search, true); - checkImportedField("my_elem_map", "parent_ref", "parent", "elem_map", search, true); - checkImportedField("my_str_int_map", "parent_ref", "parent", "str_int_map", search, true); + Schema schema = buildChildSearch(grandParentBuilder.build(), + new IntermediateParentStructSdBuilder().build(), + new ChildStructSdBuilder().build()); + checkImportedStructFields(schema, grandParentBuilder); + } + + private static void checkImportedStructFields(Schema schema, AncestorStructSdBuilder ancestorBuilder) { + assertEquals(3, schema.importedFields().get().fields().size()); + checkImportedField("my_elem_array.name", "parent_ref", "parent", "elem_array.name", schema, ancestorBuilder.elem_array_name_attr); + checkImportedField("my_elem_array.weight", "parent_ref", "parent", "elem_array.weight", schema, ancestorBuilder.elem_array_weight_attr); + checkImportedField("my_elem_map.key", "parent_ref", "parent", "elem_map.key", schema, ancestorBuilder.elem_map_key_attr); + checkImportedField("my_elem_map.value.name", "parent_ref", "parent", "elem_map.value.name", schema, ancestorBuilder.elem_map_value_name_attr); + checkImportedField("my_elem_map.value.weight", "parent_ref", "parent", "elem_map.value.weight", schema, ancestorBuilder.elem_map_value_weight_attr); + checkImportedField("my_str_int_map.key", "parent_ref", "parent", "str_int_map.key", schema, ancestorBuilder.str_int_map_key_attr); + checkImportedField("my_str_int_map.value", "parent_ref", "parent", "str_int_map.value", schema, ancestorBuilder.str_int_map_value_attr); + checkImportedField("my_elem_array", "parent_ref", "parent", "elem_array", schema, true); + checkImportedField("my_elem_map", "parent_ref", "parent", "elem_map", schema, true); + checkImportedField("my_str_int_map", "parent_ref", "parent", "str_int_map", schema, true); } @Test @@ -308,7 +308,7 @@ public class ImportedFieldsTestCase { } } - private static Search buildChildSearch(String parentSdContent, String sdContent) throws ParseException { + private static Schema buildChildSearch(String parentSdContent, String sdContent) throws ParseException { SearchBuilder builder = new SearchBuilder(); builder.importString(parentSdContent); builder.importString(sdContent); @@ -316,7 +316,7 @@ public class ImportedFieldsTestCase { return builder.getSearch("child"); } - private static Search buildChildSearch(String grandParentSdContent, String parentSdContent, String sdContent) throws ParseException { + private static Schema buildChildSearch(String grandParentSdContent, String parentSdContent, String sdContent) throws ParseException { SearchBuilder builder = new SearchBuilder(); builder.importString(grandParentSdContent); builder.importString(parentSdContent); @@ -389,19 +389,19 @@ public class ImportedFieldsTestCase { } private static void checkPosImport(ParentPosSdBuilder parentBuilder, DescendantPosSdBuilder childBuilder) throws ParseException { - Search search = buildChildSearch(parentBuilder.build(), childBuilder.build()); - checkImportedPosFields(search); + Schema schema = buildChildSearch(parentBuilder.build(), childBuilder.build()); + checkImportedPosFields(schema); } private static void checkNestedPosImport(GrandParentPosSdBuilder grandParentBuilder, DescendantPosSdBuilder childBuilder) throws ParseException { - Search search = buildChildSearch(grandParentBuilder.build(), new IntermediateParentPosSdBuilder().build(), childBuilder.build()); - checkImportedPosFields(search); + Schema schema = buildChildSearch(grandParentBuilder.build(), new IntermediateParentPosSdBuilder().build(), childBuilder.build()); + checkImportedPosFields(schema); } - private static void checkImportedPosFields(Search search) { - assertEquals(2, search.importedFields().get().fields().size()); - assertSearchContainsImportedField("my_pos_zcurve", "parent_ref", "parent", "pos_zcurve", search); - assertSearchContainsImportedField("my_pos", "parent_ref", "parent", "pos", search); + private static void checkImportedPosFields(Schema schema) { + assertEquals(2, schema.importedFields().get().fields().size()); + assertSearchContainsImportedField("my_pos_zcurve", "parent_ref", "parent", "pos_zcurve", schema); + assertSearchContainsImportedField("my_pos", "parent_ref", "parent", "pos", schema); } @Test @@ -421,22 +421,22 @@ public class ImportedFieldsTestCase { checkPosImport(new ParentPosSdBuilder(), new ChildPosSdBuilder().import_pos_zcurve_before(true)); } - private static ImportedField getImportedField(String name, Search search) { + private static ImportedField getImportedField(String name, Schema schema) { if (name.contains(".")) { - assertNull(search.importedFields().get().fields().get(name)); + assertNull(schema.importedFields().get().fields().get(name)); String superFieldName = name.substring(0,name.indexOf(".")); String subFieldName = name.substring(name.indexOf(".")+1); - ImportedField superField = search.importedFields().get().fields().get(superFieldName); + ImportedField superField = schema.importedFields().get().fields().get(superFieldName); if (superField != null && superField instanceof ImportedComplexField) { return ((ImportedComplexField)superField).getNestedField(subFieldName); } return null; } - return search.importedFields().get().fields().get(name); + return schema.importedFields().get().fields().get(name); } - private static void assertSearchNotContainsImportedField(String fieldName, Search search) { - ImportedField importedField = getImportedField(fieldName, search); + private static void assertSearchNotContainsImportedField(String fieldName, Schema schema) { + ImportedField importedField = getImportedField(fieldName, schema); assertNull(importedField); } @@ -444,8 +444,8 @@ public class ImportedFieldsTestCase { String referenceFieldName, String referenceDocType, String targetFieldName, - Search search) { - ImportedField importedField = getImportedField(fieldName, search); + Schema schema) { + ImportedField importedField = getImportedField(fieldName, schema); assertNotNull(importedField); assertEquals(fieldName, importedField.fieldName()); assertEquals(referenceFieldName, importedField.reference().referenceField().getName()); @@ -454,11 +454,11 @@ public class ImportedFieldsTestCase { } private static void checkImportedField(String fieldName, String referenceFieldName, String referenceDocType, - String targetFieldName, Search search, boolean present) { + String targetFieldName, Schema schema, boolean present) { if (present) { - assertSearchContainsImportedField(fieldName, referenceFieldName, referenceDocType, targetFieldName, search); + assertSearchContainsImportedField(fieldName, referenceFieldName, referenceDocType, targetFieldName, schema); } else { - assertSearchNotContainsImportedField(fieldName, search); + assertSearchNotContainsImportedField(fieldName, schema); } } @@ -479,7 +479,7 @@ public class ImportedFieldsTestCase { checkImportedField("entries_from_b.value", "ref_parent_b", "parent_b", "entries.value", child, true); } - private void assertParentContainsEntriesAttributes(Search parent) { + private void assertParentContainsEntriesAttributes(Schema parent) { var attrs = new AttributeFields(parent); assertTrue(attrs.containsAttribute("entries.key")); assertTrue(attrs.containsAttribute("entries.value")); 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 13581a1e9e6..aad7a725b9e 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 @@ -5,7 +5,7 @@ import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.document.DataType; import com.yahoo.searchdefinition.Index; import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.document.BooleanIndexDefinition; @@ -153,9 +153,9 @@ public class IndexingScriptRewriterTestCase extends SchemaTestCase { private static ScriptExpression processField(SDField unprocessedField) { SDDocumentType sdoc = new SDDocumentType("test"); sdoc.addField(unprocessedField); - Search search = new Search("test"); - search.addDocument(sdoc); - new Processing().process(search, new BaseDeployLogger(), new RankProfileRegistry(), new QueryProfiles(), true, false); + Schema schema = new Schema("test"); + schema.addDocument(sdoc); + new Processing().process(schema, new BaseDeployLogger(), new RankProfileRegistry(), new QueryProfiles(), true, false); return unprocessedField.getIndexingScript(); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java index 91f719c4eb8..5df8f20b5c7 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java @@ -3,7 +3,7 @@ package com.yahoo.searchdefinition.processing; import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.document.SDField; @@ -24,36 +24,36 @@ public class IntegerIndex2AttributeTestCase extends SchemaTestCase { @Test public void testIntegerIndex2Attribute() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/integerindex2attribute.sd"); - new IntegerIndex2Attribute(search, new BaseDeployLogger(), new RankProfileRegistry(), new QueryProfiles()).process(true, false); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/integerindex2attribute.sd"); + new IntegerIndex2Attribute(schema, new BaseDeployLogger(), new RankProfileRegistry(), new QueryProfiles()).process(true, false); SDField f; - f = search.getConcreteField("s1"); + f = schema.getConcreteField("s1"); assertTrue(f.getAttributes().isEmpty()); assertTrue(f.existsIndex("s1")); - f = search.getConcreteField("s2"); + f = schema.getConcreteField("s2"); assertEquals(f.getAttributes().size(), 1); assertTrue(f.existsIndex("s2")); - f = search.getConcreteField("as1"); + f = schema.getConcreteField("as1"); assertTrue(f.getAttributes().isEmpty()); assertTrue(f.existsIndex("as1")); - f = search.getConcreteField("as2"); + f = schema.getConcreteField("as2"); assertEquals(f.getAttributes().size(), 1); assertTrue(f.existsIndex("as2")); - f = search.getConcreteField("i1"); + f = schema.getConcreteField("i1"); assertEquals(f.getAttributes().size(), 1); assertFalse(f.existsIndex("i1")); - f = search.getConcreteField("i2"); + f = schema.getConcreteField("i2"); assertEquals(f.getAttributes().size(), 1); assertFalse(f.existsIndex("i2")); - f = search.getConcreteField("ai1"); - assertEquals(search.getConcreteField("ai1").getAttributes().size(), 1); - assertFalse(search.getConcreteField("ai1").existsIndex("ai1")); - f = search.getConcreteField("ai2"); + f = schema.getConcreteField("ai1"); + assertEquals(schema.getConcreteField("ai1").getAttributes().size(), 1); + assertFalse(schema.getConcreteField("ai1").existsIndex("ai1")); + f = schema.getConcreteField("ai2"); assertEquals(f.getAttributes().size(), 1); assertFalse(f.existsIndex("ai2")); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolverTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolverTestCase.java index ab98706fd44..80c3fa48d4e 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolverTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolverTestCase.java @@ -2,7 +2,7 @@ package com.yahoo.searchdefinition.processing; import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.parser.ParseException; import com.yahoo.vespa.documentmodel.SummaryField; @@ -168,11 +168,11 @@ public class MatchedElementsOnlyResolverTestCase { assertEquals(expSourceField, field.getSingleSource()); } - private Search buildSearch(String field) throws ParseException { + private Schema buildSearch(String field) throws ParseException { return buildSearch(field, ""); } - private Search buildSearch(String field, String summary) throws ParseException { + private Schema buildSearch(String field, String summary) throws ParseException { var builder = new SearchBuilder(new RankProfileRegistry()); builder.importString(joinLines("search test {", " document test {", diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java index 8d8a19796ba..73b4b9a7e53 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.processing; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.document.Matching; @@ -25,18 +25,18 @@ public class NGramTestCase extends SchemaTestCase { @Test public void testNGram() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/ngram.sd"); - assertNotNull(search); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/ngram.sd"); + assertNotNull(schema); - SDField gram1 = search.getConcreteField("gram_1"); + SDField gram1 = schema.getConcreteField("gram_1"); assertEquals(Matching.Type.GRAM, gram1.getMatching().getType()); assertEquals(1, gram1.getMatching().getGramSize()); - SDField gram2 = search.getConcreteField("gram_2"); + SDField gram2 = schema.getConcreteField("gram_2"); assertEquals(Matching.Type.GRAM, gram2.getMatching().getType()); assertEquals(-1, gram2.getMatching().getGramSize()); // Not set explicitly - SDField gram3=search.getConcreteField("gram_3"); + SDField gram3= schema.getConcreteField("gram_3"); assertEquals(Matching.Type.GRAM,gram3.getMatching().getType()); assertEquals(3, gram3.getMatching().getGramSize()); @@ -55,7 +55,7 @@ public class NGramTestCase extends SchemaTestCase { @Test public void testInvalidNGramSetting1() throws IOException, ParseException { try { - Search search = SearchBuilder.buildFromFile("src/test/examples/invalidngram1.sd"); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/invalidngram1.sd"); fail("Should cause an exception"); } catch (IllegalArgumentException e) { @@ -66,7 +66,7 @@ public class NGramTestCase extends SchemaTestCase { @Test public void testInvalidNGramSetting2() throws IOException, ParseException { try { - Search search = SearchBuilder.buildFromFile("src/test/examples/invalidngram2.sd"); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/invalidngram2.sd"); fail("Should cause an exception"); } catch (IllegalArgumentException e) { @@ -77,7 +77,7 @@ public class NGramTestCase extends SchemaTestCase { @Test public void testInvalidNGramSetting3() throws IOException, ParseException { try { - Search search = SearchBuilder.buildFromFile("src/test/examples/invalidngram3.sd"); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/invalidngram3.sd"); fail("Should cause an exception"); } catch (IllegalArgumentException e) { 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 59f0916f912..a01fdd8725d 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 @@ -2,7 +2,6 @@ package com.yahoo.searchdefinition.processing; import com.google.common.collect.ImmutableMap; -import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockApplicationPackage; @@ -12,7 +11,7 @@ import com.yahoo.document.TemporaryStructuredDataType; import com.yahoo.searchdefinition.Application; import com.yahoo.searchdefinition.DocumentReference; import com.yahoo.searchdefinition.DocumentReferences; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.derived.TestableDeployLogger; import com.yahoo.searchdefinition.document.SDDocumentType; import com.yahoo.searchdefinition.document.SDField; @@ -25,16 +24,16 @@ import com.yahoo.searchdefinition.document.TemporarySDField; public class ParentChildSearchModel { private final Application application = new Application(MockApplicationPackage.createEmpty()); - public Search parentSearch; - public Search childSearch; + public Schema parentSchema; + public Schema childSchema; ParentChildSearchModel() { - parentSearch = createSearch("parent"); - childSearch = createSearch("child"); + parentSchema = createSearch("parent"); + childSchema = createSearch("child"); } - protected Search createSearch(String name) { - Search result = new Search(name, application, new MockFileRegistry(), new TestableDeployLogger(), new TestProperties()); + protected Schema createSearch(String name) { + Schema result = new Schema(name, application, new MockFileRegistry(), new TestableDeployLogger(), new TestProperties()); result.addDocument(new SDDocumentType(name)); return result; } @@ -49,7 +48,7 @@ public class ParentChildSearchModel { return new TemporarySDField(fieldName, ReferenceDataType.createWithInferredId(TemporaryStructuredDataType.create(parentType))); } - protected static void addRefField(Search child, Search parent, String fieldName) { + protected static void addRefField(Schema child, Schema parent, String fieldName) { SDField refField = createRefField(parent.getName(), fieldName); child.getDocument().addField(refField); child.getDocument().setDocumentReferences(new DocumentReferences(ImmutableMap.of(refField.getName(), @@ -57,11 +56,11 @@ public class ParentChildSearchModel { } protected ParentChildSearchModel addImportedField(String fieldName, String referenceFieldName, String targetFieldName) { - return addImportedField(childSearch, fieldName, referenceFieldName, targetFieldName); + return addImportedField(childSchema, fieldName, referenceFieldName, targetFieldName); } - protected ParentChildSearchModel addImportedField(Search search, String fieldName, String referenceFieldName, String targetFieldName) { - search.temporaryImportedFields().get().add(new TemporaryImportedField(fieldName, referenceFieldName, targetFieldName)); + protected ParentChildSearchModel addImportedField(Schema schema, String fieldName, String referenceFieldName, String targetFieldName) { + schema.temporaryImportedFields().get().add(new TemporaryImportedField(fieldName, referenceFieldName, targetFieldName)); return this; } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java index bcec2bfacfa..e6f00646758 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.searchdefinition.processing; import com.yahoo.document.DataType; import com.yahoo.document.DocumentType; import com.yahoo.document.PositionDataType; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.document.Attribute; import com.yahoo.searchdefinition.document.FieldSet; @@ -31,20 +31,20 @@ public class PositionTestCase { "src/test/examples/position_base.sd", "src/test/examples/position_inherited.sd")); - Search search = sb.getSearch("position_inherited"); - FieldSet fieldSet = search.getDocument().getFieldSets().builtInFieldSets().get(DocumentType.DOCUMENT); + Schema schema = sb.getSearch("position_inherited"); + FieldSet fieldSet = schema.getDocument().getFieldSets().builtInFieldSets().get(DocumentType.DOCUMENT); assertFalse(fieldSet.getFieldNames().contains(PositionDataType.getZCurveFieldName("pos"))); } @Test public void requireThatPositionCanBeAttribute() throws Exception { - Search search = SearchBuilder.buildFromFile("src/test/examples/position_attribute.sd"); - assertNull(search.getAttribute("pos")); - assertNull(search.getAttribute("pos.x")); - assertNull(search.getAttribute("pos.y")); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/position_attribute.sd"); + assertNull(schema.getAttribute("pos")); + assertNull(schema.getAttribute("pos.x")); + assertNull(schema.getAttribute("pos.y")); - assertPositionAttribute(search, "pos", Attribute.CollectionType.SINGLE); - assertPositionSummary(search, "pos", false); + assertPositionAttribute(schema, "pos", Attribute.CollectionType.SINGLE); + assertPositionSummary(schema, "pos", false); } @Test @@ -60,13 +60,13 @@ public class PositionTestCase { @Test public void requireThatSummaryAloneDoesNotCreateZCurve() throws Exception { - Search search = SearchBuilder.buildFromFile("src/test/examples/position_summary.sd"); - assertNull(search.getAttribute("pos")); - assertNull(search.getAttribute("pos.x")); - assertNull(search.getAttribute("pos.y")); - assertNull(search.getAttribute("pos.zcurve")); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/position_summary.sd"); + assertNull(schema.getAttribute("pos")); + assertNull(schema.getAttribute("pos.x")); + assertNull(schema.getAttribute("pos.y")); + assertNull(schema.getAttribute("pos.zcurve")); - SummaryField summary = search.getSummaryField("pos"); + SummaryField summary = schema.getSummaryField("pos"); assertNotNull(summary); assertEquals(2, summary.getSourceCount()); Iterator<SummaryField.Source> it = summary.getSources().iterator(); @@ -74,61 +74,61 @@ public class PositionTestCase { assertEquals("pos.y", it.next().getName()); assertEquals(SummaryTransform.NONE, summary.getTransform()); - assertNull(search.getSummaryField("pos_ext.distance")); + assertNull(schema.getSummaryField("pos_ext.distance")); } @Test public void requireThatExtraFieldCanBePositionAttribute() throws Exception { - Search search = SearchBuilder.buildFromFile("src/test/examples/position_extra.sd"); - assertNull(search.getAttribute("pos_ext")); - assertNull(search.getAttribute("pos_ext.x")); - assertNull(search.getAttribute("pos_ext.y")); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/position_extra.sd"); + assertNull(schema.getAttribute("pos_ext")); + assertNull(schema.getAttribute("pos_ext.x")); + assertNull(schema.getAttribute("pos_ext.y")); - assertPositionAttribute(search, "pos_ext", Attribute.CollectionType.SINGLE); - assertPositionSummary(search, "pos_ext", false); + assertPositionAttribute(schema, "pos_ext", Attribute.CollectionType.SINGLE); + assertPositionSummary(schema, "pos_ext", false); } @Test public void requireThatPositionArrayIsSupported() throws Exception { - Search search = SearchBuilder.buildFromFile("src/test/examples/position_array.sd"); - assertNull(search.getAttribute("pos")); - assertNull(search.getAttribute("pos.x")); - assertNull(search.getAttribute("pos.y")); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/position_array.sd"); + assertNull(schema.getAttribute("pos")); + assertNull(schema.getAttribute("pos.x")); + assertNull(schema.getAttribute("pos.y")); - assertPositionAttribute(search, "pos", Attribute.CollectionType.ARRAY); - assertPositionSummary(search, "pos", true); + assertPositionAttribute(schema, "pos", Attribute.CollectionType.ARRAY); + assertPositionSummary(schema, "pos", true); } - private static void assertPositionAttribute(Search search, String fieldName, Attribute.CollectionType type) { - Attribute attribute = search.getAttribute(PositionDataType.getZCurveFieldName(fieldName)); + private static void assertPositionAttribute(Schema schema, String fieldName, Attribute.CollectionType type) { + Attribute attribute = schema.getAttribute(PositionDataType.getZCurveFieldName(fieldName)); assertNotNull(attribute); assertTrue(attribute.isPosition()); assertEquals(attribute.getCollectionType(), type); assertEquals(attribute.getType(), Attribute.Type.LONG); } - private static void assertPositionSummary(Search search, String fieldName, boolean isArray) { - assertSummaryField(search, + private static void assertPositionSummary(Schema schema, String fieldName, boolean isArray) { + assertSummaryField(schema, fieldName, PositionDataType.getZCurveFieldName(fieldName), (isArray ? DataType.getArray(PositionDataType.INSTANCE) : PositionDataType.INSTANCE), SummaryTransform.GEOPOS); - assertSummaryField(search, + assertSummaryField(schema, PositionDataType.getDistanceSummaryFieldName(fieldName), PositionDataType.getZCurveFieldName(fieldName), DataType.INT, SummaryTransform.DISTANCE); - assertSummaryField(search, + assertSummaryField(schema, PositionDataType.getPositionSummaryFieldName(fieldName), PositionDataType.getZCurveFieldName(fieldName), DataType.getArray(DataType.STRING), SummaryTransform.POSITIONS); } - private static void assertSummaryField(Search search, String fieldName, String sourceName, DataType dataType, + private static void assertSummaryField(Schema schema, String fieldName, String sourceName, DataType dataType, SummaryTransform transform) { - SummaryField summary = search.getSummaryField(fieldName); + SummaryField summary = schema.getSummaryField(fieldName); assertNotNull(summary); assertEquals(1, summary.getSourceCount()); assertEquals(sourceName, summary.getSingleSource()); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankModifierTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankModifierTestCase.java index dc7305f55c3..0aa4c3917d2 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankModifierTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankModifierTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.processing; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.parser.ParseException; @@ -17,6 +17,6 @@ import java.io.IOException; public class RankModifierTestCase extends SchemaTestCase { @Test public void testLiteral() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/rankmodifier/literal.sd"); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/rankmodifier/literal.sd"); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java index 1b8160e0123..7ffb20859e9 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java @@ -12,7 +12,7 @@ import com.yahoo.path.Path; import com.yahoo.search.query.profile.QueryProfileRegistry; import com.yahoo.searchdefinition.RankProfile; import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.parser.ParseException; import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; @@ -43,7 +43,7 @@ class RankProfileSearchFixture { new XGBoostImporter()); private final RankProfileRegistry rankProfileRegistry = new RankProfileRegistry(); private final QueryProfileRegistry queryProfileRegistry; - private final Search search; + private final Schema schema; private final Map<String, RankProfile> compiledRankProfiles = new HashMap<>(); private final ExecutorService executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()); @@ -79,7 +79,7 @@ class RankProfileSearchFixture { "}"; builder.importString(sdContent); builder.build(); - search = builder.getSearch(); + schema = builder.getSearch(); } public void assertFirstPhaseExpression(String expExpression, String rankProfile) { @@ -106,7 +106,7 @@ class RankProfileSearchFixture { } public RankProfile compileRankProfile(String rankProfile, Path applicationDir) { - RankProfile compiled = rankProfileRegistry.get(search, rankProfile) + RankProfile compiled = rankProfileRegistry.get(schema, rankProfile) .compile(queryProfileRegistry, new ImportedMlModels(applicationDir.toFile(), executor, importers)); compiledRankProfiles.put(rankProfile, compiled); @@ -115,7 +115,7 @@ class RankProfileSearchFixture { /** Returns the given uncompiled profile */ public RankProfile rankProfile(String rankProfile) { - return rankProfileRegistry.get(search, rankProfile); + return rankProfileRegistry.get(schema, rankProfile); } /** Returns the given compiled profile, or null if not compiled yet or not present at all */ @@ -123,6 +123,6 @@ class RankProfileSearchFixture { return compiledRankProfiles.get(rankProfile); } - public Search search() { return search; } + public Schema search() { return schema; } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankPropertyVariablesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankPropertyVariablesTestCase.java index 407a5877976..3f77741aa2a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankPropertyVariablesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankPropertyVariablesTestCase.java @@ -5,7 +5,7 @@ import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.search.query.profile.QueryProfileRegistry; import com.yahoo.searchdefinition.RankProfile.RankProperty; import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.parser.ParseException; @@ -21,16 +21,16 @@ public class RankPropertyVariablesTestCase extends SchemaTestCase { @Test public void testRankPropVariables() throws IOException, ParseException { RankProfileRegistry rankProfileRegistry = new RankProfileRegistry(); - Search search = SearchBuilder.buildFromFile("src/test/examples/rankpropvars.sd", + Schema schema = SearchBuilder.buildFromFile("src/test/examples/rankpropvars.sd", new BaseDeployLogger(), rankProfileRegistry, new QueryProfileRegistry()); - assertRankPropEquals(rankProfileRegistry.get(search, "other").getRankProperties(), "$testvar1", "foo"); - assertRankPropEquals(rankProfileRegistry.get(search, "other").getRankProperties(), "$testvar_2", "bar"); - assertRankPropEquals(rankProfileRegistry.get(search, "other").getRankProperties(), "$testvarOne23", "baz"); - assertRankPropEquals(rankProfileRegistry.get(search, "another").getRankProperties(), "$Testvar1", "1"); - assertRankPropEquals(rankProfileRegistry.get(search, "another").getRankProperties(), "$Testvar_4", "4"); - assertRankPropEquals(rankProfileRegistry.get(search, "another").getRankProperties(), "$testvarFour23", "234234.234"); + assertRankPropEquals(rankProfileRegistry.get(schema, "other").getRankProperties(), "$testvar1", "foo"); + assertRankPropEquals(rankProfileRegistry.get(schema, "other").getRankProperties(), "$testvar_2", "bar"); + assertRankPropEquals(rankProfileRegistry.get(schema, "other").getRankProperties(), "$testvarOne23", "baz"); + assertRankPropEquals(rankProfileRegistry.get(schema, "another").getRankProperties(), "$Testvar1", "1"); + assertRankPropEquals(rankProfileRegistry.get(schema, "another").getRankProperties(), "$Testvar_4", "4"); + assertRankPropEquals(rankProfileRegistry.get(schema, "another").getRankProperties(), "$testvarFour23", "234234.234"); } private void assertRankPropEquals(List<RankProperty> props, String key, String val) { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTransformerTokensTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTransformerTokensTestCase.java index dcd7e2426c3..e77787e22ca 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTransformerTokensTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTransformerTokensTestCase.java @@ -8,7 +8,7 @@ import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.search.query.profile.QueryProfileRegistry; import com.yahoo.searchdefinition.RankProfile; import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.expressiontransforms.RankProfileTransformContext; import com.yahoo.searchdefinition.expressiontransforms.TokenTransformer; @@ -90,8 +90,8 @@ public class RankingExpressionWithTransformerTokensTestCase { SearchBuilder searchBuilder = new SearchBuilder(application, new MockFileRegistry(), new BaseDeployLogger(), new TestProperties(), rankProfileRegistry, queryProfileRegistry); searchBuilder.importString(sdContent); searchBuilder.build(); - Search search = searchBuilder.getSearch(); - RankProfile rp = rankProfileRegistry.get(search, "my_profile"); + Schema schema = searchBuilder.getSearch(); + RankProfile rp = rankProfileRegistry.get(schema, "my_profile"); return new RankProfileTransformContext(rp, queryProfileRegistry, Collections.emptyMap(), null, Collections.emptyMap(), Collections.emptyMap()); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java index 27ea680d97a..a76379d185f 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java @@ -9,8 +9,8 @@ import com.yahoo.search.query.profile.QueryProfileRegistry; import com.yahoo.searchdefinition.LargeRankExpressions; import com.yahoo.searchdefinition.RankProfile; import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SchemaTestCase; -import com.yahoo.searchdefinition.Search; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.derived.DerivedConfiguration; import com.yahoo.searchdefinition.derived.AttributeFields; @@ -30,7 +30,7 @@ import static org.junit.Assert.assertTrue; public class RankingExpressionsTestCase extends SchemaTestCase { - private static Search createSearch(String dir, ModelContext.Properties deployProperties, RankProfileRegistry rankProfileRegistry) throws IOException, ParseException { + private static Schema createSearch(String dir, ModelContext.Properties deployProperties, RankProfileRegistry rankProfileRegistry) throws IOException, ParseException { return SearchBuilder.createFromDirectory(dir, new MockFileRegistry(), new TestableDeployLogger(), deployProperties, rankProfileRegistry).getSearch(); } @@ -38,8 +38,8 @@ public class RankingExpressionsTestCase extends SchemaTestCase { public void testFunctions() throws IOException, ParseException { ModelContext.Properties deployProperties = new TestProperties(); RankProfileRegistry rankProfileRegistry = new RankProfileRegistry(); - Search search = createSearch("src/test/examples/rankingexpressionfunction", deployProperties, rankProfileRegistry); - RankProfile functionsRankProfile = rankProfileRegistry.get(search, "macros"); + Schema schema = createSearch("src/test/examples/rankingexpressionfunction", deployProperties, rankProfileRegistry); + RankProfile functionsRankProfile = rankProfileRegistry.get(schema, "macros"); Map<String, RankProfile.RankingExpressionFunction> functions = functionsRankProfile.getFunctions(); assertEquals(2, functions.get("titlematch$").function().arguments().size()); assertEquals("var1", functions.get("titlematch$").function().arguments().get(0)); @@ -52,7 +52,7 @@ public class RankingExpressionsTestCase extends SchemaTestCase { assertEquals(0, functions.get("artistmatch").function().arguments().size()); RawRankProfile rawRankProfile = new RawRankProfile(functionsRankProfile, new LargeRankExpressions(new MockFileRegistry()), new QueryProfileRegistry(), - new ImportedMlModels(), new AttributeFields(search), deployProperties); + new ImportedMlModels(), new AttributeFields(schema), deployProperties); List<Pair<String, String>> rankProperties = rawRankProfile.configProperties(); assertEquals(6, rankProperties.size()); @@ -75,8 +75,8 @@ public class RankingExpressionsTestCase extends SchemaTestCase { @Test(expected = IllegalArgumentException.class) public void testThatIncludingFileInSubdirFails() throws IOException, ParseException { RankProfileRegistry registry = new RankProfileRegistry(); - Search search = createSearch("src/test/examples/rankingexpressioninfile", new TestProperties(), registry); - new DerivedConfiguration(search, registry); // rank profile parsing happens during deriving + Schema schema = createSearch("src/test/examples/rankingexpressioninfile", new TestProperties(), registry); + new DerivedConfiguration(schema, registry); // rank profile parsing happens during deriving } private void verifyProfile(RankProfile profile, List<String> expectedFunctions, List<Pair<String, String>> rankProperties, @@ -96,20 +96,20 @@ public class RankingExpressionsTestCase extends SchemaTestCase { } } - private void verifySearch(Search search, RankProfileRegistry rankProfileRegistry, LargeRankExpressions largeExpressions, + private void verifySearch(Schema schema, RankProfileRegistry rankProfileRegistry, LargeRankExpressions largeExpressions, QueryProfileRegistry queryProfiles, ImportedMlModels models, ModelContext.Properties properties) { - AttributeFields attributes = new AttributeFields(search); + AttributeFields attributes = new AttributeFields(schema); - verifyProfile(rankProfileRegistry.get(search, "base"), Arrays.asList("large_f", "large_m"), - Arrays.asList(new Pair<>("rankingExpression(large_f).expressionName", "base.large_f"), new Pair<>("rankingExpression(large_m).expressionName", "base.large_m")), - largeExpressions, queryProfiles, models, attributes, properties); + verifyProfile(rankProfileRegistry.get(schema, "base"), Arrays.asList("large_f", "large_m"), + Arrays.asList(new Pair<>("rankingExpression(large_f).expressionName", "base.large_f"), new Pair<>("rankingExpression(large_m).expressionName", "base.large_m")), + largeExpressions, queryProfiles, models, attributes, properties); for (String child : Arrays.asList("child_a", "child_b")) { - verifyProfile(rankProfileRegistry.get(search, child), Arrays.asList("large_f", "large_m", "large_local_f", "large_local_m"), - Arrays.asList(new Pair<>("rankingExpression(large_f).expressionName", child + ".large_f"), new Pair<>("rankingExpression(large_m).expressionName", child + ".large_m"), + verifyProfile(rankProfileRegistry.get(schema, child), Arrays.asList("large_f", "large_m", "large_local_f", "large_local_m"), + Arrays.asList(new Pair<>("rankingExpression(large_f).expressionName", child + ".large_f"), new Pair<>("rankingExpression(large_m).expressionName", child + ".large_m"), new Pair<>("rankingExpression(large_local_f).expressionName", child + ".large_local_f"), new Pair<>("rankingExpression(large_local_m).expressionName", child + ".large_local_m"), new Pair<>("vespa.rank.firstphase", "rankingExpression(firstphase)"), new Pair<>("rankingExpression(firstphase).expressionName", child + ".firstphase")), - largeExpressions, queryProfiles, models, attributes, properties); + largeExpressions, queryProfiles, models, attributes, properties); } } @@ -120,9 +120,9 @@ public class RankingExpressionsTestCase extends SchemaTestCase { LargeRankExpressions largeExpressions = new LargeRankExpressions(new MockFileRegistry()); QueryProfileRegistry queryProfiles = new QueryProfileRegistry(); ImportedMlModels models = new ImportedMlModels(); - Search search = createSearch("src/test/examples/largerankingexpressions", properties, rankProfileRegistry); - verifySearch(search, rankProfileRegistry, largeExpressions, queryProfiles, models, properties); + Schema schema = createSearch("src/test/examples/largerankingexpressions", properties, rankProfileRegistry); + verifySearch(schema, rankProfileRegistry, largeExpressions, queryProfiles, models, properties); // Need to verify that second derivation works as that will happen if same sd is used in multiple content clusters - verifySearch(search, rankProfileRegistry, largeExpressions, queryProfiles, models, properties); + verifySearch(schema, rankProfileRegistry, largeExpressions, queryProfiles, models, properties); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java index ad38e65e655..41b9d480921 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java @@ -5,7 +5,7 @@ import com.yahoo.document.DataType; import com.yahoo.document.Field; import com.yahoo.document.ReferenceDataType; import com.yahoo.searchdefinition.DocumentGraphValidator; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.document.SDDocumentType; import com.yahoo.searchdefinition.parser.ParseException; @@ -50,9 +50,9 @@ public class ReferenceFieldTestCase { builder.importString(salespersonSdContent); builder.importString(adSdContent); builder.build(); - Search search = builder.getSearch("ad"); - assertSearchContainsReferenceField("campaign_ref", "campaign", search.getDocument()); - assertSearchContainsReferenceField("salesperson_ref", "salesperson", search.getDocument()); + Schema schema = builder.getSearch("ad"); + assertSearchContainsReferenceField("campaign_ref", "campaign", schema.getDocument()); + assertSearchContainsReferenceField("salesperson_ref", "salesperson", schema.getDocument()); } @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/SearchMustHaveDocumentTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/SchemaMustHaveDocumentTest.java index 4fe03fe0faa..53ca4bf10a5 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/SearchMustHaveDocumentTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/SchemaMustHaveDocumentTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.fail; /** * @author hmusum */ -public class SearchMustHaveDocumentTest { +public class SchemaMustHaveDocumentTest { @Test public void requireErrorWhenMissingDocument() throws IOException, ParseException { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/SummaryConsistencyTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/SummaryConsistencyTestCase.java index 71b4db60886..e0593aef1e3 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/SummaryConsistencyTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/SummaryConsistencyTestCase.java @@ -1,7 +1,7 @@ // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.processing; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.parser.ParseException; import com.yahoo.vespa.documentmodel.SummaryTransform; @@ -39,7 +39,7 @@ public class SummaryConsistencyTestCase { "", "}" ); - Search search = SearchBuilder.createFromString(sd).getSearch(); - assertEquals(SummaryTransform.ATTRIBUTECOMBINER, search.getSummaryField("elem_array_unfiltered").getTransform()); + Schema schema = SearchBuilder.createFromString(sd).getSearch(); + assertEquals(SummaryTransform.ATTRIBUTECOMBINER, schema.getSummaryField("elem_array_unfiltered").getTransform()); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSourceTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSourceTestCase.java index adb6cc03d5b..da1037b6fd7 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSourceTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSourceTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.searchdefinition.processing; import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.parser.ParseException; @@ -50,11 +50,11 @@ public class SummaryFieldsMustHaveValidSourceTestCase extends SchemaTestCase { @Test public void requireThatDocumentIdIsAllowedToPass() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/documentidinsummary.sd"); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/documentidinsummary.sd"); BaseDeployLogger deployLogger = new BaseDeployLogger(); RankProfileRegistry rankProfileRegistry = new RankProfileRegistry(); - new SummaryFieldsMustHaveValidSource(search, deployLogger, rankProfileRegistry, new QueryProfiles()).process(true, false); - assertEquals("documentid", search.getSummary("withid").getSummaryField("w").getSingleSource()); + new SummaryFieldsMustHaveValidSource(schema, deployLogger, rankProfileRegistry, new QueryProfiles()).process(true, false); + assertEquals("documentid", schema.getSummary("withid").getSummaryField("w").getSingleSource()); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java index 8714568338f..19ae565ed07 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java @@ -3,7 +3,6 @@ package com.yahoo.searchdefinition.processing; import com.yahoo.collections.Pair; import com.yahoo.component.ComponentId; -import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.search.query.profile.QueryProfileRegistry; @@ -14,7 +13,7 @@ import com.yahoo.search.query.profile.types.QueryProfileTypeRegistry; import com.yahoo.searchdefinition.LargeRankExpressions; import com.yahoo.searchdefinition.RankProfile; import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.derived.AttributeFields; @@ -199,7 +198,7 @@ public class TensorTransformTestCase extends SchemaTestCase { " }\n" + "}\n"); builder.build(true); - Search s = builder.getSearch(); + Schema s = builder.getSearch(); RankProfile test = rankProfileRegistry.get(s, "test").compile(queryProfiles, new ImportedMlModels()); List<Pair<String, String>> testRankProperties = new RawRankProfile(test, new LargeRankExpressions(new MockFileRegistry()), 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 ab6a547d9e5..4c56d2a5ab0 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 @@ -8,7 +8,7 @@ import com.yahoo.document.DataType; import com.yahoo.document.Field; import com.yahoo.searchdefinition.Application; import com.yahoo.searchdefinition.DocumentReference; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.derived.TestableDeployLogger; import com.yahoo.searchdefinition.document.ImportedField; import com.yahoo.searchdefinition.document.ImportedFields; @@ -36,11 +36,11 @@ public class ValidateFieldTypesTest { @Test public void throws_exception_if_type_of_document_field_does_not_match_summary_field() { - Search search = createSearchWithDocument(DOCUMENT_NAME); - search.setImportedFields(createSingleImportedField(IMPORTED_FIELD_NAME, DataType.INT)); - search.addSummary(createDocumentSummary(IMPORTED_FIELD_NAME, DataType.STRING, search)); + Schema schema = createSearchWithDocument(DOCUMENT_NAME); + schema.setImportedFields(createSingleImportedField(IMPORTED_FIELD_NAME, DataType.INT)); + schema.addSummary(createDocumentSummary(IMPORTED_FIELD_NAME, DataType.STRING, schema)); - ValidateFieldTypes validator = new ValidateFieldTypes(search, null, null, null); + ValidateFieldTypes validator = new ValidateFieldTypes(schema, null, null, null); exceptionRule.expect(IllegalArgumentException.class); exceptionRule.expectMessage( "For search '" + DOCUMENT_NAME + "', field '" + IMPORTED_FIELD_NAME + "': Incompatible types. " + @@ -48,27 +48,27 @@ public class ValidateFieldTypesTest { validator.process(true, false); } - private static Search createSearch(String documentType) { - return new Search(documentType, new Application(MockApplicationPackage.createEmpty()), new MockFileRegistry(), new TestableDeployLogger(), new TestProperties()); + private static Schema createSearch(String documentType) { + return new Schema(documentType, new Application(MockApplicationPackage.createEmpty()), new MockFileRegistry(), new TestableDeployLogger(), new TestProperties()); } - private static Search createSearchWithDocument(String documentName) { - Search search = createSearch(documentName); - SDDocumentType document = new SDDocumentType(documentName, search); - search.addDocument(document); - return search; + private static Schema createSearchWithDocument(String documentName) { + Schema schema = createSearch(documentName); + SDDocumentType document = new SDDocumentType(documentName, schema); + schema.addDocument(document); + return schema; } private static ImportedFields createSingleImportedField(String fieldName, DataType dataType) { - Search targetSearch = createSearch("target_doc"); + Schema targetSchema = createSearch("target_doc"); SDField targetField = new SDField("target_field", dataType); - DocumentReference documentReference = new DocumentReference(new Field("reference_field"), targetSearch); + DocumentReference documentReference = new DocumentReference(new Field("reference_field"), targetSchema); ImportedField importedField = new ImportedSimpleField(fieldName, documentReference, targetField); return new ImportedFields(Collections.singletonMap(fieldName, importedField)); } - private static DocumentSummary createDocumentSummary(String fieldName, DataType dataType, Search search) { - DocumentSummary summary = new DocumentSummary("mysummary", search); + private static DocumentSummary createDocumentSummary(String fieldName, DataType dataType, Schema schema) { + DocumentSummary summary = new DocumentSummary("mysummary", schema); summary.add(new SummaryField(fieldName, dataType)); return summary; } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/WeightedSetSummaryToTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/WeightedSetSummaryToTestCase.java index 3b2875d303c..eec382a115c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/WeightedSetSummaryToTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/WeightedSetSummaryToTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.processing; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.SchemaTestCase; import com.yahoo.searchdefinition.parser.ParseException; @@ -16,8 +16,8 @@ public class WeightedSetSummaryToTestCase extends SchemaTestCase { @Test public void testRequireThatImplicitFieldsAreCreated() throws IOException, ParseException { - Search search = SearchBuilder.buildFromFile("src/test/examples/weightedset-summaryto.sd"); - assertNotNull(search); + Schema schema = SearchBuilder.buildFromFile("src/test/examples/weightedset-summaryto.sd"); + assertNotNull(schema); } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/SearchDataTypeValidatorTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/SchemaDataTypeValidatorTestCase.java index cbea01e3ca3..b7b83dbf68c 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/SearchDataTypeValidatorTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/SchemaDataTypeValidatorTestCase.java @@ -10,7 +10,7 @@ import static org.junit.Assert.fail; /** * @author Simon Thoresen Hult */ -public class SearchDataTypeValidatorTestCase { +public class SchemaDataTypeValidatorTestCase { @Test public void requireThatSupportedTypesAreValidated() { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexedSearchClusterChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexedSchemaClusterChangeValidatorTest.java index 44d62b72ce2..7b1474f9754 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexedSearchClusterChangeValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexedSchemaClusterChangeValidatorTest.java @@ -21,7 +21,7 @@ import static com.yahoo.vespa.model.application.validation.change.ConfigChangeTe import static com.yahoo.vespa.model.application.validation.change.ConfigChangeTestUtils.normalizeServicesInActions; import static org.junit.Assert.assertTrue; -public class IndexedSearchClusterChangeValidatorTest { +public class IndexedSchemaClusterChangeValidatorTest { static class Fixture { VespaModel currentModel; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StreamingSearchClusterChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StreamingSchemaClusterChangeValidatorTest.java index a4080250c60..dddb6a38db1 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StreamingSearchClusterChangeValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StreamingSchemaClusterChangeValidatorTest.java @@ -22,7 +22,7 @@ import static com.yahoo.vespa.model.application.validation.change.ConfigChangeTe import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -public class StreamingSearchClusterChangeValidatorTest { +public class StreamingSchemaClusterChangeValidatorTest { private static class Fixture { VespaModel currentModel; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSchemaTuningBuilderTest.java index 7578fc5c8f8..4ed355a7dca 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSchemaTuningBuilderTest.java @@ -18,7 +18,7 @@ import static org.junit.Assert.assertTrue; /** * @author geirst */ -public class DomSearchTuningBuilderTest extends DomBuilderTest { +public class DomSchemaTuningBuilderTest extends DomBuilderTest { private static final double DELTA = 0.000001; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearchChainsBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSchemaChainsBuilderTest.java index a34a5c577b7..86c448c403c 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearchChainsBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSchemaChainsBuilderTest.java @@ -35,7 +35,7 @@ import static org.junit.Assert.fail; * * @author Tony Vaagenes */ -public class DomSearchChainsBuilderTest extends DomBuilderTest { +public class DomSchemaChainsBuilderTest extends DomBuilderTest { private SearchChains searchChains; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/Federation2Test.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/Federation2Test.java index 76b5a102155..ac272301445 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/Federation2Test.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/Federation2Test.java @@ -10,7 +10,7 @@ import static org.junit.Assert.assertEquals; /** * @author bratseth */ -public class Federation2Test extends SearchChainsTestBase { +public class Federation2Test extends SchemaChainsTestBase { @Override Element servicesXml() { return parse( diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/FederationTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/FederationTest.java index 0c1b2de1c5d..39fcb9d5af2 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/FederationTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/FederationTest.java @@ -14,7 +14,7 @@ import static org.junit.Assert.*; * Test generated config for federation. * @author Tony Vaagenes */ -public class FederationTest extends SearchChainsTestBase { +public class FederationTest extends SchemaChainsTestBase { @Override Element servicesXml() { return parse( diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTest.java index f55bbe4aee0..9ccfa768dc1 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.*; * * @author Tony Vaagenes */ -public class SearchChainsTest extends SearchChainsTestBase { +public class SchemaChainsTest extends SchemaChainsTestBase { private ChainsConfig chainsConfig; private ProviderConfig providerConfig; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest2.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTest2.java index 40182c74be6..04bda0bce21 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest2.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTest2.java @@ -15,7 +15,7 @@ import static org.junit.Assert.fail; /** * @author gjoranv */ -public class SearchChainsTest2 { +public class SchemaChainsTest2 { private MockRoot root; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTestBase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTestBase.java index 8b92704df3d..e654f8deee1 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTestBase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTestBase.java @@ -9,7 +9,7 @@ import org.w3c.dom.Element; /** Creates SearchChains model from xml input. * @author Tony Vaagenes */ -public abstract class SearchChainsTestBase extends DomBuilderTest { +public abstract class SchemaChainsTestBase extends DomBuilderTest { @Before public void setupSearchChains() { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SchemaBuilderTest.java index 794cfa1f18a..e7901ebd5f0 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SchemaBuilderTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.fail; /** * @author gjoranv */ -public class SearchBuilderTest extends ContainerModelBuilderTestBase { +public class SchemaBuilderTest extends ContainerModelBuilderTestBase { private ChainsConfig chainsConfig() { return root.getConfig(ChainsConfig.class, "default/component/com.yahoo.search.handler.SearchHandler"); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSchemaClusterTest.java index 2383c2db407..d6020a96818 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSchemaClusterTest.java @@ -31,7 +31,7 @@ import static org.junit.Assert.assertTrue; * * @author geirst */ -public class ContentSearchClusterTest { +public class ContentSchemaClusterTest { private static double EPSILON = 0.000001; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSchemaTest.java index 12f3d722e5e..952a0b945dd 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSchemaTest.java @@ -9,7 +9,7 @@ import static org.junit.Assert.assertNull; /** * @author Simon Thoresen Hult */ -public class ContentSearchTest { +public class ContentSchemaTest { @Test public void requireThatAccessorsWork() { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedSearchNodeNamingTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedSchemaNodeNamingTest.java index 55c9853b02b..17e295c1c2a 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedSearchNodeNamingTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedSchemaNodeNamingTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; * * @author geirst */ -public class IndexedSearchNodeNamingTest { +public class IndexedSchemaNodeNamingTest { private ContentCluster getSingleNodeCluster() throws Exception { String groupXml = joinLines(" <group>", diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/SearchCoverageTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/SchemaCoverageTest.java index 8db115aeb10..66184d74251 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/SearchCoverageTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/SchemaCoverageTest.java @@ -10,7 +10,7 @@ import static org.junit.Assert.fail; /** * @author Simon Thoresen Hult */ -public class SearchCoverageTest { +public class SchemaCoverageTest { @Test public void requireThatAccessorWork() { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/DomContentSearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/DomContentSchemaBuilderTest.java index 5222d0a8715..b8788ece7b6 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/DomContentSearchBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/DomContentSchemaBuilderTest.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertNull; /** * @author Simon Thoresen Hult */ -public class DomContentSearchBuilderTest { +public class DomContentSchemaBuilderTest { @Test public void requireThatDefaultsAreNull() throws Exception { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/DomSearchCoverageBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/DomSchemaCoverageBuilderTest.java index 7512b6b5469..6c5456e73fc 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/DomSearchCoverageBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/DomSchemaCoverageBuilderTest.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertNull; /** * @author Simon Thoresen Hult */ -public class DomSearchCoverageBuilderTest { +public class DomSchemaCoverageBuilderTest { @Test public void requireThatDefaultsAreNull() throws Exception { 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/SchemaClusterTest.java index 660ec9f13f1..27dda6a6bb2 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/SchemaClusterTest.java @@ -5,7 +5,7 @@ import com.yahoo.component.ComponentId; import com.yahoo.container.QrSearchersConfig; import com.yahoo.document.DataType; import com.yahoo.search.config.ClusterConfig; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.document.Attribute; import com.yahoo.searchdefinition.document.SDDocumentType; @@ -34,31 +34,31 @@ import static org.junit.Assert.assertTrue; * * @author hmusum */ -public class SearchClusterTest { +public class SchemaClusterTest { @Test public void testSdConfigLogical() { // sd1 SDDocumentType sdt1 = new SDDocumentType("s1"); - Search search1 = new Search("s1"); + Schema schema1 = new Schema("s1"); SDField f1 = new SDField("f1", DataType.STRING); f1.addAttribute(new Attribute("f1", DataType.STRING)); f1.setIndexingScript(new ScriptExpression(new StatementExpression(new AttributeExpression("f1")))); sdt1.addField(f1); - search1.addDocument(sdt1); + schema1.addDocument(sdt1); // sd2 SDDocumentType sdt2 = new SDDocumentType("s2"); - Search search2 = new Search("s2"); + Schema schema2 = new Schema("s2"); SDField f2=new SDField("f2", DataType.STRING); f2.addAttribute(new Attribute("f2", DataType.STRING)); f2.setIndexingScript(new ScriptExpression(new StatementExpression(new AttributeExpression("f2")))); sdt2.addField(f2); - search2.addDocument(sdt2); + schema2.addDocument(sdt2); SearchBuilder builder = new SearchBuilder(); - builder.importRawSearch(search1); - builder.importRawSearch(search2); + builder.importRawSearch(schema1); + builder.importRawSearch(schema2); builder.build(); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchNodeTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaNodeTest.java index 16f6a90ac66..cca2d817df4 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchNodeTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaNodeTest.java @@ -29,7 +29,7 @@ import static org.junit.Assert.assertTrue; * * @author geirst */ -public class SearchNodeTest { +public class SchemaNodeTest { private void assertBaseDir(String expected, SearchNode node) { ProtonConfig.Builder builder = new ProtonConfig.Builder(); |