diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2018-06-20 10:17:42 +0200 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2018-06-20 10:17:42 +0200 |
commit | 2915ddaa1c176a47d6c62d3b25bad9bb369c1448 (patch) | |
tree | 3706af052360b9ef219d34ebf041d788cb92dd3d /searchcore | |
parent | 44fc1380b66867958f89c47ac8752926b3787a4d (diff) |
add and use HDR_ABORT instead
Diffstat (limited to 'searchcore')
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/test/attribute_utils.h | 3 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/test/attribute_utils.h b/searchcore/src/vespa/searchcore/proton/test/attribute_utils.h index 6270b8b3a89..f1d661a3ad0 100644 --- a/searchcore/src/vespa/searchcore/proton/test/attribute_utils.h +++ b/searchcore/src/vespa/searchcore/proton/test/attribute_utils.h @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include <vespa/vespalib/util/hdr_abort.h> #include <vespa/searchcommon/attribute/config.h> #include <vespa/searchlib/attribute/integerbase.h> @@ -24,7 +25,7 @@ struct AttributeUtils search::IntegerAttribute &ia = static_cast<search::IntegerAttribute &>(*attr); while (ia.getNumDocs() < to) { uint32_t docId; - if (!ia.addDoc(docId)) { LOG_ABORT("should not be reached"); } + if (!ia.addDoc(docId)) { HDR_ABORT("should not be reached"); } } for (uint32_t i = from; i < to; ++i) { ia.update(i, value); diff --git a/searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h b/searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h index 9385c160927..b0b999e0d30 100644 --- a/searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h +++ b/searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h @@ -1,6 +1,7 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include <vespa/vespalib/util/hdr_abort.h> #include <vespa/searchlib/test/mock_attribute_manager.h> #include <vespa/searchcore/proton/attribute/i_attribute_manager.h> #include <vespa/searchcore/proton/attribute/imported_attributes_repo.h> @@ -54,16 +55,16 @@ public: virtual void pruneRemovedFields(search::SerialNum) override { } virtual const IAttributeFactory::SP &getFactory() const override { - LOG_ABORT("should not be reached"); + HDR_ABORT("should not be reached"); } virtual search::ISequencedTaskExecutor &getAttributeFieldWriter() const override { - LOG_ABORT("should not be reached"); + HDR_ABORT("should not be reached"); } virtual search::AttributeVector *getWritableAttribute(const vespalib::string &) const override { return nullptr; } virtual const std::vector<search::AttributeVector *> &getWritableAttributes() const override { - LOG_ABORT("should not be reached"); + HDR_ABORT("should not be reached"); } virtual void asyncForEachAttribute(std::shared_ptr<IAttributeFunctor>) const override { } |