From 8691cff8dfc1e3f42a85bba4e125705a24daefc0 Mon Sep 17 00:00:00 2001 From: CJ Cobb Date: Tue, 2 Mar 2021 10:23:58 -0500 Subject: [PATCH] rename CassandraFlatMapBackend to CassandraBackend and rename file --- CMakeLists.txt | 2 +- reporting/BackendFactory.h | 4 +- ...ortingBackend.cpp => CassandraBackend.cpp} | 64 +++++++++---------- ...{ReportingBackend.h => CassandraBackend.h} | 38 +++++------ 4 files changed, 52 insertions(+), 56 deletions(-) rename reporting/{ReportingBackend.cpp => CassandraBackend.cpp} (96%) rename reporting/{ReportingBackend.h => CassandraBackend.h} (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f6c9139..2c66a9e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ include(Postgres) target_sources(reporting PRIVATE reporting/ETLSource.cpp - reporting/ReportingBackend.cpp + reporting/CassandraBackend.cpp reporting/PostgresBackend.cpp reporting/Pg.cpp reporting/DBHelpers.cpp diff --git a/reporting/BackendFactory.h b/reporting/BackendFactory.h index a284709d..b2932c26 100644 --- a/reporting/BackendFactory.h +++ b/reporting/BackendFactory.h @@ -1,7 +1,7 @@ #ifndef RIPPLE_APP_REPORTING_BACKENDFACTORY_H_INCLUDED #define RIPPLE_APP_REPORTING_BACKENDFACTORY_H_INCLUDED #include -#include +#include namespace Backend { std::unique_ptr makeBackend(boost::json::object const& config) @@ -10,7 +10,7 @@ makeBackend(boost::json::object const& config) if (dbConfig.contains("cassandra")) { - auto backend = std::make_unique( + auto backend = std::make_unique( dbConfig.at("cassandra").as_object()); return std::move(backend); } diff --git a/reporting/ReportingBackend.cpp b/reporting/CassandraBackend.cpp similarity index 96% rename from reporting/ReportingBackend.cpp rename to reporting/CassandraBackend.cpp index c53a0e98..b33ecaae 100644 --- a/reporting/ReportingBackend.cpp +++ b/reporting/CassandraBackend.cpp @@ -1,4 +1,4 @@ -#include +#include namespace Backend { // Process the result of an asynchronous write. Retry on error // @param fut cassandra future associated with the write @@ -6,9 +6,9 @@ namespace Backend { void flatMapWriteCallback(CassFuture* fut, void* cbData) { - CassandraFlatMapBackend::WriteCallbackData& requestParams = - *static_cast(cbData); - CassandraFlatMapBackend const& backend = *requestParams.backend; + CassandraBackend::WriteCallbackData& requestParams = + *static_cast(cbData); + CassandraBackend const& backend = *requestParams.backend; auto rc = cass_future_error_code(fut); if (rc != CASS_OK) { @@ -42,9 +42,9 @@ flatMapWriteCallback(CassFuture* fut, void* cbData) void flatMapWriteBookCallback(CassFuture* fut, void* cbData) { - CassandraFlatMapBackend::WriteCallbackData& requestParams = - *static_cast(cbData); - CassandraFlatMapBackend const& backend = *requestParams.backend; + CassandraBackend::WriteCallbackData& requestParams = + *static_cast(cbData); + CassandraBackend const& backend = *requestParams.backend; auto rc = cass_future_error_code(fut); if (rc != CASS_OK) { @@ -79,9 +79,9 @@ flatMapWriteBookCallback(CassFuture* fut, void* cbData) void flatMapWriteKeyCallback(CassFuture* fut, void* cbData) { - CassandraFlatMapBackend::WriteCallbackData& requestParams = - *static_cast(cbData); - CassandraFlatMapBackend const& backend = *requestParams.backend; + CassandraBackend::WriteCallbackData& requestParams = + *static_cast(cbData); + CassandraBackend const& backend = *requestParams.backend; auto rc = cass_future_error_code(fut); if (rc != CASS_OK) { @@ -118,9 +118,9 @@ flatMapWriteKeyCallback(CassFuture* fut, void* cbData) void flatMapGetCreatedCallback(CassFuture* fut, void* cbData) { - CassandraFlatMapBackend::WriteCallbackData& requestParams = - *static_cast(cbData); - CassandraFlatMapBackend const& backend = *requestParams.backend; + CassandraBackend::WriteCallbackData& requestParams = + *static_cast(cbData); + CassandraBackend const& backend = *requestParams.backend; auto rc = cass_future_error_code(fut); if (rc != CASS_OK) { @@ -178,10 +178,9 @@ flatMapGetCreatedCallback(CassFuture* fut, void* cbData) void flatMapWriteTransactionCallback(CassFuture* fut, void* cbData) { - CassandraFlatMapBackend::WriteTransactionCallbackData& requestParams = - *static_cast( - cbData); - CassandraFlatMapBackend const& backend = *requestParams.backend; + CassandraBackend::WriteTransactionCallbackData& requestParams = + *static_cast(cbData); + CassandraBackend const& backend = *requestParams.backend; auto rc = cass_future_error_code(fut); if (rc != CASS_OK) { @@ -213,10 +212,9 @@ flatMapWriteTransactionCallback(CassFuture* fut, void* cbData) void flatMapWriteAccountTxCallback(CassFuture* fut, void* cbData) { - CassandraFlatMapBackend::WriteAccountTxCallbackData& requestParams = - *static_cast( - cbData); - CassandraFlatMapBackend const& backend = *requestParams.backend; + CassandraBackend::WriteAccountTxCallbackData& requestParams = + *static_cast(cbData); + CassandraBackend const& backend = *requestParams.backend; auto rc = cass_future_error_code(fut); if (rc != CASS_OK) { @@ -250,10 +248,9 @@ flatMapWriteAccountTxCallback(CassFuture* fut, void* cbData) void flatMapWriteLedgerHeaderCallback(CassFuture* fut, void* cbData) { - CassandraFlatMapBackend::WriteLedgerHeaderCallbackData& requestParams = - *static_cast( - cbData); - CassandraFlatMapBackend const& backend = *requestParams.backend; + CassandraBackend::WriteLedgerHeaderCallbackData& requestParams = + *static_cast(cbData); + CassandraBackend const& backend = *requestParams.backend; auto rc = cass_future_error_code(fut); if (rc != CASS_OK) { @@ -285,10 +282,9 @@ flatMapWriteLedgerHeaderCallback(CassFuture* fut, void* cbData) void flatMapWriteLedgerHashCallback(CassFuture* fut, void* cbData) { - CassandraFlatMapBackend::WriteLedgerHashCallbackData& requestParams = - *static_cast( - cbData); - CassandraFlatMapBackend const& backend = *requestParams.backend; + CassandraBackend::WriteLedgerHashCallbackData& requestParams = + *static_cast(cbData); + CassandraBackend const& backend = *requestParams.backend; auto rc = cass_future_error_code(fut); if (rc != CASS_OK) { @@ -324,8 +320,8 @@ flatMapWriteLedgerHashCallback(CassFuture* fut, void* cbData) void flatMapReadCallback(CassFuture* fut, void* cbData) { - CassandraFlatMapBackend::ReadCallbackData& requestParams = - *static_cast(cbData); + CassandraBackend::ReadCallbackData& requestParams = + *static_cast(cbData); CassError rc = cass_future_error_code(fut); @@ -398,8 +394,8 @@ flatMapReadCallback(CassFuture* fut, void* cbData) void flatMapReadObjectCallback(CassFuture* fut, void* cbData) { - CassandraFlatMapBackend::ReadObjectCallbackData& requestParams = - *static_cast(cbData); + CassandraBackend::ReadObjectCallbackData& requestParams = + *static_cast(cbData); CassError rc = cass_future_error_code(fut); @@ -457,7 +453,7 @@ flatMapReadObjectCallback(CassFuture* fut, void* cbData) } void -CassandraFlatMapBackend::open() +CassandraBackend::open() { std::cout << config_ << std::endl; auto getString = [this](std::string const& field) -> std::string { diff --git a/reporting/ReportingBackend.h b/reporting/CassandraBackend.h similarity index 98% rename from reporting/ReportingBackend.h rename to reporting/CassandraBackend.h index 82576ba8..7297d3c1 100644 --- a/reporting/ReportingBackend.h +++ b/reporting/CassandraBackend.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_REPORTING_REPORTINGBACKEND_H_INCLUDED -#define RIPPLE_APP_REPORTING_REPORTINGBACKEND_H_INCLUDED +#ifndef RIPPLE_APP_REPORTING_CASSANDRABACKEND_H_INCLUDED +#define RIPPLE_APP_REPORTING_CASSANDRABACKEND_H_INCLUDED #include #include @@ -57,7 +57,7 @@ flatMapWriteLedgerHeaderCallback(CassFuture* fut, void* cbData); void flatMapWriteLedgerHashCallback(CassFuture* fut, void* cbData); -class CassandraFlatMapBackend : public BackendInterface +class CassandraBackend : public BackendInterface { private: // convenience function for one-off queries. For normal reads and writes, @@ -142,11 +142,11 @@ private: mutable bool isFirstLedger_ = false; public: - CassandraFlatMapBackend(boost::json::object const& config) : config_(config) + CassandraBackend(boost::json::object const& config) : config_(config) { } - ~CassandraFlatMapBackend() override + ~CassandraBackend() override { if (open_) close(); @@ -395,13 +395,13 @@ public: struct WriteLedgerHeaderCallbackData { - CassandraFlatMapBackend const* backend; + CassandraBackend const* backend; uint32_t sequence; std::string header; uint32_t currentRetries = 0; WriteLedgerHeaderCallbackData( - CassandraFlatMapBackend const* f, + CassandraBackend const* f, uint32_t sequence, std::string&& header) : backend(f), sequence(sequence), header(std::move(header)) @@ -410,13 +410,13 @@ public: }; struct WriteLedgerHashCallbackData { - CassandraFlatMapBackend const* backend; + CassandraBackend const* backend; ripple::uint256 hash; uint32_t sequence; uint32_t currentRetries = 0; WriteLedgerHashCallbackData( - CassandraFlatMapBackend const* f, + CassandraBackend const* f, ripple::uint256 hash, uint32_t sequence) : backend(f), hash(hash), sequence(sequence) @@ -1185,7 +1185,7 @@ public: struct ReadCallbackData { - CassandraFlatMapBackend const& backend; + CassandraBackend const& backend; ripple::uint256 const& hash; TransactionAndMetadata& result; std::condition_variable& cv; @@ -1194,7 +1194,7 @@ public: size_t batchSize; ReadCallbackData( - CassandraFlatMapBackend const& backend, + CassandraBackend const& backend, ripple::uint256 const& hash, TransactionAndMetadata& result, std::condition_variable& cv, @@ -1274,7 +1274,7 @@ public: struct ReadObjectCallbackData { - CassandraFlatMapBackend const& backend; + CassandraBackend const& backend; ripple::uint256 const& key; uint32_t sequence; Blob& result; @@ -1284,7 +1284,7 @@ public: size_t batchSize; ReadObjectCallbackData( - CassandraFlatMapBackend const& backend, + CassandraBackend const& backend, ripple::uint256 const& key, uint32_t sequence, Blob& result, @@ -1380,7 +1380,7 @@ public: struct WriteCallbackData { - CassandraFlatMapBackend const* backend; + CassandraBackend const* backend; std::string key; uint32_t sequence; uint32_t createdSequence = 0; @@ -1393,7 +1393,7 @@ public: std::atomic refs = 1; WriteCallbackData( - CassandraFlatMapBackend const* f, + CassandraBackend const* f, std::string&& key, uint32_t sequence, std::string&& blob, @@ -1416,14 +1416,14 @@ public: }; struct WriteAccountTxCallbackData { - CassandraFlatMapBackend const* backend; + CassandraBackend const* backend; AccountTransactionsData data; uint32_t currentRetries = 0; std::atomic refs; WriteAccountTxCallbackData( - CassandraFlatMapBackend const* f, + CassandraBackend const* f, AccountTransactionsData&& data) : backend(f), data(std::move(data)), refs(data.accounts.size()) { @@ -1858,7 +1858,7 @@ public: struct WriteTransactionCallbackData { - CassandraFlatMapBackend const* backend; + CassandraBackend const* backend; // The shared pointer to the node object must exist until it's // confirmed persisted. Otherwise, it can become deleted // prematurely if other copies are removed from caches. @@ -1870,7 +1870,7 @@ public: uint32_t currentRetries = 0; WriteTransactionCallbackData( - CassandraFlatMapBackend const* f, + CassandraBackend const* f, std::string&& hash, uint32_t sequence, std::string&& transaction,