aboutsummaryrefslogtreecommitdiffstats
path: root/searchlib/src
diff options
context:
space:
mode:
authorGeir Storli <geirst@yahoo-inc.com>2016-06-17 13:17:54 +0200
committerGeir Storli <geirst@yahoo-inc.com>2016-06-17 13:17:54 +0200
commit5ace8c7e66f09ce4d54ec8b9a73b4c9525e96800 (patch)
tree7195c31943500e23f4b43fbb940cc50e08d36f19 /searchlib/src
parent5e5a3b090ff6ef260162055ea75534d0f927c5ef (diff)
Remove count that was wrong and misleading.
Diffstat (limited to 'searchlib/src')
-rw-r--r--searchlib/src/vespa/searchlib/transactionlog/domain.cpp6
-rw-r--r--searchlib/src/vespa/searchlib/transactionlog/domain.h2
-rw-r--r--searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp1
3 files changed, 0 insertions, 9 deletions
diff --git a/searchlib/src/vespa/searchlib/transactionlog/domain.cpp b/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
index 0a6c9107856..9faa80a76b9 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
@@ -38,7 +38,6 @@ Domain::Domain(const string &domainName,
const FileHeaderContext &fileHeaderContext) :
_defaultCrcType(defaultCrcType),
_executor(executor),
- _count(0),
_sessionId(1),
_useFsync(useFsync),
_syncMonitor(),
@@ -83,7 +82,6 @@ void Domain::addPart(int64_t partId, bool isLastPart) {
} else {
{
LockGuard guard(_lock);
- _count += dp->size();
_parts[partId] = dp;
}
if (! isLastPart) {
@@ -272,12 +270,8 @@ void Domain::commit(const Packet & packet)
}
dp = _parts.rbegin()->second;
}
- size_t oldSz(dp->size());
dp->commit(entry.serial(), packet);
cleanSessions();
- // If commit fails no updates should be sent to subscribers either.
- // Is is better to keep a consistent behaviour.
- _count += dp->size() - oldSz;
LockGuard guard(_sessionLock);
for (auto & it : _sessions) {
diff --git a/searchlib/src/vespa/searchlib/transactionlog/domain.h b/searchlib/src/vespa/searchlib/transactionlog/domain.h
index d00651bd438..d6dbde6b06e 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domain.h
+++ b/searchlib/src/vespa/searchlib/transactionlog/domain.h
@@ -69,7 +69,6 @@ public:
bool getMarkedDeleted(void) const { return _markedDeleted; }
void markDeleted(void) { _markedDeleted = true; }
- uint64_t count() const { return _count; }
size_t byteSize() const;
size_t getNumSessions() const { return _sessions.size(); }
@@ -103,7 +102,6 @@ private:
DomainPart::Crc _defaultCrcType;
Executor & _executor;
- uint64_t _count;
int _sessionId;
const bool _useFsync;
vespalib::Monitor _syncMonitor;
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
index 79b7413c1b4..b9a9ea57a9e 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
@@ -219,7 +219,6 @@ void TransLogServer::logMetric() const
EV_COUNT((prefix + "last").c_str(), it->second->end());
EV_COUNT((prefix + "first").c_str(), it->second->begin());
EV_VALUE((prefix + "numused").c_str(), it->second->size());
- EV_COUNT((prefix + "count").c_str(), it->second->count());
}
}