fix: conflicts

Author: guanshengliang

docs/en/08-operation/30-activate.md

@@ -0,0 +1,43 @@
+---
+title: Activate TDengine TSDB-Enterprise
+---
+
+This document describes how to activate a TDengine TSDB-Enterprise license.
+
+## Prerequisites
+
+- Contact TDengine or an authorized reseller to purchase TDengine TSDB-Enterprise.
+- Install and deploy TDengine TSDB-Enterprise on the actual machines that you intend to license.
+
+## Procedure
+
+1. Run the following SQL statement to obtain required information for your deployment:
+
+   ```sql
+   SHOW CLUSTER MACHINES;
+   ```
+
+   Sample output is displayed as follows:
+
+   ```text
+            id         | dnode_num |          machine         | version  |
+   =======================================================================
+   3609687158593567855 | 1         | Bdw+qvOCyvAOc3SS5GIyEOIi | 3.3.6.13 |
+   ```
+
+1. Copy the entire output of the statement and send it to your account representative or authorized reseller. Also include the following information:
+
+   - The name of your company
+   - The name and email address of the primary technical contact
+   - The intended environment (production, PoC, or testing)
+   - The desired term of the license
+
+   Your account representative or reseller will send you an activation code that you use to activate your TDengine TSDB-Enterprise deployment.
+
+1. Once you receive your activation code, log in to TDengine TSDB Explorer. The default URL is `http://127.0.0.1:6060`.
+
+1. From the main menu on the left, select **Management**. Open the **License** tab and click **Activate License**.
+
+1. Enter your activation code and click **Confirm**.
+
+Your TDengine TSDB-Enterprise deployment is now licensed. You can view the details of your license, including expiration date, on the **License** tab.

docs/en/14-reference/03-taos-sql/40-tmq.md

@@ -116,4 +116,4 @@ Displays the allocation relationship and consumption information between consume
 
 ## MQTT Data Subscription
 
-TDengine 3.3.7.0 includes MQTT-based data subscription, allowing data to be subscribed to directly via an MQTT client. For details, refer to the MQTT Data Subscription section.
+You can subscribe to data directly via an MQTT client. For details, refer to [MQTT Data Subscription](../../../advanced-features/data-subscription/mqtt-data-sub/).

docs/en/14-reference/09-error-code.md

@@ -114,6 +114,7 @@ Below are the business error codes for each module.
 | 0x8000013C | Invalid disk id                   | Invalid disk id                                              | Check users whether the mounted disk is invalid or use the parameter diskIDCheckEnabled to skip the disk check. |
 | 0x8000013D | Decimal value overflow            | Decimal value overflow                                       | Check query expression and decimal values |
 | 0x8000013E | Division by zero error            | Division by zero                                             | Check division expression |
+| 0x8000013F | Decimal value parse error         | Decimal value parse error                                    | Preserve the scene and logs, report issue on github |
 | 0x80000140 | Edition not compatible            | Edition incompatibility between nodes                        | Check editions(enterprise or community) of all nodes (including server and client), ensure node editions are consistent or compatible |
 | 0x80000141 | Invalid signature                 | Message signature is invalid or mismatch                     | Check if client and server are using the same signature algorithm |
 

docs/zh/14-reference/09-error-code.md

@@ -112,6 +112,7 @@ TSDB 错误码包括 taosc 客户端和服务端，所有语言的连接器无
 | 0x8000013C | Invalid disk id                         | 不合法的 disk id                                                           | 建议用户检查挂载磁盘是否失效或者使用参数 diskIDCheckEnabled 来跳过磁盘检查                                                                            |
 | 0x8000013D | Decimal value overflow                  | Decimal 计算溢出                                                           | 检查计算表达式和参数值是否计算结果导致类型溢出                                                                                                        |
 | 0x8000013E | Division by zero error                  | Division by zero                                                           | 检查除法操作是否除以 0                                                                                                                              |
+| 0x8000013F | Decimal value parse error               | Decimal 解析错误                                                           | 保留现场和日志，github 上报 issue                                                                                                                           |
 | 0x80000140 | Edition not compatible                  | 社区版/企业版不匹配                                                        | 检查各节点（包括服务端和客户端）是否有社区版和企业版混用的情况，确保都是企业版或都是社区版 |
 | 0x80000141 | Invalid signature                       | 消息签名无效或不正确                                                       | 检查客户端和服务端是否使用了相同的签名算法 |
 

include/util/taoserror.h

@@ -170,6 +170,7 @@ int32_t  taosGetErrSize();
 #define TSDB_CODE_INVALID_DISK_ID               TAOS_DEF_ERROR_CODE(0, 0x013C)
 #define TSDB_CODE_DECIMAL_OVERFLOW              TAOS_DEF_ERROR_CODE(0, 0x013D)
 #define TSDB_CODE_DIVISION_BY_ZERO              TAOS_DEF_ERROR_CODE(0, 0x013E)
+#define TSDB_CODE_DECIMAL_PARSE_ERROR           TAOS_DEF_ERROR_CODE(0, 0x013F)
 
 #define TSDB_CODE_EDITION_NOT_COMPATIBLE        TAOS_DEF_ERROR_CODE(0, 0x0140) // internal
 #define TSDB_CODE_INVALID_SIGNATURE             TAOS_DEF_ERROR_CODE(0, 0x0141) // internal

source/client/src/clientTmq.c

@@ -3703,7 +3703,8 @@ int32_t tmq_offset_seek(tmq_t* tmq, const char* pTopicName, int32_t vgId, int64_
 
   int32_t msgSize = tSerializeSMqSeekReq(NULL, 0, &req);
   if (msgSize < 0) {
-    return TSDB_CODE_PAR_INTERNAL_ERROR;
+    tqErrorC("%s get invalid msg at line %d", __func__, __LINE__);
+    return TSDB_CODE_TMQ_INVALID_MSG;
   }
 
   char* msg = taosMemoryCalloc(1, msgSize);
@@ -3712,8 +3713,9 @@ int32_t tmq_offset_seek(tmq_t* tmq, const char* pTopicName, int32_t vgId, int64_
   }
 
   if (tSerializeSMqSeekReq(msg, msgSize, &req) < 0) {
+    tqErrorC("%s serialize seek req failed at line %d", __func__, __LINE__);
     taosMemoryFree(msg);
-    return TSDB_CODE_PAR_INTERNAL_ERROR;
+    return TSDB_CODE_TMQ_INVALID_MSG;
   }
 
   SMsgSendInfo* sendInfo = taosMemoryCalloc(1, sizeof(SMsgSendInfo));

source/common/src/tdataformat.c

@@ -5199,7 +5199,7 @@ int32_t tRowBuildFromBind2(SBindInfo2 *infos, int32_t numOfInfos, SSHashObj *par
           if (infos[iInfo].type == TSDB_DATA_TYPE_DECIMAL) {
             if (!pSchemaExt) {
               uError("stmt2 decimal64 type without ext schema info, cannot parse decimal values");
-              code = TSDB_CODE_PAR_INTERNAL_ERROR;
+              code = TSDB_CODE_DECIMAL_PARSE_ERROR;
               goto _exit;
             }
             uint8_t precision = 0, scale = 0;
@@ -5221,7 +5221,7 @@ int32_t tRowBuildFromBind2(SBindInfo2 *infos, int32_t numOfInfos, SSHashObj *par
           } else if (infos[iInfo].type == TSDB_DATA_TYPE_DECIMAL64) {
             if (!pSchemaExt) {
               uError("stmt2 decimal128 type without ext schema info, cannot parse decimal values");
-              code = TSDB_CODE_PAR_INTERNAL_ERROR;
+              code = TSDB_CODE_DECIMAL_PARSE_ERROR;
               goto _exit;
             }
             uint8_t precision = 0, scale = 0;

source/dnode/mnode/impl/src/mndDnode.c

@@ -1617,7 +1617,7 @@ static int32_t mndProcessCreateEncryptKeyReq(SRpcMsg *pReq) {
     tFreeSMCfgDnodeReq(&cfgReq);
     return mndProcessCreateEncryptKeyReqImpl(pReq, cfgReq.dnodeId, &dcfgReq);
   } else {
-    code = TSDB_CODE_PAR_INTERNAL_ERROR;
+    code = TSDB_CODE_MND_INTERNAL_ERROR;
     tFreeSMCfgDnodeReq(&cfgReq);
     TAOS_RETURN(code);
   }

source/dnode/mnode/impl/src/mndSubscribe.c

@@ -696,7 +696,7 @@ static int32_t assignVgroups(SMqRebOutputObj *pOutput, SHashObj *pHash, int32_t
 
   if (pAssignIter != NULL) {
     mError("tmq rebalancesub:%s assign iter is not NULL, never should reach here", pOutput->pSub->key);
-    code = TSDB_CODE_PAR_INTERNAL_ERROR;
+    code = TSDB_CODE_MND_INTERNAL_ERROR;
     goto END;
   }
   while (1) {

source/libs/command/src/command.c

@@ -652,6 +652,7 @@ static void appendColumnFields(char* buf, int32_t* len, STableCfg* pCfg) {
 
 static void appendColRefFields(char* buf, int32_t* len, STableCfg* pCfg) {
   char expandName[(SHOW_CREATE_TB_RESULT_FIELD1_LEN << 1) + 1] = {0};
+  bool firstRef = true;
   for (int32_t i = 1; i < pCfg->numOfColumns; ++i) {
     SSchema* pSchema = pCfg->pSchemas + i;
     SColRef* pRef = pCfg->pColRefs + i;
@@ -669,8 +670,11 @@ static void appendColRefFields(char* buf, int32_t* len, STableCfg* pCfg) {
     }
 
     *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
-                      "%s`%s` %s", ((i > 1) ? ", " : ""), expandIdentifier(pSchema->name, expandName), type);
-
+                      "%s`%s` %s", (!firstRef ? ", " : " ("), expandIdentifier(pSchema->name, expandName), type);
+    firstRef = false;
+  }
+  if (!firstRef) {
+    *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), ")");
   }
 }
 
@@ -939,10 +943,10 @@ static int32_t setCreateTBResultIntoDataBlock(SSDataBlock* pBlock, SDbCfgInfo* p
         snprintf(buf2 + VARSTR_HEADER_SIZE + len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + len), ")");
   } else if (TSDB_VIRTUAL_CHILD_TABLE == pCfg->tableType) {
     len += tsnprintf(buf2 + VARSTR_HEADER_SIZE, SHOW_CREATE_TB_RESULT_FIELD2_LEN - VARSTR_HEADER_SIZE,
-                     "CREATE VTABLE `%s` (", expandIdentifier(tbName, buf1));
+                     "CREATE VTABLE `%s`", expandIdentifier(tbName, buf1));
     appendColRefFields(buf2, &len, pCfg);
     len += snprintf(buf2 + VARSTR_HEADER_SIZE + len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + len),
-                    ") USING `%s` (", expandIdentifier(pCfg->stbName, buf1));
+                    " USING `%s` (", expandIdentifier(pCfg->stbName, buf1));
     appendTagNameFields(buf2, &len, pCfg);
     len += tsnprintf(buf2 + VARSTR_HEADER_SIZE + len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + len),
                      ") TAGS (");