summaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-08-25 12:29:20 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-08-25 12:29:20 +0000
commit27444d9fb3334411c033a135f7e9dffccb2087e7 (patch)
tree3172a62d54db8c0d35f77d817a913f99d26e7765 /searchlib
parent3416fd10a13080811f32765eb3f9b3857d3d8670 (diff)
Make it compile
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/vespa/searchlib/docstore/storebybucket.cpp8
-rw-r--r--searchlib/src/vespa/searchlib/docstore/storebybucket.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/searchlib/src/vespa/searchlib/docstore/storebybucket.cpp b/searchlib/src/vespa/searchlib/docstore/storebybucket.cpp
index 85eccb6b728..25ef968ba14 100644
--- a/searchlib/src/vespa/searchlib/docstore/storebybucket.cpp
+++ b/searchlib/src/vespa/searchlib/docstore/storebybucket.cpp
@@ -18,8 +18,8 @@ StoreByBucket::StoreByBucket(MemoryDataStore & backingMemory, ThreadExecutor & e
_where(),
_backingMemory(backingMemory),
_executor(executor),
- _lock(),
- _allInFlight(false),
+ _monitor(),
+ _inFlight(0),
_chunks(),
_compression(compression)
{
@@ -34,7 +34,7 @@ StoreByBucket::add(BucketId bucketId, uint32_t chunkId, uint32_t lid, const void
if ( ! _current->hasRoom(sz)) {
Chunk::UP tmpChunk = createChunk();
_current.swap(tmpChunk);
- _inflight
+ incInFlight();
_executor.execute(makeTask(makeClosure(this, &StoreByBucket::closeChunk, std::move(tmpChunk))));
}
Index idx(bucketId, _current->getId(), chunkId, lid);
@@ -50,7 +50,7 @@ StoreByBucket::createChunk()
size_t
StoreByBucket::getChunkCount() const {
- vespalib::LockGuard guard(_lock);
+ vespalib::LockGuard guard(_monitor);
return _chunks.size();
}
diff --git a/searchlib/src/vespa/searchlib/docstore/storebybucket.h b/searchlib/src/vespa/searchlib/docstore/storebybucket.h
index ed37f05500a..2cad67f2194 100644
--- a/searchlib/src/vespa/searchlib/docstore/storebybucket.h
+++ b/searchlib/src/vespa/searchlib/docstore/storebybucket.h
@@ -70,7 +70,7 @@ private:
MemoryDataStore & _backingMemory;
ThreadExecutor & _executor;
vespalib::Monitor _monitor;
- int64_t _inFlight;
+ size_t _inFlight;
vespalib::hash_map<uint64_t, ConstBufferRef> _chunks;
CompressionConfig _compression;
};