From 7f0654cabbe158da95a0f150d3e1cf7b31d5b099 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Sun, 1 Feb 2015 11:24:49 +0300 Subject: [PATCH] Fixed build [#METR-2807]. --- dbms/src/DataStreams/tests/expression_stream.cpp | 6 +++--- dbms/src/DataStreams/tests/filter_stream.cpp | 8 ++++---- dbms/src/DataStreams/tests/filter_stream_hitlog.cpp | 2 +- dbms/src/DataStreams/tests/fork_streams.cpp | 2 +- dbms/src/Interpreters/tests/expression.cpp | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dbms/src/DataStreams/tests/expression_stream.cpp b/dbms/src/DataStreams/tests/expression_stream.cpp index 60a66e33440..dda3b9c7c1c 100644 --- a/dbms/src/DataStreams/tests/expression_stream.cpp +++ b/dbms/src/DataStreams/tests/expression_stream.cpp @@ -50,13 +50,13 @@ int main(int argc, char ** argv) Context context; context.getColumns().push_back(NameAndTypePair("number", new DataTypeUInt64)); - ExpressionAnalyzer analyzer(ast, context); + ExpressionAnalyzer analyzer(ast, context, context.getColumns()); ExpressionActionsChain chain; analyzer.appendSelect(chain, false); analyzer.appendProjectResult(chain, false); chain.finalize(); ExpressionActionsPtr expression = chain.getLastActions(); - + StoragePtr table = StorageSystemNumbers::create("Numbers"); Names column_names; @@ -68,7 +68,7 @@ int main(int argc, char ** argv) in = table->read(column_names, 0, context, Settings(), stage)[0]; in = new ExpressionBlockInputStream(in, expression); in = new LimitBlockInputStream(in, 10, std::max(static_cast(0), static_cast(n) - 10)); - + WriteBufferFromOStream out1(std::cout); RowOutputStreamPtr out2 = new TabSeparatedRowOutputStream(out1, expression->getSampleBlock()); BlockOutputStreamFromRowOutputStream out(out2); diff --git a/dbms/src/DataStreams/tests/filter_stream.cpp b/dbms/src/DataStreams/tests/filter_stream.cpp index df232b6bb9d..cc797e4b2fe 100644 --- a/dbms/src/DataStreams/tests/filter_stream.cpp +++ b/dbms/src/DataStreams/tests/filter_stream.cpp @@ -28,7 +28,7 @@ using Poco::SharedPtr; int main(int argc, char ** argv) { using namespace DB; - + try { size_t n = argc == 2 ? parse(argv[1]) : 10ULL; @@ -56,13 +56,13 @@ int main(int argc, char ** argv) Context context; context.getColumns().push_back(NameAndTypePair("number", new DataTypeUInt64)); - ExpressionAnalyzer analyzer(ast, context); + ExpressionAnalyzer analyzer(ast, context, context.getColumns()); ExpressionActionsChain chain; analyzer.appendSelect(chain, false); analyzer.appendProjectResult(chain, false); chain.finalize(); ExpressionActionsPtr expression = chain.getLastActions(); - + StoragePtr table = StorageSystemNumbers::create("Numbers"); Names column_names; @@ -74,7 +74,7 @@ int main(int argc, char ** argv) in = new ExpressionBlockInputStream(in, expression); in = new FilterBlockInputStream(in, 1); in = new LimitBlockInputStream(in, 10, std::max(static_cast(0), static_cast(n) - 10)); - + WriteBufferFromOStream ob(std::cout); RowOutputStreamPtr out_ = new TabSeparatedRowOutputStream(ob, expression->getSampleBlock()); BlockOutputStreamFromRowOutputStream out(out_); diff --git a/dbms/src/DataStreams/tests/filter_stream_hitlog.cpp b/dbms/src/DataStreams/tests/filter_stream_hitlog.cpp index dde28bbea3b..314558521f2 100644 --- a/dbms/src/DataStreams/tests/filter_stream_hitlog.cpp +++ b/dbms/src/DataStreams/tests/filter_stream_hitlog.cpp @@ -125,7 +125,7 @@ int main(int argc, char ** argv) /// читаем из неё, применяем выражение, фильтруем, и пишем в tsv виде в консоль - ExpressionAnalyzer analyzer(ast, context); + ExpressionAnalyzer analyzer(ast, context, context.getColumns()); ExpressionActionsChain chain; analyzer.appendSelect(chain, false); analyzer.appendWhere(chain, false); diff --git a/dbms/src/DataStreams/tests/fork_streams.cpp b/dbms/src/DataStreams/tests/fork_streams.cpp index 17942e2be1d..72ef893589b 100644 --- a/dbms/src/DataStreams/tests/fork_streams.cpp +++ b/dbms/src/DataStreams/tests/fork_streams.cpp @@ -71,7 +71,7 @@ int main(int argc, char ** argv) Context context; context.getColumns().push_back(NameAndTypePair("number", new DataTypeUInt64)); - ExpressionAnalyzer analyzer(ast, context); + ExpressionAnalyzer analyzer(ast, context, context.getColumns()); ExpressionActionsChain chain; analyzer.appendSelect(chain, false); analyzer.appendProjectResult(chain, false); diff --git a/dbms/src/Interpreters/tests/expression.cpp b/dbms/src/Interpreters/tests/expression.cpp index ac9ee0c32e1..b53ee9ba448 100644 --- a/dbms/src/Interpreters/tests/expression.cpp +++ b/dbms/src/Interpreters/tests/expression.cpp @@ -26,7 +26,7 @@ int main(int argc, char ** argv) { using namespace DB; - + try { ParserSelectQuery parser; @@ -64,8 +64,8 @@ int main(int argc, char ** argv) columns.push_back(NameAndTypePair("s1", new DataTypeString)); columns.push_back(NameAndTypePair("s2", new DataTypeString)); context.setColumns(columns); - - ExpressionAnalyzer analyzer(ast, context); + + ExpressionAnalyzer analyzer(ast, context, context.getColumns()); ExpressionActionsChain chain; analyzer.appendSelect(chain, false); analyzer.appendProjectResult(chain, false); @@ -75,7 +75,7 @@ int main(int argc, char ** argv) size_t n = argc == 2 ? atoi(argv[1]) : 10; Block block; - + ColumnWithNameAndType column_x; column_x.name = "x"; column_x.type = new DataTypeInt16; @@ -123,7 +123,7 @@ int main(int argc, char ** argv) << ", " << n * 1000000 / stopwatch.elapsed() << " rows/sec." << std::endl; } - + OneBlockInputStream * is = new OneBlockInputStream(block); LimitBlockInputStream lis(is, 20, std::max(0, static_cast(n) - 20)); WriteBufferFromOStream out_buf(std::cout);