Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
6d79a5f5
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
6d79a5f5
编写于
9月 06, 2022
作者:
A
Alex Duan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(query): save row count with int16_t smaller
上级
df5b08c0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
21 deletion
+23
-21
src/common/inc/texpr.h
src/common/inc/texpr.h
+1
-1
src/common/src/texpr.c
src/common/src/texpr.c
+22
-20
未找到文件。
src/common/inc/texpr.h
浏览文件 @
6d79a5f5
...
@@ -85,7 +85,7 @@ struct SSchema;
...
@@ -85,7 +85,7 @@ struct SSchema;
typedef
struct
{
typedef
struct
{
int16_t
type
;
int16_t
type
;
int16_t
bytes
;
int16_t
bytes
;
int
16
_t
numOfRows
;
int
32
_t
numOfRows
;
char
*
data
;
char
*
data
;
}
tExprOperandInfo
;
}
tExprOperandInfo
;
...
...
src/common/src/texpr.c
浏览文件 @
6d79a5f5
...
@@ -668,55 +668,56 @@ void exprTreeExprNodeTraverse(tExprNode *pExpr, int32_t numOfRows, tExprOperandI
...
@@ -668,55 +668,56 @@ void exprTreeExprNodeTraverse(tExprNode *pExpr, int32_t numOfRows, tExprOperandI
pl
=
ltmp
;
pl
=
ltmp
;
pt
=
transl
;
pt
=
transl
;
int32_t
i
;
switch
(
left
.
type
)
{
switch
(
left
.
type
)
{
case
TSDB_DATA_TYPE_TINYINT
:
case
TSDB_DATA_TYPE_TINYINT
:
for
(
i
nt16_t
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
int8_t
*
)
pl
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
int8_t
*
)
pl
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_SMALLINT
:
case
TSDB_DATA_TYPE_SMALLINT
:
for
(
i
nt16_t
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
int16_t
*
)
pl
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
int16_t
*
)
pl
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_INT
:
case
TSDB_DATA_TYPE_INT
:
for
(
i
nt16_t
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
int32_t
*
)
pl
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
int32_t
*
)
pl
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_BIGINT
:
case
TSDB_DATA_TYPE_BIGINT
:
for
(
i
nt16_t
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
int64_t
*
)
pl
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
int64_t
*
)
pl
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_UTINYINT
:
case
TSDB_DATA_TYPE_UTINYINT
:
for
(
i
nt16_t
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
uint8_t
*
)
pl
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
uint8_t
*
)
pl
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_USMALLINT
:
case
TSDB_DATA_TYPE_USMALLINT
:
for
(
i
nt16_t
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
uint16_t
*
)
pl
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
uint16_t
*
)
pl
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_UINT
:
case
TSDB_DATA_TYPE_UINT
:
for
(
i
nt16_t
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
uint32_t
*
)
pl
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
uint32_t
*
)
pl
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_UBIGINT
:
case
TSDB_DATA_TYPE_UBIGINT
:
for
(
i
nt16_t
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
uint64_t
*
)
pl
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
uint64_t
*
)
pl
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_FLOAT
:
case
TSDB_DATA_TYPE_FLOAT
:
for
(
i
nt16_t
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
float
*
)
pl
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
float
*
)
pl
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_DOUBLE
:
case
TSDB_DATA_TYPE_DOUBLE
:
for
(
i
nt16_t
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
left
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
double
*
)
pl
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
double
*
)
pl
+
i
));
}
}
break
;
break
;
...
@@ -766,55 +767,56 @@ void exprTreeExprNodeTraverse(tExprNode *pExpr, int32_t numOfRows, tExprOperandI
...
@@ -766,55 +767,56 @@ void exprTreeExprNodeTraverse(tExprNode *pExpr, int32_t numOfRows, tExprOperandI
pr
=
rtmp
;
pr
=
rtmp
;
pt
=
transr
;
pt
=
transr
;
int32_t
i
;
switch
(
right
.
type
)
{
switch
(
right
.
type
)
{
case
TSDB_DATA_TYPE_TINYINT
:
case
TSDB_DATA_TYPE_TINYINT
:
for
(
i
nt16_t
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
int8_t
*
)
pr
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
int8_t
*
)
pr
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_SMALLINT
:
case
TSDB_DATA_TYPE_SMALLINT
:
for
(
i
nt16_t
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
int16_t
*
)
pr
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
int16_t
*
)
pr
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_INT
:
case
TSDB_DATA_TYPE_INT
:
for
(
i
nt16_t
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
int32_t
*
)
pr
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
int32_t
*
)
pr
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_BIGINT
:
case
TSDB_DATA_TYPE_BIGINT
:
for
(
i
nt16_t
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
int64_t
*
)
pr
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
int64_t
*
)
pr
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_UTINYINT
:
case
TSDB_DATA_TYPE_UTINYINT
:
for
(
i
nt16_t
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
uint8_t
*
)
pr
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
uint8_t
*
)
pr
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_USMALLINT
:
case
TSDB_DATA_TYPE_USMALLINT
:
for
(
i
nt16_t
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
uint16_t
*
)
pr
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
uint16_t
*
)
pr
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_UINT
:
case
TSDB_DATA_TYPE_UINT
:
for
(
i
nt16_t
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
uint32_t
*
)
pr
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
uint32_t
*
)
pr
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_UBIGINT
:
case
TSDB_DATA_TYPE_UBIGINT
:
for
(
i
nt16_t
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
uint64_t
*
)
pr
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
uint64_t
*
)
pr
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_FLOAT
:
case
TSDB_DATA_TYPE_FLOAT
:
for
(
i
nt16_t
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
float
*
)
pr
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
float
*
)
pr
+
i
));
}
}
break
;
break
;
case
TSDB_DATA_TYPE_DOUBLE
:
case
TSDB_DATA_TYPE_DOUBLE
:
for
(
i
nt16_t
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
for
(
i
=
0
;
i
<
right
.
numOfRows
;
i
++
)
{
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
double
*
)
pr
+
i
));
*
((
int64_t
*
)
pt
+
i
)
=
(
int64_t
)(
*
((
double
*
)
pr
+
i
));
}
}
break
;
break
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录