Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
a70637ab
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,发现更多精彩内容 >>
提交
a70637ab
编写于
4月 26, 2020
作者:
A
Alexey Milovidov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed UBSan; added a test
上级
d1464a44
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
30 addition
and
15 deletion
+30
-15
src/Core/DecimalFunctions.h
src/Core/DecimalFunctions.h
+27
-15
tests/queries/0_stateless/01259_datetime64_ubsan.reference
tests/queries/0_stateless/01259_datetime64_ubsan.reference
+1
-0
tests/queries/0_stateless/01259_datetime64_ubsan.sql
tests/queries/0_stateless/01259_datetime64_ubsan.sql
+2
-0
未找到文件。
src/Core/DecimalFunctions.h
浏览文件 @
a70637ab
...
...
@@ -2,15 +2,20 @@
// Moved Decimal-related functions out from Core/Types.h to reduce compilation time.
#include <Core/Types.h>
#include <Common/intExp.h>
#include <Common/Exception.h>
#include <common/arithmeticOverflow.h>
#include <limits>
class
DateLUTImpl
;
namespace
DB
{
namespace
ErrorCodes
{
extern
const
int
DECIMAL_OVERFLOW
;
}
namespace
DecimalUtils
{
...
...
@@ -37,22 +42,26 @@ struct DecimalComponents
};
/** Make a decimal value from whole and fractional components with given scale multiplier.
* where scale_multiplier = scaleMultiplier<T>(scale)
* this is to reduce number of calls to scaleMultiplier when scale is known.
*
* Sign of `whole` controls sign of result: negative whole => negative result, positive whole => positive result.
* Sign of `fractional` is expected to be positive, otherwise result is undefined.
* If `scale` is to big (scale > maxPrecision<DecimalType::NativeType>), result is undefined.
*/
* where scale_multiplier = scaleMultiplier<T>(scale)
* this is to reduce number of calls to scaleMultiplier when scale is known.
*
* Sign of `whole` controls sign of result: negative whole => negative result, positive whole => positive result.
* Sign of `fractional` is expected to be positive, otherwise result is undefined.
* If `scale` is to big (scale > maxPrecision<DecimalType::NativeType>), result is undefined.
*/
template
<
typename
DecimalType
>
DecimalType
decimalFromComponentsWithMultiplier
(
const
typename
DecimalType
::
NativeType
&
whole
,
const
typename
DecimalType
::
NativeType
&
fractional
,
typename
DecimalType
::
NativeType
scale_multiplier
)
const
typename
DecimalType
::
NativeType
&
fractional
,
typename
DecimalType
::
NativeType
scale_multiplier
)
{
using
T
=
typename
DecimalType
::
NativeType
;
const
auto
fractional_sign
=
whole
<
0
?
-
1
:
1
;
const
T
value
=
whole
*
scale_multiplier
+
fractional_sign
*
(
fractional
%
scale_multiplier
);
T
whole_scaled
=
0
;
if
(
common
::
mulOverflow
(
whole
,
scale_multiplier
,
whole_scaled
))
throw
Exception
(
"Decimal math overflow"
,
ErrorCodes
::
DECIMAL_OVERFLOW
);
const
T
value
=
whole_scaled
+
fractional_sign
*
(
fractional
%
scale_multiplier
);
return
DecimalType
(
value
);
}
...
...
@@ -61,7 +70,8 @@ DecimalType decimalFromComponentsWithMultiplier(const typename DecimalType::Nati
* @see `decimalFromComponentsWithMultiplier` for details.
*/
template
<
typename
DecimalType
>
DecimalType
decimalFromComponents
(
const
typename
DecimalType
::
NativeType
&
whole
,
const
typename
DecimalType
::
NativeType
&
fractional
,
UInt32
scale
)
DecimalType
decimalFromComponents
(
const
typename
DecimalType
::
NativeType
&
whole
,
const
typename
DecimalType
::
NativeType
&
fractional
,
UInt32
scale
)
{
using
T
=
typename
DecimalType
::
NativeType
;
...
...
@@ -72,7 +82,8 @@ DecimalType decimalFromComponents(const typename DecimalType::NativeType & whole
* @see `decimalFromComponentsWithMultiplier` for details.
*/
template
<
typename
DecimalType
>
DecimalType
decimalFromComponents
(
const
DecimalComponents
<
typename
DecimalType
::
NativeType
>
&
components
,
UInt32
scale
)
DecimalType
decimalFromComponents
(
const
DecimalComponents
<
typename
DecimalType
::
NativeType
>
&
components
,
UInt32
scale
)
{
return
decimalFromComponents
<
DecimalType
>
(
components
.
whole
,
components
.
fractional
,
scale
);
}
...
...
@@ -81,7 +92,8 @@ DecimalType decimalFromComponents(const DecimalComponents<typename DecimalType::
* This is an optimization to reduce number of calls to scaleMultiplier on known scale.
*/
template
<
typename
DecimalType
>
DecimalComponents
<
typename
DecimalType
::
NativeType
>
splitWithScaleMultiplier
(
const
DecimalType
&
decimal
,
typename
DecimalType
::
NativeType
scale_multiplier
)
DecimalComponents
<
typename
DecimalType
::
NativeType
>
splitWithScaleMultiplier
(
const
DecimalType
&
decimal
,
typename
DecimalType
::
NativeType
scale_multiplier
)
{
using
T
=
typename
DecimalType
::
NativeType
;
const
auto
whole
=
decimal
.
value
/
scale_multiplier
;
...
...
tests/queries/0_stateless/01259_datetime64_ubsan.reference
0 → 100644
浏览文件 @
a70637ab
29
tests/queries/0_stateless/01259_datetime64_ubsan.sql
0 → 100644
浏览文件 @
a70637ab
select
now64
(
10
);
-- { serverError 407 }
select
length
(
toString
(
now64
(
9
)));
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录