thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 17:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Less dependencies [#CLICKHOUSE-2]

Browse Source
This commit is contained in:
Alexey Milovidov 2017-01-14 11:47:34 +03:00
parent cf60632d78
commit 2a8564c68c
9 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/include/DB/Interpreters/ExpressionAnalyzer.h
View File

@ -27,7 +27,7 @@ using BlockInputStreamPtr = std::shared_ptr<IBlockInputStream>;
class IStorage;
using StoragePtr = std::shared_ptr<IStorage>;
using Tables = std::vector<StoragePtr>;
using Tables = std::map<String, StoragePtr>;
class ASTFunction;
class ASTExpressionList;

4
dbms/include/DB/Storages/StorageSet.h
View File

@ -91,8 +91,8 @@ private:
const NamesAndTypesList & alias_columns_,
const ColumnDefaults & column_defaults_);
void insertBlock(const Block & block) override { set->insertFromBlock(block); }
size_t getSize() const override { return set->getTotalRowCount(); };
void insertBlock(const Block & block) override;
size_t getSize() const override;
};
}

1
dbms/src/Interpreters/InterpreterCreateQuery.cpp
View File

@ -20,6 +20,7 @@
#include <DB/Parsers/ASTColumnDeclaration.h>
#include <DB/Parsers/formatAST.h>
#include <DB/Parsers/ASTIdentifier.h>
#include <DB/Parsers/ASTLiteral.h>
#include <DB/Parsers/ParserCreateQuery.h>
#include <DB/Parsers/parseQuery.h>

1
dbms/src/Interpreters/InterpreterSelectQuery.cpp
View File

@ -26,6 +26,7 @@
#include <DB/Parsers/ASTFunction.h>
#include <DB/Parsers/ASTLiteral.h>
#include <DB/Parsers/ASTOrderByElement.h>
#include <DB/Parsers/ASTTablesInSelectQuery.h>
#include <DB/Interpreters/InterpreterSelectQuery.h>
#include <DB/Interpreters/InterpreterSetQuery.h>

1
dbms/src/Interpreters/evaluateConstantExpression.cpp
View File

@ -2,6 +2,7 @@
#include <DB/Columns/ColumnConst.h>
#include <DB/Parsers/IAST.h>
#include <DB/Parsers/ASTIdentifier.h>
#include <DB/Parsers/ASTLiteral.h>
#include <DB/DataTypes/DataTypesNumberFixed.h>
#include <DB/Interpreters/Context.h>
#include <DB/Interpreters/ExpressionAnalyzer.h>

2
dbms/src/Interpreters/evaluateMissingDefaults.cpp
View File

@ -3,6 +3,8 @@
#include <DB/Interpreters/ExpressionAnalyzer.h>
#include <DB/Interpreters/ExpressionActions.h>
#include <DB/Interpreters/evaluateMissingDefaults.h>
#include <DB/Parsers/ASTExpressionList.h>
#include <DB/Parsers/ASTWithAlias.h>
#include <utility>

4
dbms/src/Storages/StorageJoin.cpp
View File

@ -53,7 +53,7 @@ void StorageJoin::assertCompatible(ASTTableJoin::Kind kind_, ASTTableJoin::Stric
}
void StorageJoin::insertBlock(const Block & block) override { join->insertFromBlock(block); }
size_t StorageJoin::getSize() const override { return join->getTotalRowCount(); };
void StorageJoin::insertBlock(const Block & block) { join->insertFromBlock(block); }
size_t StorageJoin::getSize() const { return join->getTotalRowCount(); };
}

1
dbms/src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -16,6 +16,7 @@
#include <DB/Parsers/formatAST.h>
#include <DB/Parsers/ASTInsertQuery.h>
#include <DB/Parsers/ASTSelectQuery.h>
#include <DB/Parsers/queryToString.h>
#include <DB/IO/ReadBufferFromString.h>

4
dbms/src/Storages/StorageSet.cpp
View File

@ -101,6 +101,10 @@ StorageSet::StorageSet(
}
void StorageSet::insertBlock(const Block & block) { set->insertFromBlock(block); }
size_t StorageSet::getSize() const { return set->getTotalRowCount(); };
void StorageSetOrJoinBase::restore()
{
Poco::File tmp_dir(path + "tmp/");