diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2020-11-17 18:03:00 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-11-17 18:03:00 +0100 |
commit | 9e8a8bd941009ff4e11edddd5004284db13a2127 (patch) | |
tree | cf90d0d32dec2e38a8fdcf73e2cc554fbd7d38a2 /searchcore | |
parent | da4dee87d3cc7ee29ff7aeca757ee95edfdb3f2c (diff) |
Use snake case: incSerialNum() ==> inc_serial_num()
Diffstat (limited to 'searchcore')
8 files changed, 9 insertions, 9 deletions
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp index 1d8b85864f6..04258b3989f 100644 --- a/searchcore/src/tests/proton/docsummary/docsummary.cpp +++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp @@ -244,7 +244,7 @@ public: PutRes putRes(dms.put(docId.getGlobalId(), BucketFactory::getBucketId(docId), Timestamp(0u), docSize, lid, 0u)); LOG_ASSERT(putRes.ok()); - uint64_t serialNum = _ddb->getFeedHandler().incSerialNum(); + uint64_t serialNum = _ddb->getFeedHandler().inc_serial_num(); _aw->put(serialNum, doc, lid, std::shared_ptr<IDestructorCallback>()); _aw->forceCommit(serialNum, std::shared_ptr<IDestructorCallback>()); _ddb->getReadySubDB()->getAttributeManager()->getAttributeFieldWriter().sync(); diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp index 6f0a8f0758c..6bcdea95a5a 100644 --- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp +++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp @@ -228,7 +228,7 @@ public: void setSubDBs(const std::vector<MyDocumentSubDB *> &subDBs); - SerialNum incSerialNum() { + SerialNum inc_serial_num() { return ++_serialNum; } @@ -736,7 +736,7 @@ MyFeedHandler::setSubDBs(const std::vector<MyDocumentSubDB *> &subDBs) void MyFeedHandler::appendOperation(const FeedOperation &op, DoneCallback) { - const_cast<FeedOperation &>(op).setSerialNum(incSerialNum()); + const_cast<FeedOperation &>(op).setSerialNum(inc_serial_num()); } diff --git a/searchcore/src/tests/proton/server/feedstates_test.cpp b/searchcore/src/tests/proton/server/feedstates_test.cpp index d45612cbcaf..4d4056de81d 100644 --- a/searchcore/src/tests/proton/server/feedstates_test.cpp +++ b/searchcore/src/tests/proton/server/feedstates_test.cpp @@ -59,7 +59,7 @@ struct MyIncSerialNum : IIncSerialNum { : _serial_num(serial_num) { } - SerialNum incSerialNum() override { return ++_serial_num; } + SerialNum inc_serial_num() override { return ++_serial_num; } }; struct Fixture diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp index c76a7270ab2..c7b5aaafbfc 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp @@ -431,7 +431,7 @@ DocumentDB::applyConfig(DocumentDBConfig::SP configSnapshot, SerialNum serialNum FeedHandler::CommitResult commit_result; if (!equalReplayConfig && tlsReplayDone) { sync(_feedHandler->getSerialNum()); - serialNum = _feedHandler->incSerialNum(); + serialNum = _feedHandler->inc_serial_num(); _config_store->saveConfig(*configSnapshot, serialNum); // save entry in transaction log NewConfigOperation op(serialNum, *_config_store); diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp index 88f785a58df..441b1745616 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp @@ -552,7 +552,7 @@ FeedHandler::initiateCommit() { void FeedHandler::appendOperation(const FeedOperation &op, TlsWriter::DoneCallback onDone) { if (!op.getSerialNum()) { - const_cast<FeedOperation &>(op).setSerialNum(incSerialNum()); + const_cast<FeedOperation &>(op).setSerialNum(inc_serial_num()); } _tlsWriter->appendOperation(op, std::move(onDone)); if (++_numOperationsPendingCommit == 1) { diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.h b/searchcore/src/vespa/searchcore/proton/server/feedhandler.h index 777b8a0c81d..88bd818bf32 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.h +++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.h @@ -212,7 +212,7 @@ public: } void setSerialNum(SerialNum serialNum) { _serialNum = serialNum; } - SerialNum incSerialNum() override { return ++_serialNum; } + SerialNum inc_serial_num() override { return ++_serialNum; } SerialNum getSerialNum() const override { return _serialNum; } // The two following methods are used when saving initial config SerialNum get_replay_end_serial_num() const { return _replay_end_serial_num; } diff --git a/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp b/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp index 7ab7b95ae24..93bbf709ca2 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp @@ -131,7 +131,7 @@ public: return *_feed_view_ptr->getDocumentTypeRepo(); } void check_serial_num(search::SerialNum serial_num) override { - auto exp_serial_num = _inc_serial_num.incSerialNum(); + auto exp_serial_num = _inc_serial_num.inc_serial_num(); if (exp_serial_num != serial_num) { LOG(warning, "Expected replay serial number %" PRIu64 ", got serial number %" PRIu64, exp_serial_num, serial_num); assert(exp_serial_num == serial_num); diff --git a/searchcore/src/vespa/searchcore/proton/server/i_inc_serial_num.h b/searchcore/src/vespa/searchcore/proton/server/i_inc_serial_num.h index 64afcf49f94..d0832350fe0 100644 --- a/searchcore/src/vespa/searchcore/proton/server/i_inc_serial_num.h +++ b/searchcore/src/vespa/searchcore/proton/server/i_inc_serial_num.h @@ -13,7 +13,7 @@ namespace proton { class IIncSerialNum { public: virtual ~IIncSerialNum() = default; - virtual search::SerialNum incSerialNum() = 0; + virtual search::SerialNum inc_serial_num() = 0; }; } |