From 7530a7e2e3eae388c6e1573b07dad1230ee541f0 Mon Sep 17 00:00:00 2001 From: Minghao Li Date: Fri, 12 Aug 2022 18:37:08 +0800 Subject: [PATCH 1/3] refactor(sync): update mnode elect timer --- source/dnode/mnode/impl/src/mndSync.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndSync.c b/source/dnode/mnode/impl/src/mndSync.c index 03e5c2b3a2..ac8f7270d6 100644 --- a/source/dnode/mnode/impl/src/mndSync.c +++ b/source/dnode/mnode/impl/src/mndSync.c @@ -250,8 +250,12 @@ int32_t mndInitSync(SMnode *pMnode) { // decrease election timer setPingTimerMS(pMgmt->sync, 5000); - setElectTimerMS(pMgmt->sync, 600); - setHeartbeatTimerMS(pMgmt->sync, 300); + setElectTimerMS(pMgmt->sync, 3000); + setHeartbeatTimerMS(pMgmt->sync, 700); + /* + setElectTimerMS(pMgmt->sync, 600); + setHeartbeatTimerMS(pMgmt->sync, 300); + */ mDebug("mnode-sync is opened, id:%" PRId64, pMgmt->sync); return 0; From e50f09aa4cf24deca6ba60ac6e8c9687de98545a Mon Sep 17 00:00:00 2001 From: Minghao Li Date: Fri, 12 Aug 2022 18:38:14 +0800 Subject: [PATCH 2/3] refactor(sync): update mnode elect timer --- source/dnode/mnode/impl/src/mndSync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/dnode/mnode/impl/src/mndSync.c b/source/dnode/mnode/impl/src/mndSync.c index ac8f7270d6..a1cd5c96d4 100644 --- a/source/dnode/mnode/impl/src/mndSync.c +++ b/source/dnode/mnode/impl/src/mndSync.c @@ -251,7 +251,7 @@ int32_t mndInitSync(SMnode *pMnode) { // decrease election timer setPingTimerMS(pMgmt->sync, 5000); setElectTimerMS(pMgmt->sync, 3000); - setHeartbeatTimerMS(pMgmt->sync, 700); + setHeartbeatTimerMS(pMgmt->sync, 500); /* setElectTimerMS(pMgmt->sync, 600); setHeartbeatTimerMS(pMgmt->sync, 300); From 03ee64e8ca026f9f455292cb6cb40296aeddc002 Mon Sep 17 00:00:00 2001 From: jiajingbin Date: Fri, 12 Aug 2022 19:39:14 +0800 Subject: [PATCH 3/3] docs: update 06-stream.md for stream-computing --- docs/zh/07-develop/06-stream.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/zh/07-develop/06-stream.md b/docs/zh/07-develop/06-stream.md index 5217fa8389..602727cd70 100644 --- a/docs/zh/07-develop/06-stream.md +++ b/docs/zh/07-develop/06-stream.md @@ -72,7 +72,7 @@ Query OK, 2 rows in database (0.009580s) ## 示例二 -依然以示例一中的数据为基础，我们已经采集到了每个智能电表的电流和电压数据，现在要求出功率，并将地域和电表名以符号 "." 拼接，然后以电表名称分组输出到新的数据表中。 +依然以示例一中的数据为基础，我们已经采集到了每个智能电表的电流和电压数据，现在需要求出有功功率和无功功率，并将地域和电表名以符号 "." 拼接，然后以电表名称分组输出到新的数据表中。 ### 创建 DB 和原始数据表 @@ -81,7 +81,7 @@ Query OK, 2 rows in database (0.009580s) ### 创建流 ```sql -create stream power_stream into power_stream_output_stb as select ts, concat_ws(".", location, tbname) as meter_location, current*voltage as meter_power from meters partition by tbname; +create stream power_stream into power_stream_output_stb as select ts, concat_ws(".", location, tbname) as meter_location, current*voltage*cos(phase) as active_power, current*voltage*sin(phase) as reactive_power from meters partition by tbname; ``` ### 写入数据 @@ -90,16 +90,16 @@ create stream power_stream into power_stream_output_stb as select ts, concat_ws( ### 查询以观查结果 ```sql -taos> select ts, meter_location, meter_power from power_stream_output_stb; - ts | meter_location | meter_power | -======================================================================================= - 2022-08-12 07:44:47.817 | California.SanFrancisco.d1002 | 2245.400041580 | - 2022-08-12 08:44:47.826 | California.LosAngeles.d1003 | 2607.800042152 | - 2022-08-12 09:44:47.833 | California.LosAngeles.d1003 | 2988.199914932 | - 2022-08-12 03:44:47.791 | California.SanFrancisco.d1001 | 2255.700041771 | - 2022-08-12 05:44:47.800 | California.SanFrancisco.d1001 | 2746.800083160 | - 2022-08-12 06:44:47.809 | California.SanFrancisco.d1001 | 2718.300042152 | - 2022-08-12 10:44:47.840 | California.LosAngeles.d1004 | 2408.400042534 | - 2022-08-12 11:44:48.379 | California.LosAngeles.d1004 | 2541.500000000 | -Query OK, 8 rows in database (0.014788s) +taos> select ts, meter_location, active_power, reactive_power from power_stream_output_stb; + ts | meter_location | active_power | reactive_power | +=================================================================================================================== + 2022-08-12 11:25:32.579 | California.LosAngeles.d1003 | 2506.240411679 | 720.680274962 | + 2022-08-12 12:25:32.586 | California.LosAngeles.d1003 | 2863.424274422 | 854.482390839 | + 2022-08-12 13:25:32.594 | California.LosAngeles.d1004 | 2307.834596289 | 688.687331847 | + 2022-08-12 14:25:32.601 | California.LosAngeles.d1004 | 2387.415754896 | 871.474763418 | + 2022-08-12 10:25:32.566 | California.SanFrancisco.d1002 | 2175.595991997 | 555.520860397 | + 2022-08-12 06:25:32.534 | California.SanFrancisco.d1001 | 2148.178871730 | 688.120784090 | + 2022-08-12 08:25:32.546 | California.SanFrancisco.d1001 | 2598.589176205 | 890.081451418 | + 2022-08-12 09:25:32.555 | California.SanFrancisco.d1001 | 2588.728381186 | 829.240910475 | +Query OK, 8 rows in database (0.013775s) ``` \ No newline at end of file