Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
37a250de
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
37a250de
编写于
7月 14, 2022
作者:
P
Ping Xiao
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '2.6' into cases/TS-841
上级
aaae4230
7eea70db
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
18 addition
and
4 deletion
+18
-4
examples/c/makefile
examples/c/makefile
+0
-1
packaging/tools/install_arbi.sh
packaging/tools/install_arbi.sh
+9
-0
src/kit/taos-tools
src/kit/taos-tools
+1
-1
src/query/inc/qSqlparser.h
src/query/inc/qSqlparser.h
+4
-2
src/query/src/qSqlParser.c
src/query/src/qSqlParser.c
+4
-0
未找到文件。
examples/c/makefile
浏览文件 @
37a250de
...
@@ -7,7 +7,6 @@ LFLAGS = '-Wl,-rpath,/usr/local/taos/driver/' -ltaos -lpthread -lm -lrt
...
@@ -7,7 +7,6 @@ LFLAGS = '-Wl,-rpath,/usr/local/taos/driver/' -ltaos -lpthread -lm -lrt
CFLAGS
=
-O3
-g
-Wall
-Wno-deprecated
-fPIC
-Wno-unused-result
-Wconversion
\
CFLAGS
=
-O3
-g
-Wall
-Wno-deprecated
-fPIC
-Wno-unused-result
-Wconversion
\
-Wno-char-subscripts
-D_REENTRANT
-Wno-format
-D_REENTRANT
-DLINUX
\
-Wno-char-subscripts
-D_REENTRANT
-Wno-format
-D_REENTRANT
-DLINUX
\
-Wno-unused-function
-D_M_X64
-I
/usr/local/taos/include
-std
=
gnu99
\
-Wno-unused-function
-D_M_X64
-I
/usr/local/taos/include
-std
=
gnu99
\
-I
../../../deps/cJson/inc
\
-Wno-unused-function
-D_M_X64
-I
/usr/local/taos/include
-std
=
gnu99
\
-Wno-unused-function
-D_M_X64
-I
/usr/local/taos/include
-std
=
gnu99
\
-fsanitize
=
address
-fsanitize
=
undefined
-fno-sanitize-recover
=
all
-fsanitize
=
float-divide-by-zero
-fsanitize
=
float-cast-overflow
-fno-sanitize
=
null
-fno-sanitize
=
alignment
-fsanitize
=
address
-fsanitize
=
undefined
-fno-sanitize-recover
=
all
-fsanitize
=
float-divide-by-zero
-fsanitize
=
float-cast-overflow
-fno-sanitize
=
null
-fno-sanitize
=
alignment
...
...
packaging/tools/install_arbi.sh
浏览文件 @
37a250de
...
@@ -76,12 +76,21 @@ elif echo $osinfo | grep -qwi "debian"; then
...
@@ -76,12 +76,21 @@ elif echo $osinfo | grep -qwi "debian"; then
elif
echo
$osinfo
|
grep
-qwi
"Kylin"
;
then
elif
echo
$osinfo
|
grep
-qwi
"Kylin"
;
then
# echo "This is Kylin system"
# echo "This is Kylin system"
os_type
=
1
os_type
=
1
elif
echo
$osinfo
|
grep
-qwi
"Red"
;
then
# echo "This is Red Hat system"
os_type
=
1
elif
echo
$osinfo
|
grep
-qwi
"centos"
;
then
elif
echo
$osinfo
|
grep
-qwi
"centos"
;
then
# echo "This is centos system"
# echo "This is centos system"
os_type
=
2
os_type
=
2
elif
echo
$osinfo
|
grep
-qwi
"fedora"
;
then
elif
echo
$osinfo
|
grep
-qwi
"fedora"
;
then
# echo "This is fedora system"
# echo "This is fedora system"
os_type
=
2
os_type
=
2
elif
echo
$osinfo
|
grep
-qwi
"Linx"
;
then
# echo "This is Linx system"
os_type
=
1
service_mod
=
0
initd_mod
=
0
service_config_dir
=
"/etc/systemd/system"
else
else
echo
" osinfo:
${
osinfo
}
"
echo
" osinfo:
${
osinfo
}
"
echo
" This is an officially unverified linux system,"
echo
" This is an officially unverified linux system,"
...
...
taos-tools
@
bd496f76
比较
9cb71e3c
...
bd496f76
Subproject commit
9cb71e3c4c0474553aa961cbe19795541c29b5c7
Subproject commit
bd496f76b64931c66da2f8b0f24143a98a881cde
src/query/inc/qSqlparser.h
浏览文件 @
37a250de
...
@@ -97,9 +97,11 @@ typedef struct SIntervalVal {
...
@@ -97,9 +97,11 @@ typedef struct SIntervalVal {
SStrToken
offset
;
SStrToken
offset
;
}
SIntervalVal
;
}
SIntervalVal
;
typedef
struct
tSqlExpr
tSqlExprTimestamp
;
typedef
struct
SRangeVal
{
typedef
struct
SRangeVal
{
void
*
start
;
tSqlExprTimestamp
*
start
;
void
*
end
;
tSqlExprTimestamp
*
end
;
}
SRangeVal
;
}
SRangeVal
;
typedef
struct
SSessionWindowVal
{
typedef
struct
SSessionWindowVal
{
...
...
src/query/src/qSqlParser.c
浏览文件 @
37a250de
...
@@ -1183,6 +1183,10 @@ void destroySqlNode(SSqlNode *pSqlNode) {
...
@@ -1183,6 +1183,10 @@ void destroySqlNode(SSqlNode *pSqlNode) {
pSqlNode
->
fillType
=
NULL
;
pSqlNode
->
fillType
=
NULL
;
tSqlExprDestroy
(
pSqlNode
->
pHaving
);
tSqlExprDestroy
(
pSqlNode
->
pHaving
);
tSqlExprDestroy
(
pSqlNode
->
pRange
.
start
);
tSqlExprDestroy
(
pSqlNode
->
pRange
.
end
);
free
(
pSqlNode
);
free
(
pSqlNode
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录