From 59e0cfe5f6d95dcd83eebf025c1330fc1e4d197f Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Fri, 11 Jun 2021 14:55:38 +0200
Subject: [PATCH] fix build
---
.../request_handler_db_meta_write.cpp | 12 +++---
.../test_request_handler_db_meta_writer.cpp | 40 +++++++++----------
.../mongo_db/upsert/upsert_mongodb.cpp | 5 ++-
3 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/receiver/src/request_handler/request_handler_db_meta_write.cpp b/receiver/src/request_handler/request_handler_db_meta_write.cpp
index c1f288867..58aa2af5c 100644
--- a/receiver/src/request_handler/request_handler_db_meta_write.cpp
+++ b/receiver/src/request_handler/request_handler_db_meta_write.cpp
@@ -27,16 +27,16 @@ Error RequestHandlerDbMetaWrite::ProcessRequest(Request* request) const {
mode.Decode(request->GetCustomData()[kPosMetaIngestMode]);
}
- auto err = db_client__->Insert(collection_name_prefix_, stream.empty()?"bt":"st_"+stream, meta, size, mode);
+ auto err = db_client__->Insert(collection_name_prefix_, stream.empty() ? "bt" : "st_" + stream, meta, size, mode);
if (!err) {
if (stream.empty()) {
log__->Debug(std::string{"insert beamtime meta"} + " to " + collection_name_prefix_ + " in " +
- db_name_ +
- " at " + GetReceiverConfig()->database_uri);
+ db_name_ +
+ " at " + GetReceiverConfig()->database_uri);
} else {
- log__->Debug(std::string{"insert stream meta for "}+stream+ " to " + collection_name_prefix_ + " in " +
- db_name_ +
- " at " + GetReceiverConfig()->database_uri);
+ log__->Debug(std::string{"insert stream meta for "} +stream + " to " + collection_name_prefix_ + " in " +
+ db_name_ +
+ " at " + GetReceiverConfig()->database_uri);
}
}
diff --git a/receiver/unittests/request_handler/test_request_handler_db_meta_writer.cpp b/receiver/unittests/request_handler/test_request_handler_db_meta_writer.cpp
index 9b7f37890..73a88dd21 100644
--- a/receiver/unittests/request_handler/test_request_handler_db_meta_writer.cpp
+++ b/receiver/unittests/request_handler/test_request_handler_db_meta_writer.cpp
@@ -71,7 +71,7 @@ class DbMetaWriterHandlerTests : public Test {
uint64_t expected_meta_size = meta_str.size();
std::string expected_meta_name = "bt";
uint64_t expected_custom_data[asapo::kNCustomParams] {0, 0, 0};
- void SetUp() override {
+ void SetUp() override {
GenericRequestHeader request_header;
request_header.data_id = 0;
handler.db_client__ = std::unique_ptr<asapo::Database> {&mock_db};
@@ -83,7 +83,7 @@ class DbMetaWriterHandlerTests : public Test {
handler.db_client__.release();
}
- void ExpectRequestParams(const std::string& ver,uint64_t mode,const std::string& stream);
+ void ExpectRequestParams(const std::string& ver, uint64_t mode, const std::string& stream);
};
@@ -93,7 +93,7 @@ MATCHER_P(M_CheckIngestMode, mode, "") {
}
-void DbMetaWriterHandlerTests::ExpectRequestParams(const std::string& ver,uint64_t mode,const std::string& stream) {
+void DbMetaWriterHandlerTests::ExpectRequestParams(const std::string& ver, uint64_t mode, const std::string& stream) {
EXPECT_CALL(*mock_request, GetDataSource())
.WillOnce(ReturnRef(expected_data_source))
;
@@ -111,13 +111,13 @@ void DbMetaWriterHandlerTests::ExpectRequestParams(const std::string& ver,uint64
;
EXPECT_CALL(*mock_request, GetApiVersion())
- .WillOnce(Return(ver))
- ;
+ .WillOnce(Return(ver))
+ ;
- if (mode>0) {
+ if (mode > 0) {
EXPECT_CALL(*mock_request, GetStream())
- .WillOnce(Return(stream))
- ;
+ .WillOnce(Return(stream))
+ ;
expected_custom_data[asapo::kPosMetaIngestMode] = mode;
EXPECT_CALL(*mock_request, GetCustomData_t()).WillOnce(Return(expected_custom_data));
}
@@ -126,7 +126,7 @@ void DbMetaWriterHandlerTests::ExpectRequestParams(const std::string& ver,uint64
TEST_F(DbMetaWriterHandlerTests, CallsIngestBeamtimeMetaOldVersion) {
SetReceiverConfig(config, "none");
- ExpectRequestParams("v0.2",0,"");
+ ExpectRequestParams("v0.2", 0, "");
asapo::MetaIngestMode expected_mode{asapo::MetaIngestOp::kReplace, true};
@@ -148,21 +148,21 @@ TEST_F(DbMetaWriterHandlerTests, CallsIngestBeamtimeMetaOldVersion) {
TEST_F(DbMetaWriterHandlerTests, CallsIngestBeamtimeMeta) {
SetReceiverConfig(config, "none");
- ExpectRequestParams(asapo::GetReceiverApiVersion(),11,"");
+ ExpectRequestParams(asapo::GetReceiverApiVersion(), 11, "");
asapo::MetaIngestMode expected_mode{asapo::MetaIngestOp::kInsert, true};
EXPECT_CALL(mock_db, Insert_t(expected_collection_name, "bt", expected_meta, expected_meta_size,
M_CheckIngestMode(expected_mode))).
- WillOnce(testing::Return(nullptr));
+ WillOnce(testing::Return(nullptr));
EXPECT_CALL(mock_logger, Debug(AllOf(HasSubstr("insert beamtime meta"),
HasSubstr(expected_beamtime_id),
HasSubstr(config.database_uri),
HasSubstr(expected_collection_name)
- )
- )
- );
+ )
+ )
+ );
handler.ProcessRequest(mock_request.get());
}
@@ -170,21 +170,21 @@ TEST_F(DbMetaWriterHandlerTests, CallsIngestBeamtimeMeta) {
TEST_F(DbMetaWriterHandlerTests, CallsIngestStreamMeta) {
SetReceiverConfig(config, "none");
- ExpectRequestParams(asapo::GetReceiverApiVersion(),13,expected_stream);
+ ExpectRequestParams(asapo::GetReceiverApiVersion(), 13, expected_stream);
asapo::MetaIngestMode expected_mode{asapo::MetaIngestOp::kUpdate, true};
- EXPECT_CALL(mock_db, Insert_t(expected_collection_name, "st_"+expected_stream, expected_meta, expected_meta_size,
+ EXPECT_CALL(mock_db, Insert_t(expected_collection_name, "st_" + expected_stream, expected_meta, expected_meta_size,
M_CheckIngestMode(expected_mode))).
- WillOnce(testing::Return(nullptr));
+ WillOnce(testing::Return(nullptr));
EXPECT_CALL(mock_logger, Debug(AllOf(HasSubstr("insert stream meta"),
HasSubstr(expected_beamtime_id),
HasSubstr(expected_stream),
HasSubstr(config.database_uri),
HasSubstr(expected_collection_name)
- )
- )
- );
+ )
+ )
+ );
handler.ProcessRequest(mock_request.get());
}
diff --git a/tests/automatic/mongo_db/upsert/upsert_mongodb.cpp b/tests/automatic/mongo_db/upsert/upsert_mongodb.cpp
index f1420bcf6..addb0f0d1 100644
--- a/tests/automatic/mongo_db/upsert/upsert_mongodb.cpp
+++ b/tests/automatic/mongo_db/upsert/upsert_mongodb.cpp
@@ -45,14 +45,15 @@ int main(int argc, char* argv[]) {
db.Connect("127.0.0.1", "test");
}
- auto err = db.Upsert("meta", 0, reinterpret_cast<const uint8_t*>(json.c_str()), json.size());
+ auto mode = asapo::MetaIngestMode{asapo::MetaIngestOp::kReplace, true};
+ auto err = db.Insert("meta", 0, reinterpret_cast<const uint8_t*>(json.c_str()), json.size(), mode);
if (err) {
std::cout << err->Explain() << std::endl;
}
Assert(err, args.keyword);
- err = db.Upsert("meta", 0, reinterpret_cast<const uint8_t*>(json.c_str()), json.size());
+ err = db.Insert("meta", 0, reinterpret_cast<const uint8_t*>(json.c_str()), json.size(), mode);
if (err) {
std::cout << err->Explain() << std::endl;
}
--
GitLab