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

source/common/src/ttime.c

@@ -94,8 +94,6 @@ static int32_t (*parseLocaltimeFp[]) (char* timestr, int64_t* time, int32_t time
   parseLocaltimeWithDst
 };
 
-int32_t taosGetTimestampSec() { return (int32_t)time(NULL); }
-
 int32_t taosParseTime(char* timestr, int64_t* time, int32_t len, int32_t timePrec, int8_t day_light) {
   /* parse datatime string in with tz */
   if (strnchr(timestr, 'T', len, false) != NULL) {

source/os/src/osTime.c

@@ -63,4 +63,6 @@ FORCE_INLINE int32_t taosGetTimeOfDay(struct timeval *tv) {
   return gettimeofday(tv, NULL);
 }
 
+int32_t taosGetTimestampSec() { return (int32_t)time(NULL); }
+
 #endif