thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix header path and small fixes in tests

Browse Source
This commit is contained in:
alesapin 2018-06-13 10:36:47 +03:00
parent 7eaac3e40d
commit 567bbb2bbb
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dbms/src/Storages/StorageURL.cpp
View File

@ -9,7 +9,9 @@
#include <IO/ReadWriteBufferFromHTTP.h>
#include <IO/WriteBufferFromOStream.h>
#include <DataStreams/FormatFactory.h>
#include <Formats/FormatFactory.h>
#include <DataStreams/IBlockOutputStream.h>
#include <DataStreams/IProfilingBlockInputStream.h>
#include <Poco/Net/HTTPRequest.h>
@ -47,7 +49,7 @@ namespace
{
read_buf = std::make_unique<ReadWriteBufferFromHTTP>(uri, Poco::Net::HTTPRequest::HTTP_GET, nullptr, timeouts);
reader = FormatFactory().getInput(format, *read_buf, sample_block, context, max_block_size);
reader = FormatFactory::instance().getInput(format, *read_buf, sample_block, context, max_block_size);
}
~StorageURLBlockInputStream() override {}
@ -105,7 +107,7 @@ namespace
{
ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = [&](std::ostream & ostr) {
WriteBufferFromOStream out_buffer(ostr);
auto writer = FormatFactory().getOutput(format, out_buffer, sample_block, global_context);
auto writer = FormatFactory::instance().getOutput(format, out_buffer, sample_block, global_context);
writer->writePrefix();
writer->write(block);
writer->writeSuffix();

15
dbms/tests/queries/0_stateless/00646_url_engine.python
View File

@ -1,6 +1,7 @@
#!/usr/bin/env python
from __future__ import print_function
import csv
import sys
import tempfile
import threading
import os, urllib
@ -19,9 +20,9 @@ def get_ch_answer(query):
def check_answers(query, answer):
ch_answer = get_ch_answer(query)
if ch_answer.strip() != answer.strip():
print("FAIL on query:", query)
print("Expected answer:", answer)
print("Fetched answer :", ch_answer)
print("FAIL on query:", query, file=sys.stderr)
print("Expected answer:", answer, file=sys.stderr)
print("Fetched answer :", ch_answer, file=sys.stderr)
raise Exception("Fail on query")
class CSVHTTPServer(BaseHTTPRequestHandler):
@ -133,7 +134,7 @@ def test_insert(table_name="", schema="str String,numuint UInt32,numint Int32,do
def main():
test_data = "Hello,2,-2,7.7\nWorld,2,-5,8.8"
select_table_input = {
select_only_requests = {
"select str,numuint,numint,double from {tbl}" : test_data.replace(',', '\t'),
"select numuint, count(*) from {tbl} group by numuint" : "2\t2",
"select str,numuint,numint,double from {tbl} limit 1": test_data.split("\n")[0].replace(',', '\t'),
@ -150,12 +151,12 @@ def main():
'select double, count(*) from {tbl} group by double': "7.7\t2\n9.9\t10"
}
t = start_server(len(select_table_input) * 2 + (len(insert_requests) + len(select_requests)) * 2)
t = start_server(len(select_only_requests) * 2 + (len(insert_requests) + len(select_requests)) * 2)
t.start()
# test table with url engine
test_select(table_name="test_table_select", requests=select_table_input.keys(), answers=select_table_input.values(), test_data=test_data)
test_select(table_name="test_table_select", requests=select_only_requests.keys(), answers=select_only_requests.values(), test_data=test_data)
# test table function url
test_select(requests=select_table_input.keys(), answers=select_table_input.values(), test_data=test_data)
test_select(requests=select_only_requests.keys(), answers=select_only_requests.values(), test_data=test_data)
#test insert into table with url engine
test_insert(table_name="test_table_insert", requests_insert=insert_requests, requests_select=select_requests.keys(), answers=select_requests.values())
#test insert into table function url