Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
5a7237cc
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,发现更多精彩内容 >>
提交
5a7237cc
编写于
3月 23, 2019
作者:
A
Alexey Milovidov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Miscellaneous
上级
e9af289b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
11 deletion
+6
-11
dbms/src/Functions/multiIf.cpp
dbms/src/Functions/multiIf.cpp
+1
-6
dbms/src/Storages/MergeTree/MergeTreeData.cpp
dbms/src/Storages/MergeTree/MergeTreeData.cpp
+2
-2
dbms/src/Storages/MergeTree/MergeTreeData.h
dbms/src/Storages/MergeTree/MergeTreeData.h
+3
-3
未找到文件。
dbms/src/Functions/multiIf.cpp
浏览文件 @
5a7237cc
...
...
@@ -23,12 +23,7 @@ namespace ErrorCodes
/// where N >= 1.
///
/// For all 1 <= i <= N, "cond_i" has type UInt8.
/// Types of all the branches "then_i" and "else" are either of the following:
/// - numeric types for which there exists a common type;
/// - dates;
/// - dates with time;
/// - strings;
/// - arrays of such types.
/// Types of all the branches "then_i" and "else" have a common type.
///
/// Additionally the arguments, conditions or branches, support nullable types
/// and the NULL value, with a NULL condition treated as false.
...
...
dbms/src/Storages/MergeTree/MergeTreeData.cpp
浏览文件 @
5a7237cc
...
...
@@ -223,8 +223,8 @@ static void checkKeyExpression(const ExpressionActions & expr, const Block & sam
void
MergeTreeData
::
setPrimaryKeyIndicesAndColumns
(
const
ASTPtr
&
new_order_by_ast
,
ASTPtr
new_primary_key_ast
,
const
ColumnsDescription
&
new_columns
,
const
IndicesDescription
&
indices_description
,
bool
only_check
)
const
ASTPtr
&
new_order_by_ast
,
const
ASTPtr
&
new_primary_key_ast
,
const
ColumnsDescription
&
new_columns
,
const
IndicesDescription
&
indices_description
,
bool
only_check
)
{
if
(
!
new_order_by_ast
)
throw
Exception
(
"ORDER BY cannot be empty"
,
ErrorCodes
::
BAD_ARGUMENTS
);
...
...
dbms/src/Storages/MergeTree/MergeTreeData.h
浏览文件 @
5a7237cc
...
...
@@ -732,9 +732,9 @@ private:
/// The same for clearOldTemporaryDirectories.
std
::
mutex
clear_old_temporary_directories_mutex
;
void
setPrimaryKeyIndicesAndColumns
(
const
ASTPtr
&
new_order_by_ast
,
ASTPtr
new_primary_key_ast
,
const
ColumnsDescription
&
new_columns
,
const
IndicesDescription
&
indices_description
,
bool
only_check
=
false
);
void
setPrimaryKeyIndicesAndColumns
(
const
ASTPtr
&
new_order_by_ast
,
const
ASTPtr
&
new_primary_key_ast
,
const
ColumnsDescription
&
new_columns
,
const
IndicesDescription
&
indices_description
,
bool
only_check
=
false
);
void
initPartitionKey
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录