Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
55842dce
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,发现更多精彩内容 >>
提交
55842dce
编写于
5月 06, 2019
作者:
G
Guillaume Tassery
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
code style
上级
e0bd16c1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
12 deletion
+12
-12
dbms/src/IO/Progress.cpp
dbms/src/IO/Progress.cpp
+6
-6
dbms/src/IO/Progress.h
dbms/src/IO/Progress.h
+3
-3
dbms/src/IO/WriteBufferFromHTTPServerResponse.cpp
dbms/src/IO/WriteBufferFromHTTPServerResponse.cpp
+2
-2
dbms/src/Interpreters/executeQuery.cpp
dbms/src/Interpreters/executeQuery.cpp
+1
-1
未找到文件。
dbms/src/IO/Progress.cpp
浏览文件 @
55842dce
...
...
@@ -15,19 +15,19 @@ void AllProgressValueImpl::read(ProgressValues & value, ReadBuffer & in, UInt64
size_t
new_total_rows
=
0
;
size_t
new_write_rows
=
0
;
size_t
new_write_bytes
=
0
;
readVarUInt
(
new_rows
,
in
);
readVarUInt
(
new_bytes
,
in
);
readVarUInt
(
new_total_rows
,
in
);
readVarUInt
(
new_write_rows
,
in
);
readVarUInt
(
new_write_bytes
,
in
);
value
.
rows
=
new_rows
;
value
.
bytes
=
new_bytes
;
value
.
total_rows
=
new_total_rows
;
value
.
write_rows
=
new_write_rows
;
value
.
write_bytes
=
new_write_bytes
;
}
}
void
AllProgressValueImpl
::
write
(
const
ProgressValues
&
value
,
WriteBuffer
&
out
,
UInt64
/*client_revision*/
)
...
...
@@ -62,15 +62,15 @@ void ReadProgressValueImpl::read(ProgressValues & value, ReadBuffer & in, UInt64
size_t
new_rows
=
0
;
size_t
new_bytes
=
0
;
size_t
new_total_rows
=
0
;
readVarUInt
(
new_rows
,
in
);
readVarUInt
(
new_bytes
,
in
);
readVarUInt
(
new_total_rows
,
in
);
value
.
rows
=
new_rows
;
value
.
bytes
=
new_bytes
;
value
.
total_rows
=
new_total_rows
;
}
}
void
ReadProgressValueImpl
::
write
(
const
ProgressValues
&
value
,
WriteBuffer
&
out
,
UInt64
/*client_revision*/
)
...
...
dbms/src/IO/Progress.h
浏览文件 @
55842dce
...
...
@@ -21,7 +21,7 @@ struct ProgressValues
size_t
bytes
;
size_t
total_rows
;
size_t
write_rows
;
size_t
write_bytes
;
size_t
write_bytes
;
template
<
typename
ReadImpl
=
AllProgressValueImpl
>
...
...
@@ -152,7 +152,7 @@ struct Progress
res
.
total_rows
=
total_rows
.
fetch_and
(
0
);
res
.
write_rows
=
write_rows
.
fetch_and
(
0
);
res
.
write_bytes
=
write_bytes
.
fetch_and
(
0
);
return
res
;
}
...
...
@@ -163,7 +163,7 @@ struct Progress
total_rows
=
other
.
total_rows
.
load
(
std
::
memory_order_relaxed
);
write_rows
=
other
.
write_rows
.
load
(
std
::
memory_order_relaxed
);
write_bytes
=
other
.
write_bytes
.
load
(
std
::
memory_order_relaxed
);
return
*
this
;
}
...
...
dbms/src/IO/WriteBufferFromHTTPServerResponse.cpp
浏览文件 @
55842dce
...
...
@@ -40,7 +40,7 @@ void WriteBufferFromHTTPServerResponse::writeHeaderSummary()
{
if
(
headers_finished_sending
)
return
;
WriteBufferFromOwnString
progress_string_writer
;
accumulated_progress
.
writeJSON
(
progress_string_writer
);
...
...
@@ -53,7 +53,7 @@ void WriteBufferFromHTTPServerResponse::writeHeaderProgress()
{
if
(
headers_finished_sending
)
return
;
WriteBufferFromOwnString
progress_string_writer
;
accumulated_progress
.
writeJSON
<
ReadProgressValueImpl
>
(
progress_string_writer
);
...
...
dbms/src/Interpreters/executeQuery.cpp
浏览文件 @
55842dce
...
...
@@ -317,7 +317,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
elem
.
written_bytes
=
info
.
written_bytes
;
auto
progress_callback
=
context
.
getProgressCallback
();
if
(
progress_callback
)
progress_callback
(
Progress
(
WriteProgress
(
info
.
written_rows
,
info
.
written_bytes
)));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录