thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-10 01:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
yariks5s 2023-11-27 18:21:49 +00:00
parent 4abb13c795
commit ab0be2f236
3 changed files with 91 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/Client/ClientBase.cpp
View File

@ -2566,14 +2566,6 @@ bool ClientBase::processMultiQueryFromFile(const String & file_name)
ReadBufferFromFile in(file_name);
readStringUntilEOF(queries_from_file, in);
if (!global_context->getSettings().log_comment.changed)
{
Settings settings = global_context->getSettings();
/// NOTE: cannot use even weakly_canonical() since it fails for /dev/stdin due to resolving of "pipe:[X]"
settings.log_comment = fs::absolute(fs::path(file_name));
global_context->setSettings(settings);
}
return executeMultiQuery(queries_from_file);
}
@ -2861,7 +2853,7 @@ void ClientBase::init(int argc, char ** argv)
("interactive", "Process queries-file or --query query and start interactive mode")
("pager", po::value<std::string>(), "Pipe all output into this command (less or similar)")
("max_memory_usage_in_client", po::value<int>(), "Set memory limit in client/local server")
("max_memory_usage_in_client", po::value<std::string>(), "Set memory limit in client/local server")
;
addOptions(options_description);
@ -2996,12 +2988,65 @@ void ClientBase::init(int argc, char ** argv)
clearPasswordFromCommandLine(argc, argv);
/// Limit on total memory usage
size_t max_client_memory_usage = config().getInt64("max_memory_usage_in_client", 0 /*default value*/);
if (max_client_memory_usage != 0)
std::string max_client_memory_usage = config().getString("max_memory_usage_in_client", "0" /*default value*/);
if (max_client_memory_usage != "0")
{
total_memory_tracker.setHardLimit(max_client_memory_usage);
total_memory_tracker.setDescription("(total)");
total_memory_tracker.setMetric(CurrentMetrics::MemoryTracking);
UInt64 multiplier = 1;
size_t pos = max_client_memory_usage.size()-1;
if (!isdigit(max_client_memory_usage[pos]))
{
switch (std::tolower(max_client_memory_usage[pos]))
{
case 'k':
{
multiplier = 1e3;
break;
}
case 'm':
{
multiplier = 1e6;
break;
}
case 'g':
{
multiplier = 1e9;
break;
}
case 't':
{
multiplier = 1e12;
break;
}
case 'p':
{
multiplier = 1e15;
break;
}
case 'e':
{
multiplier = 1e18;
break;
}
default:
throw Exception(ErrorCodes::INCORRECT_DATA, "Invalid character '{}' in max_memory_usage_in_client", max_client_memory_usage[pos]);
}
}
long double mem_usage_float = std::stod((max_client_memory_usage.substr(0, pos+1))) * multiplier;
if (mem_usage_float < 0)
throw Exception(ErrorCodes::BAD_ARGUMENTS, "Argument '{}' for max_memory_usage_in_client cannot be negative.", mem_usage_float);
if (mem_usage_float > UInt64(mem_usage_float))
throw Exception(ErrorCodes::BAD_ARGUMENTS, "Type of argument '{}' for max_memory_usage_in_client must be integer", mem_usage_float);
try
{
UInt64 max_client_memory_usage_int = UInt64(mem_usage_float);
total_memory_tracker.setHardLimit(max_client_memory_usage_int);
total_memory_tracker.setDescription("(total)");
total_memory_tracker.setMetric(CurrentMetrics::MemoryTracking);
}
catch (...)
{
throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid input '{}' in max_memory_usage_in_client", max_client_memory_usage);
}
}
}

14
tests/queries/0_stateless/02003_memory_limit_in_client.reference
View File

@ -1 +1,15 @@
60000
60000
60000
60000
60000
60000
60000
60000
60000
60000
60000
1
1
1
1

18
tests/queries/0_stateless/02003_memory_limit_in_client.sh
View File

@ -6,3 +6,21 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
$CLICKHOUSE_CLIENT --max_memory_usage_in_client=1 -n -q "SELECT arrayMap(x -> range(x), range(number)) FROM numbers(1000) -- { clientError MEMORY_LIMIT_EXCEEDED }"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client=0 -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client='0.5K' -n -q "SELECT arrayMap(x -> range(x), range(number)) FROM numbers(1000) -- { clientError MEMORY_LIMIT_EXCEEDED }"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client='0.5k' -n -q "SELECT arrayMap(x -> range(x), range(number)) FROM numbers(1000) -- { clientError MEMORY_LIMIT_EXCEEDED }"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client='1M' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client='1m' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client='1.231G' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client='1.2145g' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client='1.1T' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client='1.1t' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client='2P' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client='2p' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client='10.2E' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client='10.2e' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client='-1.1T' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "BAD_ARGUMENTS"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client='1.1111K' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "BAD_ARGUMENTS"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client='-1' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "BAD_ARGUMENTS"
$CLICKHOUSE_CLIENT --max_memory_usage_in_client='1.1a' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "INCORRECT_DATA"