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

Merge pull request #2761 from 4ertus2/negative

Browse Source 
Fix client's --testmode (allow multiple negative tests with clientError)
This commit is contained in:
alexey-milovidov 2018-07-30 21:48:36 +03:00 committed by GitHub
commit 98e9f4c24c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dbms/programs/client/Client.cpp
View File

@ -86,6 +86,7 @@ namespace ErrorCodes
extern const int UNKNOWN_PACKET_FROM_SERVER; extern const int UNKNOWN_PACKET_FROM_SERVER;
extern const int UNEXPECTED_PACKET_FROM_SERVER; extern const int UNEXPECTED_PACKET_FROM_SERVER;
extern const int CLIENT_OUTPUT_FORMAT_SPECIFIED; extern const int CLIENT_OUTPUT_FORMAT_SPECIFIED;
extern const int LOGICAL_ERROR;
} }
@ -119,16 +120,20 @@ public:
} }
} }
void checkActual(int actual_server_error, int actual_client_error, /// @returns true if it's possible to continue without reconnect
bool checkActual(int & actual_server_error, int & actual_client_error,
bool & got_exception, std::unique_ptr<Exception> & last_exception) const bool & got_exception, std::unique_ptr<Exception> & last_exception) const
{ {
if (!enabled) if (!enabled)
return; return true;
if (allErrorsExpected(actual_server_error, actual_client_error)) if (allErrorsExpected(actual_server_error, actual_client_error))
{ {
got_exception = false; got_exception = false;
last_exception.reset(); last_exception.reset();
actual_server_error = 0;
actual_client_error = 0;
return false;
} }
if (lostExpectedError(actual_server_error, actual_client_error)) if (lostExpectedError(actual_server_error, actual_client_error))
@ -136,7 +141,11 @@ public:
std::cerr << "Success when error expected. It expects server error " std::cerr << "Success when error expected. It expects server error "
<< server_error << ", client error " << client_error << "." << std::endl; << server_error << ", client error " << client_error << "." << std::endl;
got_exception = true; got_exception = true;
last_exception = std::make_unique<Exception>("Success when error expected", ErrorCodes::LOGICAL_ERROR); /// return error to OS
return false;
} }
return true;
} }
int serverError() const { return server_error; } int serverError() const { return server_error; }
@ -167,7 +176,7 @@ private:
bool allErrorsExpected(int actual_server_error, int actual_client_error) const bool allErrorsExpected(int actual_server_error, int actual_client_error) const
{ {
return (server_error == actual_server_error) && (client_error == actual_client_error); return (server_error || client_error) && (server_error == actual_server_error) && (client_error == actual_client_error);
} }
bool lostExpectedError(int actual_server_error, int actual_client_error) const bool lostExpectedError(int actual_server_error, int actual_client_error) const
@ -811,11 +820,13 @@ private:
catch (...) catch (...)
{ {
actual_client_error = getCurrentExceptionCode(); actual_client_error = getCurrentExceptionCode();
if (!actual_client_error || actual_client_error != expected_client_error)
std::cerr << "Error on processing query: " << query << std::endl << getCurrentExceptionMessage(true); std::cerr << "Error on processing query: " << query << std::endl << getCurrentExceptionMessage(true);
got_exception = true; got_exception = true;
} }
test_hint.checkActual(actual_server_error, actual_client_error, got_exception, last_exception); if (!test_hint.checkActual(actual_server_error, actual_client_error, got_exception, last_exception))
connection->forceConnected();
if (got_exception && !ignore_error) if (got_exception && !ignore_error)
{ {