diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-03-23 15:24:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-23 15:24:23 +0100 |
commit | 76a39f8d3381b19d0db9034d70f5df11215a672c (patch) | |
tree | f7d365046733669d528395ec947b99fab522758a | |
parent | 275fee0246a0ae6f143638ba88dc4cd4eaa20cc8 (diff) | |
parent | 92c5e2cc7696cb342bb1b0ba912300a30d60e974 (diff) |
Merge pull request #26558 from vespa-engine/toregge/use-explicit-instantiations-of-multi-value-attribute-and-multi-value-enum-attribute
Use explicit instantiations of MultiValueEnumAttribute and MultiValue…
9 files changed, 4 insertions, 9 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/createarrayfastsearch.cpp b/searchlib/src/vespa/searchlib/attribute/createarrayfastsearch.cpp index 5e22352c1d4..2a1ddee19f3 100644 --- a/searchlib/src/vespa/searchlib/attribute/createarrayfastsearch.cpp +++ b/searchlib/src/vespa/searchlib/attribute/createarrayfastsearch.cpp @@ -13,8 +13,6 @@ LOG_SETUP(".createarrayfastsearch"); #include "attributevector.hpp" #include "enumstore.hpp" #include "enumattribute.hpp" -#include "multivalueattribute.hpp" -#include "multienumattribute.hpp" #include "multinumericenumattribute.hpp" #include "multinumericpostattribute.hpp" #include "multistringpostattribute.hpp" diff --git a/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp b/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp index 292c390997f..bded00940c1 100644 --- a/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp +++ b/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp @@ -3,7 +3,6 @@ #include "attributefactory.h" #include "defines.h" #include "attributevector.hpp" -#include "multivalueattribute.hpp" #include "multinumericattribute.hpp" #include "multistringattribute.hpp" diff --git a/searchlib/src/vespa/searchlib/attribute/createsetfastsearch.cpp b/searchlib/src/vespa/searchlib/attribute/createsetfastsearch.cpp index 7daea3e92f6..d706a9c207c 100644 --- a/searchlib/src/vespa/searchlib/attribute/createsetfastsearch.cpp +++ b/searchlib/src/vespa/searchlib/attribute/createsetfastsearch.cpp @@ -11,8 +11,6 @@ LOG_SETUP(".createsetfastsearch"); #include "attributevector.hpp" #include "enumstore.hpp" #include "enumattribute.hpp" -#include "multivalueattribute.hpp" -#include "multienumattribute.hpp" #include "multinumericenumattribute.hpp" #include "multinumericpostattribute.hpp" #include "multistringpostattribute.hpp" diff --git a/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp b/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp index 99538bb748f..1fc8de878b6 100644 --- a/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp +++ b/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp @@ -3,7 +3,6 @@ #include "attributefactory.h" #include "defines.h" #include "attributevector.hpp" -#include "multivalueattribute.hpp" #include "multinumericattribute.hpp" #include "multistringattribute.hpp" diff --git a/searchlib/src/vespa/searchlib/attribute/flagattribute.cpp b/searchlib/src/vespa/searchlib/attribute/flagattribute.cpp index f8cf742bdb2..d1c04eeb023 100644 --- a/searchlib/src/vespa/searchlib/attribute/flagattribute.cpp +++ b/searchlib/src/vespa/searchlib/attribute/flagattribute.cpp @@ -4,6 +4,7 @@ #include "load_utils.hpp" #include "multinumericattribute.hpp" #include "multi_numeric_flag_search_context.h" +#include <vespa/searchcommon/attribute/config.h> #include <vespa/searchlib/common/bitvector.h> #include <vespa/log/log.h> diff --git a/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp index ab68e1f1214..f7c520c2047 100644 --- a/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp @@ -3,12 +3,12 @@ #pragma once #include "multienumattribute.h" -#include "multivalueattribute.hpp" #include "multienumattributesaver.h" #include "load_utils.h" #include "enum_store_loaders.h" #include "ipostinglistattributebase.h" #include "valuemodifier.h" +#include <vespa/searchcommon/attribute/config.h> #include <vespa/vespalib/stllike/hashtable.hpp> #include <vespa/vespalib/datastore/unique_store_remapper.h> diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.hpp index 55e84b96fb4..147fd7dfa91 100644 --- a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.hpp @@ -2,13 +2,13 @@ #pragma once #include "multinumericattribute.h" -#include "multivalueattribute.hpp" #include "attributevector.hpp" #include "multinumericattributesaver.h" #include "multi_numeric_search_context.h" #include "load_utils.h" #include "primitivereader.h" #include "valuemodifier.h" +#include <vespa/searchcommon/attribute/config.h> #include <vespa/searchlib/query/query_term_simple.h> #include <vespa/searchlib/util/fileutil.h> diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.hpp index a2a6b25fc11..9a37677801e 100644 --- a/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.hpp @@ -3,6 +3,7 @@ #pragma once #include "multinumericenumattribute.h" +#include "enum_store_loaders.h" #include "load_utils.h" #include "loadednumericvalue.h" #include "enumerated_multi_value_read_view.h" diff --git a/searchlib/src/vespa/searchlib/attribute/multistringattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multistringattribute.hpp index c34f64a7da4..a63862126fa 100644 --- a/searchlib/src/vespa/searchlib/attribute/multistringattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multistringattribute.hpp @@ -5,7 +5,6 @@ #include "multistringattribute.h" #include "enumattribute.hpp" #include "enumerated_multi_value_read_view.h" -#include "multienumattribute.hpp" #include "multi_string_enum_hint_search_context.h" #include <vespa/vespalib/text/utf8.h> #include <vespa/vespalib/text/lowercase.h> |