Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
af4c4dc1
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,发现更多精彩内容 >>
提交
af4c4dc1
编写于
2月 13, 2019
作者:
A
alesapin
提交者:
Alex Zatelepin
2月 13, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix old clients insert query processing with embedded data
上级
a0b91077
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
4 deletion
+8
-4
dbms/programs/server/TCPHandler.cpp
dbms/programs/server/TCPHandler.cpp
+2
-1
dbms/src/Core/Defines.h
dbms/src/Core/Defines.h
+1
-0
dbms/src/Interpreters/executeQuery.cpp
dbms/src/Interpreters/executeQuery.cpp
+3
-2
dbms/src/Interpreters/executeQuery.h
dbms/src/Interpreters/executeQuery.h
+2
-1
未找到文件。
dbms/programs/server/TCPHandler.cpp
浏览文件 @
af4c4dc1
...
...
@@ -185,8 +185,9 @@ void TCPHandler::runImpl()
state
.
maybe_compressed_in
.
reset
();
/// For more accurate accounting by MemoryTracker.
});
bool
may_have_embedded_data
=
client_revision
>=
DBMS_MIN_REVISION_WITH_CLIENT_SUPPORT_EMBEDDED_DATA
;
/// Processing Query
state
.
io
=
executeQuery
(
state
.
query
,
query_context
,
false
,
state
.
stage
);
state
.
io
=
executeQuery
(
state
.
query
,
query_context
,
false
,
state
.
stage
,
may_have_embedded_data
);
if
(
state
.
io
.
out
)
state
.
need_receive_data_for_insert
=
true
;
...
...
dbms/src/Core/Defines.h
浏览文件 @
af4c4dc1
...
...
@@ -47,6 +47,7 @@
#define DBMS_MIN_REVISION_WITH_SERVER_DISPLAY_NAME 54372
#define DBMS_MIN_REVISION_WITH_VERSION_PATCH 54401
#define DBMS_MIN_REVISION_WITH_SERVER_LOGS 54406
#define DBMS_MIN_REVISION_WITH_CLIENT_SUPPORT_EMBEDDED_DATA 54415
/// Minimum revision with exactly the same set of aggregation methods and rules to select them.
/// Two-level (bucketed) aggregation is incompatible if servers are inconsistent in these rules
/// (keys will be placed in different buckets and result will not be fully aggregated).
...
...
dbms/src/Interpreters/executeQuery.cpp
浏览文件 @
af4c4dc1
...
...
@@ -435,10 +435,11 @@ BlockIO executeQuery(
const
String
&
query
,
Context
&
context
,
bool
internal
,
QueryProcessingStage
::
Enum
stage
)
QueryProcessingStage
::
Enum
stage
,
bool
may_have_embedded_data
)
{
BlockIO
streams
;
std
::
tie
(
std
::
ignore
,
streams
)
=
executeQueryImpl
(
query
.
data
(),
query
.
data
()
+
query
.
size
(),
context
,
internal
,
stage
,
false
);
std
::
tie
(
std
::
ignore
,
streams
)
=
executeQueryImpl
(
query
.
data
(),
query
.
data
()
+
query
.
size
(),
context
,
internal
,
stage
,
!
may_have_embedded_data
);
return
streams
;
}
...
...
dbms/src/Interpreters/executeQuery.h
浏览文件 @
af4c4dc1
...
...
@@ -37,7 +37,8 @@ BlockIO executeQuery(
const
String
&
query
,
/// Query text without INSERT data. The latter must be written to BlockIO::out.
Context
&
context
,
/// DB, tables, data types, storage engines, functions, aggregate functions...
bool
internal
=
false
,
/// If true, this query is caused by another query and thus needn't be registered in the ProcessList.
QueryProcessingStage
::
Enum
stage
=
QueryProcessingStage
::
Complete
/// To which stage the query must be executed.
QueryProcessingStage
::
Enum
stage
=
QueryProcessingStage
::
Complete
,
/// To which stage the query must be executed.
bool
may_have_embedded_data
=
false
/// If insert query may have embedded data
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录