Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
4e67e058
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,发现更多精彩内容 >>
提交
4e67e058
编写于
3月 14, 2017
作者:
A
Alexey Milovidov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed error [#CLICKHOUSE-2].
上级
d877718b
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
15 addition
and
14 deletion
+15
-14
dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
...clude/DB/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
+1
-1
dbms/src/Common/Collator.cpp
dbms/src/Common/Collator.cpp
+1
-1
dbms/src/Interpreters/ExpressionActions.cpp
dbms/src/Interpreters/ExpressionActions.cpp
+2
-2
dbms/src/Interpreters/ExpressionAnalyzer.cpp
dbms/src/Interpreters/ExpressionAnalyzer.cpp
+1
-1
dbms/src/Interpreters/InterpreterAlterQuery.cpp
dbms/src/Interpreters/InterpreterAlterQuery.cpp
+1
-1
dbms/src/Interpreters/InterpreterKillQueryQuery.cpp
dbms/src/Interpreters/InterpreterKillQueryQuery.cpp
+2
-1
dbms/src/Interpreters/InterpreterSelectQuery.cpp
dbms/src/Interpreters/InterpreterSelectQuery.cpp
+2
-2
dbms/src/Interpreters/ProcessList.cpp
dbms/src/Interpreters/ProcessList.cpp
+1
-1
dbms/src/Storages/MergeTree/MergeTreeData.cpp
dbms/src/Storages/MergeTree/MergeTreeData.cpp
+1
-1
dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp
dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp
+2
-2
dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
+1
-1
未找到文件。
dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
浏览文件 @
4e67e058
...
...
@@ -47,7 +47,7 @@ struct ReplicatedMergeTreeLogEntryData
case
ReplicatedMergeTreeLogEntryData
::
DROP_RANGE
:
return
"DROP_RANGE"
;
case
ReplicatedMergeTreeLogEntryData
::
ATTACH_PART
:
return
"ATTACH_PART"
;
default:
throw
Exception
(
"Unknown log entry type: "
+
DB
::
toString
(
type
),
ErrorCodes
::
LOGICAL_ERROR
);
throw
Exception
(
"Unknown log entry type: "
+
DB
::
toString
<
int
>
(
type
),
ErrorCodes
::
LOGICAL_ERROR
);
}
}
...
...
dbms/src/Common/Collator.cpp
浏览文件 @
4e67e058
...
...
@@ -39,7 +39,7 @@ int Collator::compare(const char * str1, size_t length1, const char * str2, size
UCollationResult
compare_result
=
ucol_strcollIter
(
collator
,
&
iter1
,
&
iter2
,
&
status
);
if
(
status
!=
U_ZERO_ERROR
)
throw
DB
::
Exception
(
"ICU collation comparison failed with error code: "
+
DB
::
toString
(
status
),
throw
DB
::
Exception
(
"ICU collation comparison failed with error code: "
+
DB
::
toString
<
int
>
(
status
),
DB
::
ErrorCodes
::
COLLATION_COMPARISON_FAILED
);
/** Values of enum UCollationResult are equals to what exactly we need:
...
...
dbms/src/Interpreters/ExpressionActions.cpp
浏览文件 @
4e67e058
...
...
@@ -534,7 +534,7 @@ void ExpressionActions::checkLimits(Block & block) const
const
Limits
&
limits
=
settings
.
limits
;
if
(
limits
.
max_temporary_columns
&&
block
.
columns
()
>
limits
.
max_temporary_columns
)
throw
Exception
(
"Too many temporary columns: "
+
block
.
dumpNames
()
+
". Maximum: "
+
toString
(
limits
.
max_temporary_columns
),
+
". Maximum: "
+
limits
.
max_temporary_columns
.
toString
(
),
ErrorCodes
::
TOO_MUCH_TEMPORARY_COLUMNS
);
if
(
limits
.
max_temporary_non_const_columns
)
...
...
@@ -552,7 +552,7 @@ void ExpressionActions::checkLimits(Block & block) const
list_of_non_const_columns
<<
"
\n
"
<<
block
.
safeGetByPosition
(
i
).
name
;
throw
Exception
(
"Too many temporary non-const columns:"
+
list_of_non_const_columns
.
str
()
+
". Maximum: "
+
toString
(
limits
.
max_temporary_non_const_columns
),
+
". Maximum: "
+
limits
.
max_temporary_non_const_columns
.
toString
(
),
ErrorCodes
::
TOO_MUCH_TEMPORARY_NON_CONST_COLUMNS
);
}
}
...
...
dbms/src/Interpreters/ExpressionAnalyzer.cpp
浏览文件 @
4e67e058
...
...
@@ -706,7 +706,7 @@ void ExpressionAnalyzer::normalizeTreeImpl(
ASTPtr
&
ast
,
MapOfASTs
&
finished_asts
,
SetOfASTs
&
current_asts
,
std
::
string
current_alias
,
size_t
level
)
{
if
(
level
>
settings
.
limits
.
max_ast_depth
)
throw
Exception
(
"Normalized AST is too deep. Maximum: "
+
toString
(
settings
.
limits
.
max_ast_depth
),
ErrorCodes
::
TOO_DEEP_AST
);
throw
Exception
(
"Normalized AST is too deep. Maximum: "
+
settings
.
limits
.
max_ast_depth
.
toString
(
),
ErrorCodes
::
TOO_DEEP_AST
);
if
(
finished_asts
.
count
(
ast
))
{
...
...
dbms/src/Interpreters/InterpreterAlterQuery.cpp
浏览文件 @
4e67e058
...
...
@@ -74,7 +74,7 @@ BlockIO InterpreterAlterQuery::execute()
break
;
default:
throw
Exception
(
"Bad PartitionCommand::Type: "
+
toString
(
command
.
type
),
ErrorCodes
::
ARGUMENT_OUT_OF_BOUND
);
throw
Exception
(
"Bad PartitionCommand::Type: "
+
toString
<
int
>
(
command
.
type
),
ErrorCodes
::
ARGUMENT_OUT_OF_BOUND
);
}
}
...
...
dbms/src/Interpreters/InterpreterKillQueryQuery.cpp
浏览文件 @
4e67e058
...
...
@@ -10,6 +10,7 @@
#include <DB/DataStreams/OneBlockInputStream.h>
#include <thread>
#include <iostream>
#include <cstddef>
namespace
DB
...
...
@@ -120,7 +121,7 @@ public:
String
getID
()
const
override
{
return
"SynchronousQueryKiller_"
+
toString
(
this
);
return
"SynchronousQueryKiller_"
+
toString
(
intptr_t
(
this
)
);
}
Block
readImpl
()
override
...
...
dbms/src/Interpreters/InterpreterSelectQuery.cpp
浏览文件 @
4e67e058
...
...
@@ -73,7 +73,7 @@ void InterpreterSelectQuery::init(BlockInputStreamPtr input, const Names & requi
original_max_threads
=
settings
.
max_threads
;
if
(
settings
.
limits
.
max_subquery_depth
&&
subquery_depth
>
settings
.
limits
.
max_subquery_depth
)
throw
Exception
(
"Too deep subqueries. Maximum: "
+
toString
(
settings
.
limits
.
max_subquery_depth
),
throw
Exception
(
"Too deep subqueries. Maximum: "
+
settings
.
limits
.
max_subquery_depth
.
toString
(
),
ErrorCodes
::
TOO_DEEP_SUBQUERIES
);
if
(
is_first_select_inside_union_all
)
...
...
@@ -787,7 +787,7 @@ QueryProcessingStage::Enum InterpreterSelectQuery::executeFetchColumns()
if
(
settings
.
limits
.
max_columns_to_read
&&
required_columns
.
size
()
>
settings
.
limits
.
max_columns_to_read
)
throw
Exception
(
"Limit for number of columns to read exceeded. "
"Requested: "
+
toString
(
required_columns
.
size
())
+
", maximum: "
+
toString
(
settings
.
limits
.
max_columns_to_read
),
+
", maximum: "
+
settings
.
limits
.
max_columns_to_read
.
toString
(
),
ErrorCodes
::
TOO_MUCH_COLUMNS
);
size_t
limit_length
=
0
;
...
...
dbms/src/Interpreters/ProcessList.cpp
浏览文件 @
4e67e058
...
...
@@ -48,7 +48,7 @@ ProcessList::EntryPtr ProcessList::insert(
&&
user_process_list
->
second
.
queries
.
size
()
>=
settings
.
max_concurrent_queries_for_user
)
throw
Exception
(
"Too much simultaneous queries for user "
+
client_info
.
current_user
+
". Current: "
+
toString
(
user_process_list
->
second
.
queries
.
size
())
+
", maximum: "
+
toString
(
settings
.
max_concurrent_queries_for_user
),
+
", maximum: "
+
settings
.
max_concurrent_queries_for_user
.
toString
(
),
ErrorCodes
::
TOO_MUCH_SIMULTANEOUS_QUERIES
);
if
(
!
client_info
.
current_query_id
.
empty
())
...
...
dbms/src/Storages/MergeTree/MergeTreeData.cpp
浏览文件 @
4e67e058
...
...
@@ -264,7 +264,7 @@ String MergeTreeData::MergingParams::getModeName() const
case
Graphite
:
return
"Graphite"
;
default:
throw
Exception
(
"Unknown mode of operation for MergeTreeData: "
+
toString
(
mode
),
ErrorCodes
::
LOGICAL_ERROR
);
throw
Exception
(
"Unknown mode of operation for MergeTreeData: "
+
toString
<
int
>
(
mode
),
ErrorCodes
::
LOGICAL_ERROR
);
}
}
...
...
dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp
浏览文件 @
4e67e058
...
...
@@ -594,7 +594,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMerger::mergePartsToTemporaryPart
break
;
default:
throw
Exception
(
"Unknown mode of operation for MergeTreeData: "
+
toString
(
data
.
merging_params
.
mode
),
ErrorCodes
::
LOGICAL_ERROR
);
throw
Exception
(
"Unknown mode of operation for MergeTreeData: "
+
toString
<
int
>
(
data
.
merging_params
.
mode
),
ErrorCodes
::
LOGICAL_ERROR
);
}
String
new_part_tmp_path
=
data
.
getFullPath
()
+
"tmp_"
+
merged_name
+
"/"
;
...
...
@@ -993,7 +993,7 @@ MergeTreeData::PerShardDataParts MergeTreeDataMerger::reshardPartition(
break
;
default:
throw
Exception
(
"Unknown mode of operation for MergeTreeData: "
+
toString
(
data
.
merging_params
.
mode
),
ErrorCodes
::
LOGICAL_ERROR
);
throw
Exception
(
"Unknown mode of operation for MergeTreeData: "
+
toString
<
int
>
(
data
.
merging_params
.
mode
),
ErrorCodes
::
LOGICAL_ERROR
);
}
merged_stream
->
readPrefix
();
...
...
dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
浏览文件 @
4e67e058
...
...
@@ -47,7 +47,7 @@ void ReplicatedMergeTreeLogEntryData::writeText(WriteBuffer & out) const
break
;
default:
throw
Exception
(
"Unknown log entry type: "
+
DB
::
toString
(
type
),
ErrorCodes
::
LOGICAL_ERROR
);
throw
Exception
(
"Unknown log entry type: "
+
DB
::
toString
<
int
>
(
type
),
ErrorCodes
::
LOGICAL_ERROR
);
}
out
<<
'\n'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录