Merge branch 'develop' of github.com:taosdata/TDengine into dev/chr

documentation20/cn/12.taos-sql/docs.md

@@ -1601,7 +1601,7 @@ SELECT AVG(current), MAX(current), LEASTSQUARES(current, start_val, step_val), P
 
 **GROUP BY的限制**
 
-TAOS SQL 支持对标签、TBNAME 进行 GROUP BY 操作，也支持普通列进行 GROUP BY，前提是：仅限一列且该列的唯一值小于 10 万个。
+TAOS SQL 支持对标签、TBNAME 进行 GROUP BY 操作，也支持普通列进行 GROUP BY，前提是：仅限一列且该列的唯一值小于 10 万个。注意：group by 不支持float,double 类型。
 
 **IS NOT NULL 与不为空的表达式适用范围**
 

src/client/inc/tscParseLine.h

@@ -67,6 +67,8 @@ typedef struct {
   SMLProtocolType protocol;
   SMLTimeStampType tsType;
   SHashObj* smlDataToSchema;
+
+  int64_t affectedRows;
 } SSmlLinesInfo;
 
 int tscSmlInsert(TAOS* taos, TAOS_SML_DATA_POINT* points, int numPoint, SSmlLinesInfo* info);

src/client/src/tscParseLineProtocol.c

@@ -761,7 +761,7 @@ static int32_t doInsertChildTableWithStmt(TAOS* taos, char* sql, char* cTableNam
   code = taos_stmt_prepare(stmt, sql, (unsigned long)strlen(sql));
 
   if (code != 0) {
-    tscError("SML:0x%"PRIx64" taos_stmt_prepare return %d:%s", info->id, code, tstrerror(code));
+    tscError("SML:0x%"PRIx64" taos_stmt_prepare return %d:%s", info->id, code, taos_stmt_errstr(stmt));
     taos_stmt_close(stmt);
     return code;
   }
@@ -771,7 +771,11 @@ static int32_t doInsertChildTableWithStmt(TAOS* taos, char* sql, char* cTableNam
   do {
     code = taos_stmt_set_tbname(stmt, cTableName);
     if (code != 0) {
-      tscError("SML:0x%"PRIx64" taos_stmt_set_tbname return %d:%s", info->id, code, tstrerror(code));
+      tscError("SML:0x%"PRIx64" taos_stmt_set_tbname return %d:%s", info->id, code, taos_stmt_errstr(stmt));
+
+      int affectedRows = taos_stmt_affected_rows(stmt);
+      info->affectedRows += affectedRows;
+
       taos_stmt_close(stmt);
       return code;
     }
@@ -781,13 +785,21 @@ static int32_t doInsertChildTableWithStmt(TAOS* taos, char* sql, char* cTableNam
       TAOS_BIND* colsBinds = taosArrayGetP(batchBind, i);
       code = taos_stmt_bind_param(stmt, colsBinds);
       if (code != 0) {
-        tscError("SML:0x%"PRIx64" taos_stmt_bind_param return %d:%s", info->id, code, tstrerror(code));
+        tscError("SML:0x%"PRIx64" taos_stmt_bind_param return %d:%s", info->id, code, taos_stmt_errstr(stmt));
+
+        int affectedRows = taos_stmt_affected_rows(stmt);
+        info->affectedRows += affectedRows;
+
         taos_stmt_close(stmt);
         return code;
       }
       code = taos_stmt_add_batch(stmt);
       if (code != 0) {
-        tscError("SML:0x%"PRIx64" taos_stmt_add_batch return %d:%s", info->id, code, tstrerror(code));
+        tscError("SML:0x%"PRIx64" taos_stmt_add_batch return %d:%s", info->id, code, taos_stmt_errstr(stmt));
+
+        int affectedRows = taos_stmt_affected_rows(stmt);
+        info->affectedRows += affectedRows;
+
         taos_stmt_close(stmt);
         return code;
       }
@@ -795,9 +807,10 @@ static int32_t doInsertChildTableWithStmt(TAOS* taos, char* sql, char* cTableNam
 
     code = taos_stmt_execute(stmt);
     if (code != 0) {
-      tscError("SML:0x%"PRIx64" taos_stmt_execute return %d:%s, try:%d", info->id, code, tstrerror(code), try);
+      tscError("SML:0x%"PRIx64" taos_stmt_execute return %d:%s, try:%d", info->id, code, taos_stmt_errstr(stmt), try);
     }
-
+    tscDebug("SML:0x%"PRIx64" taos_stmt_execute inserted %d rows", info->id, taos_stmt_affected_rows(stmt));
+    
     tryAgain = false;
     if ((code == TSDB_CODE_TDB_INVALID_TABLE_ID
          || code == TSDB_CODE_VND_INVALID_VGROUP_ID
@@ -825,6 +838,8 @@ static int32_t doInsertChildTableWithStmt(TAOS* taos, char* sql, char* cTableNam
     }
   } while (tryAgain);
 
+  int affectedRows = taos_stmt_affected_rows(stmt);
+  info->affectedRows += affectedRows;
 
   taos_stmt_close(stmt);
   return code;
@@ -1069,6 +1084,8 @@ int tscSmlInsert(TAOS* taos, TAOS_SML_DATA_POINT* points, int numPoint, SSmlLine
 
   int32_t code = TSDB_CODE_SUCCESS;
 
+  info->affectedRows = 0;
+
   tscDebug("SML:0x%"PRIx64" build data point schemas", info->id);
   SArray* stableSchemas = taosArrayInit(32, sizeof(SSmlSTableSchema)); // SArray<STableColumnsSchema>
   code = buildDataPointSchemas(points, numPoint, stableSchemas, info);
@@ -1871,7 +1888,7 @@ static int32_t parseSmlKey(TAOS_SML_KV *pKV, const char **index, SHashObj *pHash
 
   //key field cannot start with digit
   if (isdigit(*cur)) {
-    tscError("SML:0x%"PRIx64" Tag key cannnot start with digit", info->id);
+    tscError("SML:0x%"PRIx64" Tag key cannot start with digit", info->id);
     return TSDB_CODE_TSC_LINE_SYNTAX_ERROR;
   }
   while (*cur != '\0') {
@@ -1885,6 +1902,8 @@ static int32_t parseSmlKey(TAOS_SML_KV *pKV, const char **index, SHashObj *pHash
     }
     //Escape special character
     if (*cur == '\\') {
+      //TODO: escape will work after column & tag
+      //support spcial characters
       escapeSpecialCharacter(2, &cur);
     }
     key[len] = *cur;
@@ -1911,13 +1930,42 @@ static int32_t parseSmlKey(TAOS_SML_KV *pKV, const char **index, SHashObj *pHash
 static int32_t parseSmlValue(TAOS_SML_KV *pKV, const char **index,
                           bool *is_last_kv, SSmlLinesInfo* info, bool isTag) {
   const char *start, *cur;
+  int32_t ret = TSDB_CODE_SUCCESS;
   char *value = NULL;
   uint16_t len = 0;
+  bool searchQuote = false;
   start = cur = *index;
 
+  //if field value is string
+  if (!isTag) {
+    if (*cur == '"') {
+      searchQuote = true;
+      cur += 1;
+      len += 1;
+    } else if (*cur == 'L' && *(cur + 1) == '"') {
+      searchQuote = true;
+      cur += 2;
+      len += 2;
+    }
+  }
+
   while (1) {
     // unescaped ',' or ' ' or '\0' identifies a value
-    if ((*cur == ',' || *cur == ' ' || *cur == '\0') && *(cur - 1) != '\\') {
+    if (((*cur == ',' || *cur == ' ' ) && *(cur - 1) != '\\') || *cur == '\0') {
+      if (searchQuote == true) {
+        //first quote ignored while searching
+        if (*(cur - 1) == '"' && len != 1 && len != 2) {
+          *is_last_kv = (*cur == ' ' || *cur == '\0') ? true : false;
+          break;
+        } else if (*cur == '\0') {
+          ret = TSDB_CODE_TSC_LINE_SYNTAX_ERROR;
+          goto error;
+        } else {
+          cur++;
+          len++;
+          continue;
+        }
+      }
       //unescaped ' ' or '\0' indicates end of value
       *is_last_kv = (*cur == ' ' || *cur == '\0') ? true : false;
       if (*cur == ' ' && *(cur + 1) == ' ') {
@@ -1929,7 +1977,7 @@ static int32_t parseSmlValue(TAOS_SML_KV *pKV, const char **index,
     }
     //Escape special character
     if (*cur == '\\') {
-      escapeSpecialCharacter(2, &cur);
+      escapeSpecialCharacter(isTag ? 2 : 3, &cur);
     }
     cur++;
     len++;
@@ -1946,16 +1994,20 @@ static int32_t parseSmlValue(TAOS_SML_KV *pKV, const char **index,
   if (!convertSmlValueType(pKV, value, len, info, isTag)) {
     tscError("SML:0x%"PRIx64" Failed to convert sml value string(%s) to any type",
             info->id, value);
-    //free previous alocated key field
-    free(pKV->key);
-    pKV->key = NULL;
     free(value);
-    return TSDB_CODE_TSC_INVALID_VALUE;
+    ret = TSDB_CODE_TSC_INVALID_VALUE;
+    goto error;
   }
   free(value);
 
   *index = (*cur == '\0') ? cur : cur + 1;
-  return TSDB_CODE_SUCCESS;
+  return ret;
+
+error:
+  //free previous alocated key field
+  free(pKV->key);
+  pKV->key = NULL;
+  return ret;
 }
 
 static int32_t parseSmlMeasurement(TAOS_SML_DATA_POINT *pSml, const char **index,

src/client/src/tscParseOpenTSDB.c

@@ -138,21 +138,41 @@ static int32_t parseTelnetMetricValue(TAOS_SML_KV **pKVs, int *num_kvs, const ch
   const char *start, *cur;
   int32_t ret = TSDB_CODE_SUCCESS;
   int len = 0;
+  bool searchQuote = false;
   char key[] = OTD_METRIC_VALUE_COLUMN_NAME;
   char *value = NULL;
 
   start = cur = *index;
 
+  //if metric value is string
+  if (*cur == '"') {
+    searchQuote = true;
+    cur += 1;
+    len += 1;
+  } else if (*cur == 'L' && *(cur + 1) == '"') {
+    searchQuote = true;
+    cur += 2;
+    len += 2;
+  }
+
   while(*cur != '\0') {
     if (*cur == ' ') {
-      if (*cur == ' ') {
-        if (*(cur + 1) != ' ') {
-          break;
+      if (searchQuote == true) {
+        if (*(cur - 1) == '"' && len != 1 && len != 2) {
+          searchQuote = false;
         } else {
           cur++;
+          len++;
           continue;
         }
       }
+
+      if (*(cur + 1) != ' ') {
+        break;
+      } else {
+        cur++;
+        continue;
+      }
     }
     cur++;
     len++;

src/client/src/tscPrepare.c

@@ -78,6 +78,8 @@ typedef struct STscStmt {
   SSqlObj* pSql;
   SMultiTbStmt mtb;
   SNormalStmt normal;
+
+  int numOfRows;
 } STscStmt;
 
 #define STMT_RET(c) do {          \
@@ -1212,6 +1214,8 @@ static int insertStmtExecute(STscStmt* stmt) {
   // wait for the callback function to post the semaphore
   tsem_wait(&pSql->rspSem);
 
+  stmt->numOfRows += pSql->res.numOfRows;
+
   // data block reset
   pCmd->batchSize = 0;
   for(int32_t i = 0; i < pCmd->insertParam.numOfTables; ++i) {
@@ -1284,7 +1288,9 @@ static int insertBatchStmtExecute(STscStmt* pStmt) {
   tsem_wait(&pStmt->pSql->rspSem);
 
   code = pStmt->pSql->res.code;
-  
+
+  pStmt->numOfRows += pStmt->pSql->res.numOfRows;
+
   insertBatchClean(pStmt);
 
   return code;
@@ -1516,11 +1522,12 @@ TAOS_STMT* taos_stmt_init(TAOS* taos) {
   }
 
   tsem_init(&pSql->rspSem, 0, 0);
-  pSql->signature = pSql;
-  pSql->pTscObj   = pObj;
-  pSql->maxRetry  = TSDB_MAX_REPLICA;
-  pStmt->pSql     = pSql;
-  pStmt->last     = STMT_INIT;
+  pSql->signature   = pSql;
+  pSql->pTscObj     = pObj;
+  pSql->maxRetry    = TSDB_MAX_REPLICA;
+  pStmt->pSql       = pSql;
+  pStmt->last       = STMT_INIT;
+  pStmt->numOfRows  = 0;
   registerSqlObj(pSql);
 
   return pStmt;
@@ -1564,9 +1571,7 @@ int taos_stmt_prepare(TAOS_STMT* stmt, const char* sql, unsigned long length) {
   }
 
   pRes->qId = 0;
-  pRes->numOfRows = 1;
-
-  registerSqlObj(pSql);
+  pRes->numOfRows = 0;
 
   strtolower(pSql->sqlstr, sql);
   tscDebugL("0x%"PRIx64" SQL: %s", pSql->self, pSql->sqlstr);
@@ -1981,6 +1986,7 @@ int taos_stmt_execute(TAOS_STMT* stmt) {
     } else {
       taosReleaseRef(tscObjRef, pStmt->pSql->self);
       pStmt->pSql = taos_query((TAOS*)pStmt->taos, sql);
+      pStmt->numOfRows += taos_affected_rows(pStmt->pSql);
       ret = taos_errno(pStmt->pSql);
       free(sql);
     }
@@ -1989,6 +1995,17 @@ int taos_stmt_execute(TAOS_STMT* stmt) {
   STMT_RET(ret);
 }
 
+int taos_stmt_affected_rows(TAOS_STMT* stmt) {
+  STscStmt* pStmt = (STscStmt*)stmt;
+
+  if (pStmt == NULL) {
+    tscError("statement is invalid");
+    return 0;
+  }
+
+  return pStmt->numOfRows;
+}
+
 TAOS_RES *taos_stmt_use_result(TAOS_STMT* stmt) {
   if (stmt == NULL) {
     tscError("statement is invalid.");

src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDatabaseMetaData.java

@@ -562,25 +562,27 @@ public abstract class AbstractDatabaseMetaData extends WrapperImpl implements Da
         List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
         try (Statement stmt = connection.createStatement()) {
             stmt.execute("use " + catalog);
-            ResultSet tables = stmt.executeQuery("show tables");
-            while (tables.next()) {
-                TSDBResultSetRowData rowData = new TSDBResultSetRowData(10);
-                rowData.setStringValue(1, catalog);                                     //TABLE_CAT
-                rowData.setStringValue(2, null);                                 //TABLE_SCHEM
-                rowData.setStringValue(3, tables.getString("table_name"));  //TABLE_NAME
-                rowData.setStringValue(4, "TABLE");                              //TABLE_TYPE
-                rowData.setStringValue(5, "");                                   //REMARKS
-                rowDataList.add(rowData);
+            try (ResultSet tables = stmt.executeQuery("show tables")) {
+                while (tables.next()) {
+                    TSDBResultSetRowData rowData = new TSDBResultSetRowData(10);
+                    rowData.setStringValue(1, catalog);                                     //TABLE_CAT
+                    rowData.setStringValue(2, null);                                 //TABLE_SCHEM
+                    rowData.setStringValue(3, tables.getString("table_name"));  //TABLE_NAME
+                    rowData.setStringValue(4, "TABLE");                              //TABLE_TYPE
+                    rowData.setStringValue(5, "");                                   //REMARKS
+                    rowDataList.add(rowData);
+                }
             }
-            ResultSet stables = stmt.executeQuery("show stables");
-            while (stables.next()) {
-                TSDBResultSetRowData rowData = new TSDBResultSetRowData(10);
-                rowData.setStringValue(1, catalog);                                  //TABLE_CAT
-                rowData.setStringValue(2, null);                              //TABLE_SCHEM
-                rowData.setStringValue(3, stables.getString("name"));    //TABLE_NAME
-                rowData.setStringValue(4, "TABLE");                           //TABLE_TYPE
-                rowData.setStringValue(5, "STABLE");                          //REMARKS
-                rowDataList.add(rowData);
+            try (ResultSet stables = stmt.executeQuery("show stables")) {
+                while (stables.next()) {
+                    TSDBResultSetRowData rowData = new TSDBResultSetRowData(10);
+                    rowData.setStringValue(1, catalog);                                  //TABLE_CAT
+                    rowData.setStringValue(2, null);                              //TABLE_SCHEM
+                    rowData.setStringValue(3, stables.getString("name"));    //TABLE_NAME
+                    rowData.setStringValue(4, "TABLE");                           //TABLE_TYPE
+                    rowData.setStringValue(5, "STABLE");                          //REMARKS
+                    rowDataList.add(rowData);
+                }
             }
             resultSet.setRowDataList(rowDataList);
         }
@@ -638,8 +640,9 @@ public abstract class AbstractDatabaseMetaData extends WrapperImpl implements Da
         resultSet.setColumnMetaDataList(buildGetColumnsColumnMetaDataList());
         // set up rowDataList
         List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
-        try (Statement stmt = conn.createStatement()) {
-            ResultSet rs = stmt.executeQuery("describe " + catalog + "." + tableNamePattern);
+        try (Statement stmt = conn.createStatement();
+             ResultSet rs = stmt.executeQuery("describe " + catalog + "." + tableNamePattern)) {
+
             int rowIndex = 0;
             while (rs.next()) {
                 TSDBResultSetRowData rowData = new TSDBResultSetRowData(24);
@@ -1147,9 +1150,9 @@ public abstract class AbstractDatabaseMetaData extends WrapperImpl implements Da
         columnMetaDataList.add(buildTableCatalogMeta(1));       // 1. TABLE_CAT
         resultSet.setColumnMetaDataList(columnMetaDataList);
 
-        try (Statement stmt = conn.createStatement()) {
+        try (Statement stmt = conn.createStatement();
+             ResultSet rs = stmt.executeQuery("show databases")) {
             List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
-            ResultSet rs = stmt.executeQuery("show databases");
             while (rs.next()) {
                 TSDBResultSetRowData rowData = new TSDBResultSetRowData(1);
                 rowData.setStringValue(1, rs.getString("name"));
@@ -1168,12 +1171,13 @@ public abstract class AbstractDatabaseMetaData extends WrapperImpl implements Da
             return new EmptyResultSet();
 
         DatabaseMetaDataResultSet resultSet = new DatabaseMetaDataResultSet();
-        try (Statement stmt = conn.createStatement()) {
+        try (Statement stmt = conn.createStatement();
+             ResultSet rs = stmt.executeQuery("describe " + catalog + "." + table)) {
             // set up ColumnMetaDataList
             resultSet.setColumnMetaDataList(buildGetPrimaryKeysMetadataList());
             // set rowData
             List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
-            ResultSet rs = stmt.executeQuery("describe " + catalog + "." + table);
+
             rs.next();
             TSDBResultSetRowData rowData = new TSDBResultSetRowData(6);
             rowData.setStringValue(1, catalog);
@@ -1217,15 +1221,14 @@ public abstract class AbstractDatabaseMetaData extends WrapperImpl implements Da
     }
 
     private boolean isAvailableCatalog(Connection connection, String catalog) {
-        try (Statement stmt = connection.createStatement()) {
-            ResultSet databases = stmt.executeQuery("show databases");
+        try (Statement stmt = connection.createStatement();
+             ResultSet databases = stmt.executeQuery("show databases")) {
             while (databases.next()) {
                 String dbname = databases.getString("name");
                 this.precision = databases.getString("precision");
                 if (dbname.equalsIgnoreCase(catalog))
                     return true;
             }
-            databases.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -1246,17 +1249,18 @@ public abstract class AbstractDatabaseMetaData extends WrapperImpl implements Da
             resultSet.setColumnMetaDataList(buildGetSuperTablesColumnMetaDataList());
             // set result set row data
             stmt.execute("use " + catalog);
-            ResultSet rs = stmt.executeQuery("show tables like '" + tableNamePattern + "'");
-            List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
-            while (rs.next()) {
-                TSDBResultSetRowData rowData = new TSDBResultSetRowData(4);
-                rowData.setStringValue(1, catalog);
-                rowData.setStringValue(2, null);
-                rowData.setStringValue(3, rs.getString("table_name"));
-                rowData.setStringValue(4, rs.getString("stable_name"));
-                rowDataList.add(rowData);
+            try (ResultSet rs = stmt.executeQuery("show tables like '" + tableNamePattern + "'")) {
+                List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
+                while (rs.next()) {
+                    TSDBResultSetRowData rowData = new TSDBResultSetRowData(4);
+                    rowData.setStringValue(1, catalog);
+                    rowData.setStringValue(2, null);
+                    rowData.setStringValue(3, rs.getString("table_name"));
+                    rowData.setStringValue(4, rs.getString("stable_name"));
+                    rowDataList.add(rowData);
+                }
+                resultSet.setRowDataList(rowDataList);
             }
-            resultSet.setRowDataList(rowDataList);
         }
         return resultSet;
     }

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetRowData.java

@@ -189,7 +189,7 @@ public class TSDBResultSetRowData {
         long value = (long) obj;
         if (value < 0)
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_NUMERIC_VALUE_OUT_OF_RANGE);
-        return Long.valueOf(value).intValue();
+        return (int) value;
     }
 
 

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java

@@ -64,9 +64,9 @@ public class RestfulDriver extends AbstractDriver {
 
         RestfulConnection conn = new RestfulConnection(host, port, props, database, url, token);
         if (database != null && !database.trim().replaceAll("\\s", "").isEmpty()) {
-            Statement stmt = conn.createStatement();
-            stmt.execute("use " + database);
-            stmt.close();
+            try (Statement stmt = conn.createStatement()) {
+                stmt.execute("use " + database);
+            }
         }
         return conn;
     }

src/inc/taos.h

@@ -141,6 +141,7 @@ DLL_EXPORT int        taos_stmt_bind_param_batch(TAOS_STMT* stmt, TAOS_MULTI_BIN
 DLL_EXPORT int        taos_stmt_bind_single_param_batch(TAOS_STMT* stmt, TAOS_MULTI_BIND* bind, int colIdx);
 DLL_EXPORT int        taos_stmt_add_batch(TAOS_STMT *stmt);
 DLL_EXPORT int        taos_stmt_execute(TAOS_STMT *stmt);
+DLL_EXPORT int        taos_stmt_affected_rows(TAOS_STMT *stmt);
 DLL_EXPORT TAOS_RES * taos_stmt_use_result(TAOS_STMT *stmt);
 DLL_EXPORT int        taos_stmt_close(TAOS_STMT *stmt);
 DLL_EXPORT char *     taos_stmt_errstr(TAOS_STMT *stmt);

src/kit/taosdump/taosdump.c

@@ -638,11 +638,6 @@ static int queryDbImpl(TAOS *taos, char *command) {
     TAOS_RES *res = NULL;
     int32_t   code = -1;
 
-    if (NULL != res) {
-        taos_free_result(res);
-        res = NULL;
-    }
-
     res = taos_query(taos, command);
     code = taos_errno(res);
 
@@ -1193,6 +1188,7 @@ static int64_t dumpNormalTable(
             jsonAvroSchema);
     }
 
+    tfree(jsonAvroSchema);
     freeTbDes(tableDes);
     return ret;
 }

src/plugins/monitor/src/monMain.c

@@ -204,6 +204,7 @@ static void monBuildMonitorSql(char *sql, int32_t cmd) {
              ", disk_used float, disk_total int"
              ", band_speed float"
              ", io_read float, io_write float"
+             ", io_read_rate float, io_write_rate float"
              ", req_http int, req_select int, req_insert int"
              ") tags (dnodeid int, fqdn binary(%d))",
              tsMonitorDbName, TSDB_FQDN_LEN);
@@ -325,7 +326,10 @@ static int32_t monBuildIoSql(char *sql) {
     monDebug("failed to get io info");
   }
 
-  return sprintf(sql, ", %f, %f", readKB, writeKB);
+  float readRate = readKB/tsMonitorInterval;
+  float writeRate = writeKB/tsMonitorInterval;
+
+  return sprintf(sql, ", %f, %f, %f, %f", readKB, writeKB, readRate, writeRate);
 }
 
 static void monSaveSystemInfo() {

src/query/src/qExecutor.c

@@ -365,7 +365,8 @@ int32_t getNumOfResult(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx* pCtx, int3
      * ts, tag, tagprj function can not decide the output number of current query
      * the number of output result is decided by main output
      */
-    if (hasMainFunction && (id == TSDB_FUNC_TS || id == TSDB_FUNC_TAG || id == TSDB_FUNC_TAGPRJ)) {
+    if (hasMainFunction && (id == TSDB_FUNC_TS || id == TSDB_FUNC_TAG || id == TSDB_FUNC_TAGPRJ ||
+                            id == TSDB_FUNC_TS_DUMMY || id == TSDB_FUNC_TAG_DUMMY)) {
       continue;
     }
 

tests/examples/c/makefile

@@ -29,7 +29,3 @@ clean:
 	rm $(ROOT)stream
 	rm $(ROOT)subscribe
 	rm $(ROOT)apitest
-
-
-	
-

tests/examples/c/prepare.c

@@ -184,6 +184,10 @@ void verify_prepare(TAOS* taos) {
     taos_stmt_close(stmt);
     exit(EXIT_FAILURE);
   }
+
+  int affectedRows = taos_stmt_affected_rows(stmt);
+  printf("sucessfully inserted %d rows\n", affectedRows);
+
   taos_stmt_close(stmt);
 
   // query the records
@@ -400,6 +404,9 @@ void verify_prepare2(TAOS* taos) {
     exit(EXIT_FAILURE);
   }
 
+  int affectedRows = taos_stmt_affected_rows(stmt);
+  printf("sucessfully inserted %d rows\n", affectedRows);
+
   taos_stmt_close(stmt);
 
   // query the records
@@ -784,6 +791,10 @@ void verify_prepare3(TAOS* taos) {
     taos_stmt_close(stmt);
     exit(EXIT_FAILURE);
   }
+  
+  int affectedRows = taos_stmt_affected_rows(stmt);
+  printf("successfully inserted %d rows\n", affectedRows);
+
   taos_stmt_close(stmt);
 
   // query the records

tests/pytest/insert/insertTelnetLines.py

@@ -29,7 +29,6 @@ class TDTestCase:
         tdSql.execute("create database if not exists test precision 'us'")
         tdSql.execute('use test')
 
-
         ### metric ###
         print("============= step1 : test metric  ================")
         lines0 = [
@@ -215,7 +214,7 @@ class TDTestCase:
 
         #binary
         lines2_7 = [
-                        "stb2_7 1626006833610ms \"binary_val.!@#$%^&*\" host=\"host0\"",
+                        "stb2_7 1626006833610ms \"  binary_val  .!@#$%^&*  \" host=\"host0\"",
                         "stb2_7 1626006833620ms \"binary_val.:;,./?|+-=\" host=\"host0\"",
                         "stb2_7 1626006833630ms \"binary_val.()[]{}<>\" host=\"host0\""
                      ]
@@ -232,7 +231,7 @@ class TDTestCase:
 
         #nchar
         lines2_8 = [
-                        "stb2_8 1626006833610ms L\"nchar_val数值一\" host=\"host0\"",
+                        "stb2_8 1626006833610ms L\"  nchar_val  数值一  \" host=\"host0\"",
                         "stb2_8 1626006833620ms L\"nchar_val数值二\" host=\"host0\""
                      ]
 

tests/pytest/insert/line_insert.py

@@ -31,9 +31,9 @@ class TDTestCase:
 
         tdSql.execute('create stable ste(ts timestamp, f int) tags(t1 bigint)')
 
-        lines = [   "st,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000",
+        lines = [   "st,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"\"\"a    pa,\"s   si,t \"\"\",c2=false,c4=4f64 1626006833639000000",
                     "st,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64 1626006833640000000",
-                    "ste,t2=5f64,t3=L\"ste\" c1=true,c2=4i64,c3=\"iam\" 1626056811823316532",
+                    "ste,t2=5f64,t3=L\"ste\" c1=true,c2=4i64,c3=\" i,\"a \"m,\"\"\" 1626056811823316532",
                     "stf,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000",
                     "st,t1=4i64,t2=5f64,t3=\"t4\" c1=3i64,c3=L\"passitagain\",c2=true,c4=5f64 1626006833642000000",
                     "ste,t2=5f64,t3=L\"ste2\" c3=\"iamszhou\",c4=false 1626056811843316532",

tests/script/api/batchprepare.c

@@ -119,7 +119,11 @@ int stmt_scol_func1(TAOS_STMT *stmt) {
     printf("failed to execute insert statement.\n");
     exit(1);
   }
-
+  
+  int affectedRows = taos_stmt_affected_rows(stmt);
+  if (affectedRows != 100) {
+    printf("failed to insert 100 rows");
+  }
   return 0;
 }
 

tests/script/api/stmt.c

@@ -46,6 +46,7 @@ void taos_stmt_init_test() {
   }
   stmt = taos_stmt_init(taos);
   assert(stmt != NULL);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   assert(taos_stmt_close(stmt) == 0);
   printf("finish taos_stmt_init test\n");
 }
@@ -127,6 +128,7 @@ void taos_stmt_set_tbname_test() {
   assert(taos_stmt_set_tbname(stmt, name) == 0);
   free(name);
   free(stmt_sql);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   taos_stmt_close(stmt);
   printf("finish taos_stmt_set_tbname test\n");
 }
@@ -166,6 +168,7 @@ void taos_stmt_set_tbname_tags_test() {
   free(stmt_sql);
   free(name);
   free(tags);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   taos_stmt_close(stmt);
   printf("finish taos_stmt_set_tbname_tags test\n");
 }
@@ -194,8 +197,10 @@ void taos_stmt_set_sub_tbname_test() {
   assert(taos_stmt_set_sub_tbname(stmt, name) != 0);
   sprintf(name, "tb");
   assert(taos_stmt_set_sub_tbname(stmt, name) == 0);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   assert(taos_load_table_info(taos, "super, tb") == 0);
   assert(taos_stmt_set_sub_tbname(stmt, name) == 0);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   free(name);
   free(stmt_sql);
   assert(taos_stmt_close(stmt) == 0);
@@ -238,6 +243,7 @@ void taos_stmt_bind_param_test() {
   assert(taos_stmt_bind_param(stmt, params) != 0);
   assert(taos_stmt_set_tbname(stmt, "super") == 0);
   assert(taos_stmt_bind_param(stmt, params) == 0);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   free(params);
   free(stmt_sql);
   taos_stmt_close(stmt);
@@ -249,6 +255,7 @@ void taos_stmt_bind_single_param_batch_test() {
   TAOS_STMT *      stmt = NULL;
   TAOS_MULTI_BIND *bind = NULL;
   assert(taos_stmt_bind_single_param_batch(stmt, bind, 0) != 0);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   printf("finish taos_stmt_bind_single_param_batch test\n");
 }
 
@@ -257,6 +264,7 @@ void taos_stmt_bind_param_batch_test() {
   TAOS_STMT *      stmt = NULL;
   TAOS_MULTI_BIND *bind = NULL;
   assert(taos_stmt_bind_param_batch(stmt, bind) != 0);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   printf("finish taos_stmt_bind_param_batch test\n");
 }
 
@@ -293,10 +301,14 @@ void taos_stmt_add_batch_test() {
   params[1].length = &params[1].buffer_length;
   params[1].is_null = NULL;
   assert(taos_stmt_set_tbname(stmt, "super") == 0);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   assert(taos_stmt_bind_param(stmt, params) == 0);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   assert(taos_stmt_add_batch(stmt) == 0);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   free(params);
   free(stmt_sql);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   assert(taos_stmt_close(stmt) == 0);
   printf("finish taos_stmt_add_batch test\n");
 }
@@ -317,10 +329,13 @@ void taos_stmt_execute_test() {
   stmt = taos_stmt_init(taos);
   assert(stmt != NULL);
   assert(taos_stmt_execute(stmt) != 0);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   char *stmt_sql = calloc(1, 1000);
   sprintf(stmt_sql, "insert into ? values (?,?)");
   assert(taos_stmt_prepare(stmt, stmt_sql, 0) == 0);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   assert(taos_stmt_execute(stmt) != 0);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   TAOS_BIND *params = calloc(2, sizeof(TAOS_BIND));
   int64_t    ts = (int64_t)1591060628000;
   params[0].buffer_type = TSDB_DATA_TYPE_TIMESTAMP;
@@ -335,11 +350,17 @@ void taos_stmt_execute_test() {
   params[1].length = &params[1].buffer_length;
   params[1].is_null = NULL;
   assert(taos_stmt_set_tbname(stmt, "super") == 0);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   assert(taos_stmt_execute(stmt) != 0);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   assert(taos_stmt_bind_param(stmt, params) == 0);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   assert(taos_stmt_execute(stmt) != 0);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   assert(taos_stmt_add_batch(stmt) == 0);
+  assert(taos_stmt_affected_rows(stmt) == 0);
   assert(taos_stmt_execute(stmt) == 0);
+  assert(taos_stmt_affected_rows(stmt) == 1);
   free(params);
   free(stmt_sql);
   assert(taos_stmt_close(stmt) == 0);
@@ -542,4 +563,4 @@ int main(int argc, char *argv[]) {
   test_api_reliability();
   test_query();
   return 0;
-}
+}
\ No newline at end of file

tests/script/api/stmtTest.c

@@ -229,6 +229,14 @@ int main(int argc, char *argv[]) {
     PRINT_SUCCESS
     printf("Successfully execute insert statement.\n");
 
+    int affectedRows = taos_stmt_affected_rows(stmt);
+    printf("Successfully inserted %d rows\n", affectedRows);
+    if (affectedRows != 10) {
+      PRINT_ERROR
+      printf("failed to insert 10 rows\n");
+      exit(EXIT_FAILURE);
+    }
+
     taos_stmt_close(stmt);
     for (int i = 0; i < 10; i++) {
         check_result(taos, i, 1);