diff options
author | Geir Storli <geirst@yahoo-inc.com> | 2016-06-17 13:17:10 +0200 |
---|---|---|
committer | Geir Storli <geirst@yahoo-inc.com> | 2016-06-17 13:17:10 +0200 |
commit | 20336701552da34ebf7d3d90e5da9bf2d89d185c (patch) | |
tree | 2c32d1da20ece97b5aeb0f401fd8f140a40ba86e | |
parent | 1934e961b908c85415650117a8b9024afaf6dfa6 (diff) |
Rename count -> numEntries.
4 files changed, 20 insertions, 20 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp index 606312fcae2..5ccbbb0f5b5 100644 --- a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp +++ b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp @@ -19,7 +19,7 @@ TransLogServerMetrics::DomainMetrics::DomainMetrics(metrics::MetricSet *parent, void TransLogServerMetrics::DomainMetrics::update(const DomainInfo &stats) { - entries.set(stats.count); + entries.set(stats.numEntries); } void diff --git a/searchlib/src/tests/transactionlog/translogclient_test.cpp b/searchlib/src/tests/transactionlog/translogclient_test.cpp index 775654d23fc..2e756e9d4b8 100644 --- a/searchlib/src/tests/transactionlog/translogclient_test.cpp +++ b/searchlib/src/tests/transactionlog/translogclient_test.cpp @@ -715,7 +715,7 @@ void Test::testErase() "count %zu, numBytes %zu", partId, (uint64_t) part.range.from(), (uint64_t) part.range.to(), - part.count, part.byteSize); + part.numEntries, part.byteSize); } ASSERT_LESS_EQUAL(2u, numParts); // Erase everything before second to last domainpart file @@ -726,8 +726,8 @@ void Test::testErase() TOTAL_NUM_ENTRIES + 1 - eraseSerial, TOTAL_NUM_ENTRIES - eraseSerial)); TEST_DO(assertStatus(*s1, eraseSerial, TOTAL_NUM_ENTRIES, - domainInfo.parts[numParts - 2].count + - domainInfo.parts[numParts - 1].count)); + domainInfo.parts[numParts - 2].numEntries + + domainInfo.parts[numParts - 1].numEntries)); // No apparent effect of erasing just first entry in 2nd to last part s1->erase(eraseSerial + 1); TEST_DO(assertVisitStats(tls, "erase", 2, TOTAL_NUM_ENTRIES, @@ -735,8 +735,8 @@ void Test::testErase() TOTAL_NUM_ENTRIES + 1 - eraseSerial, TOTAL_NUM_ENTRIES - eraseSerial)); TEST_DO(assertStatus(*s1, eraseSerial + 1, TOTAL_NUM_ENTRIES, - domainInfo.parts[numParts - 2].count + - domainInfo.parts[numParts - 1].count)); + domainInfo.parts[numParts - 2].numEntries + + domainInfo.parts[numParts - 1].numEntries)); // No apparent effect of erasing almost all of 2nd to last part SerialNum eraseSerial2 = domainInfo.parts[numParts - 2].range.to(); s1->erase(eraseSerial2); @@ -745,8 +745,8 @@ void Test::testErase() TOTAL_NUM_ENTRIES + 1 - eraseSerial, TOTAL_NUM_ENTRIES - eraseSerial)); TEST_DO(assertStatus(*s1, eraseSerial2, TOTAL_NUM_ENTRIES, - domainInfo.parts[numParts - 2].count + - domainInfo.parts[numParts - 1].count)); + domainInfo.parts[numParts - 2].numEntries + + domainInfo.parts[numParts - 1].numEntries)); // Erase everything before last domainpart file eraseSerial = domainInfo.parts[numParts - 1].range.from(); s1->erase(eraseSerial); @@ -755,7 +755,7 @@ void Test::testErase() TOTAL_NUM_ENTRIES + 1 - eraseSerial, TOTAL_NUM_ENTRIES - eraseSerial)); TEST_DO(assertStatus(*s1, eraseSerial, TOTAL_NUM_ENTRIES, - domainInfo.parts[numParts - 1].count)); + domainInfo.parts[numParts - 1].numEntries)); // No apparent effect of erasing just first entry in last part s1->erase(eraseSerial + 1); TEST_DO(assertVisitStats(tls, "erase", 2, TOTAL_NUM_ENTRIES, @@ -763,7 +763,7 @@ void Test::testErase() TOTAL_NUM_ENTRIES + 1 - eraseSerial, TOTAL_NUM_ENTRIES - eraseSerial)); TEST_DO(assertStatus(*s1, eraseSerial + 1, TOTAL_NUM_ENTRIES, - domainInfo.parts[numParts - 1].count)); + domainInfo.parts[numParts - 1].numEntries)); // No apparent effect of erasing almost all of last part eraseSerial2 = domainInfo.parts[numParts - 1].range.to(); s1->erase(eraseSerial2); @@ -772,7 +772,7 @@ void Test::testErase() TOTAL_NUM_ENTRIES + 1 - eraseSerial, TOTAL_NUM_ENTRIES - eraseSerial)); TEST_DO(assertStatus(*s1, eraseSerial2, TOTAL_NUM_ENTRIES, - domainInfo.parts[numParts - 1].count)); + domainInfo.parts[numParts - 1].numEntries)); } } diff --git a/searchlib/src/vespa/searchlib/transactionlog/domain.h b/searchlib/src/vespa/searchlib/transactionlog/domain.h index 6309d7113f1..d00651bd438 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/domain.h +++ b/searchlib/src/vespa/searchlib/transactionlog/domain.h @@ -10,25 +10,25 @@ namespace transactionlog { struct PartInfo { SerialNumRange range; - size_t count; + size_t numEntries; size_t byteSize; vespalib::string file; - PartInfo(SerialNumRange range_in, size_t count_in, + PartInfo(SerialNumRange range_in, size_t numEntries_in, size_t byteSize_in, vespalib::stringref file_in) - : range(range_in), count(count_in), byteSize(byteSize_in), + : range(range_in), numEntries(numEntries_in), byteSize(byteSize_in), file(file_in) {} }; struct DomainInfo { SerialNumRange range; - size_t count; + size_t numEntries; size_t byteSize; std::vector<PartInfo> parts; - DomainInfo(SerialNumRange range_in, size_t count_in, size_t byteSize_in) - : range(range_in), count(count_in), byteSize(byteSize_in), parts() {} + DomainInfo(SerialNumRange range_in, size_t numEntries_in, size_t byteSize_in) + : range(range_in), numEntries(numEntries_in), byteSize(byteSize_in), parts() {} DomainInfo() - : range(), count(0), byteSize(0), parts() {} + : range(), numEntries(0), byteSize(0), parts() {} }; typedef std::map<vespalib::string, DomainInfo> DomainStats; diff --git a/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp b/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp index 49c16940be5..fdc771a7b58 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp +++ b/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp @@ -21,7 +21,7 @@ struct DomainExplorer : vespalib::StateExplorer { DomainInfo info = domain->getDomainInfo(); state.setLong("from", info.range.from()); state.setLong("to", info.range.to()); - state.setLong("count", info.count); + state.setLong("numEntries", info.numEntries); state.setLong("byteSize", info.byteSize); if (full) { Cursor &array = state.setArray("parts"); @@ -29,7 +29,7 @@ struct DomainExplorer : vespalib::StateExplorer { Cursor &part = array.addObject(); part.setLong("from", part_in.range.from()); part.setLong("to", part_in.range.to()); - part.setLong("count", part_in.count); + part.setLong("numEntries", part_in.numEntries); part.setLong("byteSize", part_in.byteSize); part.setString("file", part_in.file); { |