diff options
Diffstat (limited to 'searchcore')
4 files changed, 9 insertions, 7 deletions
diff --git a/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp b/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp index 4d0a96aa638..649b948b895 100644 --- a/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp @@ -28,6 +28,7 @@ LOG_SETUP("attribute_manager_test"); #include <vespa/searchlib/attribute/reference_attribute.h> #include <vespa/searchlib/attribute/singlenumericattribute.hpp> #include <vespa/searchlib/common/foregroundtaskexecutor.h> +#include <vespa/searchlib/common/indexmetainfo.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/predicate/predicate_index.h> #include <vespa/searchlib/predicate/predicate_tree_annotator.h> diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp index fc0649eedbd..c0e41e5b36d 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp @@ -21,7 +21,6 @@ using search::AttributeContext; using search::AttributeEnumGuard; using search::AttributeGuard; using search::AttributeVector; -using search::IndexMetaInfo; using search::TuneFileAttributes; using search::attribute::IAttributeContext; using search::attribute::IAttributeVector; diff --git a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp index 934357d3fa3..4d159d50a95 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp +++ b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp @@ -11,6 +11,8 @@ #include <fstream> #include <vespa/searchlib/common/serialnumfileheadercontext.h> #include <vespa/searchlib/common/isequencedtaskexecutor.h> +#include <vespa/searchlib/attribute/attributememorysavetarget.h> +#include <vespa/searchlib/attribute/attributevector.h> #include <future> #include "attribute_directory.h" #include <vespa/vespalib/util/stringfmt.h> @@ -158,7 +160,7 @@ FlushableAttribute::Flusher::run() } } -FlushableAttribute::FlushableAttribute(const AttributeVector::SP attr, +FlushableAttribute::FlushableAttribute(const AttributeVectorSP attr, const std::shared_ptr<AttributeDirectory> &attrDir, const TuneFileAttributes & tuneFileAttributes, diff --git a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.h b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.h index e72ec166453..a74dde28406 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.h +++ b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.h @@ -3,15 +3,14 @@ #pragma once #include <vespa/searchcorespi/flush/iflushtarget.h> -#include <vespa/searchlib/attribute/attributememorysavetarget.h> -#include <vespa/searchlib/attribute/attributevector.h> -#include <vespa/searchlib/common/indexmetainfo.h> +#include <vespa/searchlib/common/tunefileinfo.h> #include <vespa/searchcore/proton/common/hw_info.h> namespace search { class ISequencedTaskExecutor; +class AttributeVector; namespace common { class FileHeaderContext; } @@ -34,8 +33,9 @@ private: * Task performing the actual flushing to disk. **/ class Flusher; + using AttributeVectorSP = std::shared_ptr<search::AttributeVector>; - search::AttributeVector::SP _attr; + AttributeVectorSP _attr; bool _cleanUpAfterFlush; FlushStats _lastStats; const search::TuneFileAttributes _tuneFileAttributes; @@ -55,7 +55,7 @@ public: * * fileHeaderContext must be kept alive by caller. **/ - FlushableAttribute(const search::AttributeVector::SP attr, + FlushableAttribute(const AttributeVectorSP attr, const std::shared_ptr<AttributeDirectory> &attrDir, const search::TuneFileAttributes &tuneFileAttributes, const search::common::FileHeaderContext & |