diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-06 20:47:39 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-07 09:50:24 +0200 |
| commit | 0b37a1b9eecf9b38310bde4a11c01a7962234450 (patch) | |
| tree | 1f6b1836d69fe2e72d800397167f5b5ff02ed90a /storage | |
| parent | a9ba7645226f200148de44a19aff204dd0841493 (diff) | |
Hide BucketId::List
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/vespa/storage/distributor/operationtargetresolverimpl.cpp | 7 | ||||
| -rw-r--r-- | storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/storage/src/vespa/storage/distributor/operationtargetresolverimpl.cpp b/storage/src/vespa/storage/distributor/operationtargetresolverimpl.cpp index fba6b131e09..6f331e23e2c 100644 --- a/storage/src/vespa/storage/distributor/operationtargetresolverimpl.cpp +++ b/storage/src/vespa/storage/distributor/operationtargetresolverimpl.cpp @@ -4,9 +4,9 @@ #include <vespa/vespalib/util/exceptions.h> #include <vespa/vespalib/util/printable.hpp> #include <sstream> +#include <cassert> -namespace storage { -namespace distributor { +namespace storage::distributor { BucketInstance::BucketInstance( const document::BucketId& id, const api::BucketInfo& info, @@ -197,5 +197,4 @@ OperationTargetResolverImpl::getAllInstances(OperationType type, return instances; } -} // distributor -} // storage +} diff --git a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h index 5e45e846337..51bdb94188e 100644 --- a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h +++ b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h @@ -1,13 +1,13 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <memory> #include <vespa/storage/common/storagecomponent.h> #include <vespa/storage/common/servicelayercomponent.h> #include <vespa/storage/common/storagelink.h> #include <vespa/storage/config/config-stor-server.h> #include <vespa/storage/persistence/messages.h> #include <vespa/storage/persistence/types.h> +#include <vespa/document/bucket/bucketidlist.h> #include <vespa/vespalib/util/sync.h> #include <vespa/config/config.h> @@ -60,7 +60,7 @@ private: config::ConfigFetcher _configFetcher; vespalib::Monitor _monitor; vespalib::Lock _stateLock; - document::BucketId::List _rechecksNotStarted; + document::bucket::BucketIdList _rechecksNotStarted; size_t _pendingRequests; size_t _maxPendingChunkSize; bool _singleThreadMode; // For unit testing only |