fix: interval more than 1000 years

include/util/taoserror.h

@@ -657,6 +657,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_PAR_CORRESPONDING_STABLE_ERR  TAOS_DEF_ERROR_CODE(0, 0x2618)
 #define TSDB_CODE_PAR_INVALID_DB_OPTION         TAOS_DEF_ERROR_CODE(0, 0x2619)
 #define TSDB_CODE_PAR_INVALID_TABLE_OPTION      TAOS_DEF_ERROR_CODE(0, 0x261A)
+#define TSDB_CODE_PAR_INTER_VALUE_TOO_BIG       TAOS_DEF_ERROR_CODE(0, 0x261B)
 #define TSDB_CODE_PAR_GROUPBY_WINDOW_COEXIST    TAOS_DEF_ERROR_CODE(0, 0x2624)
 #define TSDB_CODE_PAR_AGG_FUNC_NESTING          TAOS_DEF_ERROR_CODE(0, 0x2627)
 #define TSDB_CODE_PAR_INVALID_STATE_WIN_TYPE    TAOS_DEF_ERROR_CODE(0, 0x2628)

source/libs/parser/src/parTranslater.c

@@ -3512,6 +3512,7 @@ static void convertVarDuration(SValueNode* pOffset, uint8_t precision) {
   pOffset->unit = units[precision];
 }
 
+static const int64_t  maxKeepMS = (int64_t)3600 * 1000 * 24 * (365 * 1000 + 250);
 static int32_t checkIntervalWindow(STranslateContext* pCxt, SIntervalWindowNode* pInterval) {
   uint8_t precision = ((SColumnNode*)pInterval->pCol)->node.resType.precision;
 
@@ -3520,6 +3521,8 @@ static int32_t checkIntervalWindow(STranslateContext* pCxt, SIntervalWindowNode*
   if (pInter->datum.i <= 0 || (!valInter && pInter->datum.i < tsMinIntervalTime)) {
     return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INTER_VALUE_TOO_SMALL, tsMinIntervalTime,
                                 getPrecisionStr(precision));
+  } else if (pInter->datum.i > maxKeepMS) {
+    return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INTER_VALUE_TOO_BIG, 1000, "years");
   }
 
   if (NULL != pInterval->pOffset) {

source/libs/parser/src/parUtil.c

@@ -65,6 +65,8 @@ static char* getSyntaxErrFormat(int32_t errCode) {
       return "This statement is no longer supported";
     case TSDB_CODE_PAR_INTER_VALUE_TOO_SMALL:
       return "Interval cannot be less than %d %s";
+    case TSDB_CODE_PAR_INTER_VALUE_TOO_BIG:
+      return "Interval cannot be more than %d %s";
     case TSDB_CODE_PAR_DB_NOT_SPECIFIED:
       return "Database not specified";
     case TSDB_CODE_PAR_INVALID_IDENTIFIER_NAME:

source/os/src/osTime.c

@@ -477,47 +477,38 @@ struct tm *taosLocalTime(const time_t *timep, struct tm *result, char *buf) {
     return res;
   }
 #ifdef WINDOWS
-  if (*timep < 0) {
+  if (*timep < -2208988800LL) {
-    if (*timep < -2208988800LL) {
+    if (buf != NULL) {
-      if (buf != NULL) {
+      sprintf(buf, "NaN");
-        sprintf(buf, "NaN");
-      }
-      return NULL;
-    }
-
-    SYSTEMTIME    s;
-    FILETIME      f;
-    LARGE_INTEGER offset;
-    struct tm     tm1;
-    time_t        tt = 0;
-    if (localtime_s(&tm1, &tt) != 0 ) {
-      if (buf != NULL) {
-        sprintf(buf, "NaN");
-      }
-      return NULL;
-    }
-    offset.QuadPart = TIMEEPOCH1900;
-    offset.QuadPart += *timep * 10000000;
-    f.dwLowDateTime = offset.QuadPart & 0xffffffff;
-    f.dwHighDateTime = (offset.QuadPart >> 32) & 0xffffffff;
-    FileTimeToSystemTime(&f, &s);
-    result->tm_sec = s.wSecond;
-    result->tm_min = s.wMinute;
-    result->tm_hour = s.wHour;
-    result->tm_mday = s.wDay;
-    result->tm_mon = s.wMonth - 1;
-    result->tm_year = s.wYear - 1900;
-    result->tm_wday = s.wDayOfWeek;
-    result->tm_yday = 0;
-    result->tm_isdst = 0;
-  } else {
-    if (localtime_s(result, timep) != 0) {
-      if (buf != NULL) {
-        sprintf(buf, "NaN");
-      }
-      return NULL;
     }
+    return NULL;
   }
+
+  SYSTEMTIME    s;
+  FILETIME      f;
+  LARGE_INTEGER offset;
+  struct tm     tm1;
+  time_t        tt = 0;
+  if (localtime_s(&tm1, &tt) != 0) {
+    if (buf != NULL) {
+      sprintf(buf, "NaN");
+    }
+    return NULL;
+  }
+  offset.QuadPart = TIMEEPOCH1900;
+  offset.QuadPart += *timep * 10000000;
+  f.dwLowDateTime = offset.QuadPart & 0xffffffff;
+  f.dwHighDateTime = (offset.QuadPart >> 32) & 0xffffffff;
+  FileTimeToSystemTime(&f, &s);
+  result->tm_sec = s.wSecond;
+  result->tm_min = s.wMinute;
+  result->tm_hour = s.wHour;
+  result->tm_mday = s.wDay;
+  result->tm_mon = s.wMonth - 1;
+  result->tm_year = s.wYear - 1900;
+  result->tm_wday = s.wDayOfWeek;
+  result->tm_yday = 0;
+  result->tm_isdst = 0;
 #else
   res = localtime_r(timep, result);
   if (res == NULL && buf != NULL) {

source/util/src/terror.c

@@ -518,6 +518,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_PORT,              "Port should be an in
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_ENDPOINT,          "Endpoint should be in the format of 'fqdn:port'")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_EXPRIE_STATEMENT,          "This statement is no longer supported")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INTER_VALUE_TOO_SMALL,     "Interval too small")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INTER_VALUE_TOO_BIG,       "Interval too big")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_DB_NOT_SPECIFIED,          "Database not specified")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_IDENTIFIER_NAME,   "Invalid identifier name")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_CORRESPONDING_STABLE_ERR,  "Corresponding super table not in this db")