From 2c71f1898f7ac4fd54f3b018f77a33a7c4f0912c Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Mon, 1 Jul 2019 16:02:32 +0200
Subject: [PATCH] start updating producer
---
common/cpp/include/database/database.h | 5 +++--
common/cpp/include/unittests/MockDatabase.h | 6 +++---
common/cpp/src/database/mongodb_client.h | 3 ++-
receiver/src/request_handler_db_write.cpp | 2 +-
receiver/unittests/receiver_mocking.h | 2 +-
receiver/unittests/test_request_handler_db_writer.cpp | 6 +++---
6 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/common/cpp/include/database/database.h b/common/cpp/include/database/database.h
index 38e295030..04979a761 100644
--- a/common/cpp/include/database/database.h
+++ b/common/cpp/include/database/database.h
@@ -18,9 +18,10 @@ class Database {
const std::string& collection ) = 0;
virtual Error Insert(const FileInfo& file, bool ignore_duplicates) const = 0;
virtual Error Upsert(uint64_t id, const uint8_t* data, uint64_t size) const = 0;
- virtual Error InsertAsSubset(const FileInfo& file, uint64_t subset_id,uint64_t subset_size, bool ignore_duplicates) const = 0;
+ virtual Error InsertAsSubset(const FileInfo& file, uint64_t subset_id, uint64_t subset_size,
+ bool ignore_duplicates) const = 0;
- virtual ~Database() = default;
+ virtual ~Database() = default;
};
class DatabaseFactory {
diff --git a/common/cpp/include/unittests/MockDatabase.h b/common/cpp/include/unittests/MockDatabase.h
index c8e740dda..94c611d5f 100644
--- a/common/cpp/include/unittests/MockDatabase.h
+++ b/common/cpp/include/unittests/MockDatabase.h
@@ -21,8 +21,8 @@ class MockDatabase : public Database {
}
Error InsertAsSubset(const FileInfo& file, uint64_t subset_id,
- uint64_t subset_size, bool ignore_duplicates) const override {
- return Error{Insert_t(file, ignore_duplicates)};
+ uint64_t subset_size, bool ignore_duplicates) const override {
+ return Error{InsertAsSubset_t(file, subset_id, subset_size, ignore_duplicates)};
}
@@ -30,7 +30,7 @@ class MockDatabase : public Database {
MOCK_CONST_METHOD2(Insert_t, ErrorInterface * (const FileInfo&, bool));
- MOCK_CONST_METHOD4(InsertAsSubset_t, ErrorInterface * (const FileInfo&,uint64_t,uint64_t, bool));
+ MOCK_CONST_METHOD4(InsertAsSubset_t, ErrorInterface * (const FileInfo&, uint64_t, uint64_t, bool));
Error Upsert(uint64_t id, const uint8_t* data, uint64_t size) const override {
diff --git a/common/cpp/src/database/mongodb_client.h b/common/cpp/src/database/mongodb_client.h
index 69720778e..82266de6e 100644
--- a/common/cpp/src/database/mongodb_client.h
+++ b/common/cpp/src/database/mongodb_client.h
@@ -39,7 +39,8 @@ class MongoDBClient final : public Database {
Error Connect(const std::string& address, const std::string& database,
const std::string& collection) override;
Error Insert(const FileInfo& file, bool ignore_duplicates) const override;
- Error InsertAsSubset(const FileInfo& file, uint64_t subset_id,uint64_t subset_size, bool ignore_duplicates) const override;
+ Error InsertAsSubset(const FileInfo& file, uint64_t subset_id, uint64_t subset_size,
+ bool ignore_duplicates) const override;
Error Upsert(uint64_t id, const uint8_t* data, uint64_t size) const override;
~MongoDBClient() override;
private:
diff --git a/receiver/src/request_handler_db_write.cpp b/receiver/src/request_handler_db_write.cpp
index aaeee6b00..697f0af8a 100644
--- a/receiver/src/request_handler_db_write.cpp
+++ b/receiver/src/request_handler_db_write.cpp
@@ -34,7 +34,7 @@ Error RequestHandlerDbWrite::InsertRecordToDb(const Request* request) const {
} else {
auto subset_id = request->GetCustomData()[0];
auto subset_size = request->GetCustomData()[1];
- err = db_client__->InsertAsSubset(file_info,subset_id,subset_size,true);
+ err = db_client__->InsertAsSubset(file_info, subset_id, subset_size, true);
}
if (!err) {
diff --git a/receiver/unittests/receiver_mocking.h b/receiver/unittests/receiver_mocking.h
index 8c1c6476b..ffcdf213a 100644
--- a/receiver/unittests/receiver_mocking.h
+++ b/receiver/unittests/receiver_mocking.h
@@ -54,7 +54,7 @@ class MockRequest: public Request {
MOCK_CONST_METHOD0(GetMetaData, const std::string & ());
MOCK_CONST_METHOD0(GetBeamline, const std::string & ());
MOCK_CONST_METHOD0(GetOpCode, asapo::Opcode ());
- MOCK_CONST_METHOD0(GetCustomData, const asapo::CustomRequestData& ());
+ MOCK_CONST_METHOD0(GetCustomData, const asapo::CustomRequestData & ());
MOCK_CONST_METHOD0(GetMessage, const char* ());
MOCK_METHOD1(SetBeamtimeId, void (std::string));
MOCK_METHOD1(SetBeamline, void (std::string));
diff --git a/receiver/unittests/test_request_handler_db_writer.cpp b/receiver/unittests/test_request_handler_db_writer.cpp
index d6374f2a4..2bba51d3e 100644
--- a/receiver/unittests/test_request_handler_db_writer.cpp
+++ b/receiver/unittests/test_request_handler_db_writer.cpp
@@ -71,7 +71,7 @@ class DbWriterHandlerTests : public Test {
uint64_t expected_id = 15;
uint64_t expected_subset_id = 15;
uint64_t expected_subset_size = 2;
- asapo:: CustomRequestData expected_custom_data{expected_subset_id,expected_subset_size};
+ asapo:: CustomRequestData expected_custom_data{expected_subset_id, expected_subset_size};
void SetUp() override {
GenericRequestHeader request_header;
request_header.data_id = 2;
@@ -140,8 +140,8 @@ void DbWriterHandlerTests::ExpectRequestParams(asapo::Opcode op_code) {
;
if (op_code == asapo::Opcode::kOpcodeTransferSubsetData) {
- EXPECT_CALL(*mock_request, GetCustomData())
- .WillOnce(ReturnRef(expected_custom_data))
+ EXPECT_CALL(*mock_request, GetCustomData()).Times(2).
+ WillRepeatedly(ReturnRef(expected_custom_data))
;
}
}
--
GitLab