Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
49f8080e
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,发现更多精彩内容 >>
提交
49f8080e
编写于
10月 13, 2017
作者:
P
proller
提交者:
alexey-milovidov
10月 13, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Small debud improvement
上级
f30841d5
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
55 addition
and
10 deletion
+55
-10
dbms/src/Common/iostream_debug_helpers.cpp
dbms/src/Common/iostream_debug_helpers.cpp
+37
-2
dbms/src/Common/iostream_debug_helpers.h
dbms/src/Common/iostream_debug_helpers.h
+11
-0
dbms/src/Interpreters/DDLWorker.cpp
dbms/src/Interpreters/DDLWorker.cpp
+1
-1
dbms/src/Interpreters/ExpressionAnalyzer.cpp
dbms/src/Interpreters/ExpressionAnalyzer.cpp
+1
-1
dbms/src/Interpreters/ExpressionAnalyzer.h
dbms/src/Interpreters/ExpressionAnalyzer.h
+2
-2
dbms/src/Interpreters/Set.cpp
dbms/src/Interpreters/Set.cpp
+0
-1
dbms/src/Storages/MergeTree/MergeTreeData.cpp
dbms/src/Storages/MergeTree/MergeTreeData.cpp
+1
-1
libs/libcommon/include/common/iostream_debug_helpers.h
libs/libcommon/include/common/iostream_debug_helpers.h
+2
-2
未找到文件。
dbms/src/Common/iostream_debug_helpers.cpp
浏览文件 @
49f8080e
...
...
@@ -9,6 +9,8 @@
#include <DataTypes/IDataType.h>
#include <Functions/IFunction.h>
#include <Storages/IStorage.h>
#include <Interpreters/ExpressionAnalyzer.h>
#include <Parsers/IAST.h>
std
::
ostream
&
operator
<<
(
std
::
ostream
&
stream
,
const
DB
::
IBlockInputStream
&
what
)
{
...
...
@@ -80,14 +82,47 @@ std::ostream & operator<<(std::ostream & stream, const DB::IColumn & what)
return
stream
;
}
std
::
ostream
&
operator
<<
(
std
::
ostream
&
stream
,
const
DB
::
Connection
::
Packet
&
what
)
{
std
::
ostream
&
operator
<<
(
std
::
ostream
&
stream
,
const
DB
::
Connection
::
Packet
&
what
)
{
stream
<<
"Connection::Packet("
<<
"type = "
<<
what
.
type
;
// types description: Core/Protocol.h
if
(
what
.
exception
)
stream
<<
"exception = "
<<
what
.
exception
.
get
();
//TODO: profile_info
//
TODO: profile_info
stream
<<
") {"
<<
what
.
block
<<
"}"
;
return
stream
;
}
std
::
ostream
&
operator
<<
(
std
::
ostream
&
stream
,
const
DB
::
SubqueryForSet
&
what
)
{
stream
<<
"SubqueryForSet(source = "
<<
what
.
source
<<
", source_sample = "
<<
what
.
source_sample
// TODO: << ", set = " << what.set << ", join = " << what.join
<<
", table = "
<<
what
.
table
<<
")"
;
return
stream
;
}
std
::
ostream
&
operator
<<
(
std
::
ostream
&
stream
,
const
DB
::
IAST
&
what
)
{
stream
<<
"IAST("
<<
"query_string = "
<<
what
.
query_string
<<
"){"
;
what
.
dumpTree
(
stream
);
stream
<<
"}"
;
return
stream
;
}
std
::
ostream
&
operator
<<
(
std
::
ostream
&
stream
,
const
DB
::
ExpressionAnalyzer
&
what
)
{
stream
<<
"ExpressionAnalyzer{"
<<
"hasAggregation="
<<
what
.
hasAggregation
()
<<
", RequiredColumns="
<<
what
.
getRequiredColumns
()
<<
", SubqueriesForSet="
<<
what
.
getSubqueriesForSets
()
<<
", ExternalTables="
<<
what
.
getExternalTables
()
// TODO
<<
"}"
;
return
stream
;
}
dbms/src/Common/iostream_debug_helpers.h
浏览文件 @
49f8080e
...
...
@@ -32,6 +32,17 @@ std::ostream & operator<<(std::ostream & stream, const DB::ColumnWithTypeAndName
namespace
DB
{
class
IColumn
;
}
std
::
ostream
&
operator
<<
(
std
::
ostream
&
stream
,
const
DB
::
IColumn
&
what
);
namespace
DB
{
struct
SubqueryForSet
;
}
std
::
ostream
&
operator
<<
(
std
::
ostream
&
stream
,
const
DB
::
SubqueryForSet
&
what
);
namespace
DB
{
class
IAST
;
}
std
::
ostream
&
operator
<<
(
std
::
ostream
&
stream
,
const
DB
::
IAST
&
what
);
namespace
DB
{
class
ExpressionAnalyzer
;
}
std
::
ostream
&
operator
<<
(
std
::
ostream
&
stream
,
const
DB
::
ExpressionAnalyzer
&
what
);
#include <Client/Connection.h>
std
::
ostream
&
operator
<<
(
std
::
ostream
&
stream
,
const
DB
::
Connection
::
Packet
&
what
);
...
...
dbms/src/Interpreters/DDLWorker.cpp
浏览文件 @
49f8080e
...
...
@@ -12,7 +12,7 @@
#include <IO/ReadBufferFromString.h>
#include <Storages/IStorage.h>
#include <DataStreams/
One
BlockInputStream.h>
#include <DataStreams/
IProfiling
BlockInputStream.h>
#include <Interpreters/executeQuery.h>
#include <Interpreters/Cluster.h>
...
...
dbms/src/Interpreters/ExpressionAnalyzer.cpp
浏览文件 @
49f8080e
...
...
@@ -2845,7 +2845,7 @@ void ExpressionAnalyzer::collectJoinedColumns(NameSet & joined_columns, NamesAnd
}
Names
ExpressionAnalyzer
::
getRequiredColumns
()
Names
ExpressionAnalyzer
::
getRequiredColumns
()
const
{
if
(
!
unknown_required_columns
.
empty
())
throw
Exception
(
"Unknown identifier: "
+
*
unknown_required_columns
.
begin
(),
ErrorCodes
::
UNKNOWN_IDENTIFIER
);
...
...
dbms/src/Interpreters/ExpressionAnalyzer.h
浏览文件 @
49f8080e
...
...
@@ -83,7 +83,7 @@ public:
/** Get a set of columns that are enough to read from the table to evaluate the expression.
* Columns added from another table by JOIN are not counted.
*/
Names
getRequiredColumns
();
Names
getRequiredColumns
()
const
;
/** These methods allow you to build a chain of transformations over a block, that receives values in the desired sections of the query.
*
...
...
@@ -127,7 +127,7 @@ public:
* That is, you need to call getSetsWithSubqueries after all calls of `append*` or `getActions`
* and create all the returned sets before performing the actions.
*/
SubqueriesForSets
getSubqueriesForSets
()
{
return
subqueries_for_sets
;
}
SubqueriesForSets
getSubqueriesForSets
()
const
{
return
subqueries_for_sets
;
}
PreparedSets
getPreparedSets
()
{
return
prepared_sets
;
}
...
...
dbms/src/Interpreters/Set.cpp
浏览文件 @
49f8080e
...
...
@@ -8,7 +8,6 @@
#include <Common/typeid_cast.h>
#include <DataStreams/IProfilingBlockInputStream.h>
#include <DataStreams/OneBlockInputStream.h>
#include <DataTypes/DataTypeArray.h>
#include <DataTypes/DataTypeTraits.h>
...
...
dbms/src/Storages/MergeTree/MergeTreeData.cpp
浏览文件 @
49f8080e
...
...
@@ -1554,7 +1554,7 @@ void MergeTreeData::delayInsertIfNeeded(Poco::Event * until)
if
(
parts_count
>=
settings
.
parts_to_throw_insert
)
{
ProfileEvents
::
increment
(
ProfileEvents
::
RejectedInserts
);
throw
Exception
(
"Too much parts. Merges are processing significantly slower than inserts."
,
ErrorCodes
::
TOO_MUCH_PARTS
);
throw
Exception
(
"Too much parts
("
+
toString
(
parts_count
)
+
")
. Merges are processing significantly slower than inserts."
,
ErrorCodes
::
TOO_MUCH_PARTS
);
}
const
size_t
max_k
=
settings
.
parts_to_throw_insert
-
settings
.
parts_to_delay_insert
;
/// always > 0
...
...
libs/libcommon/include/common/iostream_debug_helpers.h
浏览文件 @
49f8080e
...
...
@@ -144,7 +144,7 @@ std::ostream & operator<<(std::ostream & stream, const std::chrono::time_point<c
template
<
typename
T
>
std
::
ostream
&
operator
<<
(
std
::
ostream
&
stream
,
const
std
::
shared_ptr
<
T
>
&
what
)
{
stream
<<
"shared_ptr(use_count = "
<<
what
.
use_count
()
<<
") {"
;
stream
<<
"shared_ptr(
"
<<
what
.
get
()
<<
",
use_count = "
<<
what
.
use_count
()
<<
") {"
;
if
(
what
)
stream
<<
*
what
;
else
...
...
@@ -156,7 +156,7 @@ std::ostream & operator<<(std::ostream & stream, const std::shared_ptr<T> & what
template
<
typename
T
>
std
::
ostream
&
operator
<<
(
std
::
ostream
&
stream
,
const
std
::
unique_ptr
<
T
>
&
what
)
{
stream
<<
"unique_ptr {"
;
stream
<<
"unique_ptr
("
<<
what
.
get
()
<<
")
{"
;
if
(
what
)
stream
<<
*
what
;
else
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录