Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
51016167
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,发现更多精彩内容 >>
未验证
提交
51016167
编写于
9月 07, 2020
作者:
S
Shengliang Guan
提交者:
GitHub
9月 07, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3409 from taosdata/feature/mqtt
Feature/mqtt
上级
5e5750bd
c413e0d7
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
11 addition
and
11 deletion
+11
-11
packaging/cfg/taos.cfg
packaging/cfg/taos.cfg
+1
-1
src/common/src/tglobal.c
src/common/src/tglobal.c
+3
-3
tests/script/general/insert/insert_drop.sim
tests/script/general/insert/insert_drop.sim
+1
-1
tests/script/general/parser/commit.sim
tests/script/general/parser/commit.sim
+1
-1
tests/script/general/parser/selectResNum.sim
tests/script/general/parser/selectResNum.sim
+1
-1
tests/script/general/parser/topbot.sim
tests/script/general/parser/topbot.sim
+1
-1
tests/script/general/parser/union.sim
tests/script/general/parser/union.sim
+1
-1
tests/script/general/table/limit.sim
tests/script/general/table/limit.sim
+1
-1
tests/script/unique/vnode/replica3_vgroup.sim
tests/script/unique/vnode/replica3_vgroup.sim
+1
-1
未找到文件。
packaging/cfg/taos.cfg
浏览文件 @
51016167
...
@@ -129,7 +129,7 @@
...
@@ -129,7 +129,7 @@
# mqttPort 1883
# mqttPort 1883
# mqtt topic
# mqtt topic
# mqttTopic /
weather/loop
# mqttTopic /
test
# the compressed rpc message, option:
# the compressed rpc message, option:
# -1 (no compression)
# -1 (no compression)
...
...
src/common/src/tglobal.c
浏览文件 @
51016167
...
@@ -1298,21 +1298,21 @@ bool taosCheckGlobalCfg() {
...
@@ -1298,21 +1298,21 @@ bool taosCheckGlobalCfg() {
taosGetFqdn
(
tsLocalFqdn
);
taosGetFqdn
(
tsLocalFqdn
);
}
}
snprintf
(
tsLocalEp
,
sizeof
(
tsLocalEp
),
"%s:%
d
"
,
tsLocalFqdn
,
tsServerPort
);
snprintf
(
tsLocalEp
,
sizeof
(
tsLocalEp
),
"%s:%
u
"
,
tsLocalFqdn
,
tsServerPort
);
uInfo
(
"localEp is: %s"
,
tsLocalEp
);
uInfo
(
"localEp is: %s"
,
tsLocalEp
);
if
(
tsFirst
[
0
]
==
0
)
{
if
(
tsFirst
[
0
]
==
0
)
{
strcpy
(
tsFirst
,
tsLocalEp
);
strcpy
(
tsFirst
,
tsLocalEp
);
}
else
{
}
else
{
taosGetFqdnPortFromEp
(
tsFirst
,
fqdn
,
&
port
);
taosGetFqdnPortFromEp
(
tsFirst
,
fqdn
,
&
port
);
snprintf
(
tsFirst
,
sizeof
(
tsFirst
),
"%s:%
d
"
,
fqdn
,
port
);
snprintf
(
tsFirst
,
sizeof
(
tsFirst
),
"%s:%
u
"
,
fqdn
,
port
);
}
}
if
(
tsSecond
[
0
]
==
0
)
{
if
(
tsSecond
[
0
]
==
0
)
{
strcpy
(
tsSecond
,
tsLocalEp
);
strcpy
(
tsSecond
,
tsLocalEp
);
}
else
{
}
else
{
taosGetFqdnPortFromEp
(
tsSecond
,
fqdn
,
&
port
);
taosGetFqdnPortFromEp
(
tsSecond
,
fqdn
,
&
port
);
snprintf
(
tsSecond
,
sizeof
(
tsSecond
),
"%s:%
d
"
,
fqdn
,
port
);
snprintf
(
tsSecond
,
sizeof
(
tsSecond
),
"%s:%
u
"
,
fqdn
,
port
);
}
}
taosGetSystemInfo
();
taosGetSystemInfo
();
...
...
tests/script/general/insert/insert_drop.sim
浏览文件 @
51016167
...
@@ -19,7 +19,7 @@ $stb = stb
...
@@ -19,7 +19,7 @@ $stb = stb
sql drop database $db -x step1
sql drop database $db -x step1
step1:
step1:
sql create database $db
maxtables 10
ctime 30
sql create database $db ctime 30
print ====== create tables
print ====== create tables
sql use $db
sql use $db
sql create table $stb (ts timestamp, c1 int) tags(t1 int)
sql create table $stb (ts timestamp, c1 int) tags(t1 int)
...
...
tests/script/general/parser/commit.sim
浏览文件 @
51016167
...
@@ -23,7 +23,7 @@ $stb = $stbPrefix . $i
...
@@ -23,7 +23,7 @@ $stb = $stbPrefix . $i
sql drop database $db -x step1
sql drop database $db -x step1
step1:
step1:
sql create database $db maxrows 255
maxtables 100
ctime 3600
sql create database $db maxrows 255 ctime 3600
print ====== create tables
print ====== create tables
sql use $db
sql use $db
sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
...
...
tests/script/general/parser/selectResNum.sim
浏览文件 @
51016167
...
@@ -23,7 +23,7 @@ $stb = $stbPrefix . $i
...
@@ -23,7 +23,7 @@ $stb = $stbPrefix . $i
sql drop database $db -x step1
sql drop database $db -x step1
step1:
step1:
sql create database $db cache 16
maxtables 200
sql create database $db cache 16
print ====== create tables
print ====== create tables
sql use $db
sql use $db
sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
...
...
tests/script/general/parser/topbot.sim
浏览文件 @
51016167
...
@@ -23,7 +23,7 @@ $stb = $stbPrefix . $i
...
@@ -23,7 +23,7 @@ $stb = $stbPrefix . $i
sql drop database $db -x step1
sql drop database $db -x step1
step1:
step1:
sql create database $db cache 16
maxtables 200
sql create database $db cache 16
print ====== create tables
print ====== create tables
sql use $db
sql use $db
sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
...
...
tests/script/general/parser/union.sim
浏览文件 @
51016167
...
@@ -27,7 +27,7 @@ $mt1 = $mtPrefix . $j
...
@@ -27,7 +27,7 @@ $mt1 = $mtPrefix . $j
sql drop database if exits $db -x step1
sql drop database if exits $db -x step1
step1:
step1:
sql create database if not exists $db
maxtables 4
sql create database if not exists $db
sql use $db
sql use $db
sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int)
sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int)
...
...
tests/script/general/table/limit.sim
浏览文件 @
51016167
...
@@ -17,7 +17,7 @@ $db = $dbPrefix . $i
...
@@ -17,7 +17,7 @@ $db = $dbPrefix . $i
$tb = $tbPrefix . $i
$tb = $tbPrefix . $i
print =================== step 0
print =================== step 0
sql create database $db
maxtables 129
sql create database $db
sql use $db
sql use $db
sql show vgroups
sql show vgroups
if $rows != 0 then
if $rows != 0 then
...
...
tests/script/unique/vnode/replica3_vgroup.sim
浏览文件 @
51016167
...
@@ -26,7 +26,7 @@ sleep 3000
...
@@ -26,7 +26,7 @@ sleep 3000
print =================== step 1
print =================== step 1
sql create database $db replica 3
maxtables 100
sql create database $db replica 3
sql use $db
sql use $db
sql create table st (ts timestamp, speed int) tags (t1 int)
sql create table st (ts timestamp, speed int) tags (t1 int)
sleep 3001
sleep 3001
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录