Merge branch 'master' into test/TD-3295

Jenkinsfile

@@ -43,7 +43,23 @@ def pre_test(){
     killall -9 gdb || echo "no gdb running"
     cd ${WKC}
     git reset --hard HEAD~10 >/dev/null
+    '''
+    script {
+      if (env.CHANGE_TARGET == 'master') {
+        sh '''
+        cd ${WKC}
+        git checkout master
+        '''
+        }
+      else {
+        sh '''
+        cd ${WKC}
         git checkout develop
+        '''
+      } 
+    }
+    sh'''
+    cd ${WKC}
     git pull >/dev/null
     git fetch origin +refs/pull/${CHANGE_ID}/merge
     git checkout -qf FETCH_HEAD
@@ -53,15 +69,22 @@ def pre_test(){
     '''
     script {
       if (env.CHANGE_TARGET == 'master') {
-        sh 'git checkout master'
+        sh '''
+        cd ${WK}
+        git checkout master
+        '''
         }
       else {
-        sh 'git checkout develop'
+        sh '''
+        cd ${WK}
+        git checkout develop
+        '''
       } 
     }
     sh '''
-    git pull >/dev/null 
+
     cd ${WK}
+    git pull >/dev/null 
     export TZ=Asia/Harbin
     date
     git clean -dfx

tests/pytest/fulltest.sh

@@ -22,6 +22,7 @@ python3 ./test.py -f insert/alterTableAndInsert.py
 python3 ./test.py -f insert/insertIntoTwoTables.py
 python3 ./test.py -f insert/before_1970.py
 python3 bug2265.py
+python3 ./test.py -f insert/bug3654.py
 
 #table
 python3 ./test.py -f table/alter_wal0.py

tests/pytest/insert/bug3654.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import taos
+import sys
+
+from util.log import *
+from util.sql import *
+from util.cases import *
+
+class TDTestCase:
+
+    def init(self, conn, logSql):
+        tdLog.debug(f"start to excute {__file__}")
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.printNoPrefix("==========step1:create table")
+        tdSql.execute("drop database if exists db")
+        tdSql.execute("create database db keep 36500,36500,36500")
+        tdSql.execute("use db")
+        tdSql.execute("create stable if not exists stb1 (ts timestamp, c1 int) tags(t11 int)")
+        tdSql.execute("create table t10 using stb1 tags(1)")
+        gapdate = (datetime.datetime.now() - datetime.datetime(1970, 1, 1, 8, 0, 0)).days
+
+        tdLog.printNoPrefix("==========step2:insert data")
+        tdSql.execute(f"insert into t10 values (now-{gapdate}d, 1)")
+        tdSql.execute(f"insert into t10 values (now-{gapdate + 1}d, 2)")
+
+        tdLog.printNoPrefix("==========step3:query")
+        tdSql.query("select * from t10 where c1=1")
+        tdSql.checkRows(1)
+        tdSql.query("select * from t10 where c1=2")
+        tdSql.checkRows(1)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
\ No newline at end of file