thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix test, better log, fix defaults for client

Browse Source
This commit is contained in:
Yakov Olkhovskiy 2024-06-03 07:24:28 +00:00
parent eaeabd8d37
commit e0be652f4d
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Client/ConnectionParameters.cpp
View File

@ -103,8 +103,8 @@ ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfigurati
#endif
}
proto_send_chunked = config.getString("proto_caps.send", "chunked");
proto_recv_chunked = config.getString("proto_caps.recv", "chunked");
proto_send_chunked = config.getString("proto_caps.send", "notchunked_optional");
proto_recv_chunked = config.getString("proto_caps.recv", "notchunked_optional");
quota_key = config.getString("quota_key", "");

4
src/Client/ConnectionParameters.h
View File

@ -20,8 +20,8 @@ struct ConnectionParameters
std::string default_database;
std::string user;
std::string password;
std::string proto_send_chunked;
std::string proto_recv_chunked;
std::string proto_send_chunked = "notchunked_optional";
std::string proto_recv_chunked = "notchunked_optional";
std::string quota_key;
SSHKey ssh_private_key;
Protocol::Secure security = Protocol::Secure::Disable;

6
src/IO/ReadBufferFromPocoSocketChunked.cpp
View File

@ -65,10 +65,10 @@ bool ReadBufferFromPocoSocketChunked::load_next_chunk(Position c_pos, bool cont)
if (next_chunk)
{
if (cont)
LOG_TEST(log, "Packet receive continued. Size {}", next_chunk);
LOG_TEST(log, "{} <- {} Chunk receive continued. Size {}", ourAddress().toString(), peerAddress().toString(), next_chunk);
}
else
LOG_TEST(log, "Packet receive ended.");
LOG_TEST(log, "{} <- {} Chunk receive ended.", ourAddress().toString(), peerAddress().toString());
return true;
}
@ -134,7 +134,7 @@ bool ReadBufferFromPocoSocketChunked::nextImpl()
c_pos = buffer().begin();
}
LOG_TEST(log, "Packet receive started. Message {}, size {}", static_cast<unsigned int>(*c_pos), chunk_left);
LOG_TEST(log, "{} <- {} Chunk receive started. Message {}, size {}", ourAddress().toString(), peerAddress().toString(), static_cast<unsigned int>(*c_pos), chunk_left);
}
else
{

6
src/IO/WriteBufferFromPocoSocketChunked.h
View File

@ -30,7 +30,7 @@ public:
if (finished)
throw Exception(ErrorCodes::LOGICAL_ERROR, "Native protocol: attempt to send empty chunk");
LOG_TEST(log, "Packet send ended.");
LOG_TEST(log, "{} -> {} Chunk send ended.", ourAddress().toString(), peerAddress().toString());
finished = true;
UInt32 s = 0;
@ -43,9 +43,9 @@ protected:
{
UInt32 s = static_cast<UInt32>(offset());
if (finished)
LOG_TEST(log, "Packet send started. Message {}, size {}", static_cast<unsigned int>(*buffer().begin()), s);
LOG_TEST(log, "{} -> {} Chunk send started. Message {}, size {}", ourAddress().toString(), peerAddress().toString(), static_cast<unsigned int>(*buffer().begin()), s);
else
LOG_TEST(log, "Packet send continued. Size {}", s);
LOG_TEST(log, "{} -> {} Chunk send continued. Size {}", ourAddress().toString(), peerAddress().toString(), s);
finished = false;
s = toLittleEndian(s);

2
tests/integration/test_hedged_requests/test.py
View File

@ -333,7 +333,7 @@ def test_receive_timeout2(started_cluster):
# in packet receiving but there are replicas in process of
# connection establishing.
update_configs(
node_1_sleep_in_send_data=4000,
node_1_sleep_in_send_data=5000,
node_2_sleep_in_send_tables_status=2000,
node_3_sleep_in_send_tables_status=2000,
)