diff --git a/src/common/src/texpr.c b/src/common/src/texpr.c
index 45872918bdcde6c4c290ce6d2751a574b3806e69..96bc03fd0898c14980a7d1137e30bd542de346c8 100644
--- a/src/common/src/texpr.c
+++ b/src/common/src/texpr.c
@@ -2007,86 +2007,100 @@ void vectorTimeFunc(int16_t functionId, tExprOperandInfo *pInputs, int32_t numIn
           assert(pInputs[1].type == TSDB_DATA_TYPE_TIMESTAMP);
           assert(pInputs[2].type == TSDB_DATA_TYPE_BIGINT);
 
-          int64_t timeUnit, timePrec;
+          int64_t timeUnit, timePrec, timeVal = 0;
           GET_TYPED_DATA(timeUnit, int64_t, pInputs[1].type, inputData[1]);
           GET_TYPED_DATA(timePrec, int64_t, pInputs[2].type, inputData[2]);
 
           if (pInputs[0].type == TSDB_DATA_TYPE_BINARY ||
-              pInputs[0].type == TSDB_DATA_TYPE_NCHAR) {
-            int64_t timeVal = 0;
+              pInputs[0].type == TSDB_DATA_TYPE_NCHAR) { /* datetime format strings */
             taosParseTime((char *)varDataVal(inputData[0]), &timeVal, pInputs[0].bytes, timePrec, 0);
+          } else if (pInputs[0].type == TSDB_DATA_TYPE_BIGINT ||
+                     pInputs[0].type == TSDB_DATA_TYPE_TIMESTAMP) { /* unix timestamp or ts column*/
+            GET_TYPED_DATA(timeVal, int64_t, pInputs[0].type, inputData[0]);
+          }
 
-            char buf[20] = {0};
-            NUM_TO_STRING(TSDB_DATA_TYPE_BIGINT, &timeVal, sizeof(buf), buf);
-            int32_t tsDigits = strlen(buf);
-            switch (timeUnit) {
-              case 1: { /* 1a */
-                if (tsDigits == TSDB_TIME_PRECISION_MILLI_DIGITS) {
-                  timeVal = timeVal;
-                } else if (tsDigits == TSDB_TIME_PRECISION_MICRO_DIGITS) {
-                  timeVal = timeVal / (1000 * 1000) * (1000 * 1000);
-                } else if (tsDigits == TSDB_TIME_PRECISION_NANO_DIGITS) {
-                  timeVal = timeVal / (1000 * 1000 * 1000) * (1000 * 1000 * 1000);
-                } else {
-                  assert(0);
-                }
-                break;
-              }
-              case 1000: { /* 1s */
-                if (tsDigits == TSDB_TIME_PRECISION_MILLI_DIGITS) {
-                  timeVal = timeVal / 1000 * 1000;
-                } else if (tsDigits == TSDB_TIME_PRECISION_MICRO_DIGITS) {
-                  timeVal = timeVal / (1000 * 1000) * (1000 * 1000);
-                } else if (tsDigits == TSDB_TIME_PRECISION_NANO_DIGITS) {
-                  timeVal = timeVal / (1000 * 1000 * 1000) * (1000 * 1000 * 1000);
-                } else {
-                  assert(0);
-                }
-                break;
+          char buf[20] = {0};
+          NUM_TO_STRING(TSDB_DATA_TYPE_BIGINT, &timeVal, sizeof(buf), buf);
+          int32_t tsDigits = strlen(buf);
+          int64_t factor = (timePrec == TSDB_TIME_PRECISION_MILLI) ? 1000 :
+                           (timePrec == TSDB_TIME_PRECISION_MICRO ? 1000000 : 1000000000);
+          switch (timeUnit) {
+            case 1: { /* 1a */
+              if (tsDigits == TSDB_TIME_PRECISION_MILLI_DIGITS) {
+                timeVal = timeVal;
+              } else if (tsDigits == TSDB_TIME_PRECISION_MICRO_DIGITS) {
+                timeVal = timeVal / (1000 * 1000) * (1000 * 1000);
+              } else if (tsDigits == TSDB_TIME_PRECISION_NANO_DIGITS) {
+                timeVal = timeVal / (1000 * 1000 * 1000) * (1000 * 1000 * 1000);
+              } else if (tsDigits <= TSDB_TIME_PRECISION_SEC_DIGITS){
+                timeVal = timeVal * factor;
+              } else {
+                assert(0);
               }
-              case 60000: { /* 1m */
-                if (tsDigits == TSDB_TIME_PRECISION_MILLI_DIGITS) {
-                  timeVal = timeVal / 1000 / 60 * 60 * 1000;
-                } else if (tsDigits == TSDB_TIME_PRECISION_MICRO_DIGITS) {
-                  timeVal = timeVal / (1000 * 1000) / 60 * 60 * (1000 * 1000);
-                } else if (tsDigits == TSDB_TIME_PRECISION_NANO_DIGITS) {
-                  timeVal = timeVal / (1000 * 1000 * 1000) / 60 * 60 * (1000 * 1000 * 1000);
-                } else {
-                  assert(0);
-                }
-                break;
+              break;
+            }
+            case 1000: { /* 1s */
+              if (tsDigits == TSDB_TIME_PRECISION_MILLI_DIGITS) {
+                timeVal = timeVal / 1000 * 1000;
+              } else if (tsDigits == TSDB_TIME_PRECISION_MICRO_DIGITS) {
+                timeVal = timeVal / (1000 * 1000) * (1000 * 1000);
+              } else if (tsDigits == TSDB_TIME_PRECISION_NANO_DIGITS) {
+                timeVal = timeVal / (1000 * 1000 * 1000) * (1000 * 1000 * 1000);
+              } else if (tsDigits <= TSDB_TIME_PRECISION_SEC_DIGITS) {
+                timeVal = timeVal * factor;
+              } else {
+                assert(0);
               }
-              case 3600000: { /* 1h */
-                if (tsDigits == TSDB_TIME_PRECISION_MILLI_DIGITS) {
-                  timeVal = timeVal / 1000 / 3600 * 3600 * 1000;
-                } else if (tsDigits == TSDB_TIME_PRECISION_MICRO_DIGITS) {
-                  timeVal = timeVal / (1000 * 1000) / 3600 * 3600 * (1000 * 1000);
-                } else if (tsDigits == TSDB_TIME_PRECISION_NANO_DIGITS) {
-                  timeVal = timeVal / (1000 * 1000 * 1000) / 3600 * 3600 * (1000 * 1000 * 1000);
-                } else {
-                  assert(0);
-                }
-                break;
+              break;
+            }
+            case 60000: { /* 1m */
+              if (tsDigits == TSDB_TIME_PRECISION_MILLI_DIGITS) {
+                timeVal = timeVal / 1000 / 60 * 60 * 1000;
+              } else if (tsDigits == TSDB_TIME_PRECISION_MICRO_DIGITS) {
+                timeVal = timeVal / (1000 * 1000) / 60 * 60 * (1000 * 1000);
+              } else if (tsDigits == TSDB_TIME_PRECISION_NANO_DIGITS) {
+                timeVal = timeVal / (1000 * 1000 * 1000) / 60 * 60 * (1000 * 1000 * 1000);
+              } else if (tsDigits <= TSDB_TIME_PRECISION_SEC_DIGITS) {
+                timeVal = timeVal * factor / factor / 60 * 60 * factor;
+              } else {
+                assert(0);
               }
-              case 86400000: { /* 1d */
-                if (tsDigits == TSDB_TIME_PRECISION_MILLI_DIGITS) {
-                  timeVal = timeVal / 1000 / 86400 * 86400 * 1000;
-                } else if (tsDigits == TSDB_TIME_PRECISION_MICRO_DIGITS) {
-                  timeVal = timeVal / (1000 * 1000) / 86400 * 86400 * (1000 * 1000);
-                } else if (tsDigits == TSDB_TIME_PRECISION_NANO_DIGITS) {
-                  timeVal = timeVal / (1000 * 1000 * 1000) / 86400 * 86400 * (1000 * 1000 * 1000);
-                } else {
-                  assert(0);
-                }
-                break;
+              break;
+            }
+            case 3600000: { /* 1h */
+              if (tsDigits == TSDB_TIME_PRECISION_MILLI_DIGITS) {
+                timeVal = timeVal / 1000 / 3600 * 3600 * 1000;
+              } else if (tsDigits == TSDB_TIME_PRECISION_MICRO_DIGITS) {
+                timeVal = timeVal / (1000 * 1000) / 3600 * 3600 * (1000 * 1000);
+              } else if (tsDigits == TSDB_TIME_PRECISION_NANO_DIGITS) {
+                timeVal = timeVal / (1000 * 1000 * 1000) / 3600 * 3600 * (1000 * 1000 * 1000);
+              } else if (tsDigits <= TSDB_TIME_PRECISION_SEC_DIGITS) {
+                timeVal = timeVal * factor / factor / 3600 * 3600 * factor;
+              } else {
+                assert(0);
               }
-              default: {
-                timeVal = 0;
-                break;
+              break;
+            }
+            case 86400000: { /* 1d */
+              if (tsDigits == TSDB_TIME_PRECISION_MILLI_DIGITS) {
+                timeVal = timeVal / 1000 / 86400 * 86400 * 1000;
+              } else if (tsDigits == TSDB_TIME_PRECISION_MICRO_DIGITS) {
+                timeVal = timeVal / (1000 * 1000) / 86400 * 86400 * (1000 * 1000);
+              } else if (tsDigits == TSDB_TIME_PRECISION_NANO_DIGITS) {
+                timeVal = timeVal / (1000 * 1000 * 1000) / 86400 * 86400 * (1000 * 1000 * 1000);
+              } else if (tsDigits <= TSDB_TIME_PRECISION_SEC_DIGITS) {
+                timeVal = timeVal * factor / factor / 86400* 86400 * factor;
+              } else {
+                assert(0);
               }
+              break;
+            }
+            default: {
+              timeVal = 0;
+              break;
             }
-            SET_TYPED_DATA(outputData, pOutput->type, timeVal);
           }
+          SET_TYPED_DATA(outputData, pOutput->type, timeVal);
 
           break;
         }