From 1e048f9bd7d69a4f286757095429fed60a2bb964 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Sat, 8 Jul 2023 16:55:59 +0200 Subject: Remove unused, stale stuff related to index-to Mostly in schemas, support remove years ago, no funcation changes --- .../schema/processing/multifieldresolver/RankTypeResolver.java | 2 +- config-model/src/test/cfg/admin/metricconfig/schemas/music.sd | 2 -- config-model/src/test/cfg/application/app1/schemas/music.sd | 2 -- config-model/src/test/cfg/application/app1/schemas/product.sd | 1 - .../application/app_complicated_deployment_spec/schemas/music.sd | 2 -- .../src/test/cfg/application/app_genericservices/schemas/music.sd | 2 -- .../src/test/cfg/application/sdfilenametest/schemas/notmusic.sd | 1 - .../validation/testjars/nomanifest/searchdefinitions/book.sd | 6 ------ .../validation/testjars/nomanifest/searchdefinitions/music.sd | 2 -- .../validation/testjars/nomanifest/searchdefinitions/video.sd | 7 ------- .../application/validation/testjars/ok/searchdefinitions/book.sd | 6 ------ .../application/validation/testjars/ok/searchdefinitions/music.sd | 2 -- .../application/validation/testjars/ok/searchdefinitions/video.sd | 7 ------- .../src/test/cfg/routing/content_two_clusters/schemas/mobile.sd | 2 -- .../src/test/cfg/routing/content_two_clusters/schemas/music.sd | 2 -- .../src/test/cfg/routing/contentsimpleconfig/schemas/music.sd | 2 -- config-model/src/test/cfg/routing/replacehop/schemas/music.sd | 2 -- config-model/src/test/cfg/routing/replaceroute/schemas/music.sd | 2 -- config-model/src/test/cfg/search/data/travel/schemas/TTPOI.sd | 2 -- .../cfg/search/data/v2/inherited_rankprofiles/schemas/music.sd | 2 -- .../cfg/storage/app_index_higher_than_num_nodes/schemas/music.sd | 2 -- .../test/cfg/storage/clustercontroller_advanced/schemas/music.sd | 2 -- config-model/src/test/derived/music3/music3.sd | 2 -- config-model/src/test/derived/newrank/newrank.sd | 1 - config-model/src/test/examples/attributesexactmatch.sd | 1 - config-model/src/test/examples/casing.sd | 1 - 26 files changed, 1 insertion(+), 64 deletions(-) (limited to 'config-model') diff --git a/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/RankTypeResolver.java b/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/RankTypeResolver.java index 6424fd8ba06..e86ac6dabfc 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/RankTypeResolver.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/RankTypeResolver.java @@ -11,7 +11,7 @@ import java.util.logging.Level; /** * Checks if fields have defined different rank types for the same - * index (typically in an index-to statement), and if they have + * index (typically in a fieldset statement), and if they have * output a warning and use the first ranktype. * * @author hmusum diff --git a/config-model/src/test/cfg/admin/metricconfig/schemas/music.sd b/config-model/src/test/cfg/admin/metricconfig/schemas/music.sd index f90d805ce6a..71d588662a0 100644 --- a/config-model/src/test/cfg/admin/metricconfig/schemas/music.sd +++ b/config-model/src/test/cfg/admin/metricconfig/schemas/music.sd @@ -3,11 +3,9 @@ search music { document music { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/cfg/application/app1/schemas/music.sd b/config-model/src/test/cfg/application/app1/schemas/music.sd index 92e87848a8a..4e220f96727 100644 --- a/config-model/src/test/cfg/application/app1/schemas/music.sd +++ b/config-model/src/test/cfg/application/app1/schemas/music.sd @@ -7,13 +7,11 @@ search music { field title type string { indexing: summary | index # How this field should be indexed - # index-to: title, default # Create two indexes rank-type: about # Type of ranking settings to apply } field artist type string { indexing: summary | attribute | index - # index-to: artist, default rank-type:about } diff --git a/config-model/src/test/cfg/application/app1/schemas/product.sd b/config-model/src/test/cfg/application/app1/schemas/product.sd index 132ae15053f..70c9343d63a 100644 --- a/config-model/src/test/cfg/application/app1/schemas/product.sd +++ b/config-model/src/test/cfg/application/app1/schemas/product.sd @@ -3,7 +3,6 @@ document product { field title type string { indexing: index | summary - # index-to: title, default } field price type int { diff --git a/config-model/src/test/cfg/application/app_complicated_deployment_spec/schemas/music.sd b/config-model/src/test/cfg/application/app_complicated_deployment_spec/schemas/music.sd index 92e87848a8a..4e220f96727 100644 --- a/config-model/src/test/cfg/application/app_complicated_deployment_spec/schemas/music.sd +++ b/config-model/src/test/cfg/application/app_complicated_deployment_spec/schemas/music.sd @@ -7,13 +7,11 @@ search music { field title type string { indexing: summary | index # How this field should be indexed - # index-to: title, default # Create two indexes rank-type: about # Type of ranking settings to apply } field artist type string { indexing: summary | attribute | index - # index-to: artist, default rank-type:about } diff --git a/config-model/src/test/cfg/application/app_genericservices/schemas/music.sd b/config-model/src/test/cfg/application/app_genericservices/schemas/music.sd index 92e87848a8a..4e220f96727 100644 --- a/config-model/src/test/cfg/application/app_genericservices/schemas/music.sd +++ b/config-model/src/test/cfg/application/app_genericservices/schemas/music.sd @@ -7,13 +7,11 @@ search music { field title type string { indexing: summary | index # How this field should be indexed - # index-to: title, default # Create two indexes rank-type: about # Type of ranking settings to apply } field artist type string { indexing: summary | attribute | index - # index-to: artist, default rank-type:about } diff --git a/config-model/src/test/cfg/application/sdfilenametest/schemas/notmusic.sd b/config-model/src/test/cfg/application/sdfilenametest/schemas/notmusic.sd index 19528975587..a4cf5cef1a1 100644 --- a/config-model/src/test/cfg/application/sdfilenametest/schemas/notmusic.sd +++ b/config-model/src/test/cfg/application/sdfilenametest/schemas/notmusic.sd @@ -5,7 +5,6 @@ search music { field title type string { indexing: summary | index - # index-to: title, default } } diff --git a/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/book.sd b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/book.sd index 73b540627d7..ba298f4fcba 100644 --- a/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/book.sd +++ b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/book.sd @@ -2,34 +2,28 @@ search book { document book inherits base { field title type string { bolding: on - index-to: default, title indexing: index|summary rank-type: about } field dispauthor type string { bolding: on - index-to: default, dispauthor indexing: index|summary rank-type: about } field author type string { bolding: on - index-to: default, author indexing: index|summary rank-type: about } field keys type string { - index-to: default, keys indexing: index rank-type: about } field isbn type string { - index-to: default, isbn indexing: index|summary rank-type: about } field series type string { - index-to: default, series indexing: index rank-type: about } diff --git a/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/music.sd b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/music.sd index 498bc79489f..21da176564b 100644 --- a/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/music.sd @@ -2,11 +2,9 @@ search music { document music inherits base { field f1 type string { indexing: summary | index - index-to: f1, all } field f2 type string { indexing: summary | index - index-to: f2, all } } } diff --git a/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/video.sd b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/video.sd index b010b6d9769..5462be17374 100644 --- a/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/video.sd +++ b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/video.sd @@ -2,41 +2,34 @@ search video { document video inherits base { field title type string { bolding: on - index-to: default, title indexing: index|summary rank-type: about } field keys type string { - index-to: default, keys indexing: index rank-type: about } field director type string { bolding: on - index-to: default, director indexing: index|summary rank-type: about } field disp_actor type string { bolding: on - index-to: default, disp_actor indexing: index|summary rank-type: about } field actor type string { bolding: on - index-to: default, actor indexing: index|summary rank-type: about } field fmt type string { - index-to: default, fmt indexing: index|summary rank-type: about } field isbn type string { bolding: on - index-to: default, isbn indexing: index|summary rank-type: about } diff --git a/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/book.sd b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/book.sd index 73b540627d7..ba298f4fcba 100644 --- a/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/book.sd +++ b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/book.sd @@ -2,34 +2,28 @@ search book { document book inherits base { field title type string { bolding: on - index-to: default, title indexing: index|summary rank-type: about } field dispauthor type string { bolding: on - index-to: default, dispauthor indexing: index|summary rank-type: about } field author type string { bolding: on - index-to: default, author indexing: index|summary rank-type: about } field keys type string { - index-to: default, keys indexing: index rank-type: about } field isbn type string { - index-to: default, isbn indexing: index|summary rank-type: about } field series type string { - index-to: default, series indexing: index rank-type: about } diff --git a/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/music.sd b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/music.sd index 498bc79489f..21da176564b 100644 --- a/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/music.sd @@ -2,11 +2,9 @@ search music { document music inherits base { field f1 type string { indexing: summary | index - index-to: f1, all } field f2 type string { indexing: summary | index - index-to: f2, all } } } diff --git a/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/video.sd b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/video.sd index b010b6d9769..5462be17374 100644 --- a/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/video.sd +++ b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/video.sd @@ -2,41 +2,34 @@ search video { document video inherits base { field title type string { bolding: on - index-to: default, title indexing: index|summary rank-type: about } field keys type string { - index-to: default, keys indexing: index rank-type: about } field director type string { bolding: on - index-to: default, director indexing: index|summary rank-type: about } field disp_actor type string { bolding: on - index-to: default, disp_actor indexing: index|summary rank-type: about } field actor type string { bolding: on - index-to: default, actor indexing: index|summary rank-type: about } field fmt type string { - index-to: default, fmt indexing: index|summary rank-type: about } field isbn type string { bolding: on - index-to: default, isbn indexing: index|summary rank-type: about } diff --git a/config-model/src/test/cfg/routing/content_two_clusters/schemas/mobile.sd b/config-model/src/test/cfg/routing/content_two_clusters/schemas/mobile.sd index 60ea98235b0..3cc3dcf5526 100644 --- a/config-model/src/test/cfg/routing/content_two_clusters/schemas/mobile.sd +++ b/config-model/src/test/cfg/routing/content_two_clusters/schemas/mobile.sd @@ -3,11 +3,9 @@ search mobile { document mobile { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/cfg/routing/content_two_clusters/schemas/music.sd b/config-model/src/test/cfg/routing/content_two_clusters/schemas/music.sd index 290f8983b4d..982607955a7 100644 --- a/config-model/src/test/cfg/routing/content_two_clusters/schemas/music.sd +++ b/config-model/src/test/cfg/routing/content_two_clusters/schemas/music.sd @@ -3,11 +3,9 @@ search music { document music { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/cfg/routing/contentsimpleconfig/schemas/music.sd b/config-model/src/test/cfg/routing/contentsimpleconfig/schemas/music.sd index 290f8983b4d..982607955a7 100644 --- a/config-model/src/test/cfg/routing/contentsimpleconfig/schemas/music.sd +++ b/config-model/src/test/cfg/routing/contentsimpleconfig/schemas/music.sd @@ -3,11 +3,9 @@ search music { document music { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/cfg/routing/replacehop/schemas/music.sd b/config-model/src/test/cfg/routing/replacehop/schemas/music.sd index 274c6ca63d6..c4dcecbd6ac 100755 --- a/config-model/src/test/cfg/routing/replacehop/schemas/music.sd +++ b/config-model/src/test/cfg/routing/replacehop/schemas/music.sd @@ -3,11 +3,9 @@ search music { document music { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/cfg/routing/replaceroute/schemas/music.sd b/config-model/src/test/cfg/routing/replaceroute/schemas/music.sd index 274c6ca63d6..c4dcecbd6ac 100755 --- a/config-model/src/test/cfg/routing/replaceroute/schemas/music.sd +++ b/config-model/src/test/cfg/routing/replaceroute/schemas/music.sd @@ -3,11 +3,9 @@ search music { document music { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/cfg/search/data/travel/schemas/TTPOI.sd b/config-model/src/test/cfg/search/data/travel/schemas/TTPOI.sd index f3fe2cdf445..7895d98b2e0 100644 --- a/config-model/src/test/cfg/search/data/travel/schemas/TTPOI.sd +++ b/config-model/src/test/cfg/search/data/travel/schemas/TTPOI.sd @@ -4,13 +4,11 @@ document TTPOI { # categories associated with the POI field Categories type array { indexing: summary | index - # index-to: Categories } # sub catagories associated with the POI field SubCategories type array { indexing: summary | index - # index-to: SubCategories } } diff --git a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/schemas/music.sd b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/schemas/music.sd index 290f8983b4d..982607955a7 100644 --- a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/schemas/music.sd +++ b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/schemas/music.sd @@ -3,11 +3,9 @@ search music { document music { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/schemas/music.sd b/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/schemas/music.sd index 290f8983b4d..982607955a7 100644 --- a/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/schemas/music.sd +++ b/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/schemas/music.sd @@ -3,11 +3,9 @@ search music { document music { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/cfg/storage/clustercontroller_advanced/schemas/music.sd b/config-model/src/test/cfg/storage/clustercontroller_advanced/schemas/music.sd index 290f8983b4d..982607955a7 100644 --- a/config-model/src/test/cfg/storage/clustercontroller_advanced/schemas/music.sd +++ b/config-model/src/test/cfg/storage/clustercontroller_advanced/schemas/music.sd @@ -3,11 +3,9 @@ search music { document music { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/derived/music3/music3.sd b/config-model/src/test/derived/music3/music3.sd index 7123c45bac2..47867683c62 100644 --- a/config-model/src/test/derived/music3/music3.sd +++ b/config-model/src/test/derived/music3/music3.sd @@ -5,13 +5,11 @@ schema music3 { field title type string { indexing: summary | index - # index-to: title, default rank-type: about } field artist type string { indexing: summary | attribute | index - # index-to: artist, default rank-type:about } diff --git a/config-model/src/test/derived/newrank/newrank.sd b/config-model/src/test/derived/newrank/newrank.sd index 345d01bffb5..a01f292eb27 100644 --- a/config-model/src/test/derived/newrank/newrank.sd +++ b/config-model/src/test/derived/newrank/newrank.sd @@ -99,7 +99,6 @@ schema newrank{ field artist type string { indexing: summary | index - # index-to: artist, default } field artistspid type string { diff --git a/config-model/src/test/examples/attributesexactmatch.sd b/config-model/src/test/examples/attributesexactmatch.sd index 2db687cb20d..5529906adce 100644 --- a/config-model/src/test/examples/attributesexactmatch.sd +++ b/config-model/src/test/examples/attributesexactmatch.sd @@ -29,7 +29,6 @@ search music { } field genre type string { - # index-to: foo } field trumpetist type string { diff --git a/config-model/src/test/examples/casing.sd b/config-model/src/test/examples/casing.sd index b0ce0a07748..7564934949b 100644 --- a/config-model/src/test/examples/casing.sd +++ b/config-model/src/test/examples/casing.sd @@ -31,7 +31,6 @@ search music { field Genre type string { indexing: index - # index-to: Foo alias Foo: sjanger } -- cgit v1.2.3