Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
868cf83c
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看板
提交
868cf83c
编写于
12月 29, 2022
作者:
sangshuduo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore: prepare for string passing
上级
2673b6a5
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
15 addition
and
15 deletion
+15
-15
source/dnode/mgmt/node_mgmt/src/dmNodes.c
source/dnode/mgmt/node_mgmt/src/dmNodes.c
+3
-3
source/os/src/osLocale.c
source/os/src/osLocale.c
+1
-1
source/os/src/osString.c
source/os/src/osString.c
+3
-3
tools/shell/src/shellArguments.c
tools/shell/src/shellArguments.c
+1
-1
tools/shell/src/shellCommand.c
tools/shell/src/shellCommand.c
+1
-1
tools/shell/src/shellUtil.c
tools/shell/src/shellUtil.c
+5
-5
tools/shell/src/shellWebsocket.c
tools/shell/src/shellWebsocket.c
+1
-1
未找到文件。
source/dnode/mgmt/node_mgmt/src/dmNodes.c
浏览文件 @
868cf83c
...
@@ -109,8 +109,8 @@ static int32_t dmStartNodes(SDnode *pDnode) {
...
@@ -109,8 +109,8 @@ static int32_t dmStartNodes(SDnode *pDnode) {
}
}
}
}
dInfo
(
"T
Dengine
initialized successfully"
);
dInfo
(
"T
he daemon
initialized successfully"
);
dmReportStartup
(
"T
Dengine
"
,
"initialized successfully"
);
dmReportStartup
(
"T
he daemon
"
,
"initialized successfully"
);
return
0
;
return
0
;
}
}
...
@@ -142,7 +142,7 @@ int32_t dmRunDnode(SDnode *pDnode) {
...
@@ -142,7 +142,7 @@ int32_t dmRunDnode(SDnode *pDnode) {
while
(
1
)
{
while
(
1
)
{
if
(
pDnode
->
stop
)
{
if
(
pDnode
->
stop
)
{
dInfo
(
"T
Dengine
is about to stop"
);
dInfo
(
"T
he daemon
is about to stop"
);
dmSetStatus
(
pDnode
,
DND_STAT_STOPPED
);
dmSetStatus
(
pDnode
,
DND_STAT_STOPPED
);
dmStopNodes
(
pDnode
);
dmStopNodes
(
pDnode
);
dmCloseNodes
(
pDnode
);
dmCloseNodes
(
pDnode
);
...
...
source/os/src/osLocale.c
浏览文件 @
868cf83c
...
@@ -71,7 +71,7 @@ char *taosCharsetReplace(char *charsetstr) {
...
@@ -71,7 +71,7 @@ char *taosCharsetReplace(char *charsetstr) {
* seems does not response as expected.
* seems does not response as expected.
*
*
* In some Linux systems, setLocale(LC_CTYPE, "") may return NULL, in which case the launch of
* In some Linux systems, setLocale(LC_CTYPE, "") may return NULL, in which case the launch of
* both the
TDengine
Server and the Client may be interrupted.
* both the Server and the Client may be interrupted.
*
*
* In case that the setLocale failed to be executed, the right charset needs to be set.
* In case that the setLocale failed to be executed, the right charset needs to be set.
*/
*/
...
...
source/os/src/osString.c
浏览文件 @
868cf83c
...
@@ -217,7 +217,7 @@ void taosReleaseConv(int32_t idx, iconv_t conv, ConvType type) {
...
@@ -217,7 +217,7 @@ void taosReleaseConv(int32_t idx, iconv_t conv, ConvType type) {
bool
taosMbsToUcs4
(
const
char
*
mbs
,
size_t
mbsLength
,
TdUcs4
*
ucs4
,
int32_t
ucs4_max_len
,
int32_t
*
len
)
{
bool
taosMbsToUcs4
(
const
char
*
mbs
,
size_t
mbsLength
,
TdUcs4
*
ucs4
,
int32_t
ucs4_max_len
,
int32_t
*
len
)
{
#ifdef DISALLOW_NCHAR_WITHOUT_ICONV
#ifdef DISALLOW_NCHAR_WITHOUT_ICONV
printf
(
"Nchar cannot be read and written without iconv, please install iconv library and recompile
TDengine
.
\n
"
);
printf
(
"Nchar cannot be read and written without iconv, please install iconv library and recompile.
\n
"
);
return
-
1
;
return
-
1
;
#else
#else
memset
(
ucs4
,
0
,
ucs4_max_len
);
memset
(
ucs4
,
0
,
ucs4_max_len
);
...
@@ -245,7 +245,7 @@ bool taosMbsToUcs4(const char *mbs, size_t mbsLength, TdUcs4 *ucs4, int32_t ucs4
...
@@ -245,7 +245,7 @@ bool taosMbsToUcs4(const char *mbs, size_t mbsLength, TdUcs4 *ucs4, int32_t ucs4
int32_t
taosUcs4ToMbs
(
TdUcs4
*
ucs4
,
int32_t
ucs4_max_len
,
char
*
mbs
)
{
int32_t
taosUcs4ToMbs
(
TdUcs4
*
ucs4
,
int32_t
ucs4_max_len
,
char
*
mbs
)
{
#ifdef DISALLOW_NCHAR_WITHOUT_ICONV
#ifdef DISALLOW_NCHAR_WITHOUT_ICONV
printf
(
"Nchar cannot be read and written without iconv, please install iconv library and recompile
TDengine
.
\n
"
);
printf
(
"Nchar cannot be read and written without iconv, please install iconv library and recompile.
\n
"
);
return
-
1
;
return
-
1
;
#else
#else
...
@@ -263,7 +263,7 @@ int32_t taosUcs4ToMbs(TdUcs4 *ucs4, int32_t ucs4_max_len, char *mbs) {
...
@@ -263,7 +263,7 @@ int32_t taosUcs4ToMbs(TdUcs4 *ucs4, int32_t ucs4_max_len, char *mbs) {
}
}
bool
taosValidateEncodec
(
const
char
*
encodec
)
{
bool
taosValidateEncodec
(
const
char
*
encodec
)
{
#ifdef DISALLOW_NCHAR_WITHOUT_ICONV
#ifdef DISALLOW_NCHAR_WITHOUT_ICONV
printf
(
"Nchar cannot be read and written without iconv, please install iconv library and recompile
TDengine
.
\n
"
);
printf
(
"Nchar cannot be read and written without iconv, please install iconv library and recompile.
\n
"
);
return
true
;
return
true
;
#else
#else
iconv_t
cd
=
iconv_open
(
encodec
,
DEFAULT_UNICODE_ENCODEC
);
iconv_t
cd
=
iconv_open
(
encodec
,
DEFAULT_UNICODE_ENCODEC
);
...
...
tools/shell/src/shellArguments.c
浏览文件 @
868cf83c
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
#define TAOS_CONSOLE_PROMPT_HEADER "taos> "
#define TAOS_CONSOLE_PROMPT_HEADER "taos> "
#define TAOS_CONSOLE_PROMPT_CONTINUE " -> "
#define TAOS_CONSOLE_PROMPT_CONTINUE " -> "
#define SHELL_HOST "T
Dengin
e server FQDN to connect. The default host is localhost."
#define SHELL_HOST "T
h
e server FQDN to connect. The default host is localhost."
#define SHELL_PORT "The TCP/IP port number to use for the connection."
#define SHELL_PORT "The TCP/IP port number to use for the connection."
#define SHELL_USER "The user name to use when connecting to the server."
#define SHELL_USER "The user name to use when connecting to the server."
#define SHELL_PASSWORD "The password to use when connecting to the server."
#define SHELL_PASSWORD "The password to use when connecting to the server."
...
...
tools/shell/src/shellCommand.c
浏览文件 @
868cf83c
...
@@ -75,7 +75,7 @@ void shellGetPrevCharSize(const char *str, int32_t pos, int32_t *size, int32_t *
...
@@ -75,7 +75,7 @@ void shellGetPrevCharSize(const char *str, int32_t pos, int32_t *size, int32_t *
}
}
taosMbToWchar
(
&
wc
,
str
+
pos
,
MB_CUR_MAX
);
taosMbToWchar
(
&
wc
,
str
+
pos
,
MB_CUR_MAX
);
// assert(rc == *size); // it will be core, if str is encode by utf8 and
taos
charset is gbk
// assert(rc == *size); // it will be core, if str is encode by utf8 and charset is gbk
*
width
=
taosWcharWidth
(
wc
);
*
width
=
taosWcharWidth
(
wc
);
}
}
...
...
tools/shell/src/shellUtil.c
浏览文件 @
868cf83c
...
@@ -50,19 +50,19 @@ bool shellRegexMatch(const char *s, const char *reg, int32_t cflags) {
...
@@ -50,19 +50,19 @@ bool shellRegexMatch(const char *s, const char *reg, int32_t cflags) {
int32_t
shellCheckIntSize
()
{
int32_t
shellCheckIntSize
()
{
if
(
sizeof
(
int8_t
)
!=
1
)
{
if
(
sizeof
(
int8_t
)
!=
1
)
{
printf
(
"
taos
int8 size is %d(!= 1)"
,
(
int
)
sizeof
(
int8_t
));
printf
(
"int8 size is %d(!= 1)"
,
(
int
)
sizeof
(
int8_t
));
return
-
1
;
return
-
1
;
}
}
if
(
sizeof
(
int16_t
)
!=
2
)
{
if
(
sizeof
(
int16_t
)
!=
2
)
{
printf
(
"
taos
int16 size is %d(!= 2)"
,
(
int
)
sizeof
(
int16_t
));
printf
(
"int16 size is %d(!= 2)"
,
(
int
)
sizeof
(
int16_t
));
return
-
1
;
return
-
1
;
}
}
if
(
sizeof
(
int32_t
)
!=
4
)
{
if
(
sizeof
(
int32_t
)
!=
4
)
{
printf
(
"
taos
int32 size is %d(!= 4)"
,
(
int
)
sizeof
(
int32_t
));
printf
(
"int32 size is %d(!= 4)"
,
(
int
)
sizeof
(
int32_t
));
return
-
1
;
return
-
1
;
}
}
if
(
sizeof
(
int64_t
)
!=
8
)
{
if
(
sizeof
(
int64_t
)
!=
8
)
{
printf
(
"
taos
int64 size is %d(!= 8)"
,
(
int
)
sizeof
(
int64_t
));
printf
(
"int64 size is %d(!= 8)"
,
(
int
)
sizeof
(
int64_t
));
return
-
1
;
return
-
1
;
}
}
return
0
;
return
0
;
...
@@ -80,7 +80,7 @@ void shellGenerateAuth() {
...
@@ -80,7 +80,7 @@ void shellGenerateAuth() {
void
shellDumpConfig
()
{
void
shellDumpConfig
()
{
SConfig
*
pCfg
=
taosGetCfg
();
SConfig
*
pCfg
=
taosGetCfg
();
if
(
pCfg
==
NULL
)
{
if
(
pCfg
==
NULL
)
{
printf
(
"
TDengine
read global config failed!
\r\n
"
);
printf
(
"read global config failed!
\r\n
"
);
}
else
{
}
else
{
cfgDumpCfg
(
pCfg
,
1
,
true
);
cfgDumpCfg
(
pCfg
,
1
,
true
);
}
}
...
...
tools/shell/src/shellWebsocket.c
浏览文件 @
868cf83c
...
@@ -235,7 +235,7 @@ void shellRunSingleCommandWebsocketImp(char *command) {
...
@@ -235,7 +235,7 @@ void shellRunSingleCommandWebsocketImp(char *command) {
if
(
reconnectNum
==
0
)
{
if
(
reconnectNum
==
0
)
{
continue
;
continue
;
}
else
{
}
else
{
fprintf
(
stderr
,
"T
Dengin
e server is disconnected, will try to reconnect
\n
"
);
fprintf
(
stderr
,
"T
h
e server is disconnected, will try to reconnect
\n
"
);
}
}
return
;
return
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录