diff options
8 files changed, 8 insertions, 83 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java index 39d51414607..f8766afbc7b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java @@ -114,9 +114,6 @@ public class IndexSchema extends Derived implements IndexschemaConfig.Producer { .prefix(f.hasPrefix()) .phrases(f.hasPhrases()) .positions(f.hasPositions()); - if (f.getSdType() !=null && !f.getSdType().equals(com.yahoo.searchdefinition.Index.Type.VESPA)) { - ifB.indextype(IndexschemaConfig.Indexfield.Indextype.Enum.valueOf(f.getSdType().toString())); - } if (!f.getCollectionType().equals("SINGLE")) { ifB.collectiontype(IndexschemaConfig.Indexfield.Collectiontype.Enum.valueOf(f.getCollectionType())); } @@ -194,10 +191,7 @@ public class IndexSchema extends Derived implements IndexschemaConfig.Producer { public Index.Type getRawType() { return type; } public String getType() { return type.equals(Index.Type.INT64) - ? "INT64" - : type.equals(Index.Type.BOOLEANTREE) - ? "BOOLEANTREE" - : "STRING"; + ? "INT64" : "STRING"; } public String getCollectionType() { return (sdFieldType == null) diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj index 50ca2b204fe..883dfc7ac72 100644 --- a/config-model/src/main/javacc/SDParser.jj +++ b/config-model/src/main/javacc/SDParser.jj @@ -221,7 +221,6 @@ TOKEN : | < WEIGHT: "weight" > | < TYPE: "type" > | < INDEX: "index" > -| < RISE: "rise" > | < MTOKEN: "token" > | < TEXT: "text" > | < WORD: "word" > @@ -1777,11 +1776,6 @@ Object indexBody(IndexOperation index) : ( <PREFIX> { index.setPrefix(true); } | <ALIAS> <COLON> str = identifier() { index.addAlias(str); } | <STEMMING> <COLON> str = identifier() { index.setStemming(str); } - | <RISE> { - if (true) throw new ParseException("'index:rise' is no longer an option. Use 'indexing:attribute' instead. " + - "If it is a weighted set field you should also add 'attribute:fast-search'." + - "This change will require refeeding."); - } | <ARITY> <COLON> arity = integer() { index.setArity(arity); } | <LOWERBOUND> <COLON> num = consumeLong() { index.setLowerBound(num); } | <UPPERBOUND> <COLON> num = consumeLong() { index.setUpperBound(num); } @@ -2555,7 +2549,6 @@ String identifier() : { } | <REFERENCE> | <REMOVEIFZERO> | <RERANKCOUNT> - | <RISE> | <SEARCH> | <SECONDARY> | <SECONDPHASE> diff --git a/config-model/src/test/derived/indexschema/indexschema.cfg b/config-model/src/test/derived/indexschema/indexschema.cfg index 7d081869b22..d1f43c4a81e 100644 --- a/config-model/src/test/derived/indexschema/indexschema.cfg +++ b/config-model/src/test/derived/indexschema/indexschema.cfg @@ -1,5 +1,4 @@ indexfield[].name "sa" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -7,7 +6,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "sb" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -15,7 +13,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "sc" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -23,7 +20,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "sd" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -31,7 +27,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "sf" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype ARRAY indexfield[].prefix false @@ -39,7 +34,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "sg" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET indexfield[].prefix false @@ -47,7 +41,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "sh" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -55,7 +48,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "si" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix true @@ -63,7 +55,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "exact1" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -71,7 +62,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "exact2" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -79,7 +69,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "nostemstring1" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -87,7 +76,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "nostemstring2" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -95,7 +83,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "nostemstring3" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -103,7 +90,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "nostemstring4" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -111,7 +97,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "fs9" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -119,7 +104,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "sd_literal" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -127,7 +111,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "sh.fragment" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -135,7 +118,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "sh.host" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -143,7 +125,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "sh.hostname" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -151,7 +132,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "sh.path" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -159,7 +139,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "sh.port" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -167,7 +146,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "sh.query" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false @@ -175,7 +153,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "sh.scheme" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype SINGLE indexfield[].prefix false diff --git a/config-model/src/test/derived/uri_array/indexschema.cfg b/config-model/src/test/derived/uri_array/indexschema.cfg index be7bf609579..8593c594e3c 100644 --- a/config-model/src/test/derived/uri_array/indexschema.cfg +++ b/config-model/src/test/derived/uri_array/indexschema.cfg @@ -1,5 +1,4 @@ indexfield[].name "my_uri" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype ARRAY indexfield[].prefix false @@ -7,7 +6,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "my_uri.fragment" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype ARRAY indexfield[].prefix false @@ -15,7 +13,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "my_uri.host" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype ARRAY indexfield[].prefix false @@ -23,7 +20,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "my_uri.hostname" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype ARRAY indexfield[].prefix false @@ -31,7 +27,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "my_uri.path" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype ARRAY indexfield[].prefix false @@ -39,7 +34,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "my_uri.port" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype ARRAY indexfield[].prefix false @@ -47,7 +41,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "my_uri.query" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype ARRAY indexfield[].prefix false @@ -55,7 +48,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "my_uri.scheme" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype ARRAY indexfield[].prefix false diff --git a/config-model/src/test/derived/uri_wset/indexschema.cfg b/config-model/src/test/derived/uri_wset/indexschema.cfg index 5997a47c48a..a432556bb6b 100644 --- a/config-model/src/test/derived/uri_wset/indexschema.cfg +++ b/config-model/src/test/derived/uri_wset/indexschema.cfg @@ -1,5 +1,4 @@ indexfield[].name "my_uri" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET indexfield[].prefix false @@ -7,7 +6,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "my_uri.fragment" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET indexfield[].prefix false @@ -15,7 +13,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "my_uri.host" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET indexfield[].prefix false @@ -23,7 +20,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "my_uri.hostname" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET indexfield[].prefix false @@ -31,7 +27,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "my_uri.path" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET indexfield[].prefix false @@ -39,7 +34,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "my_uri.port" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET indexfield[].prefix false @@ -47,7 +41,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "my_uri.query" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET indexfield[].prefix false @@ -55,7 +48,6 @@ indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 indexfield[].name "my_uri.scheme" -indexfield[].indextype VESPA indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET indexfield[].prefix false diff --git a/configdefinitions/src/vespa/indexschema.def b/configdefinitions/src/vespa/indexschema.def index 5352e4d9009..7153164bfab 100644 --- a/configdefinitions/src/vespa/indexschema.def +++ b/configdefinitions/src/vespa/indexschema.def @@ -4,10 +4,8 @@ namespace=vespa.config.search ## The name of the index field. indexfield[].name string -## This is the type of an index. Currently only rise and vespa are supported -indexfield[].indextype enum {VESPA, RISE} default=VESPA ## The data type of the index field. -indexfield[].datatype enum { STRING, INT64, BOOLEANTREE } default=STRING +indexfield[].datatype enum { STRING, INT64 } default=STRING ## The collection type of the index field. indexfield[].collectiontype enum { SINGLE, ARRAY, WEIGHTEDSET } default=SINGLE ## Whether the index should support prefix searches. diff --git a/searchcommon/src/tests/schema/load-save-cfg/indexschema.cfg b/searchcommon/src/tests/schema/load-save-cfg/indexschema.cfg index 989f30f7499..c0998bcf597 100644 --- a/searchcommon/src/tests/schema/load-save-cfg/indexschema.cfg +++ b/searchcommon/src/tests/schema/load-save-cfg/indexschema.cfg @@ -8,17 +8,6 @@ indexfield[2].datatype STRING indexfield[2].prefix true indexfield[2].phrases false indexfield[2].positions false -indexfield[3].name e -indexfield[3].datatype BOOLEANTREE -indexfield[3].collectiontype SINGLE -indexfield[4].name f -indexfield[4].indextype RISE -indexfield[4].datatype STRING -indexfield[4].collectiontype WEIGHTEDSET -indexfield[5].name g -indexfield[5].indextype RISE -indexfield[5].datatype INT64 -indexfield[5].collectiontype WEIGHTEDSET fieldset[1] fieldset[0].name default fieldset[0].field[2] diff --git a/searchcommon/src/vespa/searchcommon/common/schemaconfigurer.cpp b/searchcommon/src/vespa/searchcommon/common/schemaconfigurer.cpp index 401003cb74b..d56f3c747c1 100644 --- a/searchcommon/src/vespa/searchcommon/common/schemaconfigurer.cpp +++ b/searchcommon/src/vespa/searchcommon/common/schemaconfigurer.cpp @@ -32,8 +32,6 @@ convertIndexDataType(const IndexschemaConfig::Indexfield::Datatype &type) return DataType::STRING; case IndexschemaConfig::Indexfield::INT64: return DataType::INT64; - case IndexschemaConfig::Indexfield::BOOLEANTREE: - return DataType::BOOLEANTREE; } return DataType::STRING; } @@ -144,20 +142,12 @@ SchemaBuilder::build(const IndexschemaConfig &cfg, Schema &schema) { for (size_t i = 0; i < cfg.indexfield.size(); ++i) { const IndexschemaConfig::Indexfield & f = cfg.indexfield[i]; - if ((f.datatype == IndexschemaConfig::Indexfield::BOOLEANTREE && - f.collectiontype == IndexschemaConfig::Indexfield::SINGLE) || - (f.indextype == IndexschemaConfig::Indexfield::RISE)) - { - LOG(warning, "Your field '%s' is a rise index. Those are no longer supported as of Vespa-5.89.\n" - " Redeploy and follow instructions to mitigate.", f.name.c_str()); - } else { - schema.addIndexField(Schema::IndexField(f.name, convertIndexDataType(f.datatype), - convertIndexCollectionType(f.collectiontype)). - setPrefix(f.prefix). - setPhrases(f.phrases). - setPositions(f.positions). - setAvgElemLen(f.averageelementlen)); - } + schema.addIndexField(Schema::IndexField(f.name, convertIndexDataType(f.datatype), + convertIndexCollectionType(f.collectiontype)). + setPrefix(f.prefix). + setPhrases(f.phrases). + setPositions(f.positions). + setAvgElemLen(f.averageelementlen)); } for (size_t i = 0; i < cfg.fieldset.size(); ++i) { const IndexschemaConfig::Fieldset &fs = cfg.fieldset[i]; |