aboutsummaryrefslogtreecommitdiffstats
path: root/searchcommon/src/vespa/searchcommon/common/schemaconfigurer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'searchcommon/src/vespa/searchcommon/common/schemaconfigurer.cpp')
-rw-r--r--searchcommon/src/vespa/searchcommon/common/schemaconfigurer.cpp22
1 files changed, 6 insertions, 16 deletions
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];