Formats: better modularity (development) #2447

ClickHouse · Jun 9, 2018 · e3a445a · e3a445a
1 parent c4e6434
commit e3a445a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/dbms/src/DataStreams/tests/expression_stream.cpp b/dbms/src/DataStreams/tests/expression_stream.cpp
@@ -8,8 +8,7 @@
 
 #include <DataStreams/LimitBlockInputStream.h>
 #include <DataStreams/ExpressionBlockInputStream.h>
-#include <DataStreams/TabSeparatedRowOutputStream.h>
-#include <DataStreams/BlockOutputStreamFromRowOutputStream.h>
+#include <Formats/FormatFactory.h>
 #include <DataStreams/copyData.h>
 
 #include <DataTypes/DataTypesNumber.h>
@@ -55,17 +54,14 @@ try
     in = std::make_shared<ExpressionBlockInputStream>(in, expression);
     in = std::make_shared<LimitBlockInputStream>(in, 10, std::max(static_cast<Int64>(0), static_cast<Int64>(n) - 10));
 
-    FormatSettings format_settings;
-
     WriteBufferFromOStream out1(std::cout);
-    RowOutputStreamPtr out2 = std::make_shared<TabSeparatedRowOutputStream>(out1, expression->getSampleBlock(), false, false, format_settings);
-    BlockOutputStreamFromRowOutputStream out(out2, expression->getSampleBlock());
+    BlockOutputStreamPtr out = FormatFactory::instance().getOutput("TabSeparated", out1, expression->getSampleBlock(), context);
 
     {
         Stopwatch stopwatch;
         stopwatch.start();
 
-        copyData(*in, out);
+        copyData(*in, *out);
 
         stopwatch.stop();
         std::cout << std::fixed << std::setprecision(2)

diff --git a/dbms/src/Interpreters/tests/expression.cpp b/dbms/src/Interpreters/tests/expression.cpp
@@ -123,10 +123,9 @@ int main(int argc, char ** argv)
         auto is = std::make_shared<OneBlockInputStream>(block);
         LimitBlockInputStream lis(is, 20, std::max(0, static_cast<int>(n) - 20));
         WriteBufferFromOStream out_buf(std::cout);
-        RowOutputStreamPtr os_ = std::make_shared<TabSeparatedRowOutputStream>(out_buf, block, false, false, FormatSettings());
-        BlockOutputStreamFromRowOutputStream os(os_, is->getHeader());
+        BlockOutputStreamPtr out = FormatFactory::instance().getOutput("TabSeparated", out_buf, block, context);
 
-        copyData(lis, os);
+        copyData(lis, *out);
     }
     catch (const Exception & e)
     {

diff --git a/dbms/src/Storages/tests/system_numbers.cpp b/dbms/src/Storages/tests/system_numbers.cpp
@@ -29,10 +29,9 @@ try
     QueryProcessingStage::Enum stage;
 
     LimitBlockInputStream input(table->read(column_names, {}, Context::createGlobal(), stage, 10, 1)[0], 10, 96);
-    RowOutputStreamPtr output_ = std::make_shared<TabSeparatedRowOutputStream>(out_buf, sample, false, false, FormatSettings());
-    BlockOutputStreamFromRowOutputStream output(output_, sample);
+    BlockOutputStreamPtr out = FormatFactory::instance().getOutput("TabSeparated", out_buf, sample, context);
 
-    copyData(input, output);
+    copyData(input, *out);
 
     return 0;
 }