diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-10 11:29:17 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-10 11:29:17 +0000 |
| commit | 2cfd6607c25ca1d511c07a6b4709f24f00c82239 (patch) | |
| tree | 44de53022e9a5b0009aa0d766abeb46cf60783b6 | |
| parent | 90d35e4e86e9469515d6e29aecd570d4b4664b29 (diff) | |
Only close the _diskMemUsageSampler if it has been created.
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/proton.cpp | 6 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/features/dotproductfeature.cpp | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp index 6759335914d..54009ef60f4 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp @@ -55,8 +55,6 @@ #include <malloc.h> #endif -#include <vespa/searchlib/aggregation/forcelink.hpp> -#include <vespa/searchlib/expression/forcelink.hpp> #include <sstream> #include <vespa/log/log.h> @@ -473,7 +471,9 @@ Proton::~Proton() _diskMemUsageSampler->notifier().removeDiskMemUsageListener(_memoryFlushConfigUpdater.get()); } _sessionPruneHandle.reset(); - _diskMemUsageSampler->close(); + if (_diskMemUsageSampler) { + _diskMemUsageSampler->close(); + } _scheduler.reset(); _executor.shutdown(); _executor.sync(); diff --git a/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp b/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp index 47b5e0161e9..accd3ea694f 100644 --- a/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp @@ -155,7 +155,6 @@ DotProductExecutorByEnum::execute(uint32_t docId) { class SingleDotProductExecutorByEnum final : public fef::FeatureExecutor { public: - using IWeightedSeEnumReadView = attribute::IWeightedSetEnumReadView; SingleDotProductExecutorByEnum(const IWeightedSetEnumReadView * weighted_set_enum_read_view, EnumHandle key, feature_t value) : _weighted_set_enum_read_view(weighted_set_enum_read_view), _key(key), |