[TS-238]<feature>(tsdb): support client show tables count

src/client/inc/tsclient.h

@@ -319,6 +319,7 @@ typedef struct {
 
   TAOS_FIELD*    final;
   struct SGlobalMerger *pMerger;
+  int32_t        numOfTables;
 } SSqlRes;
 
 typedef struct {
@@ -498,6 +499,7 @@ void doAsyncQuery(STscObj *pObj, SSqlObj *pSql, __async_cb_func_t fp, void *para
 void tscImportDataFromFile(SSqlObj *pSql);
 struct SGlobalMerger* tscInitResObjForLocalQuery(int32_t numOfRes, int32_t rowLen, uint64_t id);
 bool tscIsUpdateQuery(SSqlObj* pSql);
+bool tscIsDeleteQuery(SSqlObj* pSql);
 char* tscGetSqlStr(SSqlObj* pSql);
 bool tscIsQueryWithLimit(SSqlObj* pSql);
 

src/client/src/tscDelete.c

@@ -89,7 +89,8 @@ void tscSubDeleteCallback(void *param, TAOS_RES *tres, int code) {
       pSql->self, pVgroup->epAddr[pSql->epSet.inUse].fqdn, pVgroup->vgId, trsupport->subqueryIndex);
 
   // success do total count
-  pParentSql->res.numOfRows += pSql->res.numOfRows;
+  pParentSql->res.numOfRows   += pSql->res.numOfRows;
+  pParentSql->res.numOfTables += pSql->res.numOfTables;
   if (subAndCheckDone(pSql, pParentSql, trsupport->subqueryIndex)) {
     // all sub done, call parentSQL callback to finish
     (*pParentSql->fp)(pParentSql->param, pParentSql, pParentSql->res.numOfRows);

src/client/src/tscServer.c

@@ -523,9 +523,12 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcEpSet *pEpSet) {
       pMsg->numOfRows = htonl(pMsg->numOfRows);
       pMsg->affectedRows = htonl(pMsg->affectedRows);
       pMsg->failedRows = htonl(pMsg->failedRows);
-      pMsg->numOfFailedBlocks = htonl(pMsg->numOfFailedBlocks);
+      pMsg->numOfTables = htonl(pMsg->numOfTables);
 
       pRes->numOfRows += pMsg->affectedRows;
+      if(pMsg->numOfTables > 0) {
+        pRes->numOfTables = pMsg->numOfTables;
+      }
       tscDebug("0x%"PRIx64" SQL cmd:%s, code:%s inserted rows:%d rspLen:%d", pSql->self, sqlCmd[pCmd->command],
                tstrerror(pRes->code), pMsg->affectedRows, pRes->rspLen);
     } else {

src/client/src/tscSql.c

@@ -433,6 +433,14 @@ int taos_affected_rows(TAOS_RES *tres) {
   return pSql->res.numOfRows;
 }
 
+int taos_affected_tables(TAOS_RES *tres) {
+  SSqlObj* pSql = (SSqlObj*) tres;
+  if (pSql == NULL || pSql->signature != pSql) return 0;
+
+  return pSql->res.numOfTables;
+}
+
+
 TAOS_FIELD *taos_fetch_fields(TAOS_RES *res) {
   SSqlObj *pSql = (SSqlObj *)res;
   SSqlRes *pRes = &pSql->res;

src/client/src/tscUtil.c

@@ -4311,6 +4311,15 @@ bool tscIsUpdateQuery(SSqlObj* pSql) {
   return ((pCmd->command >= TSDB_SQL_INSERT && pCmd->command <= TSDB_SQL_DROP_DNODE) || TSDB_SQL_RESET_CACHE == pCmd->command || TSDB_SQL_USE_DB == pCmd->command);
 }
 
+bool tscIsDeleteQuery(SSqlObj* pSql) {
+  if (pSql == NULL || pSql->signature != pSql) {
+    return false;
+  }
+
+  SSqlCmd* pCmd = &pSql->cmd;
+  return pCmd->command == TSDB_SQL_DELETE_DATA;
+}
+
 char* tscGetSqlStr(SSqlObj* pSql) {
   if (pSql == NULL || pSql->signature != pSql) {
     return NULL;

src/inc/taos.h

@@ -216,6 +216,8 @@ DLL_EXPORT TAOS_RES *taos_schemaless_insert(TAOS* taos, char* lines[], int numLi
 
 DLL_EXPORT int32_t taos_parse_time(char* timestr, int64_t* time, int32_t len, int32_t timePrec, int8_t dayligth);
 
+DLL_EXPORT int taos_affected_tables(TAOS_RES *res);
+
 #ifdef __cplusplus
 }
 #endif

src/inc/taosmsg.h

@@ -256,7 +256,7 @@ typedef struct {
   int32_t              numOfRows;     // number of records the client is trying to write
   int32_t              affectedRows;  // number of records actually written
   int32_t              failedRows;    // number of failed records (exclude duplicate records)
-  int32_t              numOfFailedBlocks;
+  int32_t              numOfTables;   // affected tables
   SShellSubmitRspBlock failedBlocks[];
 } SShellSubmitRspMsg;
 

src/kit/shell/src/shellEngine.c

@@ -291,7 +291,20 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
     return;
   }
 
-  if (!tscIsUpdateQuery(pSql)) {  // select and show kinds of commands
+  if (tscIsDeleteQuery(pSql)) {
+    // delete
+    int numOfRows   = taos_affected_rows(pSql);
+    int numOfTables = taos_affected_tables(pSql);
+    int error_no    = taos_errno(pSql);
+
+    et = taosGetTimestampUs();
+    if (error_no == TSDB_CODE_SUCCESS) {
+      printf("Deleted %d row(s) from %d table(s) (%.6fs)\n", numOfRows, numOfTables, (et - st) / 1E6);
+    } else {
+      printf("Deleted interrupted (%s), %d row(s) from %d tables (%.6fs)\n", taos_errstr(pSql), numOfRows, numOfTables, (et - st) / 1E6);
+    }
+  }
+  else if (!tscIsUpdateQuery(pSql)) {  // select and show kinds of commands
     int error_no = 0;
 
     int numOfRows = shellDumpResult(pSql, fname, &error_no, printMode);

src/tsdb/inc/tsdbint.h

@@ -99,7 +99,7 @@ struct STsdbRepo {
 
   SMergeBuf       mergeBuf;  //used when update=2
   int8_t          compactState;  // compact state: inCompact/noCompact/waitingCompact?
-  int8_t          truncateState;  // truncate state: inTruncate/noTruncate/waitingTruncate
+  int8_t          deleteState;  // truncate state: inTruncate/noTruncate/waitingTruncate
 
   pthread_t*      pthread;
 };

src/tsdb/src/tsdbDelete.c

@@ -63,9 +63,8 @@ typedef struct {
 #define TSDB_DELETE_EXBUF(pdh) TSDB_READ_EXBUF(&((pdh)->readh))
 
 
-static void  tsdbStartDelete(STsdbRepo *pRepo);
-static void  tsdbEndDelete(STsdbRepo *pRepo, int eno);
-static int   tsdbDeleteMeta(STsdbRepo *pRepo);
+static void  tsdbStartDeleteTrans(STsdbRepo *pRepo);
+static void  tsdbEndDeleteTrans(STsdbRepo *pRepo, int eno);
 static int   tsdbDeleteTSData(STsdbRepo *pRepo, SControlDataInfo* pCtlInfo, SArray* pArray);
 static int   tsdbFSetDelete(SDeleteH *pdh, SDFileSet *pSet);
 static int   tsdbInitDeleteH(SDeleteH *pdh, STsdbRepo *pRepo);
@@ -73,7 +72,6 @@ static void  tsdbDestroyDeleteH(SDeleteH *pdh);
 static int   tsdbInitDeleteTblArray(SDeleteH *pdh);
 static void  tsdbDestroyDeleteTblArray(SDeleteH *pdh);
 static int   tsdbCacheFSetIndex(SDeleteH *pdh);
-static int   tsdbDeleteCache(STsdbRepo *pRepo, void *param);
 static int   tsdbFSetInit(SDeleteH *pdh, SDFileSet *pSet);
 static void  tsdbDeleteFSetEnd(SDeleteH *pdh);
 static int   tsdbFSetDeleteImpl(SDeleteH *pdh);
@@ -88,6 +86,7 @@ int tsdbControlDelete(STsdbRepo* pRepo, SControlDataInfo* pCtlInfo) {
   int32_t ret = tsdbDeleteImplCommon(pRepo, pCtlInfo);
   if(pCtlInfo->pRsp) {
     pCtlInfo->pRsp->affectedRows = htonl(pCtlInfo->pRsp->affectedRows);
+    pCtlInfo->pRsp->numOfTables  = htonl(pCtlInfo->pRsp->numOfTables);
     pCtlInfo->pRsp->code = ret;
   }
 
@@ -112,26 +111,23 @@ static void tsdbClearUpdates(SArray * pArray) {
   taosArrayDestroy(&pArray);
 }
 
-static int tsdbDeleteImplCommon(STsdbRepo *pRepo, SControlDataInfo* pCtlInfo) {
-  int32_t code = 0;
-  // Step 1: check and clear cache
-  if ((code = tsdbDeleteCache(pRepo, pCtlInfo)) != 0) {
-    pRepo->code = terrno;
-    tsem_post(&(pRepo->readyToCommit));
-    tsdbInfo("vgId:%d failed to truncate since %s", REPO_ID(pRepo), tstrerror(terrno));
-    return -1;
-  }
+static int tsdbDeleteMeta(STsdbRepo *pRepo) {
+  STsdbFS *pfs = REPO_FS(pRepo);
+  tsdbUpdateMFile(pfs, pfs->cstatus->pmf);
+  return TSDB_CODE_SUCCESS;
+}
 
-  // Step 2: truncate and rebuild DFileSets
-  // Check if there are files in TSDB FS to truncate
+static int tsdbDeleteImplCommon(STsdbRepo *pRepo, SControlDataInfo* pCtlInfo) {
+  // check valid
   if ((REPO_FS(pRepo)->cstatus->pmf == NULL) || (taosArrayGetSize(REPO_FS(pRepo)->cstatus->df) <= 0)) {
-    pRepo->truncateState = TSDB_NO_DELETE;
+    pRepo->deleteState = TSDB_NO_DELETE;
     tsem_post(&(pRepo->readyToCommit));
-    tsdbInfo("vgId:%d truncate over, no meta or data file", REPO_ID(pRepo));
+    tsdbInfo("vgId:%d delete over, no meta or data file", REPO_ID(pRepo));
     return -1;
   }
 
-  tsdbStartDelete(pRepo);
+  // start transaction
+  tsdbStartDeleteTrans(pRepo);
 
   if (tsdbDeleteMeta(pRepo) < 0) {
     tsdbError("vgId:%d failed to truncate META data since %s", REPO_ID(pRepo), tstrerror(terrno));
@@ -144,7 +140,13 @@ static int tsdbDeleteImplCommon(STsdbRepo *pRepo, SControlDataInfo* pCtlInfo) {
     goto _err;
   }
 
-  tsdbEndDelete(pRepo, TSDB_CODE_SUCCESS);
+  // end transaction
+  tsdbEndDeleteTrans(pRepo, TSDB_CODE_SUCCESS);
+
+  // set affected tables number
+  if(pCtlInfo->pRsp) {
+    pCtlInfo->pRsp->numOfTables = pCtlInfo->tnum;
+  }
 
   // update last row
   tsdbUpdateLastRow(pRepo, aUpdates);
@@ -153,54 +155,30 @@ static int tsdbDeleteImplCommon(STsdbRepo *pRepo, SControlDataInfo* pCtlInfo) {
 
 _err:
   pRepo->code = terrno;
-  tsdbEndDelete(pRepo, terrno);
+  tsdbEndDeleteTrans(pRepo, terrno);
   tsdbClearUpdates(aUpdates);
   return -1;
 }
 
-static int tsdbDeleteCache(STsdbRepo *pRepo, void *param) {
-  // step 1: reset query cache(reset all or the specific cache)
-  // TODO ... check with Doctor Liao
-  // if(... <0){
-  //   terrno = ...;
-  //   return -1;
-  // }
-
-  // step 2: check and clear cache of last_row/last
-  // TODO: ... scan/check/clear stable/child table/common table
-  // if(... <0){
-  //   terrno = ...;
-  //   return -1;
-  // }
-
-  return 0;
-}
-
-static void tsdbStartDelete(STsdbRepo *pRepo) {
-  assert(pRepo->truncateState != TSDB_IN_DELETE);
+static void tsdbStartDeleteTrans(STsdbRepo *pRepo) {
+  assert(pRepo->deleteState != TSDB_IN_DELETE);
   tsdbInfo("vgId:%d start to truncate!", REPO_ID(pRepo));
   tsdbStartFSTxn(pRepo, 0, 0);
   pRepo->code = TSDB_CODE_SUCCESS;
-  pRepo->truncateState = TSDB_IN_DELETE;
+  pRepo->deleteState = TSDB_IN_DELETE;
 }
 
-static void tsdbEndDelete(STsdbRepo *pRepo, int eno) {
+static void tsdbEndDeleteTrans(STsdbRepo *pRepo, int eno) {
   if (eno != TSDB_CODE_SUCCESS) {
     tsdbEndFSTxnWithError(REPO_FS(pRepo));
   } else {
     tsdbEndFSTxn(pRepo);
   }
-  pRepo->truncateState = TSDB_NO_DELETE;
+  pRepo->deleteState = TSDB_NO_DELETE;
   tsdbInfo("vgId:%d truncate over, %s", REPO_ID(pRepo), (eno == TSDB_CODE_SUCCESS) ? "succeed" : "failed");
   tsem_post(&(pRepo->readyToCommit));
 }
 
-static int tsdbDeleteMeta(STsdbRepo *pRepo) {
-  STsdbFS *pfs = REPO_FS(pRepo);
-  tsdbUpdateMFile(pfs, pfs->cstatus->pmf);
-  return 0;
-}
-
 static int tsdbDeleteTSData(STsdbRepo *pRepo, SControlDataInfo* pCtlInfo, SArray* pArray) {
   STsdbCfg *       pCfg = REPO_CFG(pRepo);
   SDeleteH         deleteH = {0};

src/tsdb/src/tsdbMain.c

@@ -214,7 +214,7 @@ int tsdbGetState(STsdbRepo *repo) { return repo->state; }
 
 int8_t tsdbGetCompactState(STsdbRepo *repo) { return (int8_t)(repo->compactState); }
 
-int8_t tsdbGetTruncateState(STsdbRepo *repo) { return (int8_t)(repo->truncateState); }
+int8_t tsdbGetTruncateState(STsdbRepo *repo) { return (int8_t)(repo->deleteState); }
 
 void tsdbReportStat(void *repo, int64_t *totalPoints, int64_t *totalStorage, int64_t *compStorage) {
   ASSERT(repo != NULL);
@@ -575,7 +575,7 @@ static STsdbRepo *tsdbNewRepo(STsdbCfg *pCfg, STsdbAppH *pAppH) {
   pRepo->state = TSDB_STATE_OK;
   pRepo->code = TSDB_CODE_SUCCESS;
   pRepo->compactState = 0;
-  pRepo->truncateState = 0;
+  pRepo->deleteState = 0;
   pRepo->config = *pCfg;
   if (pAppH) {
     pRepo->appH = *pAppH;