Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • caosdb/src/caosdb-cpplib
1 result
Show changes
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 499 additions and 701 deletions
include/caosdb/info.h
View file @ 51f202ec
......@@ -54,21 +54,13 @@ public:
* server behind the given connection.
*/
explicit inline VersionInfo(ProtoVersionInfo *info) : info(info){};
[[nodiscard]] inline auto GetMajor() const -> int32_t {
return this->info->major();
}
[[nodiscard]] inline auto GetMinor() const -> int32_t {
return this->info->minor();
}
[[nodiscard]] inline auto GetPatch() const -> int32_t {
return this->info->patch();
}
[[nodiscard]] inline auto GetMajor() const -> int32_t { return this->info->major(); }
[[nodiscard]] inline auto GetMinor() const -> int32_t { return this->info->minor(); }
[[nodiscard]] inline auto GetPatch() const -> int32_t { return this->info->patch(); }
[[nodiscard]] inline auto GetPreRelease() const -> const std::string & {
return this->info->pre_release();
}
[[nodiscard]] inline auto GetBuild() const -> const std::string & {
return this->info->build();
}
[[nodiscard]] inline auto GetBuild() const -> const std::string & { return this->info->build(); }
private:
/// This object is the owner of the Protobuf VersionInfo message.
......
include/caosdb/logging.h
View file @ 51f202ec
......@@ -38,8 +38,7 @@ namespace caosdb::logging {
const std::string logger_name = "caosdb::logging";
typedef boost::log::sources::severity_channel_logger_mt<int, std::string>
boost_logger_class;
typedef boost::log::sources::severity_channel_logger_mt<int, std::string> boost_logger_class;
BOOST_LOG_GLOBAL_LOGGER(logger, boost_logger_class)
......@@ -67,8 +66,7 @@ public:
virtual ~LoggingConfiguration() = default;
LoggingConfiguration(int level);
auto AddSink(const std::shared_ptr<SinkConfiguration> &sink) -> void;
auto GetSinks() const
-> const std::vector<std::shared_ptr<SinkConfiguration>> &;
auto GetSinks() const -> const std::vector<std::shared_ptr<SinkConfiguration>> &;
private:
std::vector<std::shared_ptr<SinkConfiguration>> sinks;
......@@ -102,8 +100,7 @@ public:
[[nodiscard]] virtual auto GetDestination() const -> const std::string & = 0;
friend auto initialize_logging_defaults() -> int;
friend auto
initialize_logging(const LoggingConfiguration &logging_configuration) -> void;
friend auto initialize_logging(const LoggingConfiguration &logging_configuration) -> void;
protected:
virtual auto Configure(boost::log::settings &settings) const -> void;
......@@ -118,8 +115,7 @@ public:
ConsoleSinkConfiguration(const std::string &name, int level);
[[nodiscard]] auto GetDestination() const -> const std::string & override;
friend auto initialize_logging_defaults() -> int;
friend auto
initialize_logging(const LoggingConfiguration &logging_configuration) -> void;
friend auto initialize_logging(const LoggingConfiguration &logging_configuration) -> void;
protected:
typedef SinkConfiguration sink_configuration;
......@@ -139,12 +135,10 @@ class FileSinkConfiguration : public SinkConfiguration {
public:
virtual ~FileSinkConfiguration() = default;
FileSinkConfiguration(const std::string &name, int level);
[[nodiscard]] virtual auto GetDestination() const
-> const std::string & override;
[[nodiscard]] virtual auto GetDestination() const -> const std::string & override;
auto SetDirectory(const std::string &directory) -> void;
friend auto initialize_logging_defaults() -> int;
friend auto
initialize_logging(const LoggingConfiguration &logging_configuration) -> void;
friend auto initialize_logging(const LoggingConfiguration &logging_configuration) -> void;
protected:
typedef SinkConfiguration sink_configuration;
......@@ -159,8 +153,7 @@ class SyslogSinkConfiguration : public SinkConfiguration {
public:
virtual ~SyslogSinkConfiguration() = default;
SyslogSinkConfiguration(const std::string &name, int level);
[[nodiscard]] virtual auto GetDestination() const
-> const std::string & override;
[[nodiscard]] virtual auto GetDestination() const -> const std::string & override;
private:
const std::string destination = "Syslog";
......@@ -193,29 +186,22 @@ void caosdb_log_trace(const char *channel, const char *msg);
} // namespace caosdb::logging
#define CAOSDB_LOG_FATAL(Channel) \
BOOST_LOG_CHANNEL_SEV(caosdb::logging::logger::get(), Channel, \
CAOSDB_LOG_LEVEL_FATAL)
#define CAOSDB_LOG_ERROR(Channel) \
BOOST_LOG_CHANNEL_SEV(caosdb::logging::logger::get(), Channel, \
CAOSDB_LOG_LEVEL_ERROR)
#define CAOSDB_LOG_WARN(Channel) \
BOOST_LOG_CHANNEL_SEV(caosdb::logging::logger::get(), Channel, \
CAOSDB_LOG_LEVEL_WARN)
#define CAOSDB_LOG_INFO(Channel) \
BOOST_LOG_CHANNEL_SEV(caosdb::logging::logger::get(), Channel, \
CAOSDB_LOG_LEVEL_INFO)
#define CAOSDB_LOG_DEBUG(Channel) \
BOOST_LOG_CHANNEL_SEV(caosdb::logging::logger::get(), Channel, \
CAOSDB_LOG_LEVEL_DEBUG)
#define CAOSDB_LOG_TRACE(Channel) \
BOOST_LOG_CHANNEL_SEV(caosdb::logging::logger::get(), Channel, \
CAOSDB_LOG_LEVEL_TRACE)
#define CAOSDB_LOG_ERROR_AND_RETURN_STATUS(Channel, StatusCode, Message) \
CAOSDB_LOG_ERROR(Channel) \
<< "StatusCode (" << StatusCode << ") " \
<< caosdb::get_status_description(StatusCode) << ": " << Message; \
#define CAOSDB_LOG_FATAL(Channel) \
BOOST_LOG_CHANNEL_SEV(caosdb::logging::logger::get(), Channel, CAOSDB_LOG_LEVEL_FATAL)
#define CAOSDB_LOG_ERROR(Channel) \
BOOST_LOG_CHANNEL_SEV(caosdb::logging::logger::get(), Channel, CAOSDB_LOG_LEVEL_ERROR)
#define CAOSDB_LOG_WARN(Channel) \
BOOST_LOG_CHANNEL_SEV(caosdb::logging::logger::get(), Channel, CAOSDB_LOG_LEVEL_WARN)
#define CAOSDB_LOG_INFO(Channel) \
BOOST_LOG_CHANNEL_SEV(caosdb::logging::logger::get(), Channel, CAOSDB_LOG_LEVEL_INFO)
#define CAOSDB_LOG_DEBUG(Channel) \
BOOST_LOG_CHANNEL_SEV(caosdb::logging::logger::get(), Channel, CAOSDB_LOG_LEVEL_DEBUG)
#define CAOSDB_LOG_TRACE(Channel) \
BOOST_LOG_CHANNEL_SEV(caosdb::logging::logger::get(), Channel, CAOSDB_LOG_LEVEL_TRACE)
#define CAOSDB_LOG_ERROR_AND_RETURN_STATUS(Channel, StatusCode, Message) \
CAOSDB_LOG_ERROR(Channel) << "StatusCode (" << StatusCode << ") " \
<< caosdb::get_status_description(StatusCode) << ": " << Message; \
return StatusCode;
#endif
include/caosdb/message_code.h
View file @ 51f202ec
......@@ -41,17 +41,16 @@ namespace caosdb::entity {
enum MessageCode {
UNSPECIFIED = caosdb::entity::v1alpha1::MessageCode::MESSAGE_CODE_UNSPECIFIED,
UNKNOWN = caosdb::entity::v1alpha1::MessageCode::MESSAGE_CODE_UNKNOWN,
ENTITY_DOES_NOT_EXIST =
caosdb::entity::v1alpha1::MessageCode::MESSAGE_CODE_ENTITY_DOES_NOT_EXIST,
ENTITY_HAS_NO_PROPERTIES = caosdb::entity::v1alpha1::MessageCode::
MESSAGE_CODE_ENTITY_HAS_NO_PROPERTIES,
ENTITY_DOES_NOT_EXIST = caosdb::entity::v1alpha1::MessageCode::MESSAGE_CODE_ENTITY_DOES_NOT_EXIST,
ENTITY_HAS_NO_PROPERTIES =
caosdb::entity::v1alpha1::MessageCode::MESSAGE_CODE_ENTITY_HAS_NO_PROPERTIES,
};
[[nodiscard]] inline auto get_message_code(int code) noexcept -> MessageCode {
// TODO(tf) smarter, less forgot-it-prone implementation
static MessageCode all_codes[] = {
MessageCode::UNSPECIFIED, MessageCode::UNKNOWN,
MessageCode::ENTITY_DOES_NOT_EXIST, MessageCode::ENTITY_HAS_NO_PROPERTIES};
static MessageCode all_codes[] = {MessageCode::UNSPECIFIED, MessageCode::UNKNOWN,
MessageCode::ENTITY_DOES_NOT_EXIST,
MessageCode::ENTITY_HAS_NO_PROPERTIES};
for (MessageCode known_code : all_codes) {
if (known_code == code) {
......
include/caosdb/protobuf_helper.h
View file @ 51f202ec
......@@ -26,11 +26,11 @@
#include <google/protobuf/arena.h> // for Arena
#include <google/protobuf/extension_set.h> // for Arena
#define CAOSDB_DEBUG_MESSAGE_STRING(message, out) \
std::string out; \
{ \
google::protobuf::util::JsonOptions options; \
google::protobuf::util::MessageToJsonString(message, &out, options); \
#define CAOSDB_DEBUG_MESSAGE_STRING(message, out) \
std::string out; \
{ \
google::protobuf::util::JsonOptions options; \
google::protobuf::util::MessageToJsonString(message, &out, options); \
}
namespace caosdb::utility {
......@@ -42,15 +42,13 @@ auto get_arena() -> Arena *;
template <typename P> class ProtoMessageWrapper {
public:
ProtoMessageWrapper(const ProtoMessageWrapper &other) = default;
inline auto CopyFrom(const ProtoMessageWrapper &other) noexcept
-> StatusCode {
inline auto CopyFrom(const ProtoMessageWrapper &other) noexcept -> StatusCode {
this->wrapped->CopyFrom(*other.wrapped);
return StatusCode::SUCCESS;
}
protected:
ProtoMessageWrapper()
: ProtoMessageWrapper(Arena::CreateMessage<P>(get_arena())) {}
ProtoMessageWrapper() : ProtoMessageWrapper(Arena::CreateMessage<P>(get_arena())) {}
ProtoMessageWrapper(P *wrapped) : wrapped(wrapped) {}
P *wrapped;
};
......
include/caosdb/transaction.h
View file @ 51f202ec
This diff is collapsed.
include/caosdb/transaction_handler.h
View file @ 51f202ec
......@@ -17,14 +17,12 @@ class EntityTransactionHandler final : public UnaryRpcHandler {
public:
EntityTransactionHandler(HandlerTag tag, EntityTransactionService::Stub *stub,
grpc::CompletionQueue *completion_queue,
MultiTransactionRequest *request,
MultiTransactionResponse *response);
MultiTransactionRequest *request, MultiTransactionResponse *response);
~EntityTransactionHandler() override = default;
EntityTransactionHandler(const EntityTransactionHandler &) = delete;
EntityTransactionHandler &
operator=(const EntityTransactionHandler &) = delete;
EntityTransactionHandler &operator=(const EntityTransactionHandler &) = delete;
EntityTransactionHandler(EntityTransactionHandler &&) = delete;
EntityTransactionHandler &operator=(EntityTransactionHandler &&) = delete;
......@@ -35,8 +33,7 @@ protected:
EntityTransactionService::Stub *stub_;
std::unique_ptr<grpc::ClientAsyncResponseReader<MultiTransactionResponse>>
rpc_;
std::unique_ptr<grpc::ClientAsyncResponseReader<MultiTransactionResponse>> rpc_;
MultiTransactionRequest *request_;
MultiTransactionResponse *response_;
......
include/caosdb/transaction_status.h
View file @ 51f202ec
......@@ -39,11 +39,11 @@ using caosdb::exceptions::TransactionTypeError;
/**
* Define static factory method in the TransactionStatus class.
*/
#define CAOSDB_TRANSACTION_STATUS_DEFAULT_FACTORY(_StatusName, _StatusCode) \
inline static auto _StatusName()->const TransactionStatus & { \
static const TransactionStatus instance( \
_StatusCode, caosdb::get_status_description(_StatusCode)); \
return instance; \
#define CAOSDB_TRANSACTION_STATUS_DEFAULT_FACTORY(_StatusName, _StatusCode) \
inline static auto _StatusName()->const TransactionStatus & { \
static const TransactionStatus instance(_StatusCode, \
caosdb::get_status_description(_StatusCode)); \
return instance; \
}
/**
......@@ -99,25 +99,21 @@ public:
* possibly due to misconfiguration of the client, errors in the network or
* because the server is down.
*/
CAOSDB_TRANSACTION_STATUS_DEFAULT_FACTORY(CONNECTION_ERROR,
StatusCode::CONNECTION_ERROR)
CAOSDB_TRANSACTION_STATUS_DEFAULT_FACTORY(CONNECTION_ERROR, StatusCode::CONNECTION_ERROR)
/**
* Factory for an AUTHENTICATION_ERROR status.
*
* This status means that the RPC layer reported an authentication error.
*/
CAOSDB_TRANSACTION_STATUS_DEFAULT_FACTORY(AUTHENTICATION_ERROR,
StatusCode::AUTHENTICATION_ERROR)
CAOSDB_TRANSACTION_STATUS_DEFAULT_FACTORY(AUTHENTICATION_ERROR, StatusCode::AUTHENTICATION_ERROR)
/**
* Another factory for an TRANSACTION_ERROR Status with a detailed
* description.
*/
inline static auto AUTHENTICATION_ERROR(const std::string &details)
-> const TransactionStatus {
return TransactionStatus(
StatusCode::AUTHENTICATION_ERROR,
caosdb::get_status_description(StatusCode::AUTHENTICATION_ERROR) +
" Original error: " + details);
inline static auto AUTHENTICATION_ERROR(const std::string &details) -> const TransactionStatus {
return TransactionStatus(StatusCode::AUTHENTICATION_ERROR,
caosdb::get_status_description(StatusCode::AUTHENTICATION_ERROR) +
" Original error: " + details);
}
/**
* Factory for a FILE_UPLOAD_ERROR status.
......@@ -125,49 +121,43 @@ public:
* This status means that the transaction failed during the upload of the
* file blobs of file entities.
*/
CAOSDB_TRANSACTION_STATUS_DEFAULT_FACTORY(FILE_UPLOAD_ERROR,
StatusCode::FILE_UPLOAD_ERROR);
CAOSDB_TRANSACTION_STATUS_DEFAULT_FACTORY(FILE_UPLOAD_ERROR, StatusCode::FILE_UPLOAD_ERROR);
/**
* Factory for a FILE_DOWN_ERROR status.
*
* This status means that the transaction failed during the download of the
* file blobs of file entities.
*/
CAOSDB_TRANSACTION_STATUS_DEFAULT_FACTORY(FILE_DOWNLOAD_ERROR,
StatusCode::FILE_DOWNLOAD_ERROR);
CAOSDB_TRANSACTION_STATUS_DEFAULT_FACTORY(FILE_DOWNLOAD_ERROR, StatusCode::FILE_DOWNLOAD_ERROR);
/**
* Factory for a TRANSACTION_ERROR status.
*
* This status means that the transaction failed due to errors thrown by the
* server.
*/
CAOSDB_TRANSACTION_STATUS_DEFAULT_FACTORY(
TRANSACTION_ERROR, StatusCode::GENERIC_TRANSACTION_ERROR)
CAOSDB_TRANSACTION_STATUS_DEFAULT_FACTORY(TRANSACTION_ERROR,
StatusCode::GENERIC_TRANSACTION_ERROR)
/**
* Another factory for a TRANSACTION_ERROR status with a detailed
* description.
*/
inline static auto TRANSACTION_ERROR(const std::string &details)
-> const TransactionStatus {
return TransactionStatus(
StatusCode::GENERIC_TRANSACTION_ERROR,
caosdb::get_status_description(StatusCode::GENERIC_TRANSACTION_ERROR) +
" Original error: " + details);
inline static auto TRANSACTION_ERROR(const std::string &details) -> const TransactionStatus {
return TransactionStatus(StatusCode::GENERIC_TRANSACTION_ERROR,
caosdb::get_status_description(StatusCode::GENERIC_TRANSACTION_ERROR) +
" Original error: " + details);
}
/**
* Factory for a RPC_ERROR with a detailed description.
*
* This status is used for any error on the RPC layer.
*/
inline static auto RPC_ERROR(const std::string &details)
-> const TransactionStatus {
inline static auto RPC_ERROR(const std::string &details) -> const TransactionStatus {
// We use the GENERIC_RPC_ERROR here because we might want to add further
// RPC_ERROR states with different error codes (which stem from GRPC) here
// in the future.
return TransactionStatus(
StatusCode::GENERIC_RPC_ERROR,
caosdb::get_status_description(StatusCode::GENERIC_RPC_ERROR) +
" Original error: " + details);
return TransactionStatus(StatusCode::GENERIC_RPC_ERROR,
caosdb::get_status_description(StatusCode::GENERIC_RPC_ERROR) +
" Original error: " + details);
}
/**
......@@ -177,18 +167,16 @@ public:
* supposedly do not have a special handling.
*/
inline static auto GENERIC_ERROR(const std::string &details) {
return TransactionStatus(
StatusCode::GENERIC_ERROR,
caosdb::get_status_description(StatusCode::GENERIC_ERROR) +
"Original error: " + details);
return TransactionStatus(StatusCode::GENERIC_ERROR,
caosdb::get_status_description(StatusCode::GENERIC_ERROR) +
"Original error: " + details);
}
inline auto ThrowExceptionIfError() const -> void {
TransactionStatus::ThrowExceptionIfError(this->code, this->description);
}
inline static auto ThrowExceptionIfError(StatusCode code,
const std::string &description)
inline static auto ThrowExceptionIfError(StatusCode code, const std::string &description)
-> void {
if (!IsError(code)) {
return;
......@@ -222,18 +210,14 @@ public:
/**
* Return true if this TransactionStatus represents an erroneous state.
*/
inline auto IsError() const -> bool {
return TransactionStatus::IsError(this->code);
};
inline auto IsError() const -> bool { return TransactionStatus::IsError(this->code); };
/**
* Return a description of the erroneous state.
*
* No description yields an empty string.
*/
inline auto GetDescription() const -> const std::string & {
return this->description;
}
inline auto GetDescription() const -> const std::string & { return this->description; }
/**
* Return the status code of the state.
......
include/caosdb/unary_rpc_handler.h
View file @ 51f202ec
......@@ -60,8 +60,7 @@ namespace caosdb::transaction {
class UnaryRpcHandler : public HandlerInterface {
public:
inline UnaryRpcHandler(grpc::CompletionQueue *completion_queue)
: HandlerInterface(), state_(CallState::NewCall),
completion_queue(completion_queue) {}
: HandlerInterface(), state_(CallState::NewCall), completion_queue(completion_queue) {}
void Start() override {
transaction_status = TransactionStatus::EXECUTING();
......
include/caosdb/utility.h
View file @ 51f202ec
......@@ -21,20 +21,25 @@
#ifndef CAOSDB_UTILS_H
#define CAOSDB_UTILS_H
#include "caosdb/entity.h"
#include "caosdb/data_type.h"
#include <boost/beast/core/detail/base64.hpp>
#include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
#include <boost/filesystem/string_file.hpp>
#include <boost/lexical_cast.hpp> // for lexical_cast
#include <boost/json.hpp>
#include <cassert>
#include <cstdlib>
#include <exception> // for logic_error
#include <fstream>
#include <iostream>
#include <map>
#include <memory>
#include <string>
#include <string_view>
#include <mutex>
#include <shared_mutex>
#include <string>
#include <string_view>
namespace caosdb::utility {
using boost::filesystem::exists;
......@@ -43,6 +48,43 @@ using boost::filesystem::path;
using boost::json::stream_parser;
using boost::json::value;
/**
* @brief Get the name of the enum value. May be useful for higher-order CaosDB clients.
*/
template <typename Enum> auto getEnumNameFromValue(Enum v) -> std::string {
if (std::is_same_v<std::underlying_type_t<Enum>, int>) {
return boost::lexical_cast<std::string>(static_cast<int>(v));
}
throw std::logic_error(std::string("Enum type ") + typeid(v).name() + " not implemented.");
}
// Forward declaration of specializations
template <>
auto getEnumNameFromValue<caosdb::entity::AtomicDataType>(caosdb::entity::AtomicDataType v)
-> std::string;
template <>
auto getEnumNameFromValue<caosdb::entity::Importance>(caosdb::entity::Importance v) -> std::string;
template <> auto getEnumNameFromValue<caosdb::entity::Role>(caosdb::entity::Role v) -> std::string;
/**
* @brief Get the enum value from a string.
*
* @detail May be useful for higher-order CaosDB clients and only makes sense if specialized.
*/
template <typename Enum> auto getEnumValueFromName(const std::string &name) -> Enum {
throw std::logic_error(std::string("Enum type ") + typeid(Enum).name() + " not implemented.");
}
// Forward declaration of specializations
template <>
auto getEnumValueFromName<caosdb::entity::AtomicDataType>(const std::string &name)
-> caosdb::entity::AtomicDataType;
template <>
auto getEnumValueFromName<caosdb::entity::Importance>(const std::string &name)
-> caosdb::entity::Importance;
template <>
auto getEnumValueFromName<caosdb::entity::Role>(const std::string &name) -> caosdb::entity::Role;
/**
* @brief Read a text file into a string and return the file's content.
*/
......@@ -68,8 +110,7 @@ inline auto get_env_var(const char *key, const char *fallback) -> const char * {
* @brief Return the value of an environment variable or - if undefined - the
* fallback value.
*/
inline auto get_env_var(const std::string &key, const std::string &fallback)
-> const std::string {
inline auto get_env_var(const std::string &key, const std::string &fallback) -> const std::string {
const char *val = get_env_var(key.c_str(), fallback.c_str());
auto const result = std::string(val);
......@@ -84,8 +125,7 @@ inline auto base64_encode(const std::string &plain) -> std::string {
auto size_encoded = boost::beast::detail::base64::encoded_size(size_plain);
std::unique_ptr<char[]> encoded(new char[size_encoded]);
boost::beast::detail::base64::encode(encoded.get(), plain.c_str(),
size_plain);
boost::beast::detail::base64::encode(encoded.get(), plain.c_str(), size_plain);
// the encoded char[] is not null terminated, so explicitely set the length
return std::string(encoded.get(), encoded.get() + size_encoded);
......
include/caosdb/value.h
View file @ 51f202ec
......@@ -29,12 +29,11 @@
#include <string> // for string
#include <vector> // for vector
#define LIST_VALUE_CONSTRUCTOR(TYPE, SETTER) \
explicit inline Value(const std::vector<TYPE> &values) \
: ProtoMessageWrapper<ProtoValue>() { \
for (const auto &value : values) { \
this->wrapped->mutable_list_values()->add_values()->SETTER(value); \
} \
#define LIST_VALUE_CONSTRUCTOR(TYPE, SETTER) \
explicit inline Value(const std::vector<TYPE> &values) : ProtoMessageWrapper<ProtoValue>() { \
for (const auto &value : values) { \
this->wrapped->mutable_list_values()->add_values()->SETTER(value); \
} \
}
namespace caosdb::entity {
......@@ -58,16 +57,12 @@ enum SpecialValue {
class ScalarValue : public ProtoMessageWrapper<ProtoScalarValue> {
public:
inline ScalarValue(ProtoScalarValue *wrapped)
: ProtoMessageWrapper<ProtoScalarValue>(wrapped) {}
inline ScalarValue(ProtoScalarValue *wrapped) : ProtoMessageWrapper<ProtoScalarValue>(wrapped) {}
[[nodiscard]] inline auto IsString() const noexcept -> bool {
return (this->wrapped->scalar_value_case() ==
ScalarValueCase::kStringValue) ||
(this->wrapped->scalar_value_case() ==
ScalarValueCase::kSpecialValue &&
this->wrapped->special_value() ==
ProtoSpecialValue::SPECIAL_VALUE_EMPTY_STRING);
return (this->wrapped->scalar_value_case() == ScalarValueCase::kStringValue) ||
(this->wrapped->scalar_value_case() == ScalarValueCase::kSpecialValue &&
this->wrapped->special_value() == ProtoSpecialValue::SPECIAL_VALUE_EMPTY_STRING);
return false;
}
[[nodiscard]] inline auto AsString() const noexcept -> const std::string & {
......@@ -76,24 +71,21 @@ public:
}
[[nodiscard]] inline auto IsDouble() const noexcept -> bool {
return (this->wrapped->scalar_value_case() ==
ScalarValueCase::kDoubleValue);
return (this->wrapped->scalar_value_case() == ScalarValueCase::kDoubleValue);
}
[[nodiscard]] inline auto AsDouble() const noexcept -> double {
return this->wrapped->double_value();
}
[[nodiscard]] inline auto IsInteger() const noexcept -> bool {
return (this->wrapped->scalar_value_case() ==
ScalarValueCase::kIntegerValue);
return (this->wrapped->scalar_value_case() == ScalarValueCase::kIntegerValue);
}
[[nodiscard]] inline auto AsInteger() const noexcept -> int64_t {
return this->wrapped->integer_value();
}
[[nodiscard]] inline auto IsBool() const noexcept -> bool {
return (this->wrapped->scalar_value_case() ==
ScalarValueCase::kBooleanValue);
return (this->wrapped->scalar_value_case() == ScalarValueCase::kBooleanValue);
}
[[nodiscard]] inline auto AsBool() const noexcept -> bool {
return this->wrapped->boolean_value();
......@@ -105,10 +97,8 @@ public:
inline Value() : ProtoMessageWrapper<ProtoValue>() {
// has NULL_VALUE now
}
explicit inline Value(ProtoValue *wrapped)
: ProtoMessageWrapper<ProtoValue>(wrapped) {}
explicit inline Value(const std::string &value)
: ProtoMessageWrapper<ProtoValue>() {
explicit inline Value(ProtoValue *wrapped) : ProtoMessageWrapper<ProtoValue>(wrapped) {}
explicit inline Value(const std::string &value) : ProtoMessageWrapper<ProtoValue>() {
this->wrapped->mutable_scalar_value()->set_string_value(value);
}
explicit inline Value(const char *value) : ProtoMessageWrapper<ProtoValue>() {
......@@ -139,10 +129,8 @@ public:
[[nodiscard]] inline auto IsString() const noexcept -> bool {
if (this->wrapped->value_case() == ValueCase::kScalarValue) {
return (this->wrapped->scalar_value().scalar_value_case() ==
ScalarValueCase::kStringValue) ||
(this->wrapped->scalar_value().scalar_value_case() ==
ScalarValueCase::kSpecialValue &&
return (this->wrapped->scalar_value().scalar_value_case() == ScalarValueCase::kStringValue) ||
(this->wrapped->scalar_value().scalar_value_case() == ScalarValueCase::kSpecialValue &&
this->wrapped->scalar_value().special_value() ==
ProtoSpecialValue::SPECIAL_VALUE_EMPTY_STRING);
}
......@@ -156,8 +144,7 @@ public:
[[nodiscard]] inline auto IsDouble() const noexcept -> bool {
if (this->wrapped->value_case() == ValueCase::kScalarValue) {
return (this->wrapped->scalar_value().scalar_value_case() ==
ScalarValueCase::kDoubleValue);
return (this->wrapped->scalar_value().scalar_value_case() == ScalarValueCase::kDoubleValue);
}
return false;
}
......@@ -168,8 +155,7 @@ public:
[[nodiscard]] inline auto IsInteger() const noexcept -> bool {
if (this->wrapped->value_case() == ValueCase::kScalarValue) {
return (this->wrapped->scalar_value().scalar_value_case() ==
ScalarValueCase::kIntegerValue);
return (this->wrapped->scalar_value().scalar_value_case() == ScalarValueCase::kIntegerValue);
}
return false;
}
......@@ -180,8 +166,7 @@ public:
[[nodiscard]] inline auto IsBool() const noexcept -> bool {
if (this->wrapped->value_case() == ValueCase::kScalarValue) {
return (this->wrapped->scalar_value().scalar_value_case() ==
ScalarValueCase::kBooleanValue);
return (this->wrapped->scalar_value().scalar_value_case() == ScalarValueCase::kBooleanValue);
}
return false;
}
......@@ -192,16 +177,14 @@ public:
[[nodiscard]] inline auto IsList() const noexcept -> bool {
return this->wrapped->value_case() == ValueCase::kListValues;
}
[[nodiscard]] inline auto AsList() const noexcept
-> const std::vector<ScalarValue> & {
[[nodiscard]] inline auto AsList() const noexcept -> const std::vector<ScalarValue> & {
if (!IsList()) {
// create empty list
this->list_values = std::make_unique<std::vector<ScalarValue>>();
}
if (this->list_values == nullptr) {
this->list_values = std::make_unique<std::vector<ScalarValue>>();
for (auto &scalar :
*(this->wrapped->mutable_list_values()->mutable_values())) {
for (auto &scalar : *(this->wrapped->mutable_list_values()->mutable_values())) {
this->list_values->push_back(ScalarValue(&scalar));
}
}
......@@ -209,8 +192,7 @@ public:
}
inline auto operator==(const Value &other) const noexcept -> bool {
return this->wrapped->SerializeAsString() ==
other.wrapped->SerializeAsString();
return this->wrapped->SerializeAsString() == other.wrapped->SerializeAsString();
}
inline auto ToString() const noexcept -> const std::string {
......
include/ccaosdb.h
View file @ 51f202ec
......@@ -137,8 +137,7 @@ int caosdb_connection_create_pem_file_certificate_provider(
*
* EXPERT USE ONLY. Only use it when you know what you are doing.
*/
int caosdb_connection_delete_certificate_provider(
caosdb_connection_certificate_provider *provider);
int caosdb_connection_delete_certificate_provider(caosdb_connection_certificate_provider *provider);
/**
* Create a tls-secured connection configuration.
......@@ -153,8 +152,8 @@ int caosdb_connection_delete_certificate_provider(
* Only use it when you know what you are doing.
*/
int caosdb_connection_create_tls_connection_configuration(
caosdb_connection_connection_configuration *out, const char *host,
const int port, caosdb_authentication_authenticator *authenticator,
caosdb_connection_connection_configuration *out, const char *host, const int port,
caosdb_authentication_authenticator *authenticator,
caosdb_connection_certificate_provider *provider);
/**
......@@ -173,8 +172,7 @@ int caosdb_connection_create_tls_connection_configuration(
* Only use it when you know what you are doing.
*/
int caosdb_connection_create_insecure_connection_configuration(
caosdb_connection_connection_configuration *out, const char *host,
const int port);
caosdb_connection_connection_configuration *out, const char *host, const int port);
/**
* Destructor function for the caosdb_connection_connection_configuration
......@@ -192,8 +190,7 @@ int caosdb_connection_delete_connection_configuration(
* @param cacert path to a pem-file.
*/
int caosdb_connection_configuration_add_cacert(
caosdb_connection_connection_configuration *configuration,
const char *cacert);
caosdb_connection_connection_configuration *configuration, const char *cacert);
/**
* Create a plain password authenticator.
......@@ -206,16 +203,14 @@ int caosdb_connection_configuration_add_cacert(
* Only use it when you know what you are doing.
*/
int caosdb_authentication_create_plain_password_authenticator(
caosdb_authentication_authenticator *out, const char *username,
const char *password);
caosdb_authentication_authenticator *out, const char *username, const char *password);
/**
* Destructor function for the caosdb_authentication_authenticator struct.
*
* EXPERT USE ONLY. Only use it when you know what you are doing.
*/
int caosdb_authentication_delete_authenticator(
caosdb_authentication_authenticator *authenticator);
int caosdb_authentication_delete_authenticator(caosdb_authentication_authenticator *authenticator);
/**
* Create a connection instance.
......@@ -239,31 +234,28 @@ int caosdb_connection_create_connection(
*
* EXPERT USE ONLY. Only use it when you know what you are doing.
*/
int caosdb_connection_delete_connection(
caosdb_connection_connection *connection);
int caosdb_connection_delete_connection(caosdb_connection_connection *connection);
/**
* Request the version of the server.
*/
int caosdb_connection_get_version_info(
caosdb_info_version_info *out,
const caosdb_connection_connection *connection);
int caosdb_connection_get_version_info(caosdb_info_version_info *out,
const caosdb_connection_connection *connection);
/**
* Get the default connection from the ConnectionManager.
*
* The default connection is to be specified in a configuration file.
*/
int caosdb_connection_connection_manager_get_default_connection(
caosdb_connection_connection *out);
int caosdb_connection_connection_manager_get_default_connection(caosdb_connection_connection *out);
/**
* Get a named connection from the ConnectionManager.
*
* The named connection is to be specified in a configuration file.
*/
int caosdb_connection_connection_manager_get_connection(
caosdb_connection_connection *out, const char *name);
int caosdb_connection_connection_manager_get_connection(caosdb_connection_connection *out,
const char *name);
/****************************************************************************
* ENTITY STUFF AND TRANSACTIONS
......@@ -282,19 +274,16 @@ typedef struct {
* This transaction has to be deleted manually by
* caosdb_transaction_delete_transaction() later on.
*/
int caosdb_connection_connection_create_transaction(
caosdb_connection_connection *connection,
caosdb_transaction_transaction *out);
int caosdb_transaction_delete_transaction(
caosdb_transaction_transaction *transaction);
int caosdb_transaction_transaction_retrieve_by_id(
caosdb_transaction_transaction *transaction, const char *id);
int caosdb_transaction_transaction_retrieve_by_ids(
caosdb_transaction_transaction *transaction, const char *ids[], int length);
int caosdb_transaction_transaction_query(
caosdb_transaction_transaction *transaction, const char *query);
int caosdb_transaction_transaction_execute(
caosdb_transaction_transaction *transaction);
int caosdb_connection_connection_create_transaction(caosdb_connection_connection *connection,
caosdb_transaction_transaction *out);
int caosdb_transaction_delete_transaction(caosdb_transaction_transaction *transaction);
int caosdb_transaction_transaction_retrieve_by_id(caosdb_transaction_transaction *transaction,
const char *id);
int caosdb_transaction_transaction_retrieve_by_ids(caosdb_transaction_transaction *transaction,
const char *ids[], int length);
int caosdb_transaction_transaction_query(caosdb_transaction_transaction *transaction,
const char *query);
int caosdb_transaction_transaction_execute(caosdb_transaction_transaction *transaction);
// TODO(fspreck) execute_asynchronously may be added as a separate
// function once we actually support asynchronous execution.
......@@ -303,12 +292,11 @@ typedef struct {
bool _deletable = false;
} caosdb_transaction_result_set;
int caosdb_transaction_transaction_get_result_set(
caosdb_transaction_transaction *transaction,
caosdb_transaction_result_set *out);
int caosdb_transaction_transaction_get_result_set(caosdb_transaction_transaction *transaction,
caosdb_transaction_result_set *out);
int caosdb_transaction_transaction_get_count_result(
caosdb_transaction_transaction *transaction, long *out);
int caosdb_transaction_transaction_get_count_result(caosdb_transaction_transaction *transaction,
long *out);
typedef struct {
void *wrapped_entity;
......@@ -317,8 +305,7 @@ typedef struct {
int caosdb_transaction_result_set_at(caosdb_transaction_result_set *result_set,
caosdb_entity_entity *entity, int index);
int caosdb_transaction_result_set_size(
caosdb_transaction_result_set *result_set, int *out);
int caosdb_transaction_result_set_size(caosdb_transaction_result_set *result_set, int *out);
typedef struct {
void *wrapped_property;
......@@ -337,55 +324,41 @@ typedef struct {
int caosdb_entity_entity_get_id(caosdb_entity_entity *entity, char *out);
int caosdb_entity_entity_get_role(caosdb_entity_entity *entity, char *out);
int caosdb_entity_entity_get_name(caosdb_entity_entity *entity, char *out);
int caosdb_entity_entity_get_description(caosdb_entity_entity *entity,
char *out);
int caosdb_entity_entity_get_description(caosdb_entity_entity *entity, char *out);
int caosdb_entity_entity_get_datatype(caosdb_entity_entity *entity, char *out);
int caosdb_entity_entity_get_unit(caosdb_entity_entity *entity, char *out);
int caosdb_entity_entity_get_value(caosdb_entity_entity *entity, char *out);
int caosdb_entity_entity_get_version_id(caosdb_entity_entity *entity,
char *out);
int caosdb_entity_entity_get_errors_size(caosdb_entity_entity *entity,
int *out);
int caosdb_entity_entity_get_error(caosdb_entity_entity *entity,
caosdb_entity_message *out, int index);
int caosdb_entity_entity_get_warnings_size(caosdb_entity_entity *entity,
int *out);
int caosdb_entity_entity_get_warning(caosdb_entity_entity *entity,
caosdb_entity_message *out, int index);
int caosdb_entity_entity_get_version_id(caosdb_entity_entity *entity, char *out);
int caosdb_entity_entity_get_errors_size(caosdb_entity_entity *entity, int *out);
int caosdb_entity_entity_get_error(caosdb_entity_entity *entity, caosdb_entity_message *out,
int index);
int caosdb_entity_entity_get_warnings_size(caosdb_entity_entity *entity, int *out);
int caosdb_entity_entity_get_warning(caosdb_entity_entity *entity, caosdb_entity_message *out,
int index);
int caosdb_entity_entity_get_infos_size(caosdb_entity_entity *entity, int *out);
int caosdb_entity_entity_get_info(caosdb_entity_entity *entity,
caosdb_entity_message *out, int index);
int caosdb_entity_entity_get_properties_size(caosdb_entity_entity *entity,
int *out);
int caosdb_entity_entity_get_property(caosdb_entity_entity *entity,
caosdb_entity_property *out, int index);
int caosdb_entity_entity_get_parents_size(caosdb_entity_entity *entity,
int *out);
int caosdb_entity_entity_get_parent(caosdb_entity_entity *entity,
caosdb_entity_parent *out, int index);
int caosdb_entity_entity_get_info(caosdb_entity_entity *entity, caosdb_entity_message *out,
int index);
int caosdb_entity_entity_get_properties_size(caosdb_entity_entity *entity, int *out);
int caosdb_entity_entity_get_property(caosdb_entity_entity *entity, caosdb_entity_property *out,
int index);
int caosdb_entity_entity_get_parents_size(caosdb_entity_entity *entity, int *out);
int caosdb_entity_entity_get_parent(caosdb_entity_entity *entity, caosdb_entity_parent *out,
int index);
int caosdb_entity_property_get_id(caosdb_entity_property *property, char *out);
int caosdb_entity_property_get_name(caosdb_entity_property *property,
char *out);
int caosdb_entity_property_get_description(caosdb_entity_property *property,
char *out);
int caosdb_entity_property_get_importance(caosdb_entity_property *property,
char *out);
int caosdb_entity_property_get_datatype(caosdb_entity_property *property,
char *out);
int caosdb_entity_property_get_unit(caosdb_entity_property *property,
char *out);
int caosdb_entity_property_get_value(caosdb_entity_property *property,
char *out);
int caosdb_entity_property_get_name(caosdb_entity_property *property, char *out);
int caosdb_entity_property_get_description(caosdb_entity_property *property, char *out);
int caosdb_entity_property_get_importance(caosdb_entity_property *property, char *out);
int caosdb_entity_property_get_datatype(caosdb_entity_property *property, char *out);
int caosdb_entity_property_get_unit(caosdb_entity_property *property, char *out);
int caosdb_entity_property_get_value(caosdb_entity_property *property, char *out);
int caosdb_entity_parent_get_id(caosdb_entity_parent *parent, char *out);
int caosdb_entity_parent_get_name(caosdb_entity_parent *parent, char *out);
int caosdb_entity_parent_get_description(caosdb_entity_parent *parent,
char *out);
int caosdb_entity_parent_get_description(caosdb_entity_parent *parent, char *out);
int caosdb_entity_message_get_code(caosdb_entity_message *message, int *out);
int caosdb_entity_message_get_description(caosdb_entity_message *message,
char *out);
int caosdb_entity_message_get_description(caosdb_entity_message *message, char *out);
// CONSTRUCTORS AND DESTRUCTORS
int caosdb_entity_create_entity(caosdb_entity_entity *out);
......@@ -396,42 +369,27 @@ int caosdb_entity_create_parent(caosdb_entity_parent *out);
int caosdb_entity_delete_parent(caosdb_entity_parent *out);
// SETTERS FOR EVERYTHING THAT MAY BE SET
int caosdb_entity_entity_set_role(caosdb_entity_entity *entity,
const char *role);
int caosdb_entity_entity_set_name(caosdb_entity_entity *entity,
const char *name);
int caosdb_entity_entity_set_description(caosdb_entity_entity *entity,
const char *description);
int caosdb_entity_entity_set_datatype(caosdb_entity_entity *entity,
const char *datatype);
int caosdb_entity_entity_set_unit(caosdb_entity_entity *entity,
const char *unit);
int caosdb_entity_entity_set_value(caosdb_entity_entity *entity,
const char *value);
int caosdb_entity_entity_append_parent(caosdb_entity_entity *entity,
caosdb_entity_parent *parent);
int caosdb_entity_entity_set_role(caosdb_entity_entity *entity, const char *role);
int caosdb_entity_entity_set_name(caosdb_entity_entity *entity, const char *name);
int caosdb_entity_entity_set_description(caosdb_entity_entity *entity, const char *description);
int caosdb_entity_entity_set_datatype(caosdb_entity_entity *entity, const char *datatype);
int caosdb_entity_entity_set_unit(caosdb_entity_entity *entity, const char *unit);
int caosdb_entity_entity_set_value(caosdb_entity_entity *entity, const char *value);
int caosdb_entity_entity_append_parent(caosdb_entity_entity *entity, caosdb_entity_parent *parent);
int caosdb_entity_entity_remove_parent(caosdb_entity_entity *entity, int index);
int caosdb_entity_entity_append_property(caosdb_entity_entity *entity,
caosdb_entity_property *property);
int caosdb_entity_entity_remove_property(caosdb_entity_entity *entity,
int index);
int caosdb_entity_property_set_id(caosdb_entity_property *property,
const char *id);
int caosdb_entity_property_set_name(caosdb_entity_property *property,
const char *name);
int caosdb_entity_property_set_datatype(caosdb_entity_property *property,
const char *datatype);
int caosdb_entity_property_set_importance(caosdb_entity_property *property,
const char *importance);
int caosdb_entity_property_set_unit(caosdb_entity_property *property,
const char *unit);
int caosdb_entity_property_set_value(caosdb_entity_property *property,
const char *value);
int caosdb_entity_entity_remove_property(caosdb_entity_entity *entity, int index);
int caosdb_entity_property_set_id(caosdb_entity_property *property, const char *id);
int caosdb_entity_property_set_name(caosdb_entity_property *property, const char *name);
int caosdb_entity_property_set_datatype(caosdb_entity_property *property, const char *datatype);
int caosdb_entity_property_set_importance(caosdb_entity_property *property, const char *importance);
int caosdb_entity_property_set_unit(caosdb_entity_property *property, const char *unit);
int caosdb_entity_property_set_value(caosdb_entity_property *property, const char *value);
int caosdb_entity_parent_set_id(caosdb_entity_parent *parent, const char *id);
int caosdb_entity_parent_set_name(caosdb_entity_parent *parent,
const char *name);
int caosdb_entity_parent_set_name(caosdb_entity_parent *parent, const char *name);
#ifdef __cplusplus
}
......
src/CMakeLists.txt
View file @ 51f202ec
......@@ -29,6 +29,7 @@ set(libcaosdb_SRC
${CMAKE_CURRENT_SOURCE_DIR}/caosdb/protobuf_helper.cpp
${CMAKE_CURRENT_SOURCE_DIR}/caosdb/transaction.cpp
${CMAKE_CURRENT_SOURCE_DIR}/caosdb/transaction_handler.cpp
${CMAKE_CURRENT_SOURCE_DIR}/caosdb/utility.cpp
${CMAKE_CURRENT_SOURCE_DIR}/caosdb/unary_rpc_handler.cpp
${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/register_file_upload_handler.cpp
${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/upload_request_handler.cpp
......
src/caosdb/authentication.cpp
View file @ 51f202ec
......@@ -34,28 +34,28 @@ using grpc::MetadataCredentialsPlugin;
using grpc::Status;
using grpc::string_ref;
MetadataCredentialsPluginImpl::MetadataCredentialsPluginImpl(std::string key,
std::string value)
MetadataCredentialsPluginImpl::MetadataCredentialsPluginImpl(std::string key, std::string value)
: key(std::move(key)), value(std::move(value)) {}
auto MetadataCredentialsPluginImpl::GetMetadata(
string_ref /*service_url*/, string_ref /*method_name*/,
const AuthContext & /*channel_auth_context*/,
std::multimap<grpc::string, grpc::string> *metadata) -> Status {
auto MetadataCredentialsPluginImpl::GetMetadata(string_ref /*service_url*/,
string_ref /*method_name*/,
const AuthContext & /*channel_auth_context*/,
std::multimap<grpc::string, grpc::string> *metadata)
-> Status {
metadata->insert(std::make_pair(this->key, this->value));
return Status::OK;
}
PlainPasswordAuthenticator::PlainPasswordAuthenticator(
const std::string &username, const std::string &password) {
PlainPasswordAuthenticator::PlainPasswordAuthenticator(const std::string &username,
const std::string &password) {
this->basic = "Basic " + base64_encode(username + ":" + password);
}
auto PlainPasswordAuthenticator::GetCallCredentials() const
-> std::shared_ptr<grpc::CallCredentials> {
auto call_creds = grpc::MetadataCredentialsFromPlugin(
std::unique_ptr<grpc::MetadataCredentialsPlugin>(
auto call_creds =
grpc::MetadataCredentialsFromPlugin(std::unique_ptr<grpc::MetadataCredentialsPlugin>(
new MetadataCredentialsPluginImpl("authentication", this->basic)));
return call_creds;
}
......
src/caosdb/configuration.cpp
View file @ 51f202ec
......@@ -75,8 +75,7 @@ auto PemFileCertificateProvider::GetCertificatePem() const -> std::string {
return this->certificate_provider;
}
PemCertificateProvider::PemCertificateProvider(
const std::string &certificate_provider) {
PemCertificateProvider::PemCertificateProvider(const std::string &certificate_provider) {
this->certificate_provider = certificate_provider;
}
......@@ -84,26 +83,21 @@ auto PemCertificateProvider::GetCertificatePem() const -> std::string {
return this->certificate_provider;
}
ConnectionConfiguration::ConnectionConfiguration(const std::string &host,
int port) {
ConnectionConfiguration::ConnectionConfiguration(const std::string &host, int port) {
this->host = host;
this->port = port;
}
auto ConnectionConfiguration::GetHost() const -> std::string {
return this->host;
}
auto ConnectionConfiguration::GetHost() const -> std::string { return this->host; }
auto ConnectionConfiguration::GetPort() const -> int { return this->port; }
auto operator<<(std::ostream &out, const ConnectionConfiguration &configuration)
-> std::ostream & {
auto operator<<(std::ostream &out, const ConnectionConfiguration &configuration) -> std::ostream & {
out << configuration.ToString();
return out;
}
InsecureConnectionConfiguration::InsecureConnectionConfiguration(
const std::string &host, int port)
InsecureConnectionConfiguration::InsecureConnectionConfiguration(const std::string &host, int port)
: ConnectionConfiguration(host, port) {
this->credentials = InsecureChannelCredentials();
}
......@@ -118,41 +112,38 @@ auto InsecureConnectionConfiguration::ToString() const -> std::string {
std::to_string(this->GetPort()) + ")";
}
TlsConnectionConfiguration::TlsConnectionConfiguration(const std::string &host,
int port)
TlsConnectionConfiguration::TlsConnectionConfiguration(const std::string &host, int port)
: ConnectionConfiguration(host, port) {
SslCredentialsOptions options;
this->credentials = SslCredentials(options);
}
TlsConnectionConfiguration::TlsConnectionConfiguration(
const std::string &host, int port,
const CertificateProvider &certificate_provider)
const std::string &host, int port, const CertificateProvider &certificate_provider)
: ConnectionConfiguration(host, port) {
SslCredentialsOptions options;
options.pem_root_certs = certificate_provider.GetCertificatePem();
this->credentials = SslCredentials(options);
}
TlsConnectionConfiguration::TlsConnectionConfiguration(
const std::string &host, int port, const Authenticator &authenticator)
TlsConnectionConfiguration::TlsConnectionConfiguration(const std::string &host, int port,
const Authenticator &authenticator)
: ConnectionConfiguration(host, port) {
SslCredentialsOptions options;
this->credentials = grpc::CompositeChannelCredentials(
SslCredentials(options), authenticator.GetCallCredentials());
this->credentials =
grpc::CompositeChannelCredentials(SslCredentials(options), authenticator.GetCallCredentials());
}
TlsConnectionConfiguration::TlsConnectionConfiguration(
const std::string &host, int port,
const CertificateProvider &certificate_provider,
const std::string &host, int port, const CertificateProvider &certificate_provider,
const Authenticator &authenticator)
: ConnectionConfiguration(host, port) {
SslCredentialsOptions options;
options.pem_root_certs = certificate_provider.GetCertificatePem();
this->credentials = grpc::CompositeChannelCredentials(
SslCredentials(options), authenticator.GetCallCredentials());
this->credentials =
grpc::CompositeChannelCredentials(SslCredentials(options), authenticator.GetCallCredentials());
}
auto TlsConnectionConfiguration::GetChannelCredentials() const
......@@ -161,31 +152,29 @@ auto TlsConnectionConfiguration::GetChannelCredentials() const
}
auto TlsConnectionConfiguration::ToString() const -> std::string {
return "TlsConnectionConfiguration(" + this->GetHost() + "," +
std::to_string(this->GetPort()) + "," + this->certificate_provider +
")";
return "TlsConnectionConfiguration(" + this->GetHost() + "," + std::to_string(this->GetPort()) +
"," + this->certificate_provider + ")";
}
auto ConnectionConfigurationHelper::CreateCertificateProvider(
const object &from) const -> std::unique_ptr<CertificateProvider> {
auto ConnectionConfigurationHelper::CreateCertificateProvider(const object &from) const
-> std::unique_ptr<CertificateProvider> {
std::unique_ptr<CertificateProvider> certificate_provider;
if (from.contains("server_certificate_path")) {
const value &path_str = from.at("server_certificate_path");
assert(path_str.is_string() == true);
const path certificate_file = path(path_str.as_string().c_str());
if (!exists(certificate_file)) {
throw ConfigurationError(
"File does not exist (server_certificate_path): " +
certificate_file.string());
throw ConfigurationError("File does not exist (server_certificate_path): " +
certificate_file.string());
}
certificate_provider = std::make_unique<PemFileCertificateProvider>(
path(path_str.as_string().c_str()));
certificate_provider =
std::make_unique<PemFileCertificateProvider>(path(path_str.as_string().c_str()));
}
return certificate_provider;
}
auto ConnectionConfigurationHelper::CreateAuthenticator(
const object &from) const -> std::unique_ptr<Authenticator> {
auto ConnectionConfigurationHelper::CreateAuthenticator(const object &from) const
-> std::unique_ptr<Authenticator> {
std::unique_ptr<Authenticator> authenticator;
if (from.contains("authentication")) {
assert(from.at("authentication").is_object());
......@@ -205,8 +194,7 @@ auto ConnectionConfigurationHelper::CreateAuthenticator(
assert(password.is_string());
authenticator = std::make_unique<PlainPasswordAuthenticator>(
std::string(username.as_string().c_str()),
std::string(password.as_string().c_str()));
std::string(username.as_string().c_str()), std::string(password.as_string().c_str()));
} else {
throw ConfigurationError("Unknow authentication type: '" + type + "'.");
}
......@@ -216,22 +204,19 @@ auto ConnectionConfigurationHelper::CreateAuthenticator(
auto ConnectionConfigurationHelper::CreateConnectionConfiguration(
const bool tls, const std::string &host, const int port,
const CertificateProvider *certificate_provider,
const Authenticator *authenticator) const
const CertificateProvider *certificate_provider, const Authenticator *authenticator) const
-> std::unique_ptr<ConnectionConfiguration> {
if (tls) {
if (certificate_provider != nullptr && authenticator != nullptr) {
// authenticated and special certificate
return std::make_unique<TlsConnectionConfiguration>(
host, port, *certificate_provider, *authenticator);
return std::make_unique<TlsConnectionConfiguration>(host, port, *certificate_provider,
*authenticator);
} else if (certificate_provider != nullptr) {
// unauthenticated, special certificate
return std::make_unique<TlsConnectionConfiguration>(
host, port, *certificate_provider);
return std::make_unique<TlsConnectionConfiguration>(host, port, *certificate_provider);
} else if (authenticator != nullptr) {
// authenticated, no special certificate
return std::make_unique<TlsConnectionConfiguration>(host, port,
*authenticator);
return std::make_unique<TlsConnectionConfiguration>(host, port, *authenticator);
}
// unauthenticated, no special certificate
return std::make_unique<TlsConnectionConfiguration>(host, port);
......@@ -250,8 +235,8 @@ auto ConnectionConfigurationHelper::IsTls(const object &from) const -> bool {
return tls;
}
auto ConnectionConfigurationHelper::CreateConnectionConfiguration(
const object &from) const -> std::unique_ptr<ConnectionConfiguration> {
auto ConnectionConfigurationHelper::CreateConnectionConfiguration(const object &from) const
-> std::unique_ptr<ConnectionConfiguration> {
assert(from.contains("host"));
const auto &host = from.at("host");
assert(host.is_string());
......@@ -266,28 +251,30 @@ auto ConnectionConfigurationHelper::CreateConnectionConfiguration(
auto authenticator = CreateAuthenticator(from);
return CreateConnectionConfiguration(
tls, std::string(host.as_string().c_str()),
static_cast<int>(port.as_int64()), certificate_provider.get(),
authenticator.get());
return CreateConnectionConfiguration(tls, std::string(host.as_string().c_str()),
static_cast<int>(port.as_int64()),
certificate_provider.get(), authenticator.get());
}
auto LoggingConfigurationHelper::CreateConsoleSinkConfiguration(
const object & /*from*/, const std::string &name, int level) const
auto LoggingConfigurationHelper::CreateConsoleSinkConfiguration(const object & /*from*/,
const std::string &name,
int level) const
-> std::shared_ptr<caosdb::logging::SinkConfiguration> {
auto result = std::make_shared<ConsoleSinkConfiguration>(name, level);
return result;
}
auto LoggingConfigurationHelper::CreateSyslogSinkConfiguration(
const object & /*from*/, const std::string &name, int level) const
auto LoggingConfigurationHelper::CreateSyslogSinkConfiguration(const object & /*from*/,
const std::string &name,
int level) const
-> std::shared_ptr<caosdb::logging::SinkConfiguration> {
auto result = std::make_shared<SyslogSinkConfiguration>(name, level);
return result;
}
auto LoggingConfigurationHelper::CreateFileSinkConfiguration(
const object &from, const std::string &name, int level) const
auto LoggingConfigurationHelper::CreateFileSinkConfiguration(const object &from,
const std::string &name,
int level) const
-> std::shared_ptr<caosdb::logging::SinkConfiguration> {
auto result = std::make_shared<FileSinkConfiguration>(name, level);
if (from.contains("directory")) {
......@@ -296,16 +283,15 @@ auto LoggingConfigurationHelper::CreateFileSinkConfiguration(
return result;
}
auto LoggingConfigurationHelper::CreateSinkConfiguration(
const object &from, const std::string &name, int default_level) const
auto LoggingConfigurationHelper::CreateSinkConfiguration(const object &from,
const std::string &name,
int default_level) const
-> std::shared_ptr<caosdb::logging::SinkConfiguration> {
assert(from.contains("destination"));
const auto &destination =
std::string(from.at("destination").as_string().c_str());
const auto &destination = std::string(from.at("destination").as_string().c_str());
int level = from.contains("level")
? ConvertLogLevel(from.at("level").as_string().c_str())
: default_level;
int level =
from.contains("level") ? ConvertLogLevel(from.at("level").as_string().c_str()) : default_level;
if (destination == "file") {
return CreateFileSinkConfiguration(from, name, level);
......@@ -318,8 +304,7 @@ auto LoggingConfigurationHelper::CreateSinkConfiguration(
}
}
auto LoggingConfigurationHelper::ConvertLogLevel(
const std::string &string_level) const -> int {
auto LoggingConfigurationHelper::ConvertLogLevel(const std::string &string_level) const -> int {
static std::map<std::string, int> log_level_names = {
{"", CAOSDB_DEFAULT_LOG_LEVEL}, {"off", CAOSDB_LOG_LEVEL_OFF},
{"fatal", CAOSDB_LOG_LEVEL_FATAL}, {"error", CAOSDB_LOG_LEVEL_ERROR},
......@@ -333,11 +318,10 @@ auto LoggingConfigurationHelper::ConvertLogLevel(
}
}
auto LoggingConfigurationHelper::CreateLoggingConfiguration(
const object &from) const -> LoggingConfiguration {
auto default_level_str = from.contains("level")
? std::string(from.at("level").as_string().c_str())
: "";
auto LoggingConfigurationHelper::CreateLoggingConfiguration(const object &from) const
-> LoggingConfiguration {
auto default_level_str =
from.contains("level") ? std::string(from.at("level").as_string().c_str()) : "";
int default_level = ConvertLogLevel(default_level_str);
auto result = LoggingConfiguration(default_level);
......@@ -351,8 +335,8 @@ auto LoggingConfigurationHelper::CreateLoggingConfiguration(
const auto *elem = sinks.begin();
while (elem != sinks.end()) {
result.AddSink(CreateSinkConfiguration(
elem->value().as_object(), elem->key().to_string(), default_level));
result.AddSink(CreateSinkConfiguration(elem->value().as_object(), elem->key().to_string(),
default_level));
elem = std::next(elem);
}
}
......@@ -369,9 +353,8 @@ auto ConfigurationManager::mReset() noexcept -> int {
} catch (const caosdb::exceptions::Exception &exc) {
return exc.GetCode();
} catch (const std::exception &exc) {
CAOSDB_LOG_ERROR(logger_name)
<< "Unknown error during the reset of the ConfigurationManager: "
<< exc.what();
CAOSDB_LOG_ERROR(logger_name) << "Unknown error during the reset of the ConfigurationManager: "
<< exc.what();
return StatusCode::CONFIGURATION_ERROR;
}
}
......@@ -384,15 +367,13 @@ auto ConfigurationManager::mClear() noexcept -> int {
} catch (const caosdb::exceptions::Exception &exc) {
return exc.GetCode();
} catch (const std::exception &exc) {
CAOSDB_LOG_ERROR(logger_name)
<< "Unknown error during the reset of the ConfigurationManager: "
<< exc.what();
CAOSDB_LOG_ERROR(logger_name) << "Unknown error during the reset of the ConfigurationManager: "
<< exc.what();
return StatusCode::CONFIGURATION_ERROR;
}
}
auto ConfigurationManager::mLoadSingleJSONConfiguration(const path &json_file)
-> void {
auto ConfigurationManager::mLoadSingleJSONConfiguration(const path &json_file) -> void {
if (!json_configuration.is_null()) {
throw ConfigurationError("This CaosDB client has already been configured.");
}
......@@ -403,11 +384,10 @@ auto ConfigurationManager::mLoadSingleJSONConfiguration(const path &json_file)
json_configuration = load_json_file(json_file);
}
auto ConfigurationManager::mGetConnectionConfiguration(
const std::string &name) const -> std::unique_ptr<ConnectionConfiguration> {
auto ConfigurationManager::mGetConnectionConfiguration(const std::string &name) const
-> std::unique_ptr<ConnectionConfiguration> {
auto connection_json = GetConnection(name);
return connection_configuration_helper.CreateConnectionConfiguration(
connection_json);
return connection_configuration_helper.CreateConnectionConfiguration(connection_json);
}
auto ConfigurationManager::mGetDefaultConnectionName() const -> std::string {
......@@ -442,33 +422,28 @@ auto ConfigurationManager::GetConfiguration() const -> const object & {
auto ConfigurationManager::GetConnections() const -> const object & {
const auto &configuration = GetConfiguration();
if (!configuration.contains("connections")) {
throw ConfigurationError(
"This CaosDB client hasn't any configured connections.");
throw ConfigurationError("This CaosDB client hasn't any configured connections.");
}
const auto &connections_value = configuration.at("connections");
if (connections_value.is_null()) {
throw ConfigurationError(
"This CaosDB client hasn't any configured connections.");
throw ConfigurationError("This CaosDB client hasn't any configured connections.");
}
assert(connections_value.is_object());
const auto &connections_object = connections_value.as_object();
if (connections_object.empty()) {
throw ConfigurationError(
"This CaosDB client hasn't any configured connections.");
throw ConfigurationError("This CaosDB client hasn't any configured connections.");
}
return connections_object;
}
auto ConfigurationManager::GetConnection(const std::string &name) const
-> const object & {
auto ConfigurationManager::GetConnection(const std::string &name) const -> const object & {
const auto &connections = GetConnections();
if (connections.contains(name)) {
const auto &result_connection = connections.at(name);
assert(result_connection.is_object());
return result_connection.as_object();
}
throw ConfigurationError("The connection '" + name +
"' has not been defined.");
throw ConfigurationError("The connection '" + name + "' has not been defined.");
}
// TODO(tf) This has apparently a cognitive complexity of 34>25 (threshold).
......@@ -476,13 +451,11 @@ auto ConfigurationManager::InitializeDefaults() -> int { // NOLINT
// find the configuration file...
std::unique_ptr<path> configuration_file_path;
for (const char *const &configuration_file :
caosdb::LIBCAOSDB_CONFIGURATION_FILES_PRECEDENCE) {
for (const char *const &configuration_file : caosdb::LIBCAOSDB_CONFIGURATION_FILES_PRECEDENCE) {
if (strcmp(configuration_file, "$CAOSDB_CLIENT_CONFIGURATION") == 0) {
// user specified a file via the environment variable
// TODO(tf) make this thread-secure (concurrency-mt-unsafe)
const auto *from_env_var =
getenv("CAOSDB_CLIENT_CONFIGURATION"); // NOLINT
const auto *from_env_var = getenv("CAOSDB_CLIENT_CONFIGURATION"); // NOLINT
if (from_env_var != nullptr) {
configuration_file_path = std::make_unique<path>(from_env_var);
if (exists(*configuration_file_path)) {
......@@ -532,10 +505,9 @@ auto ConfigurationManager::InitializeDefaults() -> int { // NOLINT
"We are using the default configuration";
}
if (configuration_file_path != nullptr &&
this->json_configuration.is_object()) {
CAOSDB_LOG_INFO(logger_name) << "Loaded configuration from "
<< *(configuration_file_path.get()) << ".";
if (configuration_file_path != nullptr && this->json_configuration.is_object()) {
CAOSDB_LOG_INFO(logger_name) << "Loaded configuration from " << *(configuration_file_path.get())
<< ".";
}
return 0;
......
src/caosdb/connection.cpp
View file @ 51f202ec
......@@ -48,17 +48,14 @@ using caosdb::transaction::TransactionStatus;
Connection::Connection(const ConnectionConfiguration &configuration) {
const std::string target =
configuration.GetHost() + ":" + std::to_string(configuration.GetPort());
this->channel =
grpc::CreateChannel(target, configuration.GetChannelCredentials());
this->channel = grpc::CreateChannel(target, configuration.GetChannelCredentials());
this->general_info_service = GeneralInfoService::NewStub(this->channel);
this->entity_transaction_service =
std::make_shared<EntityTransactionService::Stub>(this->channel);
this->file_transmission_service =
std::make_shared<FileTransmissionService::Stub>(this->channel);
this->file_transmission_service = std::make_shared<FileTransmissionService::Stub>(this->channel);
}
auto Connection::RetrieveVersionInfoNoExceptions() const noexcept
-> TransactionStatus {
auto Connection::RetrieveVersionInfoNoExceptions() const noexcept -> TransactionStatus {
const GetVersionInfoRequest request;
GetVersionInfoResponse response;
......@@ -70,20 +67,18 @@ auto Connection::RetrieveVersionInfoNoExceptions() const noexcept
if (!grpc_status.ok()) {
switch (grpc_status.error_code()) {
case grpc::StatusCode::UNAUTHENTICATED:
status =
TransactionStatus::AUTHENTICATION_ERROR(grpc_status.error_message());
status = TransactionStatus::AUTHENTICATION_ERROR(grpc_status.error_message());
break;
case grpc::StatusCode::UNAVAILABLE:
status = TransactionStatus::CONNECTION_ERROR();
break;
default:
auto error_message = grpc_status.error_message();
status = TransactionStatus::RPC_ERROR(
std::to_string(grpc_status.error_code()) + " - " + error_message);
status = TransactionStatus::RPC_ERROR(std::to_string(grpc_status.error_code()) + " - " +
error_message);
}
} else {
this->version_info =
std::make_unique<VersionInfo>(response.release_version_info());
this->version_info = std::make_unique<VersionInfo>(response.release_version_info());
}
return status;
......@@ -96,8 +91,7 @@ auto Connection::RetrieveVersionInfo() const -> const VersionInfo & {
return *GetVersionInfo();
}
[[nodiscard]] auto Connection::CreateTransaction() const
-> std::unique_ptr<Transaction> {
[[nodiscard]] auto Connection::CreateTransaction() const -> std::unique_ptr<Transaction> {
auto entity_service = this->entity_transaction_service;
auto file_service = this->file_transmission_service;
return std::make_unique<Transaction>(entity_service, file_service);
......@@ -115,19 +109,17 @@ auto ConnectionManager::mGetConnection(const std::string &name) const
auto connection = ConfigurationManager::GetConnectionConfiguration(name);
connections[name] = std::make_shared<Connection>(*connection.release());
} catch (const caosdb::exceptions::ConfigurationError &exc) {
throw caosdb::exceptions::UnknownConnectionError("No connection named '" +
name + "' present.");
throw caosdb::exceptions::UnknownConnectionError("No connection named '" + name +
"' present.");
}
}
return this->connections.at(name);
}
auto ConnectionManager::mGetDefaultConnection() const
-> const std::shared_ptr<Connection> & {
auto ConnectionManager::mGetDefaultConnection() const -> const std::shared_ptr<Connection> & {
if (!HasConnection(default_connection_name)) {
default_connection_name = ConfigurationManager::GetDefaultConnectionName();
auto default_connection =
ConfigurationManager::GetDefaultConnectionConfiguration();
auto default_connection = ConfigurationManager::GetDefaultConnectionConfiguration();
connections[default_connection_name] =
std::make_shared<Connection>(*default_connection.release());
}
......
src/caosdb/entity.cpp
View file @ 51f202ec
......@@ -54,19 +54,13 @@ auto Parent::CreateProtoParent() -> ProtoParent * {
return Arena::CreateMessage<ProtoParent>(get_arena());
}
auto Parent::SetName(const std::string &name) -> void {
this->wrapped->set_name(name);
}
auto Parent::SetName(const std::string &name) -> void { this->wrapped->set_name(name); }
auto Parent::SetId(const std::string &id) -> void { this->wrapped->set_id(id); }
[[nodiscard]] auto Parent::GetId() const -> const std::string & {
return this->wrapped->id();
}
[[nodiscard]] auto Parent::GetId() const -> const std::string & { return this->wrapped->id(); }
[[nodiscard]] auto Parent::GetName() const -> const std::string & {
return this->wrapped->name();
}
[[nodiscard]] auto Parent::GetName() const -> const std::string & { return this->wrapped->name(); }
[[nodiscard]] auto Parent::GetDescription() const -> const std::string & {
return this->wrapped->description();
......@@ -78,9 +72,7 @@ auto Property::CreateProtoProperty() -> ProtoProperty * {
return Arena::CreateMessage<ProtoProperty>(get_arena());
}
[[nodiscard]] auto Property::GetId() const -> const std::string & {
return this->wrapped->id();
}
[[nodiscard]] auto Property::GetId() const -> const std::string & { return this->wrapped->id(); }
[[nodiscard]] auto Property::GetName() const -> const std::string & {
return this->wrapped->name();
......@@ -94,25 +86,17 @@ auto Property::CreateProtoProperty() -> ProtoProperty * {
return static_cast<Importance>(this->wrapped->importance());
}
[[nodiscard]] auto Property::GetValue() const -> const Value & {
return this->value;
}
[[nodiscard]] auto Property::GetValue() const -> const Value & { return this->value; }
[[nodiscard]] auto Property::GetUnit() const -> const std::string & {
return this->wrapped->unit();
}
[[nodiscard]] auto Property::GetDataType() const -> const DataType & {
return this->data_type;
}
[[nodiscard]] auto Property::GetDataType() const -> const DataType & { return this->data_type; }
auto Property::SetId(const std::string &id) -> void {
this->wrapped->set_id(id);
}
auto Property::SetId(const std::string &id) -> void { this->wrapped->set_id(id); }
auto Property::SetName(const std::string &name) -> void {
this->wrapped->set_name(name);
}
auto Property::SetName(const std::string &name) -> void { this->wrapped->set_name(name); }
auto Property::SetDescription(const std::string &description) -> void {
this->wrapped->set_description(description);
......@@ -122,21 +106,13 @@ auto Property::SetImportance(Importance importance) -> void {
this->wrapped->set_importance(static_cast<ProtoImportance>(importance));
}
auto Property::SetValue(const Value &value) -> StatusCode {
return this->value.CopyFrom(value);
}
auto Property::SetValue(const Value &value) -> StatusCode { return this->value.CopyFrom(value); }
auto Property::SetValue(const std::string &value) -> StatusCode {
return SetValue(Value(value));
}
auto Property::SetValue(const std::string &value) -> StatusCode { return SetValue(Value(value)); }
auto Property::SetValue(const char *value) -> StatusCode {
return SetValue(Value(value));
}
auto Property::SetValue(const char *value) -> StatusCode { return SetValue(Value(value)); }
auto Property::SetValue(double value) -> StatusCode {
return SetValue(Value(value));
}
auto Property::SetValue(double value) -> StatusCode { return SetValue(Value(value)); }
auto Property::SetValue(const std::vector<std::string> &values) -> StatusCode {
return SetValue(Value(values));
......@@ -158,51 +134,35 @@ auto Property::SetValue(const std::vector<bool> &values) -> StatusCode {
return SetValue(Value(values));
}
auto Property::SetValue(const int64_t value) -> StatusCode {
return SetValue(Value(value));
}
auto Property::SetValue(const int64_t value) -> StatusCode { return SetValue(Value(value)); }
auto Property::SetValue(const bool value) -> StatusCode {
return SetValue(Value(value));
}
auto Property::SetValue(const bool value) -> StatusCode { return SetValue(Value(value)); }
auto Property::SetUnit(const std::string &unit) -> void {
this->wrapped->set_unit(unit);
}
auto Property::SetUnit(const std::string &unit) -> void { this->wrapped->set_unit(unit); }
auto Property::SetDataType(const DataType &new_data_type) -> StatusCode {
return this->data_type.CopyFrom(new_data_type);
}
auto Property::SetDataType(const AtomicDataType new_data_type) -> StatusCode {
return SetDataType(DataType(new_data_type));
auto Property::SetDataType(const AtomicDataType new_data_type, bool list_type) -> StatusCode {
return SetDataType(DataType(new_data_type, list_type));
}
auto Property::SetDataType(const std::string &new_data_type) -> StatusCode {
return SetDataType(DataType(new_data_type));
auto Property::SetDataType(const std::string &new_data_type, bool list_type) -> StatusCode {
return SetDataType(DataType(new_data_type, list_type));
}
[[nodiscard]] auto Entity::GetParents() const -> const Parents & {
return parents;
}
[[nodiscard]] auto Entity::GetParents() const -> const Parents & { return parents; }
auto Entity::AppendParent(const Parent &parent) -> void {
this->parents.Append(parent);
}
auto Entity::AppendParent(const Parent &parent) -> void { this->parents.Append(parent); }
auto Entity::RemoveParent(int index) -> void { this->parents.Remove(index); }
[[nodiscard]] auto Entity::GetProperties() const -> const Properties & {
return properties;
}
[[nodiscard]] auto Entity::GetProperties() const -> const Properties & { return properties; }
auto Entity::AppendProperty(const Property &property) -> void {
this->properties.Append(property);
}
auto Entity::AppendProperty(const Property &property) -> void { this->properties.Append(property); }
auto Entity::RemoveProperty(int index) -> void {
this->properties.Remove(index);
}
auto Entity::RemoveProperty(int index) -> void { this->properties.Remove(index); }
auto Entity::CreateProtoEntity() -> ProtoEntity * {
return Arena::CreateMessage<ProtoEntity>(get_arena());
......@@ -228,17 +188,11 @@ auto Entity::SetVersionId(const std::string &id) -> void {
this->wrapped->mutable_version()->set_id(id);
}
auto Entity::CopyTo(ProtoEntity *target) -> void {
target->CopyFrom(*(this->wrapped));
}
auto Entity::CopyTo(ProtoEntity *target) -> void { target->CopyFrom(*(this->wrapped)); }
auto Entity::SetRole(Role role) -> void {
this->wrapped->set_role(static_cast<EntityRole>(role));
}
auto Entity::SetRole(Role role) -> void { this->wrapped->set_role(static_cast<EntityRole>(role)); }
auto Entity::SetName(const std::string &name) -> void {
this->wrapped->set_name(name);
}
auto Entity::SetName(const std::string &name) -> void { this->wrapped->set_name(name); }
auto Entity::SetDescription(const std::string &description) -> void {
this->wrapped->set_description(description);
......@@ -251,17 +205,11 @@ auto Entity::SetValue(const Value &value) -> StatusCode {
return this->value.CopyFrom(value);
}
auto Entity::SetValue(const std::string &value) -> StatusCode {
return SetValue(Value(value));
}
auto Entity::SetValue(const std::string &value) -> StatusCode { return SetValue(Value(value)); }
auto Entity::SetValue(const char *value) -> StatusCode {
return SetValue(Value(value));
}
auto Entity::SetValue(const char *value) -> StatusCode { return SetValue(Value(value)); }
auto Entity::SetValue(double value) -> StatusCode {
return SetValue(Value(value));
}
auto Entity::SetValue(double value) -> StatusCode { return SetValue(Value(value)); }
auto Entity::SetValue(const std::vector<std::string> &values) -> StatusCode {
return SetValue(Value(values));
......@@ -283,17 +231,11 @@ auto Entity::SetValue(const std::vector<bool> &values) -> StatusCode {
return SetValue(Value(values));
}
auto Entity::SetValue(const int64_t value) -> StatusCode {
return SetValue(Value(value));
}
auto Entity::SetValue(const int64_t value) -> StatusCode { return SetValue(Value(value)); }
auto Entity::SetValue(const bool value) -> StatusCode {
return SetValue(Value(value));
}
auto Entity::SetValue(const bool value) -> StatusCode { return SetValue(Value(value)); }
auto Entity::SetUnit(const std::string &unit) -> void {
this->wrapped->set_unit(unit);
}
auto Entity::SetUnit(const std::string &unit) -> void { this->wrapped->set_unit(unit); }
auto Entity::SetDataType(const DataType &new_data_type) -> StatusCode {
if (GetRole() != Role::PROPERTY) {
......@@ -302,12 +244,12 @@ auto Entity::SetDataType(const DataType &new_data_type) -> StatusCode {
return this->data_type.CopyFrom(new_data_type);
}
auto Entity::SetDataType(const AtomicDataType new_data_type) -> StatusCode {
return SetDataType(DataType(new_data_type));
auto Entity::SetDataType(const AtomicDataType new_data_type, bool list_type) -> StatusCode {
return SetDataType(DataType(new_data_type, list_type));
}
auto Entity::SetDataType(const std::string &new_data_type) -> StatusCode {
return SetDataType(DataType(new_data_type));
auto Entity::SetDataType(const std::string &new_data_type, bool list_type) -> StatusCode {
return SetDataType(DataType(new_data_type, list_type));
}
auto Entity::SetFilePath(const std::string &path) -> void {
......
src/caosdb/file_transmission/download_request_handler.cpp
View file @ 51f202ec
......@@ -76,14 +76,13 @@ using caosdb::StatusCode;
using caosdb::utility::get_arena;
using google::protobuf::Arena;
DownloadRequestHandler::DownloadRequestHandler(
HandlerTag tag, FileTransmissionService::Stub *stub,
grpc::CompletionQueue *cq, FileDescriptor file_descriptor)
DownloadRequestHandler::DownloadRequestHandler(HandlerTag tag, FileTransmissionService::Stub *stub,
grpc::CompletionQueue *cq,
FileDescriptor file_descriptor)
: tag_(tag), stub_(stub), cq_(cq),
request_(Arena::CreateMessage<FileDownloadRequest>(get_arena())),
response_(Arena::CreateMessage<FileDownloadResponse>(get_arena())),
state_(CallState::NewCall), file_descriptor_(std::move(file_descriptor)),
bytesReceived_(0) {}
response_(Arena::CreateMessage<FileDownloadResponse>(get_arena())), state_(CallState::NewCall),
file_descriptor_(std::move(file_descriptor)), bytesReceived_(0) {}
bool DownloadRequestHandler::OnNext(bool ok) {
try {
......@@ -105,15 +104,13 @@ bool DownloadRequestHandler::OnNext(bool ok) {
return true;
} catch (std::exception &e) {
CAOSDB_LOG_ERROR(logger_name)
<< "DownloadRequestHandler caught an exception: " << e.what();
CAOSDB_LOG_ERROR(logger_name) << "DownloadRequestHandler caught an exception: " << e.what();
transaction_status = TransactionStatus::GENERIC_ERROR(e.what());
state_ = CallState::CallComplete;
} catch (...) {
CAOSDB_LOG_ERROR(logger_name)
<< "Transaction error: unknown exception caught";
transaction_status = TransactionStatus::GENERIC_ERROR(
"DownloadRequestHandler caught an unknown exception");
CAOSDB_LOG_ERROR(logger_name) << "Transaction error: unknown exception caught";
transaction_status =
TransactionStatus::GENERIC_ERROR("DownloadRequestHandler caught an unknown exception");
state_ = CallState::CallComplete;
}
......@@ -129,36 +126,30 @@ bool DownloadRequestHandler::OnNext(bool ok) {
void DownloadRequestHandler::Cancel() { ctx_.TryCancel(); }
void DownloadRequestHandler::handleNewCallState() {
CAOSDB_LOG_TRACE(logger_name)
<< "Enter DownloadRequestHandler::handleNewCallState. local_path = "
<< file_descriptor_.local_path
<< ", download_id = " << file_descriptor_.file_transmission_id;
CAOSDB_LOG_TRACE(logger_name) << "Enter DownloadRequestHandler::handleNewCallState. local_path = "
<< file_descriptor_.local_path
<< ", download_id = " << file_descriptor_.file_transmission_id;
fileWriter_ = std::make_unique<FileWriter>(file_descriptor_.local_path);
request_->mutable_file_transmission_id()->CopyFrom(
*(file_descriptor_.file_transmission_id));
request_->mutable_file_transmission_id()->CopyFrom(*(file_descriptor_.file_transmission_id));
rpc_ = stub_->PrepareAsyncFileDownload(&ctx_, *request_, cq_);
transaction_status = TransactionStatus::EXECUTING();
state_ = CallState::SendingRequest;
rpc_->StartCall(tag_);
CAOSDB_LOG_TRACE(logger_name)
<< "Leave DownloadRequestHandler::handleNewCallState";
CAOSDB_LOG_TRACE(logger_name) << "Leave DownloadRequestHandler::handleNewCallState";
}
void DownloadRequestHandler::handleSendingRequestState() {
CAOSDB_LOG_TRACE(logger_name)
<< "Enter DownloadRequestHandler::handleSendingRequestState";
CAOSDB_LOG_TRACE(logger_name) << "Enter DownloadRequestHandler::handleSendingRequestState";
state_ = CallState::ReceivingFile;
rpc_->Read(response_, tag_);
CAOSDB_LOG_TRACE(logger_name)
<< "Leave DownloadRequestHandler::handleSendingRequestState";
CAOSDB_LOG_TRACE(logger_name) << "Leave DownloadRequestHandler::handleSendingRequestState";
}
void DownloadRequestHandler::handleReceivingFileState() {
CAOSDB_LOG_TRACE(logger_name)
<< "Enter DownloadRequestHandler::handleReceivingFileState";
CAOSDB_LOG_TRACE(logger_name) << "Enter DownloadRequestHandler::handleReceivingFileState";
if (response_->has_chunk()) {
const auto &chunkData = response_->chunk().data();
if (chunkData.empty()) {
......@@ -174,35 +165,30 @@ void DownloadRequestHandler::handleReceivingFileState() {
} else {
throw std::runtime_error("File chunk expected");
}
CAOSDB_LOG_TRACE(logger_name)
<< "Leave DownloadRequestHandler::handleReceivingFileState";
CAOSDB_LOG_TRACE(logger_name) << "Leave DownloadRequestHandler::handleReceivingFileState";
}
void DownloadRequestHandler::handleCallCompleteState() {
CAOSDB_LOG_TRACE(logger_name)
<< "Enter DownloadRequestHandler::handleCallCompleteState";
CAOSDB_LOG_TRACE(logger_name) << "Enter DownloadRequestHandler::handleCallCompleteState";
switch (status_.error_code()) {
case grpc::OK: {
CAOSDB_LOG_INFO(logger_name)
<< "DownloadRequestHandler finished successfully ("
<< file_descriptor_.local_path << "): Download complete, "
<< bytesReceived_ << " bytes received.";
CAOSDB_LOG_INFO(logger_name) << "DownloadRequestHandler finished successfully ("
<< file_descriptor_.local_path << "): Download complete, "
<< bytesReceived_ << " bytes received.";
} break;
default: {
auto code(static_cast<StatusCode>(status_.error_code()));
std::string description(get_status_description(code) +
" Original message: " + status_.error_message());
transaction_status = TransactionStatus(code, description);
CAOSDB_LOG_ERROR(logger_name)
<< "DownloadRequestHandler finished with an error ("
<< file_descriptor_.local_path << "): Download aborted with code " << code
<< " - " << description;
CAOSDB_LOG_ERROR(logger_name) << "DownloadRequestHandler finished with an error ("
<< file_descriptor_.local_path << "): Download aborted with code "
<< code << " - " << description;
} break;
}
CAOSDB_LOG_TRACE(logger_name)
<< "Leave DownloadRequestHandler::handleCallCompleteState";
CAOSDB_LOG_TRACE(logger_name) << "Leave DownloadRequestHandler::handleCallCompleteState";
}
} // namespace caosdb::transaction
src/caosdb/file_transmission/file_writer.cpp
View file @ 51f202ec
......@@ -53,8 +53,7 @@
namespace caosdb::transaction {
FileWriter::FileWriter(boost::filesystem::path filename)
: filename_(std::move(filename)) {
FileWriter::FileWriter(boost::filesystem::path filename) : filename_(std::move(filename)) {
this->openFile();
}
......
src/caosdb/file_transmission/register_file_upload_handler.cpp
View file @ 51f202ec
......@@ -59,26 +59,24 @@ namespace caosdb::transaction {
RegisterFileUploadHandler::~RegisterFileUploadHandler() = default;
RegisterFileUploadHandler::RegisterFileUploadHandler(
HandlerTag tag, FileTransmissionService::Stub *stub,
grpc::CompletionQueue *completion_queue, RegisterFileUploadRequest *request,
RegisterFileUploadResponse *response)
: UnaryRpcHandler(completion_queue), tag_(tag), stub_(stub),
request_(request), response_(response) {}
RegisterFileUploadHandler::RegisterFileUploadHandler(HandlerTag tag,
FileTransmissionService::Stub *stub,
grpc::CompletionQueue *completion_queue,
RegisterFileUploadRequest *request,
RegisterFileUploadResponse *response)
: UnaryRpcHandler(completion_queue), tag_(tag), stub_(stub), request_(request),
response_(response) {}
void RegisterFileUploadHandler::handleNewCallState() {
CAOSDB_LOG_TRACE(logger_name)
<< "Enter RegisterFileUploadHandler::handleNewCallState.";
CAOSDB_LOG_TRACE(logger_name) << "Enter RegisterFileUploadHandler::handleNewCallState.";
rpc_ = stub_->PrepareAsyncRegisterFileUpload(&call_context, *request_,
completion_queue);
rpc_ = stub_->PrepareAsyncRegisterFileUpload(&call_context, *request_, completion_queue);
state_ = CallState::CallComplete;
rpc_->StartCall();
rpc_->Finish(response_, &status_, tag_);
CAOSDB_LOG_TRACE(logger_name)
<< "Leave RegisterFileUploadHandler::handleNewCallState";
CAOSDB_LOG_TRACE(logger_name) << "Leave RegisterFileUploadHandler::handleNewCallState";
}
} // namespace caosdb::transaction
src/caosdb/file_transmission/upload_request_handler.cpp
View file @ 51f202ec
......@@ -78,15 +78,12 @@ using caosdb::StatusCode;
using caosdb::utility::get_arena;
using google::protobuf::Arena;
UploadRequestHandler::UploadRequestHandler(HandlerTag tag,
FileTransmissionService::Stub *stub,
UploadRequestHandler::UploadRequestHandler(HandlerTag tag, FileTransmissionService::Stub *stub,
grpc::CompletionQueue *cq,
FileDescriptor file_descriptor)
: tag_(tag), stub_(stub), cq_(cq),
request_(Arena::CreateMessage<FileUploadRequest>(get_arena())),
response_(Arena::CreateMessage<FileUploadResponse>(get_arena())),
state_(CallState::NewCall), file_descriptor_(std::move(file_descriptor)),
bytesToSend_(0) {}
: tag_(tag), stub_(stub), cq_(cq), request_(Arena::CreateMessage<FileUploadRequest>(get_arena())),
response_(Arena::CreateMessage<FileUploadResponse>(get_arena())), state_(CallState::NewCall),
file_descriptor_(std::move(file_descriptor)), bytesToSend_(0) {}
bool UploadRequestHandler::OnNext(bool ok) {
try {
......@@ -110,15 +107,13 @@ bool UploadRequestHandler::OnNext(bool ok) {
return true;
} catch (std::exception &e) {
CAOSDB_LOG_ERROR(logger_name)
<< "UploadRequestHandler caught an exception: " << e.what();
CAOSDB_LOG_ERROR(logger_name) << "UploadRequestHandler caught an exception: " << e.what();
transaction_status = TransactionStatus::GENERIC_ERROR(e.what());
state_ = CallState::CallComplete;
} catch (...) {
CAOSDB_LOG_ERROR(logger_name)
<< "Transaction error: unknown exception caught";
transaction_status = TransactionStatus::GENERIC_ERROR(
"UploadRequestHandler caught an unknown exception");
CAOSDB_LOG_ERROR(logger_name) << "Transaction error: unknown exception caught";
transaction_status =
TransactionStatus::GENERIC_ERROR("UploadRequestHandler caught an unknown exception");
state_ = CallState::CallComplete;
}
......@@ -188,31 +183,27 @@ void UploadRequestHandler::handleExpectingResponseState() {
}
void UploadRequestHandler::handleCallCompleteState() {
CAOSDB_LOG_TRACE(logger_name)
<< "Enter UploadRequestHandler::handleCallCompleteState";
CAOSDB_LOG_TRACE(logger_name) << "Enter UploadRequestHandler::handleCallCompleteState";
switch (status_.error_code()) {
case grpc::OK: {
auto bytesSent = fileReader_ != nullptr ? fileReader_->fileSize() : 0;
CAOSDB_LOG_INFO(logger_name)
<< "UploadRequestHandler finished successfully ("
<< file_descriptor_.local_path << "): upload complete, " << bytesSent
<< " bytes sent";
CAOSDB_LOG_INFO(logger_name) << "UploadRequestHandler finished successfully ("
<< file_descriptor_.local_path << "): upload complete, "
<< bytesSent << " bytes sent";
} break;
default: {
auto code(static_cast<StatusCode>(status_.error_code()));
std::string description(get_status_description(code) +
" Original message: " + status_.error_message());
transaction_status = TransactionStatus(code, description);
CAOSDB_LOG_ERROR(logger_name)
<< "UploadRequestHandler finished with an error ("
<< file_descriptor_.local_path << "): Upload aborted with code " << code
<< " - " << description;
CAOSDB_LOG_ERROR(logger_name) << "UploadRequestHandler finished with an error ("
<< file_descriptor_.local_path << "): Upload aborted with code "
<< code << " - " << description;
} break;
}
CAOSDB_LOG_TRACE(logger_name)
<< "Leave UploadRequestHandler::handleCallCompleteState";
CAOSDB_LOG_TRACE(logger_name) << "Leave UploadRequestHandler::handleCallCompleteState";
}
} // namespace caosdb::transaction