From f568691731057e40bcfd9c3b2fbcbbde6cef7558 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 21 Feb 2022 11:10:15 -0500 Subject: [PATCH] Adding report API to analytics server --- src/lib/CMakeDeps.cmake | 2 +- src/lib/api/services/AnalyticsService.proto | 80 ++++++++++- src/lib/domain_model/Security.proto | 6 + .../analytics/AnalyticsServiceServer.cpp | 130 +++++++++++++++--- .../sparkd/analytics/AnalyticsServiceServer.h | 12 ++ 5 files changed, 209 insertions(+), 21 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index eb5fce682..c023ed0aa 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/domain/Currency.proto;api/domain/SecurityType.proto;api/domain/Venue.proto;api/io/URL.proto;api/md/MarketDataSubscriptionParams.proto;api/md/binance/BinanceMarketDataSubscriptionParams.proto;api/md/deribit/DeribitMarketDataSubscriptionParams.proto;api/md/ftx/FTXMarketDataSubscriptionParams.proto;api/md/glbx/GlbxMarketDataSubscriptionParams.proto;api/md/huobi/HuobiMarketDataSubscriptionParams.proto;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/AnalyticsService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MarketDataService.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;communincation/websockets/tests/WebsocketSyncClientTests.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/AlgoTypes.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spartan.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain/AggressorSide.cpp;domain/NewOrder.cpp;domain/OrderDefinition.cpp;domain/OrderStatus.cpp;domain/OrderUpdate.cpp;domain/Side.cpp;domain/TimeInForce.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;io/QueryParams.cpp;io/URL.cpp;io/http/CurlHandle.cpp;io/http/HTTPClient.cpp;io/http/HTTPHeaders.cpp;io/http/HTTPRequest.cpp;io/http/HTTPResponse.cpp;io/websocket/WebsocketClient.cpp;io/websocket/WebsocketClientConfiguration.cpp;io/websocket/WebsocketError.cpp;io/websocket/WebsocketMessage.cpp;io/websocket/WebsocketSSLClientInternal.cpp;io/websocket/tests/WebsocketClientTests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MarketDataError.cpp;md/MarketDataGateway.cpp;md/MarketDataRegistrationFactory.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/Product.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityMarketState.cpp;md/SecurityOracle.cpp;md/SecurityStore.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/binance/BinanceBookLevel.cpp;md/binance/BinanceDepthBootstrapper.cpp;md/binance/BinanceDepthSnapshot.cpp;md/binance/BinanceDepthStreamParams.cpp;md/binance/BinanceDepthStreamSite.cpp;md/binance/BinanceDepthStreamSiteKey.cpp;md/binance/BinanceDiffDepthSubscription.cpp;md/binance/BinanceDiffDepthUpdate.cpp;md/binance/BinanceWebsocketStreamDemuxer.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/listeners/LiveLadderPrinter.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/service/MarketDataServiceServer.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/Governor.cpp;orderman/OrderBuilder.cpp;orderman/OrderRouter.cpp;orderman/OrderServiceServer.cpp;orderman/OrderServices.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/actors/order_manager/PositionIndex.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/FilledPositionEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/events/TradeSignalEvent.cpp;orderman/gateways/ExecutionGatewayFactory.cpp;orderman/gateways/GLBXExecutionGateway.cpp;orderman/gateways/GLBXiLink3ExecutionGateway.cpp;orderman/gateways/ICEExecutionGateway.cpp;orderman/ilink3/IL3ConnectionHandler.cpp;orderman/ilink3/IL3GW.cpp;orderman/ilink3/IL3Parser.cpp;orderman/ilink3/IL3Reactor.cpp;orderman/ilink3/ILink3Utils.cpp;orderman/ilink3/SessionStore.cpp;orderman/ilink3/test/ILinkGWTests.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/orderman_utils/BookUtils.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/GLBXNativeOrder.cpp;orderman/orders/ICENativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/DynamicHelpers.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/PositionUpdate.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp;orderman/orders/algo/algo_orders/DormanAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp;orderman/orders/algo/algo_orders/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/OnSignalAlgo.cpp;orderman/orders/algo/algo_orders/ProRataAlgo.cpp;orderman/orders/algo/algo_orders/PyramidAlgo.cpp;orderman/orders/algo/algo_orders/RegisterDorman.cpp;orderman/orders/algo/algo_orders/ScratchAlgo.cpp;orderman/orders/algo/algo_orders/SniperAlgo.cpp;orderman/orders/algo/algo_orders/SplitterAlgo.cpp;orderman/orders/algo/algo_orders/TASAlgo.cpp;orderman/orders/algo/algo_orders/TASCounterAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp;orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp;orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp;orderman/orders/algo/algo_orders/tests/dorman_tests.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp;orderman/orders/algo/algo_orders/tests/splitter_tests.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/glbx/IGLBXOrderEncoder.cpp;orderman/orders/glbx/iLink2OrderEncoder.cpp;orderman/orders/glbx/iLink3OrderEncoder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IDGenerator.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/MathUtils.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/MathUtilsTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/domain/Currency.proto;api/domain/SecurityType.proto;api/domain/Venue.proto;api/io/URL.proto;api/md/MarketDataSubscriptionParams.proto;api/md/binance/BinanceMarketDataSubscriptionParams.proto;api/md/deribit/DeribitMarketDataSubscriptionParams.proto;api/md/ftx/FTXMarketDataSubscriptionParams.proto;api/md/glbx/GlbxMarketDataSubscriptionParams.proto;api/md/huobi/HuobiMarketDataSubscriptionParams.proto;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/AnalyticsService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MarketDataService.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;communincation/websockets/tests/WebsocketSyncClientTests.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/algo_types.proto;config/protos/cme_reference_data.proto;config/protos/exchange_sim_cfg.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/market_data.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/ports.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spartan.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/symbols.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/protos/ui.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain/AggressorSide.cpp;domain/NewOrder.cpp;domain/OrderDefinition.cpp;domain/OrderStatus.cpp;domain/OrderUpdate.cpp;domain/Side.cpp;domain/TimeInForce.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;io/QueryParams.cpp;io/URL.cpp;io/http/CurlHandle.cpp;io/http/HTTPClient.cpp;io/http/HTTPHeaders.cpp;io/http/HTTPRequest.cpp;io/http/HTTPResponse.cpp;io/websocket/WebsocketClient.cpp;io/websocket/WebsocketClientConfiguration.cpp;io/websocket/WebsocketError.cpp;io/websocket/WebsocketMessage.cpp;io/websocket/WebsocketSSLClientInternal.cpp;io/websocket/tests/WebsocketClientTests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MarketDataError.cpp;md/MarketDataGateway.cpp;md/MarketDataRegistrationFactory.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/Product.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityMarketState.cpp;md/SecurityOracle.cpp;md/SecurityStore.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/binance/BinanceBookLevel.cpp;md/binance/BinanceDepthBootstrapper.cpp;md/binance/BinanceDepthSnapshot.cpp;md/binance/BinanceDepthStreamParams.cpp;md/binance/BinanceDepthStreamSite.cpp;md/binance/BinanceDepthStreamSiteKey.cpp;md/binance/BinanceDiffDepthSubscription.cpp;md/binance/BinanceDiffDepthUpdate.cpp;md/binance/BinanceWebsocketStreamDemuxer.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/listeners/LiveLadderPrinter.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/service/MarketDataServiceServer.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/Governor.cpp;orderman/OrderBuilder.cpp;orderman/OrderRouter.cpp;orderman/OrderServiceServer.cpp;orderman/OrderServices.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/actors/order_manager/PositionIndex.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/FilledPositionEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/events/TradeSignalEvent.cpp;orderman/gateways/ExecutionGatewayFactory.cpp;orderman/gateways/GLBXExecutionGateway.cpp;orderman/gateways/GLBXiLink3ExecutionGateway.cpp;orderman/gateways/ICEExecutionGateway.cpp;orderman/ilink3/IL3ConnectionHandler.cpp;orderman/ilink3/IL3GW.cpp;orderman/ilink3/IL3Parser.cpp;orderman/ilink3/IL3Reactor.cpp;orderman/ilink3/ILink3Utils.cpp;orderman/ilink3/SessionStore.cpp;orderman/ilink3/test/ILinkGWTests.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/orderman_utils/BookUtils.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/GLBXNativeOrder.cpp;orderman/orders/ICENativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/DynamicHelpers.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/PositionUpdate.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp;orderman/orders/algo/algo_orders/DormanAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp;orderman/orders/algo/algo_orders/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/OnSignalAlgo.cpp;orderman/orders/algo/algo_orders/ProRataAlgo.cpp;orderman/orders/algo/algo_orders/PyramidAlgo.cpp;orderman/orders/algo/algo_orders/RegisterDorman.cpp;orderman/orders/algo/algo_orders/ScratchAlgo.cpp;orderman/orders/algo/algo_orders/SniperAlgo.cpp;orderman/orders/algo/algo_orders/SplitterAlgo.cpp;orderman/orders/algo/algo_orders/TASAlgo.cpp;orderman/orders/algo/algo_orders/TASCounterAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp;orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp;orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp;orderman/orders/algo/algo_orders/tests/dorman_tests.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp;orderman/orders/algo/algo_orders/tests/splitter_tests.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/glbx/IGLBXOrderEncoder.cpp;orderman/orders/glbx/iLink2OrderEncoder.cpp;orderman/orders/glbx/iLink3OrderEncoder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IDGenerator.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/MathUtils.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/MathUtilsTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/services/AnalyticsService.proto b/src/lib/api/services/AnalyticsService.proto index 056b3ace5..22989ef33 100644 --- a/src/lib/api/services/AnalyticsService.proto +++ b/src/lib/api/services/AnalyticsService.proto @@ -41,7 +41,7 @@ enum DriverCalculationType{ } message ExpirationParameterEntry{ - int32 id = 10; + int32 id = 10 [(bts.api.key)=true]; bts.api.SecurityType security_type = 20; string symbol = 30; bts.api.Expiration expiration = 40; @@ -78,6 +78,77 @@ message IntWrapper{ int32 data = 1; } +enum VolSurfaceGreeks +{ + Vol = 0; + Moneyness = 20; + Theo = 30; + Delta = 40; + BSMDelta = 50; + FlatVolDelta = 60; + Vega = 70; + BSMVega = 80; + AdjustedVega = 90; + Theta = 100; + AdjustedTheta = 110; + RollRho = 120; + DiscountRho = 130; + TimeValue = 140; + + Gamma = 150; + BSMGamma = 160; + OEV = 170; + BSMOEV = 180; + Vanna = 190; + Volga = 200; + Charm = 210; + DVolDUnd = 220; + // Vol²/DUnd² + D2VolDUnd2 = 230; + + DPriceDRiskReversal = 240; + + DPriceDStrangle = 250; + DPriceDPutTilt = 260; + DPriceDCallTilt = 270; + PNL = 280; + ExpirationDelta = 290; +} + +message Report{ + enum ReportType { + Slide = 0; + Combo = 1; + PnL = 2; + } + enum StrikeGrouping { + RawStrike = 0; + Delta = 1; + StandardStrike = 2; + } + enum ReportCalculationMode { + UserPrompted = 0; + PositionOrTheoChange = 1; + } + int32 id = 10; + int32 vs_id = 20; + string report_type = 30; + ReportType report_name = 40; + string internal_account = 50; + string risk_terms_name = 60; + bts.api.SecurityType risk_terms_type = 70; + string option_equivalence_name = 80; + bts.api.SecurityType option_equivalence_type = 90; + bts.api.SecurityTuple securities = 95; + repeated double handles = 100; + repeated double strike_buckets = 110; + StrikeGrouping strike_grouping = 120; + repeated VolSurfaceGreeks greeks = 130; + bool slide_handles_in_percentage = 140; + ReportCalculationMode calc_mode = 150; +} + + service AnalyticsService { option (bts.api.service_description) = "Provides VolSurface creations and saves"; rpc get_new_volsurface_id(bts.api.VoidMessage) returns (AnalyticsServiceCreateReply); @@ -91,4 +162,11 @@ service AnalyticsService { rpc volsurfaces(bts.api.VoidMessage) returns (stream VolSurfaceEntry); rpc exp_parameters(bts.api.VoidMessage) returns (stream ExpirationParameterEntryList); rpc volsurface_usage(bts.api.VoidMessage) returns (stream VolSurfaceUsageList); + + // reports + rpc get_new_report_id(bts.api.VoidMessage) returns (AnalyticsServiceCreateReply); + rpc save_report(Report) returns (bts.api.ResultMessage); + rpc delete_report(IntWrapper) returns (bts.api.ResultMessage); + rpc reports(bts.api.VoidMessage) returns (stream Report); + } \ No newline at end of file diff --git a/src/lib/domain_model/Security.proto b/src/lib/domain_model/Security.proto index 72263c540..10f8c9718 100644 --- a/src/lib/domain_model/Security.proto +++ b/src/lib/domain_model/Security.proto @@ -150,6 +150,12 @@ message SpreadContract { repeated ContractLeg legs = 10; } +message SecurityTuple{ + SecurityType type = 10; + Venue venue = 20; + string symbol = 30; +} + message SyntheticContract { string name = 1; uint32 user_id = 2; diff --git a/src/server/sparkd/analytics/AnalyticsServiceServer.cpp b/src/server/sparkd/analytics/AnalyticsServiceServer.cpp index 4d12556a5..47462c133 100644 --- a/src/server/sparkd/analytics/AnalyticsServiceServer.cpp +++ b/src/server/sparkd/analytics/AnalyticsServiceServer.cpp @@ -9,6 +9,7 @@ #include "lib/utils/PBUtils.h" #include "lib/utils/Puid.h" #include "lib/utils/bts_assert.h" +#include "server/sparkd/algo/AlgoDefinitionServiceServer.h" #include #include #include @@ -21,6 +22,37 @@ using namespace bts::api::analytics; namespace bts::analytics { +// assumes key are ints +int get_max_id(IStore *const store, const std::string &ns) { + auto ns_map = store->retrieve_all(); + auto it = ns_map.find(ns); + if (it == ns_map.end()) { + return 0; + } + int max_id = -1; + for (const auto &kv : it->second) { + int key = std::stoi(kv.first); + max_id = key > max_id ? key : max_id; + } + return max_id; +} + +void add_or_update_to_table( + persistence::IStore *store, + const std::string &ns, + const std::string &key, + const std::string &val) { + auto [exists, existing_val] = store->retrieve_one(ns, key); + LOG(Gen, Info, + "add_or_update ns: {} key: {} val: {} exists: {} existing_val: {}", ns, + key, val, exists, existing_val); + if (exists) { + store->update(ns, key, val); + } else { + store->insert(ns, key, val); + } +} + // parses out the vs_id and vs_name from the key std::tuple parse_vs_id_name( const std::string &ns, const std::string &sep_str) { @@ -35,27 +67,33 @@ struct AnalyticsServiceServer::PImpl { const std::string vs_ns_sep = "."; const std::string exp_params_ns = "analytics_expiration_params"; const std::string vs_usage_ns = "volsurface_usage"; + const std::string reports_ns = "reports"; std::unique_ptr vs_store; std::unique_ptr exp_params_store; std::unique_ptr vs_usage_store; + std::unique_ptr reports_store; AnalyticsServiceBase::VolsurfacesStatefulPublisher vs_publisher; AnalyticsServiceBase::Exp_parametersStatefulPublisher exp_params_publisher; AnalyticsServiceBase::Volsurface_usageStatefulPublisher vs_usage_publisher; + AnalyticsServiceBase::ReportsStatefulPublisher reports_publisher; PImpl( bts::api::ServiceContext &context, const AnalyticsServiceBase::VolsurfacesStatefulPublisher &vs_publisher, const AnalyticsServiceBase::Exp_parametersStatefulPublisher &exp_params_publisher, const AnalyticsServiceBase::Volsurface_usageStatefulPublisher - &vs_usage_publisher) + &vs_usage_publisher, + const AnalyticsServiceBase::ReportsStatefulPublisher &reports_publisher) : context(context), vs_store(std::make_unique("volsurfaces")), exp_params_store(std::make_unique( "analytics_expiration_params")), vs_usage_store( std::make_unique("volsurface_usage")), + reports_store(std::make_unique("reports")), vs_publisher(vs_publisher), exp_params_publisher(exp_params_publisher), - vs_usage_publisher(vs_usage_publisher) {} + vs_usage_publisher(vs_usage_publisher), + reports_publisher(reports_publisher) {} }; AnalyticsServiceServer::AnalyticsServiceServer( @@ -65,7 +103,8 @@ AnalyticsServiceServer::AnalyticsServiceServer( context, make_volsurfaces_stateful_publisher(), make_exp_parameters_stateful_publisher(), - make_volsurface_usage_stateful_publisher())) { + make_volsurface_usage_stateful_publisher(), + make_reports_stateful_publisher())) { // publishing all vol surfaces LOG(Gen, Info, "Starting AnalyticsServiceServer"); auto vs_table = me->vs_store->retrieve_all(); @@ -109,6 +148,19 @@ AnalyticsServiceServer::AnalyticsServiceServer( } } me->vs_usage_publisher.flush(); + // reports + { + auto ns_table = me->reports_store->retrieve_all(); + bts_assert(ns_table.size() == 0 || ns_table.size() == 1); + for (const auto &ns_vals : ns_table) { + for (const auto &kvp : ns_vals.second) { + Report report; + utils::pb::from_string(kvp.second, &report); + me->reports_publisher.add_or_update(report); + } + } + me->reports_publisher.flush(); + } } void AnalyticsServiceServer::get_new_volsurface_id( @@ -199,20 +251,6 @@ void AnalyticsServiceServer::clean_up( // TODO } -void _add_or_update( - persistence::IStore *store, - const std::string &ns, - const std::string &key, - const std::string &val) { - auto [exists, existing_val] = store->retrieve_one(ns, key); - if (exists) { - LOG(Gen, Info, "_add_or_update key:{} val:{} exists", key, existing_val); - store->update(ns, key, val); - } else { - store->insert(ns, key, val); - } -} - void AnalyticsServiceServer::set_exp_parameters( const bts::api::analytics::ExpirationParameterEntryList &exp_params_args, const api::Response<::bts::api::ResultMessage> &response) { @@ -221,8 +259,7 @@ void AnalyticsServiceServer::set_exp_parameters( std::string ns = me->exp_params_ns; std::string key = std::to_string(1); std::string value = utils::pb::to_string(exp_params); - _add_or_update(me->exp_params_store.get(), ns, key, value); - me->exp_params_store->update(ns, key, value); + add_or_update_to_table(me->exp_params_store.get(), ns, key, value); me->exp_params_publisher.add_or_update(exp_params); me->exp_params_publisher.flush(); api::ResultMessage res; @@ -246,6 +283,61 @@ void AnalyticsServiceServer::set_volsurface_usage_list( response(res); } +void AnalyticsServiceServer::get_new_report_id( + const ::bts::api::VoidMessage &, + const bts::api::Response<::bts::api::analytics::AnalyticsServiceCreateReply> + &response) { + auto max_id = get_max_id(me->reports_store.get(), me->reports_ns); + auto new_id = max_id + 1; + bts::api::analytics::AnalyticsServiceCreateReply rep; + rep.set_ok(true); + rep.set_new_id(new_id); + response(rep); +} + +void AnalyticsServiceServer::save_report( + const ::bts::api::analytics::Report &report_arg, + const api::Response<::bts::api::ResultMessage> &resp) { + Report report = report_arg; + std::string key = std::to_string(report.id()); + auto [present, val] = me->reports_store->retrieve_one(me->reports_ns, key); + if (!present) { + int new_id = get_max_id(me->reports_store.get(), me->reports_ns) + 1; + report.set_id(new_id); + } else { + bts_assert(!val.empty()); + } + std::string report_str = utils::pb::to_string(report); + add_or_update_to_table( + me->reports_store.get(), me->reports_ns, std::to_string(report.id()), + report_str); + me->reports_publisher.add_or_update(report); + me->reports_publisher.flush(); + api::ResultMessage res; + res.set_success(true); + resp(res); +} + +void AnalyticsServiceServer::delete_report( + const bts::api::analytics::IntWrapper &id, + const api::Response<::bts::api::ResultMessage> &resp) { + std::string key = std::to_string(id.data()); + auto [present, val] = me->reports_store->retrieve_one(me->reports_ns, key); + api::ResultMessage res; + res.set_success(false); + if (!present) { + res.set_success(false); + res.set_error_message("Could not find report"); + resp(res); + return; + } + bts_assert(!val.empty()); + me->reports_publisher.erase(id.data()); + me->reports_publisher.flush(); + me->reports_store->remove(me->reports_ns, {key}); + resp(res); +} + AnalyticsServiceServer::~AnalyticsServiceServer() {} } // namespace bts::analytics \ No newline at end of file diff --git a/src/server/sparkd/analytics/AnalyticsServiceServer.h b/src/server/sparkd/analytics/AnalyticsServiceServer.h index dddb5b7e1..38bca5f0b 100644 --- a/src/server/sparkd/analytics/AnalyticsServiceServer.h +++ b/src/server/sparkd/analytics/AnalyticsServiceServer.h @@ -46,6 +46,18 @@ class AnalyticsServiceServer const ::bts::api::analytics::VolSurfaceUsageList &request, const api::Response<::bts::api::ResultMessage> &reply) override; + void get_new_report_id( + const ::bts::api::VoidMessage &request, + const api::Response<::bts::api::analytics::AnalyticsServiceCreateReply> + &reply) override; + void save_report( + const ::bts::api::analytics::Report &report, + const api::Response<::bts::api::ResultMessage> &reply) override; + void delete_report( + const ::bts::api::analytics::IntWrapper &request, + const api::Response<::bts::api::ResultMessage> &reply) override; + // rpc reports(bts.api.VoidMessage) returns(stream Report); + ~AnalyticsServiceServer(); }; } // namespace bts::analytics