From 911a16c564ed039dc98fde9a7b36090c9c1770ab Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 1 Sep 2022 11:48:55 +0200
Subject: [PATCH] PIPELINE
---
include/caosdb/logging.h | 1 -
requirements.txt | 2 +-
src/caosdb/connection.cpp | 23 +++++++--------
.../download_request_handler.cpp | 29 +++++++++----------
.../upload_request_handler.cpp | 1 -
src/caosdb/transaction.cpp | 2 +-
src/caosdb/unary_rpc_handler.cpp | 9 +++---
test/test_transaction.cpp | 2 +-
8 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/include/caosdb/logging.h b/include/caosdb/logging.h
index 94c78ed..50e61ee 100644
--- a/include/caosdb/logging.h
+++ b/include/caosdb/logging.h
@@ -27,7 +27,6 @@
#include <cstdint> // for uint64_t
#include <iosfwd> // for streamsize
#include <memory> // for shared_ptr
-#include <ostream> // for ostream
#include <string> // for string
#include <vector> // for vector
diff --git a/requirements.txt b/requirements.txt
index d8e16e0..2ef3545 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ bottle==0.12.21
certifi==2022.6.15
charset-normalizer==2.1.0
colorama==0.4.5
-conan==1.51.3
+conan==1.52.0
distro==1.6.0
fasteners==0.17.3
future==0.18.2
diff --git a/src/caosdb/connection.cpp b/src/caosdb/connection.cpp
index abc87da..b5219d9 100644
--- a/src/caosdb/connection.cpp
+++ b/src/caosdb/connection.cpp
@@ -25,18 +25,17 @@
#include "caosdb/acm/v1alpha1/main.grpc.pb.h" // for AccessControlMan...
#include "caosdb/acm/v1alpha1/main.pb.h" // for CreateSingleUser...
#endif
-#include "caosdb/configuration.h" // for ConnectionConfigur...
-#include "caosdb/exceptions.h" // for ConfigurationError
-#include "caosdb/info.h" // for VersionInfo
-#include "caosdb/info/v1/main.grpc.pb.h" // for GeneralInfoService
-#include "caosdb/info/v1/main.pb.h" // for GetVersionInfoRequest
-#include "caosdb/transaction.h" // for Transaction
-#include "caosdb/transaction_status.h" // for TransactionStatus
-#include <grpcpp/client_context.h> // for ClientContext
-#include <grpcpp/create_channel.h> // for CreateChannel
-#include <grpcpp/support/status.h> // for Status
-#include <grpcpp/support/status_code_enum.h> // for StatusCode, UNAUTHENTIC...
-#include <string> // for string, operator+
+#include "caosdb/configuration.h" // for ConnectionConfigur...
+#include "caosdb/exceptions.h" // for ConfigurationError
+#include "caosdb/info.h" // for VersionInfo
+#include "caosdb/info/v1/main.grpc.pb.h" // for GeneralInfoService
+#include "caosdb/info/v1/main.pb.h" // for GetVersionInfoRequest
+#include "caosdb/transaction.h" // for Transaction
+#include "caosdb/transaction_status.h" // for TransactionStatus
+#include <grpcpp/client_context.h> // for ClientContext
+#include <grpcpp/create_channel.h> // for CreateChannel
+#include <grpcpp/support/status.h> // for Status
+#include <string> // for string, operator+
// IWYU pragma: no_include "net/proto2/public/repeated_field.h"
namespace caosdb::connection {
diff --git a/src/caosdb/file_transmission/download_request_handler.cpp b/src/caosdb/file_transmission/download_request_handler.cpp
index 821ed79..2415a14 100644
--- a/src/caosdb/file_transmission/download_request_handler.cpp
+++ b/src/caosdb/file_transmission/download_request_handler.cpp
@@ -47,21 +47,20 @@
* > DEALINGS IN THE SOFTWARE.
*/
#include "caosdb/file_transmission/download_request_handler.h"
-#include "caosdb/logging.h" // for CAOSDB_LOG_TRACE
-#include "caosdb/protobuf_helper.h" // for get_arena
-#include "caosdb/status_code.h" // for GENERIC_RPC_E...
-#include "caosdb/transaction_status.h" // for TransactionStatus
-#include <exception> // IWYU pragma: keep
-#include <filesystem> // for operator<<, path
-#include <google/protobuf/arena.h> // for Arena
-#include <grpcpp/client_context.h> // for ClientContext
-#include <grpcpp/completion_queue.h> // for CompletionQueue
-#include <grpcpp/support/async_stream.h> // for ClientAsyncReader
-#include <grpcpp/support/status.h> // for Status
-#include <grpcpp/support/status_code_enum.h> // for OK
-#include <stdexcept> // for runtime_error
-#include <string> // for string, opera...
-#include <utility> // for move
+#include "caosdb/logging.h" // for CAOSDB_LOG_TRACE
+#include "caosdb/protobuf_helper.h" // for get_arena
+#include "caosdb/status_code.h" // for GENERIC_RPC_E...
+#include "caosdb/transaction_status.h" // for TransactionStatus
+#include <exception> // IWYU pragma: keep
+#include <filesystem> // for operator<<, path
+#include <google/protobuf/arena.h> // for Arena
+#include <grpcpp/client_context.h> // for ClientContext
+#include <grpcpp/completion_queue.h> // for CompletionQueue
+#include <grpcpp/support/async_stream.h> // for ClientAsyncReader
+#include <grpcpp/support/status.h> // for Status
+#include <stdexcept> // for runtime_error
+#include <string> // for string, opera...
+#include <utility> // for move
// IWYU pragma: no_include <bits/exception.h>
//
namespace caosdb::transaction {
diff --git a/src/caosdb/file_transmission/upload_request_handler.cpp b/src/caosdb/file_transmission/upload_request_handler.cpp
index 32bb813..d307e8e 100644
--- a/src/caosdb/file_transmission/upload_request_handler.cpp
+++ b/src/caosdb/file_transmission/upload_request_handler.cpp
@@ -57,7 +57,6 @@
#include <filesystem> // for operator<<, path
#include <google/protobuf/arena.h> // for Arena
#include <grpcpp/impl/codegen/call_op_set.h> // for WriteOptions
-#include <grpcpp/support/status_code_enum.h> // for OK
#include <string> // for basic_string
#include <utility> // for move
// IWYU pragma: no_include <bits/exception.h>
diff --git a/src/caosdb/transaction.cpp b/src/caosdb/transaction.cpp
index c75fdeb..9da3716 100644
--- a/src/caosdb/transaction.cpp
+++ b/src/caosdb/transaction.cpp
@@ -32,7 +32,7 @@
#include <filesystem> // for operator<<, path
#include <future> // for async, future
#include <google/protobuf/arena.h> // for Arena
-#include <grpc/impl/codegen/gpr_types.h> // for gpr_timespec
+#include <grpc/grpc.h> // for gpr_timespec
#include <map> // for map, operator!=
#include <memory> // for unique_ptr
#include <random> // for mt19937, rand...
diff --git a/src/caosdb/unary_rpc_handler.cpp b/src/caosdb/unary_rpc_handler.cpp
index 06afc12..e68afc8 100644
--- a/src/caosdb/unary_rpc_handler.cpp
+++ b/src/caosdb/unary_rpc_handler.cpp
@@ -47,11 +47,10 @@
* > DEALINGS IN THE SOFTWARE.
*/
#include "caosdb/unary_rpc_handler.h"
-#include "caosdb/logging.h" // for CAOSDB_LOG_TRACE
-#include "caosdb/status_code.h" // for GENERIC_RPC_E...
-#include <exception> // IWYU pragma: keep
-#include <grpcpp/support/status_code_enum.h> // for OK
-#include <string> // for string, opera...
+#include "caosdb/logging.h" // for CAOSDB_LOG_TRACE
+#include "caosdb/status_code.h" // for GENERIC_RPC_E...
+#include <exception> // IWYU pragma: keep
+#include <string> // for string, opera...
// IWYU pragma: no_include <bits/exception.h>
namespace caosdb::transaction {
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index e710b6c..63d9cde 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -55,7 +55,7 @@ TEST(test_transaction, create_transaction) {
auto transaction = connection.CreateTransaction();
ASSERT_EQ(StatusCode::GO_ON, transaction->RetrieveById("100"));
- EXPECT_THROW_MESSAGE(transaction->Execute(), ConnectionError,
+ EXPECT_THROW_STARTS_WITH(transaction->Execute(), ConnectionError,
"The attempt to execute this transaction was not successful because the "
"connection to the server could not be established. "
"Original message: failed to connect to all addresses");
--
GitLab