Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode

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

@@ -416,8 +416,7 @@ static int32_t mndCreateSma(SMnode *pMnode, SNodeMsg *pReq, SMCreateSmaReq *pCre
   streamObj.version = 1;
   streamObj.sql = pCreate->sql;
   streamObj.createdBy = STREAM_CREATED_BY__SMA;
-  // TODO
-  streamObj.fixedSinkVgId = 0;
+  streamObj.fixedSinkVgId = smaObj.dstVgId;
   streamObj.smaId = smaObj.uid;
   /*streamObj.physicalPlan = "";*/
   streamObj.logicalPlan = "not implemented";

source/dnode/vnode/src/tsdb/tsdbFS.c

@@ -1111,7 +1111,7 @@ static int tsdbRestoreDFileSet(STsdb *pRepo) {
   char         bname[TSDB_FILENAME_LEN];
   STfsDir *       tdir = NULL;
   const STfsFile *pf = NULL;
-  const char * pattern = "^v[0-9]+f[0-9]+\\.(head|data|last)(-ver[0-9]+)?$";
+  const char * pattern = "^v[0-9]+f[0-9]+\\.(head|data|last|smad|smal)(-ver[0-9]+)?$";
   SArray *     fArray = NULL;
   regex_t      regex;
   STsdbFS *    pfs = REPO_FS(pRepo);

source/libs/scalar/src/sclfunc.c

@@ -267,7 +267,7 @@ static void trtrim(char *input, char *output, int32_t type, int32_t charLen) {
       numOfSpaces++;
     }
   } else { //NCHAR
-    for (int32_t i = charLen - 1; i < charLen; ++i) {
+    for (int32_t i = charLen - 1; i >= 0; --i) {
       if (!iswspace(*((uint32_t *)varDataVal(input) + i))) {
         break;
       }