diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-03-24 13:37:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-24 13:37:16 +0100 |
commit | 16a64c3f22f03dfba2ec1740db9cec5f768dff10 (patch) | |
tree | 1671a95e983141d06f409235104a6b407dfb31be /searchlib/src | |
parent | 92e417c34e0d0ec14809fdc3365377e9d4fa8825 (diff) | |
parent | e1f2607f61dd674c47edc4d0e6bbcb9c914136d6 (diff) |
Merge pull request #26572 from vespa-engine/toregge/use-explicit-instantiations-of-multi-value-numeric-attribute
Use explicit instantiation of MultiValueNumericAttribute
Diffstat (limited to 'searchlib/src')
6 files changed, 19 insertions, 4 deletions
diff --git a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp index 24213c53cbe..ab36213246e 100644 --- a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp +++ b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp @@ -6,7 +6,7 @@ #include <vespa/searchlib/attribute/attributemanager.h> #include <vespa/searchlib/attribute/configconverter.h> #include <vespa/searchlib/attribute/multinumericattribute.h> -#include <vespa/searchlib/attribute/multinumericattribute.hpp> +#include <vespa/searchlib/attribute/multinumericattribute.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/log/log.h> diff --git a/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp b/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp index bded00940c1..a73d9f1f08c 100644 --- a/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp +++ b/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp @@ -3,7 +3,7 @@ #include "attributefactory.h" #include "defines.h" #include "attributevector.hpp" -#include "multinumericattribute.hpp" +#include "multinumericattribute.h" #include "multistringattribute.hpp" #include <vespa/log/log.h> diff --git a/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp b/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp index 1fc8de878b6..34bb81e4305 100644 --- a/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp +++ b/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp @@ -3,7 +3,7 @@ #include "attributefactory.h" #include "defines.h" #include "attributevector.hpp" -#include "multinumericattribute.hpp" +#include "multinumericattribute.h" #include "multistringattribute.hpp" #include <vespa/log/log.h> diff --git a/searchlib/src/vespa/searchlib/attribute/flagattribute.cpp b/searchlib/src/vespa/searchlib/attribute/flagattribute.cpp index d1c04eeb023..4586bc1786e 100644 --- a/searchlib/src/vespa/searchlib/attribute/flagattribute.cpp +++ b/searchlib/src/vespa/searchlib/attribute/flagattribute.cpp @@ -2,10 +2,11 @@ #include "flagattribute.h" #include "load_utils.hpp" -#include "multinumericattribute.hpp" +#include "multinumericattribute.h" #include "multi_numeric_flag_search_context.h" #include <vespa/searchcommon/attribute/config.h> #include <vespa/searchlib/common/bitvector.h> +#include <vespa/searchlib/query/query_term_simple.h> #include <vespa/log/log.h> LOG_SETUP(".searchlib.attribute.flag_attribute"); diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.cpp b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.cpp index 4fd5b9510c8..e6d62c0e905 100644 --- a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.cpp +++ b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.cpp @@ -7,5 +7,18 @@ LOG_SETUP(".searchlib.attribute.multi_numeric_attribute"); namespace search { +template class MultiValueNumericAttribute<IntegerAttributeTemplate<int8_t>, int8_t>; +template class MultiValueNumericAttribute<IntegerAttributeTemplate<int16_t>, int16_t>; +template class MultiValueNumericAttribute<IntegerAttributeTemplate<int32_t>, int32_t>; +template class MultiValueNumericAttribute<IntegerAttributeTemplate<int64_t>, int64_t>; +template class MultiValueNumericAttribute<FloatingPointAttributeTemplate<float>, float>; +template class MultiValueNumericAttribute<FloatingPointAttributeTemplate<double>, double>; +template class MultiValueNumericAttribute<IntegerAttributeTemplate<int8_t>, multivalue::WeightedValue<int8_t>>; +template class MultiValueNumericAttribute<IntegerAttributeTemplate<int16_t>, multivalue::WeightedValue<int16_t>>; +template class MultiValueNumericAttribute<IntegerAttributeTemplate<int32_t>, multivalue::WeightedValue<int32_t>>; +template class MultiValueNumericAttribute<IntegerAttributeTemplate<int64_t>, multivalue::WeightedValue<int64_t>>; +template class MultiValueNumericAttribute<FloatingPointAttributeTemplate<float>, multivalue::WeightedValue<float>>; +template class MultiValueNumericAttribute<FloatingPointAttributeTemplate<double>, multivalue::WeightedValue<double>>; + } // namespace search diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.h b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.h index ed78f7776f1..32b3c7dbad2 100644 --- a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.h @@ -6,6 +6,7 @@ #include "floatbase.h" #include "multivalueattribute.h" #include "search_context.h" +#include <vespa/searchcommon/attribute/config.h> #include <limits> namespace search { |