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

Minor style and logic fixes

Browse Source
This commit is contained in:
dimarub2000 2019-08-09 16:00:47 +03:00
parent b2cbc1a747
commit 9d2c9c8c2a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dbms/programs/benchmark/Benchmark.cpp
View File

@ -216,9 +216,9 @@ private:
const std::vector<std::vector<double>> students_table = { const std::vector<std::vector<double>> students_table = {
/* inf */ { 1.282, 1.645, 1.960, 2.326, 2.576, 3.090 }, /* inf */ { 1.282, 1.645, 1.960, 2.326, 2.576, 3.090 },
/* 1. */ { 3.078, 6.314, 12.706, 31.821, 63.657, 318.313 }, /* 1. */ { 3.078, 6.314, 12.706, 31.821, 63.657, 318.313},
/* 2. */ { 1.886, 2.920, 4.303, 6.965, 9.925, 22.327 }, /* 2. */ { 1.886, 2.920, 4.303, 6.965, 9.925, 22.327 },
/* 3. */ { 1.638, 2.353, 3.182, 4.541, 5.841, 10.215 }, /* 3. */ { 1.638, 2.353, 3.182, 4.541, 5.841, 10.215 },
/* 4. */ { 1.533, 2.132, 2.776, 3.747, 4.604, 7.173 }, /* 4. */ { 1.533, 2.132, 2.776, 3.747, 4.604, 7.173 },
/* 5. */ { 1.476, 2.015, 2.571, 3.365, 4.032, 5.893 }, /* 5. */ { 1.476, 2.015, 2.571, 3.365, 4.032, 5.893 },
/* 6. */ { 1.440, 1.943, 2.447, 3.143, 3.707, 5.208 }, /* 6. */ { 1.440, 1.943, 2.447, 3.143, 3.707, 5.208 },
@ -353,7 +353,6 @@ private:
return true; return true;
} }
} }
}; };
RelativeAnalysis comparison_relative; RelativeAnalysis comparison_relative;
@ -552,9 +551,10 @@ private:
std::lock_guard lock(mutex); std::lock_guard lock(mutex);
std::cerr << "\n"; std::cerr << "\n";
size_t info_counter = 1; for (size_t i = 1; i <= infos.size(); ++i)
for (auto & info : infos)
{ {
auto & info = infos[i - 1];
/// Avoid zeros, nans or exceptions /// Avoid zeros, nans or exceptions
if (0 == info->queries) if (0 == info->queries)
return; return;
@ -562,7 +562,7 @@ private:
double seconds = info->work_time / concurrency; double seconds = info->work_time / concurrency;
std::cerr std::cerr
<< "connection " << info_counter++ << ", " << "connection " << i << ", "
<< "queries " << info->queries << ", " << "queries " << info->queries << ", "
<< "QPS: " << (info->queries / seconds) << ", " << "QPS: " << (info->queries / seconds) << ", "
<< "RPS: " << (info->read_rows / seconds) << ", " << "RPS: " << (info->read_rows / seconds) << ", "
@ -571,6 +571,7 @@ private:
<< "result MiB/s: " << (info->result_bytes / seconds / 1048576) << "." << "result MiB/s: " << (info->result_bytes / seconds / 1048576) << "."
<< "\n"; << "\n";
} }
std::cerr << "\n\t\t"; std::cerr << "\n\t\t";
for (size_t i = 1; i <= infos.size(); ++i) for (size_t i = 1; i <= infos.size(); ++i)
@ -622,7 +623,7 @@ private:
for (size_t i = 1; i <= infos.size(); ++i) for (size_t i = 1; i <= infos.size(); ++i)
{ {
auto info = infos[i - 1]; auto & info = infos[i - 1];
json_out << double_quote << "connection_" + toString(i) << ": {\n"; json_out << double_quote << "connection_" + toString(i) << ": {\n";
json_out << double_quote << "statistics" << ": {\n"; json_out << double_quote << "statistics" << ": {\n";