Merge pull request #1684 from taosdata/feature/lihui

[merge puhua modify]

src/client/src/tscUtil.c

@@ -2010,7 +2010,7 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, void (*fp)(), void
     }
     
     // create the fields info from the sql functions
-    SColumnList columnList = {.num = 1};
+    SColumnList columnList = {.num = 0};
   
     for(int32_t k = 0; k < numOfOutputCols; ++k) {
       SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, indexList[k]);

src/sdb/src/sdbEngine.c

@@ -812,11 +812,10 @@ void sdbResetTable(SSdbTable *pTable) {
   SRowHead *rowHead = NULL;
   void *    pMetaRow = NULL;
   int64_t   oldId = pTable->id;
-  //TODO: check
-  //int       oldNumOfRows = pTable->numOfRows;
+  int       oldNumOfRows = pTable->numOfRows;
 
   if (sdbOpenSdbFile(pTable) < 0) return;
-  //pTable->numOfRows = oldNumOfRows;
+  pTable->numOfRows = oldNumOfRows;
 
   total_size = sizeof(SRowHead) + pTable->maxRowSize + sizeof(TSCKSUM);
   rowHead = (SRowHead *)malloc(total_size);