diff options
Diffstat (limited to 'config-model/src/test/derived')
176 files changed, 521 insertions, 234 deletions
diff --git a/config-model/src/test/derived/advanced/advanced.sd b/config-model/src/test/derived/advanced/advanced.sd index 98a403dc44e..43dcbed4882 100644 --- a/config-model/src/test/derived/advanced/advanced.sd +++ b/config-model/src/test/derived/advanced/advanced.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema advanced { document advanced { field debug_src type string { } diff --git a/config-model/src/test/derived/annotationsimplicitstruct/annotationsimplicitstruct.sd b/config-model/src/test/derived/annotationsimplicitstruct/annotationsimplicitstruct.sd index fd407a68ea3..6df2b06de6a 100755 --- a/config-model/src/test/derived/annotationsimplicitstruct/annotationsimplicitstruct.sd +++ b/config-model/src/test/derived/annotationsimplicitstruct/annotationsimplicitstruct.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema annotationsimplicitstruct { document annotationsimplicitstruct { diff --git a/config-model/src/test/derived/annotationsinheritance/annotationsinheritance.sd b/config-model/src/test/derived/annotationsinheritance/annotationsinheritance.sd index 256fb98ae8a..dd09bd69009 100755 --- a/config-model/src/test/derived/annotationsinheritance/annotationsinheritance.sd +++ b/config-model/src/test/derived/annotationsinheritance/annotationsinheritance.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema annotationsinheritance { document annotationsinheritance { diff --git a/config-model/src/test/derived/annotationsinheritance2/annotationsinheritance2.sd b/config-model/src/test/derived/annotationsinheritance2/annotationsinheritance2.sd index f6f30bf6aad..749cee57ec6 100755 --- a/config-model/src/test/derived/annotationsinheritance2/annotationsinheritance2.sd +++ b/config-model/src/test/derived/annotationsinheritance2/annotationsinheritance2.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema annotationsinheritance2 { document annotationsinheritance2 { diff --git a/config-model/src/test/derived/annotationsoutsideofdocument/annotationsoutsideofdocument.sd b/config-model/src/test/derived/annotationsoutsideofdocument/annotationsoutsideofdocument.sd index 6be5d3401ce..c5b373f0dd6 100644 --- a/config-model/src/test/derived/annotationsoutsideofdocument/annotationsoutsideofdocument.sd +++ b/config-model/src/test/derived/annotationsoutsideofdocument/annotationsoutsideofdocument.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema annotationsoutsideofdocument { # (will fail) diff --git a/config-model/src/test/derived/annotationspolymorphy/annotationspolymorphy.sd b/config-model/src/test/derived/annotationspolymorphy/annotationspolymorphy.sd index 52e17cc19b5..52d3a07f133 100644 --- a/config-model/src/test/derived/annotationspolymorphy/annotationspolymorphy.sd +++ b/config-model/src/test/derived/annotationspolymorphy/annotationspolymorphy.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema annotationspolymorphy { document annotationspolymorphy { diff --git a/config-model/src/test/derived/annotationsreference/annotationsreference.sd b/config-model/src/test/derived/annotationsreference/annotationsreference.sd index eb1923494ac..0a7cec65943 100755 --- a/config-model/src/test/derived/annotationsreference/annotationsreference.sd +++ b/config-model/src/test/derived/annotationsreference/annotationsreference.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema annotationsreference { document annotationsreference { diff --git a/config-model/src/test/derived/annotationsreference2/annotationsreference2.sd b/config-model/src/test/derived/annotationsreference2/annotationsreference2.sd index f91e25a2563..2c9f6fb2341 100644 --- a/config-model/src/test/derived/annotationsreference2/annotationsreference2.sd +++ b/config-model/src/test/derived/annotationsreference2/annotationsreference2.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema annotationreference2 { document annotationreference2 { annotation foo { } diff --git a/config-model/src/test/derived/annotationssimple/annotationssimple.sd b/config-model/src/test/derived/annotationssimple/annotationssimple.sd index 1282dee9f12..4e044f5ee28 100755 --- a/config-model/src/test/derived/annotationssimple/annotationssimple.sd +++ b/config-model/src/test/derived/annotationssimple/annotationssimple.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema annotationssimple { document annotationssimple { diff --git a/config-model/src/test/derived/annotationsstruct/annotationsstruct.sd b/config-model/src/test/derived/annotationsstruct/annotationsstruct.sd index 64b13dc434e..57dbf9a10b1 100644 --- a/config-model/src/test/derived/annotationsstruct/annotationsstruct.sd +++ b/config-model/src/test/derived/annotationsstruct/annotationsstruct.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema annotationsstruct { document annotationsstruct { struct my_struct { diff --git a/config-model/src/test/derived/annotationsstructarray/annotationsstructarray.sd b/config-model/src/test/derived/annotationsstructarray/annotationsstructarray.sd index e153951a2c1..0f057cf697b 100644 --- a/config-model/src/test/derived/annotationsstructarray/annotationsstructarray.sd +++ b/config-model/src/test/derived/annotationsstructarray/annotationsstructarray.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema annotationsstructarray { document annotationsstructarray { struct my_struct { diff --git a/config-model/src/test/derived/array_of_struct_attribute/test.sd b/config-model/src/test/derived/array_of_struct_attribute/test.sd index 969dba96bf8..3e46aea986a 100644 --- a/config-model/src/test/derived/array_of_struct_attribute/test.sd +++ b/config-model/src/test/derived/array_of_struct_attribute/test.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { struct elem { @@ -17,6 +17,6 @@ schema test { } } document-summary rename { - summary new_elem_array type array<elem> { source: elem_array } + summary new_elem_array { source: elem_array } } } diff --git a/config-model/src/test/derived/arrays/arrays.sd b/config-model/src/test/derived/arrays/arrays.sd index 1a6c4b07fc2..928896fade6 100644 --- a/config-model/src/test/derived/arrays/arrays.sd +++ b/config-model/src/test/derived/arrays/arrays.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema arrays { document arrays { diff --git a/config-model/src/test/derived/attributeprefetch/attributeprefetch.sd b/config-model/src/test/derived/attributeprefetch/attributeprefetch.sd index a0746ea7dcb..30dbda3ca5f 100644 --- a/config-model/src/test/derived/attributeprefetch/attributeprefetch.sd +++ b/config-model/src/test/derived/attributeprefetch/attributeprefetch.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema prefetch { document prefetch { field singlebyte type byte { diff --git a/config-model/src/test/derived/attributerank/attributerank.sd b/config-model/src/test/derived/attributerank/attributerank.sd index 6d6ee4e8bb1..9c895caed33 100644 --- a/config-model/src/test/derived/attributerank/attributerank.sd +++ b/config-model/src/test/derived/attributerank/attributerank.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema attributerank { document attributerank { diff --git a/config-model/src/test/derived/attributes/attributes.sd b/config-model/src/test/derived/attributes/attributes.sd index 2827afc2d42..e31f3e4df3a 100644 --- a/config-model/src/test/derived/attributes/attributes.sd +++ b/config-model/src/test/derived/attributes/attributes.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema attributes { document attributes { diff --git a/config-model/src/test/derived/bolding_dynamic_summary/test.sd b/config-model/src/test/derived/bolding_dynamic_summary/test.sd index caa7ca2cd2e..3d054c65839 100644 --- a/config-model/src/test/derived/bolding_dynamic_summary/test.sd +++ b/config-model/src/test/derived/bolding_dynamic_summary/test.sd @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { field str_1 type string { @@ -30,19 +31,19 @@ schema test { } } document-summary dyn { - summary str_3_dyn type string { + summary str_3_dyn { source: str_3 dynamic } - summary arr_3_dyn type array<string> { + summary arr_3_dyn { source: arr_3 dynamic } - summary str_4_bold type string { + summary str_4_bold { source: str_4 bolding: on } - summary arr_4_bold type array<string> { + summary arr_4_bold { source: arr_4 bolding: on } diff --git a/config-model/src/test/derived/combinedattributeandindexsearch/combinedattributeandindexsearch.sd b/config-model/src/test/derived/combinedattributeandindexsearch/combinedattributeandindexsearch.sd index c9a76b27101..47f9b6b1bad 100644 --- a/config-model/src/test/derived/combinedattributeandindexsearch/combinedattributeandindexsearch.sd +++ b/config-model/src/test/derived/combinedattributeandindexsearch/combinedattributeandindexsearch.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema combinedattributeandindexsearch { document combinedattributeandindexsearch { diff --git a/config-model/src/test/derived/complex/complex.sd b/config-model/src/test/derived/complex/complex.sd index 3e28801c53a..823afa0e859 100644 --- a/config-model/src/test/derived/complex/complex.sd +++ b/config-model/src/test/derived/complex/complex.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema complex { document complex { diff --git a/config-model/src/test/derived/declstruct/bar.sd b/config-model/src/test/derived/declstruct/bar.sd index 9a415c1a12c..feb265599aa 100644 --- a/config-model/src/test/derived/declstruct/bar.sd +++ b/config-model/src/test/derived/declstruct/bar.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema bar { document bar inherits common { struct mystructinbar { diff --git a/config-model/src/test/derived/declstruct/common.sd b/config-model/src/test/derived/declstruct/common.sd index dc691fb4ac7..ac138505648 100644 --- a/config-model/src/test/derived/declstruct/common.sd +++ b/config-model/src/test/derived/declstruct/common.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search common { document common { struct mystruct { diff --git a/config-model/src/test/derived/declstruct/foo.sd b/config-model/src/test/derived/declstruct/foo.sd index 56ea6ac4f0d..649d59b316e 100644 --- a/config-model/src/test/derived/declstruct/foo.sd +++ b/config-model/src/test/derived/declstruct/foo.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema foo { document foo inherits common { struct mystructinfoo { diff --git a/config-model/src/test/derived/declstruct/foobar.sd b/config-model/src/test/derived/declstruct/foobar.sd index bddd19e4cde..9db03c8036e 100644 --- a/config-model/src/test/derived/declstruct/foobar.sd +++ b/config-model/src/test/derived/declstruct/foobar.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema foobar { document foobar inherits foo, bar { struct mystructinfoobar { diff --git a/config-model/src/test/derived/deriver/child.sd b/config-model/src/test/derived/deriver/child.sd index b829cd9a81d..6285b4deaaa 100644 --- a/config-model/src/test/derived/deriver/child.sd +++ b/config-model/src/test/derived/deriver/child.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema child { document child inherits parent { diff --git a/config-model/src/test/derived/deriver/grandparent.sd b/config-model/src/test/derived/deriver/grandparent.sd index 2cf540a6f1e..1eaa9670776 100644 --- a/config-model/src/test/derived/deriver/grandparent.sd +++ b/config-model/src/test/derived/deriver/grandparent.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema grandparent { document grandparent { diff --git a/config-model/src/test/derived/deriver/parent.sd b/config-model/src/test/derived/deriver/parent.sd index 9379301601c..e6d46f0141d 100644 --- a/config-model/src/test/derived/deriver/parent.sd +++ b/config-model/src/test/derived/deriver/parent.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema parent { document parent inherits grandparent { diff --git a/config-model/src/test/derived/duplicate_struct/foo.sd b/config-model/src/test/derived/duplicate_struct/foo.sd index 4eda86f70bd..7cb298cd344 100644 --- a/config-model/src/test/derived/duplicate_struct/foo.sd +++ b/config-model/src/test/derived/duplicate_struct/foo.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema foo { document foo { diff --git a/config-model/src/test/derived/duplicate_struct/foobar.sd b/config-model/src/test/derived/duplicate_struct/foobar.sd index feb06852072..558d4c1ce52 100644 --- a/config-model/src/test/derived/duplicate_struct/foobar.sd +++ b/config-model/src/test/derived/duplicate_struct/foobar.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema foobar { document foobar inherits foo { diff --git a/config-model/src/test/derived/emptychild/child.sd b/config-model/src/test/derived/emptychild/child.sd index 718a8561ab8..ab18fdd7fa9 100644 --- a/config-model/src/test/derived/emptychild/child.sd +++ b/config-model/src/test/derived/emptychild/child.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema child { document child inherits parent { } diff --git a/config-model/src/test/derived/emptychild/parent.sd b/config-model/src/test/derived/emptychild/parent.sd index f304a8f7633..1f650845006 100644 --- a/config-model/src/test/derived/emptychild/parent.sd +++ b/config-model/src/test/derived/emptychild/parent.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema parent { document parent { field a1 type string { diff --git a/config-model/src/test/derived/emptydefault/emptydefault.sd b/config-model/src/test/derived/emptydefault/emptydefault.sd index 9d32069d473..0dc8d778229 100644 --- a/config-model/src/test/derived/emptydefault/emptydefault.sd +++ b/config-model/src/test/derived/emptydefault/emptydefault.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema emptydefault { document emptydefault { diff --git a/config-model/src/test/derived/exactmatch/exactmatch.sd b/config-model/src/test/derived/exactmatch/exactmatch.sd index ceeb48ad252..8ebb209ca6d 100644 --- a/config-model/src/test/derived/exactmatch/exactmatch.sd +++ b/config-model/src/test/derived/exactmatch/exactmatch.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema exactmatch { document exactmatch { diff --git a/config-model/src/test/derived/fieldset/test.sd b/config-model/src/test/derived/fieldset/test.sd index 6bdc5e73cce..3d50b87f1ee 100644 --- a/config-model/src/test/derived/fieldset/test.sd +++ b/config-model/src/test/derived/fieldset/test.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { diff --git a/config-model/src/test/derived/flickr/flickrphotos.sd b/config-model/src/test/derived/flickr/flickrphotos.sd index 8d021fe1c9b..df80ea3f96f 100755 --- a/config-model/src/test/derived/flickr/flickrphotos.sd +++ b/config-model/src/test/derived/flickr/flickrphotos.sd @@ -1,10 +1,10 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema flickrphotos{ #Document summary to use for attribute-prefetching with many hits document-summary mapcluster { - summary distance type int {} + summary distance {} } document flickrphotos{ diff --git a/config-model/src/test/derived/function_arguments/test.sd b/config-model/src/test/derived/function_arguments/test.sd index 8e54d07dee7..0e9998d8bdf 100644 --- a/config-model/src/test/derived/function_arguments/test.sd +++ b/config-model/src/test/derived/function_arguments/test.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema args { document args { diff --git a/config-model/src/test/derived/function_arguments_with_expressions/test.sd b/config-model/src/test/derived/function_arguments_with_expressions/test.sd index 14aeebca641..61caa1aa3eb 100644 --- a/config-model/src/test/derived/function_arguments_with_expressions/test.sd +++ b/config-model/src/test/derived/function_arguments_with_expressions/test.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { diff --git a/config-model/src/test/derived/gemini2/gemini.sd b/config-model/src/test/derived/gemini2/gemini.sd index 366823df04f..bf325073e1d 100644 --- a/config-model/src/test/derived/gemini2/gemini.sd +++ b/config-model/src/test/derived/gemini2/gemini.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema gemini { document gemini { diff --git a/config-model/src/test/derived/globalphase_onnx_inside/test.sd b/config-model/src/test/derived/globalphase_onnx_inside/test.sd index f7749e648e0..c863f2a1f34 100644 --- a/config-model/src/test/derived/globalphase_onnx_inside/test.sd +++ b/config-model/src/test/derived/globalphase_onnx_inside/test.sd @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { diff --git a/config-model/src/test/derived/globalphase_token_functions/files/m.py b/config-model/src/test/derived/globalphase_token_functions/files/m.py index 004135b32eb..b34f3fed248 100644 --- a/config-model/src/test/derived/globalphase_token_functions/files/m.py +++ b/config-model/src/test/derived/globalphase_token_functions/files/m.py @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # imports from onnx import TensorProto diff --git a/config-model/src/test/derived/globalphase_token_functions/rank-profiles.cfg b/config-model/src/test/derived/globalphase_token_functions/rank-profiles.cfg index 37d84c1a2d9..d0336e31744 100644 --- a/config-model/src/test/derived/globalphase_token_functions/rank-profiles.cfg +++ b/config-model/src/test/derived/globalphase_token_functions/rank-profiles.cfg @@ -49,3 +49,46 @@ rankprofile[].fef.property[].name "vespa.type.attribute.tokens" rankprofile[].fef.property[].value "tensor(d0[128])" rankprofile[].fef.property[].name "vespa.type.query.input" rankprofile[].fef.property[].value "tensor(d0[32])" +rankprofile[].name "with-fun" +rankprofile[].fef.property[].name "rankingExpression(use_model).rankingScript" +rankprofile[].fef.property[].value "attribute(outputidx) + 1.0" +rankprofile[].fef.property[].name "vespa.rank.globalphase" +rankprofile[].fef.property[].value "rankingExpression(use_model)" +rankprofile[].fef.property[].name "vespa.match.feature" +rankprofile[].fef.property[].value "attribute(outputidx)" +rankprofile[].fef.property[].name "vespa.hidden.matchfeature" +rankprofile[].fef.property[].value "attribute(outputidx)" +rankprofile[].fef.property[].name "vespa.type.attribute.tokens" +rankprofile[].fef.property[].value "tensor(d0[128])" +rankprofile[].name "with-fun-mf" +rankprofile[].fef.property[].name "rankingExpression(use_model).rankingScript" +rankprofile[].fef.property[].value "attribute(outputidx) + 1.0" +rankprofile[].fef.property[].name "vespa.rank.firstphase" +rankprofile[].fef.property[].value "nativeRank" +rankprofile[].fef.property[].name "vespa.rank.globalphase" +rankprofile[].fef.property[].value "rankingExpression(use_model)" +rankprofile[].fef.property[].name "vespa.match.feature" +rankprofile[].fef.property[].value "rankingExpression(use_model)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "rankingExpression(use_model)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "use_model" +rankprofile[].fef.property[].name "vespa.type.attribute.tokens" +rankprofile[].fef.property[].value "tensor(d0[128])" +rankprofile[].name "fun-mf-child" +rankprofile[].fef.property[].name "rankingExpression(use_model).rankingScript" +rankprofile[].fef.property[].value "attribute(outputidx) + 1.0" +rankprofile[].fef.property[].name "vespa.rank.firstphase" +rankprofile[].fef.property[].value "rankingExpression(firstphase)" +rankprofile[].fef.property[].name "rankingExpression(firstphase).rankingScript" +rankprofile[].fef.property[].value "42 * attribute(outputidx)" +rankprofile[].fef.property[].name "vespa.rank.globalphase" +rankprofile[].fef.property[].value "rankingExpression(use_model)" +rankprofile[].fef.property[].name "vespa.match.feature" +rankprofile[].fef.property[].value "rankingExpression(use_model)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "rankingExpression(use_model)" +rankprofile[].fef.property[].name "vespa.feature.rename" +rankprofile[].fef.property[].value "use_model" +rankprofile[].fef.property[].name "vespa.type.attribute.tokens" +rankprofile[].fef.property[].value "tensor(d0[128])" diff --git a/config-model/src/test/derived/globalphase_token_functions/test.sd b/config-model/src/test/derived/globalphase_token_functions/test.sd index a1d14258aab..511e09948b4 100644 --- a/config-model/src/test/derived/globalphase_token_functions/test.sd +++ b/config-model/src/test/derived/globalphase_token_functions/test.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { @@ -42,4 +42,23 @@ schema test { } } + rank-profile with-fun { + function use_model() { + expression: attribute(outputidx) + 1.0 + } + global-phase { + expression: use_model + } + } + rank-profile with-fun-mf inherits with-fun { + first-phase { + expression: nativeRank + } + match-features: use_model + } + rank-profile fun-mf-child inherits with-fun-mf { + first-phase { + expression: 42 * attribute(outputidx) + } + } } diff --git a/config-model/src/test/derived/hnsw_index/test.sd b/config-model/src/test/derived/hnsw_index/test.sd index 30f804bae99..5f6a9e7f73d 100644 --- a/config-model/src/test/derived/hnsw_index/test.sd +++ b/config-model/src/test/derived/hnsw_index/test.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { field t1 type tensor(x[128]) { diff --git a/config-model/src/test/derived/id/id.sd b/config-model/src/test/derived/id/id.sd index 44c29cf1104..f7fa3c6ee96 100644 --- a/config-model/src/test/derived/id/id.sd +++ b/config-model/src/test/derived/id/id.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema id { document id { diff --git a/config-model/src/test/derived/imported_fields_inherited_reference/child_a.sd b/config-model/src/test/derived/imported_fields_inherited_reference/child_a.sd index e0d87497435..2ddc0f359b7 100644 --- a/config-model/src/test/derived/imported_fields_inherited_reference/child_a.sd +++ b/config-model/src/test/derived/imported_fields_inherited_reference/child_a.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema child_a { document child_a { field ref_from_a type reference<parent> { diff --git a/config-model/src/test/derived/imported_fields_inherited_reference/child_b.sd b/config-model/src/test/derived/imported_fields_inherited_reference/child_b.sd index 3a13e339e7f..8a2fa85be6f 100644 --- a/config-model/src/test/derived/imported_fields_inherited_reference/child_b.sd +++ b/config-model/src/test/derived/imported_fields_inherited_reference/child_b.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema child_b { document child_b inherits child_a { field ref_from_b type reference<parent> { diff --git a/config-model/src/test/derived/imported_fields_inherited_reference/child_c.sd b/config-model/src/test/derived/imported_fields_inherited_reference/child_c.sd index 3e8b298f7f0..3d211c368a7 100644 --- a/config-model/src/test/derived/imported_fields_inherited_reference/child_c.sd +++ b/config-model/src/test/derived/imported_fields_inherited_reference/child_c.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema child_c { document child_c inherits child_b { } diff --git a/config-model/src/test/derived/imported_fields_inherited_reference/parent.sd b/config-model/src/test/derived/imported_fields_inherited_reference/parent.sd index eb466e7adf3..43a55366ee8 100644 --- a/config-model/src/test/derived/imported_fields_inherited_reference/parent.sd +++ b/config-model/src/test/derived/imported_fields_inherited_reference/parent.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema parent { document parent { field int_field type int { diff --git a/config-model/src/test/derived/imported_position_field/child.sd b/config-model/src/test/derived/imported_position_field/child.sd index d1769c6c7a5..ae974ecaa39 100644 --- a/config-model/src/test/derived/imported_position_field/child.sd +++ b/config-model/src/test/derived/imported_position_field/child.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema child { document child { field parent_ref type reference<parent> { diff --git a/config-model/src/test/derived/imported_position_field/parent.sd b/config-model/src/test/derived/imported_position_field/parent.sd index a50092e6ed9..a0d8b9edcb6 100644 --- a/config-model/src/test/derived/imported_position_field/parent.sd +++ b/config-model/src/test/derived/imported_position_field/parent.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema parent { document parent { field pos type position { diff --git a/config-model/src/test/derived/imported_position_field_summary/child.sd b/config-model/src/test/derived/imported_position_field_summary/child.sd index 52272f91862..0efa2a8905c 100644 --- a/config-model/src/test/derived/imported_position_field_summary/child.sd +++ b/config-model/src/test/derived/imported_position_field_summary/child.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema child { document child { field parent_ref type reference<parent> { @@ -8,6 +8,6 @@ schema child { import field parent_ref.pos as my_pos {} document-summary mysummary { - summary my_pos type position { } + summary my_pos { } } } diff --git a/config-model/src/test/derived/imported_position_field_summary/parent.sd b/config-model/src/test/derived/imported_position_field_summary/parent.sd index a50092e6ed9..a0d8b9edcb6 100644 --- a/config-model/src/test/derived/imported_position_field_summary/parent.sd +++ b/config-model/src/test/derived/imported_position_field_summary/parent.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema parent { document parent { field pos type position { diff --git a/config-model/src/test/derived/imported_struct_fields/child.sd b/config-model/src/test/derived/imported_struct_fields/child.sd index c83eac6aa83..09eb08d3534 100644 --- a/config-model/src/test/derived/imported_struct_fields/child.sd +++ b/config-model/src/test/derived/imported_struct_fields/child.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema child { document child { field parent_ref type reference<parent> { @@ -10,22 +10,22 @@ schema child { import field parent_ref.str_int_map as my_str_int_map {} document-summary mysummary { - summary documentid type string {} - summary my_elem_array type array<elem> {} - summary my_elem_map type map<string, elem> {} - summary my_str_int_map type map<string, int> {} + summary documentid {} + summary my_elem_array {} + summary my_elem_map {} + summary my_str_int_map {} } document-summary filtered { - summary elem_array_filtered type array<elem> { + summary elem_array_filtered { source: my_elem_array matched-elements-only } - summary elem_map_filtered type map<string, elem> { + summary elem_map_filtered { source: my_elem_map matched-elements-only } - summary str_int_map_filtered type map<string, int> { + summary str_int_map_filtered { source: my_str_int_map matched-elements-only } diff --git a/config-model/src/test/derived/imported_struct_fields/parent.sd b/config-model/src/test/derived/imported_struct_fields/parent.sd index 1faabfc1a0e..7c3b3fa28f5 100644 --- a/config-model/src/test/derived/imported_struct_fields/parent.sd +++ b/config-model/src/test/derived/imported_struct_fields/parent.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema parent { document parent { struct elem { diff --git a/config-model/src/test/derived/importedfields/child.sd b/config-model/src/test/derived/importedfields/child.sd index 627e494b385..d3be011f5fb 100644 --- a/config-model/src/test/derived/importedfields/child.sd +++ b/config-model/src/test/derived/importedfields/child.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema child { document child { field a_ref type reference<parent_a> { @@ -22,14 +22,14 @@ schema child { } document-summary mysummary { - summary a_ref type reference<parent_a> {} - summary b_ref_with_summary type reference<parent_b> {} - summary my_int_field type int {} - summary my_string_field type string {} - summary my_int_array_field type array<int> {} - summary my_int_wset_field type weightedset<int> {} - summary my_ancient_int_field type int {} - summary my_filtered_int_array_field type array<int> { + summary a_ref {} + summary b_ref_with_summary {} + summary my_int_field {} + summary my_string_field {} + summary my_int_array_field {} + summary my_int_wset_field {} + summary my_ancient_int_field {} + summary my_filtered_int_array_field { source: my_int_array_field matched-elements-only } diff --git a/config-model/src/test/derived/importedfields/grandparent.sd b/config-model/src/test/derived/importedfields/grandparent.sd index b6902018547..6bcb093e08e 100644 --- a/config-model/src/test/derived/importedfields/grandparent.sd +++ b/config-model/src/test/derived/importedfields/grandparent.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema grandparent { document grandparent { field int_field type int { diff --git a/config-model/src/test/derived/importedfields/parent_a.sd b/config-model/src/test/derived/importedfields/parent_a.sd index c3ff0dd249e..2176c8bfe0a 100644 --- a/config-model/src/test/derived/importedfields/parent_a.sd +++ b/config-model/src/test/derived/importedfields/parent_a.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema parent_a { document parent_a { field grandparent_ref type reference<grandparent> { diff --git a/config-model/src/test/derived/importedfields/parent_b.sd b/config-model/src/test/derived/importedfields/parent_b.sd index b8662070da3..59d5feeb540 100644 --- a/config-model/src/test/derived/importedfields/parent_b.sd +++ b/config-model/src/test/derived/importedfields/parent_b.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema parent_b { document parent_b { field string_field type string { diff --git a/config-model/src/test/derived/indexinfo_fieldsets/indexinfo_fieldsets.sd b/config-model/src/test/derived/indexinfo_fieldsets/indexinfo_fieldsets.sd index 58b37f7fdd3..b75b407731b 100644 --- a/config-model/src/test/derived/indexinfo_fieldsets/indexinfo_fieldsets.sd +++ b/config-model/src/test/derived/indexinfo_fieldsets/indexinfo_fieldsets.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema indexinfo_fieldsets { document indexinfo_fieldsets { diff --git a/config-model/src/test/derived/indexinfo_lowercase/indexinfo_lowercase.sd b/config-model/src/test/derived/indexinfo_lowercase/indexinfo_lowercase.sd index b42672c21aa..f45d6f9a891 100644 --- a/config-model/src/test/derived/indexinfo_lowercase/indexinfo_lowercase.sd +++ b/config-model/src/test/derived/indexinfo_lowercase/indexinfo_lowercase.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema indexinfo_lowercase { document indexinfo_lowercase { diff --git a/config-model/src/test/derived/indexschema/indexschema.sd b/config-model/src/test/derived/indexschema/indexschema.sd index 47dd8aa79be..33ab48fe0ac 100644 --- a/config-model/src/test/derived/indexschema/indexschema.sd +++ b/config-model/src/test/derived/indexschema/indexschema.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema indexschema { field searchfield1 type string {} diff --git a/config-model/src/test/derived/indexswitches/indexswitches.sd b/config-model/src/test/derived/indexswitches/indexswitches.sd index 34d1d159417..36572c3592a 100644 --- a/config-model/src/test/derived/indexswitches/indexswitches.sd +++ b/config-model/src/test/derived/indexswitches/indexswitches.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema indexswitches { document indexswitches { diff --git a/config-model/src/test/derived/inheritance/child.sd b/config-model/src/test/derived/inheritance/child.sd index 315c77b1b60..bf0e509ca28 100644 --- a/config-model/src/test/derived/inheritance/child.sd +++ b/config-model/src/test/derived/inheritance/child.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema child { document child inherits father, mother { diff --git a/config-model/src/test/derived/inheritance/father.sd b/config-model/src/test/derived/inheritance/father.sd index f2de5d1e840..99e4184461e 100644 --- a/config-model/src/test/derived/inheritance/father.sd +++ b/config-model/src/test/derived/inheritance/father.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. document father inherits grandparent { field onlyfather type string { diff --git a/config-model/src/test/derived/inheritance/grandparent.sd b/config-model/src/test/derived/inheritance/grandparent.sd index a1191762e22..c93af18a83b 100644 --- a/config-model/src/test/derived/inheritance/grandparent.sd +++ b/config-model/src/test/derived/inheritance/grandparent.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. document grandparent { field onlygrandparent type int { diff --git a/config-model/src/test/derived/inheritance/mother.sd b/config-model/src/test/derived/inheritance/mother.sd index 17411ad443b..156b0f598ea 100644 --- a/config-model/src/test/derived/inheritance/mother.sd +++ b/config-model/src/test/derived/inheritance/mother.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. document mother inherits grandparent { field onlymother type string { diff --git a/config-model/src/test/derived/inheritdiamond/child.sd b/config-model/src/test/derived/inheritdiamond/child.sd index 8fa64ad745d..82cbd487e8d 100644 --- a/config-model/src/test/derived/inheritdiamond/child.sd +++ b/config-model/src/test/derived/inheritdiamond/child.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema child { document child inherits mother, father { struct child_struct { diff --git a/config-model/src/test/derived/inheritdiamond/father.sd b/config-model/src/test/derived/inheritdiamond/father.sd index 361dbc3253a..147d6fe1f2f 100644 --- a/config-model/src/test/derived/inheritdiamond/father.sd +++ b/config-model/src/test/derived/inheritdiamond/father.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema father { document father inherits grandparent { struct father_struct { diff --git a/config-model/src/test/derived/inheritdiamond/grandparent.sd b/config-model/src/test/derived/inheritdiamond/grandparent.sd index 0ad69f52cfe..0729dd2bc3d 100644 --- a/config-model/src/test/derived/inheritdiamond/grandparent.sd +++ b/config-model/src/test/derived/inheritdiamond/grandparent.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema grandparent { document grandparent { struct grandparent_struct { diff --git a/config-model/src/test/derived/inheritdiamond/mother.sd b/config-model/src/test/derived/inheritdiamond/mother.sd index 0f4b5ca9d3b..34b52eed264 100644 --- a/config-model/src/test/derived/inheritdiamond/mother.sd +++ b/config-model/src/test/derived/inheritdiamond/mother.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema mother { document mother inherits grandparent { struct mother_struct { diff --git a/config-model/src/test/derived/inheritfromgrandparent/child.sd b/config-model/src/test/derived/inheritfromgrandparent/child.sd index b6859e84442..a64caa68cbd 100644 --- a/config-model/src/test/derived/inheritfromgrandparent/child.sd +++ b/config-model/src/test/derived/inheritfromgrandparent/child.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema child { document child inherits parent { field child_field type grandparent_struct { } diff --git a/config-model/src/test/derived/inheritfromgrandparent/grandparent.sd b/config-model/src/test/derived/inheritfromgrandparent/grandparent.sd index 0ad69f52cfe..0729dd2bc3d 100644 --- a/config-model/src/test/derived/inheritfromgrandparent/grandparent.sd +++ b/config-model/src/test/derived/inheritfromgrandparent/grandparent.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema grandparent { document grandparent { struct grandparent_struct { diff --git a/config-model/src/test/derived/inheritfromgrandparent/parent.sd b/config-model/src/test/derived/inheritfromgrandparent/parent.sd index 963e44799d9..57bebe0e6a5 100644 --- a/config-model/src/test/derived/inheritfromgrandparent/parent.sd +++ b/config-model/src/test/derived/inheritfromgrandparent/parent.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema parent { document parent inherits grandparent { diff --git a/config-model/src/test/derived/inheritfromnull/inheritfromnull.sd b/config-model/src/test/derived/inheritfromnull/inheritfromnull.sd index 549284e79b6..4e294db4cd4 100644 --- a/config-model/src/test/derived/inheritfromnull/inheritfromnull.sd +++ b/config-model/src/test/derived/inheritfromnull/inheritfromnull.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema inheritfromnull { document inheritfromnull inherits foo { } diff --git a/config-model/src/test/derived/inheritfromparent/child.sd b/config-model/src/test/derived/inheritfromparent/child.sd index 055f998b8f0..c4e7cd8768f 100644 --- a/config-model/src/test/derived/inheritfromparent/child.sd +++ b/config-model/src/test/derived/inheritfromparent/child.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema child { document child inherits parent { field child_field type parent_struct { } diff --git a/config-model/src/test/derived/inheritfromparent/parent.sd b/config-model/src/test/derived/inheritfromparent/parent.sd index ceda280ec30..03ef9076ae6 100644 --- a/config-model/src/test/derived/inheritfromparent/parent.sd +++ b/config-model/src/test/derived/inheritfromparent/parent.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema parent { document parent { struct parent_struct { diff --git a/config-model/src/test/derived/inheritstruct/child.sd b/config-model/src/test/derived/inheritstruct/child.sd index 00cc09e9d2f..b55c91c949c 100644 --- a/config-model/src/test/derived/inheritstruct/child.sd +++ b/config-model/src/test/derived/inheritstruct/child.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema child { document child inherits parent { struct other_struct inherits my_struct { diff --git a/config-model/src/test/derived/inheritstruct/parent.sd b/config-model/src/test/derived/inheritstruct/parent.sd index 2ea8ad0ce7c..b3c5735801a 100644 --- a/config-model/src/test/derived/inheritstruct/parent.sd +++ b/config-model/src/test/derived/inheritstruct/parent.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema parent { document parent { struct my_struct { diff --git a/config-model/src/test/derived/integerattributetostringindex/integerattributetostringindex.sd b/config-model/src/test/derived/integerattributetostringindex/integerattributetostringindex.sd index 7678093c28c..8ef6d52b6af 100644 --- a/config-model/src/test/derived/integerattributetostringindex/integerattributetostringindex.sd +++ b/config-model/src/test/derived/integerattributetostringindex/integerattributetostringindex.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema integerattributetostringindex { document integerattributetostringindex { field attinx type int { diff --git a/config-model/src/test/derived/language/language.sd b/config-model/src/test/derived/language/language.sd index 4b060598882..93743a783f6 100644 --- a/config-model/src/test/derived/language/language.sd +++ b/config-model/src/test/derived/language/language.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema language { document language { field language type string { diff --git a/config-model/src/test/derived/lowercase/lowercase.sd b/config-model/src/test/derived/lowercase/lowercase.sd index 80edc837830..a793fd1e7ef 100644 --- a/config-model/src/test/derived/lowercase/lowercase.sd +++ b/config-model/src/test/derived/lowercase/lowercase.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema lowercase { document lowercase { diff --git a/config-model/src/test/derived/mail/mail.sd b/config-model/src/test/derived/mail/mail.sd index 848b67e1b1f..f35a3731a11 100644 --- a/config-model/src/test/derived/mail/mail.sd +++ b/config-model/src/test/derived/mail/mail.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema mail { stemming: none diff --git a/config-model/src/test/derived/map_attribute/test.sd b/config-model/src/test/derived/map_attribute/test.sd index 5ba429a5f47..70437102dfc 100644 --- a/config-model/src/test/derived/map_attribute/test.sd +++ b/config-model/src/test/derived/map_attribute/test.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { field str_map type map<string, string> { diff --git a/config-model/src/test/derived/map_of_struct_attribute/test.sd b/config-model/src/test/derived/map_of_struct_attribute/test.sd index 2e71678148b..617f761c7e7 100644 --- a/config-model/src/test/derived/map_of_struct_attribute/test.sd +++ b/config-model/src/test/derived/map_of_struct_attribute/test.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { struct elem { @@ -30,7 +30,7 @@ schema test { } } document-summary rename { - summary new_str_elem_map type map<string,elem> { source: str_elem_map } - summary new_int_elem_map type map<int,elem> { source: int_elem_map } + summary new_str_elem_map { source: str_elem_map } + summary new_int_elem_map { source: int_elem_map } } } diff --git a/config-model/src/test/derived/matchsettings_map_after/test.sd b/config-model/src/test/derived/matchsettings_map_after/test.sd index fe575e81c69..21def1290ba 100644 --- a/config-model/src/test/derived/matchsettings_map_after/test.sd +++ b/config-model/src/test/derived/matchsettings_map_after/test.sd @@ -1,6 +1,4 @@ - -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { diff --git a/config-model/src/test/derived/matchsettings_map_def/test.sd b/config-model/src/test/derived/matchsettings_map_def/test.sd index 1a48cce0f45..55b507dd6e8 100644 --- a/config-model/src/test/derived/matchsettings_map_def/test.sd +++ b/config-model/src/test/derived/matchsettings_map_def/test.sd @@ -1,6 +1,4 @@ - -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { diff --git a/config-model/src/test/derived/matchsettings_map_in_struct/test.sd b/config-model/src/test/derived/matchsettings_map_in_struct/test.sd index f11bb397fbc..a9087f32f0e 100644 --- a/config-model/src/test/derived/matchsettings_map_in_struct/test.sd +++ b/config-model/src/test/derived/matchsettings_map_in_struct/test.sd @@ -1,6 +1,4 @@ - -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { diff --git a/config-model/src/test/derived/matchsettings_map_wfs/test.sd b/config-model/src/test/derived/matchsettings_map_wfs/test.sd index 7747378376c..eaab4ff4151 100644 --- a/config-model/src/test/derived/matchsettings_map_wfs/test.sd +++ b/config-model/src/test/derived/matchsettings_map_wfs/test.sd @@ -1,6 +1,4 @@ - -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { diff --git a/config-model/src/test/derived/matchsettings_map_wss/test.sd b/config-model/src/test/derived/matchsettings_map_wss/test.sd index f27d7d7a915..65fa2e2559c 100644 --- a/config-model/src/test/derived/matchsettings_map_wss/test.sd +++ b/config-model/src/test/derived/matchsettings_map_wss/test.sd @@ -1,6 +1,4 @@ - -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { diff --git a/config-model/src/test/derived/matchsettings_simple_def/test.sd b/config-model/src/test/derived/matchsettings_simple_def/test.sd index c1f9cbd4282..766d72864d3 100644 --- a/config-model/src/test/derived/matchsettings_simple_def/test.sd +++ b/config-model/src/test/derived/matchsettings_simple_def/test.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { diff --git a/config-model/src/test/derived/matchsettings_simple_wfs/test.sd b/config-model/src/test/derived/matchsettings_simple_wfs/test.sd index 5428b006f49..5cd7397aab7 100644 --- a/config-model/src/test/derived/matchsettings_simple_wfs/test.sd +++ b/config-model/src/test/derived/matchsettings_simple_wfs/test.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { diff --git a/config-model/src/test/derived/matchsettings_simple_wss/test.sd b/config-model/src/test/derived/matchsettings_simple_wss/test.sd index e91d36e24ad..1b9045d52c8 100644 --- a/config-model/src/test/derived/matchsettings_simple_wss/test.sd +++ b/config-model/src/test/derived/matchsettings_simple_wss/test.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { diff --git a/config-model/src/test/derived/matchsettings_simple_wss_wfs/test.sd b/config-model/src/test/derived/matchsettings_simple_wss_wfs/test.sd index cf7d793b47c..eb71ad86932 100644 --- a/config-model/src/test/derived/matchsettings_simple_wss_wfs/test.sd +++ b/config-model/src/test/derived/matchsettings_simple_wss_wfs/test.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { diff --git a/config-model/src/test/derived/mlr/mlr.sd b/config-model/src/test/derived/mlr/mlr.sd index c0ad502a35c..49a8ef1c703 100644 --- a/config-model/src/test/derived/mlr/mlr.sd +++ b/config-model/src/test/derived/mlr/mlr.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema mlr { document mlr { diff --git a/config-model/src/test/derived/multi_struct/ad.sd b/config-model/src/test/derived/multi_struct/ad.sd index ee389e510b4..39ea2eca85c 100644 --- a/config-model/src/test/derived/multi_struct/ad.sd +++ b/config-model/src/test/derived/multi_struct/ad.sd @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema ad { document ad { field e type string { diff --git a/config-model/src/test/derived/multi_struct/product.sd b/config-model/src/test/derived/multi_struct/product.sd index d1c63614917..4f94f08c637 100644 --- a/config-model/src/test/derived/multi_struct/product.sd +++ b/config-model/src/test/derived/multi_struct/product.sd @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema product { document product { struct mystruct { diff --git a/config-model/src/test/derived/multi_struct/shop.sd b/config-model/src/test/derived/multi_struct/shop.sd index 7b96bbed471..ec12414cb92 100644 --- a/config-model/src/test/derived/multi_struct/shop.sd +++ b/config-model/src/test/derived/multi_struct/shop.sd @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema shop { document shop { struct mystruct { diff --git a/config-model/src/test/derived/multi_struct/user.sd b/config-model/src/test/derived/multi_struct/user.sd index 798171f062f..f36142fa3be 100644 --- a/config-model/src/test/derived/multi_struct/user.sd +++ b/config-model/src/test/derived/multi_struct/user.sd @@ -1,7 +1,8 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema user { document user { field a type string { indexing: summary } } -}
\ No newline at end of file +} diff --git a/config-model/src/test/derived/multiplesummaries/multiplesummaries.sd b/config-model/src/test/derived/multiplesummaries/multiplesummaries.sd index 5f93a6e512b..28eaec22784 100644 --- a/config-model/src/test/derived/multiplesummaries/multiplesummaries.sd +++ b/config-model/src/test/derived/multiplesummaries/multiplesummaries.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema multiplesummaries { document multiplesummaries { @@ -80,35 +80,35 @@ schema multiplesummaries { document-summary third { - summary a type string { + summary a { } - summary adynamic type string { + summary adynamic { } - summary d type string { + summary d { } - summary e type string { + summary e { } summary f { } - summary g type array<int> { + summary g { } - summary h type weightedset<string> { + summary h { } } document-summary attributesonly1 { - summary a type string { + summary a { } - summary c type string { + summary c { } } @@ -116,10 +116,10 @@ schema multiplesummaries { # Since a here is a dynamic summary field, it will be fetched from disk document-summary notattributesonly1 { - summary adynamic type string { # Should still be dynamic here + summary adynamic { # Should still be dynamic here } - summary c type string { + summary c { } } @@ -127,25 +127,25 @@ schema multiplesummaries { # Since a here is a dynamic summary, it will be fetched from disk document-summary anothernotattributesonly2 { - summary adynamic2 type string { # Should still be dynamic here + summary adynamic2 { # Should still be dynamic here source: a dynamic } - summary c type string { + summary c { } - summary alltags type array<string> { + summary alltags { source: mytags } - summary sometags type array<string> { + summary sometags { source: mytags matched-elements-only } - summary anothera type string { + summary anothera { source: a } - summary anotherb type string { + summary anotherb { source: b } } @@ -153,24 +153,24 @@ schema multiplesummaries { # Not attributes only because d is bolded document-summary notattributesonly3 { - summary a type string { + summary a { } - summary d type string { + summary d { } } document-summary attributesonly2 { - summary anotdynamic type string { # Should not be dynamic here + summary anotdynamic { # Should not be dynamic here source: adynamic } - summary c type string { + summary c { } - summary loc_position type long { + summary loc_position { source: loc_pos_zcurve } @@ -178,33 +178,33 @@ schema multiplesummaries { document-summary attributesonly3 { - summary a type string { + summary a { } - summary anotbolded type string { + summary anotbolded { source: a } - summary loc_pos_zcurve type long { + summary loc_pos_zcurve { } } document-summary notattributesonly4 { - summary abolded2 type string { + summary abolded2 { source: a bolding: on } - summary c type string { + summary c { } } document-summary notattributesonly5 { - summary aboldeddynamic type string { + summary aboldeddynamic { source: a dynamic bolding: on diff --git a/config-model/src/test/derived/music/defs/document.config.documentmanager.def b/config-model/src/test/derived/music/defs/document.config.documentmanager.def index f18ad53ab0d..9548a503f00 100644 --- a/config-model/src/test/derived/music/defs/document.config.documentmanager.def +++ b/config-model/src/test/derived/music/defs/document.config.documentmanager.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=document.config datatype[].id int datatype[].arraytype[].datatype int diff --git a/config-model/src/test/derived/music/defs/test.extra.def b/config-model/src/test/derived/music/defs/test.extra.def index dfbe06997e1..f1ba20145dd 100644 --- a/config-model/src/test/derived/music/defs/test.extra.def +++ b/config-model/src/test/derived/music/defs/test.extra.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=test file[].name string file[].content string diff --git a/config-model/src/test/derived/music/defs/vespa.config.search.attributes.def b/config-model/src/test/derived/music/defs/vespa.config.search.attributes.def index f733b6155d3..a9af3cf0f24 100644 --- a/config-model/src/test/derived/music/defs/vespa.config.search.attributes.def +++ b/config-model/src/test/derived/music/defs/vespa.config.search.attributes.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search attribute[].name string attribute[].datatype string diff --git a/config-model/src/test/derived/music/defs/vespa.config.search.rank-profiles.def b/config-model/src/test/derived/music/defs/vespa.config.search.rank-profiles.def index 9d9154482be..7c9cbfbbfd2 100644 --- a/config-model/src/test/derived/music/defs/vespa.config.search.rank-profiles.def +++ b/config-model/src/test/derived/music/defs/vespa.config.search.rank-profiles.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search ## name of this rank profile. maps to table index for internal use. rankprofile[].name string diff --git a/config-model/src/test/derived/music/defs/vespa.config.search.summarymap.def b/config-model/src/test/derived/music/defs/vespa.config.search.summarymap.def index d3431d03708..164ac761d34 100644 --- a/config-model/src/test/derived/music/defs/vespa.config.search.summarymap.def +++ b/config-model/src/test/derived/music/defs/vespa.config.search.summarymap.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search ## The default output summary class id, -1 to use the stored summary class id diff --git a/config-model/src/test/derived/music/defs/vespa.configdefinition.ilscripts.def b/config-model/src/test/derived/music/defs/vespa.configdefinition.ilscripts.def index 456d9449fdd..ffd4ebbd9f2 100644 --- a/config-model/src/test/derived/music/defs/vespa.configdefinition.ilscripts.def +++ b/config-model/src/test/derived/music/defs/vespa.configdefinition.ilscripts.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.configdefinition ilscript[].name string ilscript[].doctype string diff --git a/config-model/src/test/derived/music/music.sd b/config-model/src/test/derived/music/music.sd index 919e324c4bc..c87db7f7462 100644 --- a/config-model/src/test/derived/music/music.sd +++ b/config-model/src/test/derived/music/music.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema music { document music { diff --git a/config-model/src/test/derived/music3/music3.sd b/config-model/src/test/derived/music3/music3.sd index 47867683c62..435363d3450 100644 --- a/config-model/src/test/derived/music3/music3.sd +++ b/config-model/src/test/derived/music3/music3.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema music3 { document music3 { diff --git a/config-model/src/test/derived/namecollision/collision.sd b/config-model/src/test/derived/namecollision/collision.sd index 509a1464090..11f910e5fb3 100644 --- a/config-model/src/test/derived/namecollision/collision.sd +++ b/config-model/src/test/derived/namecollision/collision.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema collision { document collision { diff --git a/config-model/src/test/derived/namecollision/collisionstruct.sd b/config-model/src/test/derived/namecollision/collisionstruct.sd index 2416e592513..dc3a79acd8c 100644 --- a/config-model/src/test/derived/namecollision/collisionstruct.sd +++ b/config-model/src/test/derived/namecollision/collisionstruct.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema collisionstruct { document collisionstruct { diff --git a/config-model/src/test/derived/nearestneighbor/query-profiles/default.xml b/config-model/src/test/derived/nearestneighbor/query-profiles/default.xml index 339f04b34d4..91584026574 100644 --- a/config-model/src/test/derived/nearestneighbor/query-profiles/default.xml +++ b/config-model/src/test/derived/nearestneighbor/query-profiles/default.xml @@ -1,2 +1,2 @@ -<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <query-profile id="default" type="root" /> diff --git a/config-model/src/test/derived/nearestneighbor/query-profiles/types/root.xml b/config-model/src/test/derived/nearestneighbor/query-profiles/types/root.xml index 7e671a65f09..ba8b93f55ed 100644 --- a/config-model/src/test/derived/nearestneighbor/query-profiles/types/root.xml +++ b/config-model/src/test/derived/nearestneighbor/query-profiles/types/root.xml @@ -1,4 +1,4 @@ -<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <query-profile-type id="root" inherits="native"> <field name="ranking.features.query(q_vec)" type="tensor<float>(x[5])" /> </query-profile-type> diff --git a/config-model/src/test/derived/nearestneighbor/test.sd b/config-model/src/test/derived/nearestneighbor/test.sd index 9c47f89bfd9..5b891049480 100644 --- a/config-model/src/test/derived/nearestneighbor/test.sd +++ b/config-model/src/test/derived/nearestneighbor/test.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { field id type int { @@ -23,6 +23,6 @@ schema test { } } document-summary minimal { - summary id type int {} + summary id {} } } diff --git a/config-model/src/test/derived/nearestneighbor_streaming/test.sd b/config-model/src/test/derived/nearestneighbor_streaming/test.sd index 4427fa08ab6..6f5c5a93de2 100644 --- a/config-model/src/test/derived/nearestneighbor_streaming/test.sd +++ b/config-model/src/test/derived/nearestneighbor_streaming/test.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { field vec_a type tensor<float>(x[16]) { diff --git a/config-model/src/test/derived/neuralnet/neuralnet.sd b/config-model/src/test/derived/neuralnet/neuralnet.sd index 95b7341a42f..371857be58b 100644 --- a/config-model/src/test/derived/neuralnet/neuralnet.sd +++ b/config-model/src/test/derived/neuralnet/neuralnet.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema neuralnet { document neuralnet { diff --git a/config-model/src/test/derived/neuralnet/query-profiles/default.xml b/config-model/src/test/derived/neuralnet/query-profiles/default.xml index 2535ca895ed..f8cc845e0a0 100644 --- a/config-model/src/test/derived/neuralnet/query-profiles/default.xml +++ b/config-model/src/test/derived/neuralnet/query-profiles/default.xml @@ -1,3 +1,3 @@ -<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <query-profile id="default" type="DefaultQueryProfileType"> </query-profile> diff --git a/config-model/src/test/derived/neuralnet/query-profiles/types/DefaultQueryProfileType.xml b/config-model/src/test/derived/neuralnet/query-profiles/types/DefaultQueryProfileType.xml index 8f83e4ce546..b3197522744 100644 --- a/config-model/src/test/derived/neuralnet/query-profiles/types/DefaultQueryProfileType.xml +++ b/config-model/src/test/derived/neuralnet/query-profiles/types/DefaultQueryProfileType.xml @@ -1,4 +1,4 @@ -<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <query-profile-type id="DefaultQueryProfileType" inherits="native"> <field name="ranking.features.query(W_0)" type="tensor(x[9],hidden[9])" /> <field name="ranking.features.query(b_0)" type="tensor(hidden[9])" /> diff --git a/config-model/src/test/derived/neuralnet_noqueryprofile/neuralnet.sd b/config-model/src/test/derived/neuralnet_noqueryprofile/neuralnet.sd index e083b152aba..c1bb8469f20 100644 --- a/config-model/src/test/derived/neuralnet_noqueryprofile/neuralnet.sd +++ b/config-model/src/test/derived/neuralnet_noqueryprofile/neuralnet.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema neuralnet { document neuralnet { diff --git a/config-model/src/test/derived/newrank/defs/document.config.documentmanager.def b/config-model/src/test/derived/newrank/defs/document.config.documentmanager.def index f18ad53ab0d..9548a503f00 100644 --- a/config-model/src/test/derived/newrank/defs/document.config.documentmanager.def +++ b/config-model/src/test/derived/newrank/defs/document.config.documentmanager.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=document.config datatype[].id int datatype[].arraytype[].datatype int diff --git a/config-model/src/test/derived/newrank/defs/test.extra.def b/config-model/src/test/derived/newrank/defs/test.extra.def index dfbe06997e1..f1ba20145dd 100644 --- a/config-model/src/test/derived/newrank/defs/test.extra.def +++ b/config-model/src/test/derived/newrank/defs/test.extra.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=test file[].name string file[].content string diff --git a/config-model/src/test/derived/newrank/defs/vespa.config.search.attributes.def b/config-model/src/test/derived/newrank/defs/vespa.config.search.attributes.def index f733b6155d3..a9af3cf0f24 100644 --- a/config-model/src/test/derived/newrank/defs/vespa.config.search.attributes.def +++ b/config-model/src/test/derived/newrank/defs/vespa.config.search.attributes.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search attribute[].name string attribute[].datatype string diff --git a/config-model/src/test/derived/newrank/defs/vespa.config.search.rank-profiles.def b/config-model/src/test/derived/newrank/defs/vespa.config.search.rank-profiles.def index 9d9154482be..7c9cbfbbfd2 100644 --- a/config-model/src/test/derived/newrank/defs/vespa.config.search.rank-profiles.def +++ b/config-model/src/test/derived/newrank/defs/vespa.config.search.rank-profiles.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search ## name of this rank profile. maps to table index for internal use. rankprofile[].name string diff --git a/config-model/src/test/derived/newrank/defs/vespa.config.search.summarymap.def b/config-model/src/test/derived/newrank/defs/vespa.config.search.summarymap.def index d3c3f86b295..86c9ff151df 100644 --- a/config-model/src/test/derived/newrank/defs/vespa.config.search.summarymap.def +++ b/config-model/src/test/derived/newrank/defs/vespa.config.search.summarymap.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search ## The default output summary class id, -1 to use the stored summary class id defaultoutputclass int default=-1 diff --git a/config-model/src/test/derived/newrank/defs/vespa.configdefinition.ilscripts.def b/config-model/src/test/derived/newrank/defs/vespa.configdefinition.ilscripts.def index 456d9449fdd..ffd4ebbd9f2 100644 --- a/config-model/src/test/derived/newrank/defs/vespa.configdefinition.ilscripts.def +++ b/config-model/src/test/derived/newrank/defs/vespa.configdefinition.ilscripts.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.configdefinition ilscript[].name string ilscript[].doctype string diff --git a/config-model/src/test/derived/newrank/newrank.sd b/config-model/src/test/derived/newrank/newrank.sd index a01f292eb27..6eb25888a0f 100644 --- a/config-model/src/test/derived/newrank/newrank.sd +++ b/config-model/src/test/derived/newrank/newrank.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema newrank{ document newrank{ diff --git a/config-model/src/test/derived/ngram/chunk.sd b/config-model/src/test/derived/ngram/chunk.sd index 7c2a7465327..84d806ef074 100644 --- a/config-model/src/test/derived/ngram/chunk.sd +++ b/config-model/src/test/derived/ngram/chunk.sd @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema chunk { document chunk { @@ -11,7 +12,7 @@ schema chunk { } document-summary content-summary inherits default { - summary content_dynamic type string { + summary content_dynamic { source: content dynamic } diff --git a/config-model/src/test/derived/nuwa/newsindex.sd b/config-model/src/test/derived/nuwa/newsindex.sd index 9fe3c125b97..78be5f1dbaf 100644 --- a/config-model/src/test/derived/nuwa/newsindex.sd +++ b/config-model/src/test/derived/nuwa/newsindex.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema newsindex { document newsindex { diff --git a/config-model/src/test/derived/orderilscripts/orderilscripts.sd b/config-model/src/test/derived/orderilscripts/orderilscripts.sd index 02c1dd667b0..792d1e547ed 100755 --- a/config-model/src/test/derived/orderilscripts/orderilscripts.sd +++ b/config-model/src/test/derived/orderilscripts/orderilscripts.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema orderilscripts { document orderilscripts { diff --git a/config-model/src/test/derived/position_array/position_array.sd b/config-model/src/test/derived/position_array/position_array.sd index cafdc15b9d2..36c738fb8d2 100644 --- a/config-model/src/test/derived/position_array/position_array.sd +++ b/config-model/src/test/derived/position_array/position_array.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema position_array { document position_array { field pos type array<position> { diff --git a/config-model/src/test/derived/position_attribute/position_attribute.sd b/config-model/src/test/derived/position_attribute/position_attribute.sd index b55ac26b399..65446340e71 100644 --- a/config-model/src/test/derived/position_attribute/position_attribute.sd +++ b/config-model/src/test/derived/position_attribute/position_attribute.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema position_attribute { document position_attribute { field pos type position { diff --git a/config-model/src/test/derived/position_extra/position_extra.sd b/config-model/src/test/derived/position_extra/position_extra.sd index d850113b723..584a35f70d9 100644 --- a/config-model/src/test/derived/position_extra/position_extra.sd +++ b/config-model/src/test/derived/position_extra/position_extra.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema position_extra { document position_extra { field pos_str type string { diff --git a/config-model/src/test/derived/position_nosummary/position_nosummary.sd b/config-model/src/test/derived/position_nosummary/position_nosummary.sd index 5aa40d98811..bc287a4e33e 100644 --- a/config-model/src/test/derived/position_nosummary/position_nosummary.sd +++ b/config-model/src/test/derived/position_nosummary/position_nosummary.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema position_nosummary { document position_nosummary { field pos type position { diff --git a/config-model/src/test/derived/position_summary/position_summary.sd b/config-model/src/test/derived/position_summary/position_summary.sd index f30e3d92c6a..07490e1b46c 100644 --- a/config-model/src/test/derived/position_summary/position_summary.sd +++ b/config-model/src/test/derived/position_summary/position_summary.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema position_summary { document position_summary { field pos type position { diff --git a/config-model/src/test/derived/predicate_attribute/predicate_attribute.sd b/config-model/src/test/derived/predicate_attribute/predicate_attribute.sd index 76482870719..733d8ad0a5d 100644 --- a/config-model/src/test/derived/predicate_attribute/predicate_attribute.sd +++ b/config-model/src/test/derived/predicate_attribute/predicate_attribute.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema predicate_type { document predicate_type { field some_predicate_field type predicate { diff --git a/config-model/src/test/derived/prefixexactattribute/prefixexactattribute.sd b/config-model/src/test/derived/prefixexactattribute/prefixexactattribute.sd index 119ec88c33c..d57b14fccc3 100644 --- a/config-model/src/test/derived/prefixexactattribute/prefixexactattribute.sd +++ b/config-model/src/test/derived/prefixexactattribute/prefixexactattribute.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema prefixexactattribute { document prefixexactattribute { diff --git a/config-model/src/test/derived/rankingexpression/rank-profiles.cfg b/config-model/src/test/derived/rankingexpression/rank-profiles.cfg index b0f7d0f2477..b3257c962dd 100644 --- a/config-model/src/test/derived/rankingexpression/rank-profiles.cfg +++ b/config-model/src/test/derived/rankingexpression/rank-profiles.cfg @@ -520,3 +520,65 @@ rankprofile[].fef.property[].name "vespa.type.attribute.t1" rankprofile[].fef.property[].value "tensor(m{},v[3])" rankprofile[].fef.property[].name "vespa.type.query.v" rankprofile[].fef.property[].value "tensor(v[3])" +rankprofile[].name "withnorm" +rankprofile[].fef.property[].name "rankingExpression(normBar).rankingScript" +rankprofile[].fef.property[].value "attribute(foo1) + attribute(year)" +rankprofile[].fef.property[].name "vespa.rank.firstphase" +rankprofile[].fef.property[].value "attribute(foo1)" +rankprofile[].fef.property[].name "vespa.rank.globalphase" +rankprofile[].fef.property[].value "rankingExpression(globalphase)" +rankprofile[].fef.property[].name "rankingExpression(globalphase).rankingScript" +rankprofile[].fef.property[].value "normalize@3551296680@linear + normalize@2879443254@rrank" +rankprofile[].fef.property[].name "vespa.match.feature" +rankprofile[].fef.property[].value "nativeRank" +rankprofile[].fef.property[].name "vespa.match.feature" +rankprofile[].fef.property[].value "attribute(year)" +rankprofile[].fef.property[].name "vespa.match.feature" +rankprofile[].fef.property[].value "attribute(foo1)" +rankprofile[].fef.property[].name "vespa.hidden.matchfeature" +rankprofile[].fef.property[].value "attribute(year)" +rankprofile[].fef.property[].name "vespa.hidden.matchfeature" +rankprofile[].fef.property[].value "attribute(foo1)" +rankprofile[].fef.property[].name "vespa.globalphase.rerankcount" +rankprofile[].fef.property[].value "123" +rankprofile[].fef.property[].name "vespa.type.attribute.t1" +rankprofile[].fef.property[].value "tensor(m{},v[3])" +rankprofile[].normalizer[].name "normalize@3551296680@linear" +rankprofile[].normalizer[].input "nativeRank" +rankprofile[].normalizer[].algo LINEAR +rankprofile[].normalizer[].kparam 0.0 +rankprofile[].normalizer[].name "normalize@2879443254@rrank" +rankprofile[].normalizer[].input "normBar" +rankprofile[].normalizer[].algo RRANK +rankprofile[].normalizer[].kparam 42.0 +rankprofile[].name "withfusion" +rankprofile[].fef.property[].name "rankingExpression(normBar).rankingScript" +rankprofile[].fef.property[].value "attribute(foo1) + attribute(year)" +rankprofile[].fef.property[].name "vespa.rank.firstphase" +rankprofile[].fef.property[].value "attribute(foo1)" +rankprofile[].fef.property[].name "vespa.rank.globalphase" +rankprofile[].fef.property[].value "rankingExpression(globalphase)" +rankprofile[].fef.property[].name "rankingExpression(globalphase).rankingScript" +rankprofile[].fef.property[].value "normalize@5385018767@rrank + normalize@3221316369@rrank" +rankprofile[].fef.property[].name "vespa.match.feature" +rankprofile[].fef.property[].value "nativeRank" +rankprofile[].fef.property[].name "vespa.match.feature" +rankprofile[].fef.property[].value "attribute(year)" +rankprofile[].fef.property[].name "vespa.match.feature" +rankprofile[].fef.property[].value "attribute(foo1)" +rankprofile[].fef.property[].name "vespa.hidden.matchfeature" +rankprofile[].fef.property[].value "attribute(year)" +rankprofile[].fef.property[].name "vespa.hidden.matchfeature" +rankprofile[].fef.property[].value "attribute(foo1)" +rankprofile[].fef.property[].name "vespa.globalphase.rerankcount" +rankprofile[].fef.property[].value "456" +rankprofile[].fef.property[].name "vespa.type.attribute.t1" +rankprofile[].fef.property[].value "tensor(m{},v[3])" +rankprofile[].normalizer[].name "normalize@5385018767@rrank" +rankprofile[].normalizer[].input "normBar" +rankprofile[].normalizer[].algo RRANK +rankprofile[].normalizer[].kparam 60.0 +rankprofile[].normalizer[].name "normalize@3221316369@rrank" +rankprofile[].normalizer[].input "nativeRank" +rankprofile[].normalizer[].algo RRANK +rankprofile[].normalizer[].kparam 60.0 diff --git a/config-model/src/test/derived/rankingexpression/rankexpression.sd b/config-model/src/test/derived/rankingexpression/rankexpression.sd index b0de2c60299..15537f1f9d0 100644 --- a/config-model/src/test/derived/rankingexpression/rankexpression.sd +++ b/config-model/src/test/derived/rankingexpression/rankexpression.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema rankexpression { document rankexpression { @@ -441,4 +441,32 @@ schema rankexpression { } } + rank-profile withnorm { + first-phase { + expression: attribute(foo1) + } + function normBar() { + expression: attribute(foo1) + attribute(year) + } + global-phase { + expression: normalize_linear(nativeRank) + reciprocal_rank(normBar(), 42.0) + rerank-count: 123 + } + match-features: nativeRank + } + + rank-profile withfusion { + first-phase { + expression: attribute(foo1) + } + function normBar() { + expression: attribute(foo1) + attribute(year) + } + global-phase { + expression: reciprocal_rank_fusion(normBar, nativeRank) + rerank-count: 456 + } + match-features: nativeRank + } + } diff --git a/config-model/src/test/derived/rankingmacros/rankingmacros.sd b/config-model/src/test/derived/rankingmacros/rankingmacros.sd index 84598cb483a..d4ab5ba74c0 100644 --- a/config-model/src/test/derived/rankingmacros/rankingmacros.sd +++ b/config-model/src/test/derived/rankingmacros/rankingmacros.sd @@ -1,4 +1,4 @@ -# Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema rankingmacros { document rankingmacros { diff --git a/config-model/src/test/derived/rankprofileinheritance/child.sd b/config-model/src/test/derived/rankprofileinheritance/child.sd index a6e0787a659..2517d0731f5 100644 --- a/config-model/src/test/derived/rankprofileinheritance/child.sd +++ b/config-model/src/test/derived/rankprofileinheritance/child.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema child { document child inherits parent1, parent2 { diff --git a/config-model/src/test/derived/rankprofileinheritance/parent1.sd b/config-model/src/test/derived/rankprofileinheritance/parent1.sd index d25182fde4c..d6233cebcf1 100644 --- a/config-model/src/test/derived/rankprofileinheritance/parent1.sd +++ b/config-model/src/test/derived/rankprofileinheritance/parent1.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema parent1 { document parent1 { diff --git a/config-model/src/test/derived/rankprofileinheritance/parent2.sd b/config-model/src/test/derived/rankprofileinheritance/parent2.sd index fa42f8ea303..2fa78503957 100644 --- a/config-model/src/test/derived/rankprofileinheritance/parent2.sd +++ b/config-model/src/test/derived/rankprofileinheritance/parent2.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema parent2 { document parent2 { diff --git a/config-model/src/test/derived/rankprofilemodularity/test.sd b/config-model/src/test/derived/rankprofilemodularity/test.sd index 34414414d6c..a5acdc3bd4b 100644 --- a/config-model/src/test/derived/rankprofilemodularity/test.sd +++ b/config-model/src/test/derived/rankprofilemodularity/test.sd @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { @@ -46,4 +47,4 @@ schema test { } -}
\ No newline at end of file +} diff --git a/config-model/src/test/derived/rankprofiles/rankprofiles.sd b/config-model/src/test/derived/rankprofiles/rankprofiles.sd index 9966e304b78..7b66f003094 100644 --- a/config-model/src/test/derived/rankprofiles/rankprofiles.sd +++ b/config-model/src/test/derived/rankprofiles/rankprofiles.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema rankprofiles { document rankprofiles { diff --git a/config-model/src/test/derived/rankproperties/rankproperties.sd b/config-model/src/test/derived/rankproperties/rankproperties.sd index a13b3081ca7..67473c19fd0 100644 --- a/config-model/src/test/derived/rankproperties/rankproperties.sd +++ b/config-model/src/test/derived/rankproperties/rankproperties.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema rankproperties { document rankproperties { diff --git a/config-model/src/test/derived/ranktypes/ranktypes.sd b/config-model/src/test/derived/ranktypes/ranktypes.sd index 8f11a21236d..163b4670e77 100644 --- a/config-model/src/test/derived/ranktypes/ranktypes.sd +++ b/config-model/src/test/derived/ranktypes/ranktypes.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema ranktypes { document ranktypes { diff --git a/config-model/src/test/derived/reference_fields/ad.sd b/config-model/src/test/derived/reference_fields/ad.sd index a39ec2f67ab..097a6ed5bc9 100644 --- a/config-model/src/test/derived/reference_fields/ad.sd +++ b/config-model/src/test/derived/reference_fields/ad.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema ad { document ad { field campaign_ref type reference<campaign> { @@ -12,6 +12,6 @@ schema ad { } } document-summary explicit_summary { - summary yet_another_ref type reference<campaign> {} + summary yet_another_ref {} } } diff --git a/config-model/src/test/derived/reference_fields/campaign.sd b/config-model/src/test/derived/reference_fields/campaign.sd index 026d520dfb3..498334d65e1 100644 --- a/config-model/src/test/derived/reference_fields/campaign.sd +++ b/config-model/src/test/derived/reference_fields/campaign.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema campaign { document campaign { } diff --git a/config-model/src/test/derived/reference_from_several/bar.sd b/config-model/src/test/derived/reference_from_several/bar.sd index 68e1b22da3a..47cd9b117aa 100644 --- a/config-model/src/test/derived/reference_from_several/bar.sd +++ b/config-model/src/test/derived/reference_from_several/bar.sd @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema bar { document bar { field bpref type reference<parent> { @@ -9,7 +10,7 @@ schema bar { } import field bpref.x as barsximp {} document-summary other { - summary bartitle type string {} - summary barsximp type int {} + summary bartitle {} + summary barsximp {} } } diff --git a/config-model/src/test/derived/reference_from_several/foo.sd b/config-model/src/test/derived/reference_from_several/foo.sd index bfc4eca28c2..ead26bcbba3 100644 --- a/config-model/src/test/derived/reference_from_several/foo.sd +++ b/config-model/src/test/derived/reference_from_several/foo.sd @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema foo { document foo { field myref type reference<parent> { @@ -9,7 +10,7 @@ schema foo { } import field myref.x as myx {} document-summary small { - summary myx type int {} - summary foo type string {} + summary myx {} + summary foo {} } } diff --git a/config-model/src/test/derived/reference_from_several/parent.sd b/config-model/src/test/derived/reference_from_several/parent.sd index 4b19c46ddec..e9295d32245 100644 --- a/config-model/src/test/derived/reference_from_several/parent.sd +++ b/config-model/src/test/derived/reference_from_several/parent.sd @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema parent { document parent { field x type int { diff --git a/config-model/src/test/derived/renamedfeatures/foo.sd b/config-model/src/test/derived/renamedfeatures/foo.sd index 7ab4da4de33..ad763098d51 100644 --- a/config-model/src/test/derived/renamedfeatures/foo.sd +++ b/config-model/src/test/derived/renamedfeatures/foo.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema foo { document foo { diff --git a/config-model/src/test/derived/reserved_position/reserved_position.sd b/config-model/src/test/derived/reserved_position/reserved_position.sd index 68879c53e89..377b10cfeba 100644 --- a/config-model/src/test/derived/reserved_position/reserved_position.sd +++ b/config-model/src/test/derived/reserved_position/reserved_position.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema position { document position { } } diff --git a/config-model/src/test/derived/scalar_constant/test.sd b/config-model/src/test/derived/scalar_constant/test.sd index 5c05e0ba941..1f3c7709a88 100644 --- a/config-model/src/test/derived/scalar_constant/test.sd +++ b/config-model/src/test/derived/scalar_constant/test.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { diff --git a/config-model/src/test/derived/schemainheritance/child.sd b/config-model/src/test/derived/schemainheritance/child.sd index a209919763d..ea3ff9b85da 100644 --- a/config-model/src/test/derived/schemainheritance/child.sd +++ b/config-model/src/test/derived/schemainheritance/child.sd @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema child inherits parent { document child inherits parent { @@ -35,7 +36,7 @@ schema child inherits parent { } document-summary child_summary inherits parent_summary { - summary cf1 type string {} + summary cf1 {} } import field importedschema_ref.importedfield2 as child_imported {} diff --git a/config-model/src/test/derived/schemainheritance/importedschema.sd b/config-model/src/test/derived/schemainheritance/importedschema.sd index 1b5acff8a26..88528b422e4 100644 --- a/config-model/src/test/derived/schemainheritance/importedschema.sd +++ b/config-model/src/test/derived/schemainheritance/importedschema.sd @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema importedschema { document importedschema { @@ -12,4 +13,4 @@ schema importedschema { } -}
\ No newline at end of file +} diff --git a/config-model/src/test/derived/schemainheritance/parent.sd b/config-model/src/test/derived/schemainheritance/parent.sd index 3635a179b44..ab2b703ba57 100644 --- a/config-model/src/test/derived/schemainheritance/parent.sd +++ b/config-model/src/test/derived/schemainheritance/parent.sd @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema parent { document parent { @@ -31,7 +32,7 @@ schema parent { file: small_constants_and_functions.onnx } document-summary parent_summary { - summary pf1 type string { + summary pf1 { } } import field importedschema_ref.importedfield1 as parent_imported { diff --git a/config-model/src/test/derived/schemainheritance/schema-info.cfg b/config-model/src/test/derived/schemainheritance/schema-info.cfg new file mode 100644 index 00000000000..9fe71780c7a --- /dev/null +++ b/config-model/src/test/derived/schemainheritance/schema-info.cfg @@ -0,0 +1,127 @@ +schema[].name "child" +schema[].field[].name "parent_field" +schema[].field[].type "string" +schema[].field[].attribute true +schema[].field[].index true +schema[].field[].name "child_field" +schema[].field[].type "string" +schema[].field[].attribute true +schema[].field[].index true +schema[].field[].name "pf1" +schema[].field[].type "string" +schema[].field[].attribute false +schema[].field[].index false +schema[].field[].name "importedschema_ref" +schema[].field[].type "reference<importedschema>" +schema[].field[].attribute true +schema[].field[].index false +schema[].field[].name "parent_field" +schema[].field[].type "string" +schema[].field[].attribute true +schema[].field[].index true +schema[].field[].name "cf1" +schema[].field[].type "string" +schema[].field[].attribute false +schema[].field[].index false +schema[].field[].name "child_field" +schema[].field[].type "string" +schema[].field[].attribute true +schema[].field[].index true +schema[].field[].name "parent_imported" +schema[].field[].type "string" +schema[].field[].attribute true +schema[].field[].index false +schema[].field[].name "importedfield1" +schema[].field[].type "string" +schema[].field[].attribute true +schema[].field[].index false +schema[].field[].name "child_imported" +schema[].field[].type "string" +schema[].field[].attribute true +schema[].field[].index false +schema[].field[].name "importedfield2" +schema[].field[].type "string" +schema[].field[].attribute true +schema[].field[].index false +schema[].fieldset[].name "[document]" +schema[].fieldset[].field[] "cf1" +schema[].fieldset[].field[] "importedschema_ref" +schema[].fieldset[].field[] "pf1" +schema[].fieldset[].name "[search]" +schema[].fieldset[].field[] "child_field" +schema[].fieldset[].field[] "parent_field" +schema[].fieldset[].name "parent_set" +schema[].fieldset[].field[] "pf1" +schema[].fieldset[].name "child_set" +schema[].fieldset[].field[] "cf1" +schema[].fieldset[].field[] "pf1" +schema[].summaryclass[].name "default" +schema[].summaryclass[].fields[].name "parent_field" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "child_field" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "pf1" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "cf1" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "rankfeatures" +schema[].summaryclass[].fields[].type "featuredata" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "summaryfeatures" +schema[].summaryclass[].fields[].type "featuredata" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "documentid" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].name "parent_summary" +schema[].summaryclass[].fields[].name "pf1" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "rankfeatures" +schema[].summaryclass[].fields[].type "featuredata" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "summaryfeatures" +schema[].summaryclass[].fields[].type "featuredata" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].name "attributeprefetch" +schema[].summaryclass[].fields[].name "parent_field" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "child_field" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "rankfeatures" +schema[].summaryclass[].fields[].type "featuredata" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "summaryfeatures" +schema[].summaryclass[].fields[].type "featuredata" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].name "child_summary" +schema[].summaryclass[].fields[].name "pf1" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "rankfeatures" +schema[].summaryclass[].fields[].type "featuredata" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "summaryfeatures" +schema[].summaryclass[].fields[].type "featuredata" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "cf1" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].rankprofile[].name "default" +schema[].rankprofile[].hasSummaryFeatures false +schema[].rankprofile[].hasRankFeatures false +schema[].rankprofile[].name "unranked" +schema[].rankprofile[].hasSummaryFeatures false +schema[].rankprofile[].hasRankFeatures false +schema[].rankprofile[].name "child_profile" +schema[].rankprofile[].hasSummaryFeatures false +schema[].rankprofile[].hasRankFeatures false +schema[].rankprofile[].name "parent_profile" +schema[].rankprofile[].hasSummaryFeatures false +schema[].rankprofile[].hasRankFeatures false diff --git a/config-model/src/test/derived/slice/query-profiles/default.xml b/config-model/src/test/derived/slice/query-profiles/default.xml index 2535ca895ed..f8cc845e0a0 100644 --- a/config-model/src/test/derived/slice/query-profiles/default.xml +++ b/config-model/src/test/derived/slice/query-profiles/default.xml @@ -1,3 +1,3 @@ -<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <query-profile id="default" type="DefaultQueryProfileType"> </query-profile> diff --git a/config-model/src/test/derived/slice/query-profiles/types/DefaultQueryProfileType.xml b/config-model/src/test/derived/slice/query-profiles/types/DefaultQueryProfileType.xml index 50970d8743f..961b153528a 100644 --- a/config-model/src/test/derived/slice/query-profiles/types/DefaultQueryProfileType.xml +++ b/config-model/src/test/derived/slice/query-profiles/types/DefaultQueryProfileType.xml @@ -1,4 +1,4 @@ -<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <query-profile-type id="DefaultQueryProfileType" inherits="native"> <field name="ranking.features.query(myTensor)" type="tensor<float>(key{})" /> </query-profile-type> diff --git a/config-model/src/test/derived/slice/test.sd b/config-model/src/test/derived/slice/test.sd index 0c351d4323d..b42cecaa194 100644 --- a/config-model/src/test/derived/slice/test.sd +++ b/config-model/src/test/derived/slice/test.sd @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { @@ -20,4 +21,4 @@ schema test { } } -}
\ No newline at end of file +} diff --git a/config-model/src/test/derived/sorting/sorting.sd b/config-model/src/test/derived/sorting/sorting.sd index 7317c784f66..c4be83cd21a 100644 --- a/config-model/src/test/derived/sorting/sorting.sd +++ b/config-model/src/test/derived/sorting/sorting.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema sorting { document sorting { diff --git a/config-model/src/test/derived/streamingjuniper/streamingjuniper.sd b/config-model/src/test/derived/streamingjuniper/streamingjuniper.sd index 392911d4b34..93982152e96 100644 --- a/config-model/src/test/derived/streamingjuniper/streamingjuniper.sd +++ b/config-model/src/test/derived/streamingjuniper/streamingjuniper.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema streamingjuniper { document streamingjuniper { field f1 type string { diff --git a/config-model/src/test/derived/streamingstruct/streamingstruct.sd b/config-model/src/test/derived/streamingstruct/streamingstruct.sd index 59c325f8117..8606ec0a7f7 100644 --- a/config-model/src/test/derived/streamingstruct/streamingstruct.sd +++ b/config-model/src/test/derived/streamingstruct/streamingstruct.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema streamingstruct { document streamingstruct { @@ -174,11 +174,11 @@ schema streamingstruct { } document-summary summ { - summary snippet type string { + summary snippet { dynamic source: a.f1, b.f2 } - summary snippet2 type string { + summary snippet2 { source: a.f1, b.f1, b.f2 } } diff --git a/config-model/src/test/derived/streamingstructdefault/streamingstructdefault.sd b/config-model/src/test/derived/streamingstructdefault/streamingstructdefault.sd index ecb7a177775..837678ed174 100644 --- a/config-model/src/test/derived/streamingstructdefault/streamingstructdefault.sd +++ b/config-model/src/test/derived/streamingstructdefault/streamingstructdefault.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema streamingstructdefault { document streamingstructdefault { struct sct { @@ -14,7 +14,7 @@ schema streamingstructdefault { } } document-summary default { - summary sum1 type string { + summary sum1 { source: f1, f2.s1 dynamic } diff --git a/config-model/src/test/derived/structandfieldset/test.sd b/config-model/src/test/derived/structandfieldset/test.sd index 0b50738ab54..9915b82cb01 100644 --- a/config-model/src/test/derived/structandfieldset/test.sd +++ b/config-model/src/test/derived/structandfieldset/test.sd @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { diff --git a/config-model/src/test/derived/structanyorder/structanyorder.sd b/config-model/src/test/derived/structanyorder/structanyorder.sd index 829ef04a1d5..26199ac760d 100755 --- a/config-model/src/test/derived/structanyorder/structanyorder.sd +++ b/config-model/src/test/derived/structanyorder/structanyorder.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema annotationsimplicitstruct { document annotationsimplicitstruct { diff --git a/config-model/src/test/derived/structinheritance/bad.sd b/config-model/src/test/derived/structinheritance/bad.sd index 31bef765142..b097af5efda 100644 --- a/config-model/src/test/derived/structinheritance/bad.sd +++ b/config-model/src/test/derived/structinheritance/bad.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema bad { document bad { diff --git a/config-model/src/test/derived/structinheritance/simple.sd b/config-model/src/test/derived/structinheritance/simple.sd index 0e56be4fec8..8184ea1571e 100644 --- a/config-model/src/test/derived/structinheritance/simple.sd +++ b/config-model/src/test/derived/structinheritance/simple.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema simple { document simple { diff --git a/config-model/src/test/derived/tensor/tensor.sd b/config-model/src/test/derived/tensor/tensor.sd index a0657bae2e4..f2fc57a2018 100644 --- a/config-model/src/test/derived/tensor/tensor.sd +++ b/config-model/src/test/derived/tensor/tensor.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema tensor { document tensor { diff --git a/config-model/src/test/derived/tensor2/first.sd b/config-model/src/test/derived/tensor2/first.sd index 900cf515176..cdf623417a2 100644 --- a/config-model/src/test/derived/tensor2/first.sd +++ b/config-model/src/test/derived/tensor2/first.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema first { document first { field first_field type tensor(first[10]) { diff --git a/config-model/src/test/derived/tensor2/second.sd b/config-model/src/test/derived/tensor2/second.sd index a43495b7604..46c5c93a437 100644 --- a/config-model/src/test/derived/tensor2/second.sd +++ b/config-model/src/test/derived/tensor2/second.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema second { document second { field second_field type tensor(second[10]) { diff --git a/config-model/src/test/derived/tokenization/tokenization.sd b/config-model/src/test/derived/tokenization/tokenization.sd index a74c52e4d9d..035a0165cc4 100644 --- a/config-model/src/test/derived/tokenization/tokenization.sd +++ b/config-model/src/test/derived/tokenization/tokenization.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema tokenization { document tokenization { diff --git a/config-model/src/test/derived/twostreamingstructs/streamingstruct.sd b/config-model/src/test/derived/twostreamingstructs/streamingstruct.sd index a0f2888bc2a..8e70fdfc8d1 100644 --- a/config-model/src/test/derived/twostreamingstructs/streamingstruct.sd +++ b/config-model/src/test/derived/twostreamingstructs/streamingstruct.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema streamingstruct { document streamingstruct { @@ -176,11 +176,11 @@ schema streamingstruct { } document-summary summ { - summary snippet type string { + summary snippet { dynamic source: a.f1, b.f2 } - summary snippet2 type string { + summary snippet2 { source: a.f1, b.f1, b.f2 } } diff --git a/config-model/src/test/derived/twostreamingstructs/whatever.sd b/config-model/src/test/derived/twostreamingstructs/whatever.sd index c8c7279e4e1..eef1bf92d87 100644 --- a/config-model/src/test/derived/twostreamingstructs/whatever.sd +++ b/config-model/src/test/derived/twostreamingstructs/whatever.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema whatever { document whatever { diff --git a/config-model/src/test/derived/types/types.sd b/config-model/src/test/derived/types/types.sd index 3a0eef1332d..c15f3409183 100644 --- a/config-model/src/test/derived/types/types.sd +++ b/config-model/src/test/derived/types/types.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema types { document types { diff --git a/config-model/src/test/derived/uri_array/uri_array.sd b/config-model/src/test/derived/uri_array/uri_array.sd index 6521f332a2f..8c133bf336c 100644 --- a/config-model/src/test/derived/uri_array/uri_array.sd +++ b/config-model/src/test/derived/uri_array/uri_array.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema uri_array { document uri_array { field my_uri type array<uri> { diff --git a/config-model/src/test/derived/uri_wset/uri_wset.sd b/config-model/src/test/derived/uri_wset/uri_wset.sd index 8af136bbfef..51de0e417e9 100644 --- a/config-model/src/test/derived/uri_wset/uri_wset.sd +++ b/config-model/src/test/derived/uri_wset/uri_wset.sd @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema uri_wset { document uri_wset { field my_uri type weightedset<uri> { diff --git a/config-model/src/test/derived/vector_constant/test.sd b/config-model/src/test/derived/vector_constant/test.sd index 508bd6505a7..5bb9b54b86b 100644 --- a/config-model/src/test/derived/vector_constant/test.sd +++ b/config-model/src/test/derived/vector_constant/test.sd @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. schema test { document test { field extra type string { |