diff --git a/cql3/cql_config.hh b/cql3/cql_config.hh index f1edf5849d..89ca4fedd3 100644 --- a/cql3/cql_config.hh +++ b/cql3/cql_config.hh @@ -23,12 +23,14 @@ struct cql_config { utils::updateable_value select_internal_page_size; utils::updateable_value strict_allow_filtering; utils::updateable_value enable_parallelized_aggregation; + utils::updateable_value batch_size_warn_threshold_in_kb; explicit cql_config(const db::config& cfg) : restrictions(cfg) , select_internal_page_size(cfg.select_internal_page_size) , strict_allow_filtering(cfg.strict_allow_filtering) , enable_parallelized_aggregation(cfg.enable_parallelized_aggregation) + , batch_size_warn_threshold_in_kb(cfg.batch_size_warn_threshold_in_kb) {} struct default_tag{}; cql_config(default_tag) @@ -36,6 +38,7 @@ struct cql_config { , select_internal_page_size(10000) , strict_allow_filtering(db::tri_mode_restriction(db::tri_mode_restriction_t::mode::WARN)) , enable_parallelized_aggregation(true) + , batch_size_warn_threshold_in_kb(128) {} }; diff --git a/cql3/statements/batch_statement.cc b/cql3/statements/batch_statement.cc index d644df5e47..3a8bdca260 100644 --- a/cql3/statements/batch_statement.cc +++ b/cql3/statements/batch_statement.cc @@ -11,6 +11,7 @@ #include "cql3/util.hh" #include "raw/batch_statement.hh" #include "db/config.hh" +#include "cql3/cql_config.hh" #include "db/consistency_level_validations.hh" #include "data_dictionary/data_dictionary.hh" #include @@ -195,7 +196,7 @@ void batch_statement::verify_batch_size(query_processor& qp, const utils::chunke return; // We only warn for batch spanning multiple mutations } - size_t warn_threshold = qp.db().get_config().batch_size_warn_threshold_in_kb() * 1024; + size_t warn_threshold = qp.get_cql_config().batch_size_warn_threshold_in_kb() * 1024; size_t fail_threshold = qp.db().get_config().batch_size_fail_threshold_in_kb() * 1024; size_t size = 0;