diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index 27052f08db2d8eb4a0ad500305313f48a07781f3..43968a61086661618540eed4968ff24c26996432 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -267,8 +267,8 @@ typedef struct {
 #define keyCol(pCols) (&((pCols)->cols[0]))  // Key column
 #define dataColsTKeyAt(pCols, idx) ((TKEY *)(keyCol(pCols)->pData))[(idx)]
 #define dataColsKeyAt(pCols, idx) tdGetKey(dataColsTKeyAt(pCols, idx))
-#define dataColsTKeyFirst(pCols) ((pCols)->numOfRows == 0) ? TKEY_INVALID : dataColsTKeyAt(pCols, 0)
-#define dataColsKeyFirst(pCols) ((pCols)->numOfRows == 0) ? TSDB_DATA_TIMESTAMP_NULL : dataColsKeyAt(pCols, 0)
+#define dataColsTKeyFirst(pCols) (((pCols)->numOfRows == 0) ? TKEY_INVALID : dataColsTKeyAt(pCols, 0))
+#define dataColsKeyFirst(pCols) (((pCols)->numOfRows == 0) ? TSDB_DATA_TIMESTAMP_NULL : dataColsKeyAt(pCols, 0))
 #define dataColsTKeyLast(pCols) \
   (((pCols)->numOfRows == 0) ? TKEY_INVALID : dataColsTKeyAt(pCols, (pCols)->numOfRows - 1))
 #define dataColsKeyLast(pCols) \
diff --git a/tests/pytest/update/allow_update-0.py b/tests/pytest/update/allow_update-0.py
new file mode 100644
index 0000000000000000000000000000000000000000..61295ec4b7680b42519bf7c9e0a01e0e523aa38b
--- /dev/null
+++ b/tests/pytest/update/allow_update-0.py
@@ -0,0 +1,170 @@
+###################################################################
+#           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 sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        
+        self.numOfRecords = 10
+        self.ts = 1604295582000    
+    
+    def restartTaosd(self):
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        tdSql.execute("use udb")
+
+    def run(self):
+        tdSql.prepare()
+        startTs = self.ts
+
+        print("==============step1")        
+        tdSql.execute("create database udb update 0")
+        tdSql.execute("use udb")
+        tdSql.execute("create table t (ts timestamp, a int)")
+        tdSql.execute("insert into t values (%d, 1)" % (startTs))
+        tdSql.execute("insert into t values (%d, 1)" % (startTs - 3))
+        tdSql.execute("insert into t values (%d, 1)" % (startTs + 3))
+        
+        tdSql.query("select * from t")
+        tdSql.checkRows(3)
+        
+        tdSql.query("select a from t")
+        tdSql.checkData(0, 0, 1)
+        tdSql.checkData(1, 0, 1)
+        tdSql.checkData(2, 0, 1)
+
+        print("==============step2")
+        tdSql.execute("insert into t values (%d, 2)" % (startTs))
+        tdSql.execute("insert into t values (%d, 2)" % (startTs - 3))
+        tdSql.execute("insert into t values (%d, 2)" % (startTs + 3))
+        
+        tdSql.query("select * from t")
+        tdSql.checkRows(3)
+        
+        tdSql.query("select a from t")
+        tdSql.checkData(0, 0, 1)
+        tdSql.checkData(1, 0, 1)
+        tdSql.checkData(2, 0, 1)
+
+        print("==============step3")
+        tdSql.execute("insert into t values (%d, 3)" % (startTs - 4))
+        tdSql.execute("insert into t values (%d, 3)" % (startTs - 2))
+        tdSql.execute("insert into t values (%d, 3)" % (startTs + 2))
+        tdSql.execute("insert into t values (%d, 3)" % (startTs + 4))
+        
+        tdSql.query("select * from t")
+        tdSql.checkRows(7)
+        
+        tdSql.query("select a from t")
+        tdSql.checkData(0, 0, 3)
+        tdSql.checkData(1, 0, 1)
+        tdSql.checkData(2, 0, 3)
+        tdSql.checkData(3, 0, 1)
+        tdSql.checkData(4, 0, 3)
+        tdSql.checkData(5, 0, 1)
+        tdSql.checkData(6, 0, 3)
+        
+        print("==============step4")
+        tdSql.execute("insert into t values (%d, 4)" % (startTs - 4))
+        tdSql.execute("insert into t values (%d, 4)" % (startTs - 2))
+        tdSql.execute("insert into t values (%d, 4)" % (startTs + 2))
+        tdSql.execute("insert into t values (%d, 4)" % (startTs + 4))
+        
+        tdSql.query("select * from t")
+        tdSql.checkRows(7)
+        
+        tdSql.query("select a from t")
+        tdSql.checkData(0, 0, 3)
+        tdSql.checkData(1, 0, 1)
+        tdSql.checkData(2, 0, 3)
+        tdSql.checkData(3, 0, 1)
+        tdSql.checkData(4, 0, 3)
+        tdSql.checkData(5, 0, 1)
+        tdSql.checkData(6, 0, 3)
+        
+        print("==============step5")
+        tdSql.execute("insert into t values (%d, 5)" % (startTs - 1))
+        tdSql.execute("insert into t values (%d, 5)" % (startTs + 1))
+        
+        tdSql.query("select * from t")
+        tdSql.checkRows(9)
+        
+        tdSql.query("select a from t")
+        tdSql.checkData(0, 0, 3)
+        tdSql.checkData(1, 0, 1)
+        tdSql.checkData(2, 0, 3)        
+        tdSql.checkData(3, 0, 5)
+        tdSql.checkData(4, 0, 1)
+        tdSql.checkData(5, 0, 5)        
+        tdSql.checkData(6, 0, 3)
+        tdSql.checkData(7, 0, 1)
+        tdSql.checkData(8, 0, 3)
+        
+        print("==============step6")
+        tdSql.execute("insert into t values (%d, 6)" % (startTs - 4))
+        tdSql.execute("insert into t values (%d, 6)" % (startTs - 3))
+        tdSql.execute("insert into t values (%d, 6)" % (startTs - 2))
+        tdSql.execute("insert into t values (%d, 6)" % (startTs - 1))
+        tdSql.execute("insert into t values (%d, 6)" % (startTs))
+        tdSql.execute("insert into t values (%d, 6)" % (startTs + 1))
+        tdSql.execute("insert into t values (%d, 6)" % (startTs + 2))
+        tdSql.execute("insert into t values (%d, 6)" % (startTs + 3))
+        tdSql.execute("insert into t values (%d, 6)" % (startTs + 4))
+        
+        tdSql.query("select * from t")
+        tdSql.checkRows(9)
+        
+        tdSql.query("select a from t")
+        tdSql.checkData(0, 0, 3)
+        tdSql.checkData(1, 0, 1)
+        tdSql.checkData(2, 0, 3)        
+        tdSql.checkData(3, 0, 5)
+        tdSql.checkData(4, 0, 1)
+        tdSql.checkData(5, 0, 5)        
+        tdSql.checkData(6, 0, 3)
+        tdSql.checkData(7, 0, 1)
+        tdSql.checkData(8, 0, 3)
+        
+        # restart taosd to commit, and check
+        self.restartTaosd();
+        
+        tdSql.query("select * from t")
+        tdSql.checkRows(9)
+        
+        tdSql.query("select a from t")
+        tdSql.checkData(0, 0, 3)
+        tdSql.checkData(1, 0, 1)
+        tdSql.checkData(2, 0, 3)        
+        tdSql.checkData(3, 0, 5)
+        tdSql.checkData(4, 0, 1)
+        tdSql.checkData(5, 0, 5)        
+        tdSql.checkData(6, 0, 3)
+        tdSql.checkData(7, 0, 1)
+        tdSql.checkData(8, 0, 3)        
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/update/allow_update.py b/tests/pytest/update/allow_update.py
index cc6fab5fc5bfaa43d75e82440259cf08f2d373e5..2879fc6f79210f7d96ff419a4d2e59661e29152a 100644
--- a/tests/pytest/update/allow_update.py
+++ b/tests/pytest/update/allow_update.py
@@ -1,67 +1,170 @@
-# For step 1, we set all the values as 1
-# for step 2, we set all the values as 2
-# and so on
-# check query result here means not
-
-# clear env set up
-
-# create database db update 1
-
-# create table t (ts timestamp, a int)
-
-# set an init time (such as $t0 = 1604295582000)
-
-# Step 1
-insert into t values ($t0, 1);
-insert into t values ($t0 - 3, 1);
-insert into t values ($t0 + 3, 1);
-
-check query result
-
-# Step 2
-insert into t values ($t0, 2);
-insert into t values ($t0 - 3, 2);
-insert into t values ($t0 + 3, 2);
-
-check query result
-
-# Step 3
-insert into t values ($t0 - 4, 3);
-insert into t values ($t0 - 2, 3);
-insert into t values ($t0 + 2, 3);
-insert into t values ($t0 + 4, 3);
-
-check query result
-
-# Step 4
-insert into t values ($t0 - 4, 4);
-insert into t values ($t0 - 2, 4);
-insert into t values ($t0 + 2, 4);
-insert into t values ($t0 + 4, 4);
-
-check query result
-
-# Step 4
-insert into t values ($t0 - 1, 5);
-insert into t values ($t0 + 1, 5);
-
-check query result
-
-# Step 4
-insert into t values ($t0 - 4, 6);
-insert into t values ($t0 - 3, 6);
-insert into t values ($t0 - 2, 6);
-insert into t values ($t0 - 1, 6);
-insert into t values ($t0, 6);
-insert into t values ($t0 + 1, 6);
-insert into t values ($t0 + 2, 6);
-insert into t values ($t0 + 3, 6);
-insert into t values ($t0 + 4, 6);
-
-check query result
-
-# Step 4
-
-restart to commit
-
-check query result
\ No newline at end of file
+###################################################################
+#           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 sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        
+        self.numOfRecords = 10
+        self.ts = 1604295582000    
+    
+    def restartTaosd(self):
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        tdSql.execute("use udb")
+
+    def run(self):
+        tdSql.prepare()
+        startTs = self.ts
+
+        print("==============step1")        
+        tdSql.execute("create database udb update 1")
+        tdSql.execute("use udb")
+        tdSql.execute("create table t (ts timestamp, a int)")
+        tdSql.execute("insert into t values (%d, 1)" % (startTs))
+        tdSql.execute("insert into t values (%d, 1)" % (startTs - 3))
+        tdSql.execute("insert into t values (%d, 1)" % (startTs + 3))
+        
+        tdSql.query("select * from t")
+        tdSql.checkRows(3)
+        
+        tdSql.query("select a from t")
+        tdSql.checkData(0, 0, 1)
+        tdSql.checkData(1, 0, 1)
+        tdSql.checkData(2, 0, 1)
+
+        print("==============step2")
+        tdSql.execute("insert into t values (%d, 2)" % (startTs))
+        tdSql.execute("insert into t values (%d, 2)" % (startTs - 3))
+        tdSql.execute("insert into t values (%d, 2)" % (startTs + 3))
+        
+        tdSql.query("select * from t")
+        tdSql.checkRows(3)
+        
+        tdSql.query("select a from t")
+        tdSql.checkData(0, 0, 2)
+        tdSql.checkData(1, 0, 2)
+        tdSql.checkData(2, 0, 2)
+
+        print("==============step3")
+        tdSql.execute("insert into t values (%d, 3)" % (startTs - 4))
+        tdSql.execute("insert into t values (%d, 3)" % (startTs - 2))
+        tdSql.execute("insert into t values (%d, 3)" % (startTs + 2))
+        tdSql.execute("insert into t values (%d, 3)" % (startTs + 4))
+        
+        tdSql.query("select * from t")
+        tdSql.checkRows(7)
+        
+        tdSql.query("select a from t")
+        tdSql.checkData(0, 0, 3)
+        tdSql.checkData(1, 0, 2)
+        tdSql.checkData(2, 0, 3)
+        tdSql.checkData(3, 0, 2)
+        tdSql.checkData(4, 0, 3)
+        tdSql.checkData(5, 0, 2)
+        tdSql.checkData(6, 0, 3)
+        
+        print("==============step4")
+        tdSql.execute("insert into t values (%d, 4)" % (startTs - 4))
+        tdSql.execute("insert into t values (%d, 4)" % (startTs - 2))
+        tdSql.execute("insert into t values (%d, 4)" % (startTs + 2))
+        tdSql.execute("insert into t values (%d, 4)" % (startTs + 4))
+        
+        tdSql.query("select * from t")
+        tdSql.checkRows(7)
+        
+        tdSql.query("select a from t")
+        tdSql.checkData(0, 0, 4)
+        tdSql.checkData(1, 0, 2)
+        tdSql.checkData(2, 0, 4)
+        tdSql.checkData(3, 0, 2)
+        tdSql.checkData(4, 0, 4)
+        tdSql.checkData(5, 0, 2)
+        tdSql.checkData(6, 0, 4)
+        
+        print("==============step5")
+        tdSql.execute("insert into t values (%d, 5)" % (startTs - 1))
+        tdSql.execute("insert into t values (%d, 5)" % (startTs + 1))
+        
+        tdSql.query("select * from t")
+        tdSql.checkRows(9)
+        
+        tdSql.query("select a from t")
+        tdSql.checkData(0, 0, 4)
+        tdSql.checkData(1, 0, 2)
+        tdSql.checkData(2, 0, 4)        
+        tdSql.checkData(3, 0, 5)
+        tdSql.checkData(4, 0, 2)
+        tdSql.checkData(5, 0, 5)        
+        tdSql.checkData(6, 0, 4)
+        tdSql.checkData(7, 0, 2)
+        tdSql.checkData(8, 0, 4)
+        
+        print("==============step6")
+        tdSql.execute("insert into t values (%d, 6)" % (startTs - 4))
+        tdSql.execute("insert into t values (%d, 6)" % (startTs - 3))
+        tdSql.execute("insert into t values (%d, 6)" % (startTs - 2))
+        tdSql.execute("insert into t values (%d, 6)" % (startTs - 1))
+        tdSql.execute("insert into t values (%d, 6)" % (startTs))
+        tdSql.execute("insert into t values (%d, 6)" % (startTs + 1))
+        tdSql.execute("insert into t values (%d, 6)" % (startTs + 2))
+        tdSql.execute("insert into t values (%d, 6)" % (startTs + 3))
+        tdSql.execute("insert into t values (%d, 6)" % (startTs + 4))
+        
+        tdSql.query("select * from t")
+        tdSql.checkRows(9)
+        
+        tdSql.query("select a from t")
+        tdSql.checkData(0, 0, 6)
+        tdSql.checkData(1, 0, 6)
+        tdSql.checkData(2, 0, 6)        
+        tdSql.checkData(3, 0, 6)
+        tdSql.checkData(4, 0, 6)
+        tdSql.checkData(5, 0, 6)        
+        tdSql.checkData(6, 0, 6)
+        tdSql.checkData(7, 0, 6)
+        tdSql.checkData(8, 0, 6)
+        
+        # restart taosd to commit, and check
+        self.restartTaosd();
+        
+        tdSql.query("select * from t")
+        tdSql.checkRows(9)
+        
+        tdSql.query("select a from t")
+        tdSql.checkData(0, 0, 6)
+        tdSql.checkData(1, 0, 6)
+        tdSql.checkData(2, 0, 6)        
+        tdSql.checkData(3, 0, 6)
+        tdSql.checkData(4, 0, 6)
+        tdSql.checkData(5, 0, 6)        
+        tdSql.checkData(6, 0, 6)
+        tdSql.checkData(7, 0, 6)
+        tdSql.checkData(8, 0, 6)        
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())