Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
TDengine
提交
88e69036
T
TDengine
项目概览
jobily
/
TDengine
9 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
88e69036
编写于
9月 04, 2023
作者:
H
Haojun Liao
提交者:
GitHub
9月 04, 2023
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #22714 from taosdata/fix/main-merge
other: merge 3.0
上级
69428fdd
2cf1da0d
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
77 addition
and
52 deletion
+77
-52
cmake/mxml_CMakeLists.txt.in
cmake/mxml_CMakeLists.txt.in
+1
-1
docs/zh/14-reference/05-taosbenchmark.md
docs/zh/14-reference/05-taosbenchmark.md
+5
-1
docs/zh/14-reference/14-taosKeeper.md
docs/zh/14-reference/14-taosKeeper.md
+6
-1
docs/zh/20-third-party/11-kafka.md
docs/zh/20-third-party/11-kafka.md
+1
-1
source/dnode/mnode/impl/src/mndStb.c
source/dnode/mnode/impl/src/mndStb.c
+4
-4
source/dnode/mnode/impl/src/mndStream.c
source/dnode/mnode/impl/src/mndStream.c
+2
-7
source/dnode/mnode/impl/src/mndTopic.c
source/dnode/mnode/impl/src/mndTopic.c
+1
-1
source/dnode/mnode/impl/src/mndUser.c
source/dnode/mnode/impl/src/mndUser.c
+5
-5
source/dnode/vnode/src/vnd/vnodeSnapshot.c
source/dnode/vnode/src/vnd/vnodeSnapshot.c
+14
-0
source/libs/parser/src/parTranslater.c
source/libs/parser/src/parTranslater.c
+6
-2
source/libs/planner/src/planLogicCreater.c
source/libs/planner/src/planLogicCreater.c
+3
-3
source/libs/planner/src/planPhysiCreater.c
source/libs/planner/src/planPhysiCreater.c
+19
-19
source/libs/tfs/src/tfsTier.c
source/libs/tfs/src/tfsTier.c
+5
-1
source/libs/transport/src/transCli.c
source/libs/transport/src/transCli.c
+1
-2
tests/script/tsim/query/tag_scan.sim
tests/script/tsim/query/tag_scan.sim
+4
-4
未找到文件。
cmake/mxml_CMakeLists.txt.in
浏览文件 @
88e69036
# cos
# cos
ExternalProject_Add(mxml
ExternalProject_Add(mxml
GIT_REPOSITORY https://github.com/michaelrsweet/mxml.git
GIT_REPOSITORY https://github.com/michaelrsweet/mxml.git
GIT_TAG
v
2.12
GIT_TAG
release-
2.12
SOURCE_DIR "${TD_CONTRIB_DIR}/mxml"
SOURCE_DIR "${TD_CONTRIB_DIR}/mxml"
#BINARY_DIR ""
#BINARY_DIR ""
BUILD_IN_SOURCE TRUE
BUILD_IN_SOURCE TRUE
...
...
docs/zh/14-reference/05-taosbenchmark.md
浏览文件 @
88e69036
...
@@ -11,7 +11,11 @@ taosBenchmark (曾用名 taosdemo ) 是一个用于测试 TDengine 产品性能
...
@@ -11,7 +11,11 @@ taosBenchmark (曾用名 taosdemo ) 是一个用于测试 TDengine 产品性能
## 安装
## 安装
-
安装 TDengine 官方安装包的同时会自动安装 taosBenchmark
taosBenchmark 有两种安装方式:
-
安装 TDengine 官方安装包的同时会自动安装 taosBenchmark, 详情请参考
[
TDengine 安装
](
../../operation/pkg-install
)
。
-
单独编译 taos-tools 并安装, 详情请参考
[
taos-tools
](
https://github.com/taosdata/taos-tools
)
仓库。
## 运行
## 运行
...
...
docs/zh/14-reference/14-taosKeeper.md
浏览文件 @
88e69036
...
@@ -13,7 +13,12 @@ taosKeeper 是 TDengine 3.0 版本监控指标的导出工具,通过简单的
...
@@ -13,7 +13,12 @@ taosKeeper 是 TDengine 3.0 版本监控指标的导出工具,通过简单的
## 安装
## 安装
-
安装 TDengine 官方安装包的同时会自动安装 taosKeeper
taosKeeper 有两种安装方式:
taosKeeper 安装方式:
-
安装 TDengine 官方安装包的同时会自动安装 taosKeeper, 详情请参考
[
TDengine 安装
](
../../operation/pkg-install
)
。
-
单独编译 taosKeeper 并安装,详情请参考
[
taosKeeper
](
https://github.com/taosdata/taoskeeper
)
仓库。
## 配置和运行方式
## 配置和运行方式
...
...
docs/zh/20-third-party/11-kafka.md
浏览文件 @
88e69036
...
@@ -23,7 +23,7 @@ TDengine Source Connector 用于把数据实时地从 TDengine 读出来发送
...
@@ -23,7 +23,7 @@ TDengine Source Connector 用于把数据实时地从 TDengine 读出来发送
1.
Linux 操作系统
1.
Linux 操作系统
2.
已安装 Java 8 和 Maven
2.
已安装 Java 8 和 Maven
3.
已安装 Git、curl、vi
3.
已安装 Git、curl、vi
4.
已安装并启动 TDengine。
4.
已安装并启动 TDengine。
如果还没有可参考
[
安装和卸载
](
../../operation/pkg-install
)
## 安装 Kafka
## 安装 Kafka
...
...
source/dnode/mnode/impl/src/mndStb.c
浏览文件 @
88e69036
...
@@ -1255,12 +1255,12 @@ static int32_t mndProcessCreateStbReq(SRpcMsg *pReq) {
...
@@ -1255,12 +1255,12 @@ static int32_t mndProcessCreateStbReq(SRpcMsg *pReq) {
sprintf
(
detail
,
"colVer:%d, delay1:%"
PRId64
", delay2:%"
PRId64
", deleteMark1:%"
PRId64
", "
sprintf
(
detail
,
"colVer:%d, delay1:%"
PRId64
", delay2:%"
PRId64
", deleteMark1:%"
PRId64
", "
"deleteMark2:%"
PRId64
", igExists:%d, numOfColumns:%d, numOfFuncs:%d, numOfTags:%d, "
"deleteMark2:%"
PRId64
", igExists:%d, numOfColumns:%d, numOfFuncs:%d, numOfTags:%d, "
"source:%d, suid:%"
PRId64
", tagVer:%d, ttl:%d, "
"source:%d, suid:%"
PRId64
", tagVer:%d, ttl:%d, "
"watermark1:%"
PRId64
", watermark2:%"
PRId64
,
"watermark1:%"
PRId64
", watermark2:%"
PRId64
,
createReq
.
colVer
,
createReq
.
delay1
,
createReq
.
delay2
,
createReq
.
deleteMark1
,
createReq
.
colVer
,
createReq
.
delay1
,
createReq
.
delay2
,
createReq
.
deleteMark1
,
createReq
.
deleteMark2
,
createReq
.
igExists
,
createReq
.
numOfColumns
,
createReq
.
numOfFuncs
,
createReq
.
numOfTags
,
createReq
.
deleteMark2
,
createReq
.
igExists
,
createReq
.
numOfColumns
,
createReq
.
numOfFuncs
,
createReq
.
numOfTags
,
createReq
.
source
,
createReq
.
suid
,
createReq
.
tagVer
,
createReq
.
ttl
,
createReq
.
source
,
createReq
.
suid
,
createReq
.
tagVer
,
createReq
.
ttl
,
createReq
.
watermark1
,
createReq
.
watermark2
);
createReq
.
watermark1
,
createReq
.
watermark2
);
mndAuditFieldStr
(
detail
,
createReq
.
pColumns
,
createReq
.
numOfColumns
,
AUDIT_DETAIL_MAX
);
mndAuditFieldStr
(
detail
,
createReq
.
pColumns
,
createReq
.
numOfColumns
,
AUDIT_DETAIL_MAX
);
mndAuditFieldStr
(
detail
,
createReq
.
pTags
,
createReq
.
numOfTags
,
AUDIT_DETAIL_MAX
);
mndAuditFieldStr
(
detail
,
createReq
.
pTags
,
createReq
.
numOfTags
,
AUDIT_DETAIL_MAX
);
...
@@ -2610,7 +2610,7 @@ static int32_t mndProcessDropStbReq(SRpcMsg *pReq) {
...
@@ -2610,7 +2610,7 @@ static int32_t mndProcessDropStbReq(SRpcMsg *pReq) {
char
detail
[
2000
]
=
{
0
};
char
detail
[
2000
]
=
{
0
};
sprintf
(
detail
,
"igNotExists:%d, source:%d"
,
sprintf
(
detail
,
"igNotExists:%d, source:%d"
,
dropReq
.
igNotExists
,
dropReq
.
source
);
dropReq
.
igNotExists
,
dropReq
.
source
);
SName
name
=
{
0
};
SName
name
=
{
0
};
tNameFromString
(
&
name
,
dropReq
.
name
,
T_NAME_ACCT
|
T_NAME_DB
|
T_NAME_TABLE
);
tNameFromString
(
&
name
,
dropReq
.
name
,
T_NAME_ACCT
|
T_NAME_DB
|
T_NAME_TABLE
);
...
...
source/dnode/mnode/impl/src/mndStream.c
浏览文件 @
88e69036
...
@@ -876,13 +876,8 @@ static int32_t mndProcessCreateStreamReq(SRpcMsg *pReq) {
...
@@ -876,13 +876,8 @@ static int32_t mndProcessCreateStreamReq(SRpcMsg *pReq) {
char
detail
[
2000
]
=
{
0
};
char
detail
[
2000
]
=
{
0
};
sprintf
(
detail
,
sprintf
(
detail
,
"checkpointFreq:%"
PRId64
", createStb:%d, deleteMark:%"
PRId64
"checkpointFreq:%"
PRId64
", createStb:%d, deleteMark:%"
PRId64
", "
", fillHistory:%d, igExists:%d, igExpired:%d, igUpdate:%d, lastTs:%"
PRId64
"fillHistory:%d, igExists:%d, "
", maxDelay:%"
PRId64
", numOfTags:%d, sourceDB:%s, targetStbFullName:%s, triggerType:%d, watermark:%"
PRId64
,
"igExpired:%d, igUpdate:%d, lastTs:%"
PRId64
", "
"maxDelay:%"
PRId64
", numOfTags:%d, sourceDB:%s, "
"targetStbFullName:%s, triggerType:%d, watermark:%"
PRId64
,
createStreamReq
.
checkpointFreq
,
createStreamReq
.
createStb
,
createStreamReq
.
deleteMark
,
createStreamReq
.
checkpointFreq
,
createStreamReq
.
createStb
,
createStreamReq
.
deleteMark
,
createStreamReq
.
fillHistory
,
createStreamReq
.
igExists
,
createStreamReq
.
igExpired
,
createStreamReq
.
igUpdate
,
createStreamReq
.
fillHistory
,
createStreamReq
.
igExists
,
createStreamReq
.
igExpired
,
createStreamReq
.
igUpdate
,
createStreamReq
.
lastTs
,
createStreamReq
.
maxDelay
,
createStreamReq
.
numOfTags
,
createStreamReq
.
sourceDB
,
createStreamReq
.
lastTs
,
createStreamReq
.
maxDelay
,
createStreamReq
.
numOfTags
,
createStreamReq
.
sourceDB
,
...
...
source/dnode/mnode/impl/src/mndTopic.c
浏览文件 @
88e69036
...
@@ -642,7 +642,7 @@ static int32_t mndProcessCreateTopicReq(SRpcMsg *pReq) {
...
@@ -642,7 +642,7 @@ static int32_t mndProcessCreateTopicReq(SRpcMsg *pReq) {
SName
tableName
=
{
0
};
SName
tableName
=
{
0
};
tNameFromString
(
&
tableName
,
createTopicReq
.
subStbName
,
T_NAME_ACCT
|
T_NAME_DB
|
T_NAME_TABLE
);
tNameFromString
(
&
tableName
,
createTopicReq
.
subStbName
,
T_NAME_ACCT
|
T_NAME_DB
|
T_NAME_TABLE
);
sprintf
(
detail
,
"igExists:%d, subStbName:%s, subType:%d, withMeta:%d, sql:%s"
,
sprintf
(
detail
,
"igExists:%d, subStbName:%s, subType:%d, withMeta:%d, sql:%s"
,
createTopicReq
.
igExists
,
tableName
.
tname
,
createTopicReq
.
subType
,
createTopicReq
.
withMeta
,
sql
);
createTopicReq
.
igExists
,
tableName
.
tname
,
createTopicReq
.
subType
,
createTopicReq
.
withMeta
,
sql
);
SName
dbname
=
{
0
};
SName
dbname
=
{
0
};
...
...
source/dnode/mnode/impl/src/mndUser.c
浏览文件 @
88e69036
...
@@ -657,7 +657,7 @@ static int32_t mndProcessCreateUserReq(SRpcMsg *pReq) {
...
@@ -657,7 +657,7 @@ static int32_t mndProcessCreateUserReq(SRpcMsg *pReq) {
if
(
code
==
0
)
code
=
TSDB_CODE_ACTION_IN_PROGRESS
;
if
(
code
==
0
)
code
=
TSDB_CODE_ACTION_IN_PROGRESS
;
char
detail
[
1000
]
=
{
0
};
char
detail
[
1000
]
=
{
0
};
sprintf
(
detail
,
"createType:%d, enable:%d, superUser:%d, sysInfo:%d"
,
sprintf
(
detail
,
"createType:%d, enable:%d, superUser:%d, sysInfo:%d"
,
createReq
.
createType
,
createReq
.
enable
,
createReq
.
superUser
,
createReq
.
sysInfo
);
createReq
.
createType
,
createReq
.
enable
,
createReq
.
superUser
,
createReq
.
sysInfo
);
auditRecord
(
pReq
,
pMnode
->
clusterId
,
"createUser"
,
createReq
.
user
,
""
,
detail
);
auditRecord
(
pReq
,
pMnode
->
clusterId
,
"createUser"
,
createReq
.
user
,
""
,
detail
);
...
@@ -1039,16 +1039,16 @@ static int32_t mndProcessAlterUserReq(SRpcMsg *pReq) {
...
@@ -1039,16 +1039,16 @@ static int32_t mndProcessAlterUserReq(SRpcMsg *pReq) {
if
(
code
==
0
)
code
=
TSDB_CODE_ACTION_IN_PROGRESS
;
if
(
code
==
0
)
code
=
TSDB_CODE_ACTION_IN_PROGRESS
;
char
detail
[
1000
]
=
{
0
};
char
detail
[
1000
]
=
{
0
};
sprintf
(
detail
,
"alterType:%s, enable:%d, superUser:%d, sysInfo:%d, tabName:%s, password:"
,
sprintf
(
detail
,
"alterType:%s, enable:%d, superUser:%d, sysInfo:%d, tabName:%s, password:"
,
mndUserAuditTypeStr
(
alterReq
.
alterType
),
alterReq
.
enable
,
alterReq
.
superUser
,
alterReq
.
sysInfo
,
alterReq
.
tabName
);
mndUserAuditTypeStr
(
alterReq
.
alterType
),
alterReq
.
enable
,
alterReq
.
superUser
,
alterReq
.
sysInfo
,
alterReq
.
tabName
);
if
(
alterReq
.
alterType
==
TSDB_ALTER_USER_PASSWD
){
if
(
alterReq
.
alterType
==
TSDB_ALTER_USER_PASSWD
){
sprintf
(
detail
,
"alterType:%s, enable:%d, superUser:%d, sysInfo:%d, tabName:%s, password:xxx"
,
sprintf
(
detail
,
"alterType:%s, enable:%d, superUser:%d, sysInfo:%d, tabName:%s, password:xxx"
,
mndUserAuditTypeStr
(
alterReq
.
alterType
),
alterReq
.
enable
,
alterReq
.
superUser
,
alterReq
.
sysInfo
,
mndUserAuditTypeStr
(
alterReq
.
alterType
),
alterReq
.
enable
,
alterReq
.
superUser
,
alterReq
.
sysInfo
,
alterReq
.
tabName
);
alterReq
.
tabName
);
auditRecord
(
pReq
,
pMnode
->
clusterId
,
"alterUser"
,
alterReq
.
user
,
""
,
detail
);
auditRecord
(
pReq
,
pMnode
->
clusterId
,
"alterUser"
,
alterReq
.
user
,
""
,
detail
);
}
}
else
if
(
alterReq
.
alterType
==
TSDB_ALTER_USER_SUPERUSER
||
else
if
(
alterReq
.
alterType
==
TSDB_ALTER_USER_SUPERUSER
||
alterReq
.
alterType
==
TSDB_ALTER_USER_ENABLE
||
alterReq
.
alterType
==
TSDB_ALTER_USER_ENABLE
||
alterReq
.
alterType
==
TSDB_ALTER_USER_SYSINFO
){
alterReq
.
alterType
==
TSDB_ALTER_USER_SYSINFO
){
auditRecord
(
pReq
,
pMnode
->
clusterId
,
"alterUser"
,
alterReq
.
user
,
""
,
detail
);
auditRecord
(
pReq
,
pMnode
->
clusterId
,
"alterUser"
,
alterReq
.
user
,
""
,
detail
);
...
...
source/dnode/vnode/src/vnd/vnodeSnapshot.c
浏览文件 @
88e69036
...
@@ -425,6 +425,20 @@ int32_t vnodeSnapWriterClose(SVSnapWriter *pWriter, int8_t rollback, SSnapshot *
...
@@ -425,6 +425,20 @@ int32_t vnodeSnapWriterClose(SVSnapWriter *pWriter, int8_t rollback, SSnapshot *
if
(
code
)
goto
_exit
;
if
(
code
)
goto
_exit
;
}
}
if
(
pWriter
->
pStreamTaskWriter
)
{
code
=
streamTaskSnapWriterClose
(
pWriter
->
pStreamTaskWriter
,
rollback
);
if
(
code
)
goto
_exit
;
}
if
(
pWriter
->
pStreamStateWriter
)
{
code
=
streamStateSnapWriterClose
(
pWriter
->
pStreamStateWriter
,
rollback
);
if
(
code
)
goto
_exit
;
code
=
streamStateRebuildFromSnap
(
pWriter
->
pStreamStateWriter
,
0
);
pWriter
->
pStreamStateWriter
=
NULL
;
if
(
code
)
goto
_exit
;
}
if
(
pWriter
->
pRsmaSnapWriter
)
{
if
(
pWriter
->
pRsmaSnapWriter
)
{
code
=
rsmaSnapWriterClose
(
&
pWriter
->
pRsmaSnapWriter
,
rollback
);
code
=
rsmaSnapWriterClose
(
&
pWriter
->
pRsmaSnapWriter
,
rollback
);
if
(
code
)
goto
_exit
;
if
(
code
)
goto
_exit
;
...
...
source/libs/parser/src/parTranslater.c
浏览文件 @
88e69036
...
@@ -3734,7 +3734,7 @@ static int32_t translateInterp(STranslateContext* pCxt, SSelectStmt* pSelect) {
...
@@ -3734,7 +3734,7 @@ static int32_t translateInterp(STranslateContext* pCxt, SSelectStmt* pSelect) {
static
int32_t
removeConstantValueFromList
(
SNodeList
**
pList
)
{
static
int32_t
removeConstantValueFromList
(
SNodeList
**
pList
)
{
SNode
*
pNode
=
NULL
;
SNode
*
pNode
=
NULL
;
WHERE_EACH
(
pNode
,
*
pList
)
{
WHERE_EACH
(
pNode
,
*
pList
)
{
if
(
nodeType
(
pNode
)
==
QUERY_NODE_VALUE
||
if
(
nodeType
(
pNode
)
==
QUERY_NODE_VALUE
||
(
nodeType
(
pNode
)
==
QUERY_NODE_FUNCTION
&&
fmIsConstantResFunc
((
SFunctionNode
*
)
pNode
)
&&
fmIsScalarFunc
(((
SFunctionNode
*
)
pNode
)
->
funcId
)))
{
(
nodeType
(
pNode
)
==
QUERY_NODE_FUNCTION
&&
fmIsConstantResFunc
((
SFunctionNode
*
)
pNode
)
&&
fmIsScalarFunc
(((
SFunctionNode
*
)
pNode
)
->
funcId
)))
{
ERASE_NODE
(
*
pList
);
ERASE_NODE
(
*
pList
);
continue
;
continue
;
...
@@ -3753,7 +3753,11 @@ static int32_t removeConstantValueFromList(SNodeList** pList) {
...
@@ -3753,7 +3753,11 @@ static int32_t removeConstantValueFromList(SNodeList** pList) {
static
int32_t
translatePartitionBy
(
STranslateContext
*
pCxt
,
SSelectStmt
*
pSelect
)
{
static
int32_t
translatePartitionBy
(
STranslateContext
*
pCxt
,
SSelectStmt
*
pSelect
)
{
pCxt
->
currClause
=
SQL_CLAUSE_PARTITION_BY
;
pCxt
->
currClause
=
SQL_CLAUSE_PARTITION_BY
;
int32_t
code
=
TSDB_CODE_SUCCESS
;
int32_t
code
=
TSDB_CODE_SUCCESS
;
if
(
pSelect
->
pPartitionByList
)
{
code
=
removeConstantValueFromList
(
&
pSelect
->
pPartitionByList
);
}
if
(
TSDB_CODE_SUCCESS
==
code
&&
pSelect
->
pPartitionByList
)
{
if
(
TSDB_CODE_SUCCESS
==
code
&&
pSelect
->
pPartitionByList
)
{
int8_t
typeType
=
getTableTypeFromTableNode
(
pSelect
->
pFromTable
);
int8_t
typeType
=
getTableTypeFromTableNode
(
pSelect
->
pFromTable
);
SNode
*
pPar
=
nodesListGetNode
(
pSelect
->
pPartitionByList
,
0
);
SNode
*
pPar
=
nodesListGetNode
(
pSelect
->
pPartitionByList
,
0
);
...
...
source/libs/planner/src/planLogicCreater.c
浏览文件 @
88e69036
...
@@ -447,7 +447,7 @@ static int32_t createScanLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect
...
@@ -447,7 +447,7 @@ static int32_t createScanLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect
pScan->pScanPseudoCols = pNewScanPseudoCols;
pScan->pScanPseudoCols = pNewScanPseudoCols;
}
}
}
}
*/
*/
}
}
if
(
NULL
!=
pScan
->
pScanCols
)
{
if
(
NULL
!=
pScan
->
pScanCols
)
{
...
@@ -516,7 +516,7 @@ static int32_t createJoinLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect
...
@@ -516,7 +516,7 @@ static int32_t createJoinLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect
pJoin
->
node
.
requireDataOrder
=
DATA_ORDER_LEVEL_GLOBAL
;
pJoin
->
node
.
requireDataOrder
=
DATA_ORDER_LEVEL_GLOBAL
;
pJoin
->
node
.
resultDataOrder
=
DATA_ORDER_LEVEL_NONE
;
pJoin
->
node
.
resultDataOrder
=
DATA_ORDER_LEVEL_NONE
;
pJoin
->
isLowLevelJoin
=
pJoinTable
->
isLowLevelJoin
;
pJoin
->
isLowLevelJoin
=
pJoinTable
->
isLowLevelJoin
;
int32_t
code
=
TSDB_CODE_SUCCESS
;
int32_t
code
=
TSDB_CODE_SUCCESS
;
// set left and right node
// set left and right node
...
@@ -564,7 +564,7 @@ static int32_t createJoinLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect
...
@@ -564,7 +564,7 @@ static int32_t createJoinLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect
code
=
createColumnByRewriteExprs
(
pColList
,
&
pJoin
->
node
.
pTargets
);
code
=
createColumnByRewriteExprs
(
pColList
,
&
pJoin
->
node
.
pTargets
);
}
}
}
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
if
(
TSDB_CODE_SUCCESS
==
code
)
{
SNodeList
*
pColList
=
NULL
;
SNodeList
*
pColList
=
NULL
;
if
(
QUERY_NODE_REAL_TABLE
==
nodeType
(
pJoinTable
->
pRight
)
&&
!
pJoin
->
isLowLevelJoin
)
{
if
(
QUERY_NODE_REAL_TABLE
==
nodeType
(
pJoinTable
->
pRight
)
&&
!
pJoin
->
isLowLevelJoin
)
{
...
...
source/libs/planner/src/planPhysiCreater.c
浏览文件 @
88e69036
...
@@ -539,7 +539,7 @@ static int32_t createTagScanPhysiNode(SPhysiPlanContext* pCxt, SSubplan* pSubpla
...
@@ -539,7 +539,7 @@ static int32_t createTagScanPhysiNode(SPhysiPlanContext* pCxt, SSubplan* pSubpla
return
TSDB_CODE_OUT_OF_MEMORY
;
return
TSDB_CODE_OUT_OF_MEMORY
;
}
}
vgroupInfoToNodeAddr
(
pScanLogicNode
->
pVgroupList
->
vgroups
,
&
pSubplan
->
execNode
);
vgroupInfoToNodeAddr
(
pScanLogicNode
->
pVgroupList
->
vgroups
,
&
pSubplan
->
execNode
);
pScan
->
onlyMetaCtbIdx
=
pScanLogicNode
->
onlyMetaCtbIdx
;
pScan
->
onlyMetaCtbIdx
=
pScanLogicNode
->
onlyMetaCtbIdx
;
return
createScanPhysiNodeFinalize
(
pCxt
,
pSubplan
,
pScanLogicNode
,
(
SScanPhysiNode
*
)
pScan
,
pPhyNode
);
return
createScanPhysiNodeFinalize
(
pCxt
,
pSubplan
,
pScanLogicNode
,
(
SScanPhysiNode
*
)
pScan
,
pPhyNode
);
...
@@ -726,7 +726,7 @@ static int32_t mergeEqCond(SNode** ppDst, SNode** ppSrc) {
...
@@ -726,7 +726,7 @@ static int32_t mergeEqCond(SNode** ppDst, SNode** ppSrc) {
*
ppSrc
=
NULL
;
*
ppSrc
=
NULL
;
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
}
SLogicConditionNode
*
pLogicCond
=
(
SLogicConditionNode
*
)
nodesMakeNode
(
QUERY_NODE_LOGIC_CONDITION
);
SLogicConditionNode
*
pLogicCond
=
(
SLogicConditionNode
*
)
nodesMakeNode
(
QUERY_NODE_LOGIC_CONDITION
);
if
(
NULL
==
pLogicCond
)
{
if
(
NULL
==
pLogicCond
)
{
return
TSDB_CODE_OUT_OF_MEMORY
;
return
TSDB_CODE_OUT_OF_MEMORY
;
...
@@ -754,7 +754,7 @@ static int32_t getJoinDataBlockDescNode(SNodeList* pChildren, int32_t idx, SData
...
@@ -754,7 +754,7 @@ static int32_t getJoinDataBlockDescNode(SNodeList* pChildren, int32_t idx, SData
planError
(
"Invalid join children num:%d or child type:%d"
,
pChildren
->
length
,
nodeType
(
nodesListGetNode
(
pChildren
,
0
)));
planError
(
"Invalid join children num:%d or child type:%d"
,
pChildren
->
length
,
nodeType
(
nodesListGetNode
(
pChildren
,
0
)));
return
TSDB_CODE_PLAN_INTERNAL_ERROR
;
return
TSDB_CODE_PLAN_INTERNAL_ERROR
;
}
}
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
}
...
@@ -775,12 +775,12 @@ static int32_t createMergeJoinPhysiNode(SPhysiPlanContext* pCxt, SNodeList* pChi
...
@@ -775,12 +775,12 @@ static int32_t createMergeJoinPhysiNode(SPhysiPlanContext* pCxt, SNodeList* pChi
if
(
TSDB_CODE_SUCCESS
==
code
)
{
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
getJoinDataBlockDescNode
(
pChildren
,
1
,
&
pRightDesc
);
code
=
getJoinDataBlockDescNode
(
pChildren
,
1
,
&
pRightDesc
);
}
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
setNodeSlotId
(
pCxt
,
pLeftDesc
->
dataBlockId
,
pRightDesc
->
dataBlockId
,
pJoinLogicNode
->
pPrimKeyEqCond
,
code
=
setNodeSlotId
(
pCxt
,
pLeftDesc
->
dataBlockId
,
pRightDesc
->
dataBlockId
,
pJoinLogicNode
->
pPrimKeyEqCond
,
&
pJoin
->
pPrimKeyCond
);
&
pJoin
->
pPrimKeyCond
);
}
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
setListSlotId
(
pCxt
,
pLeftDesc
->
dataBlockId
,
pRightDesc
->
dataBlockId
,
pJoinLogicNode
->
node
.
pTargets
,
code
=
setListSlotId
(
pCxt
,
pLeftDesc
->
dataBlockId
,
pRightDesc
->
dataBlockId
,
pJoinLogicNode
->
node
.
pTargets
,
&
pJoin
->
pTargets
);
&
pJoin
->
pTargets
);
...
@@ -869,7 +869,7 @@ static int32_t createHashJoinColList(int16_t lBlkId, int16_t rBlkId, SNode* pEq1
...
@@ -869,7 +869,7 @@ static int32_t createHashJoinColList(int16_t lBlkId, int16_t rBlkId, SNode* pEq1
if
(
NULL
==
pJoin
->
pOnLeft
||
NULL
==
pJoin
->
pOnRight
)
{
if
(
NULL
==
pJoin
->
pOnLeft
||
NULL
==
pJoin
->
pOnRight
)
{
return
TSDB_CODE_OUT_OF_MEMORY
;
return
TSDB_CODE_OUT_OF_MEMORY
;
}
}
code
=
extractHashJoinOnCols
(
lBlkId
,
rBlkId
,
pEq1
,
pJoin
);
code
=
extractHashJoinOnCols
(
lBlkId
,
rBlkId
,
pEq1
,
pJoin
);
if
(
TSDB_CODE_SUCCESS
==
code
)
{
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
extractHashJoinOnCols
(
lBlkId
,
rBlkId
,
pEq2
,
pJoin
);
code
=
extractHashJoinOnCols
(
lBlkId
,
rBlkId
,
pEq2
,
pJoin
);
...
@@ -893,10 +893,10 @@ static int32_t sortHashJoinTargets(int16_t lBlkId, int16_t rBlkId, SHashJoinPhys
...
@@ -893,10 +893,10 @@ static int32_t sortHashJoinTargets(int16_t lBlkId, int16_t rBlkId, SHashJoinPhys
return
TSDB_CODE_OUT_OF_MEMORY
;
return
TSDB_CODE_OUT_OF_MEMORY
;
}
}
SNodeList
*
pNew
=
nodesMakeList
();
SNodeList
*
pNew
=
nodesMakeList
();
FOREACH
(
pNode
,
pJoin
->
pTargets
)
{
FOREACH
(
pNode
,
pJoin
->
pTargets
)
{
SColumnNode
*
pCol
=
(
SColumnNode
*
)
pNode
;
SColumnNode
*
pCol
=
(
SColumnNode
*
)
pNode
;
int32_t
len
=
getSlotKey
(
pNode
,
NULL
,
name
,
TSDB_COL_FNAME_LEN
);
int32_t
len
=
getSlotKey
(
pNode
,
NULL
,
name
,
TSDB_COL_FNAME_LEN
);
tSimpleHashPut
(
pHash
,
name
,
len
,
&
pCol
,
POINTER_BYTES
);
tSimpleHashPut
(
pHash
,
name
,
len
,
&
pCol
,
POINTER_BYTES
);
}
}
...
@@ -905,7 +905,7 @@ static int32_t sortHashJoinTargets(int16_t lBlkId, int16_t rBlkId, SHashJoinPhys
...
@@ -905,7 +905,7 @@ static int32_t sortHashJoinTargets(int16_t lBlkId, int16_t rBlkId, SHashJoinPhys
FOREACH
(
pNode
,
pJoin
->
pOnLeft
)
{
FOREACH
(
pNode
,
pJoin
->
pOnLeft
)
{
SColumnNode
*
pCol
=
(
SColumnNode
*
)
pNode
;
SColumnNode
*
pCol
=
(
SColumnNode
*
)
pNode
;
int32_t
len
=
getSlotKey
(
pNode
,
NULL
,
name
,
TSDB_COL_FNAME_LEN
);
int32_t
len
=
getSlotKey
(
pNode
,
NULL
,
name
,
TSDB_COL_FNAME_LEN
);
SNode
**
p
=
tSimpleHashGet
(
pHash
,
name
,
len
);
SNode
**
p
=
tSimpleHashGet
(
pHash
,
name
,
len
);
if
(
p
)
{
if
(
p
)
{
nodesListStrictAppend
(
pJoin
->
pTargets
,
*
p
);
nodesListStrictAppend
(
pJoin
->
pTargets
,
*
p
);
...
@@ -914,7 +914,7 @@ static int32_t sortHashJoinTargets(int16_t lBlkId, int16_t rBlkId, SHashJoinPhys
...
@@ -914,7 +914,7 @@ static int32_t sortHashJoinTargets(int16_t lBlkId, int16_t rBlkId, SHashJoinPhys
}
}
FOREACH
(
pNode
,
pJoin
->
pOnRight
)
{
FOREACH
(
pNode
,
pJoin
->
pOnRight
)
{
SColumnNode
*
pCol
=
(
SColumnNode
*
)
pNode
;
SColumnNode
*
pCol
=
(
SColumnNode
*
)
pNode
;
int32_t
len
=
getSlotKey
(
pNode
,
NULL
,
name
,
TSDB_COL_FNAME_LEN
);
int32_t
len
=
getSlotKey
(
pNode
,
NULL
,
name
,
TSDB_COL_FNAME_LEN
);
SNode
**
p
=
tSimpleHashGet
(
pHash
,
name
,
len
);
SNode
**
p
=
tSimpleHashGet
(
pHash
,
name
,
len
);
if
(
p
)
{
if
(
p
)
{
nodesListStrictAppend
(
pJoin
->
pTargets
,
*
p
);
nodesListStrictAppend
(
pJoin
->
pTargets
,
*
p
);
...
@@ -930,7 +930,7 @@ static int32_t sortHashJoinTargets(int16_t lBlkId, int16_t rBlkId, SHashJoinPhys
...
@@ -930,7 +930,7 @@ static int32_t sortHashJoinTargets(int16_t lBlkId, int16_t rBlkId, SHashJoinPhys
if
(
p
==
NULL
)
{
if
(
p
==
NULL
)
{
break
;
break
;
}
}
nodesListStrictAppend
(
pJoin
->
pTargets
,
*
p
);
nodesListStrictAppend
(
pJoin
->
pTargets
,
*
p
);
}
}
}
}
...
@@ -958,10 +958,10 @@ static int32_t createHashJoinPhysiNode(SPhysiPlanContext* pCxt, SNodeList* pChil
...
@@ -958,10 +958,10 @@ static int32_t createHashJoinPhysiNode(SPhysiPlanContext* pCxt, SNodeList* pChil
code
=
setNodeSlotId
(
pCxt
,
pLeftDesc
->
dataBlockId
,
pRightDesc
->
dataBlockId
,
pJoinLogicNode
->
pPrimKeyEqCond
,
&
pJoin
->
pPrimKeyCond
);
code
=
setNodeSlotId
(
pCxt
,
pLeftDesc
->
dataBlockId
,
pRightDesc
->
dataBlockId
,
pJoinLogicNode
->
pPrimKeyEqCond
,
&
pJoin
->
pPrimKeyCond
);
if
(
TSDB_CODE_SUCCESS
==
code
)
{
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
setNodeSlotId
(
pCxt
,
pLeftDesc
->
dataBlockId
,
pRightDesc
->
dataBlockId
,
pJoinLogicNode
->
pColEqCond
,
&
pJoin
->
pColEqCond
);
code
=
setNodeSlotId
(
pCxt
,
pLeftDesc
->
dataBlockId
,
pRightDesc
->
dataBlockId
,
pJoinLogicNode
->
pColEqCond
,
&
pJoin
->
pColEqCond
);
}
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
setNodeSlotId
(
pCxt
,
pLeftDesc
->
dataBlockId
,
pRightDesc
->
dataBlockId
,
pJoinLogicNode
->
pTagEqCond
,
&
pJoin
->
pTagEqCond
);
code
=
setNodeSlotId
(
pCxt
,
pLeftDesc
->
dataBlockId
,
pRightDesc
->
dataBlockId
,
pJoinLogicNode
->
pTagEqCond
,
&
pJoin
->
pTagEqCond
);
}
}
if
(
TSDB_CODE_SUCCESS
==
code
&&
NULL
!=
pJoinLogicNode
->
pOtherOnCond
)
{
if
(
TSDB_CODE_SUCCESS
==
code
&&
NULL
!=
pJoinLogicNode
->
pOtherOnCond
)
{
code
=
setNodeSlotId
(
pCxt
,
((
SPhysiNode
*
)
pJoin
)
->
pOutputDataBlockDesc
->
dataBlockId
,
-
1
,
pJoinLogicNode
->
pOtherOnCond
,
&
pJoin
->
pFilterConditions
);
code
=
setNodeSlotId
(
pCxt
,
((
SPhysiNode
*
)
pJoin
)
->
pOutputDataBlockDesc
->
dataBlockId
,
-
1
,
pJoinLogicNode
->
pOtherOnCond
,
&
pJoin
->
pFilterConditions
);
}
}
...
@@ -973,10 +973,10 @@ static int32_t createHashJoinPhysiNode(SPhysiPlanContext* pCxt, SNodeList* pChil
...
@@ -973,10 +973,10 @@ static int32_t createHashJoinPhysiNode(SPhysiPlanContext* pCxt, SNodeList* pChil
}
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
createHashJoinColList
(
pLeftDesc
->
dataBlockId
,
pRightDesc
->
dataBlockId
,
pJoin
->
pPrimKeyCond
,
pJoin
->
pColEqCond
,
pJoin
->
pTagEqCond
,
pJoin
);
code
=
createHashJoinColList
(
pLeftDesc
->
dataBlockId
,
pRightDesc
->
dataBlockId
,
pJoin
->
pPrimKeyCond
,
pJoin
->
pColEqCond
,
pJoin
->
pTagEqCond
,
pJoin
);
}
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
sortHashJoinTargets
(
pLeftDesc
->
dataBlockId
,
pRightDesc
->
dataBlockId
,
pJoin
);
code
=
sortHashJoinTargets
(
pLeftDesc
->
dataBlockId
,
pRightDesc
->
dataBlockId
,
pJoin
);
}
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
addDataBlockSlots
(
pCxt
,
pJoin
->
pTargets
,
pJoin
->
node
.
pOutputDataBlockDesc
);
code
=
addDataBlockSlots
(
pCxt
,
pJoin
->
pTargets
,
pJoin
->
node
.
pOutputDataBlockDesc
);
}
}
...
@@ -1001,7 +1001,7 @@ static int32_t createJoinPhysiNode(SPhysiPlanContext* pCxt, SNodeList* pChildren
...
@@ -1001,7 +1001,7 @@ static int32_t createJoinPhysiNode(SPhysiPlanContext* pCxt, SNodeList* pChildren
planError
(
"Invalid join algorithm:%d"
,
pJoinLogicNode
->
joinAlgo
);
planError
(
"Invalid join algorithm:%d"
,
pJoinLogicNode
->
joinAlgo
);
break
;
break
;
}
}
return
TSDB_CODE_FAILED
;
return
TSDB_CODE_FAILED
;
}
}
...
@@ -1019,7 +1019,7 @@ static int32_t createGroupCachePhysiNode(SPhysiPlanContext* pCxt, SNodeList* pCh
...
@@ -1019,7 +1019,7 @@ static int32_t createGroupCachePhysiNode(SPhysiPlanContext* pCxt, SNodeList* pCh
pGrpCache
->
batchFetch
=
pLogicNode
->
batchFetch
;
pGrpCache
->
batchFetch
=
pLogicNode
->
batchFetch
;
SDataBlockDescNode
*
pChildDesc
=
((
SPhysiNode
*
)
nodesListGetNode
(
pChildren
,
0
))
->
pOutputDataBlockDesc
;
SDataBlockDescNode
*
pChildDesc
=
((
SPhysiNode
*
)
nodesListGetNode
(
pChildren
,
0
))
->
pOutputDataBlockDesc
;
int32_t
code
=
TSDB_CODE_SUCCESS
;
int32_t
code
=
TSDB_CODE_SUCCESS
;
/*
/*
if (TSDB_CODE_SUCCESS == code) {
if (TSDB_CODE_SUCCESS == code) {
code = setListSlotId(pCxt, pChildDesc->dataBlockId, -1, pLogicNode->pGroupCols, &pGrpCache->pGroupCols);
code = setListSlotId(pCxt, pChildDesc->dataBlockId, -1, pLogicNode->pGroupCols, &pGrpCache->pGroupCols);
}
}
...
@@ -1045,7 +1045,7 @@ static int32_t updateDynQueryCtrlStbJoinInfo(SPhysiPlanContext* pCxt, SNodeList*
...
@@ -1045,7 +1045,7 @@ static int32_t updateDynQueryCtrlStbJoinInfo(SPhysiPlanContext* pCxt, SNodeList*
}
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
if
(
TSDB_CODE_SUCCESS
==
code
)
{
memcpy
(
pDynCtrl
->
stbJoin
.
srcScan
,
pLogicNode
->
stbJoin
.
srcScan
,
sizeof
(
pDynCtrl
->
stbJoin
.
srcScan
));
memcpy
(
pDynCtrl
->
stbJoin
.
srcScan
,
pLogicNode
->
stbJoin
.
srcScan
,
sizeof
(
pDynCtrl
->
stbJoin
.
srcScan
));
SNode
*
pNode
=
NULL
;
SNode
*
pNode
=
NULL
;
int32_t
i
=
0
;
int32_t
i
=
0
;
FOREACH
(
pNode
,
pVgList
)
{
FOREACH
(
pNode
,
pVgList
)
{
...
@@ -1062,7 +1062,7 @@ static int32_t updateDynQueryCtrlStbJoinInfo(SPhysiPlanContext* pCxt, SNodeList*
...
@@ -1062,7 +1062,7 @@ static int32_t updateDynQueryCtrlStbJoinInfo(SPhysiPlanContext* pCxt, SNodeList*
return
code
;
return
code
;
}
}
static
int32_t
createDynQueryCtrlPhysiNode
(
SPhysiPlanContext
*
pCxt
,
SNodeList
*
pChildren
,
SDynQueryCtrlLogicNode
*
pLogicNode
,
static
int32_t
createDynQueryCtrlPhysiNode
(
SPhysiPlanContext
*
pCxt
,
SNodeList
*
pChildren
,
SDynQueryCtrlLogicNode
*
pLogicNode
,
SPhysiNode
**
pPhyNode
)
{
SPhysiNode
**
pPhyNode
)
{
int32_t
code
=
TSDB_CODE_SUCCESS
;
int32_t
code
=
TSDB_CODE_SUCCESS
;
...
...
source/libs/tfs/src/tfsTier.c
浏览文件 @
88e69036
...
@@ -116,7 +116,11 @@ int32_t tfsAllocDiskOnTier(STfsTier *pTier) {
...
@@ -116,7 +116,11 @@ int32_t tfsAllocDiskOnTier(STfsTier *pTier) {
if
(
pDisk
==
NULL
)
continue
;
if
(
pDisk
==
NULL
)
continue
;
if
(
pDisk
->
size
.
avail
<
tsMinDiskFreeSize
)
continue
;
if
(
pDisk
->
size
.
avail
<
tsMinDiskFreeSize
)
{
uInfo
(
"disk %s is full and skip it, level:%d id:%d free size:%"
PRId64
" min free size:%"
PRId64
,
pDisk
->
path
,
pDisk
->
level
,
pDisk
->
id
,
pDisk
->
size
.
avail
,
tsMinDiskFreeSize
);
continue
;
}
retId
=
diskId
;
retId
=
diskId
;
terrno
=
0
;
terrno
=
0
;
...
...
source/libs/transport/src/transCli.c
浏览文件 @
88e69036
...
@@ -2157,7 +2157,6 @@ static void cliSchedMsgToNextNode(SCliMsg* pMsg, SCliThrd* pThrd) {
...
@@ -2157,7 +2157,6 @@ static void cliSchedMsgToNextNode(SCliMsg* pMsg, SCliThrd* pThrd) {
if
(
rpcDebugFlag
&
DEBUG_DEBUG
)
{
if
(
rpcDebugFlag
&
DEBUG_DEBUG
)
{
STraceId
*
trace
=
&
pMsg
->
msg
.
info
.
traceId
;
STraceId
*
trace
=
&
pMsg
->
msg
.
info
.
traceId
;
char
tbuf
[
512
]
=
{
0
};
char
tbuf
[
512
]
=
{
0
};
EPSET_TO_STR
(
&
pCtx
->
epSet
,
tbuf
);
EPSET_TO_STR
(
&
pCtx
->
epSet
,
tbuf
);
tGDebug
(
"%s retry on next node,use:%s, step: %d,timeout:%"
PRId64
""
,
transLabel
(
pThrd
->
pTransInst
),
tbuf
,
tGDebug
(
"%s retry on next node,use:%s, step: %d,timeout:%"
PRId64
""
,
transLabel
(
pThrd
->
pTransInst
),
tbuf
,
pCtx
->
retryStep
,
pCtx
->
retryNextInterval
);
pCtx
->
retryStep
,
pCtx
->
retryNextInterval
);
...
@@ -2388,7 +2387,7 @@ int cliAppCb(SCliConn* pConn, STransMsg* pResp, SCliMsg* pMsg) {
...
@@ -2388,7 +2387,7 @@ int cliAppCb(SCliConn* pConn, STransMsg* pResp, SCliMsg* pMsg) {
if
(
rpcDebugFlag
&
DEBUG_TRACE
)
{
if
(
rpcDebugFlag
&
DEBUG_TRACE
)
{
char
tbuf
[
512
]
=
{
0
};
char
tbuf
[
512
]
=
{
0
};
EPSET_TO_STR
(
&
pCtx
->
epSet
,
tbuf
);
EPSET_TO_STR
(
&
pCtx
->
epSet
,
tbuf
);
tGTrace
(
"%s conn %p extract epset from msg
, use:%s"
,
CONN_GET_INST_LABEL
(
pConn
),
pConn
,
tbuf
);
tGTrace
(
"%s conn %p extract epset from msg
"
,
CONN_GET_INST_LABEL
(
pConn
),
pConn
);
}
}
}
}
if
(
rpcDebugFlag
&
DEBUG_TRACE
)
{
if
(
rpcDebugFlag
&
DEBUG_TRACE
)
{
...
...
tests/script/tsim/query/tag_scan.sim
浏览文件 @
88e69036
...
@@ -90,7 +90,7 @@ endi
...
@@ -90,7 +90,7 @@ endi
sql select tags tbname,t,b from stt1 order by t
sql select tags tbname,t,b from stt1 order by t
print $rows
print $rows
print $data00 $data01 $data02 $data10 $data11 $data12 $data20 $data21 $data22 $data30 $data31 $data32
print $data00 $data01 $data02 $data10 $data11 $data12 $data20 $data21 $data22 $data30 $data31 $data32
if $rows != 4 then
if $rows != 4 then
return -1
return -1
endi
endi
...
@@ -103,7 +103,7 @@ endi
...
@@ -103,7 +103,7 @@ endi
sql select tags t,b from stt1 where t=1
sql select tags t,b from stt1 where t=1
print $rows
print $rows
print $data00 $data01
print $data00 $data01
if $rows != 1 then
if $rows != 1 then
return -1
return -1
endi
endi
...
@@ -116,7 +116,7 @@ endi
...
@@ -116,7 +116,7 @@ endi
sql select tags t,b from stt1 where tbname='ctt11'
sql select tags t,b from stt1 where tbname='ctt11'
print $rows
print $rows
print $data00 $data01
print $data00 $data01
if $rows != 1 then
if $rows != 1 then
return -1
return -1
endi
endi
...
@@ -129,7 +129,7 @@ endi
...
@@ -129,7 +129,7 @@ endi
sql select tags t,b from ctt11
sql select tags t,b from ctt11
print $rows
print $rows
print $data00 $data01
print $data00 $data01
if $rows != 1 then
if $rows != 1 then
return -1
return -1
endi
endi
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录