thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-21 09:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed obsolete Chunks and ChunkRef storages [#METR-19997].

Browse Source
This commit is contained in:
Alexey Milovidov 2016-03-30 19:04:53 +03:00
parent 5c400d5c5c
commit 0e6993b3ea
2 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/CMakeLists.txt
View File

@ -481,7 +481,6 @@ add_library (dbms
include/DB/Storages/System/StorageSystemMerges.h
include/DB/Storages/VirtualColumnFactory.h
include/DB/Storages/StorageReplicatedMergeTree.h
include/DB/Storages/StorageChunkRef.h
include/DB/Storages/StorageFactory.h
include/DB/Storages/MarkCache.h
include/DB/Storages/System/StorageSystemReplicas.h
@ -493,7 +492,6 @@ add_library (dbms
include/DB/Storages/ColumnDefault.h
include/DB/Storages/ITableDeclaration.h
include/DB/Storages/StorageView.h
include/DB/Storages/StorageChunks.h
include/DB/Storages/System/StorageSystemColumns.h
include/DB/Storages/StorageMergeTree.h
include/DB/Storages/StorageMaterializedView.h
@ -621,8 +619,6 @@ add_library (dbms
src/Storages/StorageMerge.cpp
src/Storages/StorageMergeTree.cpp
src/Storages/StorageReplicatedMergeTree.cpp
src/Storages/StorageChunks.cpp
src/Storages/StorageChunkRef.cpp
src/Storages/StorageSet.cpp
src/Storages/StorageJoin.cpp
src/Storages/VirtualColumnFactory.cpp

42
dbms/src/Storages/StorageFactory.cpp
View File

@ -24,8 +24,6 @@
#include <DB/Storages/StorageFactory.h>
#include <DB/Storages/StorageView.h>
#include <DB/Storages/StorageMaterializedView.h>
#include <DB/Storages/StorageChunks.h>
#include <DB/Storages/StorageChunkRef.h>
#include <DB/Storages/StorageReplicatedMergeTree.h>
#include <DB/Storages/StorageSet.h>
#include <DB/Storages/StorageJoin.h>
@ -123,17 +121,6 @@ StoragePtr StorageFactory::get(
materialized_columns, alias_columns, column_defaults,
context.getSettings().max_compress_block_size);
}
else if (name == "Chunks")
{
return StorageChunks::create(
data_path, table_name, database_name, columns,
materialized_columns, alias_columns, column_defaults,
context, attach);
}
else if (name == "ChunkRef")
{
throw Exception("Table with storage ChunkRef must not be created manually.", ErrorCodes::TABLE_MUST_NOT_BE_CREATED_MANUALLY);
}
else if (name == "View")
{
return StorageView::create(
@ -147,35 +134,6 @@ StoragePtr StorageFactory::get(
materialized_columns, alias_columns, column_defaults,
attach);
}
else if (name == "ChunkMerger")
{
/// ChunkMerger устарел. Вместо него создаём таблицу типа Merge. TODO Через некоторое время, вовсе удалить эту ветку.
ASTs & args_func = typeid_cast<ASTFunction &>(*typeid_cast<ASTCreateQuery &>(*query).storage).children;
do
{
if (args_func.size() != 1)
break;
ASTs & args = typeid_cast<ASTExpressionList &>(*args_func.at(0)).children;
if (args.size() < 3 || args.size() > 4)
break;
String source_database = reinterpretAsIdentifier(args[0], local_context).name;
String table_name_regexp = safeGet<const String &>(typeid_cast<ASTLiteral &>(*args[1]).value);
return StorageMerge::create(
table_name, columns,
materialized_columns, alias_columns, column_defaults,
source_database, table_name_regexp, context);
} while (false);
throw Exception("Storage ChunkMerger requires from 3 to 4 parameters:"
" source database, regexp for source table names, number of chunks to merge, [destination tables name prefix].",
ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
}
else if (name == "TinyLog")
{
return StorageTinyLog::create(