Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
490889f8
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
490889f8
编写于
6月 03, 2022
作者:
wafwerar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(os): win python case error
上级
3d351b76
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
26 addition
and
28 deletion
+26
-28
include/util/tutil.h
include/util/tutil.h
+3
-1
source/dnode/mnode/impl/src/mndFunc.c
source/dnode/mnode/impl/src/mndFunc.c
+1
-1
source/dnode/mnode/impl/test/acct/CMakeLists.txt
source/dnode/mnode/impl/test/acct/CMakeLists.txt
+4
-6
source/dnode/mnode/impl/test/func/CMakeLists.txt
source/dnode/mnode/impl/test/func/CMakeLists.txt
+2
-2
source/dnode/mnode/impl/test/profile/CMakeLists.txt
source/dnode/mnode/impl/test/profile/CMakeLists.txt
+2
-2
source/dnode/mnode/impl/test/show/CMakeLists.txt
source/dnode/mnode/impl/test/show/CMakeLists.txt
+2
-2
source/libs/index/test/CMakeLists.txt
source/libs/index/test/CMakeLists.txt
+8
-10
source/libs/planner/test/CMakeLists.txt
source/libs/planner/test/CMakeLists.txt
+2
-2
source/libs/scalar/src/sclfunc.c
source/libs/scalar/src/sclfunc.c
+1
-1
tests/pytest/util/dnodes.py
tests/pytest/util/dnodes.py
+1
-1
未找到文件。
include/util/tutil.h
浏览文件 @
490889f8
...
...
@@ -57,11 +57,13 @@ static FORCE_INLINE void taosEncryptPass_c(uint8_t *inBuf, size_t len, char *tar
tMD5Init
(
&
context
);
tMD5Update
(
&
context
,
inBuf
,
(
uint32_t
)
len
);
tMD5Final
(
&
context
);
char
buf
[
TSDB_PASSWORD_LEN
+
1
];
sprintf
(
target
,
"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
,
context
.
digest
[
0
],
sprintf
(
buf
,
"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
,
context
.
digest
[
0
],
context
.
digest
[
1
],
context
.
digest
[
2
],
context
.
digest
[
3
],
context
.
digest
[
4
],
context
.
digest
[
5
],
context
.
digest
[
6
],
context
.
digest
[
7
],
context
.
digest
[
8
],
context
.
digest
[
9
],
context
.
digest
[
10
],
context
.
digest
[
11
],
context
.
digest
[
12
],
context
.
digest
[
13
],
context
.
digest
[
14
],
context
.
digest
[
15
]);
memcpy
(
target
,
buf
,
TSDB_PASSWORD_LEN
);
}
#ifdef __cplusplus
...
...
source/dnode/mnode/impl/src/mndFunc.c
浏览文件 @
490889f8
...
...
@@ -538,7 +538,7 @@ static int32_t mndRetrieveFuncs(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
colDataAppend
(
pColInfo
,
numOfRows
,
(
const
char
*
)
&
isAgg
,
false
);
char
b3
[
TSDB_TYPE_STR_MAX_LEN
]
=
{
0
};
char
b3
[
TSDB_TYPE_STR_MAX_LEN
+
1
]
=
{
0
};
STR_WITH_MAXSIZE_TO_VARSTR
(
b3
,
mnodeGenTypeStr
(
buf
,
TSDB_TYPE_STR_MAX_LEN
,
pFunc
->
outputType
,
pFunc
->
outputLen
),
pShow
->
pMeta
->
pSchemas
[
cols
].
bytes
);
...
...
source/dnode/mnode/impl/test/acct/CMakeLists.txt
浏览文件 @
490889f8
...
...
@@ -5,9 +5,7 @@ target_link_libraries(
PUBLIC sut
)
if
(
NOT TD_WINDOWS
)
add_test
(
NAME acctTest
COMMAND acctTest
)
endif
(
NOT TD_WINDOWS
)
add_test
(
NAME acctTest
COMMAND acctTest
)
source/dnode/mnode/impl/test/func/CMakeLists.txt
浏览文件 @
490889f8
...
...
@@ -5,9 +5,9 @@ target_link_libraries(
PUBLIC sut
)
if
(
NOT TD_WINDOWS
)
#
if(NOT TD_WINDOWS)
add_test
(
NAME funcTest
COMMAND funcTest
)
endif
(
NOT TD_WINDOWS
)
#
endif(NOT TD_WINDOWS)
source/dnode/mnode/impl/test/profile/CMakeLists.txt
浏览文件 @
490889f8
...
...
@@ -5,9 +5,9 @@ target_link_libraries(
PUBLIC sut
)
if
(
NOT TD_WINDOWS
)
#
if(NOT TD_WINDOWS)
add_test
(
NAME profileTest
COMMAND profileTest
)
endif
(
NOT TD_WINDOWS
)
#
endif(NOT TD_WINDOWS)
source/dnode/mnode/impl/test/show/CMakeLists.txt
浏览文件 @
490889f8
...
...
@@ -5,9 +5,9 @@ target_link_libraries(
PUBLIC sut
)
if
(
NOT TD_WINDOWS
)
#
if(NOT TD_WINDOWS)
add_test
(
NAME showTest
COMMAND showTest
)
endif
(
NOT TD_WINDOWS
)
#
endif(NOT TD_WINDOWS)
source/libs/index/test/CMakeLists.txt
浏览文件 @
490889f8
...
...
@@ -92,16 +92,14 @@ target_link_libraries (idxJsonUT
index
)
if
(
NOT TD_WINDOWS
)
add_test
(
NAME idxtest
COMMAND idxTest
)
add_test
(
NAME idxJsonUT
COMMAND idxJsonUT
)
endif
(
NOT TD_WINDOWS
)
add_test
(
NAME idxtest
COMMAND idxTest
)
add_test
(
NAME idxJsonUT
COMMAND idxJsonUT
)
add_test
(
NAME idxUtilUT
COMMAND idxUtilUT
...
...
source/libs/planner/test/CMakeLists.txt
浏览文件 @
490889f8
...
...
@@ -32,9 +32,9 @@ if(${BUILD_WINGETOPT})
target_link_libraries
(
plannerTest PUBLIC wingetopt
)
endif
()
if
(
NOT TD_WINDOWS
)
#
if(NOT TD_WINDOWS)
add_test
(
NAME plannerTest
COMMAND plannerTest
)
endif
(
NOT TD_WINDOWS
)
#
endif(NOT TD_WINDOWS)
source/libs/scalar/src/sclfunc.c
浏览文件 @
490889f8
...
...
@@ -718,7 +718,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
int16_t
outputType
=
GET_PARAM_TYPE
(
&
pOutput
[
0
]);
int64_t
outputLen
=
GET_PARAM_BYTES
(
&
pOutput
[
0
]);
char
*
outputBuf
=
taosMemoryCalloc
(
outputLen
*
pInput
[
0
].
numOfRows
,
1
);
char
*
outputBuf
=
taosMemoryCalloc
(
outputLen
*
pInput
[
0
].
numOfRows
+
1
,
1
);
char
*
output
=
outputBuf
;
for
(
int32_t
i
=
0
;
i
<
pInput
[
0
].
numOfRows
;
++
i
)
{
...
...
tests/pytest/util/dnodes.py
浏览文件 @
490889f8
...
...
@@ -247,7 +247,7 @@ class TDDnode:
if
bool
(
updatecfgDict
)
and
updatecfgDict
[
0
]
and
updatecfgDict
[
0
][
0
]:
print
(
updatecfgDict
[
0
][
0
])
for
key
,
value
in
updatecfgDict
[
0
][
0
].
items
():
if
key
==
"clientCfg"
:
if
key
==
"clientCfg"
and
self
.
remoteIP
==
""
and
not
platform
.
system
().
lower
()
==
'windows'
:
continue
if
value
==
'dataDir'
:
if
isFirstDir
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录