Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
fc7ae399
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,发现更多精彩内容 >>
提交
fc7ae399
编写于
6月 14, 2019
作者:
P
proller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use system rapidjson; Fix types for macos;
上级
9b727d26
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
27 addition
and
8 deletion
+27
-8
cmake/find_rapidjson.cmake
cmake/find_rapidjson.cmake
+24
-5
dbms/src/Functions/FunctionsGeo.cpp
dbms/src/Functions/FunctionsGeo.cpp
+1
-1
dbms/src/Storages/Kafka/KafkaBlockInputStream.cpp
dbms/src/Storages/Kafka/KafkaBlockInputStream.cpp
+1
-1
utils/build/build_debian_unbundled.sh
utils/build/build_debian_unbundled.sh
+1
-1
未找到文件。
cmake/find_rapidjson.cmake
浏览文件 @
fc7ae399
if
(
NOT EXISTS
"
${
ClickHouse_SOURCE_DIR
}
/contrib/rapidjson/include/rapidjson/rapidjson.h"
)
option
(
ENABLE_RAPIDJSON
"Use rapidjson"
ON
)
message
(
WARNING
"submodule contrib/rapidjson is missing. to fix try run:
\n
git submodule update --init --recursive"
)
if
(
NOT ENABLE_RAPIDJSON
)
return
()
return
()
endif
()
endif
()
option
(
USE_RAPIDJSON
"Use rapidjson"
ON
)
option
(
USE_INTERNAL_RAPIDJSON_LIBRARY
"Set to FALSE to use system rapidjson library instead of bundled"
${
NOT_UNBUNDLED
}
)
set
(
RAPIDJSON_INCLUDE_DIR
"
${
ClickHouse_SOURCE_DIR
}
/contrib/rapidjson/include"
)
if
(
NOT EXISTS
"
${
ClickHouse_SOURCE_DIR
}
/contrib/rapidjson/include/rapidjson/rapidjson.h"
)
if
(
USE_INTERNAL_RAPIDJSON_LIBRARY
)
message
(
WARNING
"submodule contrib/rapidjson is missing. to fix try run:
\n
git submodule update --init --recursive"
)
set
(
USE_INTERNAL_RAPIDJSON_LIBRARY 0
)
endif
()
set
(
MISSING_INTERNAL_RAPIDJSON_LIBRARY 1
)
endif
()
if
(
NOT USE_INTERNAL_RAPIDJSON_LIBRARY
)
find_path
(
RAPIDJSON_INCLUDE_DIR NAMES rapidjson/rapidjson.h PATHS
${
RAPIDJSON_INCLUDE_PATHS
}
)
endif
()
if
(
RAPIDJSON_INCLUDE_DIR
)
set
(
USE_RAPIDJSON 1
)
elseif
(
NOT MISSING_INTERNAL_RAPIDJSON_LIBRARY
)
set
(
RAPIDJSON_INCLUDE_DIR
"
${
ClickHouse_SOURCE_DIR
}
/contrib/rapidjson/include"
)
set
(
USE_INTERNAL_RAPIDJSON_LIBRARY 1
)
set
(
USE_RAPIDJSON 1
)
endif
()
message
(
STATUS
"Using rapidjson=
${
USE_RAPIDJSON
}
:
${
RAPIDJSON_INCLUDE_DIR
}
"
)
message
(
STATUS
"Using rapidjson=
${
USE_RAPIDJSON
}
:
${
RAPIDJSON_INCLUDE_DIR
}
"
)
dbms/src/Functions/FunctionsGeo.cpp
浏览文件 @
fc7ae399
...
@@ -335,7 +335,7 @@ public:
...
@@ -335,7 +335,7 @@ public:
const
IColumn
*
longitude
=
block
.
getByPosition
(
arguments
[
0
]).
column
.
get
();
const
IColumn
*
longitude
=
block
.
getByPosition
(
arguments
[
0
]).
column
.
get
();
const
IColumn
*
latitude
=
block
.
getByPosition
(
arguments
[
1
]).
column
.
get
();
const
IColumn
*
latitude
=
block
.
getByPosition
(
arguments
[
1
]).
column
.
get
();
const
UInt64
precision_value
=
std
::
min
(
GEOHASH_MAX_TEXT_LENGTH
,
const
UInt64
precision_value
=
std
::
min
<
UInt64
>
(
GEOHASH_MAX_TEXT_LENGTH
,
arguments
.
size
()
==
3
?
block
.
getByPosition
(
arguments
[
2
]).
column
->
get64
(
0
)
:
GEOHASH_MAX_TEXT_LENGTH
);
arguments
.
size
()
==
3
?
block
.
getByPosition
(
arguments
[
2
]).
column
->
get64
(
0
)
:
GEOHASH_MAX_TEXT_LENGTH
);
ColumnPtr
&
res_column
=
block
.
getByPosition
(
result
).
column
;
ColumnPtr
&
res_column
=
block
.
getByPosition
(
result
).
column
;
...
...
dbms/src/Storages/Kafka/KafkaBlockInputStream.cpp
浏览文件 @
fc7ae399
...
@@ -41,7 +41,7 @@ void KafkaBlockInputStream::readPrefixImpl()
...
@@ -41,7 +41,7 @@ void KafkaBlockInputStream::readPrefixImpl()
const
auto
&
limits
=
getLimits
();
const
auto
&
limits
=
getLimits
();
const
size_t
poll_timeout
=
buffer
->
subBufferAs
<
ReadBufferFromKafkaConsumer
>
()
->
pollTimeout
();
const
size_t
poll_timeout
=
buffer
->
subBufferAs
<
ReadBufferFromKafkaConsumer
>
()
->
pollTimeout
();
size_t
rows_portion_size
=
poll_timeout
?
std
::
min
(
max_block_size
,
limits
.
max_execution_time
.
totalMilliseconds
()
/
poll_timeout
)
:
max_block_size
;
size_t
rows_portion_size
=
poll_timeout
?
std
::
min
<
size_t
>
(
max_block_size
,
limits
.
max_execution_time
.
totalMilliseconds
()
/
poll_timeout
)
:
max_block_size
;
rows_portion_size
=
std
::
max
(
rows_portion_size
,
1ul
);
rows_portion_size
=
std
::
max
(
rows_portion_size
,
1ul
);
auto
child
=
FormatFactory
::
instance
().
getInput
(
storage
.
format_name
,
*
buffer
,
storage
.
getSampleBlock
(),
context
,
max_block_size
,
rows_portion_size
);
auto
child
=
FormatFactory
::
instance
().
getInput
(
storage
.
format_name
,
*
buffer
,
storage
.
getSampleBlock
(),
context
,
max_block_size
,
rows_portion_size
);
...
...
utils/build/build_debian_unbundled.sh
浏览文件 @
fc7ae399
...
@@ -22,5 +22,5 @@ env TEST_RUN=1 \
...
@@ -22,5 +22,5 @@ env TEST_RUN=1 \
`
# Use all possible contrib libs from system` \
`
# Use all possible contrib libs from system` \
`
# psmisc - killall` \
`
# psmisc - killall` \
`
# gdb - symbol test in pbuilder` \
`
# gdb - symbol test in pbuilder` \
EXTRAPACKAGES
=
"psmisc libboost-program-options-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-regex-dev zlib1g-dev liblz4-dev libdouble-conversion-dev libsparsehash-dev librdkafka-dev libpoco-dev unixodbc-dev libsparsehash-dev libgoogle-perftools-dev libzstd-dev libre2-dev libunwind-dev googletest libcctz-dev libcapnp-dev libjemalloc-dev libssl-dev libunwind-dev libgsasl7-dev libxml2-dev libbrotli-dev libhyperscan-dev
$EXTRAPACKAGES
"
\
EXTRAPACKAGES
=
"psmisc libboost-program-options-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-regex-dev zlib1g-dev liblz4-dev libdouble-conversion-dev libsparsehash-dev librdkafka-dev libpoco-dev unixodbc-dev libsparsehash-dev libgoogle-perftools-dev libzstd-dev libre2-dev libunwind-dev googletest libcctz-dev libcapnp-dev libjemalloc-dev libssl-dev libunwind-dev libgsasl7-dev libxml2-dev libbrotli-dev libhyperscan-dev
rapidjson-dev
$EXTRAPACKAGES
"
\
pdebuild
--configfile
$ROOT_DIR
/debian/.pbuilderrc
$PDEBUILD_OPT
pdebuild
--configfile
$ROOT_DIR
/debian/.pbuilderrc
$PDEBUILD_OPT
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录