Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
a29ee137
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,体验更适合开发者的 AI 搜索 >>
提交
a29ee137
编写于
10月 04, 2016
作者:
V
Vitaliy Lyudvichenko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed compilation error after inaccurate renaming of force_quoting parametr. [#METR-22950]
上级
6f3e69c1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
11 deletion
+11
-11
dbms/src/DataStreams/JSONEachRowRowOutputStream.cpp
dbms/src/DataStreams/JSONEachRowRowOutputStream.cpp
+3
-3
dbms/src/DataStreams/JSONRowOutputStream.cpp
dbms/src/DataStreams/JSONRowOutputStream.cpp
+8
-8
未找到文件。
dbms/src/DataStreams/JSONEachRowRowOutputStream.cpp
浏览文件 @
a29ee137
...
...
@@ -7,8 +7,8 @@ namespace DB
{
JSONEachRowRowOutputStream
::
JSONEachRowRowOutputStream
(
WriteBuffer
&
ostr_
,
const
Block
&
sample
,
bool
force_quoting_
)
:
ostr
(
ostr_
),
force_quoting
(
force_quoting
_
)
JSONEachRowRowOutputStream
::
JSONEachRowRowOutputStream
(
WriteBuffer
&
ostr_
,
const
Block
&
sample
,
bool
force_quoting_
64bit_integers_
)
:
ostr
(
ostr_
),
force_quoting
_64bit_integers
(
force_quoting_64bit_integers
_
)
{
size_t
columns
=
sample
.
columns
();
fields
.
resize
(
columns
);
...
...
@@ -25,7 +25,7 @@ void JSONEachRowRowOutputStream::writeField(const IColumn & column, const IDataT
{
writeString
(
fields
[
field_number
],
ostr
);
writeChar
(
':'
,
ostr
);
type
.
serializeTextJSON
(
column
,
row_num
,
ostr
,
force_quoting
);
type
.
serializeTextJSON
(
column
,
row_num
,
ostr
,
force_quoting
_64bit_integers
);
++
field_number
;
}
...
...
dbms/src/DataStreams/JSONRowOutputStream.cpp
浏览文件 @
a29ee137
...
...
@@ -7,8 +7,8 @@ namespace DB
{
JSONRowOutputStream
::
JSONRowOutputStream
(
WriteBuffer
&
ostr_
,
const
Block
&
sample_
,
bool
write_statistics_
,
bool
force_quoting_
)
:
dst_ostr
(
ostr_
),
write_statistics
(
write_statistics_
),
force_quoting
(
force_quoting
_
)
JSONRowOutputStream
::
JSONRowOutputStream
(
WriteBuffer
&
ostr_
,
const
Block
&
sample_
,
bool
write_statistics_
,
bool
force_quoting_
64bit_integers_
)
:
dst_ostr
(
ostr_
),
write_statistics
(
write_statistics_
),
force_quoting
_64bit_integers
(
force_quoting_64bit_integers
_
)
{
NamesAndTypesList
columns
(
sample_
.
getColumnsList
());
fields
.
assign
(
columns
.
begin
(),
columns
.
end
());
...
...
@@ -72,7 +72,7 @@ void JSONRowOutputStream::writeField(const IColumn & column, const IDataType & t
writeCString
(
"
\t\t\t
"
,
*
ostr
);
writeString
(
fields
[
field_number
].
name
,
*
ostr
);
writeCString
(
": "
,
*
ostr
);
type
.
serializeTextJSON
(
column
,
row_num
,
*
ostr
,
force_quoting
);
type
.
serializeTextJSON
(
column
,
row_num
,
*
ostr
,
force_quoting
_64bit_integers
);
++
field_number
;
}
...
...
@@ -152,7 +152,7 @@ void JSONRowOutputStream::writeTotals()
writeCString
(
"
\t\t
"
,
*
ostr
);
writeJSONString
(
column
.
name
,
*
ostr
);
writeCString
(
": "
,
*
ostr
);
column
.
type
->
serializeTextJSON
(
*
column
.
column
.
get
(),
0
,
*
ostr
,
force_quoting
);
column
.
type
->
serializeTextJSON
(
*
column
.
column
.
get
(),
0
,
*
ostr
,
force_quoting
_64bit_integers
);
}
writeChar
(
'\n'
,
*
ostr
);
...
...
@@ -161,7 +161,7 @@ void JSONRowOutputStream::writeTotals()
}
static
void
writeExtremesElement
(
const
char
*
title
,
const
Block
&
extremes
,
size_t
row_num
,
WriteBuffer
&
ostr
,
bool
force_quoting
)
static
void
writeExtremesElement
(
const
char
*
title
,
const
Block
&
extremes
,
size_t
row_num
,
WriteBuffer
&
ostr
,
bool
force_quoting
_64bit_integers
)
{
writeCString
(
"
\t\t\"
"
,
ostr
);
writeCString
(
title
,
ostr
);
...
...
@@ -179,7 +179,7 @@ static void writeExtremesElement(const char * title, const Block & extremes, siz
writeCString
(
"
\t\t\t
"
,
ostr
);
writeJSONString
(
column
.
name
,
ostr
);
writeCString
(
": "
,
ostr
);
column
.
type
->
serializeTextJSON
(
*
column
.
column
.
get
(),
row_num
,
ostr
,
force_quoting
);
column
.
type
->
serializeTextJSON
(
*
column
.
column
.
get
(),
row_num
,
ostr
,
force_quoting
_64bit_integers
);
}
writeChar
(
'\n'
,
ostr
);
...
...
@@ -195,9 +195,9 @@ void JSONRowOutputStream::writeExtremes()
writeCString
(
"
\t\"
extremes
\"
:
\n
"
,
*
ostr
);
writeCString
(
"
\t
{
\n
"
,
*
ostr
);
writeExtremesElement
(
"min"
,
extremes
,
0
,
*
ostr
,
force_quoting
);
writeExtremesElement
(
"min"
,
extremes
,
0
,
*
ostr
,
force_quoting
_64bit_integers
);
writeCString
(
",
\n
"
,
*
ostr
);
writeExtremesElement
(
"max"
,
extremes
,
1
,
*
ostr
,
force_quoting
);
writeExtremesElement
(
"max"
,
extremes
,
1
,
*
ostr
,
force_quoting
_64bit_integers
);
writeChar
(
'\n'
,
*
ostr
);
writeCString
(
"
\t
}"
,
*
ostr
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录