Backport #65498 to 24.6: Revert "Use 1MB HTTP buffers to avoid frequent send syscalls"

This commit is contained in:
robot-clickhouse 2024-06-22 19:09:01 +00:00
parent 0666dad013
commit a649bb3213
3 changed files with 5 additions and 5 deletions

View File

@ -26,7 +26,7 @@ namespace Poco
{ {
namespace Net namespace Net
{ {
constexpr size_t HTTP_DEFAULT_BUFFER_SIZE = 1024 * 1024; constexpr size_t HTTP_DEFAULT_BUFFER_SIZE = 8 * 1024;
typedef Poco::BasicBufferedStreamBuf<char, std::char_traits<char>> HTTPBasicStreamBuf; typedef Poco::BasicBufferedStreamBuf<char, std::char_traits<char>> HTTPBasicStreamBuf;

View File

@ -300,7 +300,7 @@ def test_when_s3_broken_pipe_at_upload_is_retried(cluster, broken_s3):
LIMIT 1000000 LIMIT 1000000
SETTINGS SETTINGS
s3_max_single_part_upload_size=100, s3_max_single_part_upload_size=100,
s3_min_upload_part_size=100000, s3_min_upload_part_size=1000000,
s3_check_objects_after_upload=0 s3_check_objects_after_upload=0
""", """,
query_id=insert_query_id, query_id=insert_query_id,
@ -311,7 +311,7 @@ def test_when_s3_broken_pipe_at_upload_is_retried(cluster, broken_s3):
) )
assert create_multipart == 1 assert create_multipart == 1
assert upload_parts == 69 assert upload_parts == 7
assert s3_errors == 3 assert s3_errors == 3
broken_s3.setup_at_part_upload( broken_s3.setup_at_part_upload(

View File

@ -12,10 +12,10 @@ INSERT INTO order_by_desc SELECT number, repeat('a', 1024) FROM numbers(1024 * 3
OPTIMIZE TABLE order_by_desc FINAL; OPTIMIZE TABLE order_by_desc FINAL;
SELECT s FROM order_by_desc ORDER BY u DESC LIMIT 10 FORMAT Null SELECT s FROM order_by_desc ORDER BY u DESC LIMIT 10 FORMAT Null
SETTINGS max_memory_usage = '600M'; SETTINGS max_memory_usage = '400M';
SELECT s FROM order_by_desc ORDER BY u LIMIT 10 FORMAT Null SELECT s FROM order_by_desc ORDER BY u LIMIT 10 FORMAT Null
SETTINGS max_memory_usage = '600M'; SETTINGS max_memory_usage = '400M';
SYSTEM FLUSH LOGS; SYSTEM FLUSH LOGS;