Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option to account history plugin to keep operations that happened in last X blocks in memory #2648

Merged
merged 16 commits into from
Oct 3, 2022
Merged

Add option to account history plugin to keep operations that happened in last X blocks in memory #2648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5985534
Add option to keep operations in the last X blocks
abitmore Sep 30, 2022
54733bf
Wrap long lines, update indents
abitmore Sep 30, 2022
7228516
Update tests for the new min-blocks-to-keep option
abitmore Sep 30, 2022
32d4d0a
Update description of some program options
abitmore Sep 30, 2022
e97455c
Add tests for min-blocks-to-keep option
abitmore Sep 30, 2022
9274261
Remove redundant or commented out code
abitmore Oct 1, 2022
0ca04b9
Delete too old history when new block arrives
abitmore Oct 1, 2022
183fd70
Modify LOAD_VALUE_SET macro to require a semicolon
abitmore Oct 1, 2022
56b1026
Simplify code
abitmore Oct 1, 2022
4a6d9d5
Add tests for partial-operations option
abitmore Oct 1, 2022
fcf4798
Add default value to description of some options
abitmore Oct 1, 2022
ca200dc
Shorten a struct name
abitmore Oct 2, 2022
1db2e1a
Refactor code for better performance
abitmore Oct 2, 2022
74018b5
Shorten a variable name
abitmore Oct 2, 2022
ab9f5ff
Update variable names to avoid variable shadowing
abitmore Oct 2, 2022
e8c80c4
Extract a code block into a function
abitmore Oct 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries/app/config_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ static void create_new_config_file(const fc::path& config_ini_path, const fc::pa
if( name == "partial-operations" )
return new_option_description(name, bpo::value<bool>()->default_value(true), o->description() );
if( name == "max-ops-per-account" )
return new_option_description(name, bpo::value<int>()->default_value(100), o->description() );
return new_option_description(name, bpo::value<uint64_t>()->default_value(100), o->description() );
return o;
};
graphene::app::detail::deduplicator dedup(modify_option_defaults);
Expand Down
9 changes: 6 additions & 3 deletions libraries/app/include/graphene/app/plugin.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,13 @@ namespace impl {

#define DEFAULT_VALUE_VECTOR(value) default_value({fc::json::to_string(value)}, fc::json::to_string(value))
#define LOAD_VALUE_SET(options, name, container, type) \
if( options.count(name) > 0 ) { \
do { \
if( options.count(name) > 0 ) { \
const std::vector<std::string>& ops = options[name].as<std::vector<std::string>>(); \
std::transform(ops.begin(), ops.end(), std::inserter(container, container.end()), &graphene::app::impl::dejsonify<type>); \
}
std::transform(ops.begin(), ops.end(), std::inserter(container, container.end()), \
&graphene::app::impl::dejsonify<type>); \
} \
} while (false)
/// @}

} } //graphene::app
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#define GRAPHENE_MAX_NESTED_OBJECTS (200)

const std::string GRAPHENE_CURRENT_DB_VERSION = "20220916";
const std::string GRAPHENE_CURRENT_DB_VERSION = "20220930";

#define GRAPHENE_RECENTLY_MISSED_COUNT_INCREMENT 4
#define GRAPHENE_RECENTLY_MISSED_COUNT_DECREMENT 3
Expand Down
274 changes: 204 additions & 70 deletions libraries/plugins/account_history/account_history_plugin.cpp
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 36 additions & 8 deletions ...aries/plugins/account_history/include/graphene/account_history/account_history_plugin.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,11 @@
#pragma once

#include <graphene/app/plugin.hpp>
#include <graphene/chain/database.hpp>

#include <graphene/chain/operation_history_object.hpp>

#include <fc/thread/future.hpp>
#include <boost/multi_index/composite_key.hpp>

namespace graphene { namespace account_history {
using namespace chain;
//using namespace graphene::db;
//using boost::multi_index_container;
//using namespace boost::multi_index;

//
// Plugins should #define their SPACE_ID's so plugins with
Expand All @@ -52,9 +46,40 @@ namespace graphene { namespace account_history {

enum account_history_object_type
{
key_account_object_type = 0
exceeded_account_object_type = 0
};

/// This struct tracks accounts that have exceeded the max-ops-per-account limit
struct exceeded_account_object : public abstract_object<exceeded_account_object>
{
static constexpr uint8_t space_id = ACCOUNT_HISTORY_SPACE_ID;
static constexpr uint8_t type_id = exceeded_account_object_type;

/// The ID of the account
account_id_type account_id;
/// The height of the block containing the oldest (not yet removed) operation related to this account
uint32_t block_num;
};

struct by_account;
struct by_block_num;
using exceeded_account_multi_idx_type = multi_index_container<
exceeded_account_object,
indexed_by<
ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
ordered_unique< tag<by_account>,
member< exceeded_account_object, account_id_type, &exceeded_account_object::account_id > >,
ordered_unique< tag<by_block_num>,
composite_key<
exceeded_account_object,
member< exceeded_account_object, uint32_t, &exceeded_account_object::block_num >,
member< object, object_id_type, &object::id >
>
>
>
>;

using exceeded_account_index = generic_index< exceeded_account_object, exceeded_account_multi_idx_type >;

namespace detail
{
Expand All @@ -81,3 +106,6 @@ class account_history_plugin : public graphene::app::plugin
};

} } //graphene::account_history

FC_REFLECT_DERIVED( graphene::account_history::exceeded_account_object, (graphene::db::object),
(account_id)(block_num) )
2 changes: 1 addition & 1 deletion libraries/plugins/witness/witness.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ void witness_plugin::plugin_initialize(const boost::program_options::variables_m
{ try {
ilog("witness plugin: plugin_initialize() begin");
_options = &options;
LOAD_VALUE_SET(options, "witness-id", _witnesses, chain::witness_id_type)
LOAD_VALUE_SET(options, "witness-id", _witnesses, chain::witness_id_type);

if( options.count("private-key") > 0 )
{
Expand Down
11 changes: 11 additions & 0 deletions tests/common/database_fixture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,18 +207,28 @@ std::shared_ptr<boost::program_options::variables_map> database_fixture_base::in
fc::set_option( options, "p2p-endpoint", std::string( ep ) );
}

if (fixture.current_test_name == "min_blocks_to_keep_test")
{
fc::set_option( options, "partial-operations", true );
fc::set_option( options, "max-ops-per-account", (uint64_t)2 );
fc::set_option( options, "min-blocks-to-keep", (uint32_t)3 );
fc::set_option( options, "max-ops-per-acc-by-min-blocks", (uint64_t)5 );
}
if (fixture.current_test_name == "get_account_history_operations")
{
fc::set_option( options, "max-ops-per-account", (uint64_t)75 );
fc::set_option( options, "min-blocks-to-keep", (uint32_t)0 );
}
if (fixture.current_test_name == "api_limit_get_account_history_operations")
{
fc::set_option( options, "max-ops-per-account", (uint64_t)125 );
fc::set_option( options, "min-blocks-to-keep", (uint32_t)0 );
fc::set_option( options, "api-limit-get-account-history-operations", (uint32_t)300 );
}
if(fixture.current_test_name =="api_limit_get_account_history")
{
fc::set_option( options, "max-ops-per-account", (uint64_t)125 );
fc::set_option( options, "min-blocks-to-keep", (uint32_t)0 );
fc::set_option( options, "api-limit-get-account-history", (uint32_t)250 );
}
if(fixture.current_test_name =="api_limit_get_grouped_limit_orders")
Expand All @@ -228,6 +238,7 @@ std::shared_ptr<boost::program_options::variables_map> database_fixture_base::in
if(fixture.current_test_name =="api_limit_get_relative_account_history")
{
fc::set_option( options, "max-ops-per-account", (uint64_t)125 );
fc::set_option( options, "min-blocks-to-keep", (uint32_t)0 );
fc::set_option( options, "api-limit-get-relative-account-history", (uint32_t)250 );
}
if(fixture.current_test_name =="api_limit_get_account_history_by_operations")
Expand Down
Loading