Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
b47db5e0
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b47db5e0
编写于
3月 24, 2020
作者:
A
Alexander Tokmakov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix
上级
221bb893
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
16 addition
and
13 deletion
+16
-13
dbms/src/Common/rename.cpp
dbms/src/Common/rename.cpp
+1
-1
dbms/src/Databases/DatabaseAtomic.cpp
dbms/src/Databases/DatabaseAtomic.cpp
+1
-1
dbms/src/Databases/DatabaseOnDisk.cpp
dbms/src/Databases/DatabaseOnDisk.cpp
+1
-0
dbms/src/Storages/IStorage.cpp
dbms/src/Storages/IStorage.cpp
+1
-1
dbms/src/Storages/StorageBuffer.cpp
dbms/src/Storages/StorageBuffer.cpp
+1
-1
dbms/src/Storages/StorageDistributed.cpp
dbms/src/Storages/StorageDistributed.cpp
+1
-1
dbms/src/Storages/StorageMaterializedView.cpp
dbms/src/Storages/StorageMaterializedView.cpp
+1
-1
dbms/src/Storages/StorageMerge.cpp
dbms/src/Storages/StorageMerge.cpp
+1
-1
dbms/src/Storages/StorageMergeTree.cpp
dbms/src/Storages/StorageMergeTree.cpp
+2
-2
dbms/src/Storages/StorageNull.cpp
dbms/src/Storages/StorageNull.cpp
+1
-1
dbms/src/Storages/StorageReplicatedMergeTree.cpp
dbms/src/Storages/StorageReplicatedMergeTree.cpp
+3
-3
dbms/tests/queries/0_stateless/01071_live_view_detach_dependency.sql
...queries/0_stateless/01071_live_view_detach_dependency.sql
+2
-0
未找到文件。
dbms/src/Common/rename.cpp
浏览文件 @
b47db5e0
...
...
@@ -47,7 +47,7 @@ namespace ErrorCodes
extern
const
int
UNSUPPORTED_METHOD
;
}
static
[[
noreturn
]]
void
renameat2
(
const
std
::
string
&
,
const
std
::
string
&
,
int
)
[[
noreturn
]]
static
void
renameat2
(
const
std
::
string
&
,
const
std
::
string
&
,
int
)
{
throw
Exception
(
"Compiled without renameat2() support"
,
ErrorCodes
::
UNSUPPORTED_METHOD
);
}
...
...
dbms/src/Databases/DatabaseAtomic.cpp
浏览文件 @
b47db5e0
...
...
@@ -98,7 +98,7 @@ void DatabaseAtomic::renameTable(const Context & context, const String & table_n
throw
Exception
(
"Table "
+
backQuote
(
getDatabaseName
())
+
"."
+
backQuote
(
table_name
)
+
" doesn't exist."
,
ErrorCodes
::
UNKNOWN_TABLE
);
String
old_metadata_path
=
getObjectMetadataPath
(
table_name
);
String
new_metadata_path
=
to_database
.
getObjectMetadataPath
(
table_name
);
String
new_metadata_path
=
to_database
.
getObjectMetadataPath
(
t
o_t
able_name
);
if
(
this
==
&
to_database
)
{
...
...
dbms/src/Databases/DatabaseOnDisk.cpp
浏览文件 @
b47db5e0
...
...
@@ -272,6 +272,7 @@ void DatabaseOnDisk::renameTable(
table_metadata_path
=
getObjectMetadataPath
(
table_name
);
attach_query
=
parseQueryFromMetadata
(
log
,
context
,
table_metadata_path
);
auto
&
create
=
attach_query
->
as
<
ASTCreateQuery
&>
();
create
.
database
=
to_database
.
getDatabaseName
();
create
.
table
=
to_table_name
;
if
(
from_ordinary_to_atomic
)
create
.
uuid
=
UUIDHelpers
::
generateV4
();
...
...
dbms/src/Storages/IStorage.cpp
浏览文件 @
b47db5e0
...
...
@@ -382,7 +382,7 @@ void IStorage::alter(
auto
table_id
=
getStorageID
();
StorageInMemoryMetadata
metadata
=
getInMemoryMetadata
();
params
.
apply
(
metadata
);
DatabaseCatalog
::
instance
().
getDatabase
AndTable
(
table_id
).
first
->
alterTable
(
context
,
table_id
,
metadata
);
DatabaseCatalog
::
instance
().
getDatabase
(
table_id
.
database_name
)
->
alterTable
(
context
,
table_id
,
metadata
);
setColumns
(
std
::
move
(
metadata
.
columns
));
}
...
...
dbms/src/Storages/StorageBuffer.cpp
浏览文件 @
b47db5e0
...
...
@@ -738,7 +738,7 @@ void StorageBuffer::alter(const AlterCommands & params, const Context & context,
StorageInMemoryMetadata
metadata
=
getInMemoryMetadata
();
params
.
apply
(
metadata
);
DatabaseCatalog
::
instance
().
getDatabase
AndTable
(
table_id
).
first
->
alterTable
(
context
,
table_id
,
metadata
);
DatabaseCatalog
::
instance
().
getDatabase
(
table_id
.
database_name
)
->
alterTable
(
context
,
table_id
,
metadata
);
setColumns
(
std
::
move
(
metadata
.
columns
));
}
...
...
dbms/src/Storages/StorageDistributed.cpp
浏览文件 @
b47db5e0
...
...
@@ -469,7 +469,7 @@ void StorageDistributed::alter(const AlterCommands & params, const Context & con
checkAlterIsPossible
(
params
,
context
.
getSettingsRef
());
StorageInMemoryMetadata
metadata
=
getInMemoryMetadata
();
params
.
apply
(
metadata
);
DatabaseCatalog
::
instance
().
getDatabase
AndTable
(
table_id
).
first
->
alterTable
(
context
,
table_id
,
metadata
);
DatabaseCatalog
::
instance
().
getDatabase
(
table_id
.
database_name
)
->
alterTable
(
context
,
table_id
,
metadata
);
setColumns
(
std
::
move
(
metadata
.
columns
));
}
...
...
dbms/src/Storages/StorageMaterializedView.cpp
浏览文件 @
b47db5e0
...
...
@@ -286,7 +286,7 @@ void StorageMaterializedView::alter(
}
/// end modify query
DatabaseCatalog
::
instance
().
getDatabase
AndTable
(
table_id
).
first
->
alterTable
(
context
,
table_id
,
metadata
);
DatabaseCatalog
::
instance
().
getDatabase
(
table_id
.
database_name
)
->
alterTable
(
context
,
table_id
,
metadata
);
setColumns
(
std
::
move
(
metadata
.
columns
));
}
...
...
dbms/src/Storages/StorageMerge.cpp
浏览文件 @
b47db5e0
...
...
@@ -439,7 +439,7 @@ void StorageMerge::alter(
StorageInMemoryMetadata
storage_metadata
=
getInMemoryMetadata
();
params
.
apply
(
storage_metadata
);
DatabaseCatalog
::
instance
().
getDatabase
AndTable
(
table_id
).
first
->
alterTable
(
context
,
table_id
,
storage_metadata
);
DatabaseCatalog
::
instance
().
getDatabase
(
table_id
.
database_name
)
->
alterTable
(
context
,
table_id
,
storage_metadata
);
setColumns
(
storage_metadata
.
columns
);
}
...
...
dbms/src/Storages/StorageMergeTree.cpp
浏览文件 @
b47db5e0
...
...
@@ -279,7 +279,7 @@ void StorageMergeTree::alter(
{
lockStructureExclusively
(
table_lock_holder
,
context
.
getCurrentQueryId
());
DatabaseCatalog
::
instance
().
getDatabase
AndTable
(
table_id
).
first
->
alterTable
(
context
,
table_id
,
metadata
);
DatabaseCatalog
::
instance
().
getDatabase
(
table_id
.
database_name
)
->
alterTable
(
context
,
table_id
,
metadata
);
update_metadata
();
}
...
...
@@ -296,7 +296,7 @@ void StorageMergeTree::alter(
lockStructureExclusively
(
table_lock_holder
,
context
.
getCurrentQueryId
());
DatabaseCatalog
::
instance
().
getDatabase
AndTable
(
table_id
).
first
->
alterTable
(
context
,
table_id
,
metadata
);
DatabaseCatalog
::
instance
().
getDatabase
(
table_id
.
database_name
)
->
alterTable
(
context
,
table_id
,
metadata
);
update_metadata
();
...
...
dbms/src/Storages/StorageNull.cpp
浏览文件 @
b47db5e0
...
...
@@ -53,7 +53,7 @@ void StorageNull::alter(
StorageInMemoryMetadata
metadata
=
getInMemoryMetadata
();
params
.
apply
(
metadata
);
DatabaseCatalog
::
instance
().
getDatabase
AndTable
(
table_id
).
first
->
alterTable
(
context
,
table_id
,
metadata
);
DatabaseCatalog
::
instance
().
getDatabase
(
table_id
.
database_name
)
->
alterTable
(
context
,
table_id
,
metadata
);
setColumns
(
std
::
move
(
metadata
.
columns
));
}
...
...
dbms/src/Storages/StorageReplicatedMergeTree.cpp
浏览文件 @
b47db5e0
...
...
@@ -494,7 +494,7 @@ void StorageReplicatedMergeTree::setTableStructure(ColumnsDescription new_column
}
auto
table_id
=
getStorageID
();
DatabaseCatalog
::
instance
().
getDatabase
AndTable
(
table_id
).
first
->
alterTable
(
global_context
,
table_id
,
metadata
);
DatabaseCatalog
::
instance
().
getDatabase
(
table_id
.
database_name
)
->
alterTable
(
global_context
,
table_id
,
metadata
);
/// Even if the primary/sorting keys didn't change we must reinitialize it
/// because primary key column types might have changed.
...
...
@@ -3270,7 +3270,7 @@ void StorageReplicatedMergeTree::alter(
changeSettings
(
metadata
.
settings_ast
,
table_lock_holder
);
DatabaseCatalog
::
instance
().
getDatabase
AndTable
(
table_id
).
first
->
alterTable
(
query_context
,
table_id
,
metadata
);
DatabaseCatalog
::
instance
().
getDatabase
(
table_id
.
database_name
)
->
alterTable
(
query_context
,
table_id
,
metadata
);
return
;
}
...
...
@@ -3331,7 +3331,7 @@ void StorageReplicatedMergeTree::alter(
/// Just change settings
current_metadata
.
settings_ast
=
future_metadata
.
settings_ast
;
changeSettings
(
current_metadata
.
settings_ast
,
table_lock_holder
);
DatabaseCatalog
::
instance
().
getDatabase
AndTable
(
table_id
).
first
->
alterTable
(
query_context
,
table_id
,
current_metadata
);
DatabaseCatalog
::
instance
().
getDatabase
(
table_id
.
database_name
)
->
alterTable
(
query_context
,
table_id
,
current_metadata
);
}
/// We can be sure, that in case of successfull commit in zookeeper our
...
...
dbms/tests/queries/0_stateless/01071_live_view_detach_dependency.sql
浏览文件 @
b47db5e0
...
...
@@ -6,3 +6,5 @@ CREATE LIVE VIEW lv AS SELECT * FROM test;
DETACH
TABLE
lv
;
INSERT
INTO
test
VALUES
(
42
);
DROP
TABLE
test
;
ATTACH
TABLE
lv
;
DROP
TABLE
lv
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录