Merge pull request #26583 from vespa-engine/toregge/trim-and-sort-attribute-factory-includes

Trim and sort AttributeFactory includes.

5 files changed, 13 insertions, 24 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/createarrayfastsearch.cpp b/searchlib/src/vespa/searchlib/attribute/createarrayfastsearch.cpp
index ba8cf763c6e..acdc5c1f219 100644
--- a/searchlib/src/vespa/searchlib/attribute/createarrayfastsearch.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/createarrayfastsearch.cpp
@@ -1,21 +1,16 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "attributefactory.h"
-#include "integerbase.h"
-#include "floatbase.h"
-#include "flagattribute.h"
 #include "defines.h"
+#include "flagattribute.h"
+#include "floatbase.h"
+#include "multinumericpostattribute.h"
+#include "multistringpostattribute.h"
 #include <vespa/searchcommon/attribute/config.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".createarrayfastsearch");
 
-#include "attributevector.hpp"
-#include "enumstore.hpp"
-#include "enumattribute.hpp"
-#include "multinumericpostattribute.h"
-#include "multistringpostattribute.h"
-
 namespace search {
 
 using attribute::BasicType;
diff --git a/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp b/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp
index d372bf759a3..f844d4749d9 100644
--- a/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp
@@ -2,7 +2,6 @@
 
 #include "attributefactory.h"
 #include "defines.h"
-#include "attributevector.hpp"
 #include "multinumericattribute.h"
 #include "multistringattribute.h"
 
diff --git a/searchlib/src/vespa/searchlib/attribute/createsetfastsearch.cpp b/searchlib/src/vespa/searchlib/attribute/createsetfastsearch.cpp
index 457aeb4c31f..717526b9888 100644
--- a/searchlib/src/vespa/searchlib/attribute/createsetfastsearch.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/createsetfastsearch.cpp
@@ -1,19 +1,16 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "attributefactory.h"
-#include "integerbase.h"
-#include "floatbase.h"
 #include "defines.h"
+#include "floatbase.h"
+#include "integerbase.h"
+#include "multinumericpostattribute.h"
+#include "multistringpostattribute.h"
+#include <vespa/searchcommon/attribute/config.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".createsetfastsearch");
 
-#include "attributevector.hpp"
-#include "enumstore.hpp"
-#include "enumattribute.hpp"
-#include "multinumericpostattribute.h"
-#include "multistringpostattribute.h"
-
 namespace search {
 
 using attribute::BasicType;
diff --git a/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp b/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp
index f70fef3a9fb..c7586d27878 100644
--- a/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp
@@ -2,7 +2,6 @@
 
 #include "attributefactory.h"
 #include "defines.h"
-#include "attributevector.hpp"
 #include "multinumericattribute.h"
 #include "multistringattribute.h"
 
diff --git a/searchlib/src/vespa/searchlib/attribute/createsinglefastsearch.cpp b/searchlib/src/vespa/searchlib/attribute/createsinglefastsearch.cpp
index 388ecda53e5..03ad7cc7ee3 100644
--- a/searchlib/src/vespa/searchlib/attribute/createsinglefastsearch.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/createsinglefastsearch.cpp
@@ -1,14 +1,13 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "attributefactory.h"
-#include "integerbase.h"
-#include "floatbase.h"
 #include "defines.h"
-#include "singlestringattribute.h"
+#include "floatbase.h"
+#include "integerbase.h"
 #include "singleboolattribute.h"
-#include <vespa/searchcommon/attribute/config.h>
-#include "singlestringpostattribute.h"
 #include "singlenumericpostattribute.h"
+#include "singlestringpostattribute.h"
+#include <vespa/searchcommon/attribute/config.h>
 #include <vespa/searchlib/tensor/direct_tensor_attribute.h>
 
 #define INTPOSTING(T)   SingleValueNumericPostingAttribute< ENUM_ATTRIBUTE(IntegerAttributeTemplate<T>) >