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

better

Browse Source
This commit is contained in:
Nikita Mikhailov 2020-12-28 19:52:54 +03:00
parent 8667842390
commit 2dde73f700
7 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
programs/client/Client.cpp
View File

@ -1364,9 +1364,6 @@ private:
if (with_output && with_output->settings_ast) if (with_output && with_output->settings_ast)
apply_query_settings(*with_output->settings_ast); apply_query_settings(*with_output->settings_ast);
// if (context.getSettingsRef().output_format_parallel_formatting)
// need_render_progress = false;
connection->forceConnected(connection_parameters.timeouts); connection->forceConnected(connection_parameters.timeouts);
ASTPtr input_function; ASTPtr input_function;

1
src/Formats/FormatFactory.cpp
View File

@ -244,7 +244,6 @@ BlockOutputStreamPtr FormatFactory::getOutputParallelIfPossible(const String & n
} }
BlockOutputStreamPtr FormatFactory::getOutput(const String & name, BlockOutputStreamPtr FormatFactory::getOutput(const String & name,
WriteBuffer & buf, const Block & sample, const Context & context, WriteBuffer & buf, const Block & sample, const Context & context,
WriteCallback callback, const std::optional<FormatSettings> & _format_settings) const WriteCallback callback, const std::optional<FormatSettings> & _format_settings) const

1
src/Processors/Formats/Impl/NativeFormat.h
View File

@ -1,3 +1,4 @@
#pragma once
#include <DataStreams/NativeBlockInputStream.h> #include <DataStreams/NativeBlockInputStream.h>
#include <DataStreams/NativeBlockOutputStream.h> #include <DataStreams/NativeBlockOutputStream.h>
#include <Formats/FormatFactory.h> #include <Formats/FormatFactory.h>

5
src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
View File

@ -292,7 +292,12 @@ private:
auto & unit = processing_units[current_unit_number]; auto & unit = processing_units[current_unit_number];
assert(unit.status = READY_TO_FORMAT); assert(unit.status = READY_TO_FORMAT);
/// We want to preallocate memory buffer (increase capacity)
/// and put the pointer at the beginning of the buffer
/// FIXME: Implement reserve() method in Memory.
unit.segment.resize(DBMS_DEFAULT_BUFFER_SIZE); unit.segment.resize(DBMS_DEFAULT_BUFFER_SIZE);
unit.segment.resize(0);
unit.actual_memory_size = 0; unit.actual_memory_size = 0;
BufferWithOutsideMemory<WriteBuffer> out_buffer(unit.segment); BufferWithOutsideMemory<WriteBuffer> out_buffer(unit.segment);

6
src/Processors/Formats/Impl/ParallelParsingInputFormat.h
View File

@ -13,6 +13,12 @@
namespace DB namespace DB
{ {
namespace ErrorCodes
{
extern const int LOGICAL_ERROR;
}
class Context; class Context;
/** /**