From fc7887e6b7b957648275f93fdaef3f57c867e6d2 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 20 Jul 2022 17:24:49 +0800
Subject: [PATCH] fix(query): update the sim.

---
 include/common/ttime.h              |  1 -
 source/common/src/ttime.c           | 26 --------------------------
 source/libs/scalar/src/sclvector.c  |  2 +-
 tests/script/tsim/scalar/scalar.sim |  9 ++++++---
 4 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/include/common/ttime.h b/include/common/ttime.h
index 2f4129f979..8f4f4f15d8 100644
--- a/include/common/ttime.h
+++ b/include/common/ttime.h
@@ -73,7 +73,6 @@ static FORCE_INLINE int64_t taosGetTimestampToday(int32_t precision) {
 }
 
 int64_t taosTimeAdd(int64_t t, int64_t duration, char unit, int32_t precision);
-int64_t taosTimeSub(int64_t t, int64_t duration, char unit, int32_t precision);
 
 int64_t taosTimeTruncate(int64_t t, const SInterval* pInterval, int32_t precision);
 int32_t taosTimeCountInterval(int64_t skey, int64_t ekey, int64_t interval, char unit, int32_t precision);
diff --git a/source/common/src/ttime.c b/source/common/src/ttime.c
index 8f150441f9..b1e4321053 100644
--- a/source/common/src/ttime.c
+++ b/source/common/src/ttime.c
@@ -712,32 +712,6 @@ int64_t taosTimeAdd(int64_t t, int64_t duration, char unit, int32_t precision) {
   return (int64_t)(taosMktime(&tm) * TSDB_TICK_PER_SECOND(precision) + fraction);
 }
 
-int64_t taosTimeSub(int64_t t, int64_t duration, char unit, int32_t precision) {
-  if (duration == 0) {
-    return t;
-  }
-
-  if (unit != 'n' && unit != 'y') {
-    return t - duration;
-  }
-
-  // The following code handles the y/n time duration
-  int64_t numOfMonth = duration;
-  if (unit == 'y') {
-    numOfMonth *= 12;
-  }
-
-  struct tm tm;
-  time_t    tt = (time_t)(t / TSDB_TICK_PER_SECOND(precision));
-  taosLocalTime(&tt, &tm);
-  int32_t mon = tm.tm_year * 12 + tm.tm_mon - (int32_t)numOfMonth;
-  tm.tm_year = mon / 12;
-  tm.tm_mon = mon % 12;
-
-  return (int64_t)(taosMktime(&tm) * TSDB_TICK_PER_SECOND(precision));
-}
-
-
 int32_t taosTimeCountInterval(int64_t skey, int64_t ekey, int64_t interval, char unit, int32_t precision) {
   if (ekey < skey) {
     int64_t tmp = ekey;
diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c
index 76de4da4fd..254c99f05d 100644
--- a/source/libs/scalar/src/sclvector.c
+++ b/source/libs/scalar/src/sclvector.c
@@ -1195,7 +1195,7 @@ static void vectorMathTsSubHelper(SColumnInfoData* pLeftCol, SColumnInfoData* pR
         colDataAppendNULL(pOutputCol, i);
         continue;  // TODO set null or ignore
       }
-      *output = taosTimeSub(getVectorBigintValueFnLeft(pLeftCol->pData, i), getVectorBigintValueFnRight(pRightCol->pData, 0),
+      *output = taosTimeAdd(getVectorBigintValueFnLeft(pLeftCol->pData, i), -getVectorBigintValueFnRight(pRightCol->pData, 0),
                             pRightCol->info.scale, pRightCol->info.precision);
       
     }
diff --git a/tests/script/tsim/scalar/scalar.sim b/tests/script/tsim/scalar/scalar.sim
index 32224e33ba..29cc67ec24 100644
--- a/tests/script/tsim/scalar/scalar.sim
+++ b/tests/script/tsim/scalar/scalar.sim
@@ -43,7 +43,8 @@ sql select cast(1 as timestamp)+1n;
 if $rows != 1 then
   return -1
 endi
-if $data00 != @70-02-01 08:00:00.000@ then
+if $data00 != @70-02-01 08:00:00.001@ then
+  print expect 70-02-01 08:00:00.001, actual: $data00
   return -1
 endi
 
@@ -52,11 +53,13 @@ if $rows != 1 then
   return -1
 endi
 
-sql select cast(1 as timestamp)-1y;
+# there is an *bug* in print timestamp that smaller than 0, so let's try value that is greater than 0.
+sql select cast(1 as timestamp)+1y;
 if $rows != 1 then
   return -1
 endi
-if $data00 != @69-01-01 08:00:00.000@ then
+if $data00 != @71-01-01 08:00:00.001@ then
+  print expect 71-01-01 08:00:00.001 , actual: $data00
   return -1
 endi