Merge remote-tracking branch 'origin/3.0' into test/cluster_case

9b19420c · wenzhouwww@live.cn · 563d4880 · f2807216 · 9b19420c · 9b19420c
31 changed file
--- a/docs/en/07-develop/03-insert-data/03-opentsdb-telnet.mdx
+++ b/docs/en/07-develop/03-insert-data/03-opentsdb-telnet.mdx
@@ -23,7 +23,7 @@ A single line of text is used in OpenTSDB line protocol to represent one row of
 - `metric` will be used as the STable name.
 - `timestamp` is the timestamp of current row of data. The time precision will be determined automatically based on the length of the timestamp. Second and millisecond time precision are supported.
- `value` is a metric which must be a numeric value, the corresponding column name is "value".
+- `value` is a metric which must be a numeric value, the corresponding column name is "_value".
 - The last part is the tag set separated by spaces, all tags will be converted to nchar type automatically.
 For example:
@@ -74,7 +74,7 @@ taos> show STables;
 Query OK, 2 row(s) in set (0.002544s)
 taos> select tbname, * from `meters.current`;
-             tbname             |           ts            |           value           | groupid |            location            |
+             tbname             |           _ts            |           _value           | groupid |            location            |
 ==================================================================================================================================
 t_0e7bcfa21a02331c06764f275... | 2022-03-28 09:56:51.249 |              10.800000000 | 3       | California.LoSangeles                |
 t_0e7bcfa21a02331c06764f275... | 2022-03-28 09:56:51.250 |              11.300000000 | 3       | California.LoSangeles                |

--- a/docs/en/07-develop/03-insert-data/04-opentsdb-json.mdx
+++ b/docs/en/07-develop/03-insert-data/04-opentsdb-json.mdx
@@ -91,7 +91,7 @@ taos> show STables;
 Query OK, 2 row(s) in set (0.001954s)
 taos> select * from `meters.current`;
-           ts            |           value           |          groupid          |            location            |
+           _ts            |           _value           |          groupid          |            location            |
 ===================================================================================================================
 2022-03-28 09:56:51.249 |              10.300000000 |               2.000000000 | California.SanFrancisco               |
 2022-03-28 09:56:51.250 |              12.600000000 |               2.000000000 | California.SanFrancisco               |

--- a/docs/zh/07-develop/03-insert-data/03-opentsdb-telnet.mdx
+++ b/docs/zh/07-develop/03-insert-data/03-opentsdb-telnet.mdx
@@ -23,7 +23,7 @@ OpenTSDB 行协议同样采用一行字符串来表示一行数据。OpenTSDB 
 - metric 将作为超级表名。
 - timestamp 本行数据对应的时间戳。根据时间戳的长度自动识别时间精度。支持秒和毫秒两种时间精度
- value 度量值，必须为一个数值。对应的列名也是 “value”。
+- value 度量值，必须为一个数值。对应的列名是 “_value”。
 - 最后一部分是标签集， 用空格分隔不同标签， 所有标签自动转化为 nchar 数据类型;
 例如：
@@ -74,7 +74,7 @@ taos> show stables;
 Query OK, 2 row(s) in set (0.002544s)
 taos> select tbname, * from `meters.current`;
-             tbname             |           ts            |           value           | groupid |            location            |
+             tbname             |           _ts            |           _value           | groupid |            location            |
 ==================================================================================================================================
 t_0e7bcfa21a02331c06764f275... | 2022-03-28 09:56:51.249 |              10.800000000 | 3       | California.LosAngeles                |
 t_0e7bcfa21a02331c06764f275... | 2022-03-28 09:56:51.250 |              11.300000000 | 3       | California.LosAngeles                |

--- a/docs/zh/07-develop/03-insert-data/04-opentsdb-json.mdx
+++ b/docs/zh/07-develop/03-insert-data/04-opentsdb-json.mdx
@@ -91,7 +91,7 @@ taos> show stables;
 Query OK, 2 row(s) in set (0.001954s)
 taos> select * from `meters.current`;
-           ts            |           value           |          groupid          |            location            |
+           _ts            |           _value           |          groupid          |            location            |
 ===================================================================================================================
 2022-03-28 09:56:51.249 |              10.300000000 |               2.000000000 | California.SanFrancisco               |
 2022-03-28 09:56:51.250 |              12.600000000 |               2.000000000 | California.SanFrancisco               |

--- a/docs/zh/21-tdinternal/01-arch.md
+++ b/docs/zh/21-tdinternal/01-arch.md
--- a/docs/zh/21-tdinternal/message.webp
+++ b/docs/zh/21-tdinternal/message.webp
--- a/docs/zh/21-tdinternal/structure.webp
+++ b/docs/zh/21-tdinternal/structure.webp
--- a/docs/zh/21-tdinternal/write_follower.webp
+++ b/docs/zh/21-tdinternal/write_follower.webp
--- a/docs/zh/21-tdinternal/write_leader.webp
+++ b/docs/zh/21-tdinternal/write_leader.webp
--- a/docs/zh/21-tdinternal/write_master.webp
+++ b/docs/zh/21-tdinternal/write_master.webp
--- a/docs/zh/21-tdinternal/write_slave.webp
+++ b/docs/zh/21-tdinternal/write_slave.webp
--- a/include/common/tglobal.h
+++ b/include/common/tglobal.h
@@ -89,7 +89,6 @@ extern uint16_t tsTelemPort;
 // query buffer management
 extern int32_t tsQueryBufferSize;  // maximum allowed usage buffer size in MB for each data node during query processing
 extern int64_t tsQueryBufferSizeBytes;   // maximum allowed usage buffer size in byte for each data node
-extern bool    tsRetrieveBlockingModel;  // retrieve threads will be blocked
 // query client
 extern int32_t tsQueryPolicy;

--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -124,9 +124,6 @@ int32_t tsMinIntervalTime = 1;
 int32_t tsQueryBufferSize = -1;
 int64_t tsQueryBufferSizeBytes = -1;
-// in retrieve blocking model, the retrieve threads will wait for the completion of the query processing.
-bool tsRetrieveBlockingModel = false;
 // tsdb config
 // For backward compatibility
 bool tsdbForceKeepFile = false;
@@ -296,6 +293,7 @@ static int32_t taosAddServerLogCfg(SConfig *pCfg) {
  if (cfgAddInt32(pCfg, "smaDebugFlag", smaDebugFlag, 0, 255, 0) != 0) return -1;
  if (cfgAddInt32(pCfg, "idxDebugFlag", idxDebugFlag, 0, 255, 0) != 0) return -1;
  if (cfgAddInt32(pCfg, "tdbDebugFlag", tdbDebugFlag, 0, 255, 0) != 0) return -1;
+  if (cfgAddInt32(pCfg, "metaDebugFlag", metaDebugFlag, 0, 255, 0) != 0) return -1;
  return 0;
 }
@@ -362,7 +360,6 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
  if (cfgAddInt32(pCfg, "maxNumOfDistinctRes", tsMaxNumOfDistinctResults, 10 * 10000, 10000 * 10000, 0) != 0) return -1;
  if (cfgAddInt32(pCfg, "countAlwaysReturnValue", tsCountAlwaysReturnValue, 0, 1, 0) != 0) return -1;
  if (cfgAddInt32(pCfg, "queryBufferSize", tsQueryBufferSize, -1, 500000000000, 0) != 0) return -1;
-  if (cfgAddBool(pCfg, "retrieveBlockingModel", tsRetrieveBlockingModel, 0) != 0) return -1;
  if (cfgAddBool(pCfg, "printAuth", tsPrintAuth, 0) != 0) return -1;
  if (cfgAddInt32(pCfg, "multiProcess", tsMultiProcess, 0, 2, 0) != 0) return -1;
@@ -476,6 +473,7 @@ static void taosSetServerLogCfg(SConfig *pCfg) {
  smaDebugFlag = cfgGetItem(pCfg, "smaDebugFlag")->i32;
  idxDebugFlag = cfgGetItem(pCfg, "idxDebugFlag")->i32;
  tdbDebugFlag = cfgGetItem(pCfg, "tdbDebugFlag")->i32;
+  metaDebugFlag = cfgGetItem(pCfg, "metaDebugFlag")->i32;
 }
 static int32_t taosSetClientCfg(SConfig *pCfg) {
@@ -547,7 +545,6 @@ static int32_t taosSetServerCfg(SConfig *pCfg) {
  tsMaxNumOfDistinctResults = cfgGetItem(pCfg, "maxNumOfDistinctRes")->i32;
  tsCountAlwaysReturnValue = cfgGetItem(pCfg, "countAlwaysReturnValue")->i32;
  tsQueryBufferSize = cfgGetItem(pCfg, "queryBufferSize")->i32;
-  tsRetrieveBlockingModel = cfgGetItem(pCfg, "retrieveBlockingModel")->bval;
  tsPrintAuth = cfgGetItem(pCfg, "printAuth")->bval;
  tsMultiProcess = cfgGetItem(pCfg, "multiProcess")->bval;
@@ -832,9 +829,7 @@ int32_t taosSetCfg(SConfig *pCfg, char *name) {
      break;
    }
    case 'r': {
-      if (strcasecmp("retrieveBlockingModel", name) == 0) {
+      if (strcasecmp("rpcQueueMemoryAllowed", name) == 0) {
-        tsRetrieveBlockingModel = cfgGetItem(pCfg, "retrieveBlockingModel")->bval;
-      } else if (strcasecmp("rpcQueueMemoryAllowed", name) == 0) {
        tsRpcQueueMemoryAllowed = cfgGetItem(pCfg, "rpcQueueMemoryAllowed")->i64;
      } else if (strcasecmp("rpcDebugFlag", name) == 0) {
        rpcDebugFlag = cfgGetItem(pCfg, "rpcDebugFlag")->i32;
@@ -1100,12 +1095,12 @@ void taosCfgDynamicOptions(const char *option, const char *value) {
  const char *options[] = {
      "dDebugFlag",   "vDebugFlag",  "mDebugFlag",   "wDebugFlag",   "sDebugFlag",   "tsdbDebugFlag",
      "tqDebugFlag",  "fsDebugFlag", "udfDebugFlag", "smaDebugFlag", "idxDebugFlag", "tdbDebugFlag",
-      "tmrDebugFlag", "uDebugFlag",  "smaDebugFlag", "rpcDebugFlag", "qDebugFlag",
+      "tmrDebugFlag", "uDebugFlag",  "smaDebugFlag", "rpcDebugFlag", "qDebugFlag", "metaDebugFlag",
  };
  int32_t *optionVars[] = {
      &dDebugFlag,   &vDebugFlag,  &mDebugFlag,   &wDebugFlag,   &sDebugFlag,   &tsdbDebugFlag,
      &tqDebugFlag,  &fsDebugFlag, &udfDebugFlag, &smaDebugFlag, &idxDebugFlag, &tdbDebugFlag,
-      &tmrDebugFlag, &uDebugFlag,  &smaDebugFlag, &rpcDebugFlag, &qDebugFlag,
+      &tmrDebugFlag, &uDebugFlag,  &smaDebugFlag, &rpcDebugFlag, &qDebugFlag, &metaDebugFlag,
  };
  int32_t optionSize = tListLen(options);
@@ -1152,5 +1147,6 @@ void taosSetAllDebugFlag(int32_t flag) {
  taosSetDebugFlag(&smaDebugFlag, "smaDebugFlag", flag);
  taosSetDebugFlag(&idxDebugFlag, "idxDebugFlag", flag);
  taosSetDebugFlag(&tdbDebugFlag, "tdbDebugFlag", flag);
+  taosSetDebugFlag(&metaDebugFlag, "metaDebugFlag", flag);
  uInfo("all debug flag are set to %d", flag);
 }
--- a/source/dnode/mnode/impl/src/mndDnode.c
+++ b/source/dnode/mnode/impl/src/mndDnode.c
@@ -788,9 +788,9 @@ _OVER:
 static int32_t mndProcessConfigDnodeReq(SRpcMsg *pReq) {
  SMnode     *pMnode = pReq->info.node;
  const char *options[] = {
-      "debugFlag",     "dDebugFlag",   "vDebugFlag",  "mDebugFlag",   "wDebugFlag",   "sDebugFlag",
+      "debugFlag",   "dDebugFlag",   "vDebugFlag",   "mDebugFlag",   "wDebugFlag",    "sDebugFlag",   "tsdbDebugFlag",
-      "tsdbDebugFlag", "tqDebugFlag",  "fsDebugFlag", "udfDebugFlag", "smaDebugFlag", "idxDebugFlag",
+      "tqDebugFlag", "fsDebugFlag",  "udfDebugFlag", "smaDebugFlag", "idxDebugFlag",  "tdbDebugFlag", "tmrDebugFlag",
-      "tdbDebugFlag",  "tmrDebugFlag", "uDebugFlag",  "smaDebugFlag", "rpcDebugFlag", "qDebugFlag",
+      "uDebugFlag",  "smaDebugFlag", "rpcDebugFlag", "qDebugFlag",   "metaDebugFlag",
  };
  int32_t optionSize = tListLen(options);

--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@@ -2068,7 +2068,7 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
  {
    .name = "apercentile",
    .type = FUNCTION_TYPE_APERCENTILE,
-    .classification = FUNC_MGT_AGG_FUNC,
+    .classification = FUNC_MGT_AGG_FUNC | FUNC_MGT_TIMELINE_FUNC,
    .translateFunc = translateApercentile,
    .getEnvFunc   = getApercentileFuncEnv,
    .initFunc     = apercentileFunctionSetup,
@@ -2083,7 +2083,7 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
  },
  {
    .name = "_apercentile_partial",
-    .type = FUNCTION_TYPE_APERCENTILE_PARTIAL,
+    .type = FUNCTION_TYPE_APERCENTILE_PARTIAL | FUNC_MGT_TIMELINE_FUNC,
    .classification = FUNC_MGT_AGG_FUNC,
    .translateFunc = translateApercentilePartial,
    .getEnvFunc   = getApercentileFuncEnv,
@@ -2096,7 +2096,7 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
  {
    .name = "_apercentile_merge",
    .type = FUNCTION_TYPE_APERCENTILE_MERGE,
-    .classification = FUNC_MGT_AGG_FUNC,
+    .classification = FUNC_MGT_AGG_FUNC | FUNC_MGT_TIMELINE_FUNC,
    .translateFunc = translateApercentileMerge,
    .getEnvFunc   = getApercentileFuncEnv,
    .initFunc     = apercentileFunctionSetup,

--- a/source/util/src/tlog.c
+++ b/source/util/src/tlog.c
@@ -82,7 +82,7 @@ int64_t tsNumOfTraceLogs = 0;
 // log
 int32_t dDebugFlag = 135;
 int32_t vDebugFlag = 135;
-int32_t mDebugFlag = 131;
+int32_t mDebugFlag = 135;
 int32_t cDebugFlag = 131;
 int32_t jniDebugFlag = 131;
 int32_t tmrDebugFlag = 131;

--- a/tests/script/tsim/alter/dnode.sim
+++ b/tests/script/tsim/alter/dnode.sim
@@ -24,14 +24,20 @@ sql alter dnode 1 'fsDebugFlag 131'
 sql alter dnode 1 'udfDebugFlag 131'
 sql alter dnode 1 'smaDebugFlag 131'
 sql alter dnode 1 'idxDebugFlag 131'
+sql alter dnode 1 'tdbDebugFlag 131'
 sql alter dnode 1 'tmrDebugFlag 131'
 sql alter dnode 1 'uDebugFlag 131'
 sql alter dnode 1 'smaDebugFlag 131'
 sql alter dnode 1 'rpcDebugFlag 131'
 sql alter dnode 1 'qDebugFlag 131'
+sql alter dnode 1 'metaDebugFlag 131'
 sql_error alter dnode 2 'wDebugFlag 135'
 sql_error alter dnode 2 'tmrDebugFlag 135'
+sql_error alter dnode 1 'monDebugFlag 131'
+sql_error alter dnode 1 'cqDebugFlag 131'
+sql_error alter dnode 1 'httpDebugFlag 131'
+sql_error alter dnode 1 'mqttDebugFlag 131'
 print ======== step3
 sql_error alter $hostname1 debugFlag 135

--- a/tests/system-test/1-insert/delete_data.py
+++ b/tests/system-test/1-insert/delete_data.py
--- a/tests/system-test/1-insert/influxdb_line_taosc_insert.py
+++ b/tests/system-test/1-insert/influxdb_line_taosc_insert.py
--- a/tests/system-test/1-insert/insertWithMoreVgroup.py
+++ b/tests/system-test/1-insert/insertWithMoreVgroup.py
--- a/tests/system-test/1-insert/insert_drop.py
+++ b/tests/system-test/1-insert/insert_drop.py
--- a/tests/system-test/1-insert/mutipythonnodebugtaosd.py
+++ b/tests/system-test/1-insert/mutipythonnodebugtaosd.py
--- a/tests/system-test/1-insert/opentsdb_json_taosc_insert.py
+++ b/tests/system-test/1-insert/opentsdb_json_taosc_insert.py
--- a/tests/system-test/1-insert/opentsdb_telnet_line_taosc_insert.py
+++ b/tests/system-test/1-insert/opentsdb_telnet_line_taosc_insert.py
--- a/tests/system-test/1-insert/table_comment.py
+++ b/tests/system-test/1-insert/table_comment.py
--- a/tests/system-test/1-insert/table_param_ttl.py
+++ b/tests/system-test/1-insert/table_param_ttl.py
--- a/tests/system-test/1-insert/test_stmt_muti_insert_query.py
+++ b/tests/system-test/1-insert/test_stmt_muti_insert_query.py
--- a/tests/system-test/1-insert/test_stmt_set_tbname_tag.py
+++ b/tests/system-test/1-insert/test_stmt_set_tbname_tag.py
--- a/tests/system-test/1-insert/update_data.py
+++ b/tests/system-test/1-insert/update_data.py
--- a/tests/system-test/1-insert/update_data_muti_rows.py
+++ b/tests/system-test/1-insert/update_data_muti_rows.py
--- a/tests/system-test/2-query/distribute_agg_apercentile.py
+++ b/tests/system-test/2-query/distribute_agg_apercentile.py
@@ -141,8 +141,8 @@ class TDTestCase:
        query_data = tdSql.queryResult
        # nest query for support max
-        tdSql.query(f"select apercentile(c2+2,10)+1 from (select max(c1) c2  from {dbname}.stb1)")
+        #tdSql.query(f"select apercentile(c2+2,10)+1 from (select max(c1) c2  from {dbname}.stb1)")
-        tdSql.checkData(0,0,31.000000000)
+        #tdSql.checkData(0,0,31.000000000)
        tdSql.query(f"select apercentile(c1+2,10)+1  as c2 from (select ts ,c1 ,c2  from {dbname}.stb1)")
        tdSql.checkData(0,0,7.560701700)
        tdSql.query(f"select apercentile(a+2,10)+1  as c2 from (select ts ,abs(c1) a ,c2  from {dbname}.stb1)")