From 63cd2ddc93d7f0c2b9c9c635302b1a6e240a91f6 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Fri, 9 Aug 2019 10:47:23 +0200
Subject: [PATCH] more work at streams
---
common/cpp/src/system_io/system_io.cpp | 1 +
receiver/src/request_handler_authorize.cpp | 4 ++--
receiver/src/request_handler_db.cpp | 2 +-
.../test_request_handler_authorizer.cpp | 7 ++++---
receiver/unittests/test_request_handler_db.cpp | 17 +++++++++--------
.../test_request_handler_db_meta_writer.cpp | 7 ++++---
.../test_request_handler_db_writer.cpp | 16 ++++++++--------
worker/api/cpp/src/server_data_broker.cpp | 2 +-
8 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/common/cpp/src/system_io/system_io.cpp b/common/cpp/src/system_io/system_io.cpp
index 7dd9819da..77a7bf0b7 100644
--- a/common/cpp/src/system_io/system_io.cpp
+++ b/common/cpp/src/system_io/system_io.cpp
@@ -152,6 +152,7 @@ Error SystemIO::WriteDataToFile(const std::string& root_folder, const std::strin
full_name = fname;
}
Error err;
+ //todo:: add IO_OPEN_MODE_SET_LENGTH_0 + tests
auto fd = Open(full_name, IO_OPEN_MODE_CREATE | IO_OPEN_MODE_RW, &err);
if (err == IOErrorTemplates::kFileNotFound && create_directories) {
size_t pos = fname.rfind(kPathSeparator);
diff --git a/receiver/src/request_handler_authorize.cpp b/receiver/src/request_handler_authorize.cpp
index 8cc5a5e50..576f1bd8e 100644
--- a/receiver/src/request_handler_authorize.cpp
+++ b/receiver/src/request_handler_authorize.cpp
@@ -11,7 +11,7 @@ namespace asapo {
std::string RequestHandlerAuthorize::GetRequestString(const Request* request, const char* source_credentials) const {
std::string request_string = std::string("{\"SourceCredentials\":\"") +
- source_credentials + "\",\"OriginHost\":\"" + request->GetOriginUri() + "\"}";
+ source_credentials + "\",\"OriginHost\":\"" + request->GetOriginUri() + "\"}";
return request_string;
}
@@ -49,7 +49,7 @@ Error RequestHandlerAuthorize::Authorize(Request* request, const char* source_cr
return ErrorFromServerResponse(err, code);
} else {
log__->Debug(std::string("authorized connection from ") + request->GetOriginUri() + " beamline: " +
- beamline_ + ", beamtime id: " + beamtime_id_+", stream: "+stream_);
+ beamline_ + ", beamtime id: " + beamtime_id_ + ", stream: " + stream_);
}
last_updated_ = system_clock::now();
diff --git a/receiver/src/request_handler_db.cpp b/receiver/src/request_handler_db.cpp
index 874c5846e..9b0efb526 100644
--- a/receiver/src/request_handler_db.cpp
+++ b/receiver/src/request_handler_db.cpp
@@ -10,7 +10,7 @@ Error RequestHandlerDb::ProcessRequest(Request* request) const {
db_name_ = request->GetBeamtimeId();
auto stream = request->GetStream();
if (stream != "detector") {
- db_name_+="_"+stream;
+ db_name_ += "_" + stream;
}
}
diff --git a/receiver/unittests/test_request_handler_authorizer.cpp b/receiver/unittests/test_request_handler_authorizer.cpp
index cd3f45503..1c7565ae9 100644
--- a/receiver/unittests/test_request_handler_authorizer.cpp
+++ b/receiver/unittests/test_request_handler_authorizer.cpp
@@ -69,7 +69,8 @@ class AuthorizerHandlerTests : public Test {
std::string expected_beamline = "beamline";
std::string expected_producer_uri = "producer_uri";
std::string expected_authorization_server = "authorizer_host";
- std::string expect_request_string = std::string("{\"SourceCredentials\":\"") + expected_source_credentials + "\",\"OriginHost\":\"" +
+ std::string expect_request_string = std::string("{\"SourceCredentials\":\"") + expected_source_credentials +
+ "\",\"OriginHost\":\"" +
expected_producer_uri + "\"}";
void MockRequestData();
@@ -104,8 +105,8 @@ class AuthorizerHandlerTests : public Test {
DoAll(SetArgPointee<3>(nullptr),
SetArgPointee<2>(code),
Return("{\"BeamtimeId\":\"" + expected_beamtime_id +
- "\",\"Stream\":" + "\"" + expected_stream +
- "\",\"Beamline\":" + "\"" + expected_beamline + "\"}")
+ "\",\"Stream\":" + "\"" + expected_stream +
+ "\",\"Beamline\":" + "\"" + expected_beamline + "\"}")
));
if (code != HttpCode::OK) {
EXPECT_CALL(mock_logger, Error(AllOf(HasSubstr("failure authorizing"),
diff --git a/receiver/unittests/test_request_handler_db.cpp b/receiver/unittests/test_request_handler_db.cpp
index b058c57dd..4aa86641f 100644
--- a/receiver/unittests/test_request_handler_db.cpp
+++ b/receiver/unittests/test_request_handler_db.cpp
@@ -105,12 +105,13 @@ TEST_F(DbHandlerTests, ProcessRequestCallsConnectDbWhenNotConnected) {
;
EXPECT_CALL(*mock_request, GetStream())
- .WillOnce(ReturnRef(expected_stream))
- ;
+ .WillOnce(ReturnRef(expected_stream))
+ ;
- EXPECT_CALL(mock_db, Connect_t("127.0.0.1:27017", expected_beamtime_id+"_"+expected_stream, expected_collection_name)).
+ EXPECT_CALL(mock_db, Connect_t("127.0.0.1:27017", expected_beamtime_id + "_" + expected_stream,
+ expected_collection_name)).
WillOnce(testing::Return(nullptr));
auto err = handler.ProcessRequest(mock_request.get());
@@ -123,16 +124,16 @@ TEST_F(DbHandlerTests, ProcessRequestUsesCorrectDbNameForDetector) {
EXPECT_CALL(*mock_request, GetBeamtimeId())
- .WillOnce(ReturnRef(expected_beamtime_id))
- ;
+ .WillOnce(ReturnRef(expected_beamtime_id))
+ ;
EXPECT_CALL(*mock_request, GetStream())
- .WillOnce(ReturnRef(expected_default_stream))
- ;
+ .WillOnce(ReturnRef(expected_default_stream))
+ ;
EXPECT_CALL(mock_db, Connect_t("127.0.0.1:27017", expected_beamtime_id, expected_collection_name)).
- WillOnce(testing::Return(nullptr));
+ WillOnce(testing::Return(nullptr));
auto err = handler.ProcessRequest(mock_request.get());
ASSERT_THAT(err, Eq(nullptr));
diff --git a/receiver/unittests/test_request_handler_db_meta_writer.cpp b/receiver/unittests/test_request_handler_db_meta_writer.cpp
index 8e851db8c..00aaee3ce 100644
--- a/receiver/unittests/test_request_handler_db_meta_writer.cpp
+++ b/receiver/unittests/test_request_handler_db_meta_writer.cpp
@@ -92,11 +92,12 @@ TEST_F(DbMetaWriterHandlerTests, CallsUpdate) {
;
EXPECT_CALL(*mock_request, GetStream())
- .WillOnce(ReturnRef(expected_stream))
- ;
+ .WillOnce(ReturnRef(expected_stream))
+ ;
- EXPECT_CALL(mock_db, Connect_t(config.broker_db_uri, expected_beamtime_id+"_"+expected_stream, expected_collection_name)).
+ EXPECT_CALL(mock_db, Connect_t(config.broker_db_uri, expected_beamtime_id + "_" + expected_stream,
+ expected_collection_name)).
WillOnce(testing::Return(nullptr));
diff --git a/receiver/unittests/test_request_handler_db_writer.cpp b/receiver/unittests/test_request_handler_db_writer.cpp
index 2ba6e289f..1f93f42e5 100644
--- a/receiver/unittests/test_request_handler_db_writer.cpp
+++ b/receiver/unittests/test_request_handler_db_writer.cpp
@@ -88,9 +88,9 @@ class DbWriterHandlerTests : public Test {
ON_CALL(*mock_request, GetBeamtimeId()).WillByDefault(ReturnRef(expected_beamtime_id));
}
- void ExpectRequestParams(asapo::Opcode op_code,const std::string& stream);
+ void ExpectRequestParams(asapo::Opcode op_code, const std::string& stream);
- FileInfo PrepareFileInfo();
+ FileInfo PrepareFileInfo();
void TearDown() override {
handler.db_client__.release();
}
@@ -110,14 +110,14 @@ MATCHER_P(CompareFileInfo, file, "") {
}
-void DbWriterHandlerTests::ExpectRequestParams(asapo::Opcode op_code,const std::string& stream) {
+void DbWriterHandlerTests::ExpectRequestParams(asapo::Opcode op_code, const std::string& stream) {
EXPECT_CALL(*mock_request, GetBeamtimeId())
.WillOnce(ReturnRef(expected_beamtime_id))
;
EXPECT_CALL(*mock_request, GetStream())
- .WillOnce(ReturnRef(stream))
- ;
+ .WillOnce(ReturnRef(stream))
+ ;
EXPECT_CALL(*mock_request, GetSlotId())
@@ -126,7 +126,7 @@ void DbWriterHandlerTests::ExpectRequestParams(asapo::Opcode op_code,const std::
std::string db_name = expected_beamtime_id;
if (stream != "detector") {
- db_name +="_"+stream;
+ db_name += "_" + stream;
}
EXPECT_CALL(mock_db, Connect_t(config.broker_db_uri, db_name, expected_collection_name)).
WillOnce(testing::Return(nullptr));
@@ -174,7 +174,7 @@ FileInfo DbWriterHandlerTests::PrepareFileInfo() {
TEST_F(DbWriterHandlerTests, CallsInsert) {
- ExpectRequestParams(asapo::Opcode::kOpcodeTransferData,expected_stream);
+ ExpectRequestParams(asapo::Opcode::kOpcodeTransferData, expected_stream);
auto file_info = PrepareFileInfo();
EXPECT_CALL(mock_db, Insert_t(CompareFileInfo(file_info), _)).
@@ -194,7 +194,7 @@ TEST_F(DbWriterHandlerTests, CallsInsert) {
TEST_F(DbWriterHandlerTests, CallsInsertSubset) {
- ExpectRequestParams(asapo::Opcode::kOpcodeTransferSubsetData,expected_default_stream);
+ ExpectRequestParams(asapo::Opcode::kOpcodeTransferSubsetData, expected_default_stream);
auto file_info = PrepareFileInfo();
diff --git a/worker/api/cpp/src/server_data_broker.cpp b/worker/api/cpp/src/server_data_broker.cpp
index 09daf5952..6f00f5529 100644
--- a/worker/api/cpp/src/server_data_broker.cpp
+++ b/worker/api/cpp/src/server_data_broker.cpp
@@ -38,7 +38,7 @@ ServerDataBroker::ServerDataBroker(std::string server_uri,
SourceCredentials source) :
io__{GenerateDefaultIO()}, httpclient__{DefaultHttpClient()},
net_client__{new TcpClient()},
-server_uri_{std::move(server_uri)}, source_path_{std::move(source_path)}, source_credentials_{std::move(source)} {
+server_uri_{std::move(server_uri)}, source_path_{std::move(source_path)}, source_credentials_(std::move(source)) {
if (source_credentials_.stream.empty()) {
source_credentials_.stream = SourceCredentials::kDefaultStream;
--
GitLab