Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
2c80d7e6
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看板
提交
2c80d7e6
编写于
7月 18, 2023
作者:
wmmhello
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'main' of
https://github.com/taosdata/TDengine
into fix/TS-3672
上级
6c350815
d1835c86
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
37 addition
and
11 deletion
+37
-11
docs/en/14-reference/12-config/index.md
docs/en/14-reference/12-config/index.md
+9
-0
docs/zh/14-reference/12-config/index.md
docs/zh/14-reference/12-config/index.md
+9
-0
include/libs/nodes/cmdnodes.h
include/libs/nodes/cmdnodes.h
+3
-3
packaging/tools/install_client.sh
packaging/tools/install_client.sh
+3
-1
source/dnode/mnode/impl/src/mndUser.c
source/dnode/mnode/impl/src/mndUser.c
+4
-4
source/libs/executor/src/timewindowoperator.c
source/libs/executor/src/timewindowoperator.c
+2
-0
source/libs/parser/src/parTranslater.c
source/libs/parser/src/parTranslater.c
+1
-3
tests/system-test/1-insert/drop.py
tests/system-test/1-insert/drop.py
+6
-0
未找到文件。
docs/en/14-reference/12-config/index.md
浏览文件 @
2c80d7e6
...
...
@@ -722,6 +722,15 @@ The charset that takes effect is UTF-8.
| Value Range | 0: not change; 1: change by modification |
| Default Value | 0 |
### tmqMaxTopicNum
| Attribute | Description |
| -------- | ------------------ |
| Applicable | Server Only |
| Meaning | The max num of topics |
| Value Range | 1-10000|
| Default Value | 20 |
## 3.0 Parameters
| # |
**Parameter**
|
**Applicable to 2.x **
|
**Applicable to 3.0 **
| Current behavior in 3.0 |
...
...
docs/zh/14-reference/12-config/index.md
浏览文件 @
2c80d7e6
...
...
@@ -726,6 +726,15 @@ charset 的有效值是 UTF-8。
| 取值范围 | 0: 不改变;1:改变 |
| 缺省值 | 0 |
### tmqMaxTopicNum
| 属性 | 说明 |
| -------- | ------------------ |
| 适用范围 | 仅服务端适用 |
| 含义 | 订阅最多可建立的 topic 数量 |
| 取值范围 | 1-10000|
| 缺省值 | 20 |
## 压缩参数
### compressMsgSize
...
...
include/libs/nodes/cmdnodes.h
浏览文件 @
2c80d7e6
...
...
@@ -358,7 +358,7 @@ typedef struct SRestoreComponentNodeStmt {
typedef
struct
SCreateTopicStmt
{
ENodeType
type
;
char
topicName
[
TSDB_T
ABLE
_NAME_LEN
];
char
topicName
[
TSDB_T
OPIC
_NAME_LEN
];
char
subDbName
[
TSDB_DB_NAME_LEN
];
char
subSTbName
[
TSDB_TABLE_NAME_LEN
];
bool
ignoreExists
;
...
...
@@ -369,13 +369,13 @@ typedef struct SCreateTopicStmt {
typedef
struct
SDropTopicStmt
{
ENodeType
type
;
char
topicName
[
TSDB_T
ABLE
_NAME_LEN
];
char
topicName
[
TSDB_T
OPIC
_NAME_LEN
];
bool
ignoreNotExists
;
}
SDropTopicStmt
;
typedef
struct
SDropCGroupStmt
{
ENodeType
type
;
char
topicName
[
TSDB_T
ABLE
_NAME_LEN
];
char
topicName
[
TSDB_T
OPIC
_NAME_LEN
];
char
cgroup
[
TSDB_CGROUP_LEN
];
bool
ignoreNotExists
;
}
SDropCGroupStmt
;
...
...
packaging/tools/install_client.sh
浏览文件 @
2c80d7e6
...
...
@@ -267,7 +267,9 @@ function install_log() {
}
function
install_connector
()
{
${
csudo
}
cp
-rf
${
script_dir
}
/connector/
${
install_main_dir
}
/
if
[
-d
${
script_dir
}
/connector
]
;
then
${
csudo
}
cp
-rf
${
script_dir
}
/connector/
${
install_main_dir
}
/
fi
}
function
install_examples
()
{
...
...
source/dnode/mnode/impl/src/mndUser.c
浏览文件 @
2c80d7e6
...
...
@@ -922,19 +922,19 @@ static int32_t mndProcessAlterUserReq(SRpcMsg *pReq) {
}
}
if
(
alterReq
.
alterType
==
TSDB_ALTER_USER_ADD_READ_TABLE
)
{
if
(
alterReq
.
alterType
==
TSDB_ALTER_USER_ADD_READ_TABLE
||
alterReq
.
alterType
==
TSDB_ALTER_USER_ADD_ALL_TABLE
)
{
if
(
mndTablePriviledge
(
pMnode
,
newUser
.
readTbs
,
newUser
.
useDbs
,
&
alterReq
,
pSdb
)
!=
0
)
goto
_OVER
;
}
if
(
alterReq
.
alterType
==
TSDB_ALTER_USER_ADD_WRITE_TABLE
)
{
if
(
alterReq
.
alterType
==
TSDB_ALTER_USER_ADD_WRITE_TABLE
||
alterReq
.
alterType
==
TSDB_ALTER_USER_ADD_ALL_TABLE
)
{
if
(
mndTablePriviledge
(
pMnode
,
newUser
.
writeTbs
,
newUser
.
useDbs
,
&
alterReq
,
pSdb
)
!=
0
)
goto
_OVER
;
}
if
(
alterReq
.
alterType
==
TSDB_ALTER_USER_REMOVE_READ_TABLE
)
{
if
(
alterReq
.
alterType
==
TSDB_ALTER_USER_REMOVE_READ_TABLE
||
alterReq
.
alterType
==
TSDB_ALTER_USER_REMOVE_ALL_TABLE
)
{
if
(
mndRemoveTablePriviledge
(
pMnode
,
newUser
.
readTbs
,
newUser
.
useDbs
,
&
alterReq
,
pSdb
)
!=
0
)
goto
_OVER
;
}
if
(
alterReq
.
alterType
==
TSDB_ALTER_USER_REMOVE_WRITE_TABLE
)
{
if
(
alterReq
.
alterType
==
TSDB_ALTER_USER_REMOVE_WRITE_TABLE
||
alterReq
.
alterType
==
TSDB_ALTER_USER_REMOVE_ALL_TABLE
)
{
if
(
mndRemoveTablePriviledge
(
pMnode
,
newUser
.
writeTbs
,
newUser
.
useDbs
,
&
alterReq
,
pSdb
)
!=
0
)
goto
_OVER
;
}
...
...
source/libs/executor/src/timewindowoperator.c
浏览文件 @
2c80d7e6
...
...
@@ -4350,6 +4350,7 @@ static void doMergeAlignedIntervalAgg(SOperatorInfo* pOperator) {
finalizeResultRows
(
pIaInfo
->
aggSup
.
pResultBuf
,
&
pResultRowInfo
->
cur
,
pSup
,
pRes
,
pTaskInfo
);
resetResultRow
(
pMiaInfo
->
pResultRow
,
pIaInfo
->
aggSup
.
resultRowSize
-
sizeof
(
SResultRow
));
cleanupAfterGroupResultGen
(
pMiaInfo
,
pRes
);
doFilter
(
pRes
,
pOperator
->
exprSupp
.
pFilterInfo
,
NULL
);
}
setOperatorCompleted
(
pOperator
);
...
...
@@ -4370,6 +4371,7 @@ static void doMergeAlignedIntervalAgg(SOperatorInfo* pOperator) {
pMiaInfo
->
prefetchedBlock
=
pBlock
;
cleanupAfterGroupResultGen
(
pMiaInfo
,
pRes
);
doFilter
(
pRes
,
pOperator
->
exprSupp
.
pFilterInfo
,
NULL
);
break
;
}
else
{
// continue
...
...
source/libs/parser/src/parTranslater.c
浏览文件 @
2c80d7e6
...
...
@@ -6135,9 +6135,7 @@ static int32_t translateCreateTopic(STranslateContext* pCxt, SCreateTopicStmt* p
static
int32_t
translateDropTopic
(
STranslateContext
*
pCxt
,
SDropTopicStmt
*
pStmt
)
{
SMDropTopicReq
dropReq
=
{
0
};
SName
name
;
tNameSetDbName
(
&
name
,
pCxt
->
pParseCxt
->
acctId
,
pStmt
->
topicName
,
strlen
(
pStmt
->
topicName
));
tNameGetFullDbName
(
&
name
,
dropReq
.
name
);
snprintf
(
dropReq
.
name
,
sizeof
(
dropReq
.
name
),
"%d.%s"
,
pCxt
->
pParseCxt
->
acctId
,
pStmt
->
topicName
);
dropReq
.
igNotExists
=
pStmt
->
ignoreNotExists
;
return
buildCmdMsg
(
pCxt
,
TDMT_MND_TMQ_DROP_TOPIC
,
(
FSerializeFunc
)
tSerializeSMDropTopicReq
,
&
dropReq
);
...
...
tests/system-test/1-insert/drop.py
浏览文件 @
2c80d7e6
...
...
@@ -129,6 +129,12 @@ class TDTestCase:
tdSql
.
query
(
f
'select * from information_schema.ins_topics where topic_name = "
{
topic_name
}
"'
)
tdSql
.
checkEqual
(
tdSql
.
queryResult
[
0
][
3
],
f
'create topic
{
topic_name
}
as select c0 from
{
self
.
dbname
}
.
{
stbname
}
'
)
tdSql
.
execute
(
f
'drop topic
{
topic_name
}
'
)
#TD-25222
long_topic_name
=
"hhhhjjhhhhqwertyuiasdfghjklzxcvbnmhhhhjjhhhhqwertyuiasdfghjklzxcvbnmhhhhjjhhhhqwertyuiasdfghjklzxcvbnm"
tdSql
.
execute
(
f
'create topic
{
long_topic_name
}
as select * from
{
self
.
dbname
}
.
{
stbname
}
'
)
tdSql
.
execute
(
f
'drop topic
{
long_topic_name
}
'
)
tdSql
.
execute
(
f
'drop database
{
self
.
dbname
}
'
)
def
drop_stream_check
(
self
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录