2017-01-13 18:26:51 +00:00
|
|
|
#include <iostream>
|
2017-02-07 16:47:10 +00:00
|
|
|
#include <limits>
|
2017-02-24 22:02:08 +00:00
|
|
|
#include <unistd.h>
|
2017-01-13 18:26:51 +00:00
|
|
|
|
2017-01-20 12:36:16 +00:00
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <boost/program_options.hpp>
|
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
#include <DB/AggregateFunctions/ReservoirSampler.h>
|
2017-01-31 16:48:36 +00:00
|
|
|
#include <DB/Client/ConnectionPool.h>
|
|
|
|
#include <DB/Common/ConcurrentBoundedQueue.h>
|
2017-02-07 16:47:10 +00:00
|
|
|
#include <DB/Common/Stopwatch.h>
|
|
|
|
#include <DB/Common/ThreadPool.h>
|
2017-01-20 12:36:16 +00:00
|
|
|
#include <DB/Core/Types.h>
|
2017-01-31 16:48:36 +00:00
|
|
|
#include <DB/DataStreams/RemoteBlockInputStream.h>
|
|
|
|
#include <DB/Interpreters/Settings.h>
|
2017-01-20 12:36:16 +00:00
|
|
|
#include <DB/IO/ReadHelpers.h>
|
|
|
|
#include <DB/IO/ReadBufferFromFileDescriptor.h>
|
2017-01-31 16:48:36 +00:00
|
|
|
|
2017-02-07 16:47:10 +00:00
|
|
|
|
2017-01-20 12:36:16 +00:00
|
|
|
#include <Poco/AutoPtr.h>
|
|
|
|
#include <Poco/XML/XMLStream.h>
|
|
|
|
#include <Poco/SAX/InputSource.h>
|
|
|
|
#include <Poco/Util/XMLConfiguration.h>
|
|
|
|
#include <Poco/Exception.h>
|
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
#include "InterruptListener.h"
|
2017-01-20 12:36:16 +00:00
|
|
|
|
2017-01-13 18:26:51 +00:00
|
|
|
/** Tests launcher for ClickHouse.
|
|
|
|
* The tool walks through given or default folder in order to find files with
|
|
|
|
* tests' description and launches it.
|
|
|
|
*/
|
|
|
|
namespace DB
|
|
|
|
{
|
|
|
|
|
|
|
|
namespace ErrorCodes
|
|
|
|
{
|
|
|
|
extern const int POCO_EXCEPTION;
|
|
|
|
extern const int STD_EXCEPTION;
|
|
|
|
extern const int UNKNOWN_EXCEPTION;
|
|
|
|
}
|
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
struct CriterionWithPriority {
|
|
|
|
std::string priority = "";
|
|
|
|
size_t value = 0;
|
|
|
|
bool fulfilled = false;
|
2017-02-07 16:47:10 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/// Termination criterions. The running test will be terminated in either of two conditions:
|
|
|
|
/// 1. All criterions marked 'min' are fulfilled
|
|
|
|
/// or
|
|
|
|
/// 2. Any criterion marked 'max' is fulfilled
|
|
|
|
class StopCriterions {
|
|
|
|
private:
|
|
|
|
using AbstractConfiguration = Poco::AutoPtr<Poco::Util::AbstractConfiguration>;
|
|
|
|
using Keys = std::vector<std::string>;
|
|
|
|
|
|
|
|
void initializeStruct(const std::string priority,
|
|
|
|
const AbstractConfiguration & stopCriterionsView)
|
|
|
|
{
|
|
|
|
Keys keys;
|
|
|
|
stopCriterionsView->keys(priority, keys);
|
|
|
|
|
|
|
|
for (const std::string & key : keys) {
|
|
|
|
if (key == "timeout_ms") {
|
|
|
|
timeout_ms.value = stopCriterionsView->getUInt64(priority + ".timeout_ms");
|
|
|
|
timeout_ms.priority = priority;
|
|
|
|
} else if (key == "read_rows") {
|
|
|
|
read_rows.value = stopCriterionsView->getUInt64(priority + ".read_rows");
|
|
|
|
read_rows.priority = priority;
|
|
|
|
} else if (key == "bytes_read_uncompressed") {
|
|
|
|
bytes_read_uncompressed.value = stopCriterionsView->getUInt64(priority + ".bytes_read_uncompressed");
|
|
|
|
bytes_read_uncompressed.priority = priority;
|
|
|
|
} else if (key == "iterations") {
|
|
|
|
iterations.value = stopCriterionsView->getUInt64(priority + ".iterations");
|
|
|
|
iterations.priority = priority;
|
|
|
|
} else if (key == "min_time_not_changing_for_ms") {
|
|
|
|
min_time_not_changing_for_ms.value = stopCriterionsView->getUInt64(priority + ".min_time_not_changing_for_ms");
|
|
|
|
min_time_not_changing_for_ms.priority = priority;
|
|
|
|
} else if (key == "max_speed_not_changing_for_ms") {
|
|
|
|
max_speed_not_changing_for_ms.value = stopCriterionsView->getUInt64(priority + ".max_speed_not_changing_for_ms");
|
|
|
|
max_speed_not_changing_for_ms.priority = priority;
|
|
|
|
} else if (key == "average_speed_not_changing_for_ms") {
|
|
|
|
average_speed_not_changing_for_ms.value = stopCriterionsView->getUInt64(priority + ".average_speed_not_changing_for_ms");
|
|
|
|
average_speed_not_changing_for_ms.priority = priority;
|
|
|
|
} else {
|
|
|
|
throw Poco::Exception("Met unkown stop criterion: " + key, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (priority == "min") { ++number_of_initialized_min; };
|
|
|
|
if (priority == "max") { ++number_of_initialized_max; };
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
public:
|
|
|
|
StopCriterions()
|
|
|
|
: number_of_initialized_min(0), number_of_initialized_max(0),
|
|
|
|
fulfilled_criterions_min(0), fulfilled_criterions_max(0) {}
|
|
|
|
|
|
|
|
void loadFromConfig(const AbstractConfiguration & stopCriterionsView)
|
|
|
|
{
|
|
|
|
if (stopCriterionsView->has("min")) {
|
|
|
|
initializeStruct("min", stopCriterionsView);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (stopCriterionsView->has("max")) {
|
|
|
|
initializeStruct("max", stopCriterionsView);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
struct CriterionWithPriority timeout_ms;
|
|
|
|
struct CriterionWithPriority read_rows;
|
|
|
|
struct CriterionWithPriority bytes_read_uncompressed;
|
|
|
|
struct CriterionWithPriority iterations;
|
|
|
|
struct CriterionWithPriority min_time_not_changing_for_ms;
|
|
|
|
struct CriterionWithPriority max_speed_not_changing_for_ms;
|
|
|
|
struct CriterionWithPriority average_speed_not_changing_for_ms;
|
2017-02-07 16:47:10 +00:00
|
|
|
|
|
|
|
/// Hereafter 'min' and 'max', in context of critetions, mean a level of importance
|
|
|
|
/// Number of initialized properties met in configuration
|
|
|
|
std::atomic<size_t> number_of_initialized_min;
|
|
|
|
std::atomic<size_t> number_of_initialized_max;
|
|
|
|
|
|
|
|
std::atomic<size_t> fulfilled_criterions_min;
|
|
|
|
std::atomic<size_t> fulfilled_criterions_max;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct Stats
|
|
|
|
{
|
|
|
|
Stopwatch watch;
|
2017-02-24 22:02:08 +00:00
|
|
|
Stopwatch watch_per_query;
|
2017-02-07 16:47:10 +00:00
|
|
|
Stopwatch min_time_watch;
|
|
|
|
Stopwatch max_speed_watch;
|
|
|
|
Stopwatch average_speed_watch;
|
2017-02-24 22:02:08 +00:00
|
|
|
size_t queries;
|
2017-02-07 16:47:10 +00:00
|
|
|
size_t read_rows;
|
|
|
|
size_t read_bytes;
|
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
using Sampler = ReservoirSampler<double>;
|
|
|
|
Sampler sampler {1 << 16};
|
|
|
|
|
2017-02-07 16:47:10 +00:00
|
|
|
/// min_time in ms
|
2017-02-24 22:02:08 +00:00
|
|
|
UInt64 min_time = std::numeric_limits<UInt64>::max();
|
|
|
|
double total_time = 0;
|
|
|
|
double max_speed = 0;
|
|
|
|
double average_speed_value = 0;
|
|
|
|
double average_speed_first = 0;
|
|
|
|
double average_speed_precision = 0.001;
|
2017-02-07 16:47:10 +00:00
|
|
|
size_t number_of_speed_info_batches = 0;
|
|
|
|
|
|
|
|
void update_min_time(const UInt64 min_time_candidate)
|
|
|
|
{
|
|
|
|
if (min_time_candidate < min_time) {
|
|
|
|
min_time = min_time_candidate;
|
|
|
|
min_time_watch.restart();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
void update_average_speed(const double new_speed_info)
|
2017-02-07 16:47:10 +00:00
|
|
|
{
|
2017-02-24 22:02:08 +00:00
|
|
|
average_speed_value = ((average_speed_value * number_of_speed_info_batches)
|
|
|
|
+ new_speed_info);
|
|
|
|
average_speed_value /= (++number_of_speed_info_batches);
|
|
|
|
|
|
|
|
if (average_speed_first == 0) {
|
|
|
|
average_speed_first = average_speed_value;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (abs(average_speed_value - average_speed_first) >= average_speed_precision) {
|
|
|
|
average_speed_first = average_speed_value;
|
2017-02-07 16:47:10 +00:00
|
|
|
average_speed_watch.restart();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void update_max_speed(const size_t max_speed_candidate)
|
|
|
|
{
|
|
|
|
if (max_speed_candidate > max_speed) {
|
|
|
|
max_speed = max_speed_candidate;
|
|
|
|
max_speed_watch.restart();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void add(size_t read_rows_inc, size_t read_bytes_inc)
|
|
|
|
{
|
|
|
|
read_rows += read_rows_inc;
|
|
|
|
read_bytes += read_bytes_inc;
|
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
double new_speed = read_rows_inc / watch_per_query.elapsedSeconds();
|
2017-02-07 16:47:10 +00:00
|
|
|
update_max_speed(new_speed);
|
|
|
|
update_average_speed(new_speed);
|
|
|
|
}
|
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
void updateQueryInfo()
|
|
|
|
{
|
|
|
|
++queries;
|
|
|
|
sampler.insert(watch_per_query.elapsedSeconds());
|
|
|
|
update_min_time(watch_per_query.elapsed() / (1000 * 1000)); /// ns to ms
|
|
|
|
}
|
|
|
|
|
|
|
|
void setTotalTime()
|
|
|
|
{
|
|
|
|
total_time = watch.elapsedSeconds();
|
|
|
|
}
|
|
|
|
|
2017-02-07 16:47:10 +00:00
|
|
|
void clear()
|
|
|
|
{
|
|
|
|
watch.restart();
|
2017-02-24 22:02:08 +00:00
|
|
|
watch_per_query.restart();
|
|
|
|
min_time_watch.restart();
|
|
|
|
max_speed_watch.restart();
|
|
|
|
average_speed_watch.restart();
|
|
|
|
|
|
|
|
sampler.clear();
|
2017-02-07 16:47:10 +00:00
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
queries = 0;
|
2017-02-07 16:47:10 +00:00
|
|
|
read_rows = 0;
|
|
|
|
read_bytes = 0;
|
2017-02-24 22:02:08 +00:00
|
|
|
|
|
|
|
min_time = std::numeric_limits<UInt64>::max();
|
|
|
|
total_time = 0;
|
|
|
|
max_speed = 0;
|
|
|
|
average_speed_value = 0;
|
|
|
|
average_speed_first = 0;
|
|
|
|
average_speed_precision = 0.001;
|
|
|
|
number_of_speed_info_batches = 0;
|
2017-02-07 16:47:10 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2017-01-13 18:26:51 +00:00
|
|
|
class PerformanceTest
|
|
|
|
{
|
|
|
|
public:
|
2017-01-20 12:36:16 +00:00
|
|
|
PerformanceTest(
|
|
|
|
const unsigned concurrency_,
|
|
|
|
const String & host_,
|
|
|
|
const UInt16 port_,
|
|
|
|
const String & default_database_,
|
|
|
|
const String & user_,
|
|
|
|
const String & password_,
|
|
|
|
const std::vector<std::string> & input_files,
|
|
|
|
const std::vector<std::string> & tags,
|
|
|
|
const std::vector<std::string> & without_tags,
|
|
|
|
const std::vector<std::string> & names,
|
|
|
|
const std::vector<std::string> & without_names,
|
|
|
|
const std::vector<std::string> & names_regexp,
|
2017-01-20 18:34:06 +00:00
|
|
|
const std::vector<std::string> & without_names_regexp
|
2017-01-20 12:36:16 +00:00
|
|
|
):
|
2017-01-31 16:48:36 +00:00
|
|
|
concurrency(concurrency_), queue(concurrency_),
|
2017-01-20 12:36:16 +00:00
|
|
|
connections(concurrency, host_, port_, default_database_, user_, password_),
|
|
|
|
pool(concurrency),
|
|
|
|
testsConfigurations(input_files.size())
|
2017-01-13 18:26:51 +00:00
|
|
|
{
|
2017-01-20 12:36:16 +00:00
|
|
|
if (input_files.size() < 1) {
|
|
|
|
throw Poco::Exception("No tests were specified", 1);
|
|
|
|
}
|
|
|
|
|
2017-01-13 18:26:51 +00:00
|
|
|
// std::cerr << std::fixed << std::setprecision(3);
|
2017-01-20 12:36:16 +00:00
|
|
|
readTestsConfiguration(input_files);
|
2017-01-13 18:26:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
2017-01-20 12:36:16 +00:00
|
|
|
unsigned concurrency;
|
2017-02-24 22:02:08 +00:00
|
|
|
std::string testName;
|
2017-01-31 16:48:36 +00:00
|
|
|
|
|
|
|
using Query = std::string;
|
|
|
|
using Queries = std::vector<std::string>;
|
|
|
|
Queries queries;
|
|
|
|
|
|
|
|
using Queue = ConcurrentBoundedQueue<Query>;
|
|
|
|
Queue queue;
|
|
|
|
|
2017-01-20 12:36:16 +00:00
|
|
|
ConnectionPool connections;
|
2017-01-31 16:48:36 +00:00
|
|
|
ThreadPool pool;
|
|
|
|
Settings settings;
|
2017-01-20 12:36:16 +00:00
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
InterruptListener interrupt_listener;
|
|
|
|
bool gotSIGINT = false;
|
|
|
|
std::vector<RemoteBlockInputStream*> streams;
|
|
|
|
|
|
|
|
double average_speed_precision = 0.001;
|
|
|
|
|
2017-01-20 18:34:06 +00:00
|
|
|
using XMLConfiguration = Poco::Util::XMLConfiguration;
|
2017-01-24 19:41:24 +00:00
|
|
|
using AbstractConfig = Poco::AutoPtr<Poco::Util::AbstractConfiguration>;
|
2017-01-20 18:34:06 +00:00
|
|
|
using Config = Poco::AutoPtr<XMLConfiguration>;
|
|
|
|
using Paths = std::vector<std::string>;
|
|
|
|
using StringToVector = std::map< std::string, std::vector<std::string> >;
|
2017-01-20 12:36:16 +00:00
|
|
|
std::vector<Config> testsConfigurations;
|
|
|
|
|
2017-02-07 16:47:10 +00:00
|
|
|
struct StopCriterions stopCriterions;
|
|
|
|
|
|
|
|
#define incFulfilledCriterions(CRITERION) \
|
2017-02-24 22:02:08 +00:00
|
|
|
if (! stopCriterions.CRITERION.fulfilled) {\
|
|
|
|
stopCriterions.CRITERION.priority == "min" \
|
|
|
|
? ++stopCriterions.fulfilled_criterions_min \
|
|
|
|
: ++stopCriterions.fulfilled_criterions_max; \
|
|
|
|
stopCriterions.CRITERION.fulfilled = true; \
|
|
|
|
}
|
2017-02-07 16:47:10 +00:00
|
|
|
|
2017-01-31 16:48:36 +00:00
|
|
|
enum ExecutionType { loop, once };
|
|
|
|
ExecutionType execType;
|
|
|
|
|
2017-02-07 16:47:10 +00:00
|
|
|
Stats info_total;
|
|
|
|
std::mutex mutex;
|
|
|
|
|
|
|
|
|
2017-01-20 18:34:06 +00:00
|
|
|
void readTestsConfiguration(const Paths & input_files)
|
2017-01-20 12:36:16 +00:00
|
|
|
{
|
2017-01-20 18:34:06 +00:00
|
|
|
testsConfigurations.resize(input_files.size());
|
|
|
|
|
|
|
|
for (size_t i = 0; i != input_files.size(); ++i) {
|
|
|
|
const std::string path = input_files[i];
|
|
|
|
testsConfigurations[i] = Config(new XMLConfiguration(path));
|
2017-01-20 12:36:16 +00:00
|
|
|
}
|
|
|
|
|
2017-01-20 18:34:06 +00:00
|
|
|
// TODO: here will be tests filter on tags, names, regexp matching, etc.
|
2017-01-20 12:36:16 +00:00
|
|
|
// { ... }
|
|
|
|
|
|
|
|
// for now let's launch one test only
|
2017-01-20 18:34:06 +00:00
|
|
|
if (testsConfigurations.size()) {
|
2017-01-24 19:41:24 +00:00
|
|
|
for (auto & testConfig : testsConfigurations) {
|
2017-01-20 18:34:06 +00:00
|
|
|
runTest(testConfig);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-24 19:41:24 +00:00
|
|
|
void runTest(Config & testConfig)
|
2017-01-20 18:34:06 +00:00
|
|
|
{
|
2017-02-24 22:02:08 +00:00
|
|
|
testName = testConfig->getString("name");
|
2017-01-31 16:48:36 +00:00
|
|
|
std::cout << "Running: " << testName << "\n";
|
2017-01-20 18:34:06 +00:00
|
|
|
|
2017-01-31 16:48:36 +00:00
|
|
|
/// Preprocess configuration file
|
2017-01-20 18:34:06 +00:00
|
|
|
using Keys = std::vector<std::string>;
|
|
|
|
|
|
|
|
if (testConfig->has("settings")) {
|
2017-01-31 16:48:36 +00:00
|
|
|
Keys configSettings;
|
|
|
|
testConfig->keys("settings", configSettings);
|
2017-01-20 18:34:06 +00:00
|
|
|
|
|
|
|
/// This macro goes through all settings in the Settings.h
|
|
|
|
/// and, if found any settings in test's xml configuration
|
2017-01-31 16:48:36 +00:00
|
|
|
/// with the same name, sets its value to settings
|
2017-01-20 18:34:06 +00:00
|
|
|
std::vector<std::string>::iterator it;
|
|
|
|
#define EXTRACT_SETTING(TYPE, NAME, DEFAULT) \
|
2017-01-31 16:48:36 +00:00
|
|
|
it = std::find(configSettings.begin(), configSettings.end(), #NAME); \
|
|
|
|
if (it != configSettings.end()) \
|
|
|
|
settings.set( \
|
2017-01-20 18:34:06 +00:00
|
|
|
#NAME, testConfig->getString("settings."#NAME) \
|
|
|
|
);
|
|
|
|
APPLY_FOR_SETTINGS(EXTRACT_SETTING)
|
|
|
|
APPLY_FOR_LIMITS(EXTRACT_SETTING)
|
|
|
|
#undef EXTRACT_SETTING
|
|
|
|
|
2017-01-31 16:48:36 +00:00
|
|
|
if (std::find(configSettings.begin(), configSettings.end(), "profile") !=
|
|
|
|
configSettings.end()) {
|
|
|
|
// TODO: proceed profile settings in a proper way
|
2017-01-20 18:34:06 +00:00
|
|
|
}
|
2017-02-24 22:02:08 +00:00
|
|
|
|
|
|
|
if (std::find(configSettings.begin(), configSettings.end(),
|
|
|
|
"average_speed_precision") != configSettings.end()) {
|
|
|
|
info_total.average_speed_precision = testConfig->getDouble("settings.average_speed_precision");
|
|
|
|
}
|
2017-01-20 18:34:06 +00:00
|
|
|
}
|
|
|
|
|
2017-01-31 16:48:36 +00:00
|
|
|
Query query;
|
2017-01-20 18:34:06 +00:00
|
|
|
|
2017-01-31 16:48:36 +00:00
|
|
|
if (! testConfig->has("query")) {
|
|
|
|
throw Poco::Exception("Missing query field in test's config: " +
|
|
|
|
testName, 1);
|
|
|
|
}
|
2017-01-20 18:34:06 +00:00
|
|
|
|
2017-01-31 16:48:36 +00:00
|
|
|
query = testConfig->getString("query");
|
|
|
|
|
|
|
|
if (query.empty()) {
|
|
|
|
throw Poco::Exception("The query is empty in test's config: " +
|
|
|
|
testName, 1);
|
2017-01-20 18:34:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (testConfig->has("substitutions")) {
|
2017-01-24 19:41:24 +00:00
|
|
|
/// Make "subconfig" of inner xml block
|
|
|
|
AbstractConfig substitutionsView(testConfig
|
|
|
|
->createView("substitutions"));
|
2017-01-20 18:34:06 +00:00
|
|
|
|
|
|
|
StringToVector substitutions;
|
|
|
|
constructSubstitutions(substitutionsView, substitutions);
|
|
|
|
|
2017-01-31 16:48:36 +00:00
|
|
|
queries = formatQueries(query, substitutions);
|
|
|
|
} else {
|
|
|
|
// TODO: probably it will be a good practice to check if
|
|
|
|
// query string has {substitution pattern}, but no substitution field
|
|
|
|
// was found in xml configuration
|
|
|
|
|
|
|
|
queries.push_back(query);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (! testConfig->has("type")) {
|
|
|
|
throw Poco::Exception("Missing type property in config: " +
|
|
|
|
testName);
|
|
|
|
}
|
|
|
|
|
|
|
|
std::string configExecType = testConfig->getString("type");
|
|
|
|
if (configExecType == "loop")
|
|
|
|
execType = loop;
|
|
|
|
else if (configExecType == "once")
|
|
|
|
execType = once;
|
|
|
|
else
|
|
|
|
throw Poco::Exception("Unknown type " + configExecType + " in :" +
|
|
|
|
testName, 1);
|
|
|
|
|
2017-02-07 16:47:10 +00:00
|
|
|
if (testConfig->has("stop")) {
|
|
|
|
AbstractConfig stopCriterionsView(testConfig
|
|
|
|
->createView("stop"));
|
|
|
|
stopCriterions.loadFromConfig(stopCriterionsView);
|
|
|
|
} else {
|
|
|
|
throw Poco::Exception("No termination conditions were found", 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (execType == loop) {
|
|
|
|
runLoopQuery(queries[0]);
|
|
|
|
} else {
|
|
|
|
runQueries(queries);
|
|
|
|
}
|
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
info_total.setTotalTime();
|
|
|
|
constructTotalInfo();
|
2017-02-07 16:47:10 +00:00
|
|
|
}
|
2017-01-31 16:48:36 +00:00
|
|
|
|
2017-02-07 16:47:10 +00:00
|
|
|
void runLoopQuery(const Query & query)
|
|
|
|
{
|
2017-02-24 22:02:08 +00:00
|
|
|
info_total.clear();
|
2017-02-07 16:47:10 +00:00
|
|
|
|
|
|
|
size_t max_iterations = stopCriterions.iterations.value;
|
|
|
|
size_t i = -1;
|
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
while (! gotSIGINT) {
|
2017-02-07 16:47:10 +00:00
|
|
|
++i;
|
|
|
|
|
|
|
|
pool.schedule(std::bind(
|
|
|
|
&PerformanceTest::thread,
|
|
|
|
this,
|
|
|
|
connections.IConnectionPool::get()
|
|
|
|
));
|
|
|
|
|
|
|
|
queue.push(query);
|
|
|
|
queue.push(""); /// asking thread to stop
|
|
|
|
pool.wait();
|
|
|
|
|
|
|
|
/// check stop criterions
|
|
|
|
if (max_iterations && i >= max_iterations) {
|
|
|
|
incFulfilledCriterions(iterations);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (stopCriterions.number_of_initialized_min &&
|
|
|
|
(stopCriterions.fulfilled_criterions_min >=
|
|
|
|
stopCriterions.number_of_initialized_min)) {
|
|
|
|
/// All 'min' criterions are fulfilled
|
|
|
|
// TODO:
|
|
|
|
std::cout << "All 'min' criterions are fulfilled" << std::endl;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (stopCriterions.number_of_initialized_max &&
|
|
|
|
stopCriterions.fulfilled_criterions_max) {
|
|
|
|
/// Some 'max' criterions are fulfilled
|
|
|
|
|
|
|
|
// TODO:
|
|
|
|
std::cout << stopCriterions.fulfilled_criterions_max
|
|
|
|
<< "'max' criterions are fulfilled" << std::endl;
|
|
|
|
break;
|
|
|
|
}
|
2017-01-31 16:48:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-07 16:47:10 +00:00
|
|
|
void runQueries(const Queries & queries)
|
2017-01-31 16:48:36 +00:00
|
|
|
{
|
2017-02-24 22:02:08 +00:00
|
|
|
info_total.clear();
|
2017-02-07 16:47:10 +00:00
|
|
|
|
2017-01-31 16:48:36 +00:00
|
|
|
for (size_t i = 0; i < concurrency; ++i) {
|
|
|
|
pool.schedule(std::bind(
|
|
|
|
&PerformanceTest::thread,
|
|
|
|
this,
|
|
|
|
connections.IConnectionPool::get()
|
|
|
|
));
|
|
|
|
}
|
|
|
|
|
2017-02-07 16:47:10 +00:00
|
|
|
for (const Query & query : queries) {
|
2017-01-31 16:48:36 +00:00
|
|
|
queue.push(query);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (size_t i = 0; i != concurrency; ++i) {
|
|
|
|
/// Genlty asking threads to stop
|
|
|
|
queue.push("");
|
|
|
|
}
|
|
|
|
|
|
|
|
pool.wait();
|
|
|
|
}
|
|
|
|
|
|
|
|
void thread(ConnectionPool::Entry & connection)
|
|
|
|
{
|
|
|
|
Query query;
|
|
|
|
|
|
|
|
while (true) {
|
|
|
|
queue.pop(query);
|
|
|
|
|
|
|
|
/// Empty query means end of execution
|
|
|
|
if (query.empty())
|
|
|
|
break;
|
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
execute(connection, query);
|
2017-01-20 18:34:06 +00:00
|
|
|
}
|
2017-01-20 12:36:16 +00:00
|
|
|
}
|
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
void execute(ConnectionPool::Entry & connection, const Query & query)
|
2017-01-31 16:48:36 +00:00
|
|
|
{
|
2017-02-24 22:02:08 +00:00
|
|
|
InterruptListener thread_interrupt_listener;
|
|
|
|
info_total.watch_per_query.restart();
|
2017-02-07 16:47:10 +00:00
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
RemoteBlockInputStream * stream = new RemoteBlockInputStream(
|
|
|
|
connection, query, &settings, nullptr, Tables()/*, query_processing_stage*/
|
|
|
|
);
|
|
|
|
|
|
|
|
size_t stream_index;
|
|
|
|
{
|
|
|
|
std::lock_guard<std::mutex> lock(mutex);
|
|
|
|
streams.push_back(stream);
|
|
|
|
stream_index = streams.size() - 1;
|
|
|
|
}
|
2017-01-31 16:48:36 +00:00
|
|
|
|
2017-02-07 16:47:10 +00:00
|
|
|
Progress progress;
|
2017-02-24 22:02:08 +00:00
|
|
|
stream->setProgressCallback(
|
|
|
|
[&progress, &stream, &thread_interrupt_listener, this]
|
2017-02-07 16:47:10 +00:00
|
|
|
(const Progress & value) {
|
|
|
|
progress.incrementPiecewiseAtomically(value);
|
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
this->checkFulfilledCriterionsAndUpdate(progress, stream, thread_interrupt_listener);
|
2017-02-07 16:47:10 +00:00
|
|
|
});
|
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
stream->readPrefix();
|
|
|
|
while (Block block = stream->read())
|
2017-02-07 16:47:10 +00:00
|
|
|
;
|
2017-02-24 22:02:08 +00:00
|
|
|
stream->readSuffix();
|
2017-01-31 16:48:36 +00:00
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
std::lock_guard<std::mutex> lock(mutex);
|
2017-02-07 16:47:10 +00:00
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
streams.erase(streams.begin() + stream_index);
|
|
|
|
delete stream;
|
2017-01-31 16:48:36 +00:00
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
info_total.updateQueryInfo();
|
2017-01-31 16:48:36 +00:00
|
|
|
|
2017-02-24 22:02:08 +00:00
|
|
|
// const BlockStreamProfileInfo & info = stream->getProfileInfo();
|
|
|
|
// double seconds = watch.elapsedSeconds();
|
2017-01-31 16:48:36 +00:00
|
|
|
// std::lock_guard<std::mutex> lock(mutex);
|
|
|
|
// info_per_interval.add(seconds, progress.rows, progress.bytes, info.rows, info.bytes);
|
|
|
|
// info_total.add(seconds, progress.rows, progress.bytes, info.rows, info.bytes);
|
|
|
|
}
|
|
|
|
|
2017-02-07 16:47:10 +00:00
|
|
|
void checkFulfilledCriterionsAndUpdate(const Progress & progress,
|
2017-02-24 22:02:08 +00:00
|
|
|
RemoteBlockInputStream * stream,
|
|
|
|
InterruptListener & thread_interrupt_listener)
|
2017-02-07 16:47:10 +00:00
|
|
|
{
|
|
|
|
std::lock_guard<std::mutex> lock(mutex);
|
|
|
|
|
|
|
|
info_total.add(progress.rows, progress.bytes);
|
|
|
|
|
|
|
|
size_t max_rows_to_read = stopCriterions.read_rows.value;
|
|
|
|
if (max_rows_to_read && info_total.read_rows >= max_rows_to_read) {
|
|
|
|
incFulfilledCriterions(read_rows);
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t max_bytes_to_read = stopCriterions.bytes_read_uncompressed.value;
|
|
|
|
if (max_bytes_to_read && info_total.read_bytes >= max_bytes_to_read) {
|
|
|
|
incFulfilledCriterions(bytes_read_uncompressed);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (UInt64 max_timeout_ms = stopCriterions.timeout_ms.value) {
|
|
|
|
/// cast nanoseconds to ms
|
|
|
|
if ((info_total.watch.elapsed() / (1000 * 1000)) > max_timeout_ms) {
|
|
|
|
incFulfilledCriterions(timeout_ms);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t min_time_not_changing_for_ms = stopCriterions
|
|
|
|
.min_time_not_changing_for_ms.value;
|
|
|
|
if (min_time_not_changing_for_ms) {
|
|
|
|
size_t min_time_did_not_change_for = info_total
|
|
|
|
.min_time_watch
|
|
|
|
.elapsed() / (1000 * 1000);
|
|
|
|
|
|
|
|
if (min_time_did_not_change_for >= min_time_not_changing_for_ms) {
|
|
|
|
incFulfilledCriterions(min_time_not_changing_for_ms);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t max_speed_not_changing_for_ms = stopCriterions
|
|
|
|
.max_speed_not_changing_for_ms
|
|
|
|
.value;
|
|
|
|
if (max_speed_not_changing_for_ms) {
|
2017-02-24 22:02:08 +00:00
|
|
|
UInt64 speed_not_changing_time = info_total
|
2017-02-07 16:47:10 +00:00
|
|
|
.max_speed_watch
|
|
|
|
.elapsed() / (1000 * 1000);
|
|
|
|
if (speed_not_changing_time >= max_speed_not_changing_for_ms) {
|
|
|
|
incFulfilledCriterions(max_speed_not_changing_for_ms);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t average_speed_not_changing_for_ms = stopCriterions
|
|
|
|
.average_speed_not_changing_for_ms
|
|
|
|
.value;
|
|
|
|
if (average_speed_not_changing_for_ms) {
|
2017-02-24 22:02:08 +00:00
|
|
|
UInt64 speed_not_changing_time = info_total
|
2017-02-07 16:47:10 +00:00
|
|
|
.average_speed_watch
|
|
|
|
.elapsed() / (1000 * 1000);
|
|
|
|
if (speed_not_changing_time >= average_speed_not_changing_for_ms) {
|
|
|
|
incFulfilledCriterions(average_speed_not_changing_for_ms);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (stopCriterions.number_of_initialized_min &&
|
|
|
|
(stopCriterions.fulfilled_criterions_min >=
|
|
|
|
stopCriterions.number_of_initialized_min)) {
|
|
|
|
/// All 'min' criterions are fulfilled
|
|
|
|
// TODO:
|
|
|
|
std::cout << "All 'min' criterions are fulfilled" << std::endl;
|
2017-02-24 22:02:08 +00:00
|
|
|
stream->cancel();
|
2017-02-07 16:47:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (stopCriterions.number_of_initialized_max &&
|
|
|
|
stopCriterions.fulfilled_criterions_max) {
|
|
|
|
/// Some 'max' criterions are fulfilled
|
|
|
|
|
|
|
|
// TODO:
|
|
|
|
std::cout << stopCriterions.fulfilled_criterions_max
|
|
|
|
<< "'max' criterions are fulfilled" << std::endl;
|
2017-02-24 22:02:08 +00:00
|
|
|
stream->cancel();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (thread_interrupt_listener.check()) { /// SIGINT
|
|
|
|
gotSIGINT = true;
|
|
|
|
|
|
|
|
for (RemoteBlockInputStream * stream : streams) {
|
|
|
|
stream->cancel();
|
|
|
|
}
|
|
|
|
|
|
|
|
std::cout << "got SIGNINT; stopping streams" << std::endl;
|
2017-02-07 16:47:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-24 19:41:24 +00:00
|
|
|
void constructSubstitutions(AbstractConfig & substitutionsView,
|
2017-01-20 18:34:06 +00:00
|
|
|
StringToVector & substitutions)
|
|
|
|
{
|
|
|
|
using Keys = std::vector<std::string>;
|
|
|
|
Keys xml_substitutions;
|
|
|
|
substitutionsView->keys(xml_substitutions);
|
|
|
|
|
|
|
|
for (size_t i = 0; i != xml_substitutions.size(); ++i) {
|
2017-01-24 19:41:24 +00:00
|
|
|
const AbstractConfig xml_substitution(
|
|
|
|
substitutionsView->createView("substitution[" +
|
|
|
|
std::to_string(i) + "]")
|
|
|
|
);
|
2017-01-20 18:34:06 +00:00
|
|
|
|
2017-01-24 19:41:24 +00:00
|
|
|
/// Property values for substitution will be stored in a vector
|
|
|
|
/// accessible by property name
|
2017-01-20 18:34:06 +00:00
|
|
|
std::vector<std::string> xml_values;
|
|
|
|
xml_substitution->keys("values", xml_values);
|
|
|
|
|
|
|
|
std::string name = xml_substitution->getString("name");
|
|
|
|
|
|
|
|
for (size_t j = 0; j != xml_values.size(); ++j) {
|
|
|
|
substitutions[name].push_back(
|
|
|
|
xml_substitution->getString("values.value[" +
|
|
|
|
std::to_string(j) + "]")
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-01-20 12:36:16 +00:00
|
|
|
|
2017-01-20 18:34:06 +00:00
|
|
|
std::vector<std::string> formatQueries(const std::string & query,
|
|
|
|
StringToVector substitutions) const
|
|
|
|
{
|
|
|
|
std::vector<std::string> queries;
|
|
|
|
|
|
|
|
StringToVector::iterator substitutions_first = substitutions.begin();
|
|
|
|
StringToVector::iterator substitutions_last = substitutions.end();
|
|
|
|
--substitutions_last;
|
|
|
|
|
|
|
|
runThroughAllOptionsAndPush(
|
|
|
|
substitutions_first, substitutions_last, query, queries
|
|
|
|
);
|
|
|
|
|
|
|
|
return queries;
|
|
|
|
}
|
|
|
|
|
2017-01-24 19:41:24 +00:00
|
|
|
/// Recursive method which goes through all substitution blocks in xml
|
|
|
|
/// and replaces property {names} by their values
|
2017-01-20 18:34:06 +00:00
|
|
|
void runThroughAllOptionsAndPush(
|
|
|
|
StringToVector::iterator substitutions_left,
|
|
|
|
StringToVector::iterator substitutions_right,
|
|
|
|
const std::string & template_query,
|
|
|
|
std::vector<std::string> & queries
|
|
|
|
) const
|
|
|
|
{
|
|
|
|
std::string name = substitutions_left->first;
|
|
|
|
std::vector<std::string> values = substitutions_left->second;
|
|
|
|
|
|
|
|
for (auto value = values.begin(); value != values.end(); ++value) {
|
2017-01-24 19:41:24 +00:00
|
|
|
/// Copy query string for each unique permutation
|
2017-01-31 16:48:36 +00:00
|
|
|
Query query = template_query;
|
2017-01-20 18:34:06 +00:00
|
|
|
size_t substrPos = 0;
|
|
|
|
|
|
|
|
while (substrPos != std::string::npos) {
|
|
|
|
substrPos = query.find("{" + name + "}");
|
|
|
|
|
|
|
|
if (substrPos != std::string::npos) {
|
|
|
|
query.replace(
|
2017-01-24 19:41:24 +00:00
|
|
|
substrPos, 1 + name.length() + 1,
|
2017-01-20 18:34:06 +00:00
|
|
|
*value
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-24 19:41:24 +00:00
|
|
|
/// If we've reached the end of substitution chain
|
2017-01-20 18:34:06 +00:00
|
|
|
if (substitutions_left == substitutions_right) {
|
|
|
|
queries.push_back(query);
|
|
|
|
} else {
|
|
|
|
StringToVector::iterator next_it = substitutions_left;
|
|
|
|
++next_it;
|
|
|
|
|
|
|
|
runThroughAllOptionsAndPush(
|
|
|
|
next_it, substitutions_right, query, queries
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-02-24 22:02:08 +00:00
|
|
|
|
|
|
|
public:
|
|
|
|
void constructTotalInfo()
|
|
|
|
{
|
|
|
|
std::string hostname = "null";
|
|
|
|
|
|
|
|
char hostname_buffer[256];
|
|
|
|
if (gethostname(hostname_buffer, 256) == 0) {
|
|
|
|
hostname = std::string(hostname_buffer);
|
|
|
|
}
|
|
|
|
|
|
|
|
std::cout << "total info: " << std::endl;
|
|
|
|
std::cout << "hostname: " << hostname << std::endl;
|
|
|
|
std::cout << "Number of CPUs: " << sysconf(_SC_NPROCESSORS_ONLN) << std::endl;
|
|
|
|
std::cout << "test_name: " << testName << std::endl;
|
|
|
|
std::cout << "??main_metric: total_time??" << std::endl;
|
|
|
|
std::cout << "parameters: {some substitutions here...}" << std::endl;
|
|
|
|
|
|
|
|
if (execType == loop) {
|
|
|
|
std::cout << "min_time: " << info_total.min_time / 1000
|
|
|
|
<< "." << info_total.min_time % 1000 << "s" << std::endl;
|
|
|
|
|
|
|
|
// TODO: <quantile>90</quantile>
|
|
|
|
|
|
|
|
std::cout << "total_time: " << info_total.total_time << "s" << std::endl;
|
|
|
|
std::cout << "queries_per_second: " << double(info_total.queries) / info_total.total_time << std::endl;
|
|
|
|
std::cout << "rows_per_second: " << double(info_total.read_rows) / info_total.total_time << std::endl;
|
|
|
|
std::cout << "bytes_per_second: " << double(info_total.read_bytes) / info_total.total_time << std::endl;
|
|
|
|
} else {
|
|
|
|
std::cout << " max_rows_per_second: " << info_total.max_speed << std::endl;
|
|
|
|
// std::cout << " max_bytes_per_second: " << << std::endl;
|
|
|
|
std::cout << " avg_rows_per_second: " << info_total.average_speed_value << std::endl;
|
|
|
|
// std::cout << " avg_bytes_per_second: " << << std::endl;
|
|
|
|
}
|
|
|
|
}
|
2017-01-13 18:26:51 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2017-01-20 18:34:06 +00:00
|
|
|
|
2017-01-13 18:26:51 +00:00
|
|
|
int mainEntryClickhousePerformanceTest(int argc, char ** argv) {
|
2017-01-20 12:36:16 +00:00
|
|
|
using namespace DB;
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
using boost::program_options::value;
|
|
|
|
using Strings = std::vector<std::string>;
|
|
|
|
|
|
|
|
boost::program_options::options_description desc("Allowed options");
|
|
|
|
desc.add_options()
|
|
|
|
("help", "produce help message")
|
|
|
|
("concurrency,c", value<unsigned>()->default_value(1), "number of parallel queries")
|
|
|
|
("host,h", value<std::string>()->default_value("localhost"), "")
|
|
|
|
("port", value<UInt16>()->default_value(9000), "")
|
|
|
|
("user", value<std::string>()->default_value("default"), "")
|
|
|
|
("password", value<std::string>()->default_value(""), "")
|
|
|
|
("database", value<std::string>()->default_value("default"), "")
|
|
|
|
("tag", value<Strings>(), "Run only tests with tag")
|
|
|
|
("without-tag", value<Strings>(), "Do not run tests with tag")
|
|
|
|
("name", value<Strings>(), "Run tests with specific name")
|
|
|
|
("without-name", value<Strings>(), "Do not run tests with name")
|
|
|
|
("name-regexp", value<Strings>(), "Run tests with names matching regexp")
|
|
|
|
("without-name-regexp", value<Strings>(), "Do not run tests with names matching regexp")
|
2017-01-20 18:34:06 +00:00
|
|
|
;
|
2017-01-20 12:36:16 +00:00
|
|
|
|
|
|
|
/// These options will not be displayed in --help
|
|
|
|
boost::program_options::options_description hidden("Hidden options");
|
|
|
|
hidden.add_options()
|
|
|
|
("input-files", value< std::vector<std::string> >(), "")
|
|
|
|
;
|
|
|
|
|
|
|
|
/// But they will be legit, though. And they must be given without name
|
|
|
|
boost::program_options::positional_options_description positional;
|
|
|
|
positional.add("input-files", -1);
|
|
|
|
|
|
|
|
boost::program_options::options_description cmdline_options;
|
|
|
|
cmdline_options.add(desc).add(hidden);
|
|
|
|
|
|
|
|
boost::program_options::variables_map options;
|
|
|
|
boost::program_options::store(
|
|
|
|
boost::program_options::command_line_parser(argc, argv)
|
|
|
|
.options(cmdline_options)
|
|
|
|
.positional(positional)
|
|
|
|
.run(),
|
|
|
|
options
|
|
|
|
);
|
|
|
|
boost::program_options::notify(options);
|
|
|
|
|
|
|
|
if (options.count("help"))
|
|
|
|
{
|
|
|
|
std::cout << "Usage: " << argv[0] << " [options] [test_file ...] [tests_folder]\n";
|
|
|
|
std::cout << desc << "\n";
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (! options.count("input-files")) {
|
|
|
|
std::cerr << "No tests files were specified. See --help" << "\n";
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
Strings tests_tags;
|
|
|
|
Strings skip_tags;
|
|
|
|
Strings tests_names;
|
|
|
|
Strings skip_names;
|
|
|
|
Strings name_regexp;
|
|
|
|
Strings skip_matching_regexp;
|
|
|
|
|
|
|
|
if (options.count("tag")) {
|
|
|
|
tests_tags = options["tag"].as<Strings>();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (options.count("without-tag")) {
|
|
|
|
skip_tags = options["without-tag"].as<Strings>();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (options.count("name")) {
|
|
|
|
tests_names = options["name"].as<Strings>();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (options.count("without-name")) {
|
|
|
|
skip_names = options["without-name"].as<Strings>();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (options.count("name-regexp")) {
|
|
|
|
name_regexp = options["name-regexp"].as<Strings>();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (options.count("without-name-regexp")) {
|
|
|
|
skip_matching_regexp = options["without-name-regexp"].as<Strings>();
|
|
|
|
}
|
|
|
|
|
|
|
|
PerformanceTest performanceTest(
|
|
|
|
options["concurrency"].as<unsigned>(),
|
|
|
|
options["host" ].as<std::string>(),
|
|
|
|
options["port" ].as<UInt16>(),
|
|
|
|
options["database" ].as<std::string>(),
|
|
|
|
options["user" ].as<std::string>(),
|
|
|
|
options["password" ].as<std::string>(),
|
|
|
|
options["input-files"].as<Strings>(),
|
|
|
|
tests_tags,
|
|
|
|
skip_tags,
|
|
|
|
tests_names,
|
|
|
|
skip_names,
|
|
|
|
name_regexp,
|
2017-01-20 18:34:06 +00:00
|
|
|
skip_matching_regexp
|
2017-01-20 12:36:16 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
catch (const Exception & e)
|
|
|
|
{
|
|
|
|
std::string text = e.displayText();
|
|
|
|
|
|
|
|
std::cerr << "Code: " << e.code() << ". " << text << "\n\n";
|
|
|
|
|
|
|
|
/// Если есть стек-трейс на сервере, то не будем писать стек-трейс на клиенте.
|
|
|
|
if (std::string::npos == text.find("Stack trace"))
|
|
|
|
std::cerr << "Stack trace:\n"
|
|
|
|
<< e.getStackTrace().toString();
|
|
|
|
|
|
|
|
return e.code();
|
|
|
|
}
|
|
|
|
catch (const Poco::Exception & e)
|
|
|
|
{
|
|
|
|
std::cerr << "Poco::Exception: " << e.displayText() << "\n";
|
|
|
|
return ErrorCodes::POCO_EXCEPTION;
|
|
|
|
}
|
|
|
|
catch (const std::exception & e)
|
|
|
|
{
|
|
|
|
std::cerr << "std::exception: " << e.what() << "\n";
|
|
|
|
return ErrorCodes::STD_EXCEPTION;
|
|
|
|
}
|
|
|
|
catch (...)
|
|
|
|
{
|
|
|
|
std::cerr << "Unknown exception\n";
|
|
|
|
return ErrorCodes::UNKNOWN_EXCEPTION;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2017-01-13 18:26:51 +00:00
|
|
|
}
|