mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-23 18:20:50 +00:00
Minor change
This commit is contained in:
parent
f55e1439cb
commit
e5661b9b62
@ -677,7 +677,7 @@ void ClientBase::onEndOfStream()
|
||||
progress_indication.clearProgressOutput();
|
||||
|
||||
if (output_format)
|
||||
output_format->finish();
|
||||
output_format->finalize();
|
||||
|
||||
resetOutput();
|
||||
|
||||
|
@ -72,7 +72,7 @@ void IOutputFormat::work()
|
||||
if (rows_before_limit_counter && rows_before_limit_counter->hasAppliedLimit())
|
||||
setRowsBeforeLimit(rows_before_limit_counter->get());
|
||||
|
||||
finalize();
|
||||
finalizeImpl();
|
||||
finalized = true;
|
||||
return;
|
||||
}
|
||||
@ -113,10 +113,10 @@ void IOutputFormat::write(const Block & block)
|
||||
flush();
|
||||
}
|
||||
|
||||
void IOutputFormat::finish()
|
||||
void IOutputFormat::finalize()
|
||||
{
|
||||
writePrefixIfNot();
|
||||
finalize();
|
||||
finalizeImpl();
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -55,7 +55,7 @@ public:
|
||||
|
||||
void write(const Block & block);
|
||||
|
||||
virtual void finish();
|
||||
void finalize();
|
||||
|
||||
virtual bool expectMaterializedColumns() const { return true; }
|
||||
|
||||
@ -73,7 +73,7 @@ protected:
|
||||
virtual void consume(Chunk) = 0;
|
||||
virtual void consumeTotals(Chunk) {}
|
||||
virtual void consumeExtremes(Chunk) {}
|
||||
virtual void finalize() {}
|
||||
virtual void finalizeImpl() {}
|
||||
virtual void writePrefix() {}
|
||||
|
||||
void writePrefixIfNot()
|
||||
|
@ -70,7 +70,7 @@ void IRowOutputFormat::consumeExtremes(DB::Chunk chunk)
|
||||
writeAfterExtremes();
|
||||
}
|
||||
|
||||
void IRowOutputFormat::finalize()
|
||||
void IRowOutputFormat::finalizeImpl()
|
||||
{
|
||||
writeSuffixIfNot();
|
||||
writeLastSuffix();
|
||||
|
@ -31,7 +31,7 @@ protected:
|
||||
void consume(Chunk chunk) override;
|
||||
void consumeTotals(Chunk chunk) override;
|
||||
void consumeExtremes(Chunk chunk) override;
|
||||
void finalize() override;
|
||||
void finalizeImpl() override;
|
||||
|
||||
/** Write a row.
|
||||
* Default implementation calls methods to write single values and delimiters
|
||||
|
@ -50,7 +50,7 @@ void ArrowBlockOutputFormat::consume(Chunk chunk)
|
||||
"Error while writing a table: {}", status.ToString());
|
||||
}
|
||||
|
||||
void ArrowBlockOutputFormat::finalize()
|
||||
void ArrowBlockOutputFormat::finalizeImpl()
|
||||
{
|
||||
if (!writer)
|
||||
{
|
||||
|
@ -26,7 +26,7 @@ public:
|
||||
|
||||
private:
|
||||
void consume(Chunk) override;
|
||||
void finalize() override;
|
||||
void finalizeImpl() override;
|
||||
|
||||
void prepareWriter(const std::shared_ptr<arrow::Schema> & schema);
|
||||
|
||||
|
@ -68,7 +68,7 @@ void MySQLOutputFormat::consume(Chunk chunk)
|
||||
}
|
||||
}
|
||||
|
||||
void MySQLOutputFormat::finalize()
|
||||
void MySQLOutputFormat::finalizeImpl()
|
||||
{
|
||||
size_t affected_rows = 0;
|
||||
std::string human_readable_info;
|
||||
|
@ -30,7 +30,7 @@ public:
|
||||
|
||||
private:
|
||||
void consume(Chunk) override;
|
||||
void finalize() override;
|
||||
void finalizeImpl() override;
|
||||
void writePrefix() override;
|
||||
|
||||
uint32_t client_capabilities = 0;
|
||||
|
@ -495,7 +495,7 @@ void ORCBlockOutputFormat::consume(Chunk chunk)
|
||||
writer->add(*batch);
|
||||
}
|
||||
|
||||
void ORCBlockOutputFormat::finalize()
|
||||
void ORCBlockOutputFormat::finalizeImpl()
|
||||
{
|
||||
if (!writer)
|
||||
prepareWriter();
|
||||
|
@ -40,7 +40,7 @@ public:
|
||||
|
||||
private:
|
||||
void consume(Chunk chunk) override;
|
||||
void finalize() override;
|
||||
void finalizeImpl() override;
|
||||
|
||||
ORC_UNIQUE_PTR<orc::Type> getORCType(const DataTypePtr & type, const std::string & column_name);
|
||||
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
namespace DB
|
||||
{
|
||||
void ParallelFormattingOutputFormat::finalize()
|
||||
void ParallelFormattingOutputFormat::finalizeImpl()
|
||||
{
|
||||
need_flush = true;
|
||||
IOutputFormat::finalized = true;
|
||||
@ -191,7 +191,7 @@ namespace DB
|
||||
}
|
||||
case ProcessingUnitType::FINALIZE :
|
||||
{
|
||||
formatter->finalize();
|
||||
formatter->finalizeImpl();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -130,7 +130,7 @@ private:
|
||||
addChunk(std::move(extremes), ProcessingUnitType::EXTREMES, /*can_throw_exception*/ true);
|
||||
}
|
||||
|
||||
void finalize() override;
|
||||
void finalizeImpl() override;
|
||||
|
||||
InternalFormatterCreator internal_formatter_creator;
|
||||
|
||||
|
@ -60,7 +60,7 @@ void ParquetBlockOutputFormat::consume(Chunk chunk)
|
||||
throw Exception{"Error while writing a table: " + status.ToString(), ErrorCodes::UNKNOWN_EXCEPTION};
|
||||
}
|
||||
|
||||
void ParquetBlockOutputFormat::finalize()
|
||||
void ParquetBlockOutputFormat::finalizeImpl()
|
||||
{
|
||||
if (!file_writer)
|
||||
{
|
||||
|
@ -35,7 +35,7 @@ public:
|
||||
|
||||
private:
|
||||
void consume(Chunk) override;
|
||||
void finalize() override;
|
||||
void finalizeImpl() override;
|
||||
|
||||
const FormatSettings format_settings;
|
||||
|
||||
|
@ -401,7 +401,7 @@ void PrettyBlockOutputFormat::writeSuffix()
|
||||
}
|
||||
}
|
||||
|
||||
void PrettyBlockOutputFormat::finalize()
|
||||
void PrettyBlockOutputFormat::finalizeImpl()
|
||||
{
|
||||
writeSuffixIfNot();
|
||||
}
|
||||
|
@ -27,7 +27,7 @@ protected:
|
||||
void consumeTotals(Chunk) override;
|
||||
void consumeExtremes(Chunk) override;
|
||||
|
||||
void finalize() override;
|
||||
void finalizeImpl() override;
|
||||
|
||||
size_t total_rows = 0;
|
||||
size_t terminal_width = 0;
|
||||
|
@ -164,7 +164,7 @@ void TemplateBlockOutputFormat::writePrefix()
|
||||
writeString(format.delimiters.front(), out);
|
||||
}
|
||||
|
||||
void TemplateBlockOutputFormat::finalize()
|
||||
void TemplateBlockOutputFormat::finalizeImpl()
|
||||
{
|
||||
if (finalized)
|
||||
return;
|
||||
|
@ -43,7 +43,7 @@ private:
|
||||
void consume(Chunk chunk) override;
|
||||
void consumeTotals(Chunk chunk) override { totals = std::move(chunk); }
|
||||
void consumeExtremes(Chunk chunk) override { extremes = std::move(chunk); }
|
||||
void finalize() override;
|
||||
void finalizeImpl() override;
|
||||
|
||||
void writeRow(const Chunk & chunk, size_t row_num);
|
||||
void serializeField(const IColumn & column, const ISerialization & serialization, size_t row_num, ColumnFormat format);
|
||||
|
@ -34,7 +34,7 @@ public:
|
||||
queue.clearAndFinish();
|
||||
}
|
||||
|
||||
void finalize() override
|
||||
void finalizeImpl() override
|
||||
{
|
||||
queue.finish();
|
||||
}
|
||||
|
@ -1168,7 +1168,7 @@ namespace
|
||||
executor->execute();
|
||||
}
|
||||
|
||||
output_format_processor->finish();
|
||||
output_format_processor->finalize();
|
||||
}
|
||||
|
||||
void Call::finishQuery()
|
||||
@ -1380,7 +1380,7 @@ namespace
|
||||
WriteBufferFromString buf{*result.mutable_totals()};
|
||||
auto format = query_context->getOutputFormat(output_format, buf, totals);
|
||||
format->write(materializeBlock(totals));
|
||||
format->finish();
|
||||
format->finalize();
|
||||
}
|
||||
|
||||
void Call::addExtremesToResult(const Block & extremes)
|
||||
@ -1391,7 +1391,7 @@ namespace
|
||||
WriteBufferFromString buf{*result.mutable_extremes()};
|
||||
auto format = query_context->getOutputFormat(output_format, buf, extremes);
|
||||
format->write(materializeBlock(extremes));
|
||||
format->finish();
|
||||
format->finalize();
|
||||
}
|
||||
|
||||
void Call::addProfileInfoToResult(const ProfileInfo & info)
|
||||
|
@ -217,7 +217,7 @@ public:
|
||||
{
|
||||
try
|
||||
{
|
||||
writer->finish();
|
||||
writer->finalize();
|
||||
writer->flush();
|
||||
write_buf->sync();
|
||||
write_buf->finalize();
|
||||
|
@ -42,7 +42,7 @@ void KafkaSink::consume(Chunk chunk)
|
||||
void KafkaSink::onFinish()
|
||||
{
|
||||
if (format)
|
||||
format->finish();
|
||||
format->finalize();
|
||||
//flush();
|
||||
|
||||
if (buffer)
|
||||
|
@ -49,7 +49,7 @@ void RabbitMQSink::consume(Chunk chunk)
|
||||
|
||||
void RabbitMQSink::onFinish()
|
||||
{
|
||||
format->finish();
|
||||
format->finalize();
|
||||
|
||||
if (buffer)
|
||||
buffer->updateMaxWait();
|
||||
|
@ -643,7 +643,7 @@ public:
|
||||
|
||||
void onFinish() override
|
||||
{
|
||||
writer->finish();
|
||||
writer->finalize();
|
||||
}
|
||||
|
||||
// void flush() override
|
||||
|
@ -328,7 +328,7 @@ public:
|
||||
{
|
||||
try
|
||||
{
|
||||
writer->finish();
|
||||
writer->finalize();
|
||||
writer->flush();
|
||||
write_buf->finalize();
|
||||
}
|
||||
|
@ -231,7 +231,7 @@ void StorageURLSink::consume(Chunk chunk)
|
||||
|
||||
void StorageURLSink::onFinish()
|
||||
{
|
||||
writer->finish();
|
||||
writer->finalize();
|
||||
writer->flush();
|
||||
write_buf->finalize();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user