Merge branch 'develop' into feature/query

src/util/inc/tutil.h

@@ -117,7 +117,7 @@ extern "C" {
 
 #define POW2(x) ((x) * (x))
 
-int taosRand(void);
+uint32_t taosRand(void);
 
 int32_t strdequote(char *src);
 

src/util/src/tkvstore.c

@@ -445,10 +445,11 @@ static void *tdDecodeKVRecord(void *buf, SKVRecord *pRecord) {
 }
 
 static int tdRestoreKVStore(SKVStore *pStore) {
-  char      tbuf[128] = "\0";
-  void *    buf = NULL;
-  int       maxBufSize = 0;
-  SKVRecord rInfo = {0};
+  char                  tbuf[128] = "\0";
+  void *                buf = NULL;
+  int                   maxBufSize = 0;
+  SKVRecord             rInfo = {0};
+  SHashMutableIterator *pIter = NULL;
 
   ASSERT(TD_KVSTORE_HEADER_SIZE == lseek(pStore->fd, 0, SEEK_CUR));
 
@@ -497,7 +498,7 @@ static int tdRestoreKVStore(SKVStore *pStore) {
     goto _err;
   }
 
-  SHashMutableIterator *pIter = taosHashCreateIter(pStore->map);
+  pIter = taosHashCreateIter(pStore->map);
   if (pIter == NULL) {
     uError("failed to create hash iter while opening KV store %s", pStore->fname);
     terrno = TSDB_CODE_COM_OUT_OF_MEMORY;

src/util/src/tutil.c

@@ -29,12 +29,12 @@
 
 
 #ifdef WINDOWS
-int taosRand(void)
+uint32_t taosRand(void)
 {
   return rand();
 }
 #else
-int taosRand(void)
+uint32_t taosRand(void)
 {
   int fd;
   int seed;
@@ -50,7 +50,7 @@ int taosRand(void)
     close(fd);
   }
 
-  return seed;
+  return (uint32_t)seed;
 }
 #endif
 
@@ -474,9 +474,9 @@ void getTmpfilePath(const char *fileNamePrefix, char *dstPath) {
 void taosRandStr(char* str, int32_t size) {
   const char* set = "abcdefghijklmnopqrstuvwxyz0123456789-_.";
   int32_t len = 39;
-  
-  for(int32_t i = 0; i < size; ++i) {
-    str[i] = set[taosRand()%len];
+
+  for (int32_t i = 0; i < size; ++i) {
+    str[i] = set[taosRand() % len];
   }
 }