From 299654e9d649964deeed3aadfa3b76ae1fa81e4d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 26 Aug 2024 15:12:32 +0000 Subject: [PATCH] refactor: Move collections into lib_system --- .../md/binance/BinanceSecurityRequestor.cpp | 4 +- .../sparkd/md/binance/BinanceSubscription.cpp | 2 +- .../binance_us/BinanceUsSecurityRequestor.cpp | 4 +- .../md/binance_us/BinanceUsSubscription.cpp | 4 +- .../BinanceUsdsFuturesSecurityRequestor.cpp | 6 +-- .../md/ccapi/CCApiCompositeMessageHandler.cpp | 2 +- .../sparkd/md/ccapi/CCApiEventDemuxer.cpp | 4 +- .../md/coinbase/CoinbaseSecurityRequestor.cpp | 4 +- .../md/coinbase/CoinbaseSubscription.cpp | 2 +- .../sparkd/md/deribit/DeribitInstrumentKind.h | 2 +- .../md/deribit/DeribitInstrumentRequest.h | 2 +- .../md/deribit/DeribitInstrumentStore.cpp | 4 +- .../sparkd/md/deribit/DeribitSubscription.cpp | 8 +-- .../sparkd/md/ftx/FTXSecurityRequestor.cpp | 4 +- src/app_sparkd/sparkd/md/okx/OkxChannel.h | 2 +- .../sparkd/md/okx/OkxSecuritySubscription.cpp | 4 +- .../sparkd/md/okx/OkxSubscription.cpp | 6 +-- src/lib_spark/spark/io/JsonDumper.h | 47 +----------------- src/lib_spark/spark/io/QueryParams.h | 4 +- src/lib_spark/spark/io/http/HTTPHeaders.h | 3 +- .../system}/collections/HASH_IMPL.h | 2 +- .../collections/auto_incremented_index.h} | 6 +-- .../system/collections/chunk.h} | 0 .../system/collections/contains.h} | 0 .../collections/discrete_values_filter.h} | 0 .../system/collections/find.h} | 0 .../system/collections/flat_unordered_map.h} | 0 .../system/collections/generated_key_map.h} | 6 +-- .../system/collections/hash_combiner.h} | 0 .../system/collections/remove.h} | 0 .../system/collections/transform.h} | 0 .../collections/unordered_map_lookup.h} | 0 .../collections/unordered_set_factory.h} | 0 .../system/collections/unordered_set_map.h} | 4 +- src/lib_system/system/json/json_dumper.h | 49 +++++++++++++++++++ 35 files changed, 95 insertions(+), 90 deletions(-) rename src/{lib_spark/spark => lib_system/system}/collections/HASH_IMPL.h (94%) rename src/{lib_spark/spark/collections/AutoIncrementedIndex.h => lib_system/system/collections/auto_incremented_index.h} (71%) rename src/{lib_spark/spark/collections/Chunk.h => lib_system/system/collections/chunk.h} (100%) rename src/{lib_spark/spark/collections/Contains.h => lib_system/system/collections/contains.h} (100%) rename src/{lib_spark/spark/collections/DiscreteValuesFilter.h => lib_system/system/collections/discrete_values_filter.h} (100%) rename src/{lib_spark/spark/collections/Find.h => lib_system/system/collections/find.h} (100%) rename src/{lib_spark/spark/collections/FlatUnorderedMap.h => lib_system/system/collections/flat_unordered_map.h} (100%) rename src/{lib_spark/spark/collections/GeneratedKeyMap.h => lib_system/system/collections/generated_key_map.h} (94%) rename src/{lib_spark/spark/collections/HashCombiner.h => lib_system/system/collections/hash_combiner.h} (100%) rename src/{lib_spark/spark/collections/Remove.h => lib_system/system/collections/remove.h} (100%) rename src/{lib_spark/spark/collections/Transform.h => lib_system/system/collections/transform.h} (100%) rename src/{lib_spark/spark/collections/UnorderedMapLookup.h => lib_system/system/collections/unordered_map_lookup.h} (100%) rename src/{lib_spark/spark/collections/UnorderedSetFactory.h => lib_system/system/collections/unordered_set_factory.h} (100%) rename src/{lib_spark/spark/collections/UnorderedSetMap.h => lib_system/system/collections/unordered_set_map.h} (98%) create mode 100644 src/lib_system/system/json/json_dumper.h diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp index 80ca2a8f7..4600e1496 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp @@ -1,8 +1,6 @@ #include "BinanceSecurityRequestor.h" #include "spark/api/domain/SecurityType.pb.h" #include "spark/api/domain/Venue.pb.h" -#include "spark/collections/Contains.h" -#include "spark/collections/Remove.h" #include "spark/domain/Security.h" #include "spark/domain/SecurityCriteria.h" #include "spark/logging/logging.h" @@ -14,6 +12,8 @@ #include "sparkd/md/ccapi/CCApiMessageHandler.h" #include "sparkd/md/ccapi/CCApiSession.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "system/collections/contains.h" +#include "system/collections/remove.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp index 2e58ba4d4..108729c3e 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp @@ -1,7 +1,6 @@ #include "BinanceSubscription.h" #include "spark/api/domain/Venue.pb.h" #include "spark/api/md/BinanceMarketDataConfig.pb.h" -#include "spark/collections/UnorderedSetFactory.h" #include "spark/core/FMT.h" #include "spark/domain/Security.h" #include "spark/domain/SecurityCriteria.h" @@ -19,6 +18,7 @@ #include "sparkd/md/ccapi/CCApiMessageLogger.h" #include "sparkd/md/ccapi/CCApiSession.h" #include "sparkd/md/ccapi/CCApiTradeAdaptor.h" +#include "system/collections/unordered_set_factory.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp index 8e3dcfc62..63dc210a5 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp @@ -1,8 +1,6 @@ #include "BinanceUsSecurityRequestor.h" #include "spark/api/domain/SecurityType.pb.h" #include "spark/api/domain/Venue.pb.h" -#include "spark/collections/Contains.h" -#include "spark/collections/Remove.h" #include "spark/domain/Security.h" #include "spark/domain/SecurityCriteria.h" #include "spark/logging/logging.h" @@ -13,6 +11,8 @@ #include "sparkd/md/ccapi/CCApiMessageHandler.h" #include "sparkd/md/ccapi/CCApiSession.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "system/collections/contains.h" +#include "system/collections/remove.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp index bb2aa3ece..daee9ac4b 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp @@ -1,10 +1,7 @@ #include "BinanceUsSubscription.h" #include "spark/api/domain/Venue.pb.h" #include "spark/api/md/BinanceUsMarketDataConfig.pb.h" -#include "spark/collections/UnorderedSetFactory.h" #include "spark/core/FMT.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityCriteria.h" #include "spark/io/ProtoPrinter.h" #include "spark/io/QueryParams.h" #include "spark/logging/logging.h" @@ -20,6 +17,7 @@ #include "sparkd/md/ccapi/CCApiMessageLogger.h" #include "sparkd/md/ccapi/CCApiSession.h" #include "sparkd/md/ccapi/CCApiTradeAdaptor.h" +#include "system/collections/unordered_set_factory.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp index 0a4053e3d..0930c1a4e 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp @@ -1,8 +1,5 @@ #include "BinanceUsdsFuturesSecurityRequestor.h" #include "spark/api/md/BinanceUsdsFuturesMarketDataConfig.pb.h" -#include "spark/collections/Contains.h" -#include "spark/collections/Remove.h" -#include "spark/collections/UnorderedSetFactory.h" #include "spark/core/FMT.h" #include "spark/domain/Security.h" #include "spark/domain/SecurityCriteria.h" @@ -14,6 +11,9 @@ #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/CCApiMessageHandler.h" #include "sparkd/md/ccapi/CCApiSession.h" +#include "system/collections/contains.h" +#include "system/collections/remove.h" +#include "system/collections/unordered_set_factory.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiCompositeMessageHandler.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiCompositeMessageHandler.cpp index cc784d3c4..c7419e2b9 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiCompositeMessageHandler.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiCompositeMessageHandler.cpp @@ -1,5 +1,5 @@ #include "CCApiCompositeMessageHandler.h" -#include "spark/collections/Remove.h" +#include "system/collections/remove.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.cpp index 0441c4d3e..56bebbe72 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.cpp @@ -1,8 +1,8 @@ #include "CCApiEventDemuxer.h" -#include "spark/collections/DiscreteValuesFilter.h" -#include "spark/collections/Find.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "system/collections/discrete_values_filter.h" +#include "system/collections/find.h" #include "spark/utils/helper_macros.h" #include diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp index 764be7798..b8562d3ef 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp @@ -1,8 +1,6 @@ #include "CoinbaseSecurityRequestor.h" #include "spark/api/domain/SecurityType.pb.h" #include "spark/api/domain/Venue.pb.h" -#include "spark/collections/Contains.h" -#include "spark/collections/Remove.h" #include "spark/domain/Security.h" #include "spark/domain/SecurityCriteria.h" #include "spark/logging/logging.h" @@ -12,6 +10,8 @@ #include "sparkd/md/ccapi/CCApiSession.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include "sparkd/md/coinbase/CoinbaseSpot.h" +#include "system/collections/contains.h" +#include "system/collections/remove.h" #include #include diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp index dcfe13a5d..6b474c6e3 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp @@ -1,6 +1,5 @@ #include "CoinbaseSubscription.h" #include "spark/api/md/CoinbaseMarketDataConfig.pb.h" -#include "spark/collections/UnorderedSetFactory.h" #include "spark/domain/Security.h" #include "spark/domain/SecurityCriteria.h" #include "spark/io/ProtoPrinter.h" @@ -15,6 +14,7 @@ #include "sparkd/md/coinbase/CoinbaseMessageType.h" #include "sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h" #include "sparkd/md/coinbase/CoinbaseSecurityRequestor.h" +#include "system/collections/unordered_set_factory.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentKind.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentKind.h index 5ddd59cbe..7480438d5 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentKind.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentKind.h @@ -2,10 +2,10 @@ #include "spark/algorithm/StringCaseConverter.h" #include "spark/api/domain/SecurityType.pb.h" -#include "spark/collections/HASH_IMPL.h" #include "spark/core/EnumMacros.h" #include "spark/core/FMT_IMPL.h" #include "spark/domain_model/Security.pb.h" +#include "system/collections/HASH_IMPL.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h index e6f035ac6..617621b7e 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h @@ -1,11 +1,11 @@ #pragma once -#include "spark/collections/Contains.h" #include "spark/core/FMT.h" #include "spark/core/FMT_IMPL.h" #include "spark/domain/SecurityCriteria.h" #include "spark/domain/SecurityCriteriaClause.h" #include "sparkd/md/deribit/DeribitInstrumentKind.h" +#include "system/collections/contains.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp index ee09ab4c1..7a610c44e 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp @@ -1,7 +1,5 @@ #include "DeribitInstrumentStore.h" #include "spark/api/domain/SecurityType.h" -#include "spark/collections/Contains.h" -#include "spark/collections/Remove.h" #include "spark/domain/Security.h" #include "spark/io/JsonReader.h" #include "spark/logging/logging.h" @@ -9,6 +7,8 @@ #include "spark/utils/bts_fatal.h" #include "sparkd/md/deribit/DeribitCombo.h" #include "sparkd/md/deribit/DeribitInstrument.h" +#include "system/collections/contains.h" +#include "system/collections/remove.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp index c797d4762..d2416396e 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp @@ -1,10 +1,6 @@ #include "DeribitSubscription.h" #include "spark/api/domain/Venue.pb.h" #include "spark/api/md/DeribitMarketDataConfig.pb.h" -#include "spark/collections/Chunk.h" -#include "spark/collections/Contains.h" -#include "spark/collections/Remove.h" -#include "spark/collections/Transform.h" #include "spark/core/FMT.h" #include "spark/core/TimeStamp.h" #include "spark/domain/Security.h" @@ -27,6 +23,10 @@ #include "sparkd/md/deribit/DeribitSecurityRequestor.h" #include "sparkd/md/deribit/DeribitTickerAdaptor.h" #include "sparkd/md/deribit/DeribitTradeAdaptor.h" +#include "system/collections/chunk.h" +#include "system/collections/contains.h" +#include "system/collections/remove.h" +#include "system/collections/transform.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp index 2c833ff18..d50e83a0f 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp @@ -1,8 +1,6 @@ #include "FTXSecurityRequestor.h" #include "spark/api/domain/SecurityType.pb.h" #include "spark/api/domain/Venue.pb.h" -#include "spark/collections/Contains.h" -#include "spark/collections/Remove.h" #include "spark/domain/Security.h" #include "spark/domain/SecurityCriteria.h" #include "spark/logging/logging.h" @@ -14,6 +12,8 @@ #include "sparkd/md/ftx/FTXFuture.h" #include "sparkd/md/ftx/FTXMarket.h" #include "sparkd/md/ftx/FTXMessageType.h" +#include "system/collections/contains.h" +#include "system/collections/remove.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxChannel.h b/src/app_sparkd/sparkd/md/okx/OkxChannel.h index ad3be1486..a15239e96 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxChannel.h +++ b/src/app_sparkd/sparkd/md/okx/OkxChannel.h @@ -1,9 +1,9 @@ #pragma once -#include "spark/collections/HASH_IMPL.h" #include "spark/core/FMT_IMPL.h" #include "spark/io/JsonOptional.h" #include "sparkd/md/okx/OkxInstrumentType.h" +#include "system/collections/HASH_IMPL.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp b/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp index ad6467c18..080fa9191 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp @@ -1,6 +1,4 @@ #include "OkxSecuritySubscription.h" -#include "spark/collections/Contains.h" -#include "spark/collections/Remove.h" #include "spark/domain/SecurityCriteria.h" #include "spark/io/JsonReader.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" @@ -16,6 +14,8 @@ #include "sparkd/md/okx/OkxInstrumentType.h" #include "sparkd/md/okx/OkxMessageType.h" #include "sparkd/md/okx/OkxRequest.h" +#include "system/collections/contains.h" +#include "system/collections/remove.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp b/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp index 638bb82ae..4800db6c6 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp @@ -1,9 +1,6 @@ #include "OkxSubscription.h" #include "spark/api/domain/Venue.pb.h" #include "spark/api/md/OkxMarketDataConfig.pb.h" -#include "spark/collections/Chunk.h" -#include "spark/collections/Contains.h" -#include "spark/collections/Transform.h" #include "spark/core/FMT.h" #include "spark/domain/Security.h" #include "spark/domain/SecurityCriteria.h" @@ -20,6 +17,9 @@ #include "sparkd/md/okx/OkxSecuritySubscription.h" #include "sparkd/md/okx/OkxTickerAdaptor.h" #include "sparkd/md/okx/OkxTradeAdaptor.h" +#include "system/collections/chunk.h" +#include "system/collections/contains.h" +#include "system/collections/transform.h" #include #include diff --git a/src/lib_spark/spark/io/JsonDumper.h b/src/lib_spark/spark/io/JsonDumper.h index d1703fc31..0127813af 100644 --- a/src/lib_spark/spark/io/JsonDumper.h +++ b/src/lib_spark/spark/io/JsonDumper.h @@ -1,48 +1,3 @@ #pragma once -#include -#include -#include -namespace bts::io { - -class JsonDumper { - public: - template - static std::string dump(const T &value, int indentation = 2); - - template - static std::string dump( - Iter first, - Iter last, - int indentation = 2, - const char *separator = ",\n"); -}; - -////////////////////////////////////////////////// -// Definition -////////////////////////////////////////////////// - -template -std::string JsonDumper::dump(const T &value, int indentation) { - nlohmann::json j; - to_json(j, value); - return j.dump(indentation); -} - -template -std::string JsonDumper::dump( - Iter first, Iter last, int indentation, const char *separator) { - if (first == last) { - return ""; - } - std::stringstream str; - auto it = first; - str << "[" << dump(*it, indentation); - while (++it != last) { - str << separator << dump(*it, indentation); - } - str << "]"; - return str.str(); -} - -} // namespace bts::io +#include "system/json/json_dumper.h" diff --git a/src/lib_spark/spark/io/QueryParams.h b/src/lib_spark/spark/io/QueryParams.h index 1f733d16e..23afa2c48 100644 --- a/src/lib_spark/spark/io/QueryParams.h +++ b/src/lib_spark/spark/io/QueryParams.h @@ -1,5 +1,7 @@ #pragma once -#include "spark/collections/FlatUnorderedMap.h" + +#include "system/collections/flat_unordered_map.h" + #include namespace bts::io { diff --git a/src/lib_spark/spark/io/http/HTTPHeaders.h b/src/lib_spark/spark/io/http/HTTPHeaders.h index b47d0dfa9..fbad071c0 100644 --- a/src/lib_spark/spark/io/http/HTTPHeaders.h +++ b/src/lib_spark/spark/io/http/HTTPHeaders.h @@ -1,5 +1,6 @@ #pragma once -#include "spark/collections/FlatUnorderedMap.h" + +#include "system/collections/flat_unordered_map.h" namespace bts::io::http { diff --git a/src/lib_spark/spark/collections/HASH_IMPL.h b/src/lib_system/system/collections/HASH_IMPL.h similarity index 94% rename from src/lib_spark/spark/collections/HASH_IMPL.h rename to src/lib_system/system/collections/HASH_IMPL.h index 33b0a7a85..2edd0c88a 100644 --- a/src/lib_spark/spark/collections/HASH_IMPL.h +++ b/src/lib_system/system/collections/HASH_IMPL.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/collections/HashCombiner.h" +#include "system/collections/hash_combiner.h" #define _HASH_ARG(x) , std::hash{}(t.x) diff --git a/src/lib_spark/spark/collections/AutoIncrementedIndex.h b/src/lib_system/system/collections/auto_incremented_index.h similarity index 71% rename from src/lib_spark/spark/collections/AutoIncrementedIndex.h rename to src/lib_system/system/collections/auto_incremented_index.h index edb34d84f..3c55f0c20 100644 --- a/src/lib_spark/spark/collections/AutoIncrementedIndex.h +++ b/src/lib_system/system/collections/auto_incremented_index.h @@ -1,9 +1,9 @@ #pragma once -#include "spark/algorithm/PlusX.h" -#include "spark/collections/GeneratedKeyMap.h" +#include "system/algorithm/plus_x.h" +#include "system/collections/GeneratedKeyMap.h" -#include +#include namespace bts::collections { diff --git a/src/lib_spark/spark/collections/Chunk.h b/src/lib_system/system/collections/chunk.h similarity index 100% rename from src/lib_spark/spark/collections/Chunk.h rename to src/lib_system/system/collections/chunk.h diff --git a/src/lib_spark/spark/collections/Contains.h b/src/lib_system/system/collections/contains.h similarity index 100% rename from src/lib_spark/spark/collections/Contains.h rename to src/lib_system/system/collections/contains.h diff --git a/src/lib_spark/spark/collections/DiscreteValuesFilter.h b/src/lib_system/system/collections/discrete_values_filter.h similarity index 100% rename from src/lib_spark/spark/collections/DiscreteValuesFilter.h rename to src/lib_system/system/collections/discrete_values_filter.h diff --git a/src/lib_spark/spark/collections/Find.h b/src/lib_system/system/collections/find.h similarity index 100% rename from src/lib_spark/spark/collections/Find.h rename to src/lib_system/system/collections/find.h diff --git a/src/lib_spark/spark/collections/FlatUnorderedMap.h b/src/lib_system/system/collections/flat_unordered_map.h similarity index 100% rename from src/lib_spark/spark/collections/FlatUnorderedMap.h rename to src/lib_system/system/collections/flat_unordered_map.h diff --git a/src/lib_spark/spark/collections/GeneratedKeyMap.h b/src/lib_system/system/collections/generated_key_map.h similarity index 94% rename from src/lib_spark/spark/collections/GeneratedKeyMap.h rename to src/lib_system/system/collections/generated_key_map.h index 9230a9274..55b1f9d3b 100644 --- a/src/lib_spark/spark/collections/GeneratedKeyMap.h +++ b/src/lib_system/system/collections/generated_key_map.h @@ -1,7 +1,5 @@ #pragma once -#include "spark/utils/bts_assert.h" - #include #include @@ -43,7 +41,7 @@ typename std::unordered_map<_Key, _Tp, _Hash>::iterator GeneratedKeyMap<_Key, _Tp, _GetNextKey, _Hash>::emplace_next(_Args... args) { auto [it, is_new] = std::unordered_map<_Key, _Tp, _Hash>::try_emplace( next_key_(), std::forward<_Args>(args)...); - bts_assert(is_new); + // bts_assert(is_new); return it; } @@ -52,7 +50,7 @@ template _Tp &GeneratedKeyMap<_Key, _Tp, _GetNextKey, _Hash>::emplace_next_value( _Args... args) { auto [it, is_new] = try_emplace(next_key_(), std::forward<_Args>(args)...); - bts_assert(is_new); + // bts_assert(is_new); return it->second; } diff --git a/src/lib_spark/spark/collections/HashCombiner.h b/src/lib_system/system/collections/hash_combiner.h similarity index 100% rename from src/lib_spark/spark/collections/HashCombiner.h rename to src/lib_system/system/collections/hash_combiner.h diff --git a/src/lib_spark/spark/collections/Remove.h b/src/lib_system/system/collections/remove.h similarity index 100% rename from src/lib_spark/spark/collections/Remove.h rename to src/lib_system/system/collections/remove.h diff --git a/src/lib_spark/spark/collections/Transform.h b/src/lib_system/system/collections/transform.h similarity index 100% rename from src/lib_spark/spark/collections/Transform.h rename to src/lib_system/system/collections/transform.h diff --git a/src/lib_spark/spark/collections/UnorderedMapLookup.h b/src/lib_system/system/collections/unordered_map_lookup.h similarity index 100% rename from src/lib_spark/spark/collections/UnorderedMapLookup.h rename to src/lib_system/system/collections/unordered_map_lookup.h diff --git a/src/lib_spark/spark/collections/UnorderedSetFactory.h b/src/lib_system/system/collections/unordered_set_factory.h similarity index 100% rename from src/lib_spark/spark/collections/UnorderedSetFactory.h rename to src/lib_system/system/collections/unordered_set_factory.h diff --git a/src/lib_spark/spark/collections/UnorderedSetMap.h b/src/lib_system/system/collections/unordered_set_map.h similarity index 98% rename from src/lib_spark/spark/collections/UnorderedSetMap.h rename to src/lib_system/system/collections/unordered_set_map.h index 2c24e6d1c..09a2e9278 100644 --- a/src/lib_spark/spark/collections/UnorderedSetMap.h +++ b/src/lib_system/system/collections/unordered_set_map.h @@ -1,5 +1,7 @@ #pragma once -#include "spark/core/AllSameType.h" + +#include "system/all_same_type.h" + #include #include diff --git a/src/lib_system/system/json/json_dumper.h b/src/lib_system/system/json/json_dumper.h new file mode 100644 index 000000000..7bada6b37 --- /dev/null +++ b/src/lib_system/system/json/json_dumper.h @@ -0,0 +1,49 @@ +#pragma once + +#include +#include +#include + +namespace bts::io { + +class JsonDumper { + public: + template + static std::string dump(const T &value, int indentation = 2); + + template + static std::string dump( + Iter first, + Iter last, + int indentation = 2, + const char *separator = ",\n"); +}; + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +template +std::string JsonDumper::dump(const T &value, int indentation) { + nlohmann::json j; + to_json(j, value); + return j.dump(indentation); +} + +template +std::string JsonDumper::dump( + Iter first, Iter last, int indentation, const char *separator) { + if (first == last) { + return ""; + } + std::stringstream str; + auto it = first; + str << "[" << dump(*it, indentation); + while (++it != last) { + str << separator << dump(*it, indentation); + } + str << "]"; + return str.str(); +} + +} // namespace bts::io