Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
bd755045
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
bd755045
编写于
6月 03, 2021
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix conflicts while mege from master
上级
77f20800
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
3 addition
and
3 deletion
+3
-3
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+3
-3
未找到文件。
src/client/src/tscSQLParser.c
浏览文件 @
bd755045
...
@@ -5829,7 +5829,7 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo* p
...
@@ -5829,7 +5829,7 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo* p
switch
(
s
)
{
switch
(
s
)
{
case
1
:
{
case
1
:
{
if
((
int32_t
)
p0
->
pVar
.
i64
<=
0
)
{
if
((
int32_t
)
p0
->
pVar
.
i64
<=
0
)
{
return
invalid
SqlErr
Msg
(
tscGetErrorMsgPayload
(
pCmd
),
msg
);
return
invalid
Operation
Msg
(
tscGetErrorMsgPayload
(
pCmd
),
msg
);
}
}
pMsg
->
daysToKeep
=
htonl
((
int32_t
)
p0
->
pVar
.
i64
);
pMsg
->
daysToKeep
=
htonl
((
int32_t
)
p0
->
pVar
.
i64
);
}
}
...
@@ -5837,7 +5837,7 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo* p
...
@@ -5837,7 +5837,7 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo* p
case
2
:
{
case
2
:
{
tVariantListItem
*
p1
=
taosArrayGet
(
pKeep
,
1
);
tVariantListItem
*
p1
=
taosArrayGet
(
pKeep
,
1
);
if
((
int32_t
)
p0
->
pVar
.
i64
<=
0
||
(
int32_t
)
p1
->
pVar
.
i64
<=
0
)
{
if
((
int32_t
)
p0
->
pVar
.
i64
<=
0
||
(
int32_t
)
p1
->
pVar
.
i64
<=
0
)
{
return
invalid
SqlErr
Msg
(
tscGetErrorMsgPayload
(
pCmd
),
msg
);
return
invalid
Operation
Msg
(
tscGetErrorMsgPayload
(
pCmd
),
msg
);
}
}
pMsg
->
daysToKeep
=
htonl
((
int32_t
)
p0
->
pVar
.
i64
);
pMsg
->
daysToKeep
=
htonl
((
int32_t
)
p0
->
pVar
.
i64
);
pMsg
->
daysToKeep1
=
htonl
((
int32_t
)
p1
->
pVar
.
i64
);
pMsg
->
daysToKeep1
=
htonl
((
int32_t
)
p1
->
pVar
.
i64
);
...
@@ -5848,7 +5848,7 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo* p
...
@@ -5848,7 +5848,7 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo* p
tVariantListItem
*
p2
=
taosArrayGet
(
pKeep
,
2
);
tVariantListItem
*
p2
=
taosArrayGet
(
pKeep
,
2
);
if
((
int32_t
)
p0
->
pVar
.
i64
<=
0
||
(
int32_t
)
p1
->
pVar
.
i64
<=
0
||
(
int32_t
)
p2
->
pVar
.
i64
<=
0
)
{
if
((
int32_t
)
p0
->
pVar
.
i64
<=
0
||
(
int32_t
)
p1
->
pVar
.
i64
<=
0
||
(
int32_t
)
p2
->
pVar
.
i64
<=
0
)
{
return
invalid
SqlErr
Msg
(
tscGetErrorMsgPayload
(
pCmd
),
msg
);
return
invalid
Operation
Msg
(
tscGetErrorMsgPayload
(
pCmd
),
msg
);
}
}
pMsg
->
daysToKeep
=
htonl
((
int32_t
)
p0
->
pVar
.
i64
);
pMsg
->
daysToKeep
=
htonl
((
int32_t
)
p0
->
pVar
.
i64
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录