Comments and wrapping up
This commit is contained in:
1 parent
0ee03a0d30
commit
d86d621d38
2 files changed
+41
-19
No files matched your search
@@ -8,6 +8,7 @@
|
||||
#include "lib/utils/PBUtils.h"
|
||||
#include "lib/utils/Puid.h"
|
||||
#include "lib/utils/bts_assert.h"
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/tokenizer.hpp>
|
||||
#include <chrono>
|
||||
#include <cstdint>
|
||||
@@ -20,19 +21,19 @@ using namespace bts::api::analytics;
|
||||
namespace bts::analytics {
|
||||
|
||||
// ns = vs_key_name
|
||||
std::tuple<int, std::string> parse_vs_id_name(const std::string &ns) {
|
||||
boost::char_separator<char> sep(".");
|
||||
boost::tokenizer<boost::char_separator<char>> tokens(ns, sep);
|
||||
std::tuple<int, std::string> parse_vs_id_name(
|
||||
const std::string &ns, const std::string &sep_str) {
|
||||
std::vector<std::string> parts;
|
||||
for (const auto &t : tokens) {
|
||||
parts.push_back(t);
|
||||
}
|
||||
boost::split(parts, ns, boost::is_any_of(sep_str));
|
||||
bts_assert(parts.size() == 3);
|
||||
return {std::stoi(parts[1]), parts[2]};
|
||||
}
|
||||
|
||||
struct AnalyticsServiceServer::PImpl {
|
||||
bts::api::ServiceContext &context;
|
||||
const std::string vs_ns_sep = ".";
|
||||
const std::string exp_params_ns = "analytics_expiration_params";
|
||||
const std::string vs_usage_ns = "volsurface_usage";
|
||||
std::unique_ptr<persistence::IStore> vs_store;
|
||||
std::unique_ptr<persistence::IStore> exp_params_store;
|
||||
std::unique_ptr<persistence::IStore> vs_usage_store;
|
||||
@@ -68,9 +69,9 @@ AnalyticsServiceServer::AnalyticsServiceServer(
|
||||
auto vs_table = me->vs_store->retrieve_all();
|
||||
for (auto const &ns_vals : vs_table) {
|
||||
const std::string &vs_name = ns_vals.first;
|
||||
const std::map<std::string, std::string> &vals = ns_vals.second;
|
||||
LOG(OrderMan, Info, "vs:{} entries:{}", vs_name, vals.size());
|
||||
for (const auto &kvp : vals) {
|
||||
const std::map<std::string, std::string> &key_vals = ns_vals.second;
|
||||
LOG(OrderMan, Info, "vs:{} entries:{}", vs_name, key_vals.size());
|
||||
for (const auto &kvp : key_vals) {
|
||||
const std::string &key = kvp.first;
|
||||
const std::string &val = kvp.second;
|
||||
LOG(OrderMan, Info, "vs:{} key:{} val:{}", vs_name, key, val);
|
||||
@@ -84,15 +85,28 @@ AnalyticsServiceServer::AnalyticsServiceServer(
|
||||
auto exp_params_table = me->exp_params_store->retrieve_all();
|
||||
bts_assert(exp_params_table.size() == 0 || exp_params_table.size() == 1);
|
||||
for (const auto &ns_vals : exp_params_table) {
|
||||
const std::map<std::string, std::string> &vals = ns_vals.second;
|
||||
bts_assert(vals.size() == 0 || vals.size() == 1);
|
||||
for (const auto &kvp : vals) {
|
||||
const std::map<std::string, std::string> &key_vals = ns_vals.second;
|
||||
bts_assert(key_vals.size() == 0 || key_vals.size() == 1);
|
||||
for (const auto &kvp : key_vals) {
|
||||
ExpirationParameterEntryList exp_params;
|
||||
utils::pb::from_string(kvp.second, &exp_params);
|
||||
me->exp_params_publisher.add_or_update(exp_params);
|
||||
}
|
||||
}
|
||||
me->exp_params_publisher.flush();
|
||||
// vol surface usage
|
||||
auto vs_usage_table = me->vs_usage_store->retrieve_all();
|
||||
bts_assert(vs_usage_table.size() == 0 || vs_usage_table.size() == 1);
|
||||
for (const auto &ns_vals : vs_usage_table) {
|
||||
const std::map<std::string, std::string> &key_vals = ns_vals.second;
|
||||
bts_assert(key_vals.size() == 0 || key_vals.size() == 1);
|
||||
for (const auto &kvp : key_vals) {
|
||||
VolSurfaceUsageList vs_usage_list;
|
||||
utils::pb::from_string(kvp.second, &vs_usage_list);
|
||||
me->vs_usage_publisher.add_or_update(vs_usage_list);
|
||||
}
|
||||
}
|
||||
me->vs_usage_publisher.flush();
|
||||
}
|
||||
|
||||
void AnalyticsServiceServer::get_new_volsurface_id(
|
||||
@@ -102,9 +116,9 @@ void AnalyticsServiceServer::get_new_volsurface_id(
|
||||
auto all = me->vs_store->retrieve_all();
|
||||
int max_id = 0;
|
||||
std::string curr_vs_name = "";
|
||||
for (const auto &kvp : all) {
|
||||
const std::string &ns = kvp.first;
|
||||
auto [vs_id, vs_name] = parse_vs_id_name(ns);
|
||||
for (const auto &ns_vals : all) {
|
||||
const std::string &ns = ns_vals.first;
|
||||
auto [vs_id, vs_name] = parse_vs_id_name(ns, me->vs_ns_sep);
|
||||
if (vs_id >= max_id) {
|
||||
max_id = vs_id;
|
||||
curr_vs_name = vs_name;
|
||||
@@ -126,9 +140,10 @@ void AnalyticsServiceServer::save_volsurface(
|
||||
VolSurfaceEntry vs_entry = vs_entry_arg;
|
||||
vs_entry.set_save_time(ms_u);
|
||||
// namespace: volsurface_<vs-name>_<vs-id>
|
||||
// key: save time
|
||||
// key: save_time epoch
|
||||
// value: VolSurfaceEntry
|
||||
std::string ns = "volsurface_" + std::to_string(vs_entry.vs_id()) + "_" +
|
||||
std::string ns = "volsurface" + me->vs_ns_sep +
|
||||
std::to_string(vs_entry.vs_id()) + me->vs_ns_sep +
|
||||
vs_entry.vs_name();
|
||||
std::string key = std::to_string(ms_u);
|
||||
std::string value = utils::pb::to_string(vs_entry);
|
||||
@@ -154,7 +169,7 @@ void AnalyticsServiceServer::set_exp_parameters(
|
||||
const api::Response<::bts::api::ResultMessage> &response) {
|
||||
ExpirationParameterEntryList exp_params = exp_params_args;
|
||||
exp_params.set_id(1);
|
||||
std::string ns = "analytics_expiration_params";
|
||||
std::string ns = me->exp_params_ns;
|
||||
std::string key = std::to_string(1);
|
||||
std::string value = utils::pb::to_string(exp_params);
|
||||
// TODO: check to see if it adds or not
|
||||
@@ -171,7 +186,7 @@ void AnalyticsServiceServer::set_volsurface_usage_list(
|
||||
const api::Response<::bts::api::ResultMessage> &response) {
|
||||
VolSurfaceUsageList vs_usage_list = vs_usage_list_args;
|
||||
vs_usage_list.set_id(1);
|
||||
std::string ns = "volsurface_usage_list";
|
||||
std::string ns = me->vs_usage_ns;
|
||||
std::string key = std::to_string(1);
|
||||
std::string value = utils::pb::to_string(vs_usage_list);
|
||||
me->vs_usage_store->update(ns, key, value);
|
||||
|
||||
Reference in new issue
Block a user