diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-07-30 21:49:37 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-07-30 21:49:37 +0200 |
commit | 0d58172a97648bd6823b675fcd7df49be3729562 (patch) | |
tree | fa4d031538ffbf212f5aabbe89c95925f185499d /storage | |
parent | 753e9f322ee8a1dccd598c0dbab2c937e3c552cc (diff) |
Use enum class for storage::spi::Result::ErrorType.
Diffstat (limited to 'storage')
9 files changed, 31 insertions, 31 deletions
diff --git a/storage/src/tests/persistence/common/persistenceproviderwrapper.cpp b/storage/src/tests/persistence/common/persistenceproviderwrapper.cpp index c804354b0ee..05e51993f49 100644 --- a/storage/src/tests/persistence/common/persistenceproviderwrapper.cpp +++ b/storage/src/tests/persistence/common/persistenceproviderwrapper.cpp @@ -14,7 +14,7 @@ #define CHECK_ERROR(className, failType) \ { \ - if (_result.getErrorCode() != spi::Result::NONE && (_failureMask & (failType))) { \ + if (_result.getErrorCode() != spi::Result::ErrorType::NONE && (_failureMask & (failType))) { \ return className(_result.getErrorCode(), _result.getErrorMessage()); \ } \ } @@ -41,7 +41,7 @@ includedVersionsToString(spi::IncludedVersions versions) PersistenceProviderWrapper::PersistenceProviderWrapper(spi::PersistenceProvider& spi) : _spi(spi), - _result(spi::Result(spi::Result::NONE, "")), + _result(spi::Result(spi::Result::ErrorType::NONE, "")), _log(), _failureMask(0) { } diff --git a/storage/src/tests/persistence/common/persistenceproviderwrapper.h b/storage/src/tests/persistence/common/persistenceproviderwrapper.h index 1f0dc93c44c..511ced02118 100644 --- a/storage/src/tests/persistence/common/persistenceproviderwrapper.h +++ b/storage/src/tests/persistence/common/persistenceproviderwrapper.h @@ -65,7 +65,7 @@ public: _result = result; } void clearResult() { - _result = spi::Result(spi::Result::NONE, ""); + _result = spi::Result(spi::Result::ErrorType::NONE, ""); } const spi::Result& getResult() const { return _result; } /** diff --git a/storage/src/tests/persistence/mergehandlertest.cpp b/storage/src/tests/persistence/mergehandlertest.cpp index 8dedf3f18df..0b2baab5652 100644 --- a/storage/src/tests/persistence/mergehandlertest.cpp +++ b/storage/src/tests/persistence/mergehandlertest.cpp @@ -631,7 +631,7 @@ TEST_F(MergeHandlerTest, spi_flush_guard) { MergeHandler handler(providerWrapper, getEnv()); providerWrapper.setResult( - spi::Result(spi::Result::PERMANENT_ERROR, "who you gonna call?")); + spi::Result(spi::Result::ErrorType::PERMANENT_ERROR, "who you gonna call?")); setUpChain(MIDDLE); // Fail applying unrevertable remove @@ -826,7 +826,7 @@ TEST_F(MergeHandlerTest, merge_bucket_spi_failures) { PersistenceProviderWrapper providerWrapper(getPersistenceProvider()); MergeHandler handler(providerWrapper, getEnv()); providerWrapper.setResult( - spi::Result(spi::Result::PERMANENT_ERROR, "who you gonna call?")); + spi::Result(spi::Result::ErrorType::PERMANENT_ERROR, "who you gonna call?")); setUpChain(MIDDLE); ExpectedExceptionSpec exceptions[] = { @@ -858,7 +858,7 @@ TEST_F(MergeHandlerTest, get_bucket_diff_spi_failures) { PersistenceProviderWrapper providerWrapper(getPersistenceProvider()); MergeHandler handler(providerWrapper, getEnv()); providerWrapper.setResult( - spi::Result(spi::Result::PERMANENT_ERROR, "who you gonna call?")); + spi::Result(spi::Result::ErrorType::PERMANENT_ERROR, "who you gonna call?")); setUpChain(MIDDLE); ExpectedExceptionSpec exceptions[] = { @@ -893,7 +893,7 @@ TEST_F(MergeHandlerTest, apply_bucket_diff_spi_failures) { PersistenceProviderWrapper providerWrapper(getPersistenceProvider()); MergeHandler handler(providerWrapper, getEnv()); providerWrapper.setResult( - spi::Result(spi::Result::PERMANENT_ERROR, "who you gonna call?")); + spi::Result(spi::Result::ErrorType::PERMANENT_ERROR, "who you gonna call?")); setUpChain(MIDDLE); ExpectedExceptionSpec exceptions[] = { @@ -960,7 +960,7 @@ TEST_F(MergeHandlerTest, get_bucket_diff_reply_spi_failures) { PersistenceProviderWrapper providerWrapper(getPersistenceProvider()); MergeHandler handler(providerWrapper, getEnv()); providerWrapper.setResult( - spi::Result(spi::Result::PERMANENT_ERROR, "who you gonna call?")); + spi::Result(spi::Result::ErrorType::PERMANENT_ERROR, "who you gonna call?")); HandleGetBucketDiffReplyInvoker invoker; setUpChain(FRONT); @@ -1051,7 +1051,7 @@ TEST_F(MergeHandlerTest, apply_bucket_diff_reply_spi_failures) { invoker.setChainPos(pos); MergeHandler handler(providerWrapper, getEnv()); providerWrapper.setResult( - spi::Result(spi::Result::PERMANENT_ERROR, "who you gonna call?")); + spi::Result(spi::Result::ErrorType::PERMANENT_ERROR, "who you gonna call?")); ExpectedExceptionSpec exceptions[] = { { PersistenceProviderWrapper::FAIL_CREATE_ITERATOR, "create iterator" }, diff --git a/storage/src/tests/persistence/provider_error_wrapper_test.cpp b/storage/src/tests/persistence/provider_error_wrapper_test.cpp index 36238abb238..2ba5218003b 100644 --- a/storage/src/tests/persistence/provider_error_wrapper_test.cpp +++ b/storage/src/tests/persistence/provider_error_wrapper_test.cpp @@ -64,7 +64,7 @@ TEST_F(ProviderErrorWrapperTest, fatal_error_invokes_listener) { Fixture f(getPersistenceProvider()); auto listener = std::make_shared<MockErrorListener>(); f.errorWrapper.register_error_listener(listener); - f.providerWrapper.setResult(spi::Result(spi::Result::FATAL_ERROR, "eject! eject!")); + f.providerWrapper.setResult(spi::Result(spi::Result::ErrorType::FATAL_ERROR, "eject! eject!")); EXPECT_FALSE(listener->_seen_fatal_error); f.perform_spi_operation(); @@ -78,7 +78,7 @@ TEST_F(ProviderErrorWrapperTest, resource_exhaustion_error_invokes_listener) { Fixture f(getPersistenceProvider()); auto listener = std::make_shared<MockErrorListener>(); f.errorWrapper.register_error_listener(listener); - f.providerWrapper.setResult(spi::Result(spi::Result::RESOURCE_EXHAUSTED, "out of juice")); + f.providerWrapper.setResult(spi::Result(spi::Result::ErrorType::RESOURCE_EXHAUSTED, "out of juice")); EXPECT_FALSE(listener->_seen_resource_exhaustion_error); f.perform_spi_operation(); @@ -103,8 +103,8 @@ TEST_F(ProviderErrorWrapperTest, listener_not_invoked_on_regular_errors) { auto listener = std::make_shared<MockErrorListener>(); f.errorWrapper.register_error_listener(listener); - EXPECT_NO_FATAL_FAILURE(f.check_no_listener_invoked_for_error(*listener, spi::Result::TRANSIENT_ERROR)); - EXPECT_NO_FATAL_FAILURE(f.check_no_listener_invoked_for_error(*listener, spi::Result::PERMANENT_ERROR)); + EXPECT_NO_FATAL_FAILURE(f.check_no_listener_invoked_for_error(*listener, spi::Result::ErrorType::TRANSIENT_ERROR)); + EXPECT_NO_FATAL_FAILURE(f.check_no_listener_invoked_for_error(*listener, spi::Result::ErrorType::PERMANENT_ERROR)); } TEST_F(ProviderErrorWrapperTest, multiple_listeners_can_be_registered) { @@ -114,7 +114,7 @@ TEST_F(ProviderErrorWrapperTest, multiple_listeners_can_be_registered) { f.errorWrapper.register_error_listener(listener1); f.errorWrapper.register_error_listener(listener2); - f.providerWrapper.setResult(spi::Result(spi::Result::RESOURCE_EXHAUSTED, "out of juice")); + f.providerWrapper.setResult(spi::Result(spi::Result::ErrorType::RESOURCE_EXHAUSTED, "out of juice")); f.perform_spi_operation(); EXPECT_TRUE(listener1->_seen_resource_exhaustion_error); diff --git a/storage/src/vespa/storage/persistence/bucketprocessor.cpp b/storage/src/vespa/storage/persistence/bucketprocessor.cpp index c512cdd461a..d4a570ee062 100644 --- a/storage/src/vespa/storage/persistence/bucketprocessor.cpp +++ b/storage/src/vespa/storage/persistence/bucketprocessor.cpp @@ -52,7 +52,7 @@ BucketProcessor::iterateAll(spi::PersistenceProvider& provider, versions, context)); - if (createIterResult.getErrorCode() != spi::Result::NONE) { + if (createIterResult.getErrorCode() != spi::Result::ErrorType::NONE) { vespalib::asciistream ss; ss << "Failed to create iterator: " << createIterResult.getErrorMessage(); @@ -65,7 +65,7 @@ BucketProcessor::iterateAll(spi::PersistenceProvider& provider, while (true) { spi::IterateResult result( provider.iterate(iteratorId, UINT64_MAX, context)); - if (result.getErrorCode() != spi::Result::NONE) { + if (result.getErrorCode() != spi::Result::ErrorType::NONE) { vespalib::asciistream ss; ss << "Failed: " << result.getErrorMessage(); throw std::runtime_error(ss.str()); diff --git a/storage/src/vespa/storage/persistence/mergehandler.cpp b/storage/src/vespa/storage/persistence/mergehandler.cpp index f5d7bc57354..37e1d818bb8 100644 --- a/storage/src/vespa/storage/persistence/mergehandler.cpp +++ b/storage/src/vespa/storage/persistence/mergehandler.cpp @@ -169,7 +169,7 @@ MergeHandler::populateMetaData( spi::ALL_VERSIONS, context)); - if (createIterResult.getErrorCode() != spi::Result::NONE) { + if (createIterResult.getErrorCode() != spi::Result::ErrorType::NONE) { std::ostringstream ss; ss << "Failed to create iterator for " << bucket @@ -183,7 +183,7 @@ MergeHandler::populateMetaData( while (true) { spi::IterateResult result( _spi.iterate(iteratorId, UINT64_MAX, context)); - if (result.getErrorCode() != spi::Result::NONE) { + if (result.getErrorCode() != spi::Result::ErrorType::NONE) { std::ostringstream ss; ss << "Failed to iterate for " << bucket @@ -226,7 +226,7 @@ MergeHandler::buildBucketInfoList( if (entry.exist()) { spi::BucketInfoResult infoResult(_spi.getBucketInfo(bucket)); - if (infoResult.getErrorCode() != spi::Result::NONE) { + if (infoResult.getErrorCode() != spi::Result::ErrorType::NONE) { std::ostringstream ss; ss << "Failed to get bucket info for " << bucket << ": " @@ -432,7 +432,7 @@ MergeHandler::fetchLocalData( spi::NEWEST_DOCUMENT_OR_REMOVE, context)); - if (createIterResult.getErrorCode() != spi::Result::NONE) { + if (createIterResult.getErrorCode() != spi::Result::ErrorType::NONE) { std::ostringstream ss; ss << "Failed to create iterator for " << bucket.toString() @@ -451,7 +451,7 @@ MergeHandler::fetchLocalData( while (true) { spi::IterateResult result( _spi.iterate(iteratorId, remainingSize, context)); - if (result.getErrorCode() != spi::Result::NONE) { + if (result.getErrorCode() != spi::Result::ErrorType::NONE) { std::ostringstream ss; ss << "Failed to iterate for " << bucket.toString() @@ -712,7 +712,7 @@ MergeHandler::applyDiffLocally( flushGuard.flush(); spi::BucketInfoResult infoResult(_spi.getBucketInfo(bucket)); - if (infoResult.getErrorCode() != spi::Result::NONE) { + if (infoResult.getErrorCode() != spi::Result::ErrorType::NONE) { LOG(warning, "Failed to get bucket info for %s: %s", bucket.toString().c_str(), infoResult.getErrorMessage().c_str()); diff --git a/storage/src/vespa/storage/persistence/persistenceutil.cpp b/storage/src/vespa/storage/persistence/persistenceutil.cpp index 4bee5df4d04..9cea0e6c5d7 100644 --- a/storage/src/vespa/storage/persistence/persistenceutil.cpp +++ b/storage/src/vespa/storage/persistence/persistenceutil.cpp @@ -182,16 +182,16 @@ uint32_t PersistenceUtil::convertErrorCode(const spi::Result& response) { switch (response.getErrorCode()) { - case spi::Result::NONE: + case spi::Result::ErrorType::NONE: return 0; - case spi::Result::TIMESTAMP_EXISTS: + case spi::Result::ErrorType::TIMESTAMP_EXISTS: return api::ReturnCode::TIMESTAMP_EXIST; - case spi::Result::TRANSIENT_ERROR: - case spi::Result::FATAL_ERROR: + case spi::Result::ErrorType::TRANSIENT_ERROR: + case spi::Result::ErrorType::FATAL_ERROR: return mbus::ErrorCode::APP_TRANSIENT_ERROR; - case spi::Result::RESOURCE_EXHAUSTED: + case spi::Result::ErrorType::RESOURCE_EXHAUSTED: return api::ReturnCode::NO_SPACE; - case spi::Result::PERMANENT_ERROR: + case spi::Result::ErrorType::PERMANENT_ERROR: default: return mbus::ErrorCode::APP_FATAL_ERROR; } diff --git a/storage/src/vespa/storage/persistence/processallhandler.cpp b/storage/src/vespa/storage/persistence/processallhandler.cpp index 51ef67dc7ac..7cb373279a6 100644 --- a/storage/src/vespa/storage/persistence/processallhandler.cpp +++ b/storage/src/vespa/storage/persistence/processallhandler.cpp @@ -39,7 +39,7 @@ public: *entry.getDocumentId(), _context); - if (removeResult.getErrorCode() != spi::Result::NONE) { + if (removeResult.getErrorCode() != spi::Result::ErrorType::NONE) { std::ostringstream ss; ss << "Failed to do remove for removelocation: " << removeResult.getErrorMessage(); diff --git a/storage/src/vespa/storage/persistence/provider_error_wrapper.cpp b/storage/src/vespa/storage/persistence/provider_error_wrapper.cpp index 056561e8e21..fe947bff4d5 100644 --- a/storage/src/vespa/storage/persistence/provider_error_wrapper.cpp +++ b/storage/src/vespa/storage/persistence/provider_error_wrapper.cpp @@ -9,9 +9,9 @@ template <typename ResultType> ResultType ProviderErrorWrapper::checkResult(ResultType&& result) const { - if (result.getErrorCode() == spi::Result::FATAL_ERROR) { + if (result.getErrorCode() == spi::Result::ErrorType::FATAL_ERROR) { trigger_shutdown_listeners(result.getErrorMessage()); - } else if (result.getErrorCode() == spi::Result::RESOURCE_EXHAUSTED) { + } else if (result.getErrorCode() == spi::Result::ErrorType::RESOURCE_EXHAUSTED) { trigger_resource_exhaustion_listeners(result.getErrorMessage()); } return std::forward<ResultType>(result); |