提交 a419ce10 编写于 作者: A Alexey Milovidov

Preparation to build with in-tree Poco library [#METR-19593].

上级 3de42d1d
......@@ -6,6 +6,7 @@
#include <DB/Core/Names.h>
#include <DB/Core/ColumnWithTypeAndName.h>
#include <DB/Core/Block.h>
#include <DB/Functions/IFunction.h>
#include <unordered_set>
#include <unordered_map>
......@@ -14,9 +15,6 @@
namespace DB
{
class IFunction;
typedef Poco::SharedPtr<IFunction> FunctionPtr;
typedef std::pair<std::string, std::string> NameWithAlias;
typedef std::vector<NameWithAlias> NamesWithAliases;
......@@ -76,7 +74,8 @@ public:
NamesWithAliases projection;
/// Если result_name_ == "", в качестве имени используется "имя_функции(аргументы через запятую)".
static ExpressionAction applyFunction(FunctionPtr function_, const std::vector<std::string> & argument_names_, std::string result_name_ = "");
static ExpressionAction applyFunction(
const FunctionPtr & function_, const std::vector<std::string> & argument_names_, std::string result_name_ = "");
static ExpressionAction addColumn(ColumnWithTypeAndName added_column_)
{
......
......@@ -4,7 +4,6 @@
#include <DB/Columns/ColumnsNumber.h>
#include <DB/Columns/ColumnArray.h>
#include <DB/DataTypes/DataTypeArray.h>
#include <DB/Functions/IFunction.h>
#include <DB/Functions/FunctionsArray.h>
#include <set>
......@@ -12,6 +11,7 @@
namespace DB
{
Names ExpressionAction::getNeededColumns() const
{
Names res = argument_names;
......@@ -28,7 +28,7 @@ Names ExpressionAction::getNeededColumns() const
return res;
}
ExpressionAction ExpressionAction::applyFunction(FunctionPtr function_,
ExpressionAction ExpressionAction::applyFunction(const FunctionPtr & function_,
const std::vector<std::string> & argument_names_,
std::string result_name_)
{
......
#include <DB/Parsers/ASTCreateQuery.h>
#include <DB/Parsers/ASTIdentifier.h>
#include <DB/Storages/StorageChunkRef.h>
#include <DB/DataStreams/IBlockInputStream.h>
namespace DB
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册