thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-24 10:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed multipart uploads and 100-continue.

Browse Source
This commit is contained in:
Vladimir Chebotarev 2019-06-21 01:16:31 +03:00
parent c6136c2b16
commit 395560df1b
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/IO/WriteBufferFromS3.cpp
View File

@ -173,7 +173,7 @@ void WriteBufferFromS3::writePart(const String & data)
LOG_TRACE((&Logger::get("WriteBufferFromS3")), "Sending request to " << part_uri.toString());
std::ostream & ostr = session->sendRequest(*request);
// if (session->peekResponse(response)) // FIXME, shall not go next if not received 100-continue
if (session->peekResponse(response))
{
// Received 100-continue.
ostr << data;
@ -244,7 +244,7 @@ void WriteBufferFromS3::complete()
LOG_TRACE((&Logger::get("WriteBufferFromS3")), "Sending request to " << complete_uri.toString());
std::ostream & ostr = session->sendRequest(*request);
// if (session->peekResponse(response)) // FIXME, shall not go next if not received 100-continue
if (session->peekResponse(response))
{
// Received 100-continue.
ostr << data;

29
dbms/tests/queries/0_stateless/00950_table_function_s3_wip/clickhouse-test
View File

@ -96,6 +96,8 @@ class PreservingDataServer(http.server.BaseHTTPRequestHandler):
def handle_expect_100(self):
print('Received Expect-100', file=sys.stderr)
self.send_response_only(100)
self.end_headers()
return True
def do_POST(self):
@ -137,6 +139,9 @@ class RedirectingPreservingDataServer(http.server.BaseHTTPRequestHandler):
def handle_expect_100(self):
print('Received Expect-100', file=sys.stderr)
return True
def do_POST(self):
query = urllib.parse.urlparse(self.path).query
if query:
query = '?{}'.format(query)
@ -150,14 +155,23 @@ class RedirectingPreservingDataServer(http.server.BaseHTTPRequestHandler):
<Message>Please re-send this request to the specified temporary endpoint.
Continue to use the original request endpoint for future requests.</Message>
<Endpoint>{host}:{port}</Endpoint>
</Error>'''.encode().format(host=localhost, port=fakes3_port))
return False
def do_POST(self):
assert False
</Error>'''.format(host=localhost, port=fakes3_port).encode())
def do_PUT(self):
assert False
query = urllib.parse.urlparse(self.path).query
if query:
query = '?{}'.format(query)
self.send_response(307)
self.send_header('Content-type', 'text/xml')
self.send_header('Location', 'http://{host}:{port}/{bucket}/test.csv{query}'.format(host=localhost, port=fakes3_port, bucket=bucket, query=query))
self.end_headers()
self.wfile.write(r'''<?xml version="1.0" encoding="UTF-8"?>
<Error>
<Code>TemporaryRedirect</Code>
<Message>Please re-send this request to the specified temporary endpoint.
Continue to use the original request endpoint for future requests.</Message>
<Endpoint>{host}:{port}</Endpoint>
</Error>'''.format(host=localhost, port=fakes3_port).encode())
servers = []
@ -199,7 +213,7 @@ def run_gofakes3():
finally:
l.release()
binary = os.path.join(repo, 'main')
subprocess.run([binary, '-backend', 'memory', '-host', ':{}'.format(fakes3_port), '-initialbucket', bucket]).check_returncode()
subprocess.run([binary, '-backend', 'memory', '-host', ':{}'.format(fakes3_port), '-initialbucket', bucket])
thread = threading.Thread(target=gofakes3_thread)
thread.start()
@ -262,4 +276,5 @@ for query in check_queries:
stop_subprocesses()
[ server.socket.close() for server in servers ]
os._exit(0)
[ job.join() for job in jobs ]