diff options
Diffstat (limited to 'config-model/src/test/derived')
27 files changed, 841 insertions, 360 deletions
diff --git a/config-model/src/test/derived/advanced/advanced.sd b/config-model/src/test/derived/advanced/advanced.sd index b03db73d45d..928e74160b9 100644 --- a/config-model/src/test/derived/advanced/advanced.sd +++ b/config-model/src/test/derived/advanced/advanced.sd @@ -99,6 +99,7 @@ search advanced { fieldset titleabstract { fields: title } + raw-as-base64-in-summary : true fieldset default { fields: title } diff --git a/config-model/src/test/derived/attributerank/attributerank.sd b/config-model/src/test/derived/attributerank/attributerank.sd index 86f96e4817c..4989e1795cd 100644 --- a/config-model/src/test/derived/attributerank/attributerank.sd +++ b/config-model/src/test/derived/attributerank/attributerank.sd @@ -38,4 +38,5 @@ search attributerank { rank-type singledouble: identity rank-type singlestring: identity } + } diff --git a/config-model/src/test/derived/complex/complex.sd b/config-model/src/test/derived/complex/complex.sd index fffa9b02212..844d09a529d 100644 --- a/config-model/src/test/derived/complex/complex.sd +++ b/config-model/src/test/derived/complex/complex.sd @@ -140,6 +140,7 @@ search complex { fieldset special { fields: special1, special2, special3 } + raw-as-base64-in-summary : false fieldset all { fields: combineda, combinedb } diff --git a/config-model/src/test/derived/indexschema/vsmfields.cfg b/config-model/src/test/derived/indexschema/vsmfields.cfg index 9dcffd30313..31db622183e 100644 --- a/config-model/src/test/derived/indexschema/vsmfields.cfg +++ b/config-model/src/test/derived/indexschema/vsmfields.cfg @@ -20,6 +20,11 @@ fieldspec[].searchmethod AUTOUTF8 fieldspec[].arg1 "" fieldspec[].maxlength 1048576 fieldspec[].fieldtype INDEX +fieldspec[].name "pos" +fieldspec[].searchmethod GEOPOS +fieldspec[].arg1 "" +fieldspec[].maxlength 1048576 +fieldspec[].fieldtype INDEX fieldspec[].name "se" fieldspec[].searchmethod AUTOUTF8 fieldspec[].arg1 "word" @@ -124,6 +129,8 @@ documenttype[].index[].name "sc" documenttype[].index[].field[].name "sc" documenttype[].index[].name "sd" documenttype[].index[].field[].name "sd" +documenttype[].index[].name "pos" +documenttype[].index[].field[].name "pos" documenttype[].index[].name "se" documenttype[].index[].field[].name "se" documenttype[].index[].name "sf" diff --git a/config-model/src/test/derived/multiplesummaries/attributes.cfg b/config-model/src/test/derived/multiplesummaries/attributes.cfg index d5db9a8fe9d..44c94c73781 100644 --- a/config-model/src/test/derived/multiplesummaries/attributes.cfg +++ b/config-model/src/test/derived/multiplesummaries/attributes.cfg @@ -1,15 +1,160 @@ -attribute[a].collectiontype SINGLE -attribute[a].datatype STRING -attribute[a].name "a" -attribute[abolded].collectiontype SINGLE -attribute[abolded].datatype STRING -attribute[abolded].name "abolded" -attribute[adynamic].collectiontype SINGLE -attribute[adynamic].datatype STRING -attribute[adynamic].name "adynamic" -attribute[c].collectiontype SINGLE -attribute[c].datatype STRING -attribute[c].name "c" -attribute[loc_pos_zcurve].collectiontype SINGLE -attribute[loc_pos_zcurve].datatype INT64 -attribute[loc_pos_zcurve].name "loc_pos_zcurve" +attribute[].name "a" +attribute[].datatype STRING +attribute[].collectiontype SINGLE +attribute[].dictionary.type BTREE +attribute[].dictionary.match UNCASED +attribute[].match UNCASED +attribute[].removeifzero false +attribute[].createifnonexistent false +attribute[].fastsearch false +attribute[].huge false +attribute[].paged false +attribute[].ismutable false +attribute[].sortascending true +attribute[].sortfunction UCA +attribute[].sortstrength PRIMARY +attribute[].sortlocale "" +attribute[].enablebitvectors false +attribute[].enableonlybitvector false +attribute[].fastaccess false +attribute[].arity 8 +attribute[].lowerbound -9223372036854775808 +attribute[].upperbound 9223372036854775807 +attribute[].densepostinglistthreshold 0.4 +attribute[].tensortype "" +attribute[].imported false +attribute[].maxuncommittedmemory 77777 +attribute[].distancemetric EUCLIDEAN +attribute[].index.hnsw.enabled false +attribute[].index.hnsw.maxlinkspernode 16 +attribute[].index.hnsw.neighborstoexploreatinsert 200 +attribute[].index.hnsw.distancemetric EUCLIDEAN +attribute[].index.hnsw.multithreadedindexing true +attribute[].name "adynamic" +attribute[].datatype STRING +attribute[].collectiontype SINGLE +attribute[].dictionary.type BTREE +attribute[].dictionary.match UNCASED +attribute[].match UNCASED +attribute[].removeifzero false +attribute[].createifnonexistent false +attribute[].fastsearch false +attribute[].huge false +attribute[].paged false +attribute[].ismutable false +attribute[].sortascending true +attribute[].sortfunction UCA +attribute[].sortstrength PRIMARY +attribute[].sortlocale "" +attribute[].enablebitvectors false +attribute[].enableonlybitvector false +attribute[].fastaccess false +attribute[].arity 8 +attribute[].lowerbound -9223372036854775808 +attribute[].upperbound 9223372036854775807 +attribute[].densepostinglistthreshold 0.4 +attribute[].tensortype "" +attribute[].imported false +attribute[].maxuncommittedmemory 77777 +attribute[].distancemetric EUCLIDEAN +attribute[].index.hnsw.enabled false +attribute[].index.hnsw.maxlinkspernode 16 +attribute[].index.hnsw.neighborstoexploreatinsert 200 +attribute[].index.hnsw.distancemetric EUCLIDEAN +attribute[].index.hnsw.multithreadedindexing true +attribute[].name "abolded" +attribute[].datatype STRING +attribute[].collectiontype SINGLE +attribute[].dictionary.type BTREE +attribute[].dictionary.match UNCASED +attribute[].match UNCASED +attribute[].removeifzero false +attribute[].createifnonexistent false +attribute[].fastsearch false +attribute[].huge false +attribute[].paged false +attribute[].ismutable false +attribute[].sortascending true +attribute[].sortfunction UCA +attribute[].sortstrength PRIMARY +attribute[].sortlocale "" +attribute[].enablebitvectors false +attribute[].enableonlybitvector false +attribute[].fastaccess false +attribute[].arity 8 +attribute[].lowerbound -9223372036854775808 +attribute[].upperbound 9223372036854775807 +attribute[].densepostinglistthreshold 0.4 +attribute[].tensortype "" +attribute[].imported false +attribute[].maxuncommittedmemory 77777 +attribute[].distancemetric EUCLIDEAN +attribute[].index.hnsw.enabled false +attribute[].index.hnsw.maxlinkspernode 16 +attribute[].index.hnsw.neighborstoexploreatinsert 200 +attribute[].index.hnsw.distancemetric EUCLIDEAN +attribute[].index.hnsw.multithreadedindexing true +attribute[].name "c" +attribute[].datatype STRING +attribute[].collectiontype SINGLE +attribute[].dictionary.type BTREE +attribute[].dictionary.match UNCASED +attribute[].match UNCASED +attribute[].removeifzero false +attribute[].createifnonexistent false +attribute[].fastsearch false +attribute[].huge false +attribute[].paged false +attribute[].ismutable false +attribute[].sortascending true +attribute[].sortfunction UCA +attribute[].sortstrength PRIMARY +attribute[].sortlocale "" +attribute[].enablebitvectors false +attribute[].enableonlybitvector false +attribute[].fastaccess false +attribute[].arity 8 +attribute[].lowerbound -9223372036854775808 +attribute[].upperbound 9223372036854775807 +attribute[].densepostinglistthreshold 0.4 +attribute[].tensortype "" +attribute[].imported false +attribute[].maxuncommittedmemory 77777 +attribute[].distancemetric EUCLIDEAN +attribute[].index.hnsw.enabled false +attribute[].index.hnsw.maxlinkspernode 16 +attribute[].index.hnsw.neighborstoexploreatinsert 200 +attribute[].index.hnsw.distancemetric EUCLIDEAN +attribute[].index.hnsw.multithreadedindexing true +attribute[].name "loc_pos_zcurve" +attribute[].datatype INT64 +attribute[].collectiontype SINGLE +attribute[].dictionary.type BTREE +attribute[].dictionary.match UNCASED +attribute[].match UNCASED +attribute[].removeifzero false +attribute[].createifnonexistent false +attribute[].fastsearch true +attribute[].huge false +attribute[].paged false +attribute[].ismutable false +attribute[].sortascending true +attribute[].sortfunction UCA +attribute[].sortstrength PRIMARY +attribute[].sortlocale "" +attribute[].enablebitvectors false +attribute[].enableonlybitvector false +attribute[].fastaccess false +attribute[].arity 8 +attribute[].lowerbound -9223372036854775808 +attribute[].upperbound 9223372036854775807 +attribute[].densepostinglistthreshold 0.4 +attribute[].tensortype "" +attribute[].imported false +attribute[].maxuncommittedmemory 77777 +attribute[].distancemetric EUCLIDEAN +attribute[].index.hnsw.enabled false +attribute[].index.hnsw.maxlinkspernode 16 +attribute[].index.hnsw.neighborstoexploreatinsert 200 +attribute[].index.hnsw.distancemetric EUCLIDEAN +attribute[].index.hnsw.multithreadedindexing true diff --git a/config-model/src/test/derived/multiplesummaries/ilscripts.cfg b/config-model/src/test/derived/multiplesummaries/ilscripts.cfg index fbb546179e1..5434b0770f7 100644 --- a/config-model/src/test/derived/multiplesummaries/ilscripts.cfg +++ b/config-model/src/test/derived/multiplesummaries/ilscripts.cfg @@ -1,13 +1,27 @@ -ilscript[multiplesummaries].doctype "multiplesummaries" -ilscript[multiplesummaries].name "multiplesummaries" -ilscript[multiplesummaries].content[] "clear_state | guard { input a | tokenize normalize stem:\"SHORTEST\" | summary abolded2 | summary aboldeddynamic | summary adynamic2 | attribute a }" -ilscript[multiplesummaries].content[] "clear_state | guard { input adynamic | tokenize normalize stem:\"SHORTEST\" | summary adynamic | attribute adynamic }" -ilscript[multiplesummaries].content[] "clear_state | guard { input abolded | tokenize normalize stem:\"SHORTEST\" | summary abolded | attribute abolded }" -ilscript[multiplesummaries].content[] "clear_state | guard { input b | summary b }" -ilscript[multiplesummaries].content[] "clear_state | guard { input c | summary c | attribute c }" -ilscript[multiplesummaries].content[] "clear_state | guard { input d | tokenize normalize stem:\"SHORTEST\" | summary d }" -ilscript[multiplesummaries].content[] "clear_state | guard { input e | tokenize normalize stem:\"SHORTEST\" | summary dynamice }" -ilscript[multiplesummaries].content[] "clear_state | guard { input f | summary f }" -ilscript[multiplesummaries].content[] "clear_state | guard { input g | summary g }" -ilscript[multiplesummaries].content[] "clear_state | guard { input h | summary h }" -ilscript[multiplesummaries].content[] "clear_state | guard { input loc | to_pos | zcurve | attribute loc_pos_zcurve }" +maxtermoccurrences 100 +fieldmatchmaxlength 1000000 +ilscript[].doctype "multiplesummaries" +ilscript[].docfield[0] "a" +ilscript[].docfield[1] "adynamic" +ilscript[].docfield[2] "abolded" +ilscript[].docfield[3] "b" +ilscript[].docfield[4] "c" +ilscript[].docfield[5] "d" +ilscript[].docfield[6] "e" +ilscript[].docfield[7] "f" +ilscript[].docfield[8] "g" +ilscript[].docfield[9] "h" +ilscript[].docfield[10] "loc" +ilscript[].docfield[11] "mytags" +ilscript[].content[0] "clear_state | guard { input loc | to_pos | zcurve | attribute loc_pos_zcurve; }" +ilscript[].content[1] "clear_state | guard { input a | tokenize normalize stem:\"BEST\" | summary abolded2 | summary aboldeddynamic | summary adynamic2 | attribute a; }" +ilscript[].content[2] "clear_state | guard { input adynamic | tokenize normalize stem:\"BEST\" | summary adynamic | attribute adynamic; }" +ilscript[].content[3] "clear_state | guard { input abolded | tokenize normalize stem:\"BEST\" | summary abolded | attribute abolded; }" +ilscript[].content[4] "clear_state | guard { input b | summary anotherb | summary b; }" +ilscript[].content[5] "clear_state | guard { input c | summary c | attribute c; }" +ilscript[].content[6] "clear_state | guard { input d | tokenize normalize stem:\"BEST\" | summary d; }" +ilscript[].content[7] "clear_state | guard { input e | tokenize normalize stem:\"BEST\" | summary dynamice | summary e; }" +ilscript[].content[8] "clear_state | guard { input f | summary f; }" +ilscript[].content[9] "clear_state | guard { input g | summary g; }" +ilscript[].content[10] "clear_state | guard { input h | summary h; }" +ilscript[].content[11] "clear_state | guard { input mytags | for_each { tokenize normalize stem:\"BEST\" } | index mytags; }" diff --git a/config-model/src/test/derived/multiplesummaries/index-info.cfg b/config-model/src/test/derived/multiplesummaries/index-info.cfg index ec2d3f06e46..d5002535761 100644 --- a/config-model/src/test/derived/multiplesummaries/index-info.cfg +++ b/config-model/src/test/derived/multiplesummaries/index-info.cfg @@ -1,59 +1,145 @@ -indexinfo[multiplesummaries].name "multiplesummaries" -indexinfo[multiplesummaries].command[].command "index" -indexinfo[multiplesummaries].command[].indexname "sddocname" -indexinfo[multiplesummaries].command[].command "word" -indexinfo[multiplesummaries].command[].indexname "sddocname" -indexinfo[multiplesummaries].command[].command "index" -indexinfo[multiplesummaries].command[].indexname "a" -indexinfo[multiplesummaries].command[].command "attribute" -indexinfo[multiplesummaries].command[].indexname "a" -indexinfo[multiplesummaries].command[].command "index" -indexinfo[multiplesummaries].command[].indexname "adynamic" -indexinfo[multiplesummaries].command[].command "attribute" -indexinfo[multiplesummaries].command[].indexname "adynamic" -indexinfo[multiplesummaries].command[].command "index" -indexinfo[multiplesummaries].command[].indexname "abolded" -indexinfo[multiplesummaries].command[].command "attribute" -indexinfo[multiplesummaries].command[].indexname "abolded" -indexinfo[multiplesummaries].command[].command "index" -indexinfo[multiplesummaries].command[].indexname "b" -indexinfo[multiplesummaries].command[].command "index" -indexinfo[multiplesummaries].command[].indexname "c" -indexinfo[multiplesummaries].command[].command "attribute" -indexinfo[multiplesummaries].command[].indexname "c" -indexinfo[multiplesummaries].command[].command "index" -indexinfo[multiplesummaries].command[].indexname "d" -indexinfo[multiplesummaries].command[].command "index" -indexinfo[multiplesummaries].command[].indexname "e" -indexinfo[multiplesummaries].command[].command "index" -indexinfo[multiplesummaries].command[].indexname "f" -indexinfo[multiplesummaries].command[].command "index" -indexinfo[multiplesummaries].command[].indexname "g" -indexinfo[multiplesummaries].command[].command "index" -indexinfo[multiplesummaries].command[].indexname "h" -indexinfo[multiplesummaries].command[].command "index" -indexinfo[multiplesummaries].command[].indexname "loc" -indexinfo[multiplesummaries].command[].command "default-position" -indexinfo[multiplesummaries].command[].indexname "loc_pos" -indexinfo[multiplesummaries].command[].command "index" -indexinfo[multiplesummaries].command[].indexname "loc_pos" -indexinfo[multiplesummaries].command[].command "index" -indexinfo[multiplesummaries].command[].indexname "loc_pos_zcurve" -indexinfo[multiplesummaries].command[].command "attribute" -indexinfo[multiplesummaries].command[].indexname "loc_pos_zcurve" -indexinfo[multiplesummaries].command[].command "dynteaser" -indexinfo[multiplesummaries].command[].indexname "adynamic" -indexinfo[multiplesummaries].command[].command "highlight" -indexinfo[multiplesummaries].command[].indexname "d" -indexinfo[multiplesummaries].command[].command "dynteaser" -indexinfo[multiplesummaries].command[].indexname "adynamic2" -indexinfo[multiplesummaries].command[].command "highlight" -indexinfo[multiplesummaries].command[].indexname "abolded2" -indexinfo[multiplesummaries].command[].command "dynteaser" -indexinfo[multiplesummaries].command[].indexname "aboldeddynamic" -indexinfo[multiplesummaries].command[].command "highlight" -indexinfo[multiplesummaries].command[].indexname "aboldeddynamic" -indexinfo[multiplesummaries].command[].command "highlight" -indexinfo[multiplesummaries].command[].indexname "abolded" -indexinfo[multiplesummaries].command[].command "dynteaser" -indexinfo[multiplesummaries].command[].indexname "dynamice" +indexinfo[].name "multiplesummaries" +indexinfo[].command[].indexname "sddocname" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "sddocname" +indexinfo[].command[].command "word" +indexinfo[].command[].indexname "a" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "a" +indexinfo[].command[].command "lowercase" +indexinfo[].command[].indexname "a" +indexinfo[].command[].command "attribute" +indexinfo[].command[].indexname "a" +indexinfo[].command[].command "type string" +indexinfo[].command[].indexname "adynamic" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "adynamic" +indexinfo[].command[].command "lowercase" +indexinfo[].command[].indexname "adynamic" +indexinfo[].command[].command "attribute" +indexinfo[].command[].indexname "adynamic" +indexinfo[].command[].command "type string" +indexinfo[].command[].indexname "abolded" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "abolded" +indexinfo[].command[].command "lowercase" +indexinfo[].command[].indexname "abolded" +indexinfo[].command[].command "attribute" +indexinfo[].command[].indexname "abolded" +indexinfo[].command[].command "type string" +indexinfo[].command[].indexname "b" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "b" +indexinfo[].command[].command "type string" +indexinfo[].command[].indexname "c" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "c" +indexinfo[].command[].command "lowercase" +indexinfo[].command[].indexname "c" +indexinfo[].command[].command "attribute" +indexinfo[].command[].indexname "c" +indexinfo[].command[].command "type string" +indexinfo[].command[].indexname "d" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "d" +indexinfo[].command[].command "type string" +indexinfo[].command[].indexname "e" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "e" +indexinfo[].command[].command "type string" +indexinfo[].command[].indexname "f" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "f" +indexinfo[].command[].command "multivalue" +indexinfo[].command[].indexname "f" +indexinfo[].command[].command "type Array<string>" +indexinfo[].command[].indexname "g" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "g" +indexinfo[].command[].command "multivalue" +indexinfo[].command[].indexname "g" +indexinfo[].command[].command "numerical" +indexinfo[].command[].indexname "g" +indexinfo[].command[].command "type Array<int>" +indexinfo[].command[].indexname "h" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "h" +indexinfo[].command[].command "multivalue" +indexinfo[].command[].indexname "h" +indexinfo[].command[].command "type WeightedSet<string>" +indexinfo[].command[].indexname "loc" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "loc" +indexinfo[].command[].command "type string" +indexinfo[].command[].indexname "mytags" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "mytags" +indexinfo[].command[].command "lowercase" +indexinfo[].command[].indexname "mytags" +indexinfo[].command[].command "multivalue" +indexinfo[].command[].indexname "mytags" +indexinfo[].command[].command "stem:BEST" +indexinfo[].command[].indexname "mytags" +indexinfo[].command[].command "normalize" +indexinfo[].command[].indexname "mytags" +indexinfo[].command[].command "plain-tokens" +indexinfo[].command[].indexname "mytags" +indexinfo[].command[].command "type Array<string>" +indexinfo[].command[].indexname "abolded2" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "abolded2" +indexinfo[].command[].command "type string" +indexinfo[].command[].indexname "aboldeddynamic" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "aboldeddynamic" +indexinfo[].command[].command "type string" +indexinfo[].command[].indexname "adynamic2" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "adynamic2" +indexinfo[].command[].command "type string" +indexinfo[].command[].indexname "alltags" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "alltags" +indexinfo[].command[].command "multivalue" +indexinfo[].command[].indexname "alltags" +indexinfo[].command[].command "type Array<string>" +indexinfo[].command[].indexname "anotherb" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "anotherb" +indexinfo[].command[].command "type string" +indexinfo[].command[].indexname "dynamice" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "dynamice" +indexinfo[].command[].command "type string" +indexinfo[].command[].indexname "loc_pos" +indexinfo[].command[].command "default-position" +indexinfo[].command[].indexname "loc_pos" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "loc_pos" +indexinfo[].command[].command "type position" +indexinfo[].command[].indexname "loc_pos_zcurve" +indexinfo[].command[].command "index" +indexinfo[].command[].indexname "loc_pos_zcurve" +indexinfo[].command[].command "attribute" +indexinfo[].command[].indexname "loc_pos_zcurve" +indexinfo[].command[].command "fast-search" +indexinfo[].command[].indexname "loc_pos_zcurve" +indexinfo[].command[].command "numerical" +indexinfo[].command[].indexname "loc_pos_zcurve" +indexinfo[].command[].command "type long" +indexinfo[].command[].indexname "adynamic" +indexinfo[].command[].command "dynteaser" +indexinfo[].command[].indexname "d" +indexinfo[].command[].command "highlight" +indexinfo[].command[].indexname "adynamic2" +indexinfo[].command[].command "dynteaser" +indexinfo[].command[].indexname "abolded2" +indexinfo[].command[].command "highlight" +indexinfo[].command[].indexname "aboldeddynamic" +indexinfo[].command[].command "dynteaser" +indexinfo[].command[].indexname "aboldeddynamic" +indexinfo[].command[].command "highlight" +indexinfo[].command[].indexname "abolded" +indexinfo[].command[].command "highlight" +indexinfo[].command[].indexname "dynamice" +indexinfo[].command[].command "dynteaser" diff --git a/config-model/src/test/derived/multiplesummaries/juniperrc.cfg b/config-model/src/test/derived/multiplesummaries/juniperrc.cfg index 2151e5a59c4..9b5c6a5a7ba 100644 --- a/config-model/src/test/derived/multiplesummaries/juniperrc.cfg +++ b/config-model/src/test/derived/multiplesummaries/juniperrc.cfg @@ -1,16 +1,43 @@ +length 256 +max_matches 3 +min_length 128 prefix true -override[abolded].fieldname "abolded" -override[abolded].length 65536 -override[abolded].max_matches 1 -override[abolded].min_length 8192 -override[abolded].surround_max 65536 -override[abolded2].fieldname "abolded2" -override[abolded2].length 65536 -override[abolded2].max_matches 1 -override[abolded2].min_length 8192 -override[abolded2].surround_max 65536 -override[d].fieldname "d" -override[d].length 65536 -override[d].max_matches 1 -override[d].min_length 8192 -override[d].surround_max 65536 +surround_max 128 +winsize 200 +winsize_fallback_multiplier 10.0 +max_match_candidates 1000 +stem_min_length 5 +stem_max_extend 3 +override[].fieldname "d" +override[].length 65536 +override[].max_matches 1 +override[].min_length 8192 +override[].prefix true +override[].surround_max 65536 +override[].winsize 200 +override[].winsize_fallback_multiplier 10.0 +override[].max_match_candidates 1000 +override[].stem_min_length 5 +override[].stem_max_extend 3 +override[].fieldname "abolded2" +override[].length 65536 +override[].max_matches 1 +override[].min_length 8192 +override[].prefix true +override[].surround_max 65536 +override[].winsize 200 +override[].winsize_fallback_multiplier 10.0 +override[].max_match_candidates 1000 +override[].stem_min_length 5 +override[].stem_max_extend 3 +override[].fieldname "abolded" +override[].length 65536 +override[].max_matches 1 +override[].min_length 8192 +override[].prefix true +override[].surround_max 65536 +override[].winsize 200 +override[].winsize_fallback_multiplier 10.0 +override[].max_match_candidates 1000 +override[].stem_min_length 5 +override[].stem_max_extend 3 diff --git a/config-model/src/test/derived/multiplesummaries/multiplesummaries.sd b/config-model/src/test/derived/multiplesummaries/multiplesummaries.sd index f4e131ee0bb..ae0e2fe92bc 100644 --- a/config-model/src/test/derived/multiplesummaries/multiplesummaries.sd +++ b/config-model/src/test/derived/multiplesummaries/multiplesummaries.sd @@ -67,6 +67,10 @@ search multiplesummaries { field loc type string { } + + field mytags type array<string> { + indexing: index + } } field loc_pos type position { @@ -120,7 +124,7 @@ search multiplesummaries { } # Since a here is a dynamic summary, it will be fetched from disk - document-summary notattributesonly2 { + document-summary anothernotattributesonly2 { summary adynamic2 type string { # Should still be dynamic here source: a @@ -130,6 +134,19 @@ search multiplesummaries { summary c type string { } + summary alltags type array<string> { + source: mytags + } + summary sometags type array<string> { + source: mytags + matched-elements-only + } + summary anothera type string { + source: a + } + summary anotherb type string { + source: b + } } # Not attributes only because d is bolded @@ -153,6 +170,7 @@ search multiplesummaries { } summary loc_position type long { + source: loc_pos_zcurve } } @@ -166,7 +184,7 @@ search multiplesummaries { source: a } - summary loc_position type long { + summary loc_pos_zcurve type long { } } diff --git a/config-model/src/test/derived/multiplesummaries/summary.cfg b/config-model/src/test/derived/multiplesummaries/summary.cfg index 16d0024155b..1c8fc47878b 100644 --- a/config-model/src/test/derived/multiplesummaries/summary.cfg +++ b/config-model/src/test/derived/multiplesummaries/summary.cfg @@ -1,174 +1,200 @@ -defaultsummaryid 235127765 +defaultsummaryid 456145241 usev8geopositions false -classes[1156201411].id 1156201411 -classes[1156201411].name "attributeprefetch" -classes[1156201411].fields[a].name "a" -classes[1156201411].fields[a].type "longstring" -classes[1156201411].fields[c].name "c" -classes[1156201411].fields[c].type "longstring" -classes[1156201411].fields[loc_pos_zcurve].name "loc_pos_zcurve" -classes[1156201411].fields[loc_pos_zcurve].type "int64" -classes[1156201411].fields[rankfeatures].name "rankfeatures" -classes[1156201411].fields[rankfeatures].type "longstring" -classes[1156201411].fields[summaryfeatures].name "summaryfeatures" -classes[1156201411].fields[summaryfeatures].type "longstring" -classes[1277791169].id 1277791169 -classes[1277791169].name "notattributesonly2" -classes[1277791169].fields[adynamic2].name "adynamic2" -classes[1277791169].fields[adynamic2].type "longstring" -classes[1277791169].fields[c].name "c" -classes[1277791169].fields[c].type "longstring" -classes[1277791169].fields[rankfeatures].name "rankfeatures" -classes[1277791169].fields[rankfeatures].type "longstring" -classes[1277791169].fields[summaryfeatures].name "summaryfeatures" -classes[1277791169].fields[summaryfeatures].type "longstring" -classes[1280967808].id 1280967808 -classes[1280967808].name "attributesonly2" -classes[1280967808].fields[anotdynamic].name "anotdynamic" -classes[1280967808].fields[anotdynamic].type "longstring" -classes[1280967808].fields[c].name "c" -classes[1280967808].fields[c].type "longstring" -classes[1280967808].fields[loc_position].name "loc_position" -classes[1280967808].fields[loc_position].type "int64" -classes[1280967808].fields[rankfeatures].name "rankfeatures" -classes[1280967808].fields[rankfeatures].type "longstring" -classes[1280967808].fields[summaryfeatures].name "summaryfeatures" -classes[1280967808].fields[summaryfeatures].type "longstring" -classes[1334083320].id 1334083320 -classes[1334083320].name "third" -classes[1334083320].fields[a].name "a" -classes[1334083320].fields[a].type "longstring" -classes[1334083320].fields[adynamic].name "adynamic" -classes[1334083320].fields[adynamic].type "longstring" -classes[1334083320].fields[d].name "d" -classes[1334083320].fields[d].type "longstring" -classes[1334083320].fields[e].name "e" -classes[1334083320].fields[e].type "longstring" -classes[1334083320].fields[f].name "f" -classes[1334083320].fields[f].type "jsonstring" -classes[1334083320].fields[g].name "g" -classes[1334083320].fields[g].type "jsonstring" -classes[1334083320].fields[h].name "h" -classes[1334083320].fields[h].type "jsonstring" -classes[1334083320].fields[rankfeatures].name "rankfeatures" -classes[1334083320].fields[rankfeatures].type "longstring" -classes[1334083320].fields[summaryfeatures].name "summaryfeatures" -classes[1334083320].fields[summaryfeatures].type "longstring" -classes[1439192258].id 1439192258 -classes[1439192258].name "second" -classes[1439192258].fields[a].name "a" -classes[1439192258].fields[a].type "longstring" -classes[1439192258].fields[adynamic].name "adynamic" -classes[1439192258].fields[adynamic].type "longstring" -classes[1439192258].fields[c].name "c" -classes[1439192258].fields[c].type "longstring" -classes[1439192258].fields[f].name "f" -classes[1439192258].fields[f].type "jsonstring" -classes[1439192258].fields[rankfeatures].name "rankfeatures" -classes[1439192258].fields[rankfeatures].type "longstring" -classes[1439192258].fields[summaryfeatures].name "summaryfeatures" -classes[1439192258].fields[summaryfeatures].type "longstring" -classes[1653275739].id 1653275739 -classes[1653275739].name "attributesonly3" -classes[1653275739].fields[a].name "a" -classes[1653275739].fields[a].type "longstring" -classes[1653275739].fields[anotbolded].name "anotbolded" -classes[1653275739].fields[anotbolded].type "longstring" -classes[1653275739].fields[loc_position].name "loc_position" -classes[1653275739].fields[loc_position].type "int64" -classes[1653275739].fields[rankfeatures].name "rankfeatures" -classes[1653275739].fields[rankfeatures].type "longstring" -classes[1653275739].fields[summaryfeatures].name "summaryfeatures" -classes[1653275739].fields[summaryfeatures].type "longstring" -classes[182001096].id 182001096 -classes[182001096].name "notattributesonly1" -classes[182001096].fields[adynamic].name "adynamic" -classes[182001096].fields[adynamic].type "longstring" -classes[182001096].fields[c].name "c" -classes[182001096].fields[c].type "longstring" -classes[182001096].fields[rankfeatures].name "rankfeatures" -classes[182001096].fields[rankfeatures].type "longstring" -classes[182001096].fields[summaryfeatures].name "summaryfeatures" -classes[182001096].fields[summaryfeatures].type "longstring" -classes[1881063334].id 1881063334 -classes[1881063334].name "notattributesonly4" -classes[1881063334].fields[abolded2].name "abolded2" -classes[1881063334].fields[abolded2].type "longstring" -classes[1881063334].fields[c].name "c" -classes[1881063334].fields[c].type "longstring" -classes[1881063334].fields[rankfeatures].name "rankfeatures" -classes[1881063334].fields[rankfeatures].type "longstring" -classes[1881063334].fields[summaryfeatures].name "summaryfeatures" -classes[1881063334].fields[summaryfeatures].type "longstring" -classes[1988966242].id 1988966242 -classes[1988966242].name "attributesonly1" -classes[1988966242].fields[a].name "a" -classes[1988966242].fields[a].type "longstring" -classes[1988966242].fields[c].name "c" -classes[1988966242].fields[c].type "longstring" -classes[1988966242].fields[rankfeatures].name "rankfeatures" -classes[1988966242].fields[rankfeatures].type "longstring" -classes[1988966242].fields[summaryfeatures].name "summaryfeatures" -classes[1988966242].fields[summaryfeatures].type "longstring" -classes[235127765].id 235127765 -classes[235127765].name "multiplesummaries" -classes[235127765].fields[a].name "a" -classes[235127765].fields[a].type "longstring" -classes[235127765].fields[abolded].name "abolded" -classes[235127765].fields[abolded].type "longstring" -classes[235127765].fields[abolded2].name "abolded2" -classes[235127765].fields[abolded2].type "longstring" -classes[235127765].fields[aboldeddynamic].name "aboldeddynamic" -classes[235127765].fields[aboldeddynamic].type "longstring" -classes[235127765].fields[adynamic].name "adynamic" -classes[235127765].fields[adynamic].type "longstring" -classes[235127765].fields[adynamic2].name "adynamic2" -classes[235127765].fields[adynamic2].type "longstring" -classes[235127765].fields[b].name "b" -classes[235127765].fields[b].type "longstring" -classes[235127765].fields[c].name "c" -classes[235127765].fields[c].type "longstring" -classes[235127765].fields[d].name "d" -classes[235127765].fields[d].type "longstring" -classes[235127765].fields[documentid].name "documentid" -classes[235127765].fields[documentid].type "longstring" -classes[235127765].fields[dynamice].name "dynamice" -classes[235127765].fields[dynamice].type "longstring" -classes[235127765].fields[e].name "e" -classes[235127765].fields[e].type "longstring" -classes[235127765].fields[f].name "f" -classes[235127765].fields[f].type "jsonstring" -classes[235127765].fields[g].name "g" -classes[235127765].fields[g].type "jsonstring" -classes[235127765].fields[h].name "h" -classes[235127765].fields[h].type "jsonstring" -classes[235127765].fields[loc_pos.distance].name "loc_pos.distance" -classes[235127765].fields[loc_pos.distance].type "integer" -classes[235127765].fields[loc_pos.position].name "loc_pos.position" -classes[235127765].fields[loc_pos.position].type "xmlstring" -classes[235127765].fields[loc_position].name "loc_position" -classes[235127765].fields[loc_position].type "int64" -classes[235127765].fields[rankfeatures].name "rankfeatures" -classes[235127765].fields[rankfeatures].type "longstring" -classes[235127765].fields[summaryfeatures].name "summaryfeatures" -classes[235127765].fields[summaryfeatures].type "longstring" -classes[803323247].id 803323247 -classes[803323247].name "notattributesonly3" -classes[803323247].fields[a].name "a" -classes[803323247].fields[a].type "longstring" -classes[803323247].fields[d].name "d" -classes[803323247].fields[d].type "longstring" -classes[803323247].fields[rankfeatures].name "rankfeatures" -classes[803323247].fields[rankfeatures].type "longstring" -classes[803323247].fields[summaryfeatures].name "summaryfeatures" -classes[803323247].fields[summaryfeatures].type "longstring" -classes[937467944].id 937467944 -classes[937467944].name "notattributesonly5" -classes[937467944].fields[aboldeddynamic].name "aboldeddynamic" -classes[937467944].fields[aboldeddynamic].type "longstring" -classes[937467944].fields[c].name "c" -classes[937467944].fields[c].type "longstring" -classes[937467944].fields[rankfeatures].name "rankfeatures" -classes[937467944].fields[rankfeatures].type "longstring" -classes[937467944].fields[summaryfeatures].name "summaryfeatures" -classes[937467944].fields[summaryfeatures].type "longstring" +classes[].id 456145241 +classes[].name "default" +classes[].omitsummaryfeatures false +classes[].fields[].name "loc_pos" +classes[].fields[].type "jsonstring" +classes[].fields[].name "loc_pos.position" +classes[].fields[].type "xmlstring" +classes[].fields[].name "loc_pos.distance" +classes[].fields[].type "integer" +classes[].fields[].name "a" +classes[].fields[].type "longstring" +classes[].fields[].name "adynamic" +classes[].fields[].type "longstring" +classes[].fields[].name "abolded" +classes[].fields[].type "longstring" +classes[].fields[].name "b" +classes[].fields[].type "longstring" +classes[].fields[].name "c" +classes[].fields[].type "longstring" +classes[].fields[].name "d" +classes[].fields[].type "longstring" +classes[].fields[].name "dynamice" +classes[].fields[].type "longstring" +classes[].fields[].name "f" +classes[].fields[].type "jsonstring" +classes[].fields[].name "g" +classes[].fields[].type "jsonstring" +classes[].fields[].name "h" +classes[].fields[].type "jsonstring" +classes[].fields[].name "rankfeatures" +classes[].fields[].type "featuredata" +classes[].fields[].name "summaryfeatures" +classes[].fields[].type "featuredata" +classes[].fields[].name "e" +classes[].fields[].type "longstring" +classes[].fields[].name "adynamic2" +classes[].fields[].type "longstring" +classes[].fields[].name "alltags" +classes[].fields[].type "jsonstring" +classes[].fields[].name "sometags" +classes[].fields[].type "jsonstring" +classes[].fields[].name "anotherb" +classes[].fields[].type "longstring" +classes[].fields[].name "abolded2" +classes[].fields[].type "longstring" +classes[].fields[].name "aboldeddynamic" +classes[].fields[].type "longstring" +classes[].fields[].name "documentid" +classes[].fields[].type "longstring" +classes[].id 783153771 +classes[].name "third" +classes[].omitsummaryfeatures false +classes[].fields[].name "a" +classes[].fields[].type "longstring" +classes[].fields[].name "adynamic" +classes[].fields[].type "longstring" +classes[].fields[].name "d" +classes[].fields[].type "longstring" +classes[].fields[].name "e" +classes[].fields[].type "longstring" +classes[].fields[].name "f" +classes[].fields[].type "jsonstring" +classes[].fields[].name "g" +classes[].fields[].type "jsonstring" +classes[].fields[].name "h" +classes[].fields[].type "jsonstring" +classes[].fields[].name "rankfeatures" +classes[].fields[].type "featuredata" +classes[].fields[].name "summaryfeatures" +classes[].fields[].type "featuredata" +classes[].id 815922035 +classes[].name "attributesonly1" +classes[].omitsummaryfeatures false +classes[].fields[].name "a" +classes[].fields[].type "longstring" +classes[].fields[].name "c" +classes[].fields[].type "longstring" +classes[].fields[].name "rankfeatures" +classes[].fields[].type "featuredata" +classes[].fields[].name "summaryfeatures" +classes[].fields[].type "featuredata" +classes[].id 1308077923 +classes[].name "notattributesonly1" +classes[].omitsummaryfeatures false +classes[].fields[].name "adynamic" +classes[].fields[].type "longstring" +classes[].fields[].name "c" +classes[].fields[].type "longstring" +classes[].fields[].name "rankfeatures" +classes[].fields[].type "featuredata" +classes[].fields[].name "summaryfeatures" +classes[].fields[].type "featuredata" +classes[].id 1609068631 +classes[].name "anothernotattributesonly2" +classes[].omitsummaryfeatures false +classes[].fields[].name "adynamic2" +classes[].fields[].type "longstring" +classes[].fields[].name "c" +classes[].fields[].type "longstring" +classes[].fields[].name "alltags" +classes[].fields[].type "jsonstring" +classes[].fields[].name "sometags" +classes[].fields[].type "jsonstring" +classes[].fields[].name "anothera" +classes[].fields[].type "longstring" +classes[].fields[].name "anotherb" +classes[].fields[].type "longstring" +classes[].fields[].name "rankfeatures" +classes[].fields[].type "featuredata" +classes[].fields[].name "summaryfeatures" +classes[].fields[].type "featuredata" +classes[].id 686755772 +classes[].name "notattributesonly3" +classes[].omitsummaryfeatures false +classes[].fields[].name "a" +classes[].fields[].type "longstring" +classes[].fields[].name "d" +classes[].fields[].type "longstring" +classes[].fields[].name "rankfeatures" +classes[].fields[].type "featuredata" +classes[].fields[].name "summaryfeatures" +classes[].fields[].type "featuredata" +classes[].id 1711750363 +classes[].name "attributesonly2" +classes[].omitsummaryfeatures false +classes[].fields[].name "anotdynamic" +classes[].fields[].type "longstring" +classes[].fields[].name "c" +classes[].fields[].type "longstring" +classes[].fields[].name "loc_position" +classes[].fields[].type "int64" +classes[].fields[].name "rankfeatures" +classes[].fields[].type "featuredata" +classes[].fields[].name "summaryfeatures" +classes[].fields[].type "featuredata" +classes[].id 1510953467 +classes[].name "attributesonly3" +classes[].omitsummaryfeatures false +classes[].fields[].name "a" +classes[].fields[].type "longstring" +classes[].fields[].name "anotbolded" +classes[].fields[].type "longstring" +classes[].fields[].name "loc_pos_zcurve" +classes[].fields[].type "int64" +classes[].fields[].name "rankfeatures" +classes[].fields[].type "featuredata" +classes[].fields[].name "summaryfeatures" +classes[].fields[].type "featuredata" +classes[].id 923824943 +classes[].name "notattributesonly4" +classes[].omitsummaryfeatures false +classes[].fields[].name "abolded2" +classes[].fields[].type "longstring" +classes[].fields[].name "c" +classes[].fields[].type "longstring" +classes[].fields[].name "rankfeatures" +classes[].fields[].type "featuredata" +classes[].fields[].name "summaryfeatures" +classes[].fields[].type "featuredata" +classes[].id 552611075 +classes[].name "notattributesonly5" +classes[].omitsummaryfeatures false +classes[].fields[].name "aboldeddynamic" +classes[].fields[].type "longstring" +classes[].fields[].name "c" +classes[].fields[].type "longstring" +classes[].fields[].name "rankfeatures" +classes[].fields[].type "featuredata" +classes[].fields[].name "summaryfeatures" +classes[].fields[].type "featuredata" +classes[].id 146047714 +classes[].name "attributeprefetch" +classes[].omitsummaryfeatures false +classes[].fields[].name "loc_pos_zcurve" +classes[].fields[].type "int64" +classes[].fields[].name "a" +classes[].fields[].type "longstring" +classes[].fields[].name "c" +classes[].fields[].type "longstring" +classes[].fields[].name "rankfeatures" +classes[].fields[].type "featuredata" +classes[].fields[].name "summaryfeatures" +classes[].fields[].type "featuredata" +classes[].id 324773027 +classes[].name "second" +classes[].omitsummaryfeatures false +classes[].fields[].name "a" +classes[].fields[].type "longstring" +classes[].fields[].name "adynamic" +classes[].fields[].type "longstring" +classes[].fields[].name "c" +classes[].fields[].type "longstring" +classes[].fields[].name "f" +classes[].fields[].type "jsonstring" +classes[].fields[].name "rankfeatures" +classes[].fields[].type "featuredata" +classes[].fields[].name "summaryfeatures" +classes[].fields[].type "featuredata" diff --git a/config-model/src/test/derived/multiplesummaries/summarymap.cfg b/config-model/src/test/derived/multiplesummaries/summarymap.cfg index 94c86ea8c80..94adc250c54 100644 --- a/config-model/src/test/derived/multiplesummaries/summarymap.cfg +++ b/config-model/src/test/derived/multiplesummaries/summarymap.cfg @@ -1,49 +1,61 @@ defaultoutputclass -1 -override[a].arguments "a" -override[a].command "attribute" -override[a].field "a" -override[abolded].arguments "abolded" -override[abolded].command "dynamicteaser" -override[abolded].field "abolded" -override[abolded2].arguments "abolded2" -override[abolded2].command "dynamicteaser" -override[abolded2].field "abolded2" -override[aboldeddynamic].arguments "aboldeddynamic" -override[aboldeddynamic].command "dynamicteaser" -override[aboldeddynamic].field "aboldeddynamic" -override[adynamic].arguments "adynamic" -override[adynamic].command "dynamicteaser" -override[adynamic].field "adynamic" -override[adynamic2].arguments "adynamic2" -override[adynamic2].command "dynamicteaser" -override[adynamic2].field "adynamic2" -override[anotbolded].arguments "a" -override[anotbolded].command "attribute" -override[anotbolded].field "anotbolded" -override[anotdynamic].arguments "adynamic" -override[anotdynamic].command "attribute" -override[anotdynamic].field "anotdynamic" -override[c].arguments "c" -override[c].command "attribute" -override[c].field "c" -override[d].arguments "d" -override[d].command "dynamicteaser" -override[d].field "d" -override[dynamice].arguments "dynamice" -override[dynamice].command "dynamicteaser" -override[dynamice].field "dynamice" -override[loc_pos.distance].arguments "loc_pos_zcurve" -override[loc_pos.distance].command "absdist" -override[loc_pos.distance].field "loc_pos.distance" -override[loc_pos.position].arguments "loc_pos_zcurve" -override[loc_pos.position].command "positions" -override[loc_pos.position].field "loc_pos.position" -override[loc_pos_zcurve].arguments "loc_pos_zcurve" -override[loc_pos_zcurve].command "attribute" -override[loc_pos_zcurve].field "loc_pos_zcurve" -override[rankfeatures].arguments "" -override[rankfeatures].command "rankfeatures" -override[rankfeatures].field "rankfeatures" -override[summaryfeatures].arguments "" -override[summaryfeatures].command "summaryfeatures" -override[summaryfeatures].field "summaryfeatures" +override[].field "a" +override[].command "attribute" +override[].arguments "a" +override[].field "adynamic" +override[].command "dynamicteaser" +override[].arguments "adynamic" +override[].field "d" +override[].command "dynamicteaser" +override[].arguments "d" +override[].field "rankfeatures" +override[].command "rankfeatures" +override[].arguments "" +override[].field "summaryfeatures" +override[].command "summaryfeatures" +override[].arguments "" +override[].field "c" +override[].command "attribute" +override[].arguments "c" +override[].field "adynamic2" +override[].command "dynamicteaser" +override[].arguments "adynamic2" +override[].field "sometags" +override[].command "matchedelementsfilter" +override[].arguments "mytags" +override[].field "anothera" +override[].command "attribute" +override[].arguments "a" +override[].field "anotdynamic" +override[].command "attribute" +override[].arguments "adynamic" +override[].field "loc_position" +override[].command "attribute" +override[].arguments "loc_pos_zcurve" +override[].field "anotbolded" +override[].command "attribute" +override[].arguments "a" +override[].field "loc_pos_zcurve" +override[].command "attribute" +override[].arguments "loc_pos_zcurve" +override[].field "abolded2" +override[].command "dynamicteaser" +override[].arguments "abolded2" +override[].field "aboldeddynamic" +override[].command "dynamicteaser" +override[].arguments "aboldeddynamic" +override[].field "loc_pos" +override[].command "geopos" +override[].arguments "loc_pos_zcurve" +override[].field "loc_pos.position" +override[].command "positions" +override[].arguments "loc_pos_zcurve" +override[].field "loc_pos.distance" +override[].command "absdist" +override[].arguments "loc_pos_zcurve" +override[].field "abolded" +override[].command "dynamicteaser" +override[].arguments "abolded" +override[].field "dynamice" +override[].command "dynamicteaser" +override[].arguments "dynamice" diff --git a/config-model/src/test/derived/position_nosummary/summary.cfg b/config-model/src/test/derived/position_nosummary/summary.cfg index cd7c295ab11..2c46031bdad 100644 --- a/config-model/src/test/derived/position_nosummary/summary.cfg +++ b/config-model/src/test/derived/position_nosummary/summary.cfg @@ -1,12 +1,8 @@ -defaultsummaryid 1727020212 -usev8geopositions false -classes[].id 1727020212 +defaultsummaryid 1151071433 +usev8geopositions true +classes[].id 1151071433 classes[].name "default" classes[].omitsummaryfeatures false -classes[].fields[].name "pos.position" -classes[].fields[].type "xmlstring" -classes[].fields[].name "pos.distance" -classes[].fields[].type "integer" classes[].fields[].name "rankfeatures" classes[].fields[].type "featuredata" classes[].fields[].name "summaryfeatures" diff --git a/config-model/src/test/derived/position_nosummary/summarymap.cfg b/config-model/src/test/derived/position_nosummary/summarymap.cfg index cc1c14a6614..0a36f98c6ca 100644 --- a/config-model/src/test/derived/position_nosummary/summarymap.cfg +++ b/config-model/src/test/derived/position_nosummary/summarymap.cfg @@ -1,10 +1,4 @@ defaultoutputclass -1 -override[].field "pos.position" -override[].command "positions" -override[].arguments "pos_zcurve" -override[].field "pos.distance" -override[].command "absdist" -override[].arguments "pos_zcurve" override[].field "rankfeatures" override[].command "rankfeatures" override[].arguments "" diff --git a/config-model/src/test/derived/position_summary/summary.cfg b/config-model/src/test/derived/position_summary/summary.cfg index 7b8bf16287f..7fda1ca0c05 100644 --- a/config-model/src/test/derived/position_summary/summary.cfg +++ b/config-model/src/test/derived/position_summary/summary.cfg @@ -1,14 +1,10 @@ -defaultsummaryid 230670304 -usev8geopositions false -classes[].id 230670304 +defaultsummaryid 644855547 +usev8geopositions true +classes[].id 644855547 classes[].name "default" classes[].omitsummaryfeatures false classes[].fields[].name "pos" classes[].fields[].type "jsonstring" -classes[].fields[].name "pos.position" -classes[].fields[].type "xmlstring" -classes[].fields[].name "pos.distance" -classes[].fields[].type "integer" classes[].fields[].name "rankfeatures" classes[].fields[].type "featuredata" classes[].fields[].name "summaryfeatures" diff --git a/config-model/src/test/derived/position_summary/summarymap.cfg b/config-model/src/test/derived/position_summary/summarymap.cfg index de48a19b6db..2223d3380a0 100644 --- a/config-model/src/test/derived/position_summary/summarymap.cfg +++ b/config-model/src/test/derived/position_summary/summarymap.cfg @@ -2,12 +2,6 @@ defaultoutputclass -1 override[].field "pos" override[].command "geopos" override[].arguments "pos_zcurve" -override[].field "pos.position" -override[].command "positions" -override[].arguments "pos_zcurve" -override[].field "pos.distance" -override[].command "absdist" -override[].arguments "pos_zcurve" override[].field "rankfeatures" override[].command "rankfeatures" override[].arguments "" diff --git a/config-model/src/test/derived/position_summary/vsmsummary.cfg b/config-model/src/test/derived/position_summary/vsmsummary.cfg index d7d45782843..56405069131 100644 --- a/config-model/src/test/derived/position_summary/vsmsummary.cfg +++ b/config-model/src/test/derived/position_summary/vsmsummary.cfg @@ -2,12 +2,6 @@ outputclass "" fieldmap[].summary "pos" fieldmap[].document[].field "pos" fieldmap[].command NONE -fieldmap[].summary "pos.position" -fieldmap[].document[].field "pos_zcurve" -fieldmap[].command NONE -fieldmap[].summary "pos.distance" -fieldmap[].document[].field "pos_zcurve" -fieldmap[].command NONE fieldmap[].summary "rankfeatures" fieldmap[].command NONE fieldmap[].summary "summaryfeatures" diff --git a/config-model/src/test/derived/rankprofilemodularity/rank-profiles.cfg b/config-model/src/test/derived/rankprofilemodularity/rank-profiles.cfg new file mode 100644 index 00000000000..3af23fd3770 --- /dev/null +++ b/config-model/src/test/derived/rankprofilemodularity/rank-profiles.cfg @@ -0,0 +1,48 @@ +rankprofile[].name "default" +rankprofile[].fef.property[].name "rankingExpression(fo2).rankingScript" +rankprofile[].fef.property[].value "random" +rankprofile[].fef.property[].name "vespa.rank.firstphase" +rankprofile[].fef.property[].value "fieldMatch(title).completeness" +rankprofile[].name "unranked" +rankprofile[].fef.property[].name "vespa.rank.firstphase" +rankprofile[].fef.property[].value "value(0)" +rankprofile[].fef.property[].name "vespa.hitcollector.heapsize" +rankprofile[].fef.property[].value "0" +rankprofile[].fef.property[].name "vespa.hitcollector.arraysize" +rankprofile[].fef.property[].value "0" +rankprofile[].fef.property[].name "vespa.dump.ignoredefaultfeatures" +rankprofile[].fef.property[].value "true" +rankprofile[].name "in_schema0" +rankprofile[].fef.property[].name "rankingExpression(fo2).rankingScript" +rankprofile[].fef.property[].value "random" +rankprofile[].fef.property[].name "vespa.rank.firstphase" +rankprofile[].fef.property[].value "fieldMatch(title).completeness" +rankprofile[].name "in_schema1" +rankprofile[].fef.property[].name "vespa.rank.firstphase" +rankprofile[].fef.property[].value "nativeRank" +rankprofile[].name "in_schema2" +rankprofile[].fef.property[].name "rankingExpression(fo2).rankingScript" +rankprofile[].fef.property[].value "random" +rankprofile[].fef.property[].name "rankingExpression(f2).rankingScript" +rankprofile[].fef.property[].value "fieldMatch(title) + rankingExpression(fo2)" +rankprofile[].fef.property[].name "vespa.rank.firstphase" +rankprofile[].fef.property[].value "rankingExpression(f2)" +rankprofile[].name "in_schema3" +rankprofile[].fef.property[].name "rankingExpression(fo2).rankingScript" +rankprofile[].fef.property[].value "random" +rankprofile[].fef.property[].name "rankingExpression(f2).rankingScript" +rankprofile[].fef.property[].value "fieldMatch(title) + rankingExpression(fo2)" +rankprofile[].fef.property[].name "rankingExpression(fo1).rankingScript" +rankprofile[].fef.property[].value "now" +rankprofile[].fef.property[].name "vespa.rank.firstphase" +rankprofile[].fef.property[].value "rankingExpression(f2)" +rankprofile[].name "outside_schema1" +rankprofile[].fef.property[].name "rankingExpression(fo1).rankingScript" +rankprofile[].fef.property[].value "now" +rankprofile[].fef.property[].name "vespa.rank.firstphase" +rankprofile[].fef.property[].value "nativeRank" +rankprofile[].name "outside_schema2" +rankprofile[].fef.property[].name "rankingExpression(fo2).rankingScript" +rankprofile[].fef.property[].value "random" +rankprofile[].fef.property[].name "vespa.rank.firstphase" +rankprofile[].fef.property[].value "fieldMatch(title).completeness" diff --git a/config-model/src/test/derived/rankprofilemodularity/test.sd b/config-model/src/test/derived/rankprofilemodularity/test.sd new file mode 100644 index 00000000000..34414414d6c --- /dev/null +++ b/config-model/src/test/derived/rankprofilemodularity/test.sd @@ -0,0 +1,49 @@ +schema test { + + document test { + + field title type string { + indexing: index + } + + } + + rank-profile default inherits outside_schema2 { + } + + rank-profile in_schema0 inherits outside_schema2 { + } + + rank-profile in_schema1 { + + first-phase { + expression: nativeRank + } + + } + + rank-profile in_schema2 inherits outside_schema2 { + + function f2() { + expression: fieldMatch(title) + fo2 + } + + first-phase { + expression: f2 + } + + } + + rank-profile in_schema3 inherits outside_schema1, outside_schema2 { + + function f2() { + expression: fieldMatch(title) + fo2 + } + + first-phase { + expression: f2 + } + + } + +}
\ No newline at end of file diff --git a/config-model/src/test/derived/rankprofilemodularity/test/outside_schema1.profile b/config-model/src/test/derived/rankprofilemodularity/test/outside_schema1.profile new file mode 100644 index 00000000000..a8092689b7f --- /dev/null +++ b/config-model/src/test/derived/rankprofilemodularity/test/outside_schema1.profile @@ -0,0 +1,7 @@ +rank-profile outside_schema1 inherits in_schema1 { + + function fo1() { + expression: now + } + +}
\ No newline at end of file diff --git a/config-model/src/test/derived/rankprofilemodularity/test/outside_schema2.profile b/config-model/src/test/derived/rankprofilemodularity/test/outside_schema2.profile new file mode 100644 index 00000000000..8cf3fcfbb78 --- /dev/null +++ b/config-model/src/test/derived/rankprofilemodularity/test/outside_schema2.profile @@ -0,0 +1,11 @@ +rank-profile outside_schema2 { + + function fo2() { + expression: random + } + + first-phase { + expression: fieldMatch(title).completeness + } + +}
\ No newline at end of file diff --git a/config-model/src/test/derived/renamedfeatures/foo.sd b/config-model/src/test/derived/renamedfeatures/foo.sd index f7884dd937d..462eb0da44e 100644 --- a/config-model/src/test/derived/renamedfeatures/foo.sd +++ b/config-model/src/test/derived/renamedfeatures/foo.sd @@ -1,6 +1,6 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search foo { - + document foo { field title type string { indexing: summary | index diff --git a/config-model/src/test/derived/renamedfeatures/rank-profiles.cfg b/config-model/src/test/derived/renamedfeatures/rank-profiles.cfg index b78866fdf05..0a327575a48 100644 --- a/config-model/src/test/derived/renamedfeatures/rank-profiles.cfg +++ b/config-model/src/test/derived/renamedfeatures/rank-profiles.cfg @@ -79,4 +79,4 @@ rankprofile[3].fef.property[10].value "rankingExpression(mymul)" rankprofile[3].fef.property[11].name "vespa.feature.rename" rankprofile[3].fef.property[11].value "mymul" rankprofile[3].fef.property[12].name "vespa.type.attribute.t1" -rankprofile[3].fef.property[12].value "tensor(m{},v[3])"
\ No newline at end of file +rankprofile[3].fef.property[12].value "tensor(m{},v[3])" diff --git a/config-model/src/test/derived/slice/query-profiles/default.xml b/config-model/src/test/derived/slice/query-profiles/default.xml new file mode 100644 index 00000000000..2535ca895ed --- /dev/null +++ b/config-model/src/test/derived/slice/query-profiles/default.xml @@ -0,0 +1,3 @@ +<!-- Copyright Yahoo. 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 new file mode 100644 index 00000000000..50970d8743f --- /dev/null +++ b/config-model/src/test/derived/slice/query-profiles/types/DefaultQueryProfileType.xml @@ -0,0 +1,4 @@ +<!-- Copyright Yahoo. 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/rank-profiles.cfg b/config-model/src/test/derived/slice/rank-profiles.cfg new file mode 100644 index 00000000000..75725b81ecf --- /dev/null +++ b/config-model/src/test/derived/slice/rank-profiles.cfg @@ -0,0 +1,25 @@ +rankprofile[].name "default" +rankprofile[].fef.property[].name "vespa.type.query.myTensor" +rankprofile[].fef.property[].value "tensor<float>(key{})" +rankprofile[].name "unranked" +rankprofile[].fef.property[].name "vespa.rank.firstphase" +rankprofile[].fef.property[].value "value(0)" +rankprofile[].fef.property[].name "vespa.hitcollector.heapsize" +rankprofile[].fef.property[].value "0" +rankprofile[].fef.property[].name "vespa.hitcollector.arraysize" +rankprofile[].fef.property[].value "0" +rankprofile[].fef.property[].name "vespa.dump.ignoredefaultfeatures" +rankprofile[].fef.property[].value "true" +rankprofile[].fef.property[].name "vespa.type.query.myTensor" +rankprofile[].fef.property[].value "tensor<float>(key{})" +rankprofile[].name "parent" +rankprofile[].fef.property[].name "rankingExpression(mySlice@77dee0712164ce73).rankingScript" +rankprofile[].fef.property[].value "query(myTensor){key:MY_KEY2}" +rankprofile[].fef.property[].name "rankingExpression(myFunction).rankingScript" +rankprofile[].fef.property[].value "4 * query(myTensor){key:MY_KEY1} * rankingExpression(mySlice@77dee0712164ce73)" +rankprofile[].fef.property[].name "rankingExpression(myValue).rankingScript" +rankprofile[].fef.property[].value "4" +rankprofile[].fef.property[].name "rankingExpression(mySlice).rankingScript" +rankprofile[].fef.property[].value "myTensor{key:MY_KEY2}" +rankprofile[].fef.property[].name "vespa.type.query.myTensor" +rankprofile[].fef.property[].value "tensor<float>(key{})" diff --git a/config-model/src/test/derived/slice/test.sd b/config-model/src/test/derived/slice/test.sd new file mode 100644 index 00000000000..c2060300785 --- /dev/null +++ b/config-model/src/test/derived/slice/test.sd @@ -0,0 +1,23 @@ +search test { + + document test { + } + + rank-profile parent { + + function inline myFunction() { + expression: myValue * query(myTensor){MY_KEY1} * mySlice(query(myTensor)) + } + + function inline myValue() { + expression: 4 + } + + function inline mySlice(myTensor) { + # TODO: We are missing type resolving across function calls in serialization, + # so using the short form (without 'key') here will fail + expression: myTensor{key:MY_KEY2} + } + } + +}
\ No newline at end of file diff --git a/config-model/src/test/derived/twostreamingstructs/whatever.sd b/config-model/src/test/derived/twostreamingstructs/whatever.sd index 34b0261326f..17ac30102a8 100644 --- a/config-model/src/test/derived/twostreamingstructs/whatever.sd +++ b/config-model/src/test/derived/twostreamingstructs/whatever.sd @@ -9,7 +9,6 @@ search whatever { field f1 type pair { indexing: summary - body } } |