diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-08-21 09:44:32 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-08-21 09:44:32 +0000 |
| commit | 8aa115bbd4ce57d0391c21f4ed1854e78b86cf7e (patch) | |
| tree | 0ee9abaac5170921ed9d341c7acfd4687b44f80a /storage | |
| parent | 6c6203e47bcca5309f0865c7e6c02855c6224a1c (diff) | |
Improve error message, and use 'using' to simplify code.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/vespa/storage/persistence/persistencethread.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/storage/src/vespa/storage/persistence/persistencethread.cpp b/storage/src/vespa/storage/persistence/persistencethread.cpp index 223e2858203..a39abc7fa58 100644 --- a/storage/src/vespa/storage/persistence/persistencethread.cpp +++ b/storage/src/vespa/storage/persistence/persistencethread.cpp @@ -16,7 +16,8 @@ #include <vespa/log/log.h> LOG_SETUP(".persistence.thread"); -using vespalib::make_string; +using vespalib::make_string_short::fmt; +using to_str = vespalib::string; namespace storage { @@ -286,12 +287,10 @@ getFieldSet(const document::FieldSetRepo & repo, vespalib::stringref name, Messa return repo.getFieldSet(name); } catch (document::FieldNotFoundException & e) { tracker.fail(storage::api::ReturnCode::ILLEGAL_PARAMETERS, - make_string("Field %s not found in fieldset %s", - e.getFieldName().c_str(), vespalib::string(name).c_str())); + fmt("Field %s in fieldset %s not found in document", e.getFieldName().c_str(), to_str(name).c_str())); } catch (const vespalib::Exception & e) { tracker.fail(storage::api::ReturnCode::ILLEGAL_PARAMETERS, - make_string("Failed parsing fieldset %s with : %s", - vespalib::string(name).c_str(), e.getMessage().c_str())); + fmt("Failed parsing fieldset %s with : %s", to_str(name).c_str(), e.getMessage().c_str())); } return document::FieldSet::SP(); } @@ -537,9 +536,7 @@ PersistenceThread::handleSplitBucket(api::SplitBucketCommand& cmd, MessageTracke #ifdef ENABLE_BUCKET_OPERATION_LOGGING { - vespalib::string desc( - vespalib::make_string( - "split(%s -> %s, %s)", + auto desc = fmt("split(%s -> %s, %s)", cmd.getBucketId().toString().c_str(), target1.getBucketId().toString().c_str(), target2.getBucketId().toString().c_str())); @@ -686,12 +683,10 @@ PersistenceThread::handleJoinBuckets(api::JoinBucketsCommand& cmd, MessageTracke #ifdef ENABLE_BUCKET_OPERATION_LOGGING { - vespalib::string desc( - vespalib::make_string( - "join(%s, %s -> %s)", + auto desc = fmt("join(%s, %s -> %s)", firstBucket.getBucketId().toString().c_str(), secondBucket.getBucketId().toString().c_str(), - cmd.getBucketId().toString().c_str())); + cmd.getBucketId().toString().c_str()); LOG_BUCKET_OPERATION(cmd.getBucketId(), desc); LOG_BUCKET_OPERATION(firstBucket.getBucketId(), desc); if (firstBucket != secondBucket) { |