Refactor parameters for predicate attributes.

2 files changed, 9 insertions, 7 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/configconverter.cpp b/searchlib/src/vespa/searchlib/attribute/configconverter.cpp
index 8c911a78d43..9e3c6156dbf 100644
--- a/searchlib/src/vespa/searchlib/attribute/configconverter.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/configconverter.cpp
@@ -65,15 +65,17 @@ ConfigConverter::convert(const AttributesConfig::Attribute & cfg)
     cType.removeIfZero(cfg.removeifzero);
     cType.createIfNonExistant(cfg.createifnonexistent);
     Config retval(bType, cType);
+    PredicateParams predicateParams;
     retval.setFastSearch(cfg.fastsearch);
     retval.setHuge(cfg.huge);
     retval.setEnableBitVectors(cfg.enablebitvectors);
     retval.setEnableOnlyBitVector(cfg.enableonlybitvector);
     retval.setIsFilter(cfg.enableonlybitvector);
     retval.setFastAccess(cfg.fastaccess);
-    retval.setArity(cfg.arity);
-    retval.setBounds(cfg.lowerbound, cfg.upperbound);
-    retval.setDensePostingListThreshold(cfg.densepostinglistthreshold);
+    predicateParams.setArity(cfg.arity);
+    predicateParams.setBounds(cfg.lowerbound, cfg.upperbound);
+    predicateParams.setDensePostingListThreshold(cfg.densepostinglistthreshold);
+    retval.setPredicateParams(predicateParams);
     if (retval.basicType().type() == BasicType::Type::TENSOR) {
         if (!cfg.tensortype.empty()) {
             retval.setTensorType(ValueType::from_spec(cfg.tensortype));
diff --git a/searchlib/src/vespa/searchlib/attribute/predicate_attribute.cpp b/searchlib/src/vespa/searchlib/attribute/predicate_attribute.cpp
index 3d3bbdcae43..2342c374643 100644
--- a/searchlib/src/vespa/searchlib/attribute/predicate_attribute.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/predicate_attribute.cpp
@@ -55,7 +55,7 @@ int64_t adjustUpperBound(int32_t arity, int64_t upper_bound) {
 }
 
 SimpleIndexConfig createSimpleIndexConfig(const search::attribute::Config &config) {
-    return SimpleIndexConfig(config.dense_posting_list_threshold(), config.getGrowStrategy());
+    return SimpleIndexConfig(config.predicateParams().dense_posting_list_threshold(), config.getGrowStrategy());
 }
 
 }  // namespace
@@ -66,9 +66,9 @@ PredicateAttribute::PredicateAttribute(const vespalib::string &base_file_name,
       _base_file_name(base_file_name),
       _limit_provider(*this),
       _index(new PredicateIndex(getGenerationHandler(), getGenerationHolder(),
-                                _limit_provider, createSimpleIndexConfig(config), config.arity())),
-      _lower_bound(adjustLowerBound(config.arity(), config.lower_bound())),
-      _upper_bound(adjustUpperBound(config.arity(), config.upper_bound())),
+                                _limit_provider, createSimpleIndexConfig(config), config.predicateParams().arity())),
+      _lower_bound(adjustLowerBound(config.predicateParams().arity(), config.predicateParams().lower_bound())),
+      _upper_bound(adjustUpperBound(config.predicateParams().arity(), config.predicateParams().upper_bound())),
       _min_feature(config.getGrowStrategy(), getGenerationHolder()),
       _interval_range_vector(config.getGrowStrategy(), getGenerationHolder()),
       _max_interval_range(1)