Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
44010803
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看板
提交
44010803
编写于
8月 31, 2022
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
enh: make cmake .. -DCMAKE_BUILD_TYPE=Release work
上级
b89b2df2
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
37 addition
and
12 deletion
+37
-12
source/dnode/mgmt/node_mgmt/src/dmTransport.c
source/dnode/mgmt/node_mgmt/src/dmTransport.c
+1
-1
source/libs/executor/src/executil.c
source/libs/executor/src/executil.c
+1
-1
source/libs/executor/src/executorimpl.c
source/libs/executor/src/executorimpl.c
+2
-2
source/libs/function/src/builtinsimpl.c
source/libs/function/src/builtinsimpl.c
+1
-0
source/libs/function/src/tudf.c
source/libs/function/src/tudf.c
+1
-1
source/libs/function/src/udfd.c
source/libs/function/src/udfd.c
+4
-4
source/libs/index/src/indexComm.c
source/libs/index/src/indexComm.c
+1
-0
source/libs/sync/src/syncIndexMgr.c
source/libs/sync/src/syncIndexMgr.c
+3
-0
source/libs/transport/src/trans.c
source/libs/transport/src/trans.c
+1
-1
source/util/src/talgo.c
source/util/src/talgo.c
+1
-0
source/util/src/tcompare.c
source/util/src/tcompare.c
+1
-0
source/util/src/tlog.c
source/util/src/tlog.c
+4
-1
tests/test/c/sdbDump.c
tests/test/c/sdbDump.c
+6
-0
tests/tsim/src/simExe.c
tests/tsim/src/simExe.c
+3
-0
tools/shell/src/shellCommand.c
tools/shell/src/shellCommand.c
+3
-0
tools/shell/src/shellEngine.c
tools/shell/src/shellEngine.c
+4
-1
未找到文件。
source/dnode/mgmt/node_mgmt/src/dmTransport.c
浏览文件 @
44010803
...
...
@@ -301,7 +301,7 @@ int32_t dmInitServer(SDnode *pDnode) {
SDnodeTrans
*
pTrans
=
&
pDnode
->
trans
;
SRpcInit
rpcInit
=
{
0
};
strncpy
(
rpcInit
.
localFqdn
,
tsLocalFqdn
,
strlen
(
tsLocalFqdn
)
);
strncpy
(
rpcInit
.
localFqdn
,
tsLocalFqdn
,
TSDB_FQDN_LEN
);
rpcInit
.
localPort
=
tsServerPort
;
rpcInit
.
label
=
"DND-S"
;
rpcInit
.
numOfThreads
=
tsNumOfRpcThreads
;
...
...
source/libs/executor/src/executil.c
浏览文件 @
44010803
...
...
@@ -1190,7 +1190,7 @@ SqlFunctionCtx* createSqlFunctionCtx(SExprInfo* pExprInfo, int32_t numOfOutput,
fmGetFuncExecFuncs
(
pCtx
->
functionId
,
&
pCtx
->
fpSet
);
}
else
{
char
*
udfName
=
pExpr
->
pExpr
->
_function
.
pFunctNode
->
functionName
;
strncpy
(
pCtx
->
udfName
,
udfName
,
strlen
(
udfName
)
);
strncpy
(
pCtx
->
udfName
,
udfName
,
TSDB_FUNC_NAME_LEN
);
fmGetUdafExecFuncs
(
pCtx
->
functionId
,
&
pCtx
->
fpSet
);
}
pCtx
->
fpSet
.
getEnv
(
pExpr
->
pExpr
->
_function
.
pFunctNode
,
&
env
);
...
...
source/libs/executor/src/executorimpl.c
浏览文件 @
44010803
...
...
@@ -3982,8 +3982,8 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
STableKeyInfo
*
pKeyInfo
=
taosArrayGet
(
pTableListInfo
->
pTableList
,
i
);
qDebug
(
"creating stream task: add table %"
PRId64
,
pKeyInfo
->
uid
);
}
}
#endif
}
pTaskInfo
->
schemaInfo
.
qsw
=
extractQueriedColumnSchema
(
&
pTableScanNode
->
scan
);
pOperator
=
createStreamScanOperatorInfo
(
pHandle
,
pTableScanNode
,
pTagCond
,
pTaskInfo
);
...
...
@@ -4449,7 +4449,7 @@ _complete:
return
code
;
}
static
void
doDestroyTableList
(
STableListInfo
*
pTableqinfoList
)
{
void
doDestroyTableList
(
STableListInfo
*
pTableqinfoList
)
{
taosArrayDestroy
(
pTableqinfoList
->
pTableList
);
taosHashCleanup
(
pTableqinfoList
->
map
);
if
(
pTableqinfoList
->
needSortTableByGroupId
)
{
...
...
source/libs/function/src/builtinsimpl.c
浏览文件 @
44010803
...
...
@@ -1160,6 +1160,7 @@ static int32_t findRowIndex(int32_t start, int32_t num, SColumnInfoData* pCol, c
}
ASSERT
(
0
);
return
0
;
}
int32_t
doMinMaxHelper
(
SqlFunctionCtx
*
pCtx
,
int32_t
isMinFunc
)
{
...
...
source/libs/function/src/tudf.c
浏览文件 @
44010803
...
...
@@ -81,7 +81,7 @@ static int32_t udfSpawnUdfd(SUdfdData* pData) {
taosDirName
(
path
);
#endif
}
else
{
strncpy
(
path
,
tsProcPath
,
strlen
(
tsProcPath
)
);
strncpy
(
path
,
tsProcPath
,
PATH_MAX
);
taosDirName
(
path
);
}
#ifdef WINDOWS
...
...
source/libs/function/src/udfd.c
浏览文件 @
44010803
...
...
@@ -453,7 +453,7 @@ void udfdProcessRpcRsp(void *parent, SRpcMsg *pMsg, SEpSet *pEpSet) {
goto
_return
;
}
taosCloseFile
(
&
file
);
strncpy
(
udf
->
path
,
path
,
strlen
(
path
)
);
strncpy
(
udf
->
path
,
path
,
PATH_MAX
);
tFreeSFuncInfo
(
pFuncInfo
);
taosArrayDestroy
(
retrieveRsp
.
pFuncInfos
);
msgInfo
->
code
=
0
;
...
...
@@ -566,17 +566,17 @@ int32_t udfdLoadUdf(char *udfName, SUdf *udf) {
uv_dlsym
(
&
udf
->
lib
,
processFuncName
,
(
void
**
)(
&
udf
->
aggProcFunc
));
char
startFuncName
[
TSDB_FUNC_NAME_LEN
+
6
]
=
{
0
};
char
*
startSuffix
=
"_start"
;
strncpy
(
startFuncName
,
processFuncName
,
s
trlen
(
process
FuncName
));
strncpy
(
startFuncName
,
processFuncName
,
s
izeof
(
start
FuncName
));
strncat
(
startFuncName
,
startSuffix
,
strlen
(
startSuffix
));
uv_dlsym
(
&
udf
->
lib
,
startFuncName
,
(
void
**
)(
&
udf
->
aggStartFunc
));
char
finishFuncName
[
TSDB_FUNC_NAME_LEN
+
7
]
=
{
0
};
char
*
finishSuffix
=
"_finish"
;
strncpy
(
finishFuncName
,
processFuncName
,
s
trlen
(
process
FuncName
));
strncpy
(
finishFuncName
,
processFuncName
,
s
izeof
(
finish
FuncName
));
strncat
(
finishFuncName
,
finishSuffix
,
strlen
(
finishSuffix
));
uv_dlsym
(
&
udf
->
lib
,
finishFuncName
,
(
void
**
)(
&
udf
->
aggFinishFunc
));
char
mergeFuncName
[
TSDB_FUNC_NAME_LEN
+
6
]
=
{
0
};
char
*
mergeSuffix
=
"_merge"
;
strncpy
(
finishFuncName
,
processFuncName
,
s
trlen
(
process
FuncName
));
strncpy
(
finishFuncName
,
processFuncName
,
s
izeof
(
finish
FuncName
));
strncat
(
finishFuncName
,
mergeSuffix
,
strlen
(
mergeSuffix
));
uv_dlsym
(
&
udf
->
lib
,
finishFuncName
,
(
void
**
)(
&
udf
->
aggMergeFunc
));
}
...
...
source/libs/index/src/indexComm.c
浏览文件 @
44010803
...
...
@@ -171,6 +171,7 @@ TExeCond tCompare(__compar_fn_t func, int8_t cmptype, void* a, void* b, int8_t d
return
tDoCompare
(
func
,
cmptype
,
&
va
,
&
vb
);
}
assert
(
0
);
return
BREAK
;
#endif
}
TExeCond
tDoCompare
(
__compar_fn_t
func
,
int8_t
comparType
,
void
*
a
,
void
*
b
)
{
...
...
source/libs/sync/src/syncIndexMgr.c
浏览文件 @
44010803
...
...
@@ -163,6 +163,7 @@ int64_t syncIndexMgrGetStartTime(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pR
}
}
ASSERT
(
0
);
return
-
1
;
}
void
syncIndexMgrSetRecvTime
(
SSyncIndexMgr
*
pSyncIndexMgr
,
const
SRaftId
*
pRaftId
,
int64_t
recvTime
)
{
...
...
@@ -190,6 +191,7 @@ int64_t syncIndexMgrGetRecvTime(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRa
}
}
ASSERT
(
0
);
return
-
1
;
}
// for debug -------------------
...
...
@@ -245,4 +247,5 @@ SyncTerm syncIndexMgrGetTerm(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftI
}
}
ASSERT
(
0
);
return
-
1
;
}
\ No newline at end of file
source/libs/transport/src/trans.c
浏览文件 @
44010803
...
...
@@ -43,7 +43,7 @@ void* rpcOpen(const SRpcInit* pInit) {
return
NULL
;
}
if
(
pInit
->
label
)
{
tstrncpy
(
pRpc
->
label
,
pInit
->
label
,
strlen
(
pInit
->
label
)
+
1
);
tstrncpy
(
pRpc
->
label
,
pInit
->
label
,
TSDB_LABEL_LEN
);
}
// register callback handle
pRpc
->
cfp
=
pInit
->
cfp
;
...
...
source/util/src/talgo.c
浏览文件 @
44010803
...
...
@@ -201,6 +201,7 @@ void *taosbsearch(const void *key, const void *base, int32_t nmemb, int32_t size
return
(
c
>
0
)
?
p
:
(
midx
>
0
?
p
-
size
:
NULL
);
}
else
{
ASSERT
(
0
);
return
NULL
;
}
}
...
...
source/util/src/tcompare.c
浏览文件 @
44010803
...
...
@@ -244,6 +244,7 @@ int32_t compareJsonVal(const void *pLeft, const void *pRight) {
return
0
;
}
else
{
assert
(
0
);
return
0
;
}
}
...
...
source/util/src/tlog.c
浏览文件 @
44010803
...
...
@@ -446,7 +446,10 @@ static inline void taosPrintLogImp(ELogLevel level, int32_t dflag, const char *b
}
if
(
dflag
&
DEBUG_SCREEN
)
{
write
(
1
,
buffer
,
(
uint32_t
)
len
);
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-result"
write
(
STDOUT_FILENO
,
buffer
,
(
uint32_t
)
len
);
#pragma GCC diagnostic pop
}
}
...
...
tests/test/c/sdbDump.c
浏览文件 @
44010803
...
...
@@ -20,6 +20,9 @@
#include "tconfig.h"
#include "tjson.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-result"
#define TMP_DNODE_DIR TD_TMP_DIR_PATH "dumpsdb"
#define TMP_MNODE_DIR TD_TMP_DIR_PATH "dumpsdb" TD_DIRSEP "mnode"
#define TMP_SDB_DATA_DIR TD_TMP_DIR_PATH "dumpsdb" TD_DIRSEP "mnode" TD_DIRSEP "data"
...
...
@@ -429,6 +432,7 @@ int32_t parseArgs(int32_t argc, char *argv[]) {
char
cmd
[
PATH_MAX
*
2
]
=
{
0
};
snprintf
(
cmd
,
sizeof
(
cmd
),
"rm -rf %s"
,
TMP_DNODE_DIR
);
system
(
cmd
);
#ifdef WINDOWS
taosMulMkDir
(
TMP_SDB_DATA_DIR
);
...
...
@@ -467,3 +471,5 @@ int32_t main(int32_t argc, char *argv[]) {
return
dumpSdb
();
}
#pragma GCC diagnostic pop
\ No newline at end of file
tests/tsim/src/simExe.c
浏览文件 @
44010803
...
...
@@ -464,7 +464,10 @@ void simStoreSystemContentResult(SScript *script, char *filename) {
taosCloseFile
(
&
pFile
);
char
rmCmd
[
MAX_FILE_NAME_LEN
]
=
{
0
};
sprintf
(
rmCmd
,
"rm -f %s"
,
filename
);
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-result"
system
(
rmCmd
);
#pragma GCC diagnostic pop
}
}
...
...
tools/shell/src/shellCommand.c
浏览文件 @
44010803
...
...
@@ -510,7 +510,10 @@ int32_t shellReadCommand(char *command) {
shellClearLineAfter
(
&
cmd
);
break
;
case
12
:
// Ctrl + L;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-result"
system
(
"clear"
);
#pragma GCC diagnostic pop
shellShowOnScreen
(
&
cmd
);
break
;
case
21
:
// Ctrl + U;
...
...
tools/shell/src/shellEngine.c
浏览文件 @
44010803
...
...
@@ -62,7 +62,10 @@ int32_t shellRunSingleCommand(char *command) {
}
if
(
shellRegexMatch
(
command
,
"^[
\t
]*clear[
\t
;]*$"
,
REG_EXTENDED
|
REG_ICASE
))
{
system
(
"clear"
);
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-result"
system
(
"clear"
);
#pragma GCC diagnostic pop
return
0
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录