Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
85110dcd
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
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看板
提交
85110dcd
编写于
8月 15, 2023
作者:
K
kailixu
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'enh/TD-25708-3.0' into enh/TD-25528-3.0x
上级
0bee41c2
8a84dce6
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
11 addition
and
28 deletion
+11
-28
source/dnode/mnode/impl/src/mndDb.c
source/dnode/mnode/impl/src/mndDb.c
+1
-2
source/dnode/mnode/impl/src/mndFunc.c
source/dnode/mnode/impl/src/mndFunc.c
+2
-3
source/dnode/mnode/impl/src/mndSma.c
source/dnode/mnode/impl/src/mndSma.c
+4
-5
source/dnode/mnode/impl/src/mndStream.c
source/dnode/mnode/impl/src/mndStream.c
+4
-5
source/libs/parser/src/parTranslater.c
source/libs/parser/src/parTranslater.c
+0
-13
未找到文件。
source/dnode/mnode/impl/src/mndDb.c
浏览文件 @
85110dcd
...
@@ -666,14 +666,13 @@ static int32_t mndProcessCreateDbReq(SRpcMsg *pReq) {
...
@@ -666,14 +666,13 @@ static int32_t mndProcessCreateDbReq(SRpcMsg *pReq) {
terrno
=
TSDB_CODE_INVALID_MSG
;
terrno
=
TSDB_CODE_INVALID_MSG
;
goto
_OVER
;
goto
_OVER
;
}
}
mInfo
(
"db:%s, start to create, vgroups:%d"
,
createReq
.
db
,
createReq
.
numOfVgroups
);
#ifdef WINDOWS
#ifdef WINDOWS
if
(
taosArrayGetSize
(
createReq
.
pRetensions
)
>
0
)
{
if
(
taosArrayGetSize
(
createReq
.
pRetensions
)
>
0
)
{
code
=
TSDB_CODE_PAR_INVALID_PLATFORM
;
code
=
TSDB_CODE_PAR_INVALID_PLATFORM
;
goto
_OVER
;
goto
_OVER
;
}
}
#endif
#endif
mInfo
(
"db:%s, start to create, vgroups:%d"
,
createReq
.
db
,
createReq
.
numOfVgroups
);
if
(
mndCheckDbPrivilege
(
pMnode
,
pReq
->
info
.
conn
.
user
,
MND_OPER_CREATE_DB
,
NULL
)
!=
0
)
{
if
(
mndCheckDbPrivilege
(
pMnode
,
pReq
->
info
.
conn
.
user
,
MND_OPER_CREATE_DB
,
NULL
)
!=
0
)
{
goto
_OVER
;
goto
_OVER
;
}
}
...
...
source/dnode/mnode/impl/src/mndFunc.c
浏览文件 @
85110dcd
...
@@ -359,12 +359,11 @@ static int32_t mndProcessCreateFuncReq(SRpcMsg *pReq) {
...
@@ -359,12 +359,11 @@ static int32_t mndProcessCreateFuncReq(SRpcMsg *pReq) {
terrno
=
TSDB_CODE_INVALID_MSG
;
terrno
=
TSDB_CODE_INVALID_MSG
;
goto
_OVER
;
goto
_OVER
;
}
}
mInfo
(
"func:%s, start to create, size:%d"
,
createReq
.
name
,
createReq
.
codeLen
);
#ifdef WINDOWS
#ifdef WINDOWS
code
=
TSDB_CODE_PAR_INVALID_PLATFORM
;
terrno
=
TSDB_CODE_PAR_INVALID_PLATFORM
;
goto
_OVER
;
goto
_OVER
;
#endif
#endif
mInfo
(
"func:%s, start to create, size:%d"
,
createReq
.
name
,
createReq
.
codeLen
);
if
(
mndCheckOperPrivilege
(
pMnode
,
pReq
->
info
.
conn
.
user
,
MND_OPER_CREATE_FUNC
)
!=
0
)
{
if
(
mndCheckOperPrivilege
(
pMnode
,
pReq
->
info
.
conn
.
user
,
MND_OPER_CREATE_FUNC
)
!=
0
)
{
goto
_OVER
;
goto
_OVER
;
}
}
...
...
source/dnode/mnode/impl/src/mndSma.c
浏览文件 @
85110dcd
...
@@ -655,10 +655,6 @@ _OVER:
...
@@ -655,10 +655,6 @@ _OVER:
}
}
static
int32_t
mndCheckCreateSmaReq
(
SMCreateSmaReq
*
pCreate
)
{
static
int32_t
mndCheckCreateSmaReq
(
SMCreateSmaReq
*
pCreate
)
{
#ifdef WINDOWS
terrno
=
TSDB_CODE_PAR_INVALID_PLATFORM
;
return
-
1
;
#endif
terrno
=
TSDB_CODE_MND_INVALID_SMA_OPTION
;
terrno
=
TSDB_CODE_MND_INVALID_SMA_OPTION
;
if
(
pCreate
->
name
[
0
]
==
0
)
return
-
1
;
if
(
pCreate
->
name
[
0
]
==
0
)
return
-
1
;
if
(
pCreate
->
stb
[
0
]
==
0
)
return
-
1
;
if
(
pCreate
->
stb
[
0
]
==
0
)
return
-
1
;
...
@@ -709,7 +705,10 @@ static int32_t mndProcessCreateSmaReq(SRpcMsg *pReq) {
...
@@ -709,7 +705,10 @@ static int32_t mndProcessCreateSmaReq(SRpcMsg *pReq) {
terrno
=
TSDB_CODE_INVALID_MSG
;
terrno
=
TSDB_CODE_INVALID_MSG
;
goto
_OVER
;
goto
_OVER
;
}
}
#ifdef WINDOWS
terrno
=
TSDB_CODE_PAR_INVALID_PLATFORM
;
goto
_OVER
;
#endif
mInfo
(
"sma:%s, start to create"
,
createReq
.
name
);
mInfo
(
"sma:%s, start to create"
,
createReq
.
name
);
if
(
mndCheckCreateSmaReq
(
&
createReq
)
!=
0
)
{
if
(
mndCheckCreateSmaReq
(
&
createReq
)
!=
0
)
{
goto
_OVER
;
goto
_OVER
;
...
...
source/dnode/mnode/impl/src/mndStream.c
浏览文件 @
85110dcd
...
@@ -253,10 +253,6 @@ static void mndShowStreamTrigger(char *dst, SStreamObj *pStream) {
...
@@ -253,10 +253,6 @@ static void mndShowStreamTrigger(char *dst, SStreamObj *pStream) {
}
}
static
int32_t
mndCheckCreateStreamReq
(
SCMCreateStreamReq
*
pCreate
)
{
static
int32_t
mndCheckCreateStreamReq
(
SCMCreateStreamReq
*
pCreate
)
{
#ifdef WINDOWS
terrno
=
TSDB_CODE_PAR_INVALID_PLATFORM
;
return
-
1
;
#endif
if
(
pCreate
->
name
[
0
]
==
0
||
pCreate
->
sql
==
NULL
||
pCreate
->
sql
[
0
]
==
0
||
pCreate
->
sourceDB
[
0
]
==
0
||
if
(
pCreate
->
name
[
0
]
==
0
||
pCreate
->
sql
==
NULL
||
pCreate
->
sql
[
0
]
==
0
||
pCreate
->
sourceDB
[
0
]
==
0
||
pCreate
->
targetStbFullName
[
0
]
==
0
)
{
pCreate
->
targetStbFullName
[
0
]
==
0
)
{
terrno
=
TSDB_CODE_MND_INVALID_STREAM_OPTION
;
terrno
=
TSDB_CODE_MND_INVALID_STREAM_OPTION
;
...
@@ -696,7 +692,10 @@ static int32_t mndProcessCreateStreamReq(SRpcMsg *pReq) {
...
@@ -696,7 +692,10 @@ static int32_t mndProcessCreateStreamReq(SRpcMsg *pReq) {
terrno
=
TSDB_CODE_INVALID_MSG
;
terrno
=
TSDB_CODE_INVALID_MSG
;
goto
_OVER
;
goto
_OVER
;
}
}
#ifdef WINDOWS
terrno
=
TSDB_CODE_PAR_INVALID_PLATFORM
;
goto
_OVER
;
#endif
mInfo
(
"stream:%s, start to create, sql:%s"
,
createStreamReq
.
name
,
createStreamReq
.
sql
);
mInfo
(
"stream:%s, start to create, sql:%s"
,
createStreamReq
.
name
,
createStreamReq
.
sql
);
if
(
mndCheckCreateStreamReq
(
&
createStreamReq
)
!=
0
)
{
if
(
mndCheckCreateStreamReq
(
&
createStreamReq
)
!=
0
)
{
...
...
source/libs/parser/src/parTranslater.c
浏览文件 @
85110dcd
...
@@ -4418,10 +4418,6 @@ static int32_t checkDbRetentionsOption(STranslateContext* pCxt, SNodeList* pRete
...
@@ -4418,10 +4418,6 @@ static int32_t checkDbRetentionsOption(STranslateContext* pCxt, SNodeList* pRete
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
}
#ifdef WINDOWS
return
generateSyntaxErrMsgExt
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_INVALID_PLATFORM
,
"Unsupported feature on this platform"
);
#endif
if
(
LIST_LENGTH
(
pRetentions
)
>
3
)
{
if
(
LIST_LENGTH
(
pRetentions
)
>
3
)
{
return
generateSyntaxErrMsgExt
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_INVALID_DB_OPTION
,
"Invalid option retentions"
);
return
generateSyntaxErrMsgExt
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_INVALID_DB_OPTION
,
"Invalid option retentions"
);
}
}
...
@@ -5871,9 +5867,6 @@ static int32_t checkCreateSmaIndex(STranslateContext* pCxt, SCreateIndexStmt* pS
...
@@ -5871,9 +5867,6 @@ static int32_t checkCreateSmaIndex(STranslateContext* pCxt, SCreateIndexStmt* pS
}
}
static
int32_t
translateCreateSmaIndex
(
STranslateContext
*
pCxt
,
SCreateIndexStmt
*
pStmt
)
{
static
int32_t
translateCreateSmaIndex
(
STranslateContext
*
pCxt
,
SCreateIndexStmt
*
pStmt
)
{
#ifdef WINDOWS
return
generateSyntaxErrMsgExt
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_INVALID_PLATFORM
,
"Unsupported feature on this platform"
);
#endif
int32_t
code
=
checkCreateSmaIndex
(
pCxt
,
pStmt
);
int32_t
code
=
checkCreateSmaIndex
(
pCxt
,
pStmt
);
pStmt
->
pReq
=
taosMemoryCalloc
(
1
,
sizeof
(
SMCreateSmaReq
));
pStmt
->
pReq
=
taosMemoryCalloc
(
1
,
sizeof
(
SMCreateSmaReq
));
if
(
pStmt
->
pReq
==
NULL
)
code
=
TSDB_CODE_OUT_OF_MEMORY
;
if
(
pStmt
->
pReq
==
NULL
)
code
=
TSDB_CODE_OUT_OF_MEMORY
;
...
@@ -7059,9 +7052,6 @@ static int32_t buildCreateStreamReq(STranslateContext* pCxt, SCreateStreamStmt*
...
@@ -7059,9 +7052,6 @@ static int32_t buildCreateStreamReq(STranslateContext* pCxt, SCreateStreamStmt*
}
}
static
int32_t
translateCreateStream
(
STranslateContext
*
pCxt
,
SCreateStreamStmt
*
pStmt
)
{
static
int32_t
translateCreateStream
(
STranslateContext
*
pCxt
,
SCreateStreamStmt
*
pStmt
)
{
#ifdef WINDOWS
return
generateSyntaxErrMsgExt
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_INVALID_PLATFORM
,
"Unsupported feature on this platform"
);
#endif
SCMCreateStreamReq
createReq
=
{
0
};
SCMCreateStreamReq
createReq
=
{
0
};
int32_t
code
=
checkCreateStream
(
pCxt
,
pStmt
);
int32_t
code
=
checkCreateStream
(
pCxt
,
pStmt
);
...
@@ -7211,9 +7201,6 @@ static int32_t readFromFile(char* pName, int32_t* len, char** buf) {
...
@@ -7211,9 +7201,6 @@ static int32_t readFromFile(char* pName, int32_t* len, char** buf) {
}
}
static
int32_t
translateCreateFunction
(
STranslateContext
*
pCxt
,
SCreateFunctionStmt
*
pStmt
)
{
static
int32_t
translateCreateFunction
(
STranslateContext
*
pCxt
,
SCreateFunctionStmt
*
pStmt
)
{
#ifdef WINDOWS
return
generateSyntaxErrMsgExt
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_INVALID_PLATFORM
,
"Unsupported feature on this platform"
);
#endif
if
(
fmIsBuiltinFunc
(
pStmt
->
funcName
))
{
if
(
fmIsBuiltinFunc
(
pStmt
->
funcName
))
{
return
generateSyntaxErrMsg
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_INVALID_FUNCTION_NAME
);
return
generateSyntaxErrMsg
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_INVALID_FUNCTION_NAME
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录