diff options
| -rw-r--r-- | persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp | 6 | ||||
| -rw-r--r-- | storage/src/vespa/storage/distributor/externaloperationhandler.cpp | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp b/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp index d3e765d3d56..2e929832718 100644 --- a/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp +++ b/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp @@ -27,16 +27,14 @@ DummyBucketExecutor::execute(const Bucket & bucket, std::unique_ptr<BucketTask> auto failed = _executor->execute(makeLambdaTask([this, bucket, bucketTask=std::move(task)]() { { std::unique_lock guard(_lock); - // Use contains when dropping support for gcc 8. - while (_inFlight.count(bucket.getBucket()) != 0) { + while (_inFlight.contains(bucket.getBucket())) { _cond.wait(guard); } _inFlight.insert(bucket.getBucket()); } bucketTask->run(bucket, makeLambdaCallback([this, bucket]() { std::unique_lock guard(_lock); - // Use contains when dropping support for gcc 8. - assert(_inFlight.count(bucket.getBucket()) != 0); + assert(_inFlight.contains(bucket.getBucket())); _inFlight.erase(bucket.getBucket()); _cond.notify_all(); })); diff --git a/storage/src/vespa/storage/distributor/externaloperationhandler.cpp b/storage/src/vespa/storage/distributor/externaloperationhandler.cpp index ebca3574eac..81201ff5469 100644 --- a/storage/src/vespa/storage/distributor/externaloperationhandler.cpp +++ b/storage/src/vespa/storage/distributor/externaloperationhandler.cpp @@ -274,9 +274,7 @@ namespace { bool put_is_from_reindexing_visitor(const api::PutCommand& cmd) { const auto& tas_cond = cmd.getCondition(); - const char* prefix = reindexing_bucket_lock_bypass_prefix(); - // Use starts_with when dropping support for gcc 8. - return (tas_cond.isPresent() && (tas_cond.getSelection().substr(0, strlen(prefix)) == prefix)); + return (tas_cond.isPresent() && (tas_cond.getSelection().starts_with(reindexing_bucket_lock_bypass_prefix()))); } // Precondition: put_is_from_reindexing_visitor(cmd) == true |